typero 0.3.6 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1c86d82e552055ef4caf2fcd72dcbfb040431d44f37dba36016ff93e4785ccf
-  data.tar.gz: d9e2dda55e722b7c7b2e6d54b87e363e7b1491c903007be100512cf22e0798f9
+  metadata.gz: 2abbf2baf5e54e738a8144eba2aa35218d88faaf1f26032a041474df61ebc393
+  data.tar.gz: 5d0eed00df648f251b43148b185dab5f05b07068ed225d831584e5a831d41b8a
 SHA512:
-  metadata.gz: ff912277d4fe41e6d18637ee208f2f91d066be02e4ef2b3fba26ce69684b13dcd5a9a8a1078d09b7e241b8c6196dccacdda6d06f1a2e08bc310c2f52d5ce9e6d
-  data.tar.gz: 5aa99ee889b1524727f43a76bf5c2cfd8b8d8f85a634081607248680f81dc0b004781bc1dff936b0a17d2a17e31bbe46536e52a569a7fc3f4cd2ea2c55d80cc4
+  metadata.gz: 78c673d3df0f2a968f44f9fab440c11831de686684d505ac3224ac937a470b0a773c1353a4c37eeb703fdf00fa13dab0a799f59e5ff5596ef75ab32860c0a9b4
+  data.tar.gz: 735f2eea8437315bf330e9d31f7e3fd9b910b3da8b7c9a3792e9b06f4628789798a4aeef089064baac2db412a0fefbeb948908c50bccb4ee6fdfba9497c8f0d4

data/.version

@@ -1 +1 @@
-0.3.6
+0.4.0

data/lib/typero.rb

@@ -4,6 +4,14 @@
 #   set :skills, [:email], min: 2
 # end
 #
+# or
+#
+# rules = Typero.new do
+#   string :name, req: true
+#   email :email, req: true
+#   email [:skills], min: 2
+# end
+#
 # errors = rules.validate @object
 # rules.valid?
 # rules.validate(@object) { |errors| ... }
@@ -15,7 +23,7 @@ class Typero
 
   class << self
     # validate single value in type
-    def validate value, type, opts={}
+    def validate type, value, opts={}
       field = type.to_s.tableize.singularize.to_sym
 
       # we need to have pointer to hash, so value can be changed (coerced) if needed
@@ -31,16 +39,12 @@ class Typero
       h[field]
     end
 
+    # check and coerce value
     # Typero.set(:label, 'Foo bar') -> "foo-bar"
     def set type, value, opts={}
-      klass = 'Typero::%sType' % type.to_s.gsub(/[^\w]/,'').classify
-      check = klass.constantize.new value, opts
+      check = Typero::Type.load(type).new value, opts
       check.set
     end
-
-    def cache
-      @@cache ||= {}
-    end
   end
 
   ###
@@ -52,9 +56,7 @@ class Typero
     instance_exec &block if block
   end
 
-  # convert
-  # integer :age
-  # set :age, type: :integer
+  # set :age, type: :integer -> integer :age
   # email :email
   # set :email, [:emails]
   # email [:emails]
@@ -81,10 +83,14 @@ class Typero
 
     opts[:type] = opts[:type].to_s.downcase
 
-    allowed_names = [:req, :uniq, :protected, :type, :min, :max, :array_type, :default, :downcase, :desc]
-    opts.keys.each do |key|
-      raise ArgumentError.new('%s is not allowed as typero option' % key) unless allowed_names.index(key)
-    end
+    opts[:required]    = opts[:req]  unless opts[:req].nil?
+    opts[:unique]      = opts[:uniq] unless opts[:uniq].nil?
+    opts[:description] = opts[:desc] unless opts[:desc].nil?
+
+    # allowed_names = [:req, :uniq, :protected, :type, :min, :max, :array_type, :default, :downcase, :desc, :label]
+    # opts.keys.each do |key|
+    #   raise ArgumentError.new('%s is not allowed as typero option' % key) unless allowed_names.index(key)
+    # end
 
     opts
   end
@@ -94,9 +100,7 @@ class Typero
     opts = type.is_a?(Hash) ? type : opts.merge(type: type)
 
     opts[:type] ||= :string
-    klass = 'Typero::%sType' % opts[:type].to_s.gsub(/[^\w]/,'').classify
-    klass.constantize
-
+    klass = Typero::Type.load opts[:type]
     @rules[field] = parse_option opts
   end
 
@@ -109,8 +113,12 @@ class Typero
     if @errors[field]
       @errors[field] += ', %s' % msg
     else
-      field_name = field.to_s.sub(/_id$/,'').humanize
-      @errors[field] = '%s %s' % [field_name, msg]
+      if msg[0,1].downcase == msg[0,1]
+        field_name = field.to_s.sub(/_id$/,'').humanize
+        msg = '%s %s' % [field_name, msg]
+      end
+
+      @errors[field] = msg
     end
   end
 
@@ -140,8 +148,8 @@ class Typero
             add_error field, e.message
           end
         end
-      elsif opts[:req]
-        msg = opts[:req].class == TrueClass ? 'is required' : opts[:req]
+      elsif opts[:required]
+        msg = opts[:required].class == TrueClass ? 'is required' : opts[:req]
         add_error field, msg
       end
     end

data/lib/typero/type.rb

@@ -2,6 +2,13 @@ class Typero::Type
   attr_accessor :opts
   attr_accessor :value
 
+  def self.load name
+    klass = 'Typero::%sType' % name.to_s.gsub(/[^\w]/,'').classify
+    klass.constantize
+  end
+
+  ###
+
   def initialize(value, opts={})
     @value = value
     @opts  = opts
@@ -12,6 +19,10 @@ class Typero::Type
     true
   end
 
+  def error_for name
+    @opts[name] || send(name)
+  end
+
   def get
     @value
   end

data/lib/typero/type/array.rb

@@ -13,8 +13,8 @@ class Typero::ArrayType < Typero::Type
 
     if type = @opts[:array_type]
       @value.map! { |el|
-        Typero.validate(el, type) { |msg|
-          raise TypeError.new "'%s' %s (value in list)" % [el, msg]
+        Typero.validate(type, el) { |msg|
+          raise TypeError.new "'%s' %s (%s)" % [el, msg, value_in_list_error]
         }
       }
     end
@@ -24,9 +24,21 @@ class Typero::ArrayType < Typero::Type
   end
 
   def validate
-    raise TypeError, 'Min array lenght is %s elements' % @opts[:min] if @opts[:min] && @value.length < @opts[:min]
-    raise TypeError, 'Max array lenght is %s elements' % @opts[:max] if @opts[:max] && @value.length > @opts[:max]
+    raise TypeError, error_for(:min_length) % @opts[:min] if @opts[:min] && @value.length < @opts[:min]
+    raise TypeError, error_for(:max_length) % @opts[:max] if @opts[:max] && @value.length > @opts[:max]
     true
   end
+
+  def min_error
+    'min array lenght is %s elements'
+  end
+
+  def max_error
+    'max array lenght is %s elements'
+  end
+
+  def value_in_list_error
+    'value in list'
+  end
 end
 

data/lib/typero/type/email.rb

@@ -5,9 +5,16 @@ class Typero::EmailType < Typero::Type
   end
 
   def validate
-    raise TypeError, 'is not having at least 8 characters' unless @value.to_s.length > 7
-    raise TypeError, 'is missing @' unless @value.include?('@')
-    # raise TypeError, "[#{@value}] is in wrong format" unless @value =~ /^[\+\w\-\.]+\@[\w\-\.]+$/i
+    raise TypeError, error_for(:not_8_chars_error) unless @value.to_s.length > 7
+    raise TypeError, error_for(:missing_monkey_error) unless @value.include?('@')
+  end
+
+  def not_8_chars_error
+    'is not having at least 8 characters'
+  end
+
+  def missing_monkey_error
+    'is missing @'
   end
 
 end

data/lib/typero/type/float.rb

@@ -5,8 +5,16 @@ class Typero::FloatType < Typero::Type
   end
 
   def validate
-    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]
+    raise TypeError, error_for(:min_length_error) % @opts[:min] if @opts[:min] && value < @opts[:min]
+    raise TypeError, error_for(:max_length_error) % @opts[:max] if @opts[:max] && value > @opts[:max]
+  end
+
+  def min_length_error
+    "min lenght is %s"
+  end
+
+  def max_length_error
+    "max lenght is %s"
   end
 
 end

data/lib/typero/type/hash.rb

@@ -4,7 +4,11 @@ class Typero::HashType < Typero::Type
   end
 
   def validate
-    raise TypeError, 'Value is not hash type' unless @value.is_a?(Hash)
+    raise TypeError, error_for(:not_hash_type_error) unless @value.is_a?(Hash)
+  end
+
+  def not_hash_type_error
+    'value is not hash type'
   end
 end
 

data/lib/typero/type/integer.rb

@@ -4,8 +4,16 @@ class Typero::IntegerType < Typero::Type
   end
 
   def validate
-    raise TypeError, 'min is %s, got %s' % [@opts[:min], @value] if @opts[:min] && @value < @opts[:min]
-    raise TypeError, 'max is %s, got %s' % [@opts[:max], @value] if @opts[:max] && @value > @opts[:max]
+    raise TypeError, error_for(:min_value_error) % [@opts[:min], @value] if @opts[:min] && @value < @opts[:min]
+    raise TypeError, error_for(:max_value_error) % [@opts[:max], @value] if @opts[:max] && @value > @opts[:max]
+  end
+
+  def min_value_error
+    'min is %s, got %s'
+  end
+
+  def max_value_error
+    'max is %s, got %s'
   end
 end
 

data/lib/typero/type/label.rb

@@ -4,6 +4,10 @@ class Typero::LabelType < Typero::Type
   end
 
   def validate
-    raise TypeError, "Label is having unallowed characters" unless @value =~ /^[\w\-]+$/
+    raise TypeError, error_for(:unallowed_characters_error) unless @value =~ /^[\w\-]+$/
+  end
+
+  def unallowed_characters_error
+    'label is having unallowed characters'
   end
 end

data/lib/typero/type/oib.rb

@@ -1,21 +1,22 @@
 class Typero::OibType < Typero::Type
+  # http://domagoj.eu/oib/
   def check? oib
     oib = oib.to_s
 
-    return false if (oib =~ /\d{11}/) != 0
-    return false if oib.length != 11
+    return false unless oib.match(/^[0-9]{11}$/)
 
-    a = 10
-    (0..9).each do |i|
-      a = (a + oib[i,1].to_i) % 10
-      a = 10 if a == 0
-      a = (a * 2) % 11
+    control_sum = (0..9).inject(10) do |middle, position|
+      middle += oib.at(position).to_i
+      middle %= 10
+      middle = 10 if middle == 0
+      middle *= 2
+      middle %= 11
     end
 
-    kontrolna = 11 - a
-    kontrolna = 0 if kontrolna == 10
+    control_sum = 11 - control_sum
+    control_sum = 0 if control_sum == 10
 
-    kontrolna == oib[10,1].to_i
+    return control_sum == oib.at(10).to_i
   end
 
   def set
@@ -23,7 +24,11 @@ class Typero::OibType < Typero::Type
   end
 
   def validate
-    raise TypeError.new('Not an OIB') unless check?(@value)
+    raise TypeError.new(error_for(:not_an_oib_error)) unless check?(@value)
+  end
+
+  def not_an_oib_error
+    'not in an OIB format'
   end
 end
 

data/lib/typero/type/string.rb

@@ -5,8 +5,18 @@ class Typero::StringType < Typero::Type
   end
 
   def validate
-    raise TypeError, 'min lenght is %s, you have %s' % [@opts[:min], @value.length] if @opts[:min] && @value.length < @opts[:min]
-    raise TypeError, 'max lenght is %s, you have %s' % [@opts[:max], @value.length] if @opts[:max] && @value.length > @opts[:max]
+    raise TypeError, error_for(:min_length_error) % [@opts[:min], @value.length] if @opts[:min] && @value.length < @opts[:min]
+    raise TypeError, error_for(:max_length_error) % [@opts[:max], @value.length] if @opts[:max] && @value.length > @opts[:max]
+  end
+
+  # ready for localization
+
+  def min_length_error
+    'min lenght is %s, you have %s'
+  end
+
+  def max_length_error
+    'max lenght is %s, you have %s'
   end
 end
 

data/lib/typero/type/url.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: typero
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.4.0
 platform: ruby
 authors:
 - Dino Reic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-06 00:00:00.000000000 Z
+date: 2018-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fast_blank