parametron 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76fe6f2be9dd10050ee5f0749f341d7fd839f5bc
-  data.tar.gz: a5594be4a8b3226ba320c8ade4a84e672a92dc97
+  metadata.gz: 4c2c555f4c77e6938803fc5b9831d8bd311084d2
+  data.tar.gz: 5889c94d61d3e643d14c39b26a2183641c69e0ed
 SHA512:
-  metadata.gz: ed8ad2f475604a05ee620885ca083463825fd26a0449f049e70146a14458764109bef90bf0f766fa9664e39b38c6c766755a35718f9194ba92ab7ad31e9d1024
-  data.tar.gz: 5f86ba4facefae42b5b95c5ee2e9039c794985c3df951ad7ecb0789a43015a6e23a0a7da7ec1eaf063bd429962b1e98f66b9123c8d739bcc2b14b709ab812a0d
+  metadata.gz: c9d9b8ab542d19b2a39a9d8e67864c2bce0c863e4ee6205885f3c0ee7fb51209826ac1686d9743cb09f25513d120e2f97e9b3ff6b7f93e532cafd79f7b8b8263
+  data.tar.gz: ba6a86a480b8f002965c9693513b2b5918d215774b46ff49c206209d1c960bc0555196d5d0f6c599d84d6524e5801e30c5032afc23495855a40b0c90c0b6345e

data/lib/parametron.rb

@@ -26,7 +26,7 @@ module Parametron
       instance_variable_set(:"@_METHOD_#{name}_WRAPPED", true)
       original = instance_method(name.to_sym)
       remove_method(name.to_sym)
-      define_method(name) do |params|
+      define_method(name) do |params={}|
         new_params = _rename_params!(_validate!(_set_defaults!(params)))
         original.bind(self).call(new_params)
       end
@@ -49,7 +49,13 @@ module Parametron
       if new_par[v.name].nil? && new_par[v.name.to_sym].nil?
         case v.default
         when nil  then next
-        when Proc then new_par[v.name.to_sym] = v.default.call(self)
+        when Proc
+          case v.default.arity
+          when 0 then new_par[v.name.to_sym] = v.default.call()
+          when 1 then new_par[v.name.to_sym] = v.default.call(self)
+          else
+            raise ArgumentError.new "Too much arguments for #{v.name} default lambda"
+          end
         else
           new_par[v.name.to_sym] = v.default
         end

data/lib/parametron/params_validator.rb

@@ -69,7 +69,7 @@ class Parametron::ParamsValidator
   end
 
   def required_keys
-    self.required_vals.map{|x| x.name.to_s}
+    self.required_vals.map{|x| x.name.to_s}.sort
   end
 
   class GenericParameter < Struct.new(:name, :default, :validator, :as)
@@ -83,7 +83,7 @@ class Parametron::ParamsValidator
     def valid?(value)
       case self.validator
       when Regexp then value && !!self.validator.match(value.to_s)
-      when Proc   then value && !!self.validator(value).call
+      when Proc   then value && !!self.validator.call(value)
       else
         true
       end

data/lib/parametron/version.rb

@@ -1,3 +1,3 @@
 module Parametron
-  VERSION = "0.2.0"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parametron
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Yury Batenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-30 00:00:00.000000000 Z
+date: 2013-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -92,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.0
 signing_key: 
 specification_version: 4
 summary: DSL for method arguments validation