recursive-open-struct 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad6b86b4a8ed2c69543135a33097d06f13e92671
-  data.tar.gz: bb738b78cb40ff95bb7d257cda73a68b5dec6f7b
+  metadata.gz: 765e14c47a76030b5a36300eea04264d3a9daf19
+  data.tar.gz: 8370dfc8bde5246291aec3594f3d27ea0162194c
 SHA512:
-  metadata.gz: fd1efd0c19bc1e6418592d071b32fcf5df03a341b852f6e1c4a5a75f7cf120494135a518011348848718c960e96414e1db033a985e388dca1060790fd7f9e922
-  data.tar.gz: 8a2e0a8592dac362652a0e8adb369b4b611df7cdbab37c55dd8cae75bad1ca6cc1976f11fedfa4d751fa0ae099e0a44551368ae838e76cedb3591ab06585aae1
+  metadata.gz: 05fea524625e1b5cef5cae0ca8e6aa46e459802cc93be57984e8cc7586c797221fa65d57e02c95f1cf0e73f2745110ddfb2478b3153431f51b9113c62987fd7f
+  data.tar.gz: a2459d5a3655c0aa1508a7e3d52f6ff45a9ccbac695b404acb6f902e3fc343a8a85237ae897d8f9af4fea93b218d1f39aab98e55a7bc0ef0d434a50c319a7ce8

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+0.6.2 / 2015-04-07
+==================
+
+* FIX: fervic: Address a bug in the Ruby 1.9's version of OpenStruct's `dup`
+* FIX: Victor Guzman: Reset memoized values on assignment in order to force the
+  implementation to re-memoize them.
+* MAINT: fervic: Simplified `initialize`
+
 0.6.1 / 2015-03-28
 ==================
 

data/Gemfile

@@ -1,12 +1,2 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 gemspec
-
-gem 'pry'
-
-group :development do
-  if RUBY_VERSION =~ /^1\.8/
-    gem 'rcov'
-  else
-    gem 'simplecov'
-  end
-end

data/lib/recursive_open_struct.rb

@@ -7,35 +7,31 @@ require 'recursive_open_struct/deep_dup'
 class RecursiveOpenStruct < OpenStruct
   include DebugInspect
 
-  def initialize(hash=nil, args={})
+  def initialize(hash={}, args={})
     @recurse_over_arrays = args.fetch(:recurse_over_arrays, false)
-    mutate_input_hash = args.fetch(:mutate_input_hash, false)
+    @deep_dup = DeepDup.new(recurse_over_arrays: @recurse_over_arrays)
 
-    unless mutate_input_hash
-      hash = DeepDup.new(recurse_over_arrays: @recurse_over_arrays).call(hash)
-    end
-
-    super(hash)
-
-    if mutate_input_hash && hash
-      hash.clear
-      @table.each { |k,v| hash[k] = v }
-      @table = hash
-    end
+    @table = args.fetch(:mutate_input_hash, false) ? hash : @deep_dup.call(hash)
+    @table && @table.each_key { |k| new_ostruct_member(k.to_sym) }
 
     @sub_elements = {}
   end
 
   def initialize_copy(orig)
     super
+
+    # Apply fix if necessary:
+    #   https://github.com/ruby/ruby/commit/2d952c6d16ffe06a28bb1007e2cd1410c3db2d58
+    @table.each_key{|key| new_ostruct_member(key)} if RUBY_VERSION =~ /^1.9/ 
+
     # deep copy the table to separate the two objects
-    @table = DeepDup.new(recurse_over_arrays: @recurse_over_arrays).call(orig.instance_variable_get(:@table))
+    @table = @deep_dup.call(orig.instance_variable_get(:@table))
     # Forget any memoized sub-elements
     @sub_elements = {}
   end
 
   def to_h
-    DeepDup.new(recurse_over_arrays: @recurse_over_arrays).call(@table)
+    @deep_dup.call(@table)
   end
 
   alias_method :to_hash, :to_h
@@ -60,7 +56,10 @@ class RecursiveOpenStruct < OpenStruct
             v
           end
         end
-        define_method("#{name}=") { |x| modifiable[name] = x }
+        define_method("#{name}=") do |x|
+          @sub_elements.delete(name)
+          modifiable[name] = x
+        end
         define_method("#{name}_as_a_hash") { @table[name] }
       end
     end

data/lib/recursive_open_struct/version.rb

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

data/recursive-open-struct.gemspec

@@ -34,9 +34,11 @@ Gem::Specification.new do |s|
     "README.md"
   ]
 
+  s.add_development_dependency('bundler', [">= 0"])
+  s.add_development_dependency('pry', [">= 0"])
+  s.add_development_dependency('rake', [">= 0"])
+  s.add_development_dependency('rdoc', [">= 0"])
   s.add_development_dependency('rspec', "~> 3.2")
-  s.add_development_dependency(%q<bundler>, [">= 0"])
-  s.add_development_dependency(%q<rdoc>, [">= 0"])
-  s.add_development_dependency(%q<rake>, [">= 0"])
+  s.add_development_dependency('simplecov', [">= 0"])
 end
 

data/spec/recursive_open_struct_spec.rb

@@ -149,6 +149,40 @@ describe RecursiveOpenStruct do
       end
     end
 
+    context "when memoizing and then modifying entire recursive structures" do
+      subject do
+        RecursiveOpenStruct.new(
+          { :blah => original_blah }, :recurse_over_arrays => true)
+      end
+ 
+      before(:each) { subject.blah } # enforce memoization
+
+      context "when modifying an entire Hash" do
+        let(:original_blah) { { :a => 'A', :b => 'B' } }
+        let(:new_blah) { { :something_new => "C" } }
+
+        before(:each) { subject.blah = new_blah }
+
+        it "returns the modified value instead of the memoized one" do
+          subject.blah.something_new.should == "C"
+        end
+
+        specify "the old value no longer exists" do
+          subject.blah.a.should be_nil
+        end
+      end
+
+      context "when modifying an entire Array" do
+        let(:original_blah) { [1, 2, 3] }
+
+        it "returns the modified value instead of the memoized one" do
+          new_blah = [4, 5, 6]
+          subject.blah = new_blah
+          subject.blah.should == new_blah
+        end
+      end
+    end
+
     describe 'recursing over arrays' do
       let(:blah_list) { [ { :foo => '1' }, { :foo => '2' }, 'baz' ] }
       let(:h) { { :blah => blah_list } }

metadata

@@ -1,31 +1,45 @@
 --- !ruby/object:Gem::Specification
 name: recursive-open-struct
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - William (B.J.) Snow Orvis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-28 00:00:00.000000000 Z
+date: 2015-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  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:
     - - '>='
@@ -53,7 +67,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :development
+  prerelease: false
+  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:
     - - '>='