typero 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b60246c3690ede7ca8f5e449abff10f446d76a6
-  data.tar.gz: fade8fc6679cc675269bb47ff03f3f0b1f965ac8
+  metadata.gz: 5d62a6bb35901d4b3b8a3734f9eb642facd83ea7
+  data.tar.gz: 33d5c380b533fee0bbf1ce7d7fe5d46c57f0ff17
 SHA512:
-  metadata.gz: 024ec4893a7173adef65b29d2c14eaff0ff7d8ce658a44584aaf4ee11c5ed64c8883a6914eeb737bea6dfbf92b58bc9e2e21ce9d9f59f31cf5d066ab48a232f6
-  data.tar.gz: bfc7263f3991580a455ddb6f819be4337569e5d3da8203a716f5d4f813cf921b41b59b24e5cd947da995b8019d57877664c25227483c42efa2cbeccce9411ad5
+  metadata.gz: 6b51d247bedb7cdde07887f0411944f461ef63b521bccad0b8c09efc541575eb069511661d1fd25c996aa2eae3efecb3092d77f122cb2054417e59be112dbcb2
+  data.tar.gz: 3174416a39d5fcf514a181011732ba4f913c4d68d14017e126be4fcf7ab94593a59396bfbbf4e3f8237437da555ff81ebd74309bbc931b73a769c0d2beda7ef8

data/lib/typero.rb

@@ -76,10 +76,9 @@ module Typero
   def quick_set(value, type, opts={})
     type_klass = "Typero::#{type.to_s.classify}Type".constantize
     type_inst  = type_klass.new(opts)
-    type_inst.respond_to?(:get_set) ? type_inst.get_set(value) : set(value)
+    type_inst.set(value)
   end
 
-
   # Typero.validate_opts params, :ttl, :password
   # only :ttl, :password and allowed in hash
   def validate_opts(hash, *args)

data/lib/typero/schema.rb

@@ -3,6 +3,7 @@
 # use whenever you want to check hash values of variables
 # in Lux FW, used in api cell
 
+# Typero::Schema.load_schema(email:{ req: true, type: :email}, age: { type: Integer, req: false })
 module Typero
   class Schema
     class << self
@@ -55,6 +56,9 @@ module Typero
           Typero.validate!(value, type, check_hash) { |msg|
             errors[field] = "#{field.to_s.capitalize}: #{msg}"
           }
+
+          # coerce value
+          hash[field] = Typero.quick_set(value, type) if value.present?
         end
       end
       errors.keys.length > 0  ? errors : nil

data/lib/typero/type.rb

@@ -49,8 +49,7 @@ module Typero
     def get_value(instance)
       # get current var value
       value = instance.respond_to?('[]') ? instance[@name] : instance.instance_variable_get("@#{@name}")
-      if value.blank?
-        # if blank check for default
+      if value.nil?
         if @opts[:default]
           @opts[:default].class.to_s == 'Proc' ? @opts[:default].call(instance) : @opts[:default]
         else
@@ -73,9 +72,15 @@ module Typero
         # search for unique fields on set, say for email
         # so it is not checked on save, it is checked on set
         if @opts[:uniq]
-          filter = instance.class.select(:id).where("#{@name}=?", value)
-          filter = filter.where('id<>?', instance.id) if instance.id
-          raise TypeError, @opts[:uniq].class == TrueClass ? "Field #{@name} is uniqe and allready exists" : @opts[:uniq] if filter.first
+          not_unique = false
+          if instance.respond_to?(:is_unique_field?)
+            not_unique = !instance.is_unique_field?(@name, value)
+          else
+            filter = instance.class.select(:id).where("#{@name}=?", value)
+            filter = filter.where('id<>?', instance.id) if instance.id
+            not_unique = true if filter.first
+          end
+          raise TypeError, @opts[:uniq].class == TrueClass ? %[Field #{@name} is uniqe and value "#{value}" allready exists] : @opts[:uniq] if not_unique
         end
 
         validate(value)

data/lib/typero/type/array.rb

@@ -4,17 +4,26 @@ module Typero
       []
     end
 
-    def get(list)
-      list.to_a
+    def get(value)
+      unless value.class.to_s.index('Array')
+        value = value.to_s.sub(/^\{/,'').sub(/\}$/,'').split(/\s*,\s*/)
+      end
+      value
     end
 
     def set(value)
-      value = value.to_s.split(/\s*,\s*/) unless value.class.to_s.index('Array')
+      value = get(value)
+      # value = value.to_a unless value.is_array?
+
+      # force type for all elements of array
       if type = @opts[:array_type]
-        check_type(type)
-        value.each { |el| Typero.validate!(el, type) }
+        value.map! { |el|
+          Typero.validate!(el, type)
+          Typero.quick_set(el, type)
+        }
       end
-      value.to_a
+
+      value
     end
 
     def validate(list)

data/lib/typero/type/float.rb

@@ -4,6 +4,10 @@ module Typero
       value.to_f
     end
 
+    def get(value)
+      value.to_f
+    end
+
     def validate(input)
       value = set(input)
       raise TypeError, "min lenght is #{@opts[:min]}" if @opts[:min] && value < @opts[:min]

data/lib/typero/version.rb

@@ -1,4 +1,4 @@
 module Typero
   # VERSION = File.read(File.dirname(__FILE__)+'/version.txt').gsub(/\s/,'').freeze
-  VERSION = '0.2.6'
+  VERSION = '0.2.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: typero
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Dino Reic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-27 00:00:00.000000000 Z
+date: 2017-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fast_blank
@@ -66,7 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Ruby type system