trafaret 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a6f9ebc15fa44c667060779f703eb99d2462d83
-  data.tar.gz: 82a0675c08400058c321efa24851b6a0e9d2a66f
+  metadata.gz: bc7865262c4ddd22e53d71b22cb53aa70b53f403
+  data.tar.gz: f5fe1c37f11b712d536e3fdb6de0c0189f0fa31e
 SHA512:
-  metadata.gz: cd413ceeafc1db8704c047a81e8bb72d56404183cd5c62c446bdafc8652be4a7b6469b4b3821e4346155b8dfae2f35207c91d3eba9558d19ffcb28bc8824a8e1
-  data.tar.gz: 7e978fa7abe98d587cd85985fc18fc862e2c298457eba0b65f8d59afd47f57f8c58e2b3968abada01be6f5e321edc4adf3360443112203bf7a22b6627b2433d1
+  metadata.gz: d3021461ace4f7c6df04852525cdd60a8fb161f1915d641b6493cc3da3253e4fba8d21e6e3271e9e5cdbfcce4cb353f99c71b7c269366950100116e292063b1d
+  data.tar.gz: d9cca1a58733a9d30c4b8917e0e0f6b01666f3f8b82611957a727b365949992b59510c17e149725c64a6d84eb86a7fcadd315129ceda85bb3aa77a9bd0ecf75e

data/lib/trafaret.rb

@@ -1,76 +1,37 @@
-require "trafaret/version"
+require 'active_support/core_ext'
+require 'trafaret/version'
+require 'trafaret/errors'
+require 'trafaret/validator'
+require 'trafaret/validators'
+require 'trafaret/base'
 
 module Trafaret
-  class Attribute
-    def initialize(name, options = {}, &blk)
-      @name = name
-      @options = options
-      @blk = blk
+  def self.get_validator(validator)
+    if validator.is_a? Symbol
+      class_name = validator.to_s.classify
+      validator = Trafaret.const_get(class_name) rescue nil
+      validator ||= Kernel.const_get(class_name)
+    else
+      validator
     end
-
-    def name
-      @name.to_s
-    end
-
-    def get(obj)
-      if @blk
-        return @blk.call obj
-      end
-      data = begin
-               obj.send(@name)
-             rescue NameError
-               nil
-             end
-      data ||= begin
-                 obj[@name] || obj[@name.to_s]
-               rescue NoMethodError, TypeError
-                 nil
-               end
-    end
-
-    alias :dump :get
   end
 
-  class Array < Attribute
-    def dump(obj)
-      cls = @options[:class]
-      if data = get(obj)
-        data.map do |elem|
-          cls.dump elem
-        end
-      else
-        []
-      end
-    end
+  def self.get_instantiated_validator(validator, options = {})
+    val = self.get_validator(validator)
+    val = val.new(options) if val.is_a? Class
+    val
   end
 
-  class Hash < Attribute
-    def initialize(name = nil, options = {}, &blk)
-      @name = name
-      @options = options
-      @attrs = options[:attributes] || []
-      instance_eval(&blk)
-    end
-
-    def attribute(name, options = {}, &blk)
-      @attrs << Attribute.new(name, options, &blk)
-    end
-
-    def array(name, options = {}, &blk)
-      @attrs << Array.new(name, options, &blk)
-    end
-
-    def hash(name, options = {}, &blk)
-      @attrs << Hash.new(name, options = {}, &blk)
-    end
+  def self.[](validator, options = {})
+    return self.get_instantiated_validator(validator, options)
+  end
 
-    def dump(obj)
-      res = {}
-      data = if @name then get(obj) else obj end
-      @attrs.each do |attr|
-        res[attr.name] = attr.dump(data)
-      end
-      res
+  def self.method_missing(meth, *args, &blk)
+    cls = self.get_validator(meth)
+    if cls
+      cls.new(*args, &blk)
+    else
+      super
     end
   end
 end

data/lib/trafaret/base.rb

@@ -0,0 +1,70 @@
+module Trafaret
+  class Key
+    def initialize(name, validator, options = {}, &blk)
+      @name = name
+      @validator = validator.new(options)
+      @options = options
+      @blk = blk
+    end
+
+    def get(obj, extractors = {})
+      return @blk.call obj if @blk
+      data = begin
+               extractors[@name].call(obj) if extractors[@name]
+             rescue NoMethodError
+               nil
+             end
+      data ||= begin
+               obj.send(@name)
+             rescue NameError
+               nil
+             end
+      data ||= begin
+                 obj[@name] || obj[@name.to_s]
+               rescue NoMethodError, TypeError
+                 nil
+               end
+    end
+
+    def call(data, extractors = {})
+      [@name, @validator.call(get(data, extractors), &@blk)]
+    end
+  end
+
+  class Extractor
+    def initialize(&blk)
+      @blk = blk
+    end
+
+    def call(data)
+      @blk.call data
+    end
+  end
+
+  class Base < Validator
+    module ClassMethods
+      attr_accessor :keys, :extractors
+      def inherited(base)
+        base.keys = (keys || []).dup
+        base.extractors = (extractors || {}).dup
+      end
+
+      def key(name, validator, options = {}, &blk)
+        @keys << Key.new(name, Trafaret.get_validator(validator), options, &blk)
+      end
+
+      def extract(name, &blk)
+        @extractors[name] = Extractor.new(&blk)
+      end
+    end
+    extend ClassMethods
+
+    def validate(data)
+      res = []
+      self.class.keys.each do |key|
+        res << key.call(data, extractors = self.class.extractors)
+      end
+      Hash[res]
+    end
+  end
+end

data/lib/trafaret/errors.rb

@@ -0,0 +1,9 @@
+module Trafaret
+  class Error < Exception
+    attr_reader :message
+
+    def initialize(message)
+      @message = message
+    end
+  end
+end

data/lib/trafaret/validator.rb

@@ -0,0 +1,33 @@
+class Trafaret::Validator
+  def initialize(options = {})
+    @options = options
+  end
+
+  def validate(data)
+    data # or return Trafaret::Error
+  end
+
+  def convert(data)
+    data
+  end
+
+  def call(data)
+    val = validate(data)
+    return val if val.is_a? Trafaret::Error
+    if block_given?
+      yield val
+    else
+      convert(val)
+    end
+  end
+
+  # ADT
+  def |(other)
+    Trafaret::Or.new(self, other)
+  end
+
+  # Helpers
+  def failure(msg)
+    Trafaret::Error.new msg
+  end
+end

data/lib/trafaret/validators.rb

@@ -0,0 +1,65 @@
+module Trafaret
+  class Any < Validator
+  end
+
+  class Or < 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) }
+    end
+
+    def validate(data)
+      errors = []
+      @validators.each do |v|
+        res = v.call(data)
+        if res.is_a? Trafaret::Error
+          errors << res
+        else
+          return res
+        end
+      end
+      return failure errors
+    end
+
+    def |(other)
+      Trafaret::Or.new(*validators, other)
+    end
+  end
+
+  class String < Validator
+    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)
+        return failure('Does not match') unless match
+        return match
+      end
+      data
+    end
+  end
+
+  class Integer < Validator
+    def validate(data)
+      data.to_i
+    end
+  end
+
+  class Array < Validator
+    def self.[](validator, options = {})
+      self.new(options.merge(validator: validator))
+    end
+
+    def validate(data)
+      return failure('Not an Array') unless data.is_a? ::Array
+      cls = Trafaret.get_validator(@options[:validator]).new @options
+      data.map do |elem|
+        cls.call elem
+      end
+    end
+  end
+end

data/lib/trafaret/version.rb

@@ -1,3 +1,3 @@
 module Trafaret
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

data/spec/trafaret_spec.rb

@@ -1,20 +1,21 @@
 # -*- coding: utf-8 -*-
 require 'trafaret'
 
-describe Trafaret do
-  Provider = Trafaret::Hash.new do
-    attribute :url
-  end
+class ProviderTrafaret < Trafaret::Base
+  key :url, Trafaret::String, min_length: 3, max_length: 50
+end
 
-  Checker = Trafaret::Hash.new do
-    attribute :name
-    array :providers, class: Provider do |obj|
-      obj['oa'].flat_map do |prov_name, accs|
-        accs.map {|uuid, data| data}
-      end
+class FacebookResponseTrafaret < Trafaret::Base
+  key :name, :string, optional: true, min_length: 2
+  extract :providers do |data|
+    data['oa'].flat_map do |prov_name, accs|
+      accs.map { |uuid, data| data }
     end
   end
+  key :providers, :array, validator: :provider_trafaret
+end
 
+describe Trafaret::Base do
   let :raw do
     {'name' => 'kuku',
      'oa' => {
@@ -26,6 +27,35 @@ describe Trafaret do
     }
   end
   it 'should work' do
-    Checker.dump(raw).should == ({"name"=>"kuku", "providers"=>[{"url"=>"http://ya.ru"}, {"url"=>"http://www.ru"}]})
+    FacebookResponseTrafaret.new.call(raw).should == ({name: "kuku", providers: [{url: "http://ya.ru"}, {url: "http://www.ru"}]})
+  end
+end
+
+describe Trafaret::String do
+  it 'should check errors' do
+    Trafaret.string.call('').message.should == 'Should not be blank'
+    Trafaret.string(min_length: 10).call('abc').message.should == 'Too short'
+    Trafaret.string(max_length: 1).call('abc').message.should == 'Too long'
+    Trafaret.string(regex: /abc/).call('bca').message.should == 'Does not match'
   end
 end
+
+describe Trafaret::Array do
+  it 'should check' do
+    Trafaret::Array[:string].call(['a', 'b', 'c']).should == ['a', 'b', 'c']
+  end
+end
+
+describe Trafaret::Or do
+  it 'should return value' do
+    Trafaret[:or, [:string, :integer]].call('krukatuka').should == 'krukatuka'
+
+    (Trafaret[:string] | Trafaret[:integer]).call('krukatuka').should == 'krukatuka'
+
+    (Trafaret.string | Trafaret.integer).call('krukatuka').should == 'krukatuka'
+  end
+
+  it 'should return errors' do
+    Trafaret[:or, Trafaret[:array, validator: :string]].call('krukatuka').message.first.message.should == 'Not an Array'
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trafaret
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Mikhail Krivushin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-02 00:00:00.000000000 Z
+date: 2014-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,6 +53,10 @@ files:
 - README.md
 - Rakefile
 - lib/trafaret.rb
+- lib/trafaret/base.rb
+- lib/trafaret/errors.rb
+- lib/trafaret/validator.rb
+- lib/trafaret/validators.rb
 - lib/trafaret/version.rb
 - spec/trafaret_spec.rb
 - trafaret.gemspec