Skip to content

Commit 4d7cc65

Browse files
princejosephclaude
princejoseph
and
claude
committed
Add Rails 7 / Ruby 3.2 compatibility
- Update `rails` version constraint from `< 7.0` to `< 8.0` in all gemspecs - Update `react-rails` constraint from `< 2.5.0` to `< 3.0` (2.7.x added Rails 7 support) - Remove `.untaint` calls removed in Ruby 3.2 (hyperstack-config, hyper-state, hyper-trace, hyper-component) - Guard `config.assets` access in rail_tie.rb for Propshaft compatibility - Guard `ActiveSupport::Dependencies.require_or_load` alias in server_side_auto_require.rb (removed in Rails 7.2) - Loosen `sqlite3`, `timecop`, and `rspec` dev dependency constraints to allow modern versions - Add `gem 'rack', '< 3'` to Gemfiles (puma 5.x requires rack < 3) Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
1 parent 52a06b2 commit 4d7cc65

18 files changed

Lines changed: 61 additions & 52 deletions

File tree

‎ruby/hyper-component/hyper-component.gemspec‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
2020
spec.add_dependency 'hyper-state', Hyperstack::Component::VERSION
2121
spec.add_dependency 'hyperstack-config', Hyperstack::Component::VERSION
2222
spec.add_dependency 'opal-activesupport', '~> 0.3.1'
23-
spec.add_dependency 'react-rails', '>= 2.4.0', '< 2.5.0'
23+
spec.add_dependency 'react-rails', '>= 2.4.0', '< 3.0'
2424

2525
spec.add_development_dependency 'bundler'
2626
spec.add_development_dependency 'chromedriver-helper'
@@ -35,11 +35,11 @@ Gem::Specification.new do |spec|
3535
spec.add_development_dependency 'pry-rescue'
3636
spec.add_development_dependency 'pry-stack_explorer'
3737
spec.add_development_dependency 'puma', '<= 5.4.0'
38-
spec.add_development_dependency 'rails', ENV['RAILS_VERSION'] || '>= 5.0.0', '< 7.0'
38+
spec.add_development_dependency 'rails', ENV['RAILS_VERSION'] || '>= 5.0.0', '< 8.0'
3939
spec.add_development_dependency 'rails-controller-testing'
4040
spec.add_development_dependency 'rake'
4141
spec.add_development_dependency 'rspec-rails'
4242
spec.add_development_dependency 'rubocop' #, '~> 0.51.0'
43-
spec.add_development_dependency 'sqlite3', '~> 1.4.2'
44-
spec.add_development_dependency 'timecop', '~> 0.8.1'
43+
spec.add_development_dependency 'sqlite3', '>= 1.4'
44+
spec.add_development_dependency 'timecop', '>= 0.8.1'
4545
end

‎ruby/hyper-component/lib/react/react-source.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@
1313
require "react/rails/asset_variant"
1414
variant = Hyperstack.env.production? ? :production : :development
1515
react_directory = React::Rails::AssetVariant.new({ variant: variant }).react_directory
16-
Opal.append_path react_directory.untaint
16+
Opal.append_path react_directory
1717
end

‎ruby/hyper-i18n/hyper-i18n.gemspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,5 @@ Gem::Specification.new do |spec|
3535
spec.add_development_dependency 'rspec'
3636
spec.add_development_dependency 'rspec-rails'
3737
spec.add_development_dependency 'rubocop' #, '~> 0.51.0'
38-
spec.add_development_dependency 'sqlite3', '~> 1.4.2' # see https://github.com/rails/rails/issues/35153
38+
spec.add_development_dependency 'sqlite3', '>= 1.4' # was ~> 1.4.2, see https://github.com/rails/rails/issues/35153
3939
end

‎ruby/hyper-model/hyper-model.gemspec‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ Gem::Specification.new do |spec|
3838
spec.add_development_dependency 'puma', '<= 5.4.0'
3939
spec.add_development_dependency 'pusher'
4040
spec.add_development_dependency 'pusher-fake'
41-
spec.add_development_dependency 'rails', ENV['RAILS_VERSION'] || '>= 5.0.0', '< 7.0'
41+
spec.add_development_dependency 'rails', ENV['RAILS_VERSION'] || '>= 5.0.0', '< 8.0'
4242
spec.add_development_dependency 'rake'
43-
spec.add_development_dependency 'react-rails', '>= 2.4.0', '< 2.5.0'
43+
spec.add_development_dependency 'react-rails', '>= 2.4.0', '< 3.0'
4444
spec.add_development_dependency 'rspec-collection_matchers'
4545
spec.add_development_dependency 'rspec-expectations'
4646
spec.add_development_dependency 'rspec-its'
@@ -52,6 +52,6 @@ Gem::Specification.new do |spec|
5252
spec.add_development_dependency 'shoulda'
5353
spec.add_development_dependency 'shoulda-matchers'
5454
spec.add_development_dependency 'spring-commands-rspec', '~> 1.0.4'
55-
spec.add_development_dependency 'sqlite3', '~> 1.4.2' # see https://github.com/rails/rails/issues/35153, '~> 1.3.6'
56-
spec.add_development_dependency 'timecop', '~> 0.8.1'
55+
spec.add_development_dependency 'sqlite3', '>= 1.4' # was ~> 1.4.2, see https://github.com/rails/rails/issues/35153
56+
spec.add_development_dependency 'timecop', '>= 0.8.1'
5757
end

‎ruby/hyper-operation/hyper-operation.gemspec‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@ Gem::Specification.new do |spec|
3737
spec.add_development_dependency 'puma', '<= 5.4.0'
3838
spec.add_development_dependency 'pusher'
3939
spec.add_development_dependency 'pusher-fake'
40-
spec.add_development_dependency 'rails', ENV['RAILS_VERSION'] || '>= 5.0.0', '< 7.0'
40+
spec.add_development_dependency 'rails', ENV['RAILS_VERSION'] || '>= 5.0.0', '< 8.0'
4141
spec.add_development_dependency 'rake'
42-
spec.add_development_dependency 'react-rails', '>= 2.4.0', '< 2.5.0'
42+
spec.add_development_dependency 'react-rails', '>= 2.4.0', '< 3.0'
4343
spec.add_development_dependency 'redis'
4444
spec.add_development_dependency 'rspec-rails'
4545
spec.add_development_dependency 'rspec-steps', '~> 2.1.1'
4646
spec.add_development_dependency 'rspec-wait'
47-
spec.add_development_dependency 'sqlite3', '~> 1.4.2' # see https://github.com/rails/rails/issues/35153
48-
spec.add_development_dependency 'timecop', '~> 0.8.1'
47+
spec.add_development_dependency 'sqlite3', '>= 1.4' # was ~> 1.4.2, see https://github.com/rails/rails/issues/35153
48+
spec.add_development_dependency 'timecop', '>= 0.8.1'
4949
end

‎ruby/hyper-router/hyper-router.gemspec‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
2929
spec.add_development_dependency 'pry-rescue'
3030
spec.add_development_dependency 'pry-stack_explorer'
3131
spec.add_development_dependency 'puma', '<= 5.4.0'
32-
spec.add_development_dependency 'rails', ENV['RAILS_VERSION'] || '>= 5.0.0', '< 7.0'
32+
spec.add_development_dependency 'rails', ENV['RAILS_VERSION'] || '>= 5.0.0', '< 8.0'
3333
spec.add_development_dependency 'rake'
3434
spec.add_development_dependency 'rspec-collection_matchers'
3535
spec.add_development_dependency 'rspec-expectations'
@@ -39,6 +39,6 @@ Gem::Specification.new do |spec|
3939
spec.add_development_dependency 'rspec-steps', '~> 2.1.1'
4040
spec.add_development_dependency 'shoulda'
4141
spec.add_development_dependency 'shoulda-matchers'
42-
spec.add_development_dependency 'sqlite3', '~> 1.4.2' # see https://github.com/rails/rails/issues/35153
43-
spec.add_development_dependency 'timecop', '~> 0.8.1'
42+
spec.add_development_dependency 'sqlite3', '>= 1.4' # was ~> 1.4.2, see https://github.com/rails/rails/issues/35153
43+
spec.add_development_dependency 'timecop', '>= 0.8.1'
4444
end

‎ruby/hyper-spec/hyper-spec.gemspec‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec| # rubocop:disable Metrics/BlockLength
2929
spec.add_dependency 'parser'
3030
spec.add_dependency 'rspec'
3131
spec.add_dependency 'selenium-webdriver'
32-
spec.add_dependency 'timecop', '~> 0.8.1'
32+
spec.add_dependency 'timecop', '>= 0.8.1'
3333
spec.add_dependency 'uglifier'
3434
spec.add_dependency 'unparser', '>= 0.4.2'
3535
spec.add_dependency 'webdrivers'
@@ -41,9 +41,9 @@ Gem::Specification.new do |spec| # rubocop:disable Metrics/BlockLength
4141
spec.add_development_dependency 'pry-rescue'
4242
spec.add_development_dependency 'pry-stack_explorer'
4343
spec.add_development_dependency 'puma', '<= 5.4.0'
44-
spec.add_development_dependency 'rails', ENV['RAILS_VERSION'] || '>= 5.0.0', '< 7.0'
44+
spec.add_development_dependency 'rails', ENV['RAILS_VERSION'] || '>= 5.0.0', '< 8.0'
4545
spec.add_development_dependency 'rake'
46-
spec.add_development_dependency 'react-rails', '>= 2.3.0', '< 2.5.0'
46+
spec.add_development_dependency 'react-rails', '>= 2.3.0', '< 3.0'
4747
spec.add_development_dependency 'rspec-rails'
4848
spec.add_development_dependency 'rspec-collection_matchers'
4949
spec.add_development_dependency 'rspec-expectations'

‎ruby/hyper-state/Gemfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
source 'https://rubygems.org'
22
gem 'hyper-spec', path: '../hyper-spec'
3+
gem 'rack', '< 3' # puma <= 5.4 requires rack < 3 (rack/handler removed in rack 3)
34
gem 'hyperstack-config', path: '../hyperstack-config'
45
gem 'hyper-component', path: '../hyper-component'
56
gemspec

‎ruby/hyper-state/hyper-state.gemspec‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ Gem::Specification.new do |spec|
3030
spec.add_development_dependency 'pry-rescue'
3131
spec.add_development_dependency 'pry-stack_explorer'
3232
spec.add_development_dependency 'puma', '<= 5.4.0'
33-
spec.add_development_dependency 'rails', ENV['RAILS_VERSION'] || '>= 5.0.0', '< 7.0'
33+
spec.add_development_dependency 'rails', ENV['RAILS_VERSION'] || '>= 5.0.0', '< 8.0'
3434
spec.add_development_dependency 'rake'
35-
spec.add_development_dependency 'react-rails', '>= 2.4.0', '< 2.5.0'
36-
spec.add_development_dependency 'rspec', '~> 3.7.0'
35+
spec.add_development_dependency 'react-rails', '>= 2.4.0', '< 3.0'
36+
spec.add_development_dependency 'rspec', '>= 3.7.0'
3737
spec.add_development_dependency 'rspec-rails'
3838
spec.add_development_dependency 'rspec-steps', '~> 2.1.1'
3939
spec.add_development_dependency 'rubocop' #, '~> 0.51.0'
40-
spec.add_development_dependency 'sqlite3', '~> 1.4.2' # see https://github.com/rails/rails/issues/35153
41-
spec.add_development_dependency 'timecop', '~> 0.8.1'
40+
spec.add_development_dependency 'sqlite3', '>= 1.4' # was ~> 1.4.2, see https://github.com/rails/rails/issues/35153
41+
spec.add_development_dependency 'timecop', '>= 0.8.1'
4242
end

‎ruby/hyper-state/lib/hyper-state.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@
1616
require 'ext/object_space'
1717
else
1818
require 'opal'
19-
Opal.append_path(File.expand_path('../', __FILE__).untaint)
19+
Opal.append_path(File.expand_path('../', __FILE__))
2020
end

0 commit comments

Comments
 (0)