trafaret 1.5.5 → 1.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 705d3489ea9f5859edca572044700d365e8a6db4
-  data.tar.gz: d0644a20d15ca0e535540f9368af10ee98d3b135
+  metadata.gz: a287cdfb38aa84321f68a1989564a6491277ea01
+  data.tar.gz: 66fe38066bd25cc4ebfd96136b93d7199a4200ec
 SHA512:
-  metadata.gz: 75c2f71ea8c22759ca1d7e54b6036891b0ef3515404a57f4e9a5bd0239ac3b44502e493c40c008379e6abba6bea740356263b2f9022d5ca7ee5d4c3287613938
-  data.tar.gz: 3980d87341dd76854286494eacf7795dc1ece42eda01168f3873128ed7dd9bf36d895532f6a51b151038a80bb411a06dcc25a892c4ff15f72bd13e52d6f90bb7
+  metadata.gz: ff3884c959180136768c903dd9a15051054596af68324e4086862a9527ee90116115898c08559f1bb1642a8fc9a7f0924477dc2c6c99553d548af7b1169fb338
+  data.tar.gz: 777a037a908f5da2d94c5663be10acd750440016a4554ef43b2bc5f1e8a3a0c56180229911aa1172a613aa56b4a48a397c0583ff437881a60320804526eb1464

data/README.rst

@@ -65,4 +65,37 @@ 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]
+  T.array(validator: :integer).call(['1','2','3']) == [1,2,3]
+
+Case
+----
+
+You can use Ruby case with trafarets, but this have not much sense::
+
+  case 123
+  when T.integer
+    :integer
+  else
+    :any
+  end
+
+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 }
+    c.when(T.string) { |r| :string }
+    c.when(T.nil) { |r| :nil }
+  end
+
+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.
+
+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

data/lib/trafaret/numeric.rb

@@ -19,11 +19,11 @@ module Trafaret
       return failure('Too big') if @options[:lte] && val > @options[:lte]
       return failure('Too small') if @options[:gt] && val <= @options[:gt]
       return failure('Too small') if @options[:gte] && val < @options[:gte]
-      data
-    end
-
-    def convert(data)
-      try_convert(data)
+      if @converters.empty?
+        val
+      else
+        data
+      end
     end
   end
 

data/lib/trafaret/validator.rb

@@ -50,6 +50,10 @@ class Trafaret::Validator
     self
   end
 
+  def ===(data)
+    !validate(data).is_a?(Trafaret::Error)
+  end
+
   # ADT
   def |(other)
     Trafaret::Or.new(self, other)

data/lib/trafaret/validators.rb

@@ -153,4 +153,49 @@ module Trafaret
       @blk.call(data)
     end
   end
+
+  class Case < Validator
+    def prepare
+      @whens = []
+      @converters.shift.call(self)
+    end
+
+    def when(trafaret, &blk)
+      @whens << [Trafaret::Constructor.construct_from(trafaret), blk]
+    end
+
+    def call(data)
+      @whens.each do |trafaret, blk|
+        val = trafaret.call(data)
+        unless val.is_a?(Trafaret::Error)
+          return blk.call(val)
+        end
+      end
+      failure('Case does not match')
+    end
+  end
+
+  class Tuple < Validator
+    def prepare
+      @validators = @args.map { |arg| Trafaret.get_instantiated_validator(arg) }
+      @size = @validators.size
+    end
+
+    def call(data)
+      return failure('Too many elements') if data.size > @size# && !@extra
+      return failure('Not enough elements') if data.size < @size
+      failures = {}
+      result = []
+      data[0..@size].each.with_index do |el, index|
+        val = @validators[index].call(el)
+        result << val
+        failures[index] = val if val.is_a? Trafaret::Error
+      end
+      if failures.empty?
+        result
+      else
+        failure(failures)
+      end
+    end
+  end
 end

data/lib/trafaret/version.rb

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

data/spec/trafaret_spec.rb

@@ -142,4 +142,44 @@ describe Trafaret::Nil do
     n.call(123).message.should == 'Value must be nil'
     n.call(nil).should == nil
   end
+end
+
+describe Trafaret::Validator do
+  it 'must work with case' do
+    caser = proc do |a|
+      case a
+      when T.integer
+        :int
+      when T.symbol(:k)
+        :symbol
+      else
+        :any
+      end
+    end
+    caser.call(123).should == :int
+    caser.call(:k).should == :symbol
+    caser.call('asd').should == :any
+  end
+end
+
+describe Trafaret::Case do
+  it 'must work' do
+    cs = T.case do |c|
+      c.when(T.integer) { |r| :int }
+      c.when(T.string) { |r| :string }
+      c.when(T.nil) { |r| :nil }
+    end
+    cs.call(123).should == :int
+    cs.call('123').should == :int
+    cs.call('abs').should == :string
+    cs.call(nil).should == :nil
+  end
+end
+
+describe Trafaret::Tuple do
+  it 'must work' do
+    t = T.tuple(:integer, :string, :nil)
+    t.call([1, 'a', nil]).should == [1, 'a', nil]
+    t.call([1, 'a', 3]).dump.should == {2 => 'Value must be nil'}
+  end
 end

metadata

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