trafaret 1.5.4 → 1.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37dbb432e6d847e95f3120d597d9a9043410baeb
-  data.tar.gz: e487439ce2948685518e053abdde06fa2ea5a029
+  metadata.gz: 705d3489ea9f5859edca572044700d365e8a6db4
+  data.tar.gz: d0644a20d15ca0e535540f9368af10ee98d3b135
 SHA512:
-  metadata.gz: 323959d139b67948dd18e2a69f3ea9eadf04ac4bebf1aaf58e56b4c8da829299b3639b194846bca36fb2c415ca82e2f04aa2f1150b21b402753f683d39e01c01
-  data.tar.gz: e05936c0649eccd16cd5d88c2a404b32410ef4bca7cdef53a48b9d81f67eb742101870f1c1b9bd63e236cbc9b2529ec6b57f4ce0d3e61436f60fba5ac10a8306
+  metadata.gz: 75c2f71ea8c22759ca1d7e54b6036891b0ef3515404a57f4e9a5bd0239ac3b44502e493c40c008379e6abba6bea740356263b2f9022d5ca7ee5d4c3287613938
+  data.tar.gz: 3980d87341dd76854286494eacf7795dc1ece42eda01168f3873128ed7dd9bf36d895532f6a51b151038a80bb411a06dcc25a892c4ff15f72bd13e52d6f90bb7

data/README.rst

@@ -26,10 +26,43 @@ You can attach converter to trafaret with ``to``::
 
   T.string(regex: /\A\d+\Z/).to { |match| match.string.to_i }.call('123')
 
+  T.string(regex: /\A\d+\Z/).to(&:string).to(&:to_i).call('123')
+
 Any callable can be used as ``Trafaret`` while it use simple convention. If data ok, you return something, if it wrong
 you must return ``Trafaret::Error`` instance with message. Correct message can be a string or a Hash with simple keys and Errors values::
 
   irb> (T.string & T.proc { |data| data == 'karramba' ? 'Bart' : T.failure('Not a Bart text!')}).call ('ku')
   => #<Trafaret::Error("Not a Bart text!")>
   irb> (T.string & T.proc { |data| data == 'karramba' ? 'Bart' : T.failure('Not a Bart text!')}).call ('karramba')
-  => "Bart"
+  => "Bart"
+
+Numeric
+-------
+
+Two trafarets Integer and Float supports common interface. In options this is parameters `lt`, `lte`, `gt`, `gte`.
+
+Example::
+
+  T.integer(gt: 3, lt: 5).call(4) == 4
+  T.float(gt:3, lt: 5).call(4.3) == 4.3
+
+String
+------
+
+Parameters `allow_blank`, `min_length`, `max_length`. And special option `regex`.
+
+Example::
+
+  T.string.call('kuku') == 'kuku'
+  T.string(regex: /\Akuku\z/).call('kuku') == 'kuku'
+
+If you use custom converter block, you will get `Match` instead of `String`, so you can use regex result::
+
+  T.string(regex: /\Ayear=(\d+),month=(\d+),day=(\d+)\z/).to {|m| Date.new(*m.to_a[1..3].map(&:to_i)) }.call('year=2012,month=5,day=4').to_s == '2012-05-04'
+
+Array
+-----
+
+Get one important parameter `validator` that will be applied to every array element::
+
+  T.array(validator: :integer).call(['1','2','3']) == [1,2,3]

data/lib/trafaret/constructor.rb

@@ -8,7 +8,7 @@ module Trafaret
         when ::Array
           from_array(from)
         when ::Symbol
-          Trafaret.get_validator from
+          Trafaret.get_instantiated_validator from
         when Trafaret::Validator
           from
         when ::Proc

data/lib/trafaret/errors.rb

@@ -9,5 +9,16 @@ module Trafaret
     def inspect
       "#<Trafaret::Error(#{message.inspect})>"
     end
+
+    def dump
+      case @message
+      when ::Hash
+        Hash[@message.map { |k, v| [k, v.dump] }]
+      when ::Array
+        @message.map &:dump
+      else
+        @message
+      end
+    end
   end
 end

data/lib/trafaret/numeric.rb

@@ -21,6 +21,10 @@ module Trafaret
       return failure('Too small') if @options[:gte] && val < @options[:gte]
       data
     end
+
+    def convert(data)
+      try_convert(data)
+    end
   end
 
   class Integer < Numeric

data/lib/trafaret/validators.rb

@@ -5,9 +5,9 @@ module Trafaret
   class ADT < Validator
     attr_reader :validators
 
-    def initialize(*args)
-      args = args.first if args.first.is_a? ::Array
-      @validators = args.map { |v| Trafaret.get_instantiated_validator(v) }
+    def prepare(*args)
+      @args = @args.first if @args.first.is_a? ::Array
+      @validators = @args.map { |v| Trafaret.get_instantiated_validator(v) }
     end
   end
 

data/lib/trafaret/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trafaret
 version: !ruby/object:Gem::Version
-  version: 1.5.4
+  version: 1.5.5
 platform: ruby
 authors:
 - Mikhail Krivushin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-16 00:00:00.000000000 Z
+date: 2014-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport