recursive-open-struct 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4474b5a862c6ea4da4f2c930664880ca70a01f75c077a2e9952fd80ed2d26da
-  data.tar.gz: dcea4c80ebe98a5f91f9ea40b2b7e82cc219b259eae83b62a00329f8075cc85a
+  metadata.gz: 3cc972f20fd1aba4f8eea6fe1766c17c7d9e663a3ed999e8375549ac37ae4b08
+  data.tar.gz: 9c0d0230d431aedeae47f0f2026d77196dfb230c3ebe9359763b4265c9a4c4d6
 SHA512:
-  metadata.gz: e8698402e67013a209a3434235e26201550c2249db8ae82480ec2208bdd0c83fb6524be046ecb4af3ed8cfe09adebd513a383d56b8b40d91f2c973fcd1f18196
-  data.tar.gz: a15827f31947ca85607086b9cda61ab18b4421bb310dd3034ca4dd39ef43ecf5215d599103cb897152924d6faa1ae94e0bc800cf197c5e96ab50fc794c547a2c
+  metadata.gz: dcdc725048e24182c562551875b2fa90d100248008af5dd4a974bb8df82f48ec5f618b3d76458d16f868b76b55263e96d3576a6d92f5ace69979beb29ae3213f
+  data.tar.gz: d67c50798fcaa7ca49003a924e57df0a22e83a5d688ef6ff90b61f462855f2b6ef8882e5873c0994558416030a9b265fe60cccfe586fd5bf9688e463d92279fe

data/.travis.yml

@@ -1,22 +1,22 @@
 ---
 language: ruby
 rvm:
-  # No longer supported
-  # - 1.9.3  # json gem now requires Ruby ~> 2.0
+  # No longer supported (but test anyways)
   - 2.0.0
   - 2.1.10
   - 2.2.10
   - jruby-19mode
-  # Current stable supported by Travis
   - 2.3.8
-  - 2.4.9
-  - 2.5.7
-  - 2.6.5
-  - 2.7.0
+  - 2.4.10
+  # Current stable supported by Travis
+  - 2.5.8
+  - 2.6.6
+  - 2.7.1
   - jruby-9.1.9.0
   # Future
   - ruby-head
   - jruby-head
+  - truffleruby-head
 sudo: false
 matrix:
   allow_failures:
@@ -25,7 +25,9 @@ matrix:
     - rvm: 2.1.10
     - rvm: 2.2.10
     - rvm: 2.3.8
+    - rvm: 2.4.10
     - rvm: jruby-19mode
     # Future
     - rvm: ruby-head
     - rvm: jruby-head
+    - rvm: truffleruby-head

data/AUTHORS.txt

@@ -8,6 +8,8 @@ Recursive-open-struct was written by these fine people:
 * Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
 * Federico Aloi <federico.aloi@gmail.com>
 * fervic <roberto@runawaybit.com>
+* Igor Victor <gogainda@yandex.ru>
+* Jean Boussier <jean.boussier@gmail.com>
 * Joe Rafaniello <jrafanie@redhat.com>
 * Kris Dekeyser <kris.dekeyser@libis.be>
 * Matt Culpepper <matt@culpepper.co>

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+1.1.3 / 2020/10/15
+==================
+
+* No longer officially supporting Ruby 2.4.x, but compatiblity continues.
+* [#68](https://github.com/aetherknight/recursive-open-struct/pull/68): Igor
+  Victor: Add truffleruby-head to travis
+* FIX [#67](https://github.com/aetherknight/recursive-open-struct/pull/67):
+  Jean Boussier: Support upstream changes to OpenStruct in ruby-head (Ruby
+  3.0.0-dev)
+
 1.1.2 / 2020/06/20
 ==================
 

data/lib/recursive_open_struct.rb

@@ -39,13 +39,16 @@ class RecursiveOpenStruct < OpenStruct
     @sub_elements = {}
   end
 
-  def initialize_copy(orig)
-    super
 
-    # deep copy the table to separate the two objects
-    @table = @deep_dup.call(orig.instance_variable_get(:@table))
-    # Forget any memoized sub-elements
-    @sub_elements = {}
+  if OpenStruct.public_instance_methods.include?(:initialize_copy)
+    def initialize_copy(orig)
+      super
+
+      # deep copy the table to separate the two objects
+      @table = @deep_dup.call(@table)
+      # Forget any memoized sub-elements
+      @sub_elements = {}
+    end
   end
 
   def to_h
@@ -56,6 +59,19 @@ class RecursiveOpenStruct < OpenStruct
   # itself to be a "kind of" Hash.
   alias_method :to_hash, :to_h
 
+  # Continue supporting older rubies -- JRuby 9.1.x.x is still considered
+  # stable, but is based on Ruby
+  # 2.3.x and so uses :modifiable instead of :modifiable?. Furthermore, if
+  # :modifiable is private, then make :modifiable? private too.
+  if !OpenStruct.private_instance_methods.include?(:modifiable?)
+    if OpenStruct.private_instance_methods.include?(:modifiable)
+      alias_method :modifiable?, :modifiable
+    elsif OpenStruct.public_instance_methods.include?(:modifiable)
+      alias_method :modifiable?, :modifiable
+      private :modifiable?
+    end
+  end
+
   def [](name)
     key_name = _get_key_from_table_(name)
     v = @table[key_name]
@@ -69,11 +85,19 @@ class RecursiveOpenStruct < OpenStruct
     end
   end
 
-  def []=(name, value)
-    key_name = _get_key_from_table_(name)
-    tbl = modifiable?  # Ensure we are modifiable
-    @sub_elements.delete(key_name)
-    tbl[key_name] = value
+  if private_instance_methods.include?(:modifiable?) || public_instance_methods.include?(:modifiable?)
+    def []=(name, value)
+      key_name = _get_key_from_table_(name)
+      tbl = modifiable?  # Ensure we are modifiable
+      @sub_elements.delete(key_name)
+      tbl[key_name] = value
+    end
+  else
+    def []=(name, value)
+      key_name = _get_key_from_table_(name)
+      @table[key_name] = value # raises if self is frozen in Ruby 3.0
+      @sub_elements.delete(key_name)
+    end
   end
 
   # Makes sure ROS responds as expected on #respond_to? and #method requests
@@ -82,17 +106,6 @@ class RecursiveOpenStruct < OpenStruct
     @table.key?(mname) || super
   end
 
-  # Continue supporting older rubies -- JRuby 9.1.x.x is still considered
-  # stable, but is based on Ruby
-  # 2.3.x and so uses :modifiable instead of :modifiable?. Furthermore, if
-  # :modifiable is private, then make :modifiable? private too.
-  if !OpenStruct.private_instance_methods.include?(:modifiable?)
-    alias_method :modifiable?, :modifiable
-    if OpenStruct.private_instance_methods.include?(:modifiable)
-      private :modifiable?
-    end
-  end
-
   # Adapted implementation of method_missing to accommodate the differences
   # between ROS and OS.
   def method_missing(mid, *args)
@@ -155,6 +168,16 @@ class RecursiveOpenStruct < OpenStruct
 
   private
 
+  unless OpenStruct.public_instance_methods.include?(:initialize_copy)
+    def initialize_dup(orig)
+      super
+      # deep copy the table to separate the two objects
+      @table = @deep_dup.call(@table)
+      # Forget any memoized sub-elements
+      @sub_elements = {}
+    end
+  end
+
   def _get_key_from_table_(name)
     return name.to_s if @table.has_key?(name.to_s)
     return name.to_sym if @table.has_key?(name.to_sym)

data/lib/recursive_open_struct/version.rb

@@ -3,5 +3,5 @@
 require 'ostruct'
 
 class RecursiveOpenStruct < OpenStruct
-  VERSION = "1.1.2"
+  VERSION = "1.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: recursive-open-struct
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - William (B.J.) Snow Orvis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-21 00:00:00.000000000 Z
+date: 2020-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler