typero 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 041634ffb9e23cb893ef64b89769a4d7c9a6a991
-  data.tar.gz: 71985d6075cda25963f0a55dc15ab8b8017c7a53
+  metadata.gz: b4f7aa7434411123ed8aad1528410d815ce2018f
+  data.tar.gz: e703cabe488d967b68b31f322756b8734f8a6858
 SHA512:
-  metadata.gz: 9564d4609fb8fd8e2150046fcf63c69409c4870f68298f64800babcd1afaa75c36358984daca317726e0fe40c4e63cb039e34fa27af99a47a99f80ec992f330b
-  data.tar.gz: 55891ab5ae341ce5b089e9b0c8b2403d36ef7de8f6a5563f9e56eff51834e996d287644356b0d0788cf460ef0f95031f3152f8b26cec3f686233103b855be779
+  metadata.gz: 99ab71faf7c55e56ac49231533bd0ae1132d07839b9b251dbb282127fc86825231b960e21fa023bec28eec511c4ef9e7e2e52f71c68eaa491c33bd3af256c5fe
+  data.tar.gz: 395435ca418457cc9833b2b3774af250b1667f377ff38fb608c639c6439889cc56415f5433fb348d0d9d041792860b0d96827252aeedef75527baa4b9c138bde

data/lib/typero.rb

@@ -1,3 +1,5 @@
+require 'fast_blank'
+
 require_relative './typero/instance'
 require_relative './typero/schema'
 require_relative './typero/type'
@@ -66,7 +68,7 @@ module Typero
   def validate(*args)
     validate!(*args)
     true
-  rescue
+  rescue TypeError
     false
   end
 

data/lib/typero/schema.rb

@@ -51,8 +51,10 @@ module Typero
           rescue
             errors[field] = $!.message
           end
-        elsif !Typero.validate(value, type)
-          errors[field] = "#{field.to_s.capitalize} is #{Typero.last_error}"
+        else
+          Typero.validate!(value, type, check_hash) { |msg|
+            errors[field] = "#{field.to_s.capitalize}: #{msg}"
+          }
         end
       end
       errors.keys.length > 0  ? errors : nil

data/lib/typero/type.rb

@@ -10,16 +10,6 @@ module Typero
 
     ### SAFE TO OVERLOAD: START
 
-    # default min implementation
-    def min(value, length)
-      raise TypeError, "Min #{@type} lenght for #{@name} is #{length}, you have #{value.to_s.length}" if value.to_s.length  < length
-    end
-
-    # default max implementation
-    def max(value, length)
-      raise TypeError, "Max #{@type} length for #{@name} is #{length}, you have #{value.to_s.length}" if value.to_s.length  > length
-    end
-
     # if value is not blank, it is sent to set method
     def set(value)
       value
@@ -82,9 +72,6 @@ module Typero
           raise TypeError, @opts[:uniq].class == TrueClass ? "Field #{@name} is uniqe and allready exists" : @opts[:uniq] if filter.first
         end
 
-        min(value, @opts[:min]) if @opts[:min]
-        max(value, @opts[:max]) if @opts[:max]
-
         validate(value)
       elsif @opts[:req]
         msg = @opts[:req].class == TrueClass ? "is required" : @opts[:req]

data/lib/typero/type/array.rb

@@ -13,12 +13,10 @@ module Typero
       value
     end
 
-    def min(value, length)
-      raise TypeError, "Min array lenght is #{length} elements" if value.length  < length
-    end
-
-    def max(value, length)
-      raise TypeError, "Max array lenght is #{length} elements" if value.length  > length
+    def validate(list)
+      raise TypeError, "Min array lenght is #{@opts[:min]} elements" if @opts[:min] && @opts[:min] < list.length
+      raise TypeError, "Max array lenght is #{@opts[:max]} elements" if @opts[:max] && @opts[:max] < list.length
+      true
     end
   end
 end

data/lib/typero/type/email.rb

@@ -5,10 +5,10 @@ module Typero
     end
 
     def validate(value)
-      raise TypeError, 'not having at least 8 characters' unless value.to_s.length > 7
-      raise TypeError, 'missing @' unless value.include?('@')
-      raise TypeError, 'in wrong domain' unless value =~ /\.\w{2,4}$/
-      raise TypeError, 'in wrong format' unless value =~ /^[\w\-\.]+\@[\w\-\.]+$/i
+      raise TypeError, 'is not having at least 8 characters' unless value.to_s.length > 7
+      raise TypeError, 'is missing @' unless value.include?('@')
+      raise TypeError, 'is in wrong domain' unless value =~ /\.\w{2,4}$/
+      raise TypeError, 'is in wrong format' unless value =~ /^[\w\-\.]+\@[\w\-\.]+$/i
       true
     end
   end

data/lib/typero/type/float.rb

@@ -4,12 +4,11 @@ module Typero
       value.to_f
     end
 
-    def min(value, length)
-      raise TypeError, "Min #{@type} lenght for #{@name} is #{length}, you have #{value}" if value.to_f  < length
-    end
-
-    def max(value, length)
-      raise TypeError, "Max #{@type} length for #{@name} is #{length}, you have #{value}" if value.to_f  > length
+    def validate(input)
+      value = set(input)
+      raise TypeError, "min lenght is #{@opts[:min]}" if @opts[:min] && value < @opts[:min]
+      raise TypeError, "max lenght is #{@opts[:max]}" if @opts[:max] && value > @opts[:max]
+      true
     end
   end
 end

data/lib/typero/type/integer.rb

@@ -3,6 +3,15 @@ module Typero
     def set(value)
       value.to_i
     end
+
+    def validate(input)
+      value = set(input)
+
+      raise TypeError, "min lenght is #{@opts[:min]}, you have #{value}" if @opts[:min] && value < @opts[:min]
+      raise TypeError, "max lenght is #{@opts[:max]}, you have #{value}" if @opts[:max] && value > @opts[:max]
+
+      true
+    end
   end
 end
 

data/lib/typero/type/label.rb

@@ -5,7 +5,7 @@ module Typero
     end
 
     def validate(value)
-      raise TypeError, "having unallowed characters" unless value =~ /^[\w\-]+$/
+      raise TypeError, "Label is having unallowed characters" unless value =~ /^[\w\-]+$/
       true
     end
   end

data/lib/typero/type/url.rb

@@ -1,7 +1,7 @@
 module Typero
   class UrlType < Typero::Type
     def validate(value)
-      raise TypeError, 'not starting with http' unless value =~ /^https?:\/\/./
+      raise TypeError, 'URL is not starting with http' unless value =~ /^https?:\/\/./
       true
     end
   end

data/lib/typero/version.rb

@@ -1,3 +1,3 @@
 module Typero
-  VERSION = "0.2.3".freeze
+  VERSION = "0.2.4".freeze
 end

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: typero
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Dino Reic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-26 00:00:00.000000000 Z
-dependencies: []
+date: 2016-09-29 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: fast_blank
+  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: active_support/core_ext/string
+  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'
 description: Simple and fast ruby type system. Enforce types as Array, Email, Boolean
   for ruby class instances
 email: reic.dino@gmail.com