hash_dealer 1.4.4 → 1.4.5

data/Gemfile

@@ -5,6 +5,7 @@ source "http://rubygems.org"
 
 gem "activesupport", :require => "active_support"
 gem "i18n"
+gem "colorize"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/VERSION

@@ -1 +1 @@
-1.4.4
+1.4.5

data/hash_dealer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "hash_dealer"
-  s.version = "1.4.4"
+  s.version = "1.4.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dan Langevin"]
-  s.date = "2011-10-05"
+  s.date = "2011-11-22"
   s.description = "Like Factory Girl but for Hashes only"
   s.email = "dan.langevin@lifebooker.com"
   s.extra_rdoc_files = [
@@ -40,7 +40,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/LifebookerInc/hash_dealer"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "1.8.11"
   s.summary = "Hash Factory - like Factory Girl but for Hashes only"
 
   if s.respond_to? :specification_version then
@@ -49,6 +49,7 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activesupport>, [">= 0"])
       s.add_runtime_dependency(%q<i18n>, [">= 0"])
+      s.add_runtime_dependency(%q<colorize>, [">= 0"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
@@ -59,6 +60,7 @@ Gem::Specification.new do |s|
     else
       s.add_dependency(%q<activesupport>, [">= 0"])
       s.add_dependency(%q<i18n>, [">= 0"])
+      s.add_dependency(%q<colorize>, [">= 0"])
       s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
@@ -70,6 +72,7 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<activesupport>, [">= 0"])
     s.add_dependency(%q<i18n>, [">= 0"])
+    s.add_dependency(%q<colorize>, [">= 0"])
     s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])

data/lib/core_extensions.rb

@@ -11,6 +11,9 @@ class TimeDateMatcher
     @instance = instance
   end
   def ==(other)
+    # allow nils to match
+    return true if other.nil?
+    # attempt to parse any strings
     if other.is_a?(String)
       begin
         other = self.instance.class.parse(other)

data/spec/lib/hash_dealer_spec.rb

@@ -83,48 +83,58 @@ describe HashDealer do
       HashDealer.roll(:variable).matcher(:only => [:b])[:b].should eql(":test_b")
     end
     
-    it "should create a wrapper for times and dates" do
-      HashDealer.define(:variable) do
-        time_test(Time.now)
-        date_test(Date.today)
+    context "Dates and Times" do
+      before(:all) do
+        HashDealer.define(:variable) do
+          time_test(Time.now)
+          date_test(Date.today)
+        end
+        HashDealer.define(:var) do
+          id("1")
+          created_at(Time.now)
+          updated_at(Time.now)
+        end
       end
-      
-      time_test = HashDealer.roll(:variable).matcher[:time_test]
-      date_test =  HashDealer.roll(:variable).matcher[:date_test]
-      
-      time_test.should be_instance_of TimeDateMatcher
-      date_test.should be_instance_of TimeDateMatcher
-      
-      time_test.should eql (Time.now - 1000)
-      time_test.should_not eql (Date.today)
-      date_test.should eql (Date.today)
-      date_test.should_not eql (Time.now)
-      
-      # check the reverse too
-      (Time.now - 1000).should eql(time_test)
-      (Time.now - 1000).should == time_test
-      (Date.today).should_not eql(time_test)
-      (Date.today).should_not == time_test
-      
-      # regular behavior should be unaffected
-      t = Time.now
-      t.should eql t.clone
-      t.should == t.clone
-      
-      
-    end
-    
-    it "should match dates and times from JSON" do
-      HashDealer.define(:var) do
-        id("1")
-        created_at(Time.now)
-        updated_at(Time.now)
+      it "should create a wrapper for times and dates" do
+
+
+        time_test = HashDealer.roll(:variable).matcher[:time_test]
+        date_test =  HashDealer.roll(:variable).matcher[:date_test]
+
+        time_test.should be_instance_of TimeDateMatcher
+        date_test.should be_instance_of TimeDateMatcher
+
+        time_test.should eql (Time.now - 1000)
+        time_test.should_not eql (Date.today)
+        date_test.should eql (Date.today)
+        date_test.should_not eql (Time.now)
+
+        # check the reverse too
+        (Time.now - 1000).should eql(time_test)
+        (Time.now - 1000).should == time_test
+        (Date.today).should_not eql(time_test)
+        (Date.today).should_not == time_test
+
+        # regular behavior should be unaffected
+        t = Time.now
+        t.should eql t.clone
+        t.should == t.clone
+
+
+      end
+
+      it "should match dates and times from JSON" do
+        ActiveSupport::JSON.encode({:created_at => Time.now, :updated_at => Time.now, :id => 1}).should match_response(HashDealer.roll(:var).matcher)
+      end
+
+      it "should allow dates and times to be null" do
+        ActiveSupport::JSON.encode({:created_at => nil, :updated_at => nil, :id => 1}).should match_response(HashDealer.roll(:var).matcher)
       end
-      
-      ActiveSupport::JSON.encode({: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])

data/spec/lib/matcher_spec.rb

@@ -52,6 +52,4 @@ describe "match_response Matcher" do
     {"a" => true}.matcher.should match_response({"a" => false})
     {"a" => {"b" => false}}.matcher.should match_response({"a" => {"b" => false}})
   end
-  
-  
 end

metadata

@@ -2,7 +2,7 @@
 name: hash_dealer
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.4.4
+  version: 1.4.5
 platform: ruby
 authors: 
 - Dan Langevin
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-05 00:00:00 Z
+date: 2011-11-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -35,18 +35,18 @@ dependencies:
   prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: bundler
+  name: colorize
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: jeweler
+  name: bundler
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -57,7 +57,7 @@ dependencies:
   prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: jeweler
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -68,7 +68,7 @@ dependencies:
   prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: rcov
+  name: rspec
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -79,8 +79,19 @@ dependencies:
   prerelease: false
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: guard-rspec
+  name: rcov
   requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: guard-rspec
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -88,10 +99,10 @@ dependencies:
         version: 0.4.0
   type: :development
   prerelease: false
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: ruby-debug19
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -99,10 +110,10 @@ dependencies:
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id008
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: simplecov
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -110,7 +121,7 @@ dependencies:
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id009
+  version_requirements: *id010
 description: Like Factory Girl but for Hashes only
 email: dan.langevin@lifebooker.com
 executables: []
@@ -153,7 +164,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1396539003165277442
+      hash: -4520042367006189314
       segments: 
       - 0
       version: "0"
@@ -166,7 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Hash Factory - like Factory Girl but for Hashes only