document_hash 0.0.3 → 0.0.4

data/lib/document_hash/version.rb

@@ -1,3 +1,3 @@
 module DocumentHash
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/document_hash.rb

@@ -1,3 +1,4 @@
+require "set"
 require "document_hash/version"
 
 module DocumentHash
@@ -45,6 +46,16 @@ module DocumentHash
       values.select{|v| v.is_a? self.class }.each{ |v| v.reset! }
     end
 
+    def merge other
+      self.class.symbolize_keys other
+      super other
+    end
+
+    def merge! other
+      self.class.symbolize_keys other
+      super other
+    end
+
     private 
 
     attr_accessor :parent, :parent_key
@@ -54,7 +65,7 @@ module DocumentHash
     end
 
     def changed_attributes 
-      @changed ||= Set.new
+      @changed ||= ::Set.new
     end
 
     def self.symbolize_keys hash

data/spec/lib/document_spec.rb

@@ -65,7 +65,6 @@ describe DocumentHash::Core do
 
   it "converts inner hashes into DocumentHashes" do
     subject = DocumentHash::Core[ { test: { inner: "test" } } ]
-
     subject[:test].should be_a_kind_of DocumentHash::Core
   end
 
@@ -73,4 +72,14 @@ describe DocumentHash::Core do
     subject = DocumentHash::Core[ { "test" => "value" } ]
     subject.keys.should include :test
   end
+
+  it "merges new values converting the keys to symbols" do
+    subject = DocumentHash::Core.new
+
+    subject.merge! "test1" => "value"
+    subject.keys.should include :test1
+
+    subject = subject.merge "test2" => "value2"
+    subject.keys.should include :test2
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: document_hash
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-27 00:00:00.000000000 Z
+date: 2013-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -42,14 +42,8 @@ files:
 - README.md
 - Rakefile
 - document_hash.gemspec
-- lib/.document.rb.swo
-- lib/.document.rb.swp
 - lib/document_hash.rb
-- lib/document_hash/.version.rb.swp
 - lib/document_hash/version.rb
-- spec/.spec_helper.rb.swp
-- spec/lib/.document_spec.rb.swo
-- spec/lib/.document_spec.rb.swp
 - spec/lib/document_spec.rb
 - spec/spec_helper.rb
 homepage: ''
@@ -77,8 +71,5 @@ signing_key:
 specification_version: 3
 summary: Document Object
 test_files:
-- spec/.spec_helper.rb.swp
-- spec/lib/.document_spec.rb.swo
-- spec/lib/.document_spec.rb.swp
 - spec/lib/document_spec.rb
 - spec/spec_helper.rb