trafaret 1.5.2 → 1.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 552e91fdd3fcd10fffaadc09b4b4608d653a51c8
-  data.tar.gz: eab3104c51d2f8f047d2fc8e2b3197cf9d3c928b
+  metadata.gz: 37dbb432e6d847e95f3120d597d9a9043410baeb
+  data.tar.gz: e487439ce2948685518e053abdde06fa2ea5a029
 SHA512:
-  metadata.gz: c545dd265e1262c133f7d702c781a3c7d00f65100ff12dfd1d4336e411cc1b82d38c567bb12a157fde63c3017a66c21d7c81a2ce1d0712821bff58f17284e61b
-  data.tar.gz: 6815466bd20840e98b2db91c7ed2fb155b9ea0f7b825b0305f617b463d10308d6cf23d5fd956118ff402d6cf2e18a6ac86a474c36de49134b6e1eca46ada869f
+  metadata.gz: 323959d139b67948dd18e2a69f3ea9eadf04ac4bebf1aaf58e56b4c8da829299b3639b194846bca36fb2c415ca82e2f04aa2f1150b21b402753f683d39e01c01
+  data.tar.gz: e05936c0649eccd16cd5d88c2a404b32410ef4bca7cdef53a48b9d81f67eb742101870f1c1b9bd63e236cbc9b2529ec6b57f4ce0d3e61436f60fba5ac10a8306

data/lib/trafaret/constructor.rb

@@ -12,7 +12,7 @@ module Trafaret
         when Trafaret::Validator
           from
         when ::Proc
-          from
+          Trafaret::Proc.new &from
         else
           raise 'Wrong parameter'
         end

data/lib/trafaret/validators.rb

@@ -93,12 +93,7 @@ module Trafaret
 
   class Array < Validator
     def prepare
-      val = Trafaret.get_validator(@options[:validator])
-      if val.is_a? ::Class
-        @cls = Trafaret.get_validator(@options[:validator]).new @options
-      else
-        @cls = val
-      end
+      @cls = Trafaret.get_instantiated_validator(@options.delete(:validator), @options)
     end
 
     def self.[](validator, options = {})

data/lib/trafaret/version.rb

@@ -1,3 +1,3 @@
 module Trafaret
-  VERSION = "1.5.2"
+  VERSION = "1.5.4"
 end

data/spec/trafaret_spec.rb

@@ -39,9 +39,10 @@ describe Trafaret::Base do
         karma: :integer
       },
       array: [{id: :integer}],
-      proc_: proc { |d| d }
+      proc_: proc { |d| d },
+      just_trafaret: T.nil
     })
-    res = t.call({kuku: 123, krkr: 'karma', hash: {karma: 234}, array: [{id: 123}, {id: 234}], proc_: 123})
+    res = t.call({kuku: 123, krkr: 'karma', hash: {karma: 234}, array: [{id: 123}, {id: 234}], proc_: 123, just_trafaret: nil})
     res[:id].should == 'karma'
     res[:hash][:karma].should == 234
     res[:proc_].should == 123

data/trafaret.gemspec

@@ -8,10 +8,10 @@ Gem::Specification.new do |spec|
   spec.version       = Trafaret::VERSION
   spec.authors       = ["Mikhail Krivushin"]
   spec.email         = ["krivushinme@gmail.com"]
-  spec.summary       = %q{Convert data structures. Like a RABL.}
+  spec.summary       = %q{Combinatorial data parser}
   spec.description   = %q{The thing to convert entities from one to other.
                           Idea from Python Trafaret lib in Ruby way.}
-  spec.homepage      = ""
+  spec.homepage      = "https://github.com/Deepwalker/trafaret.rb"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trafaret
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.4
 platform: ruby
 authors:
 - Mikhail Krivushin
@@ -76,7 +76,7 @@ files:
 - lib/trafaret/version.rb
 - spec/trafaret_spec.rb
 - trafaret.gemspec
-homepage: ''
+homepage: https://github.com/Deepwalker/trafaret.rb
 licenses:
 - MIT
 metadata: {}
@@ -99,6 +99,6 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: Convert data structures. Like a RABL.
+summary: Combinatorial data parser
 test_files:
 - spec/trafaret_spec.rb