trafaret 1.5.6 → 1.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a287cdfb38aa84321f68a1989564a6491277ea01
-  data.tar.gz: 66fe38066bd25cc4ebfd96136b93d7199a4200ec
+  metadata.gz: 6dfda67413190ab691868072c86fe3fe6c58c8e4
+  data.tar.gz: 3a372f85b3aca6b1229a692ff473645b61dc51ee
 SHA512:
-  metadata.gz: ff3884c959180136768c903dd9a15051054596af68324e4086862a9527ee90116115898c08559f1bb1642a8fc9a7f0924477dc2c6c99553d548af7b1169fb338
-  data.tar.gz: 777a037a908f5da2d94c5663be10acd750440016a4554ef43b2bc5f1e8a3a0c56180229911aa1172a613aa56b4a48a397c0583ff437881a60320804526eb1464
+  metadata.gz: a6b3348f3a319282df5b87e6daa52bb79e882fcd27935f6b459a31b5e1259c7b622285ba23f1f41eb483c99c6f39cb853e46cfcf48cc2d95077e931a1fdcebca
+  data.tar.gz: 9c3f3730bd78f27eeecb71932ec3eb82d2ebd4f2f9f9bbd43674c01f5d63d861fd22d8ce3e2f5711c2b896badf54d29f3239ae15641ca7fd3b56dced6f0431a2

data/README.rst

@@ -60,6 +60,23 @@ If you use custom converter block, you will get `Match` instead of `String`, so
 
   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']::
+
+  t = T.uri(schemes: ['ftp'])
+  t.call('ftp://ftp.ueaysuc.co.uk.edu') == 'ftp://ftp.ueaysuc.co.uk.edu'
+
+Possible Errors - 'Invalid scheme', 'Invalid URI'.
+
+Mail
+----
+
+Now just checks simple regexp::
+
+  T.email('kuku@example.com').to { |m| m[:name] } == 'kuku'
+
 Array
 -----
 
@@ -98,4 +115,4 @@ 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
+  t.call([1, 'a', 3]).dump == {2 => 'Value must be nil'} # Error dumped to pure structures

data/lib/trafaret.rb

@@ -4,6 +4,7 @@ require 'trafaret/errors'
 require 'trafaret/validator'
 require 'trafaret/validators'
 require 'trafaret/numeric'
+require 'trafaret/uri_email'
 require 'trafaret/base'
 require 'trafaret/constructor'
 

data/lib/trafaret/constructor.rb

@@ -33,8 +33,11 @@ module Trafaret
       end
 
       def from_array(params)
-        raise 'Wrong argument for array construction' if params.size != 1
-        Trafaret::Array.new validator: Trafaret::Constructor.construct_from(params[0])
+        if params.size == 1
+          Trafaret::Array.new validator: Trafaret::Constructor.construct_from(params[0])
+        else params.size > 1
+          Trafaret::Tuple.new(*(params.map { |p| Trafaret::Constructor.construct_from(p) }))
+        end
       end
     end
   end

data/lib/trafaret/uri_email.rb

@@ -0,0 +1,38 @@
+require 'uri'
+
+module Trafaret
+  class URI < Validator
+    def prepare
+      @schemes = @options.delete(:schemes) || []
+    end
+
+    def validate(data)
+      uri = ::URI.parse(data)
+      unless @schemes.empty? || @schemes.include?(uri.scheme)
+        failure('Invalid scheme')
+      else
+        uri
+      end
+    rescue ::URI::InvalidURIError
+      failure('Invalid URI')
+    end
+
+    def convert(uri)
+      uri.to_s
+    end
+  end
+
+  Uri = URI
+
+  class Email < Trafaret::String
+    REGEX = /\A(?<name>^[-!#$%&'*+\/=?^_`{}|~0-9A-Z]+(\.[-!#$%&'*+\/=?^_`{}|~0-9A-Z]+)*  # dot-atom
+        |^"([\001-\010\013\014\016-\037!#-\[\]-\177]|\\[\001-011\013\014\016-\177])* # quoted-string
+        )@(?<domain>(?:[A-Z0-9](?:[A-Z0-9-]{0,61}[A-Z0-9])?\.)+[A-Z]{2,6}\.?$)  # domain
+        |\[(25[0-5]|2[0-4]\d|[0-1]?\d?\d)(\.(25[0-5]|2[0-4]\d|[0-1]?\d?\d)){3}\]\z/xi  # literal form, ipv4 address (SMTP 4.1.3)
+
+    def prepare
+      super
+      @regex = REGEX
+    end
+  end
+end

data/lib/trafaret/validator.rb

@@ -1,4 +1,6 @@
 class Trafaret::Validator
+  attr_accessor :converters, :options
+
   def initialize(*args, &blk)
     @options = (args.pop if args.last.is_a? Hash) || {}
     @args = args

data/lib/trafaret/validators.rb

@@ -51,13 +51,17 @@ module Trafaret
   end
 
   class String < Validator
+    def prepare
+      @regex = ::Regexp.compile @options[:regex] if @options[:regex]
+    end
+
     def validate(data)
       return failure('Not a String') unless data.is_a? ::String
       return failure('Should not be blank') if !@options[:allow_blank] && data.empty? 
       return failure('Too short') if @options[:min_length] && data.size < @options[:min_length]
       return failure('Too long') if @options[:max_length] && data.size > @options[:max_length]
-      if @options[:regex]
-        match = @options[:regex].match(data)
+      if @regex
+        match = @regex.match(data)
         return failure('Does not match') unless match
         return match
       end

data/lib/trafaret/version.rb

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

data/spec/trafaret_spec.rb

@@ -39,10 +39,11 @@ describe Trafaret::Base do
         karma: :integer
       },
       array: [{id: :integer}],
+      tuple: [:integer, :nil],
       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, just_trafaret: nil})
+    res = t.call({kuku: 123, krkr: 'karma', hash: {karma: 234}, array: [{id: 123}, {id: 234}], proc_: 123, just_trafaret: nil, tuple: [123, nil]})
     res[:id].should == 'karma'
     res[:hash][:karma].should == 234
     res[:proc_].should == 123
@@ -163,7 +164,7 @@ describe Trafaret::Validator do
 end
 
 describe Trafaret::Case do
-  it 'must work' do
+  it 'must case options' do
     cs = T.case do |c|
       c.when(T.integer) { |r| :int }
       c.when(T.string) { |r| :string }
@@ -177,9 +178,23 @@ describe Trafaret::Case do
 end
 
 describe Trafaret::Tuple do
-  it 'must work' do
+  it 'must match tuple' 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
+
+describe Trafaret::URI do
+  it 'must match uri' do
+    t = T.uri(schemes: ['http', 'https'])
+    t.call('http://ya.ru:80').should == 'http://ya.ru'
+  end
+end
+
+describe Trafaret::Email do
+  it 'must parse email' do
+    e = T.email.to { |m| m[:name] }
+    e.call('kuku@gmail.com').should == 'kuku'
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trafaret
 version: !ruby/object:Gem::Version
-  version: 1.5.6
+  version: 1.5.7
 platform: ruby
 authors:
 - Mikhail Krivushin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-20 00:00:00.000000000 Z
+date: 2014-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -71,6 +71,7 @@ files:
 - lib/trafaret/constructor.rb
 - lib/trafaret/errors.rb
 - lib/trafaret/numeric.rb
+- lib/trafaret/uri_email.rb
 - lib/trafaret/validator.rb
 - lib/trafaret/validators.rb
 - lib/trafaret/version.rb