hash_dealer 1.3.3 → 1.3.4

data/.rspec

@@ -1 +1,3 @@
---color
+--color
+--format nested
+--backtrace

data/VERSION

@@ -1 +1 @@
-1.3.3
+1.3.4

data/hash_dealer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{hash_dealer}
-  s.version = "1.3.3"
+  s.version = "1.3.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dan Langevin"]
-  s.date = %q{2011-09-06}
+  s.date = %q{2011-09-08}
   s.description = %q{Like Factory Girl but for Hashes only}
   s.email = %q{dan.langevin@lifebooker.com}
   s.extra_rdoc_files = [

data/lib/core_extensions.rb

@@ -11,6 +11,13 @@ class TimeDateMatcher
     @instance = instance
   end
   def ==(other)
+    if other.is_a?(String)
+      begin
+        other = self.instance.class.parse(other)
+      rescue => e
+        return false
+      end
+    end
     self.instance.class == other.class
   end
   alias_method :eql?, :==

data/lib/path_string.rb

@@ -34,8 +34,10 @@ class PathString < String
   
   # helper method to be called recursively
   def self.sort_json(val)
-    val = val.is_a?(String) ? ActiveSupport::JSON.decode(val) : ActiveSupport::JSON.decode(ActiveSupport::JSON.encode(val))
-    val = val.collect{|v| v.collect{|n| n.is_a?(Hash) ? self.sort_json(n) : n}}
+    return val if val.is_a?(TimeDateMatcher)
+    val = ActiveSupport::JSON.decode(val) if val.is_a?(String)
+    val = self.stringify_keys(val) if val.is_a?(Hash)
+    val = val.collect{|v| v.collect{|n| n.is_a?(Hash) ? self.sort_json(n) : n}} if val.is_a?(Array)
     val.sort
   end
   
@@ -60,6 +62,15 @@ class PathString < String
   end
   
   private
+  
+  def self.stringify_keys(hash)
+    new_hash = {}
+    hash.each_pair do |k,v|
+      new_hash[k.to_s] = v.is_a?(Hash) ? self.stringify_keys(v) : v
+    end
+    new_hash
+  end
+  
   def self.get_zipped_array(known_path, entered_path)
     # make these strings
     known_path, entered_path = known_path.to_s, entered_path.to_s

data/spec/lib/hash_dealer_spec.rb

@@ -1,3 +1,4 @@
+require 'json'
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe HashDealer do
@@ -113,6 +114,17 @@ describe HashDealer do
       
     end
     
+    it "should match dates and times from JSON" do
+      HashDealer.define(:var) do
+        id("1")
+        created_at(Time.now)
+        updated_at(Time.now)
+      end
+      
+      JSON.unparse({:created_at => Time.now, :updated_at => Time.now, :id => 1}).should match_response(HashDealer.roll(:var).matcher)
+      
+    end
+    
     it "should not modify the element when returning a matcher" do
       HashDealer.define(:array) do
         my_array([1,2,3])

metadata

@@ -2,7 +2,7 @@
 name: hash_dealer
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.3.3
+  version: 1.3.4
 platform: ruby
 authors: 
 - Dan Langevin
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-06 00:00:00 Z
+date: 2011-09-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -141,7 +141,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -463454220033968617
+      hash: 284898895399616564
       segments: 
       - 0
       version: "0"