trafaret 1.5.7 → 1.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6dfda67413190ab691868072c86fe3fe6c58c8e4
-  data.tar.gz: 3a372f85b3aca6b1229a692ff473645b61dc51ee
+  metadata.gz: 1b74d49954330af927d82d0761fa42341afeb8e7
+  data.tar.gz: 05b550a4a635b52256fd7f346b2abab7035bef77
 SHA512:
-  metadata.gz: a6b3348f3a319282df5b87e6daa52bb79e882fcd27935f6b459a31b5e1259c7b622285ba23f1f41eb483c99c6f39cb853e46cfcf48cc2d95077e931a1fdcebca
-  data.tar.gz: 9c3f3730bd78f27eeecb71932ec3eb82d2ebd4f2f9f9bbd43674c01f5d63d861fd22d8ce3e2f5711c2b896badf54d29f3239ae15641ca7fd3b56dced6f0431a2
+  metadata.gz: 3da2249c3b0e1963fd11badd4c7164151f83c5d2a1f950d6fb831b637ffedae9cac81b8fb032ae66d3a482cd806f1ae36cbe9c71fdd9b634d95ae72860d2610b
+  data.tar.gz: bbdd76be5e061c0d002844849ccbb8a30ca2f322c36a511ff12c75015a518685a1287671f4c02e0b2241dd0a48b48926695da169d7c32bba169f7ceee444b44a

data/README.rst

@@ -39,7 +39,7 @@ you must return ``Trafaret::Error`` instance with message. Correct message can b
 Numeric
 -------
 
-Two trafarets Integer and Float supports common interface. In options this is parameters `lt`, `lte`, `gt`, `gte`.
+Two trafarets ``Integer`` and ``Float`` supports common interface. In options this is parameters ``lt``, ``lte``, ``gt``, ``gte``.
 
 Example::
 
@@ -49,21 +49,21 @@ Example::
 String
 ------
 
-Parameters `allow_blank`, `min_length`, `max_length`. And special option `regex`.
+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::
+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'
 
 URI
 ---
 
-URI parses URI. Parameter `schemes`, by default == ['http', 'https']::
+URI parses URI. Parameter ``schemes``, by default == ['http', 'https']::
 
   t = T.uri(schemes: ['ftp'])
   t.call('ftp://ftp.ueaysuc.co.uk.edu') == 'ftp://ftp.ueaysuc.co.uk.edu'
@@ -80,7 +80,7 @@ Now just checks simple regexp::
 Array
 -----
 
-Get one important parameter `validator` that will be applied to every array element::
+Get one important parameter ``validator`` that will be applied to every array element::
 
   T.array(validator: :integer).call(['1','2','3']) == [1,2,3]
 
@@ -96,7 +96,7 @@ You can use Ruby case with trafarets, but this have not much sense::
     :any
   end
 
-And you can use `Trafaret::Case` that puts result of trafaret to when clause::
+And you can use ``Trafaret::Case`` that puts result of trafaret to when clause::
 
   cs = T.case do |c|
     c.when(T.integer) { |r| :int }
@@ -108,11 +108,25 @@ Tuple
 -----
 
 Tuple is Array that consists not from any number of similar elements, but from exact number of different ones.
-`[1,2,3]` - Array of ints.
-`[1, 'a', nil]` - Tuple.
+``[1,2,3]`` - Array of ints.
+``[1, 'a', nil]`` - Tuple.
 
 Example::
 
   t = T.tuple(:integer, :string, :nil)
   t.call([1, 'a', nil]) == [1, 'a', nil]
   t.call([1, 'a', 3]).dump == {2 => 'Value must be nil'} # Error dumped to pure structures
+
+Hash
+----
+
+Hashes work in pair with ``Key``'s::
+
+  T::Hash.new(keys: [T.key(:field_name, validator: T.string)])
+
+Is not too appeal, but Keys are powerful and we have sugar::
+
+  T.construct(
+    kuku: :integer,
+    T.key(:opt_field, optional: true) => T.integer
+  )

data/lib/trafaret.rb

@@ -5,7 +5,7 @@ require 'trafaret/validator'
 require 'trafaret/validators'
 require 'trafaret/numeric'
 require 'trafaret/uri_email'
-require 'trafaret/base'
+require 'trafaret/hash'
 require 'trafaret/constructor'
 
 module Trafaret

data/lib/trafaret/constructor.rb

@@ -23,13 +23,13 @@ module Trafaret
         params.each do |k, v|
           v = Trafaret::Constructor.construct_from v
           if k.is_a? ::Symbol
-            keys << Key.new(k, v)
+            keys << Key.new(k, validator: v)
           elsif k.is_a? Trafaret::Key
             k.set_validator(v)
             keys << k
           end
         end
-        Trafaret::Base.new keys: keys
+        Trafaret::Hash.new keys: keys
       end
 
       def from_array(params)

data/lib/trafaret/errors.rb

@@ -13,7 +13,7 @@ module Trafaret
     def dump
       case @message
       when ::Hash
-        Hash[@message.map { |k, v| [k, v.dump] }]
+        ::Hash[@message.map { |k, v| [k, v.dump] }]
       when ::Array
         @message.map &:dump
       else

data/lib/trafaret/{base.rb → hash.rb}

@@ -1,15 +1,16 @@
 module Trafaret
   class Key
-    def initialize(name, validator, options = {}, &blk)
+    def initialize(name, options = {}, &blk)
       @name = name
       @sname = name.to_s
 
       @optional = options.delete(:optional)
       @default = options.delete(:default)
       @to_name = options.delete(:to_name) || name
+      validator = options.delete(:validator)
       @options = options
 
-      set_validator(validator, options, &blk)
+      set_validator(validator, options, &blk) if validator
     end
 
     def set_validator(validator, options = {}, &blk)
@@ -49,7 +50,7 @@ module Trafaret
     end
   end
 
-  class Base < Validator
+  class Hash < Validator
     module ClassMethods
       attr_accessor :keys
       def inherited(base)
@@ -57,7 +58,7 @@ module Trafaret
       end
 
       def key(name, validator, options = {}, &blk)
-        @keys << Key.new(name, validator, options, &blk)
+        @keys << Key.new(name, options.merge(validator: validator), &blk)
       end
     end
     extend ClassMethods
@@ -70,7 +71,7 @@ module Trafaret
     end
 
     def key(name, validator, options = {}, &blk)
-      @keys << Key.new(name, validator, options, &blk)
+      @keys << Key.new(name, validator, options.merge(validator: validator), &blk)
     end
 
     def validate(data)
@@ -87,9 +88,9 @@ module Trafaret
         end
       end
       if fails.blank?
-        Hash[res]
+        ::Hash[res]
       else
-        failure(Hash[fails])
+        failure(::Hash[fails])
       end
     end
   end

data/lib/trafaret/validator.rb

@@ -2,7 +2,7 @@ class Trafaret::Validator
   attr_accessor :converters, :options
 
   def initialize(*args, &blk)
-    @options = (args.pop if args.last.is_a? Hash) || {}
+    @options = (args.pop if args.last.is_a? ::Hash) || {}
     @args = args
     @converters = []
     @converters << blk if blk

data/lib/trafaret/validators.rb

@@ -44,6 +44,19 @@ module Trafaret
     end
   end
 
+  class Forward < Validator
+    attr_accessor :validator
+
+    def provide(validator)
+      @validator = validator
+    end
+
+    def validate(data)
+      raise 'Validator is not provided' unless validator
+      validator.validate(data)
+    end
+  end
+
   class Nil < Validator
     def validate(data)
       failure('Value must be nil') unless data.nil?
@@ -140,9 +153,9 @@ module Trafaret
         end
       end
       if fails.blank?
-        Hash[pairs]
+        ::Hash[pairs]
       else
-        failure(Hash[fails])
+        failure(::Hash[fails])
       end
     end
   end

data/lib/trafaret/version.rb

@@ -1,3 +1,3 @@
 module Trafaret
-  VERSION = "1.5.7"
+  VERSION = "1.5.9"
 end

data/spec/trafaret_spec.rb

@@ -3,11 +3,11 @@ require 'trafaret'
 
 T = Trafaret
 
-class FacebookResponseTrafaret < Trafaret::Base
+class FacebookResponseTrafaret < Trafaret::Hash
   key :name, T.string(min_length: 2), optional: true
   key :oa, T.mapping(T.string,
     T.mapping(T.string,
-      T.base(keys: [T.key(:url, T.string)])
+      T[:hash, keys: [T.key(:url, validator: T.string)]]
     )
   ), to_name: :providers do |data| # so we have response that matches our assumptions, then we can convert it
     data.flat_map { |p_n, accs| accs.map { |uuid, data| data } }
@@ -16,7 +16,7 @@ class FacebookResponseTrafaret < Trafaret::Base
   key :optional_key, :string, optional: true
 end
 
-describe Trafaret::Base do
+describe Trafaret::Hash do
   let :raw do
     {'name' => 'kuku',
      'oa' => {
@@ -34,7 +34,7 @@ describe Trafaret::Base do
   it 'should work with hash' do
     t = T.construct({
       kuku: :integer,
-      T.key(:krkr, nil, to_name: :id) => :string,
+      T.key(:krkr, to_name: :id) => :string,
       hash: {
         karma: :integer
       },
@@ -48,6 +48,14 @@ describe Trafaret::Base do
     res[:hash][:karma].should == 234
     res[:proc_].should == 123
   end
+
+  it 'should work with optional keys' do
+    t = T.construct({
+      T.key(:abd, optional: true) => :string
+    })
+    t.call({}).should == {}
+    t.call({'abd' => 'abc'}).should == {abd: 'abc'}
+  end
 end
 
 describe Trafaret::String do
@@ -116,12 +124,12 @@ end
 
 describe Trafaret::Key do
   it 'should extract and check value' do
-    T.key(:name, :string).call({name: 'cow'}).should == [:name, 'cow']
-    T.key(:name, :string, default: 'Elephant').call({}).should == [:name, 'Elephant']
-    T.key(:name, :string, optional: true).call({}).should == nil
+    T.key(:name, validator: :string).call({name: 'cow'}).should == [:name, 'cow']
+    T.key(:name, validator: :string, default: 'Elephant').call({}).should == [:name, 'Elephant']
+    T.key(:name, validator: :string, optional: true).call({}).should == nil
     # to name test
-    T.key(:name, :string, to_name: :id).call({name: '123'}).should == [:id, '123']
-    T.key(:name, :string, to_name: :id).call({name: 123})[0].should == :name
+    T.key(:name, validator: :string, to_name: :id).call({name: '123'}).should == [:id, '123']
+    T.key(:name, validator: :string, to_name: :id).call({name: 123})[0].should == :name
   end
 end
 
@@ -197,4 +205,14 @@ describe Trafaret::Email do
     e = T.email.to { |m| m[:name] }
     e.call('kuku@gmail.com').should == 'kuku'
   end
+end
+
+describe Trafaret::Forward do
+  it 'should provide recursive' do
+    fwd = Trafaret.forward
+    v = T.construct(T.key(:child, optional: true) => fwd, payload: :string)
+    fwd.provide v
+    res = v.call({child: {child: {payload: 'kuku'}, payload: '123'}, payload: '321'})
+    res[:child][:child][:payload].should == 'kuku'
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trafaret
 version: !ruby/object:Gem::Version
-  version: 1.5.7
+  version: 1.5.9
 platform: ruby
 authors:
 - Mikhail Krivushin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-21 00:00:00.000000000 Z
+date: 2014-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -67,9 +67,9 @@ files:
 - README.rst
 - Rakefile
 - lib/trafaret.rb
-- lib/trafaret/base.rb
 - lib/trafaret/constructor.rb
 - lib/trafaret/errors.rb
+- lib/trafaret/hash.rb
 - lib/trafaret/numeric.rb
 - lib/trafaret/uri_email.rb
 - lib/trafaret/validator.rb