hashmake 0.1.4 → 0.1.5

data/lib/hashmake/arg_spec.rb

@@ -7,18 +7,9 @@ module Hashmake
 # 
 class ArgSpec
 
-  # Used to specify that an arg key is mapped to to a regular value of type
-  # :type (rather than a container which contains values of type :type).
-  CONTAINER_NONE = :containerNone
-  # Used to specify that an arg key is mapped to an Array that contains values
-  # of type :type.
-  CONTAINER_ARRAY = :containerArray
-  # Used to specify that an arg key is mapped to a Hash that contains values
-  # of type :type.
-  CONTAINER_HASH = :containerHash
-  # The valid container types. CONTAINER_NONE indicates no container is expected,
+  # The valid container types. If nil, indicates no container is expected,
   # just a plain object of type given by :type.
-  CONTAINERS = [ CONTAINER_NONE, CONTAINER_ARRAY, CONTAINER_HASH ]
+  CONTAINERS = [ nil, Hash, Array ]
     
   # Defines default key/value pairs to use in initializing an instance.
   # The :reqd key is set to true by default.
@@ -27,7 +18,8 @@ class ArgSpec
   DEFAULT_ARGS = {
     :reqd => true,
     :validator => ->(a){true},
-    :container => CONTAINER_NONE,
+    :container => nil,
+    :type => Object,
   }
   
   attr_reader :key, :type, :validator, :reqd, :default, :container

data/lib/hashmake/hash_makeable.rb

@@ -24,13 +24,12 @@ module HashMakeable
   #                           not then a default value is assigned (again, according to
   #                           arg_specs passed in).
   def hash_make arg_specs, hashed_args, assign_args = true
-    arg_specs.each do |arg_spec|
+    arg_specs.each do |key, arg_spec|
       raise ArgumentError, "arg_specs item #{arg_spec} is not a ArgSpec" unless arg_spec.is_a?(ArgSpec)
     end
     raise ArgumentError, "hashed_args is not a Hash" unless hashed_args.is_a?(Hash)
 
-    arg_specs.each do |arg_spec|
-      key = arg_spec.key
+    arg_specs.each do |key, arg_spec|
       if hashed_args.has_key?(key)
         val = hashed_args[key]
       else
@@ -45,36 +44,52 @@ module HashMakeable
         end
       end
       
-      case arg_spec.container
-      when ArgSpec::CONTAINER_ARRAY
-        raise ArgumentError, "val #{val} is not an array" unless val.is_a?(Array)
-        val.each do |item|
-          raise ArgumentError, "array item #{item} is not a #{arg_spec.type}" unless item.is_a?(arg_spec.type)
-          raise ArgumentError, "array item #{item} is not valid" unless arg_spec.validator.call(item)      
-        end
-      when ArgSpec::CONTAINER_HASH
-        raise ArgumentError, "val #{val} is not a hash" unless val.is_a?(Hash)
-        val.values.each do |item|
-          raise ArgumentError, "hash item #{item} is not a #{arg_spec.type}" unless item.is_a?(arg_spec.type)
-          raise ArgumentError, "hash item #{item} is not valid" unless arg_spec.validator.call(item)      
-        end
-      when ArgSpec::CONTAINER_NONE
-        raise ArgumentError, "val #{val} is not a #{arg_spec.type}" unless val.is_a?(arg_spec.type)
-        raise ArgumentError, "val #{val} is not valid" unless arg_spec.validator.call(val)      
-      else
-        raise ArgumentError, "arg_spec.container #{arg_spec.container} is not valid"
-      end
-      
+      validate_arg arg_spec, val
       if assign_args
         self.instance_variable_set("@#{key.to_s}".to_sym, val)
+      end        
+    end
+  end
+  
+  def validate_arg arg_spec, val
+    if arg_spec.container == Array
+      raise ArgumentError, "val #{val} is not an array" unless val.is_a?(Array)
+      val.each do |item|
+        raise ArgumentError, "array item #{item} is not a #{arg_spec.type}" unless item.is_a?(arg_spec.type)
+        raise ArgumentError, "array item #{item} is not valid" unless arg_spec.validator.call(item)      
+      end
+    elsif arg_spec.container == Hash
+      raise ArgumentError, "val #{val} is not a hash" unless val.is_a?(Hash)
+      val.values.each do |item|
+        raise ArgumentError, "hash item #{item} is not a #{arg_spec.type}" unless item.is_a?(arg_spec.type)
+        raise ArgumentError, "hash item #{item} is not valid" unless arg_spec.validator.call(item)      
       end
+    elsif arg_spec.container.nil?
+      raise ArgumentError, "val #{val} is not a #{arg_spec.type}" unless val.is_a?(arg_spec.type)
+      raise ArgumentError, "val #{val} is not valid" unless arg_spec.validator.call(val)      
+    else
+      raise ArgumentError, "arg_spec.container #{arg_spec.container} is not valid"
     end
+    
+    return true
   end
 
   # Contains class methods to be added to a class that includes the
   # HashMakeable module.
   module ClassMethods
+    def arg_spec args
+      ArgSpec.new args
+    end
     
+    def arg_spec_array args
+      args = { :container => Array, :default => ->(){Array.new} }.merge(args)
+      ArgSpec.new args
+    end
+
+    def arg_spec_hash args
+      args = { :container => Hash, :default => ->(){Hash.new} }.merge(args)
+      ArgSpec.new args
+    end
   end
 
 end

data/lib/hashmake/version.rb

@@ -4,5 +4,5 @@
 #
 module Hashmake
   # hashmake version
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/spec/arg_spec_spec.rb

@@ -17,7 +17,7 @@ describe Hashmake::ArgSpec do
     lambda { Hashmake::ArgSpec.new hash }.should_not raise_error(ArgumentError)
   end
 
-  it 'should raise ArgumentError if valid container is given' do
+  it 'should not raise ArgumentError if valid container is given' do
     Hashmake::ArgSpec::CONTAINERS.each do |container|
       hash = {
         :reqd => true, :key => :stuff, :type => String, :container => container
@@ -29,7 +29,7 @@ describe Hashmake::ArgSpec do
   
   it 'should raise ArgumentError if invalid container is given' do
     hash = {
-      :reqd => true, :key => :stuff, :type => String, :container => :myOwnContainer
+      :reqd => true, :key => :stuff, :type => String, :container => Fixnum
     }
     
     lambda { Hashmake::ArgSpec.new hash }.should raise_error(ArgumentError)

data/spec/hash_makeable_spec.rb

@@ -1,20 +1,21 @@
+require 'pry'
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe Hashmake::HashMakeable do
   class MyTestClass
     include HashMakeable
     
-    HASHED_ARG_SPECS = [
-      ArgSpec.new(:reqd => true, :key => :reqd_string, :type => String, :validator => ->(a){ a.length < 10 }),
-      ArgSpec.new(:reqd => false, :key => :not_reqd_float, :type => Float, :default => 0.0, :validator => ->(a){ a.between?(0.0,1.0) }),
-      ArgSpec.new(:reqd => false, :key => :not_reqd_array_of_float, :type => Float, :container => ArgSpec::CONTAINER_ARRAY, :default => ->(){Array.new}, :validator => ->(a){ a.between?(0.0,1.0) }),
-      ArgSpec.new(:reqd => false, :key => :not_reqd_hash_of_float, :type => Float, :container => ArgSpec::CONTAINER_HASH, :default => ->(){Hash.new}, :validator => ->(a){ a.between?(0.0,1.0) }),
-    ]
+    ARG_SPECS = {
+      :reqd_string => arg_spec(:reqd => true, :type => String, :validator => ->(a){ a.length < 10 }),
+      :not_reqd_float => arg_spec(:reqd => false, :type => Float, :default => 0.0, :validator => ->(a){ a.between?(0.0,1.0) }),
+      :not_reqd_array_of_float => arg_spec_array(:reqd => false, :type => Float,  :validator => ->(a){ a.between?(0.0,1.0) }),
+      :not_reqd_hash_of_float => arg_spec_hash(:reqd => false, :type => Float, :validator => ->(a){ a.between?(0.0,1.0) }),
+    }
     
     attr_reader :reqd_string, :not_reqd_float, :not_reqd_array_of_float, :not_reqd_hash_of_float
     
     def initialize hashed_args = {}
-      hash_make MyTestClass::HASHED_ARG_SPECS, hashed_args
+      hash_make ARG_SPECS, hashed_args
     end
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hashmake
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-06 00:00:00.000000000 Z
+date: 2013-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -133,7 +133,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 581566081
+      hash: 144920435
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -142,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 581566081
+      hash: 144920435
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23