hash_dealer 1.2.3 → 1.2.4

data/VERSION

@@ -1 +1 @@
-1.2.3
+1.2.4

data/hash_dealer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{hash_dealer}
-  s.version = "1.2.3"
+  s.version = "1.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dan Langevin"]
-  s.date = %q{2011-08-23}
+  s.date = %q{2011-08-24}
   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

@@ -5,6 +5,17 @@ class Object
   end
 end
 
+class Numeric
+  def matcher(opts={})
+    PathString.new(":#{self}")
+  end
+  def ==(other)
+    return true if other.is_a?(PathString) && other =~ /^:/
+    super
+  end
+  alias_method :eql?, :==
+end
+
 # The only really important matcher
 class String
   def matcher(opts = {})
@@ -18,8 +29,8 @@ class Hash
     self.each_pair do |k,v|
       if v.is_a?(Array) || v.is_a?(Hash)
         v.pathify_strings!
-      elsif v.instance_of?(String)
-        self[k] = PathString.new(URI.decode(v))
+      elsif v.instance_of?(String) || v.is_a?(Numeric)
+        self[k] = PathString.new(URI.decode(v.to_s))
       end
     end
   end
@@ -45,8 +56,8 @@ class Array
     self.each_with_index do |v,k|
       if v.is_a?(Array) || v.is_a?(Hash)
         v.pathify_strings!
-      elsif v.instance_of?(String)
-        self[k] = PathString.new(URI.decode(v))
+      elsif v.instance_of?(String) || v.is_a?(Numeric)
+        self[k] = PathString.new(URI.decode(v.to_s))
       end
     end
   end

data/lib/path_string.rb

@@ -4,7 +4,7 @@ class PathString < String
   
   def == (other)
     # if either is a string that starts with a :, return true
-    if self =~ /^:/ || other =~ /^:/
+   if self =~ /^:/ || (other.is_a?(Numeric) && self =~ /^:\d+$/) || other =~ /^:/
       return true
     elsif self =~ /\/:/ || other =~ /\/:/
       return self.class.paths_match?(self, other)
@@ -12,6 +12,7 @@ class PathString < String
       super
     end
   end
+  alias_method :eql?, :==
   
   def self.paths_match?(a, b)
     self.get_zipped_array(a, b).each do |kp, ep|
@@ -26,11 +27,18 @@ class PathString < String
   end
   
   def self.as_sorted_json(val)
-    val = val.is_a?(String) ? ActiveSupport::JSON.decode(val).sort : ActiveSupport::JSON.decode(ActiveSupport::JSON.encode(val)).sort
+    val = self.sort_json(val)
     val.pathify_strings!
     val
   end
   
+  # helper method to be called recursively
+  def self.sort_json(val)
+    val = val.is_a?(String) ? ActiveSupport::JSON.decode(val).sort : ActiveSupport::JSON.decode(ActiveSupport::JSON.encode(val)).sort
+    val = val.collect{|v| v.collect{|n| n.is_a?(Hash) ? self.sort_json(n) : n}}
+    val
+  end
+  
   # 
   # 
   def self.extract_params(known_path, entered_path)

data/spec/lib/hash_dealer_spec.rb

@@ -94,6 +94,14 @@ describe HashDealer do
     HashDealer.roll(:parent).matcher(:only => [:b], :b => {:except => [:a]})[:b][:b].should eql(":child_b")
   end
   
+  it "should match on numeric values" do
+    HashDealer.define(:parent) do
+      a(1)
+    end
+    HashDealer.roll(:parent).matcher[:a].should eql 100
+    HashDealer.roll(:parent)[:a].should_not eql 100
+  end
+  
   it "should define a matcher for when the response is an Array" do
     HashDealer.define(:variable) do
       root([{

data/spec/lib/path_string_spec.rb

@@ -36,5 +36,4 @@ describe PathString do
   it "should match wildcard paths" do
     PathString.paths_match?("/a/1/test/2", "/a/:1/test/:2").should be_true
   end
-  
 end

metadata

@@ -2,7 +2,7 @@
 name: hash_dealer
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors: 
 - Dan Langevin
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-23 00:00:00 Z
+date: 2011-08-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -129,7 +129,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -4242599819582722325
+      hash: 101138682589520811
       segments: 
       - 0
       version: "0"