origen 0.61.3 → 0.61.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. checksums.yaml +4 -4
  2. data/config/version.rb +1 -1
  3. data/lib/origen.rb +6 -4
  4. metadata +1 -1
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: bd07a38be9bb273d3921d65bd7f5a44183b6f21ff89293a1e9a111b4bee95ce7
4
- data.tar.gz: ac025a4ce036eeb26f685a8570198872edebba0cf6a83ddc7f34f80d6ff7b1c7
3
+ metadata.gz: de55af21a90c04613a1ff7832f675da5c9f2c667b7c4bafc7c0a7af9df206bf5
4
+ data.tar.gz: b84a97c22be2ccaae7df92afa0695158271394ec56f122b1ec5e4b820c4f4655
5
5
  SHA512:
6
- metadata.gz: f70fb4a46e1e082af9a9bd108da2f441158bdfad148b6eefd1251bc3384231345ae633b2157491512ec1fe9e90ae4a913188e0daa768b5b22924423b6d06a6a9
7
- data.tar.gz: 3be1ee7bd6407d0af48553baf0eab1bcb1b98e15e567164f3aa1413a8275a956a6d367281ad427c4cef52a04266ef478c8cbfc2ec0ba7cf23a20d6321ab6e55c
6
+ metadata.gz: 838cdb21f09e536bea161809af89d0b3b7b4a49fe875a952f2125fb9ee0f9dfea5c3c94dfe421a0146d17b8e1fbbb6e0b414d6a54d3aade8fd5362d15454eb0c
7
+ data.tar.gz: 358abe430463757978b3d2f47b3783d714815ccfb67deac10adc7f3fe7e00a535c46b1c0b6060407b89af32ada4a009544dcacf58a0467feaf393852cf898126
data/config/version.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  module Origen
2
2
  MAJOR = 0
3
3
  MINOR = 61
4
- BUGFIX = 3
4
+ BUGFIX = 4
5
5
  DEV = nil
6
6
  VERSION = [MAJOR, MINOR, BUGFIX].join(".") + (DEV ? ".pre#{DEV}" : '')
7
7
  end
data/lib/origen.rb CHANGED
@@ -2,10 +2,12 @@
2
2
  # our original internal version (RGen)
3
3
  unless defined? RGen::ORIGENTRANSITION
4
4
  # ActiveSupport 4.2 wraps to_json via alias_method_chain, which causes infinite
5
- # recursion on Ruby 4 with json gem 2.x (to_json_without_active_support_encoder
6
- # ends up calling back into to_json_with_active_support_encoder). Intercept the
7
- # alias for the :to_json target before ActiveSupport's json core_ext loads.
8
- if RUBY_VERSION >= '4'
5
+ # recursion on Ruby 3.x and 4.x (to_json_without_active_support_encoder ends up
6
+ # calling back into to_json_with_active_support_encoder). The trigger is a Ruby 3.0+
7
+ # method-resolution change, NOT the json gem version (json 2.x ships on 2.6 too, yet
8
+ # 2.6 does not recurse). So the shim must apply to all of Ruby 3 and 4, not just 4.
9
+ # Intercept the alias for the :to_json target before ActiveSupport's json core_ext loads.
10
+ if RUBY_VERSION >= '3'
9
11
  require 'json'
10
12
  require 'active_support/core_ext/module/aliasing'
11
13
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: origen
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.61.3
4
+ version: 0.61.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Stephen McGinty