recursive-open-struct 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12d07e25ed0f3cedb3b40ede9f61407ea53a9927
-  data.tar.gz: a485cfb540bfb5bd8c91c423e51d54178667c43d
+  metadata.gz: 1a818135247a6ccee4084c02a5504a41213ed7ef
+  data.tar.gz: 83e7f427a585d6b32f0d041d0b237e37f16fc7d1
 SHA512:
-  metadata.gz: 6e15e67bbc323ae60734aebe7a5f124c35ff96b22589ec295c8a6e374390ba9b869e9e34f0f1b04c5079853b950e77f0cdbb5b55933ce908f8bf66b012c23a65
-  data.tar.gz: 2d1466d7c584cf5d969ab5ae49ba5c79f17ef85fd86001e56ecac64e0317c92449c87b89dfc6d20ac4b7c372a6bc0eb560b8d3b44e942ba02d0810fc3f660fe8
+  metadata.gz: 786b9589759c155996647a4a5cf35ae3d3bb28515c9d6cc9555ca152c4ff34578abb8b6e3357b5711340f22702e482517ad8d60d5fd53c0f418f99caa95d819a
+  data.tar.gz: e76b6ab3dc483c8eecbcc40cfae8f66da581533d45826d7e215baaf763f6f6176bb040502c96f2858c4492ca93784d1de302ed78eb9417abf3efb357129970dc

data/.travis.yml

@@ -1,13 +1,24 @@
 ---
 language: ruby
 rvm:
+  # - 1.9.3  # json gem now requires Ruby ~> 2.0
   - 2.0.0
   - 2.1.10
-  - 2.2.5
-  - 2.3.1
-  - 2.4.0
+  - 2.2.7
+  - 2.3.4
+  - 2.4.1
   - ruby-head
   - jruby-19mode
   - jruby-9.0.5.0
+  - jruby-9.1.5.0
   - jruby-head
 sudo: false
+matrix:
+  allow_failures:
+    # No longer supported
+    - rvm: 2.0.0
+    - rvm: 2.1.10
+    - rvm: jruby-19mode
+    # Future
+    - rvm: ruby-head
+    - rvm: jruby-head

data/CHANGELOG.md

@@ -1,3 +1,21 @@
+1.0.3 / 2017-04-10
+==================
+
+* No longer officially supporting Ruby 2.0.0 and Ruby 2.1.x. They are still
+  tested against but are permitted to fail within the Travis configuration.
+* FIX: Fix subscript notation for keys that collide with existing public
+  methods. Related to
+  [#51](https://github.com/aetherknight/recursive-open-struct/issues/51).
+* FIX [#49](https://github.com/aetherknight/recursive-open-struct/issues/49):
+  Ensure test suite passes with Ruby 2.4.0-rc1.
+
+1.0.2 / 2016-12-20
+==================
+
+* FIX [#46](https://github.com/aetherknight/recursive-open-struct/issues/46):
+  Pedro Sena: fix issues with mutating arrays within an ROS that has
+  `recurse_over_arrays: true`
+
 1.0.1 / 2016-01-18
 ==================
 

data/lib/recursive_open_struct.rb

@@ -5,6 +5,10 @@ require 'recursive_open_struct/debug_inspect'
 require 'recursive_open_struct/deep_dup'
 require 'recursive_open_struct/ruby_19_backport'
 
+# TODO: When we care less about Rubies before 2.4.0, match OpenStruct's method
+# names instead of doing things like aliasing `new_ostruct_member` to
+# `new_ostruct_member!`
+
 class RecursiveOpenStruct < OpenStruct
   include Ruby19Backport if RUBY_VERSION =~ /\A1.9/
   include DebugInspect
@@ -39,7 +43,21 @@ class RecursiveOpenStruct < OpenStruct
   alias_method :to_hash, :to_h
 
   def [](name)
-    public_send(name)
+    key_name = _get_key_from_table_(name)
+    v = @table[key_name]
+    if v.is_a?(Hash)
+      @sub_elements[key_name] ||= self.class.new(
+        v,
+        recurse_over_arrays: @recurse_over_arrays,
+        preserve_original_keys: @preserve_original_keys,
+        mutate_input_hash: true
+      )
+    elsif v.is_a?(Array) and @recurse_over_arrays
+      @sub_elements[key_name] ||= recurse_over_array(v)
+      @sub_elements[key_name] = recurse_over_array(@sub_elements[key_name])
+    else
+      v
+    end
   end
 
   # Makes sure ROS responds as expected on #respond_to? and #method requests
@@ -49,18 +67,21 @@ class RecursiveOpenStruct < OpenStruct
   end
 
   # Adapted implementation of method_missing to accomodate the differences between ROS and OS.
+  #
+  # TODO: Use modifiable? instead of modifiable, and new_ostruct_member!
+  # instead of new_ostruct_member once we care less about Rubies before 2.4.0.
   def method_missing(mid, *args)
     len = args.length
     if mid =~ /^(.*)=$/
       if len != 1
         raise ArgumentError, "wrong number of arguments (#{len} for 1)", caller(1)
       end
-      modifiable[new_ostruct_member($1.to_sym)] = args[0]
+      modifiable[new_ostruct_member!($1.to_sym)] = args[0]
     elsif len == 0
       key = mid
       key = $1 if key =~ /^(.*)_as_a_hash$/
       if @table.key?(_get_key_from_table_(key))
-        new_ostruct_member(key)
+        new_ostruct_member!(key)
         send(mid)
       end
     else
@@ -70,25 +91,14 @@ class RecursiveOpenStruct < OpenStruct
     end
   end
 
+  # TODO: Rename to new_ostruct_member! once we care less about Rubies before
+  # 2.4.0.
   def new_ostruct_member(name)
-    key_name = _get_key_from_table_ name
+    key_name = _get_key_from_table_(name)
     unless self.methods.include?(name.to_sym)
       class << self; self; end.class_eval do
         define_method(name) do
-          v = @table[key_name]
-          if v.is_a?(Hash)
-            @sub_elements[key_name] ||= self.class.new(
-              v,
-              recurse_over_arrays: @recurse_over_arrays,
-              preserve_original_keys: @preserve_original_keys,
-              mutate_input_hash: true
-            )
-          elsif v.is_a?(Array) and @recurse_over_arrays
-            @sub_elements[key_name] ||= recurse_over_array(v)
-            @sub_elements[key_name] = recurse_over_array(@sub_elements[key_name])
-          else
-            v
-          end
+          self[key_name]
         end
         define_method("#{name}=") do |x|
           @sub_elements.delete(key_name)
@@ -100,6 +110,15 @@ class RecursiveOpenStruct < OpenStruct
     key_name
   end
 
+  # Support Ruby 2.4.0+'s changes in a way that doesn't require dynamically
+  # modifying ROS.
+  #
+  # TODO: Once we care less about Rubies before 2.4.0, reverse this sot hat
+  # new_ostruct_member points to our version and not OpenStruct's.
+  alias new_ostruct_member! new_ostruct_member
+  # new_ostruct_member! is private, but new_ostruct_member is not on OpenStruct in 2.4.0-rc1?!
+  private :new_ostruct_member!
+
   def delete_field(name)
     sym = _get_key_from_table_(name)
     singleton_class.__send__(:remove_method, sym, "#{sym}=") rescue NoMethodError # ignore if methods not yet generated.
@@ -118,7 +137,7 @@ class RecursiveOpenStruct < OpenStruct
   def recurse_over_array(array)
     array.each_with_index do |a, i|
       if a.is_a? Hash
-        array[i] = self.class.new(a, :recurse_over_arrays => true, 
+        array[i] = self.class.new(a, :recurse_over_arrays => true,
           :mutate_input_hash => true, :preserve_original_keys => @preserve_original_keys)
       elsif a.is_a? Array
         array[i] = recurse_over_array a

data/lib/recursive_open_struct/version.rb

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

data/spec/recursive_open_struct/open_struct_behavior_spec.rb

@@ -63,6 +63,26 @@ describe RecursiveOpenStruct do
           expect(ros.test).to eq :foo
           expect(ros.rand).to eq 'not a number'
         end
+
+      end
+
+      context 'that contains keys that mirror existing public methods inherited from Object' do
+        let(:hash) { { method: :something } }
+        it 'handles subscript notation without calling the existing methods' do
+          expect(ros[:method]).to eq :something
+          expect(ros['method']).to eq :something
+        end
+      end
+
+      if [/\A([0-9]+)\.([0-9]+)\.([0-9]+)\z/.match(RUBY_VERSION)].tap { |l| m = l[0] ; l[0] = (m[1].to_i >= 2 && m[2].to_i >= 4) }.first
+        context 'when Ruby 2.4.0 or newer' do
+          specify 'new_ostruct_member! is private' do
+            expect {
+              ros.new_ostruct_member!(:bonsoir)
+            }.to raise_error(NoMethodError)
+              # OpenStruct.new().new_ostruct_member!(:foo)
+          end
+        end
       end
 
     end

metadata

@@ -1,94 +1,94 @@
 --- !ruby/object:Gem::Specification
 name: recursive-open-struct
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - William (B.J.) Snow Orvis
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-12-19 00:00:00.000000000 Z
+date: 2017-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  name: bundler
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  name: pry
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  name: rake
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  name: rdoc
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
-  type: :development
+  name: rspec
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
-  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  name: simplecov
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -141,7 +141,7 @@ homepage: http://github.com/aetherknight/recursive-open-struct
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -156,9 +156,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.6.6
+signing_key:
 specification_version: 4
 summary: OpenStruct subclass that returns nested hash attributes as RecursiveOpenStructs
 test_files: