typero 0.4.0 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2abbf2baf5e54e738a8144eba2aa35218d88faaf1f26032a041474df61ebc393
-  data.tar.gz: 5d0eed00df648f251b43148b185dab5f05b07068ed225d831584e5a831d41b8a
+  metadata.gz: 3abfc7ee1372098804789576ac4fb36dbfb33a2cce2e48cd2dda70b975a2a1f6
+  data.tar.gz: 9ed9618bde6dd268b39f516428c63c07a3aa86006323a0dd0b231a421e6a4c68
 SHA512:
-  metadata.gz: 78c673d3df0f2a968f44f9fab440c11831de686684d505ac3224ac937a470b0a773c1353a4c37eeb703fdf00fa13dab0a799f59e5ff5596ef75ab32860c0a9b4
-  data.tar.gz: 735f2eea8437315bf330e9d31f7e3fd9b910b3da8b7c9a3792e9b06f4628789798a4aeef089064baac2db412a0fefbeb948908c50bccb4ee6fdfba9497c8f0d4
+  metadata.gz: 3ab235a93802052f17166cf1bda8a3cd75ee20def1c669c9b5ccf7bb4d7633ae2ddffec6cc01f57e3bf2c98aaf652731a1deb7c2450e658da76ae8092e3790a1
+  data.tar.gz: 4430507594bdecbb95aff494ed0e8dc1a71d22111abecafec19a801d3d4445d1a32dfe5fd861b330515d7b63ba0a9867d53e088e1c2a3d206b13cf9147a09cd1

data/.version

@@ -1 +1 @@
-0.4.0
+0.5.2

data/lib/adapters/sequel.rb

@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+
+require 'typero'
+
+module Sequel::Plugins::TyperoAttributes
+  module ClassMethods
+    def attributes opts={}, &block
+      instance_variable_set :@typero, Typero.new(&block)
+
+      # attributes migrate: true do ...
+      AutoMigrate.typero to_s.tableize.to_sym if opts[:migrate] && Lux.config.migrate
+    end
+
+    def typero
+      instance_variable_get :@typero
+    end
+  end
+
+  module InstanceMethods
+    # calling typero! on any object will validate all fields
+    def typero! field_name=nil
+      typero = self.class.typero || return
+
+      typero.validate(self) do |name, err|
+        errors.add(name, err) unless (errors.on(name) || []).include?(err)
+      end
+
+      # this are rules unique to database, so we check them here
+      typero.rules.each do |field, rule|
+        # check uniqe fields
+        if rule[:unique]
+          id    = self[:id] || 0
+          value = self[field]
+
+          # 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 = rule[:unique].class == TrueClass ? %[Value '"#{value}"' for #{field} allready exists] : rule[:unique]
+            errors.add(field, error) unless (errors.on(field) || []).include?(error)
+          end
+        end
+
+        # check protected fields
+        if rule[:protected] && self[:id]
+          if column_changed?(field)
+            error = rule[:protected].class == TrueClass ? "value once defined can't be overwritten." : rule[:protected]
+            errors.add(field, error) unless (errors.on(field) || []).include?(error)
+          end
+        end
+      end
+
+      # check single field if single field given
+      if field_name
+        raise ArgumentError.new 'Field :%s not found in %s' % [field_name, self] unless self[field_name]
+        return unless errors.on(field_name)
+
+        errors.on(field_name).join(', ')
+      end
+
+      true
+    end
+
+    def validate
+      typero!
+      super
+    end
+  end
+
+  module DatasetMethods
+
+  end
+end
+
+Sequel::Model.plugin :typero_attributes
+

data/lib/typero.rb

@@ -43,7 +43,7 @@ class Typero
     # Typero.set(:label, 'Foo bar') -> "foo-bar"
     def set type, value, opts={}
       check = Typero::Type.load(type).new value, opts
-      check.set
+      check.value
     end
   end
 
@@ -52,76 +52,11 @@ class Typero
   # accepts dsl block to
   def initialize hash={}, &block
     @rules = {}
+    @db    = []
     hash.each { |k, v| set(k, v) }
     instance_exec &block if block
   end
 
-  # set :age, type: :integer -> integer :age
-  # email :email
-  # set :email, [:emails]
-  # email [:emails]
-  def method_missing name, *args, &block
-    field = args.shift
-
-    if field.class == Array
-      field = field.first
-      name  = [name]
-    end
-
-    set field, type=name, *args
-  end
-
-  # coerce opts values
-  def parse_option opts
-    opts[:type] ||= 'string'
-    opts[:req] = opts.delete(:required) unless opts[:required].nil?
-
-    if opts[:type].is_a?(Array)
-       opts[:array_type] = opts[:type][0] if opts[:type][0]
-       opts[:type] = 'array'
-    end
-
-    opts[:type] = opts[:type].to_s.downcase
-
-    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
-
-  # used in dsl to define value
-  def set field, type=String, opts={}
-    opts = type.is_a?(Hash) ? type : opts.merge(type: type)
-
-    opts[:type] ||= :string
-    klass = Typero::Type.load opts[:type]
-    @rules[field] = parse_option opts
-  end
-
-  def safe_type type
-    type.to_s.gsub(/[^\w]/,'').classify
-  end
-
-  # adds error to array or prefixes with field name
-  def add_error field, msg
-    if @errors[field]
-      @errors[field] += ', %s' % msg
-    else
-      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
-
   # validates any instance object or object with hash variable interface
   # it also coarces values
   def validate instance
@@ -165,8 +100,97 @@ class Typero
     errors = validate instance
     errors.keys.length == 0
   end
+
+  # returns field, db_type, db_opts
+  def db_schema
+    out = @rules.inject([]) do |total, (field, opts)|
+      type, opts = Typero::Type.load(opts[:type]).new(nil, opts).db_field
+      total << [type, field, opts]
+    end
+
+    out += @db if @db[0]
+
+    out
+  end
+
+  private
+
+  # adds error to array or prefixes with field name
+  def add_error field, msg
+    if @errors[field]
+      @errors[field] += ', %s' % msg
+    else
+      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
+
+  # used in dsl to define value
+  def set field, type=String, opts={}
+    opts = type.is_a?(Hash) ? type : opts.merge(type: type)
+    opts[:type] ||= :string
+    opts[:req]    = true if opts[:null].class == FalseClass
+    klass = Typero::Type.load opts[:type]
+    @rules[field] = parse_option opts
+  end
+
+  def safe_type type
+    type.to_s.gsub(/[^\w]/,'').classify
+  end
+
+  # coerce opts values
+  def parse_option opts
+    opts[:type] ||= 'string'
+
+    if opts[:type].is_a?(Array)
+       opts[:array_type] = opts[:type][0] if opts[:type][0]
+       opts[:type] = 'array'
+    end
+
+    opts[:type] = opts[:type].to_s.downcase
+
+    opts[:required]    = opts.delete(:req)  unless opts[:req].nil?
+    opts[:unique]      = opts.delete(:uniq) unless opts[:uniq].nil?
+    opts[:description] = opts.delete(:desc) unless opts[:desc].nil?
+
+    opts
+  end
+
+
+  # pass values for db_schema only
+  # db :timestamps
+  # db :add_index, :code -> t.add_index :code
+  def db *args
+    @db.push args
+  end
+
+  # set :age, type: :integer -> integer :age
+  # email :email
+  # set :email, [:emails]
+  # email [:emails]
+  def method_missing name, *args, &block
+    field = args.shift
+
+    if field.class == Array
+      field = field.first
+      name  = [name]
+    end
+
+    name = args.shift if name == :set
+
+    set field, type=name, *args
+  end
 end
 
 require_relative 'typero/type'
 
-Dir['%s/typero/type/*.rb' % File.dirname(__FILE__)].each { |file| require file }
+Dir['%s/typero/type/*.rb' % __dir__].each do |file|
+  require file
+end
+
+# load Sequel adapter is Sequel is available
+require_relative './adapters/sequel' if defined?(Sequel)

data/lib/typero/type.rb

@@ -9,28 +9,21 @@ class Typero::Type
 
   ###
 
-  def initialize(value, opts={})
+  def initialize value, opts={}
     @value = value
     @opts  = opts
   end
 
   # default validation for any type
-  def validate(what)
+  def validate
     true
   end
 
+  # get error from option or the default one
   def error_for name
     @opts[name] || send(name)
   end
 
-  def get
-    @value
-  end
-
-  def set
-    @value
-  end
-
   def default
     nil
   end

data/lib/typero/type/array.rb

@@ -5,7 +5,10 @@ class Typero::ArrayType < Typero::Type
 
   def set
     unless @value.class.to_s.index('Array')
-      @value = @value.to_s.sub(/^\{/,'').sub(/\}$/,'').split(/\s*,\s*/)
+      @value = @value.to_s.sub(/^\{/,'').sub(/\}$/,'')
+
+      # split on new line and comma by default
+      @value = @value.split(/\s*[,\n]\s*/)
     end
 
     @value.uniq!
@@ -40,5 +43,13 @@ class Typero::ArrayType < Typero::Type
   def value_in_list_error
     'value in list'
   end
+
+  def db_field
+    check  = Typero::Type.load(@opts[:array_type]).new nil, {}
+    schema = check.db_field
+    schema[1] ||= {}
+    schema[1].merge! array: true
+    schema
+  end
 end
 

data/lib/typero/type/boolean.rb

@@ -6,5 +6,11 @@ class Typero::BooleanType < Typero::Type
   def set
     @value = [true, 1, '1', 'true', 'on'].include?(@value) ? true : false
   end
+
+  def db_field
+    opts = {}
+    opts[:default]  = @opts[:default] || false
+    [:boolean, opts]
+  end
 end
 

data/lib/typero/type/currency.rb

@@ -0,0 +1,17 @@
+require_relative './float'
+
+class Typero::CurrencyType < Typero::FloatType
+
+  def set
+    @value = @value.to_f.round(2)
+  end
+
+  def db_field
+    opts = {}
+    opts[:precision] = 8
+    opts[:scale]     = 2
+    [:decimal, opts]
+  end
+
+end
+

data/lib/typero/type/date.rb

@@ -0,0 +1,6 @@
+class Typero::DateType < Typero::Type
+  def set
+    @value = @value.to_s.downcase.gsub(/[^\d\-\.\s]/, '')
+  end
+end
+

data/lib/typero/type/datetime.rb

@@ -0,0 +1,6 @@
+class Typero::DatetimeType < Typero::Type
+  def set
+    @value = @value.to_s.downcase.gsub(/[^\d\-\.\s\:]/, '')
+  end
+end
+

data/lib/typero/type/email.rb

@@ -17,5 +17,11 @@ class Typero::EmailType < Typero::Type
     'is missing @'
   end
 
+  def db_field
+    opts = {}
+    opts[:limit] = @opts[:max] || 120
+    opts[:null]  = false if @opts[:req]
+    [:string, opts]
+  end
 end
 

data/lib/typero/type/float.rb

@@ -17,5 +17,11 @@ class Typero::FloatType < Typero::Type
     "max lenght is %s"
   end
 
+  def db_field
+    opts = {}
+    opts[:null] = false if @opts[:req]
+    [:float, opts]
+  end
+
 end
 

data/lib/typero/type/geography.rb

@@ -0,0 +1,13 @@
+# Posrgre geography data type
+# covert google loc to field, auto fix other values
+
+class Typero::GeographyType < Typero::Type
+  def default
+    false
+  end
+
+  def db_field
+    [:geography]
+  end
+end
+

data/lib/typero/type/hash.rb

@@ -10,5 +10,9 @@ class Typero::HashType < Typero::Type
   def not_hash_type_error
     'value is not hash type'
   end
+
+  def db_field
+    [:jsonb, {}]
+  end
 end
 

data/lib/typero/type/integer.rb

@@ -15,5 +15,11 @@ class Typero::IntegerType < Typero::Type
   def max_value_error
     'max is %s, got %s'
   end
+
+  def db_field
+    opts = {}
+    opts[:null]  = false if @opts[:req]
+    [:integer, opts]
+  end
 end
 

data/lib/typero/type/label.rb

@@ -10,4 +10,11 @@ class Typero::LabelType < Typero::Type
   def unallowed_characters_error
     'label is having unallowed characters'
   end
+
+  def db_field
+    opts = {}
+    opts[:null]  = false if @opts[:req]
+    opts[:limit] = 30
+    [:string, opts]
+  end
 end

data/lib/typero/type/oib.rb

@@ -30,5 +30,12 @@ class Typero::OibType < Typero::Type
   def not_an_oib_error
     'not in an OIB format'
   end
+
+  def db_field
+    opts = {}
+    opts[:null]  = false if @opts[:req]
+    opts[:limit] = 11
+    [:string, opts]
+  end
 end
 

data/lib/typero/type/point.rb

@@ -0,0 +1,25 @@
+class Typero::PointType < Typero::Type
+  def set
+    if @value.present?
+      if @value.include?('/@')
+        point = @value.split('/@', 2).last.split(',')
+        @value = [point[0], point[1]].join(',')
+      end
+
+      unless @value.include?('POINT')
+        point = @value.sub(/,\s*/, ' ')
+        @value = 'SRID=4326;POINT(%s)' % point
+      end
+    end
+  end
+
+  def validate
+    raise TypeError, error_for(:unallowed_characters_error) unless @value =~ /^SRID=4326;POINT\(/
+  end
+
+  def db_field
+    [:geography, {}]
+  end
+
+end
+

data/lib/typero/type/string.rb

@@ -18,5 +18,12 @@ class Typero::StringType < Typero::Type
   def max_length_error
     'max lenght is %s, you have %s'
   end
+
+  def db_field
+    opts = {}
+    opts[:limit] = @opts[:max] || 255
+    opts[:null]  = false if @opts[:req]
+    [:string, opts]
+  end
 end
 

data/lib/typero/type/text.rb

@@ -0,0 +1,7 @@
+class Typero::TextType < Typero::StringType
+  def db_field
+    opts = {}
+    opts[:null]  = false if @opts[:req]
+    [:text, opts]
+  end
+end

data/lib/typero/type/url.rb

@@ -10,5 +10,11 @@ class Typero::UrlType < Typero::Type
   def not_starting_error
     'URL is not starting with http'
   end
+
+  def db_field
+    opts = {}
+    opts[:null] = false if @opts[:req]
+    [:string, opts]
+  end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: typero
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.2
 platform: ruby
 authors:
 - Dino Reic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-11 00:00:00.000000000 Z
+date: 2019-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fast_blank
@@ -32,17 +32,24 @@ extensions: []
 extra_rdoc_files: []
 files:
 - "./.version"
+- "./lib/adapters/sequel.rb"
 - "./lib/typero.rb"
 - "./lib/typero/type.rb"
 - "./lib/typero/type/array.rb"
 - "./lib/typero/type/boolean.rb"
+- "./lib/typero/type/currency.rb"
+- "./lib/typero/type/date.rb"
+- "./lib/typero/type/datetime.rb"
 - "./lib/typero/type/email.rb"
 - "./lib/typero/type/float.rb"
+- "./lib/typero/type/geography.rb"
 - "./lib/typero/type/hash.rb"
 - "./lib/typero/type/integer.rb"
 - "./lib/typero/type/label.rb"
 - "./lib/typero/type/oib.rb"
+- "./lib/typero/type/point.rb"
 - "./lib/typero/type/string.rb"
+- "./lib/typero/type/text.rb"
 - "./lib/typero/type/url.rb"
 homepage: https://github.com/dux/typero
 licenses:
@@ -63,8 +70,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.5
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Ruby type system