typero 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b0ee2233c2ba484ec5ff98778a8da24a876b7b22eb4d24cc6b3ba3a8886e714
-  data.tar.gz: 4a96d10f9c6d0e75e8ae36965d34a6cda8853684974f799e2cf5e32d6a7003c1
+  metadata.gz: 0f8d03e15d714e38774a8f817aaf02c710e3ddca8b65f9d413aefb01678bd31b
+  data.tar.gz: ebd4cb0d01d43f7a93c3e2575daa832ba960dd8ece2a284676c763f4c43ef30c
 SHA512:
-  metadata.gz: 880c3e4e551ab660f85530454ad9007ae383118677ea209ffaf0efff54bcd38da220579dc42d87618bd9ea50790b04a46c63dfe3cfd6252508b2bbec6ba1d711
-  data.tar.gz: 6f10437b894c91f3c7f723da03b426218d60b21c8bd161111d8ae7a745bdf35565f4fba84f26552fc75aa9b40211f3902d1cc2418fc420a5e3bce912ac676bc2
+  metadata.gz: 7a8dc1fdac410f59695f486860f078359a8344492335759b2df69f2fa382e3366000d70d994c4c05bdfa613c6c9dc207b66fefd2e4731f97dca97f94eda94b85
+  data.tar.gz: e7c6581d6fc6558687b023505564c669f59ce8e5dc0a298392f83fab92e1f47b27704a0b7644143161c6a264d601c2ac2a382c8cc0bdfb54f97ea52789846891

data/.version

@@ -1 +1 @@
-0.9.3
+0.9.4

data/lib/adapters/sequel.rb

@@ -27,7 +27,7 @@ module Sequel::Plugins::TyperoAttributes
 
           # we only check if field is changed
           if value.present? && column_changed?(field) && self.class.xwhere('LOWER(%s)=LOWER(?) and id<>?' % field, value, id).first
-            error = unique.class == TrueClass ? %[Value '"#{value}"' for #{field} allready exists] : unique
+            error = unique.class == TrueClass ? %[Value "#{value}" for field "#{field}" has been already used, please chose another value.] : unique
             errors.add(field, error) unless (errors.on(field) || []).include?(error)
           end
         end

data/lib/typero/params.rb

@@ -49,11 +49,8 @@ module Typero
         opts[:required] = false
       end
 
-      if value = opts.delete(:req)
-        opts[:required] = value
-      else
-        opts[:required] = true if opts[:required].nil?
-      end
+      opts[:required] = opts.delete(:req) unless opts[:req].nil?
+      opts[:required] = true if opts[:required].nil?
 
       # array that allows duplicates
       if opts[:type].is_a?(Array)
@@ -74,12 +71,16 @@ module Typero
         opts[:required] = false
         opts[:default]  = true
         opts[:type]     = :boolean
-      elsif opts[:type].is_a?(FalseClass) || opts[:type] == :false
-        opts[:required] = false
-        opts[:default]  = false
+      elsif opts[:type].is_a?(FalseClass) || opts[:type] == :false || opts[:type] == :boolean
+        opts[:required] = false if opts[:required].nil?
+        opts[:default]  = false if opts[:default].nil?
         opts[:type]     = :boolean
       end
 
+      # model / schema
+      if opts[:type].class.ancestors.include?(Typero::Schema)
+        opts[:model] = opts.delete(:type)
+      end
       opts[:model] = opts.delete(:schema) if opts[:schema]
       opts[:type]  = :model if opts[:model]
 
@@ -94,8 +95,10 @@ module Typero
       opts[:description] = opts.delete(:desc) unless opts[:desc].nil?
 
       # chek alloed params, all optional should go in meta
-      result = opts.keys - Typero::Type::OPTS_KEYS
-      raise ArgumentError.new('Unallowed Type params found: "%s", allowed: %s' % [result.join(' and '), Typero::Type::OPTS_KEYS.sort]) if result.length > 0
+      opts.keys.each do |key|
+        type = Typero::Type.load opts[:type]
+        type.allowed_opt?(key) {|err| raise ArgumentError, err }
+      end
 
       field = field.to_sym
 

data/lib/typero/schema.rb

@@ -23,6 +23,9 @@ module Typero
       end
 
       @schema.rules.each do |field, opts|
+        # force filed as a symbol
+        field = field.to_sym
+
         for k in opts.keys
           opts[k] = @object.instance_exec(&opts[k]) if opts[k].is_a?(Proc)
         end
@@ -30,8 +33,16 @@ module Typero
         # set value to default if value is blank and default given
         @object[field] = opts[:default] if opts[:default] && @object[field].blank?
 
-        # get field value
-        value = @object[field]
+        if @object.respond_to?(:key?)
+          if @object.key?(field)
+            value = @object[field]
+          elsif @object.key?(field.to_s)
+            # invalid string key, needs fix
+            value = @object[field] = @object.delete(field.to_s)
+          end
+        else
+          value = @object[field]
+        end
 
         if opts[:array]
           unless value.respond_to?(:each)

data/lib/typero/type/type.rb

@@ -22,6 +22,7 @@ module Typero
       :array,
       :default,
       :description,
+      :delimiter,
       :max_count,
       :meta,
       :min_count,
@@ -53,11 +54,23 @@ module Typero
       end
 
       def opts key, desc
-        OPTS_KEYS.push key unless OPTS_KEYS.include?(key)
-
         OPTS[self] ||= {}
         OPTS[self][key] = desc
       end
+
+      def allowed_opt? name
+        return true if OPTS_KEYS.include?(name)
+
+        OPTS[self] ||= {}
+        return true if OPTS[self][name]
+
+        msg  = %[Unallowed param "#{name}" for type "#{to_s}" found. Allowed are "#{OPTS_KEYS.join(', ')}"]
+        msg += %[ + "#{OPTS[self].keys.join(', ')}"] if OPTS[self].keys.first
+
+        block_given? ? yield(msg) : raise(ArgumentError, msg)
+
+        false
+      end
     end
 
     ###
@@ -65,6 +78,8 @@ module Typero
     def initialize value, opts={}, &block
       value = value.strip.rstrip if value.is_a?(String)
 
+      opts.keys.each {|key| self.class.allowed_opt?(key) }
+
       @value = value
       @opts  = opts
       @block = block

data/lib/typero/type/types/date_type.rb

@@ -1,4 +1,7 @@
 class Typero::DateType < Typero::Type
+  opts :min, 'Smallest date-time allowed'
+  opts :max, 'Maximal date-time allowed'
+
   error :en, :min_date, 'Minimal allowed date is %s'
   error :en, :max_date, 'Maximal allowed date is %s'
 

data/lib/typero/type/types/datetime_type.rb

@@ -1,6 +1,9 @@
 require_relative 'date_type'
 
 class Typero::DatetimeType < Typero::DateType
+  opts :min, 'Smallest date allowed'
+  opts :max, 'Maximal date allowed'
+
   def set
     unless [Time, DateTime].include?(value.class)
       value { |data| DateTime.parse(data) }

data/lib/typero/type/types/string_type.rb

@@ -7,6 +7,9 @@ class Typero::StringType < Typero::Type
     value(&:to_s)
     value(&:downcase) if opts[:downcase]
 
+    # this is database default for string type and it is good to define default unless defined
+    opts[:max] ||= 255
+
     error_for(:min_length_error, opts[:min], value.length) if opts[:min] && value.length < opts[:min]
     error_for(:max_length_error, opts[:max], value.length) if opts[:max] && value.length > opts[:max]
   end

data/lib/typero/typero.rb

@@ -22,18 +22,28 @@ module Typero
   VERSION = File.read File.expand_path "../../.version", File.dirname(__FILE__)
 
   # check and coerce value
-  # Typero.set(:label, 'Foo bar') -> "foo-bar"
-  def set type, value, opts = {}, &block
-    check = Typero::Type.load(type).new value, opts
-    check.get
-  rescue TypeError => error
-    if block
-      block.call error
-      false
+  # Typero.type(:label) -> Typero::LabelType
+  # Typero.type(:label, 'Foo bar') -> "foo-bar"
+  def type klass_name, value = :_undefined, opts = {}, &block
+    klass = Typero::Type.load(klass_name)
+
+    if value == :_undefined
+      klass
     else
-      raise error
+      begin
+        check = klass.new value, opts
+        check.get
+      rescue TypeError => error
+        if block
+          block.call error
+          false
+        else
+          raise error
+        end
+      end
     end
   end
+  alias :set :type
 
   # load or set type schema
   # Typero.schema(:blog) { ... }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: typero
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - Dino Reic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-06 00:00:00.000000000 Z
+date: 2021-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fast_blank
@@ -76,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Ruby type system