hash-proxy 0.1.4 → 0.1.5

data/Gemfile.lock

@@ -12,22 +12,23 @@ GEM
       bones (>= 3.6)
       rspec (>= 1.3)
     bones-yard (1.0.0)
+      bones (>= 3.5.0)
       yard (>= 0.5.8)
-    diff-lcs (1.1.3)
+    diff-lcs (1.2.1)
     git (1.2.5)
     little-plugger (1.1.3)
     loquacious (1.9.1)
-    rake (0.9.2.2)
-    redcarpet (2.1.1)
-    rspec (2.10.0)
-      rspec-core (~> 2.10.0)
-      rspec-expectations (~> 2.10.0)
-      rspec-mocks (~> 2.10.0)
-    rspec-core (2.10.1)
-    rspec-expectations (2.10.0)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.10.1)
-    yard (0.8.2)
+    rake (10.0.3)
+    redcarpet (2.2.2)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.0)
+    yard (0.8.5.2)
 
 PLATFORMS
   ruby

data/History.txt

@@ -1,3 +1,6 @@
+# == Version 0.1.5 / 2013-03-12
+# * Support #to_json
+#
 # == Version 0.1.4 / 2012-11-07
 # * Support serialization
 #

data/README.md

@@ -53,6 +53,8 @@ instead of the method call notation:
 Requirements
 ------------
 
+* Probably does not work on ruby 1.8.x due to dependency on 
+  json module from the 1.9.x standard library
 * No runtime dependencies
 * To build and test, run bundle install after cloning from github
 
@@ -81,6 +83,12 @@ Original author: Douglas A. Seifert (doug@dseifert.net)
 History
 -------
 
+### Version 0.1.5 / 2013-03-12
+* Support #to_json
+
+### Version 0.1.4 / 2012-11-07
+* Support serialization
+
 ### Version 0.1.3 / 2012-08-13
 * Support to_ary method on NullObject
 

data/lib/hash_proxy/proxy.rb

@@ -26,12 +26,7 @@ module HashProxy
     # Create a hashProxy::Proxy object from the provided Hash.
     #
     # @param [Hash] hash The hash we are proxying
-    # @option options [Boolean] :lazy (true) If true, values in the hash are converted
-    #     to hash proxies only when requested via
-    #     a method call.  If false, all nested Hash
-    #     and Array objects are converted to Proxy
-    #     objects at creation time
-    def initialize(hash, options = {})
+    def initialize(hash)
       @hash = hash
       @converted = {}
     end
@@ -43,6 +38,16 @@ module HashProxy
       @hash.size + @converted.size
     end
 
+    # Get all keys in this hash proxy
+    def keys
+      (@hash.keys + @converted.keys)
+    end
+
+    # Get all keys in this hash proxy
+    def values
+      (@hash.values + @converted.values)
+    end
+
     # Yields to the provided block all the values in this Hash proxy.  All values
     # are converted via #convert_value as they are yielded.  The order in which
     # values are yielded is not deterministic.  Insertion order in the original 
@@ -85,6 +90,11 @@ module HashProxy
       @converted[key] = convert_value(value)
     end
 
+    # Handle conversion to json
+    def to_json(options = nil)
+      @hash.merge(@converted).to_json(options)
+    end
+
     # Turns arbitrary method invocations into
     # lookups or sets on the contained hash
     def method_missing(name, *args)

data/spec/hash_proxy_spec.rb

@@ -2,6 +2,14 @@
 require File.expand_path('../spec_helper', __FILE__)
 
 describe HashProxy do
+  it "can be serialized and deserialized" do
+    proxy = HashProxy.create_from(:size => 42, :bar => :foo)
+    data = Marshal.dump(proxy)
+    proxy2 = Marshal.load(data)
+    proxy.keys.should eq(proxy2.keys)
+    proxy.values.should eq(proxy2.values)
+  end
+
   it "works with null values" do
     proxy = HashProxy.create_from(:null => nil)
     proxy.size.should eq(1)
@@ -129,6 +137,35 @@ describe HashProxy do
     proxy.key.does.not.exist.to_a.should eq([])
   end
 
+  describe "json conversion" do
+    require 'json'
+    it "should work when no keys are converted" do
+      hash = {foo: 'bar', baz: {subkey: 'sub1', subkey2: 'sub2'}}
+      proxy = HashProxy.create_from hash
+      proxy.to_json.should eq(hash.to_json)
+    end
+    it "should work when normal value has been converted" do
+      orig = {foo: 'bar', baz: {subkey: 'sub1', subkey2: 'sub2'}}
+      hash = Marshal.load(Marshal.dump(orig))
+      proxy = HashProxy.create_from hash
+      proxy.foo.should eq('bar')
+      # Need to parse back to ruby arrays so we can use the ruby == operator
+      # to compare
+      JSON.parse(proxy.to_json).should eq(JSON.parse(orig.to_json))
+    end
+    it "should work when nested value has been converted" do
+      orig = {foo: 'bar', baz: {subkey: 'sub1', subkey2: 'sub2'}}
+      hash = Marshal.load(Marshal.dump(orig))
+      proxy = HashProxy.create_from hash
+      proxy.baz.each do |key, val|
+        orig[:baz][key].should eq(val)
+      end
+      # Need to parse back to ruby arrays so we can use the ruby == operator
+      # to compare
+      JSON.parse(proxy.to_json).should eq(JSON.parse(orig.to_json))
+    end
+  end
+
   # TODO: Am I itching badly enough to make this pass? ....
   #it "should lazily handle nested arrays" do
   #  hash = {:foo => [{:key1 => 'val11', :key2 => 'val12'}, {:key1 => 'val21', :key2 => 'val22'}], :bar => :baz}

data/version.txt

@@ -1 +1 @@
-0.1.4
+0.1.5

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hash-proxy
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-07 00:00:00.000000000 Z
+date: 2013-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bones
@@ -82,7 +82,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 2.2.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 2.2.2
 - !ruby/object:Gem::Dependency
   name: bones
   requirement: !ruby/object:Gem::Requirement
@@ -113,8 +113,7 @@ description: ! 'An object that proxies method calls to a Hash object as hash key
 email: doug@dseifert.net
 executables: []
 extensions: []
-extra_rdoc_files:
-- History.txt
+extra_rdoc_files: []
 files:
 - .bnsignore
 - .gitignore
@@ -133,9 +132,7 @@ files:
 homepage: https://github.com/seifertd/hash-proxy
 licenses: []
 post_install_message: 
-rdoc_options:
-- --main
-- README.md
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -144,6 +141,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4040495455569849470
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: