hash_dealer 1.4.10 → 1.5.0

data/hash_dealer.gemspec

@@ -5,39 +5,19 @@
 
 Gem::Specification.new do |s|
   s.name = "hash_dealer"
-  s.version = "1.4.10"
+  s.version = "1.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dan Langevin"]
-  s.date = "2012-12-03"
+  s.date = "2012-12-27"
   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 = [
-    ".document",
-    ".rspec",
-    "Gemfile",
-    "Gemfile.lock",
-    "Guardfile",
-    "LICENSE.txt",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "hash_dealer.gemspec",
-    "lib/comparator.rb",
-    "lib/core_extensions.rb",
-    "lib/hash_dealer.rb",
-    "lib/matcher.rb",
-    "lib/path_string.rb",
-    "lib/variable_array.rb",
-    "spec/lib/hash_dealer_spec.rb",
-    "spec/lib/matcher_spec.rb",
-    "spec/lib/path_string_spec.rb",
-    "spec/spec_helper.rb"
-  ]
+  s.files = Dir["**/*"]
+
   s.homepage = "http://github.com/LifebookerInc/hash_dealer"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]

data/lib/hash.rb

@@ -0,0 +1,34 @@
+class HashDealer
+  class Hash < ::Hash
+
+    def initialize(optional_attributes = [])
+      @optional_attributes = optional_attributes
+    end
+
+    def eql?(other)
+      self_for_comparison = self.remove_optional_keys(self)
+      other_for_comparison = self.remove_optional_keys(other)
+
+      self_for_comparison.eql?(other_for_comparison)
+    end
+
+    def to_hash
+      ret = ::Hash.new
+      self.each_pair do |k,v|
+        ret[k] = v
+      end
+      ret
+    end
+
+    protected
+
+    def remove_optional_keys(hash)
+      hash = hash.clone.to_hash
+      @optional_attributes.each do |optional_attribute|
+        hash.delete(optional_attribute)
+      end
+      hash
+    end
+
+  end
+end

data/lib/hash_dealer.rb

@@ -5,10 +5,12 @@ require File.expand_path('../variable_array', __FILE__)
 require File.expand_path('../core_extensions', __FILE__)
 require File.expand_path('../matcher', __FILE__)
 require File.expand_path('../comparator', __FILE__)
+require File.expand_path('../hash', __FILE__)
 
 class HashDealer
   
   attr_accessor :parent
+  attr_accessor :optional_attributes
 
   # cattr_accessor
   def self.hashes
@@ -30,6 +32,7 @@ class HashDealer
   # initializer just calls the block from within our DSL
   def initialize(opts = {}, &block)
     @parent = opts[:parent]
+    @optional_attributes = []
     instance_eval(&block)
   end
   
@@ -46,7 +49,13 @@ class HashDealer
   def _attributes(overrides)
     # allows us to set a root value
     return @attributes.clone unless @attributes.is_a?(Hash)
-    att = @parent ? HashDealer.roll(@parent.to_sym) : Hash.new
+
+    if @parent.present?
+      att = HashDealer.roll(@parent.to_sym)
+    else
+      att = HashDealer::Hash.new(self.optional_attributes)
+    end
+
     @attributes.each do |k,v|
       att[k] = v.is_a?(Proc) ? v.call(att.merge(overrides)) : v
     end
@@ -60,13 +69,24 @@ class HashDealer
   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?))
+  def method_missing(meth, value = nil, opts = {}, &block)
+
+    unless value.present? || block_given?
+      raise Exception.new(
+        "Please provide either a String or a block to #{meth}"
+      )
+    end
+
+    if opts[:optional]
+      @optional_attributes << meth.to_sym
+    end
+
     @attributes ||= Hash.new
+    
     if block_given?
       @attributes[meth.to_sym] = block
     else
-      @attributes[meth.to_sym] = args.first
+      @attributes[meth.to_sym] = value
     end
   end
 end

data/spec/lib/hash_dealer_spec.rb

@@ -221,6 +221,24 @@ describe HashDealer do
 
   end
   
+  context "optional values" do
+
+    it "should allow values to be optionally passed in" do
+      HashDealer.define(:with_optional_values) do
+        required_value "x"
+        optional_value "y", :optional => true
+      end
+
+      hd = HashDealer.roll(:with_optional_values)
+
+      hd.should eql({:required_value => "x"})
+      hd.should eql({:required_value => "x", :optional_value => "y"})
+      hd.should_not eql({:optional_value => "y"})
+      hd.should_not eql({:required_value => "x", :bad_value => "z"})
+
+    end
+
+  end
 
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hash_dealer
 version: !ruby/object:Gem::Version
-  version: 1.4.10
+  version: 1.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-03 00:00:00.000000000 Z
+date: 2012-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -179,26 +179,76 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
 files:
-- .document
-- .rspec
+- 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
 - 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
+- LICENSE.txt
+- pkg/hash_dealer-1.4.10.gem
+- Rakefile
+- README.rdoc
 - 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
@@ -212,9 +262,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 4440880840768368962
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -228,3 +275,4 @@ signing_key:
 specification_version: 3
 summary: Hash Factory - like Factory Girl but for Hashes only
 test_files: []
+has_rdoc: 

data/.document

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

data/.rspec

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