yema 0.0.2 → 0.0.3

data/README.md

@@ -34,7 +34,7 @@ class User
   attr_accessor :age
 end
 
-User.rules.add(Yema::Rule::StrongType.new(:age), Integer)
+User.rules.add(Yema::Rule::StrongType.new(:age, type: Integer))
 
 user = User.new
 user.age = 3

data/lib/yema.rb

@@ -8,6 +8,8 @@ require 'yema/validations'
 require 'yema/validator'
 require 'yema/registry/rule'
 
+require 'yema/utils/type_matcher'
+
 require 'yema/rule'
 require 'yema/rule/required'
 require 'yema/rule/format'

data/lib/yema/rule/strong_type.rb

@@ -14,23 +14,14 @@ module Yema
       end
 
       def matches?(value)
-        return allow_nil_rule(value) if strict == :allow_nil
-        if type == TrueClass || type == FalseClass
-          boolean_matches?(value)
-        elsif value.kind_of?(Array)
-          array_matches?(value)
-        else
-          value.kind_of?(type)
-        end
+        raise ArgumentError if member_type && !value.respond_to?(:all?)
+
+        return true if (strict == :allow_nil && value.nil?)
+        Utils.type_matches?(value, type) && member_type_matches?(value)
       end
 
       private
 
-      def allow_nil_rule(value)
-        return true if value.nil?
-        value.kind_of?(type)
-      end
-
       def extract_options(options)
         @type        = options.fetch(:type)
         @member_type = options.fetch(:member_type, nil)
@@ -42,16 +33,9 @@ module Yema
         raise InvalidOptionError, "Strict option only accept [:high, :allow_nil]" unless [:high, :allow_nil].include?(strict)
       end
 
-      def boolean_matches?(value)
-        value.equal?(true) || value.equal?(false)
-      end
-
-      def array_matches?(value)
-        if member_type
-          value.kind_of?(Array) && value.all? { |v| v.kind_of?(member_type) }
-        else
-          value.kind_of?(Array)
-        end
+      def member_type_matches?(value)
+        return value.all?{ |v| Utils.type_matches?(v, member_type) } if member_type
+        true
       end
     end
   end

data/lib/yema/utils/type_matcher.rb

@@ -0,0 +1,11 @@
+module Yema
+  module Utils
+    def self.type_matches?(value, type)
+      if type == TrueClass || type == FalseClass
+        value.equal?(true) || value.equal?(false)
+      else
+        value.kind_of?(type)
+      end
+    end
+  end
+end

data/lib/yema/version.rb

@@ -1,3 +1,3 @@
 module Yema
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/yema.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "rspec"
   gem.add_development_dependency "rake"
   gem.add_development_dependency "simplecov"
+  gem.add_development_dependency "debugger"
 
   gem.add_runtime_dependency "virtus", "0.5.4"
   gem.add_runtime_dependency "equalizer", "0.0.2"

metadata

@@ -2,14 +2,14 @@
 name: yema
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Handi Wiguna
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-01 00:00:00.000000000 Z
+date: 2013-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
@@ -59,6 +59,22 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  name: debugger
+  type: :development
+  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -115,6 +131,7 @@ files:
 - lib/yema/rule/length.rb
 - lib/yema/rule/required.rb
 - lib/yema/rule/strong_type.rb
+- lib/yema/utils/type_matcher.rb
 - lib/yema/validations.rb
 - lib/yema/validator.rb
 - lib/yema/version.rb