Merge pull request #193 from zendesk/jury.razumau/rails7.1

add support for rails 7.1
zendesk · Nov 14, 2023 · e798f6b · e798f6b
2 parents 6e17f1f + 3e3587c
commit e798f6b
Show file tree

Hide file tree

Showing 12 changed files with 706 additions and 417 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -19,12 +19,13 @@ jobs:
         gemfile:
           - rails6.1
           - rails7.0
+          - rails7.1
         include:
           - {ruby: '2.7', gemfile: rails5.1}
           - {ruby: '2.7', gemfile: rails5.2}
           - {ruby: '2.7', gemfile: rails6.0}
     steps:
-      - uses: zendesk/checkout@v3
+      - uses: zendesk/checkout@v4
       - uses: zendesk/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 ### Unreleased
 
+### Curly 3.3.0 (November 13, 2023)
+* Add support for Rails 7.1
+
 ### Curly 3.2.0 (June 1, 2023)
 
 * Add support for Ruby 3.2

diff --git a/curly-templates.gemspec b/curly-templates.gemspec
@@ -20,10 +20,10 @@ Gem::Specification.new do |s|
 
   s.rdoc_options = ["--charset=UTF-8"]
 
-  s.add_dependency("actionpack", [">= 5.1", "< 7.1"])
+  s.add_dependency("actionpack", [">= 5.1", "< 7.2"])
   s.add_dependency("sorted_set")
 
-  s.add_development_dependency("railties", [">= 5.1", "< 7.1"])
+  s.add_development_dependency("railties", [">= 5.1", "< 7.2"])
   s.add_development_dependency("rake")
   s.add_development_dependency("rspec", ">= 3")
 

diff --git a/gemfiles/rails5.1.gemfile.lock b/gemfiles/rails5.1.gemfile.lock
@@ -1,8 +1,8 @@
 PATH
   remote: ..
   specs:
-    curly-templates (3.2.0)
-      actionpack (>= 5.1, < 7.1)
+    curly-templates (3.3.0)
+      actionpack (>= 5.1, < 7.2)
       sorted_set
 
 GEM
@@ -46,40 +46,49 @@ GEM
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     arel (8.0.0)
-    benchmark-ips (2.10.0)
+    benchmark-ips (2.12.0)
     builder (3.2.4)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.2)
     crass (1.0.6)
+    date (3.3.4)
     diff-lcs (1.5.0)
-    erubi (1.11.0)
+    erubi (1.12.0)
     genspec (0.3.2)
       rspec (>= 2, < 4)
       thor
-    github-markup (4.0.1)
-    globalid (1.0.0)
+    github-markup (4.0.2)
+    globalid (1.1.0)
       activesupport (>= 5.0)
-    i18n (1.12.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    loofah (2.19.0)
+    loofah (2.21.4)
       crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    mail (2.7.1)
+      nokogiri (>= 1.12.0)
+    mail (2.8.1)
       mini_mime (>= 0.1.1)
+      net-imap
+      net-pop
+      net-smtp
     method_source (1.0.0)
-    mini_mime (1.1.2)
-    mini_portile2 (2.8.0)
-    minitest (5.16.3)
-    nio4r (2.5.8)
-    nokogiri (1.13.9)
-      mini_portile2 (~> 2.8.0)
+    mini_mime (1.1.5)
+    mini_portile2 (2.8.5)
+    minitest (5.20.0)
+    net-imap (0.4.5)
+      date
+      net-protocol
+    net-pop (0.1.2)
+      net-protocol
+    net-protocol (0.2.2)
+      timeout
+    net-smtp (0.4.0)
+      net-protocol
+    nio4r (2.5.9)
+    nokogiri (1.15.4)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.13.9-x86_64-darwin)
-      racc (~> 1.4)
-    nokogiri (1.13.9-x86_64-linux)
-      racc (~> 1.4)
-    racc (1.6.0)
-    rack (2.2.4)
-    rack-test (2.0.2)
+    racc (1.7.3)
+    rack (2.2.8)
+    rack-test (2.1.0)
       rack (>= 1.3)
     rails (5.1.7)
       actioncable (= 5.1.7)
@@ -93,30 +102,32 @@ GEM
       bundler (>= 1.3.0)
       railties (= 5.1.7)
       sprockets-rails (>= 2.0.0)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
+    rails-dom-testing (2.2.0)
+      activesupport (>= 5.0.0)
+      minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.3)
-      loofah (~> 2.3)
+    rails-html-sanitizer (1.6.0)
+      loofah (~> 2.21)
+      nokogiri (~> 1.14)
     railties (5.1.7)
       actionpack (= 5.1.7)
       activesupport (= 5.1.7)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (13.0.6)
-    rbtree (0.4.5)
-    redcarpet (3.5.1)
+    rake (13.1.0)
+    rbtree (0.4.6)
+    redcarpet (3.6.0)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
       rspec-expectations (~> 3.12.0)
       rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.0)
+    rspec-core (3.12.2)
       rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.0)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.0)
+    rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-rails (4.1.2)
@@ -127,46 +138,43 @@ GEM
       rspec-expectations (~> 3.10)
       rspec-mocks (~> 3.10)
       rspec-support (~> 3.10)
-    rspec-support (3.12.0)
+    rspec-support (3.12.1)
     set (1.0.3)
     sorted_set (1.0.3)
       rbtree
       set (~> 1.0)
-    sprockets (4.1.1)
+    sprockets (4.2.1)
       concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
+      rack (>= 2.2.4, < 4)
     sprockets-rails (3.2.2)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    stackprof (0.2.22)
-    thor (1.2.1)
+    stackprof (0.2.25)
+    thor (1.3.0)
     thread_safe (0.3.6)
+    timeout (0.4.1)
     tomparse (0.4.2)
-    tzinfo (1.2.10)
+    tzinfo (1.2.11)
       thread_safe (~> 0.1)
-    webrick (1.7.0)
     websocket-driver (0.6.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    yard (0.9.28)
-      webrick (~> 1.7.0)
+    yard (0.9.34)
     yard-tomdoc (0.7.1)
       tomparse (>= 0.4.0)
       yard
 
 PLATFORMS
   ruby
-  x86_64-darwin
-  x86_64-linux
 
 DEPENDENCIES
   benchmark-ips
   curly-templates!
   genspec (>= 0.3.0)
   github-markup
   rails (~> 5.1.0)
-  railties (>= 5.1, < 7.1)
+  railties (>= 5.1, < 7.2)
   rake
   redcarpet
   rspec (>= 3)
@@ -176,4 +184,4 @@ DEPENDENCIES
   yard-tomdoc
 
 BUNDLED WITH
-   2.3.25
+   2.4.17