trafaret 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3da287d80b08ce05b13b14cc3a273319a73dd20
-  data.tar.gz: 8dbec245e7f84988b0c6686182b7039ac4fb5e72
+  metadata.gz: 552e91fdd3fcd10fffaadc09b4b4608d653a51c8
+  data.tar.gz: eab3104c51d2f8f047d2fc8e2b3197cf9d3c928b
 SHA512:
-  metadata.gz: dece3132f430f9f0bf9a7d70fc903033bbacd78566bf7eb4465ea3fe4fdc8aeef89d46888102810e8a865810837c08ff71e58a91857e8e481edae9f33249f722
-  data.tar.gz: 2d639254921bca95796de8d776b54bc713d637a5076b85643a5eb70c81442a8104c86894c35e29ac5470b3c9ae2894bd6429cf9812e7a1465ccf335890a13937
+  metadata.gz: c545dd265e1262c133f7d702c781a3c7d00f65100ff12dfd1d4336e411cc1b82d38c567bb12a157fde63c3017a66c21d7c81a2ce1d0712821bff58f17284e61b
+  data.tar.gz: 6815466bd20840e98b2db91c7ed2fb155b9ea0f7b825b0305f617b463d10308d6cf23d5fd956118ff402d6cf2e18a6ac86a474c36de49134b6e1eca46ada869f

data/README.rst

@@ -0,0 +1,35 @@
+Trafaret
+========
+
+Trafaret is lib for data parsing.
+
+You can want this first::
+
+  T = Trafaret
+
+Small example for one of ways to construct Trafaret::
+
+  T.construct({
+    id: :integer,
+    post_ids: [:integer],
+    users: [{name: :string, id: :integer}],
+    proc_: proc { |a| a == 3 ? a : T.failure('Not a 3') }
+  })
+
+Trafarets supports ``|`` and ``&`` operations::
+
+  (T.symbol(:t) | T.symbol(:a)).call(:t) == :t
+
+  (T.string.to(&:to_i) & T.integer).call('123') == 123
+
+You can attach converter to trafaret with ``to``::
+
+  T.string(regex: /\A\d+\Z/).to { |match| match.string.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"

data/lib/trafaret.rb

@@ -14,7 +14,7 @@ module Trafaret
   class << self
     def get_validator(validator)
       if validator.is_a? ::Symbol
-        class_name = validator.to_s.classify
+        class_name = validator.to_s.split('_').collect!{ |w| w.capitalize }.join
         validator = Trafaret.const_get(class_name) rescue nil
         validator ||= Kernel.const_get(class_name)
       else

data/lib/trafaret/constructor.rb

@@ -11,6 +11,8 @@ module Trafaret
           Trafaret.get_validator from
         when Trafaret::Validator
           from
+        when ::Proc
+          from
         else
           raise 'Wrong parameter'
         end

data/lib/trafaret/validator.rb

@@ -45,6 +45,11 @@ class Trafaret::Validator
     @converters << blk
   end
 
+  def to (&blk)
+    @converters << blk
+    self
+  end
+
   # ADT
   def |(other)
     Trafaret::Or.new(self, other)

data/lib/trafaret/version.rb

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

data/spec/trafaret_spec.rb

@@ -35,14 +35,16 @@ describe Trafaret::Base do
     t = T.construct({
       kuku: :integer,
       T.key(:krkr, nil, to_name: :id) => :string,
-      argh: {
+      hash: {
         karma: :integer
       },
-      arr: [{id: :integer}]
+      array: [{id: :integer}],
+      proc_: proc { |d| d }
     })
-    res = t.call({kuku: 123, krkr: 'karma', argh: {karma: 234}, arr: [{id: 123}, {id: 234}]})
+    res = t.call({kuku: 123, krkr: 'karma', hash: {karma: 234}, array: [{id: 123}, {id: 234}], proc_: 123})
     res[:id].should == 'karma'
-    res[:argh][:karma].should == 234
+    res[:hash][:karma].should == 234
+    res[:proc_].should == 123
   end
 end
 

data/trafaret.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "activesupport"
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trafaret
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - Mikhail Krivushin
@@ -10,6 +10,20 @@ bindir: bin
 cert_chain: []
 date: 2014-04-16 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +64,7 @@ files:
 - ".gitignore"
 - Gemfile
 - LICENSE.txt
-- README.md
+- README.rst
 - Rakefile
 - lib/trafaret.rb
 - lib/trafaret/base.rb

data/README.md

@@ -1,29 +0,0 @@
-# Trafaret
-
-TODO: Write a gem description
-
-## Installation
-
-Add this line to your application's Gemfile:
-
-    gem 'trafaret'
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install trafaret
-
-## Usage
-
-TODO: Write usage instructions here
-
-## Contributing
-
-1. Fork it ( http://github.com/<my-github-username>/trafaret/fork )
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request