ns-options 1.1.0 → 1.1.1

data/lib/ns-options/namespace_data.rb

@@ -47,7 +47,11 @@ module NsOptions
     # for the option/namespace name-keys
     def to_hash
       Hash.new.tap do |hash|
-        @child_options.each{|name, opt| hash[name.to_sym] = opt.value}
+        @child_options.each do |name, opt|
+          # this is meant to be a "value exporter", so always use distinct values
+          # on the returned hash to prevent unintentional pass-by-ref shared objects
+          hash[name.to_sym] = NsOptions.distinct_value(opt.value)
+        end
         @child_namespaces.each{|name, value| hash[name.to_sym] = value.to_hash}
       end
     end
@@ -60,8 +64,10 @@ module NsOptions
           # recursively apply namespace values if hash given; ignore otherwise.
           get_namespace(name).apply(value) if value.kind_of?(Hash)
         else
+          # this is meant as a "value importer", so always apply distinct values
+          # to prevent unintentional pass-by-ref shared objects.
           # be sure to use the namespace's writer to write the option value
-          @ns.send("#{name}=", value)
+          @ns.send("#{name}=", NsOptions.distinct_value(value))
         end
       end
     end

data/lib/ns-options/option.rb

@@ -52,12 +52,7 @@ module NsOptions
     end
 
     def reset
-      default_value = begin
-        self.rules[:default].clone
-      rescue TypeError
-        self.rules[:default]
-      end
-      save_value(default_value)
+      save_value NsOptions.distinct_value(self.rules[:default])
     end
 
     def is_set?

data/lib/ns-options/version.rb

@@ -1,3 +1,3 @@
 module NsOptions
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/lib/ns-options.rb

@@ -8,6 +8,14 @@ module NsOptions
     receiver.class_eval { extend NsOptions::DSL }
   end
 
+  def self.distinct_value(value)
+    begin
+      value.clone
+    rescue TypeError
+      value
+    end
+  end
+
   module DSL
 
     # This is the main DSL method for creating a namespace of options for your

data/test/unit/namespace_data_tests.rb

@@ -127,22 +127,6 @@ class NsOptions::NamespaceData
       assert_not subject.has_namespace? 'dlakjsglasdjgaklsdgjas'
     end
 
-    should "return its Hash representation" do
-      exp_hash = {
-        :first => nil, :second => nil, :third => nil,
-        :child_a => {
-          :fourth => nil, :fifth => nil,
-          :child_b => { :sixth => nil }
-        }
-      }
-      assert_equal(exp_hash, subject.to_hash)
-    end
-
-    should "apply a given hash value to itself" do
-      subject.apply(@named_values)
-      assert_equal @named_values, subject.to_hash
-    end
-
   end
 
   class EachTests < HandlingTests
@@ -213,7 +197,7 @@ class NsOptions::NamespaceData
 
   end
 
-  class ApplyTests < BaseTests
+  class HashHandlingTests < BaseTests
     setup do
       @data.define do
         option :first; option :second; option :third
@@ -223,21 +207,61 @@ class NsOptions::NamespaceData
         end
       end
 
+      @shared_array = []
       @named_values = {
         :first => "1", :second => "2", :third => "3", :twenty_one => "21",
         :child_a => {
           :fourth => "4", :fifth => "5",
           :child_b => { :sixth => "6" }
         },
-        :child_c => { :what => "?" }
+        :child_c => { :what => "?" },
+        :shared => @shared_array
       }
     end
 
+  end
+
+  class ToHashTests < HashHandlingTests
+
+    should "return its Hash representation" do
+      exp_hash = {
+        :first => nil, :second => nil, :third => nil,
+        :child_a => {
+          :fourth => nil, :fifth => nil,
+          :child_b => { :sixth => nil }
+        }
+      }
+      assert_equal(exp_hash, subject.to_hash)
+    end
+
+    should "use distinct values in its Hash representation" do
+      subject.add_option(:shared)
+      subject.set_option(:shared, [])
+      hash_rep = subject.to_hash
+      subject.get_option(:shared) << 1
+
+      assert_not_empty subject.get_option(:shared)
+      assert_empty     hash_rep[:shared]
+      assert_not_equal subject.get_option(:shared).object_id, hash_rep[:shared].object_id
+    end
+
+  end
+
+  class ApplyTests < HashHandlingTests
+
     should "apply a given hash value to itself" do
       subject.apply(@named_values)
       assert_equal @named_values, subject.to_hash
     end
 
+    should "use distinct values when applying hashes" do
+      subject.apply(@named_values)
+      @shared_array << 1
+
+      assert_empty subject.get_option(:shared)
+      assert_not_equal @shared_array.object_id, subject.get_option(:shared).object_id
+    end
+
     should "ignore applying non-hash values to namespaces" do
       assert_nil subject.ns.child_a.fourth
       prev_child_b = subject.ns.child_a.child_b.dup

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ns-options
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 1
   - 1
-  - 0
-  version: 1.1.0
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - Collin Redding
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-10 00:00:00 Z
+date: 2012-12-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: assert