hash_dealer 1.3.0 → 1.3.1

data/Gemfile

@@ -14,4 +14,5 @@ group :development do
   gem "rcov"
   gem "guard-rspec", "=0.4.0"
   gem "ruby-debug19", :require => "ruby-debug"
+  gem "simplecov"
 end

data/VERSION

@@ -1 +1 @@
-1.3.0
+1.3.1

data/hash_dealer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{hash_dealer}
-  s.version = "1.3.0"
+  s.version = "1.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dan Langevin"]
-  s.date = %q{2011-08-26}
+  s.date = %q{2011-09-05}
   s.description = %q{Like Factory Girl but for Hashes only}
   s.email = %q{dan.langevin@lifebooker.com}
   s.extra_rdoc_files = [
@@ -53,6 +53,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_development_dependency(%q<guard-rspec>, ["= 0.4.0"])
       s.add_development_dependency(%q<ruby-debug19>, [">= 0"])
+      s.add_development_dependency(%q<simplecov>, [">= 0"])
     else
       s.add_dependency(%q<activesupport>, [">= 0"])
       s.add_dependency(%q<bundler>, [">= 0"])
@@ -61,6 +62,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<guard-rspec>, ["= 0.4.0"])
       s.add_dependency(%q<ruby-debug19>, [">= 0"])
+      s.add_dependency(%q<simplecov>, [">= 0"])
     end
   else
     s.add_dependency(%q<activesupport>, [">= 0"])
@@ -70,6 +72,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<guard-rspec>, ["= 0.4.0"])
     s.add_dependency(%q<ruby-debug19>, [">= 0"])
+    s.add_dependency(%q<simplecov>, [">= 0"])
   end
 end
 

data/lib/matcher.rb

@@ -22,7 +22,12 @@ RSpec::Matchers.define(:match_list) do |actual|
   
   def normalize(val)
     val = JSON.parse(val) if val.is_a?(String)
-    val = val.first if val.is_a?(Array)
+    # if it's an array, we want just the first value   
+    if val.is_a?(Array)
+      # we append :matcher to account for variable length arrays - that causes a problem
+      # when the array is at the root and we are looking for the first element
+      val = val.first == ":matcher" ? val[1] : val.first 
+    end
     val
   end
   

data/lib/path_string.rb

@@ -34,9 +34,9 @@ class PathString < String
   
   # 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.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}}
-    val
+    val.sort
   end
   
   # 

data/spec/lib/hash_dealer_spec.rb

@@ -141,4 +141,8 @@ describe HashDealer do
     HashDealer.roll(:b).should eql({:hash_a => {:a => "123"}})
   end
   
+  it "should allow nested blocks of attributes" do
+    HashDealer.roll(:b).should eql({:hash_a => {:a => "123"}})
+  end
+  
 end

data/spec/lib/matcher_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
-describe "match_resonse Matcher" do
+describe "match_response Matcher" do
 
   it "should match hashes" do
     {:a => "b"}.should match_response({"a" => ":test"})
@@ -14,6 +14,10 @@ describe "match_resonse Matcher" do
     {"a" => ":b"}.should match_list([{"a" => "test"}, {"a" => "test2"}])
   end
   
+  it "should account for the first :matcher param when it's at the root" do
+    JSON.unparse([{"a" => "b"}, {"a" => "c"}]).should match_list({"a" => ":b"})
+  end
+  
   it "should match using wildcards for variable length arrays" do
     {"a" => ["a"]}.matcher.should match_response({"a" => ["a", "b", "c", "d"]})
     {"a" => [{"a" => "b"}]}.matcher.should match_response({"a" => [{"a" => "c"},{"a" => "x"},{"a" => "y"}]})

data/spec/spec_helper.rb

@@ -1,3 +1,12 @@
+require 'simplecov'
+SimpleCov.start 'rails' do
+  add_filter 'spec'
+end
+
+SimpleCov.at_exit do
+  SimpleCov.result.format!
+end
+
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'bundler'

metadata

@@ -2,7 +2,7 @@
 name: hash_dealer
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors: 
 - Dan Langevin
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-26 00:00:00 Z
+date: 2011-09-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -89,6 +89,17 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: simplecov
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id008
 description: Like Factory Girl but for Hashes only
 email: dan.langevin@lifebooker.com
 executables: []
@@ -130,7 +141,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -979585820027461548
+      hash: 967117454047752142
       segments: 
       - 0
       version: "0"