Modernize gem.

socketry · Apr 28, 2024 · 98c5492 · 98c5492
1 parent ef247a2
commit 98c5492
Show file tree

Hide file tree

Showing 19 changed files with 56 additions and 55 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -3,3 +3,7 @@ root = true
 [*]
 indent_style = tab
 indent_size = 2
+
+[*.{yml,yaml}]
+indent_style = space
+indent_size = 2
diff --git a/.github/workflows/coverage.yaml b/.github/workflows/coverage.yaml
@@ -21,10 +21,10 @@ jobs:
           - macos
 
         ruby:
-          - "3.2"
+          - "3.3"
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{matrix.ruby}}
@@ -46,7 +46,7 @@ jobs:
         git config --global init.defaultBranch main
         bundle exec bake test
     
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v3
       with:
         name: coverage-${{matrix.os}}-${{matrix.ruby}}
         path: .covered.db
@@ -56,10 +56,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: "3.2"
+        ruby-version: "3.3"
         bundler-cache: true
 
     - uses: actions/download-artifact@v3

diff --git a/.github/workflows/documentation.yaml b/.github/workflows/documentation.yaml
@@ -5,9 +5,6 @@ on:
     branches:
       - main
 
-    # Allows you to run this workflow manually from the Actions tab:
-    workflow_dispatch:
-
 # Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages:
 permissions:
   contents: read
@@ -28,11 +25,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: "3.2"
+        ruby-version: "3.3"
         bundler-cache: true
 
     - name: Installing packages
@@ -43,7 +40,7 @@ jobs:
       run: bundle exec bake utopia:project:static --force no
 
     - name: Upload documentation artifact
-      uses: actions/upload-pages-artifact@v1
+      uses: actions/upload-pages-artifact@v3
       with:
         path: docs
 
@@ -58,4 +55,4 @@ jobs:
     steps:
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v1
+        uses: actions/deploy-pages@v4
diff --git a/.github/workflows/test-external.yaml b/.github/workflows/test-external.yaml
@@ -20,12 +20,12 @@ jobs:
           - macos
 
         ruby:
-          - "3.0"
           - "3.1"
           - "3.2"
+          - "3.3"
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{matrix.ruby}}

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -21,9 +21,9 @@ jobs:
           - macos
 
         ruby:
-          - "3.0"
           - "3.1"
           - "3.2"
+          - "3.3"
 
         experimental: [false]
 
@@ -39,7 +39,7 @@ jobs:
             experimental: true
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{matrix.ruby}}

diff --git a/gems.rb b/gems.rb
@@ -20,6 +20,13 @@
 end
 
 group :test do
+	gem "sus"
+	gem "covered"
+
+	gem "falcon"
+	gem "async-websocket"
+	gem "sus-fixtures-async-http"
+
 	gem 'bake-test'
 	gem 'bake-test-external'
 

diff --git a/lib/utopia/content.rb b/lib/utopia/content.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2009-2023, by Samuel Williams.
+# Copyright, 2009-2024, by Samuel Williams.
 
 require_relative 'middleware'
 require_relative 'localization'

diff --git a/lib/utopia/content/document.rb b/lib/utopia/content/document.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2015-2022, by Samuel Williams.
+# Copyright, 2015-2024, by Samuel Williams.
 
 require_relative 'links'
 require_relative 'response'

diff --git a/lib/utopia/content/link.rb b/lib/utopia/content/link.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2009-2022, by Samuel Williams.
+# Copyright, 2009-2024, by Samuel Williams.
 # Copyright, 2017, by Huba Nagy.
 # Copyright, 2020, by Michael Adams.
 

diff --git a/lib/utopia/content/markup.rb b/lib/utopia/content/markup.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2009-2022, by Samuel Williams.
+# Copyright, 2009-2024, by Samuel Williams.
 
 require 'xrb/parsers'
 require 'xrb/entities'

diff --git a/lib/utopia/controller/actions.rb b/lib/utopia/controller/actions.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2014-2022, by Samuel Williams.
+# Copyright, 2014-2023, by Samuel Williams.
 
 require_relative '../http'
 

diff --git a/lib/utopia/extensions/array_split.rb b/lib/utopia/extensions/array_split.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2009-2022, by Samuel Williams.
+# Copyright, 2009-2023, by Samuel Williams.
 
 module Utopia
 	module Extensions

diff --git a/lib/utopia/redirection.rb b/lib/utopia/redirection.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2009-2022, by Samuel Williams.
+# Copyright, 2009-2023, by Samuel Williams.
 
 require_relative 'middleware'
 

diff --git a/license.md b/license.md
@@ -1,6 +1,6 @@
 # MIT License
 
-Copyright, 2009-2023, by Samuel Williams.  
+Copyright, 2009-2024, by Samuel Williams.  
 Copyright, 2015-2019, by Huba Nagy.  
 Copyright, 2020, by Olle Jonsson.  
 Copyright, 2020, by Pierre Montelle.  

diff --git a/readme.md b/readme.md
@@ -15,24 +15,6 @@ Utopia is a website generation framework which provides a robust set of tools to
 
 Please see the [project documentation](https://socketry.github.io/utopia).
 
-## Contributing
-
-We welcome contributions to this project.
-
-1.  Fork it.
-2.  Create your feature branch (`git checkout -b my-new-feature`).
-3.  Commit your changes (`git commit -am 'Add some feature'`).
-4.  Push to the branch (`git push origin my-new-feature`).
-5.  Create new Pull Request.
-
-### Developer Certificate of Origin
-
-This project uses the [Developer Certificate of Origin](https://developercertificate.org/). All contributors to this project must agree to this document to have their contributions accepted.
-
-### Contributor Covenant
-
-This project is governed by [Contributor Covenant](https://www.contributor-covenant.org/). All contributors and participants agree to abide by its terms.
-
 ## See Also
 
   - [XRB](https://github.com/socketry/xrb) — Template and markup parsers, markup generation.
@@ -49,3 +31,21 @@ This project is governed by [Contributor Covenant](https://www.contributor-coven
   - [Financier](https://github.com/ioquatix/financier) — A small business management platform.
   - [mail.oriontransfer.net](https://github.com/oriontransfer/mail.oriontransfer.net) - Mail server account management.
   - [www.codeotaku.com](http://www.codeotaku.com) ([source](https://github.com/ioquatix/www.codeotaku.com)) — Personal website, blog.
+
+## Contributing
+
+We welcome contributions to this project.
+
+1.  Fork it.
+2.  Create your feature branch (`git checkout -b my-new-feature`).
+3.  Commit your changes (`git commit -am 'Add some feature'`).
+4.  Push to the branch (`git push origin my-new-feature`).
+5.  Create new Pull Request.
+
+### Developer Certificate of Origin
+
+This project uses the [Developer Certificate of Origin](https://developercertificate.org/). All contributors to this project must agree to this document to have their contributions accepted.
+
+### Contributor Covenant
+
+This project is governed by the [Contributor Covenant](https://www.contributor-covenant.org/). All contributors and participants agree to abide by its terms.
diff --git a/test/utopia/content.rb b/test/utopia/content.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2012-2023, by Samuel Williams.
+# Copyright, 2012-2024, by Samuel Williams.
 
 require 'rack/test'
 require 'utopia/content'

diff --git a/test/utopia/content/markup.rb b/test/utopia/content/markup.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2015-2023, by Samuel Williams.
+# Copyright, 2015-2024, by Samuel Williams.
 
 require 'utopia/content/markup'
 

diff --git a/test/utopia/content/tags.rb b/test/utopia/content/tags.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2017-2023, by Samuel Williams.
+# Copyright, 2017-2024, by Samuel Williams.
 
 require 'utopia/content/tags'
 require 'utopia/content/document'

diff --git a/utopia.gemspec b/utopia.gemspec
@@ -17,11 +17,12 @@ Gem::Specification.new do |spec|
 
 	spec.metadata = {
 		"funding_uri" => "https://github.com/sponsors/ioquatix/",
+		"source_code_uri" => "https://github.com/ioquatix/utopia.git",
 	}
 
 	spec.files = Dir.glob(['{bake,lib,setup}/**/*', '*.md'], File::FNM_DOTMATCH, base: __dir__)
 
-	spec.required_ruby_version = ">= 3.0"
+	spec.required_ruby_version = ">= 3.1"
 
 	spec.add_dependency "concurrent-ruby", "~> 1.2"
 	spec.add_dependency "console", "~> 1.0"
@@ -33,14 +34,6 @@ Gem::Specification.new do |spec|
 	spec.add_dependency "rack", "~> 3.0"
 	spec.add_dependency "samovar", "~> 2.1"
 	spec.add_dependency "traces", "~> 0.10"
-	spec.add_dependency "xrb", "~> 0.4"
 	spec.add_dependency "variant", "~> 0.1"
-
-	spec.add_development_dependency "async-websocket"
-	spec.add_development_dependency "bake"
-	spec.add_development_dependency "bundler"
-	spec.add_development_dependency "covered"
-	spec.add_development_dependency "falcon"
-	spec.add_development_dependency "sus"
-	spec.add_development_dependency "sus-fixtures-async-http"
+	spec.add_dependency "xrb", "~> 0.4"
 end