hash_dealer 1.5.2 → 1.6.0

data/.document

@@ -0,0 +1,5 @@
+lib/**/*.rb
+bin/*
+- 
+features/**/*.feature
+LICENSE.txt

data/.rspec

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

data/Gemfile

@@ -12,9 +12,10 @@ gem "colorize"
 group :development do
   gem "bundler"
   gem "jeweler"
-  gem "rspec"
-  gem "rcov"
+  gem 'debugger'
+  # gem "rcov"
+  gem 'rspec'
+  gem 'rspec-core'
   gem "guard-rspec", "=0.4.0"
-  gem "ruby-debug19", :require => "ruby-debug"
   gem "simplecov"
 end

data/Gemfile.lock

@@ -3,43 +3,39 @@ GEM
   specs:
     activesupport (3.1.3)
       multi_json (~> 1.0)
-    archive-tar-minitar (0.5.2)
     colorize (0.5.8)
-    columnize (0.3.5)
-    diff-lcs (1.1.3)
+    columnize (0.3.6)
+    debugger (1.6.1)
+      columnize (>= 0.3.1)
+      debugger-linecache (~> 1.2.0)
+      debugger-ruby_core_source (~> 1.2.3)
+    debugger-linecache (1.2.0)
+    debugger-ruby_core_source (1.2.3)
+    diff-lcs (1.2.4)
     git (1.2.5)
     guard (0.8.8)
       thor (~> 0.14.6)
     guard-rspec (0.4.0)
       guard (>= 0.4.0)
     i18n (0.6.0)
-    jeweler (1.6.4)
+    jeweler (1.8.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    linecache19 (0.5.12)
-      ruby_core_source (>= 0.1.4)
+      rdoc
+    json (1.8.0)
     multi_json (1.0.3)
-    rake (0.9.2.2)
-    rcov (0.9.11)
-    rspec (2.7.0)
-      rspec-core (~> 2.7.0)
-      rspec-expectations (~> 2.7.0)
-      rspec-mocks (~> 2.7.0)
-    rspec-core (2.7.1)
-    rspec-expectations (2.7.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.7.0)
-    ruby-debug-base19 (0.11.25)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby_core_source (>= 0.1.4)
-    ruby-debug19 (0.11.6)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby-debug-base19 (>= 0.11.19)
-    ruby_core_source (0.1.5)
-      archive-tar-minitar (>= 0.5.2)
+    rake (10.1.0)
+    rdoc (4.0.1)
+      json (~> 1.4)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.4)
+    rspec-expectations (2.14.1)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.3)
     simplecov (0.5.4)
       multi_json (~> 1.0.3)
       simplecov-html (~> 0.5.3)
@@ -53,10 +49,10 @@ DEPENDENCIES
   activesupport
   bundler
   colorize
+  debugger
   guard-rspec (= 0.4.0)
   i18n
   jeweler
-  rcov
   rspec
-  ruby-debug19
+  rspec-core
   simplecov

data/Rakefile

@@ -38,7 +38,7 @@ end
 
 task :default => :spec
 
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 

data/VERSION

@@ -1 +1 @@
-1.5.2
+1.6.0

data/hash_dealer.gemspec

@@ -5,23 +5,45 @@
 
 Gem::Specification.new do |s|
   s.name = "hash_dealer"
-  s.version = "1.5.2"
+  s.version = "1.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dan Langevin"]
-  s.date = "2012-12-27"
+  s.date = "2013-08-12"
   s.description = "Like Factory Girl but for Hashes only"
   s.email = "dan.langevin@lifebooker.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
   ]
-  s.files = Dir["**/*"]
-
+  s.files = [
+    ".document",
+    ".rspec",
+    "Gemfile",
+    "Gemfile.lock",
+    "Guardfile",
+    "LICENSE.txt",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "hash_dealer.gemspec",
+    "lib/comparator.rb",
+    "lib/core_extensions.rb",
+    "lib/hash.rb",
+    "lib/hash_dealer.rb",
+    "lib/matcher.rb",
+    "lib/path_string.rb",
+    "lib/variable_array.rb",
+    "spec/lib/comparator_spec.rb",
+    "spec/lib/hash_dealer_spec.rb",
+    "spec/lib/matcher_spec.rb",
+    "spec/lib/path_string_spec.rb",
+    "spec/spec_helper.rb"
+  ]
   s.homepage = "http://github.com/LifebookerInc/hash_dealer"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
+  s.rubygems_version = "1.8.23"
   s.summary = "Hash Factory - like Factory Girl but for Hashes only"
 
   if s.respond_to? :specification_version then
@@ -33,10 +55,10 @@ Gem::Specification.new do |s|
       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<debugger>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<rspec-core>, [">= 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"])
@@ -44,10 +66,10 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<colorize>, [">= 0"])
       s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<debugger>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
-      s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<rspec-core>, [">= 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
@@ -56,10 +78,10 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<colorize>, [">= 0"])
     s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<debugger>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])
-    s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<rspec-core>, [">= 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/comparator.rb

@@ -18,18 +18,12 @@ class Comparator
     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)
-    
-    if val.is_a?(Array)
-      val = val.collect{|v| 
-        v.is_a?(Hash) || v.is_a?(Array) ? self.normalize_value(v) : v
-      }
-    end
-
+    val = val.collect{|v| v.is_a?(Hash) || v.is_a?(Array) ? self.normalize_value(v) : v} if val.is_a?(Array)
     val
   end
   
   def self.diff(obj1, obj2)
-    return {} if obj1.eql?(obj2)
+    return {} if obj1 == obj2
     if obj1.is_a?(Array) && obj2.is_a?(Array)
       return self.array_diff(obj1, obj2) 
     elsif obj1.is_a?(Hash) && obj2.is_a?(Hash)
@@ -70,18 +64,11 @@ class Comparator
   end
   
   def self.stringify_keys(hash_or_array)
-    if hash_or_array.is_a?(Array)
-      return hash_or_array.collect{|v| 
-        v.is_a?(Hash) || v.is_a?(Array) ? self.stringify_keys(v) : v
-      }
-    end
-    
-    ret = hash_or_array.stringify_keys
-    ret.each_pair do |k,v|
-      if v.is_a?(Hash) || v.is_a?(Array)
-        ret[k] = self.stringify_keys(v)
+    return hash_or_array.collect{|v| v.is_a?(Hash) || v.is_a?(Array) ? self.stringify_keys(v) : v} if hash_or_array.is_a?(Array)
+    {}.tap do |ret|
+      hash_or_array.each_pair.each do |k, v|
+        ret[k.to_s] = v.is_a?(Hash) || v.is_a?(Array) ? self.stringify_keys(v) : v
       end
     end
-    ret
   end
 end

data/lib/core_extensions.rb

@@ -45,7 +45,7 @@ end
       return other.eql?(self) if other.is_a?(TimeDateMatcher)
       return old_eql?(other)
     end
-    
+
   EOE
 end
 
@@ -65,15 +65,15 @@ end
     def matcher(opts={})
       BooleanMatcher.new(self)
     end
-  
+
     alias_method :old_eql?, :eql?
     alias_method :old_equals_equals, :==
-  
+
     def ==(other)
       return other == self if other.is_a?(BooleanMatcher)
       return self.old_equals_equals(other)
     end
-  
+
     def eql?(other)
       return other.eql?(self) if other.is_a?(BooleanMatcher)
       return self.old_eql?(other)
@@ -101,7 +101,7 @@ class String
   define_method "==_with_path_string" do |other|
     if other.is_a?(PathString)
       return true if self.is_a?(PathString)
-      return other == self 
+      return other == self
     end
     return self.send("==_without_path_string", other)
   end
@@ -130,8 +130,10 @@ class Hash
     opts[:only] ||= self.keys.collect(&:to_sym)
     opts[:only] = opts[:only].collect(&:to_sym)
     opts[:only] -= (opts[:except] || []).collect(&:to_sym)
-    
-    ret = self.class.new
+
+    ret = self.clone
+    # clear out the keys
+    ret.clear
     self.each_pair do |k,v|
       if opts[:only].include?(k.to_sym)
         ret[k] = v.matcher(opts[k.to_sym] || {})

data/lib/hash.rb

@@ -1,32 +1,19 @@
 class HashDealer
   class Hash < ::Hash
 
-    attr_accessor :optional_attributes
-
     def initialize(optional_attributes = [])
       @optional_attributes = optional_attributes
     end
 
     def eql?(other)
-      self_copy, other_copy = self.get_copies_for_comparison(other)
-      self_copy.eql?(other_copy)
-    end
+      self_for_comparison = self.remove_optional_keys(self)
+      other_for_comparison = self.remove_optional_keys(other)
 
-    def matcher(opts = {})
-      ret = super
-      ret.optional_attributes = self.optional_attributes
-      ret
+      self_for_comparison.eql?(other_for_comparison)
     end
 
     def ==(other)
-      self_copy, other_copy = self.get_copies_for_comparison(other)
-      self_copy == other_copy
-    end
-
-    def stringify_keys
-      ret = super
-      ret.optional_attributes = self.optional_attributes.collect(&:to_s)
-      ret
+      return self.eql?(other)
     end
 
     def to_hash
@@ -39,10 +26,6 @@ class HashDealer
 
     protected
 
-    def get_copies_for_comparison(other)
-      [self.remove_optional_keys(self), self.remove_optional_keys(other)]
-    end
-
     def remove_optional_keys(hash)
       hash = hash.clone.to_hash
       @optional_attributes.each do |optional_attribute|

data/lib/matcher.rb

@@ -1,5 +1,5 @@
 # just in case it's not loaded
-require 'rspec'
+require 'rspec/core'
 require 'pp'
 
 
@@ -15,21 +15,22 @@ def print_diff(diff, depth = 1)
 end
 
 RSpec::Matchers.define(:match_response) do |actual|
+
   actual = Comparator.normalize_value(actual)
-  
+
   match do |expected|
     expected = Comparator.normalize_value(expected)
     @diff = Comparator.diff(actual, expected)
     @diff == {}
   end
-  
+
   failure_message_for_should do |container|
     puts "\n"
     print_diff(@diff)
     puts "\n"
     ""
   end
-  
+
   failure_message_for_should_not do |container|
     puts "\n"
     print_diff(@diff)
@@ -40,9 +41,9 @@ end
 
 # alias as match_json
 RSpec::Matchers.define(:match_list) do |actual|
-  
+
   actual = Comparator.normalize_value(actual)
-  
+
   match do |expected|
     expected = Comparator.normalize_value(expected)
     expected = expected.first if expected.is_a?(Array)
@@ -50,19 +51,19 @@ RSpec::Matchers.define(:match_list) do |actual|
     @diff = Comparator.diff(actual, expected)
     @diff == {}
   end
-    
+
   failure_message_for_should do |container|
     puts "\n"
     print_diff(@diff)
     puts "\n"
     ""
   end
-  
+
   failure_message_for_should_not do |container|
     puts "\n"
     print_diff(@diff)
     puts "\n"
     ""
   end
-  
+
 end

data/spec/lib/matcher_spec.rb

@@ -29,28 +29,6 @@ describe "match_response Matcher" do
     {:a => "a"}.matcher.should match_response({"a" => "abcde"})
     {:a => {:b => "c"}}.should match_response({"a" => {"b" => "c"}})
   end
-
-  it "should handle optional parameters" do
-
-    HashDealer.define(:matcher_optional_values) do
-      required_val("123")
-      optional_val("456", optional: true)
-    end
-    hash_dealer = HashDealer.roll(:matcher_optional_values)
-    
-
-    {"required_val" => "123"}.should match_response(
-      hash_dealer
-    )
-
-    {"required_val" => "123", "optional_val" => "456"}.should match_response(
-      hash_dealer
-    )
-    {"optional_val" => "456"}.should_not match_response(
-      hash_dealer
-    )
-
-  end
   
   context ".diff" do
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hash_dealer
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-27 00:00:00.000000000 Z
+date: 2013-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -92,7 +92,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: debugger
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -108,7 +108,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rcov
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -124,37 +124,37 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard-rspec
+  name: rspec-core
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: ruby-debug19
+  name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -179,60 +179,15 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
 files:
-- coverage/assets/0.5.3/app.js
-- coverage/assets/0.5.3/fancybox/blank.gif
-- coverage/assets/0.5.3/fancybox/fancy_close.png
-- coverage/assets/0.5.3/fancybox/fancy_loading.png
-- coverage/assets/0.5.3/fancybox/fancy_nav_left.png
-- coverage/assets/0.5.3/fancybox/fancy_nav_right.png
-- coverage/assets/0.5.3/fancybox/fancy_shadow_e.png
-- coverage/assets/0.5.3/fancybox/fancy_shadow_n.png
-- coverage/assets/0.5.3/fancybox/fancy_shadow_ne.png
-- coverage/assets/0.5.3/fancybox/fancy_shadow_nw.png
-- coverage/assets/0.5.3/fancybox/fancy_shadow_s.png
-- coverage/assets/0.5.3/fancybox/fancy_shadow_se.png
-- coverage/assets/0.5.3/fancybox/fancy_shadow_sw.png
-- coverage/assets/0.5.3/fancybox/fancy_shadow_w.png
-- coverage/assets/0.5.3/fancybox/fancy_title_left.png
-- coverage/assets/0.5.3/fancybox/fancy_title_main.png
-- coverage/assets/0.5.3/fancybox/fancy_title_over.png
-- coverage/assets/0.5.3/fancybox/fancy_title_right.png
-- coverage/assets/0.5.3/fancybox/fancybox-x.png
-- coverage/assets/0.5.3/fancybox/fancybox-y.png
-- coverage/assets/0.5.3/fancybox/fancybox.png
-- coverage/assets/0.5.3/fancybox/jquery.fancybox-1.3.1.css
-- coverage/assets/0.5.3/fancybox/jquery.fancybox-1.3.1.pack.js
-- coverage/assets/0.5.3/favicon_green.png
-- coverage/assets/0.5.3/favicon_red.png
-- coverage/assets/0.5.3/favicon_yellow.png
-- coverage/assets/0.5.3/highlight.css
-- coverage/assets/0.5.3/highlight.pack.js
-- coverage/assets/0.5.3/jquery-1.6.2.min.js
-- coverage/assets/0.5.3/jquery.dataTables.min.js
-- coverage/assets/0.5.3/jquery.timeago.js
-- coverage/assets/0.5.3/jquery.url.js
-- coverage/assets/0.5.3/loading.gif
-- coverage/assets/0.5.3/magnify.png
-- coverage/assets/0.5.3/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
-- coverage/assets/0.5.3/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
-- coverage/assets/0.5.3/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
-- coverage/assets/0.5.3/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
-- coverage/assets/0.5.3/smoothness/images/ui-bg_glass_75_dadada_1x400.png
-- coverage/assets/0.5.3/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
-- coverage/assets/0.5.3/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
-- coverage/assets/0.5.3/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
-- coverage/assets/0.5.3/smoothness/images/ui-icons_222222_256x240.png
-- coverage/assets/0.5.3/smoothness/images/ui-icons_2e83ff_256x240.png
-- coverage/assets/0.5.3/smoothness/images/ui-icons_454545_256x240.png
-- coverage/assets/0.5.3/smoothness/images/ui-icons_888888_256x240.png
-- coverage/assets/0.5.3/smoothness/images/ui-icons_cd0a0a_256x240.png
-- coverage/assets/0.5.3/smoothness/jquery-ui-1.8.4.custom.css
-- coverage/assets/0.5.3/stylesheet.css
-- coverage/index.html
+- .document
+- .rspec
 - Gemfile
 - Gemfile.lock
 - Guardfile
-- hash_dealer-1.5.2.gem
+- LICENSE.txt
+- README.rdoc
+- Rakefile
+- VERSION
 - hash_dealer.gemspec
 - lib/comparator.rb
 - lib/core_extensions.rb
@@ -241,16 +196,11 @@ files:
 - lib/matcher.rb
 - lib/path_string.rb
 - lib/variable_array.rb
-- LICENSE.txt
-- pkg/hash_dealer-1.4.10.gem
-- Rakefile
-- README.rdoc
 - spec/lib/comparator_spec.rb
 - spec/lib/hash_dealer_spec.rb
 - spec/lib/matcher_spec.rb
 - spec/lib/path_string_spec.rb
 - spec/spec_helper.rb
-- VERSION
 homepage: http://github.com/LifebookerInc/hash_dealer
 licenses:
 - MIT