hash_dealer 1.1.0 → 1.1.2

data/Guardfile

@@ -1,7 +1,7 @@
 # A sample Guardfile
 # More info at https://github.com/guard/guard#readme
 
-guard 'rspec', :version => 2 do
+guard 'rspec', :version => 2, :cli => "--color --format nested" do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')  { "spec" }

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.1.2

data/hash_dealer.gemspec

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

@@ -1,3 +1,17 @@
+class Object
+  # allows us to call matcher blindly
+  def matcher(opts = {})
+    return self
+  end
+end
+
+# The only really important matcher
+class String
+  def matcher(opts = {})
+    ":#{self}"
+  end
+end
+
 class Hash
   def pathify_strings!
     self.each_pair do |k,v|
@@ -8,6 +22,22 @@ class Hash
       end
     end
   end
+  # recursively get a matcher for each value
+  def matcher(opts = {})
+    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
+    self.each_pair do |k,v|
+      if opts[:only].include?(k.to_sym)
+        ret[k] = v.matcher(opts[k.to_sym] || {})
+      else
+        ret[k] = v
+      end
+    end
+    ret
+  end
 end
 class Array
   def pathify_strings!
@@ -19,19 +49,8 @@ class Array
       end
     end
   end
-end
-class Hash
-  def to_kief
-    ret = HashDealer::Kief.new
-    self.each_pair do |k,v|
-      if v.instance_of?(Hash)
-        ret[k] = v.to_kief
-      elsif v.instance_of?(Array)
-        ret[k] = v.collect{|n| n.instance_of?(Hash) ? n.to_kief : n}
-      else
-        ret[k] = v
-      end
-    end
-    ret
+  # call matcher on all of the elements
+  def matcher(opts = {})
+    self.collect(&:matcher)
   end
-end
+end

data/lib/hash_dealer.rb

@@ -31,22 +31,11 @@ class HashDealer
   def root(value)
     @attributes = value
   end
-  
-  # method missing
-  def method_missing(meth, *args, &block)
-    raise Exception.new("Please provide either a String or a block to #{meth}") unless (args.length == 1 || (args.empty? && block_given?))
-    @attributes ||= Kief.new
-    if block_given?
-      @attributes[meth.to_sym] = block
-    else
-      @attributes[meth.to_sym] = args.first.is_a?(Hash) ? args.first.to_kief : args.first
-    end
-  end
-  
+  # get the stored attributes for this HashDealer
   def attributes(*args)
     # allows us to set a root value
     return @attributes unless @attributes.is_a?(Hash)
-    att = @parent ? HashDealer.roll(@parent.to_sym) : Kief.new
+    att = @parent ? HashDealer.roll(@parent.to_sym) : Hash.new
     @attributes.each do |k,v|
       att[k] = v.is_a?(Proc) ? v.call(*args) : v
     end
@@ -58,28 +47,17 @@ class HashDealer
     end
     att
   end
-  # subclass of Hash that defines the matcher method, returning strings like :xyz
-  class Kief < Hash
-    def make_matcher(val)
-      case val
-        when String 
-          return ":#{val}"
-        when Kief 
-          return val.matcher
-        when Array 
-          return val.collect{|n| make_matcher(n)}
-        else
-          return val 
-      end
-    end
-    # get this Kief as a matcher - works recursively
-    def matcher
-      ret = self.class.new
-      self.each_pair do |k,v|
-        ret[k] = make_matcher(v)
-      end
-      ret
+  
+  protected
+  
+  # method missing
+  def method_missing(meth, *args, &block)
+    raise Exception.new("Please provide either a String or a block to #{meth}") unless (args.length == 1 || (args.empty? && block_given?))
+    @attributes ||= Hash.new
+    if block_given?
+      @attributes[meth.to_sym] = block
+    else
+      @attributes[meth.to_sym] = args.first
     end
   end
-  
 end

data/spec/lib/hash_dealer_spec.rb

@@ -61,4 +61,47 @@ describe HashDealer do
     String.new(HashDealer.roll(:variable).matcher[:abc]).should eql ":test"
     String.new(HashDealer.roll(:variable).matcher[:val][:k]).should eql ":v"
   end
+  
+  it "should not alter fields passed into the matcher method in the except array" do
+    HashDealer.define(:variable) do
+      a("test_a")
+      b("test_b")
+    end
+    HashDealer.roll(:variable).matcher(:except => [:b])[:a].should eql(":test_a")
+    HashDealer.roll(:variable).matcher(:except => [:b])[:b].should eql("test_b")
+  end
+  
+  it "should only alter fields passed into the matcher method in the the only array" do
+    HashDealer.define(:variable) do
+      a("test_a")
+      b("test_b")
+    end
+    HashDealer.roll(:variable).matcher(:only => [:b])[:a].should eql("test_a")
+    HashDealer.roll(:variable).matcher(:only => [:b])[:b].should eql(":test_b")
+  end
+  
+  it "should apply except/only to nested values if they are defined by hash dealer and specified" do
+    HashDealer.define(:parent) do
+      a("test_a")
+      b{HashDealer.roll(:child)}
+    end
+    HashDealer.define(:child) do
+      a("child_a")
+      b("child_b")
+    end
+    HashDealer.roll(:parent).matcher(:only => [:b], :b => {:except => [:a]})[:a].should eql("test_a")
+    HashDealer.roll(:parent).matcher(:only => [:b], :b => {:except => [:a]})[:b][:a].should eql("child_a")
+    HashDealer.roll(:parent).matcher(:only => [:b], :b => {:except => [:a]})[:b][:b].should eql(":child_b")
+  end
+  
+  it "should define a matcher for when the response is an Array" do
+    HashDealer.define(:variable) do
+      root([{
+        :abc => "123",
+        :deff => "1234"
+      }])
+    end
+    HashDealer.roll(:variable).matcher.should eql([{:abc => ":123", :deff => ":1234"}])
+  end
+  
 end

metadata

@@ -2,7 +2,7 @@
 name: hash_dealer
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.1.0
+  version: 1.1.2
 platform: ruby
 authors: 
 - Dan Langevin
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-16 00:00:00 Z
+date: 2011-08-20 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: -2413462662380501703
+      hash: 1622066731891646773
       segments: 
       - 0
       version: "0"