typero 0.5.2 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3abfc7ee1372098804789576ac4fb36dbfb33a2cce2e48cd2dda70b975a2a1f6
-  data.tar.gz: 9ed9618bde6dd268b39f516428c63c07a3aa86006323a0dd0b231a421e6a4c68
+  metadata.gz: 448ffb9631eeb66159f13e45da0e28e600f91f3ed58684789740f2ad351a317b
+  data.tar.gz: 41feafdf4c139e47c02dc71c0c5dbdea154b6e75e0b8a746e1b7f41c6beb89d6
 SHA512:
-  metadata.gz: 3ab235a93802052f17166cf1bda8a3cd75ee20def1c669c9b5ccf7bb4d7633ae2ddffec6cc01f57e3bf2c98aaf652731a1deb7c2450e658da76ae8092e3790a1
-  data.tar.gz: 4430507594bdecbb95aff494ed0e8dc1a71d22111abecafec19a801d3d4445d1a32dfe5fd861b330515d7b63ba0a9867d53e088e1c2a3d206b13cf9147a09cd1
+  metadata.gz: 28c28657d7a0c7c5e71b5cfac08eb314a857c9b4e01337666ab38f65c64aa99f1c07a56d3276f8446e0134bc28968b7b34fb13232769c97ed01c6847cdab657e
+  data.tar.gz: 65f56f37df4731adad738862fdb79ed540bdd22a3a85744f519370e4ae5d905bafa74ab4720d17d6916c068a4f9508225d20cde64a6735c29a9f9e978a9ef145

data/.version

@@ -1 +1 @@
-0.5.2
+0.7.0

data/lib/adapters/sequel.rb

@@ -1,19 +1,8 @@
 # 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
+    attr_accessor :typero
   end
 
   module InstanceMethods
@@ -27,6 +16,8 @@ module Sequel::Plugins::TyperoAttributes
 
       # this are rules unique to database, so we check them here
       typero.rules.each do |field, rule|
+        self[field] ||= {} if rule[:type] == 'hash'
+
         # check uniqe fields
         if rule[:unique]
           id    = self[:id] || 0

data/lib/typero.rb

@@ -1,193 +1,9 @@
-# rules = Typero.new do
-#   set :name, String, req: true
-#   set :email, :email, req: true
-#   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| ... }
-
-class Typero
-  attr_reader :rules
-
-  VERSION = File.read File.expand_path '../.version', File.dirname(__FILE__)
-
-  class << self
-    # validate single value in type
-    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
-      h = { field => value }
-
-      rule = new
-      rule.set field, type, opts
-
-      if error = rule.validate(h)[field]
-        block_given? ? yield(error) : raise(TypeError.new(error))
-      end
-
-      h[field]
-    end
-
-    # check and coerce value
-    # Typero.set(:label, 'Foo bar') -> "foo-bar"
-    def set type, value, opts={}
-      check = Typero::Type.load(type).new value, opts
-      check.value
-    end
-  end
-
-  ###
-
-  # accepts dsl block to
-  def initialize hash={}, &block
-    @rules = {}
-    @db    = []
-    hash.each { |k, v| set(k, v) }
-    instance_exec &block if block
-  end
-
-  # validates any instance object or object with hash variable interface
-  # it also coarces values
-  def validate instance
-    @errors = {}
-
-    @rules.each do |field, opts|
-      # set value to default if value is blank and default given
-      instance[field] = opts[:default] if opts[:default] && instance[field].blank?
-
-      # get field value
-      value = instance[field]
-
-      if value.present?
-        klass = 'Typero::%sType' % safe_type(opts[:type])
-        check = klass.constantize.new value, opts
-        check.value = check.default if check.value.nil?
-
-        unless check.value.nil?
-          begin
-            check.set
-            check.validate
-            instance[field] = check.value
-          rescue TypeError => e
-            add_error field, e.message
-          end
-        end
-      elsif opts[:required]
-        msg = opts[:required].class == TrueClass ? 'is required' : opts[:req]
-        add_error field, msg
-      end
-    end
-
-    if @errors.keys.length > 0 && block_given?
-      @errors.each { |k,v| yield(k, v) }
-    end
-
-    @errors
-  end
-
-  def valid? instance
-    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
-
+# base libs
+require_relative 'typero/typero'
+require_relative 'typero/schema'
 require_relative 'typero/type'
 
+# checker types
 Dir['%s/typero/type/*.rb' % __dir__].each do |file|
   require file
 end

data/lib/typero/schema.rb

@@ -0,0 +1,84 @@
+# Base class for schema validation
+
+class Typero
+  class Schema
+    attr_reader :rules, :db_rules
+
+    def initialize &block
+      @db_rules = []
+      @rules    = {}
+      instance_exec &block
+    end
+
+    private
+
+    # used in dsl to define value
+    def set field, type=String, opts={}
+      raise "Field name not given (Typero)" unless field
+
+      field = field.to_sym
+      opts  = type.is_a?(Hash) ? type : opts.merge(type: type)
+      opts[:type]   ||= :string
+      opts[:required] = true if opts[:null].class == FalseClass
+
+      db :add_index, field if opts.delete(:index)
+
+      klass = Typero::Type.load opts[:type]
+      @rules[field] = parse_option opts
+    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_rules.push args
+    end
+
+    def link klass, opts={}
+      klass.is! Class
+
+      # TODO: Add can? update check before save
+      integer '%s_id' % klass.to_s.tableize.singularize, opts
+    end
+
+    def hash name
+      set name, :hash
+    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
+end

data/lib/typero/type.rb

@@ -1,31 +1,42 @@
-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
-  end
-
-  # default validation for any type
-  def validate
-    true
-  end
-
-  # get error from option or the default one
-  def error_for name
-    @opts[name] || send(name)
-  end
-
-  def default
-    nil
+# Master class
+
+class Typero
+  class Type
+    attr_accessor :opts
+    attr_accessor :value
+
+    class << self
+      def load name
+        klass = 'Typero::%sType' % name.to_s.gsub(/[^\w]/,'').classify
+
+        if const_defined? klass
+          klass.constantize
+        else
+          raise ArgumentError, 'Typero type "%s" is not defined (%s)' % [name, klass]
+        end
+      end
+    end
+
+    ###
+
+    def initialize value, opts={}
+      @value = value
+      @opts  = opts
+    end
+
+    # default validation for any type
+    def validate
+      true
+    end
+
+    # get error from option or the default one
+    def error_for name
+      @opts[name] || send(name)
+    end
+
+    def default
+      nil
+    end
   end
 end
 

data/lib/typero/type/array.rb

@@ -27,8 +27,8 @@ class Typero::ArrayType < Typero::Type
   end
 
   def validate
-    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]
+    raise TypeError, error_for(:min_error) % @opts[:min] if @opts[:min] && @value.length < @opts[:min]
+    raise TypeError, error_for(:max_error) % @opts[:max] if @opts[:max] && @value.length > @opts[:max]
     true
   end
 

data/lib/typero/type/date.rb

@@ -2,5 +2,9 @@ class Typero::DateType < Typero::Type
   def set
     @value = @value.to_s.downcase.gsub(/[^\d\-\.\s]/, '')
   end
+
+  def db_field
+    [:date, {}]
+  end
 end
 

data/lib/typero/type/datetime.rb

@@ -2,5 +2,9 @@ class Typero::DatetimeType < Typero::Type
   def set
     @value = @value.to_s.downcase.gsub(/[^\d\-\.\s\:]/, '')
   end
+
+  def db_field
+    [:datetime, {}]
+  end
 end
 

data/lib/typero/type/email.rb

@@ -20,7 +20,7 @@ class Typero::EmailType < Typero::Type
   def db_field
     opts = {}
     opts[:limit] = @opts[:max] || 120
-    opts[:null]  = false if @opts[:req]
+    opts[:null]  = false if @opts[:required]
     [:string, opts]
   end
 end

data/lib/typero/type/float.rb

@@ -19,7 +19,7 @@ class Typero::FloatType < Typero::Type
 
   def db_field
     opts = {}
-    opts[:null] = false if @opts[:req]
+    opts[:null] = false if @opts[:required]
     [:float, opts]
   end
 

data/lib/typero/type/hash.rb

@@ -3,6 +3,10 @@ class Typero::HashType < Typero::Type
     {}
   end
 
+  def set
+    @value = @value.to_h
+  end
+
   def validate
     raise TypeError, error_for(:not_hash_type_error) unless @value.is_a?(Hash)
   end
@@ -12,7 +16,9 @@ class Typero::HashType < Typero::Type
   end
 
   def db_field
-    [:jsonb, {}]
+    [:jsonb, {
+      null: false
+    }]
   end
 end
 

data/lib/typero/type/image.rb

@@ -0,0 +1,28 @@
+class Typero::ImageType < Typero::Type
+  # FORMATS = %w[jpg jpeg gif png svg]
+
+  def set
+    @value = 'https://%s' % @value unless @value.include?('://')
+  end
+
+  def validate
+    raise TypeError, error_for(:not_starting_error) unless @value =~ /^https?:\/\/./
+    # ext = @value.split('.').last.downcase
+    # raise TypeError, error_for(:not_image_format) unless FORMATS.include?(ext)
+  end
+
+  def not_starting_error
+    'URL is not starting with http'
+  end
+
+  # def not_image_format
+  #   'URL is not ending with %s' % FORMATS.join(', ')
+  # end
+
+  def db_field
+    opts = {}
+    opts[:null] = false if @opts[:required]
+    [:string, opts]
+  end
+end
+

data/lib/typero/type/integer.rb

@@ -18,7 +18,8 @@ class Typero::IntegerType < Typero::Type
 
   def db_field
     opts = {}
-    opts[:null]  = false if @opts[:req]
+    opts[:null]    = false if @opts[:required]
+    opts[:default] = @opts[:default]
     [:integer, opts]
   end
 end

data/lib/typero/type/label.rb

@@ -13,8 +13,7 @@ class Typero::LabelType < Typero::Type
 
   def db_field
     opts = {}
-    opts[:null]  = false if @opts[:req]
-    opts[:limit] = 30
+    opts[:limit]   = 30
     [:string, opts]
   end
 end

data/lib/typero/type/oib.rb

@@ -33,7 +33,7 @@ class Typero::OibType < Typero::Type
 
   def db_field
     opts = {}
-    opts[:null]  = false if @opts[:req]
+    opts[:null]  = false if @opts[:required]
     opts[:limit] = 11
     [:string, opts]
   end

data/lib/typero/type/point.rb

@@ -1,12 +1,16 @@
+# for postgres - select st_asewkt(lon_lat) || st_astext(lon_lat)
+# point = @object.class.xselect("ST_AsText(#{field}) as #{field}").where(id: @object.id).first[field.to_sym]
+
 class Typero::PointType < Typero::Type
   def set
+    ap @value
     if @value.present?
       if @value.include?('/@')
         point = @value.split('/@', 2).last.split(',')
         @value = [point[0], point[1]].join(',')
       end
 
-      unless @value.include?('POINT')
+      if !@value.include?('POINT') && @value.include?(',')
         point = @value.sub(/,\s*/, ' ')
         @value = 'SRID=4326;POINT(%s)' % point
       end
@@ -14,7 +18,9 @@ class Typero::PointType < Typero::Type
   end
 
   def validate
-    raise TypeError, error_for(:unallowed_characters_error) unless @value =~ /^SRID=4326;POINT\(/
+    if @value && @value.include?(',') && !@value =~ /^SRID=4326;POINT\(/
+      raise TypeError, error_for(:unallowed_characters_error)
+    end
   end
 
   def db_field

data/lib/typero/type/string.rb

@@ -21,8 +21,9 @@ class Typero::StringType < Typero::Type
 
   def db_field
     opts = {}
-    opts[:limit] = @opts[:max] || 255
-    opts[:null]  = false if @opts[:req]
+    opts[:limit]   = @opts[:max] || 255
+    opts[:null]    = false if @opts[:required]
+    opts[:default] = @opts[:default]
     [:string, opts]
   end
 end

data/lib/typero/type/text.rb

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

data/lib/typero/type/url.rb

@@ -13,7 +13,7 @@ class Typero::UrlType < Typero::Type
 
   def db_field
     opts = {}
-    opts[:null] = false if @opts[:req]
+    opts[:null] = false if @opts[:required]
     [:string, opts]
   end
 end

data/lib/typero/typero.rb

@@ -0,0 +1,191 @@
+# rules = Typero.new do
+#   set :name, String, req: true
+#   set :email, :email, req: true
+#   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| ... }
+
+class Typero
+  SCHEMAS = {}
+  VERSION = File.read File.expand_path '../../.version', File.dirname(__FILE__)
+
+  class << self
+    # validate single value in type
+    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
+      h = { field => value }
+
+      rule = new do
+        set field, type, opts
+      end
+
+      if error = rule.validate(h)[field]
+        block_given? ? yield(error) : raise(TypeError.new(error))
+      end
+
+      h[field]
+    end
+
+    # check and coerce value
+    # Typero.set(:label, 'Foo bar') -> "foo-bar"
+    def set type, value, opts={}
+      check = Typero::Type.load(type).new value, opts
+      check.value
+    end
+
+    # list loaded classes
+    def list type=nil
+      SCHEMAS
+        .select { |k, v| type ? v[1] == type : true; }
+        .keys
+    end
+
+    # def schema table_name, &block
+    #   schema = Typero.new(&block)
+
+    #   if Lux.config.migrate
+    #     AutoMigrate.typero table_name, schema
+    #   else
+    #     klass = table_name.to_s.classify.constantize
+    #     klass.typero = schema
+    #   end
+    # end
+  end
+
+  ###
+
+  # accepts dsl block to
+  def initialize name=nil, &block
+    type = :default
+
+    if name.is_a?(Hash)
+      type = name.keys.first
+      name = name.values.first
+    end
+
+    if block_given?
+      @schema = Schema.new &block
+
+      if name
+         SCHEMAS[name_fix(name)] = [@schema, type]
+      end
+    elsif name
+      schema_name = name_fix(name)
+      @schema = SCHEMAS[schema_name][0] || raise(ArgumentError.new('Schema nemed "%s" not found (%s)' % [schema_name, name]))
+    else
+      raise ArgumentError, 'No block or schema name given'
+    end
+  end
+
+  # validates any instance object or object with hash variable interface
+  # it also coarces values
+  def validate instance
+    @errors = {}
+
+    @schema.rules.each do |field, opts|
+      # set value to default if value is blank and default given
+      instance[field] = opts[:default] if opts[:default] && instance[field].blank?
+
+      # get field value
+      value = instance[field]
+
+      if value.present?
+        klass = 'Typero::%sType' % safe_type(opts[:type])
+        check = klass.constantize.new value, opts
+        check.value = check.default if check.value.nil?
+
+        unless check.value.nil?
+          begin
+            check.set
+            check.validate
+            instance[field] = check.value
+          rescue TypeError => e
+            add_error field, e.message
+          end
+        end
+      elsif opts[:required]
+        msg = opts[:required].class == TrueClass ? 'is required' : opts[:required]
+        add_error field, msg
+      end
+    end
+
+    if @errors.keys.length > 0 && block_given?
+      @errors.each { |k,v| yield(k, v) }
+    end
+
+    @errors
+  end
+
+  def valid? instance
+    errors = validate instance
+    errors.keys.length == 0
+  end
+
+  # returns field, db_type, db_opts
+  def db_schema
+    out = @schema.rules.inject([]) do |total, (field, opts)|
+      type, opts = Typero::Type.load(opts[:type]).new(nil, opts).db_field
+      total << [type, field, opts]
+    end
+
+    out += @schema.db_rules
+
+    out
+  end
+
+  # iterate trough all the ruels via block interface
+  # schema.rules do |field, opts|
+  # schema.rules(:url) do |field, opts|
+  def rules filter=nil, &block
+    return @schema.rules unless filter
+    out = @schema.rules
+    out = out.select { |k,v| v[:type].to_s == filter.to_s || v[:array_type].to_s == filter.to_s } if filter
+    return out unless block_given?
+
+    for k, v in out
+      yield k, v
+    end
+  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 && 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
+
+  def safe_type type
+    type.to_s.gsub(/[^\w]/,'').classify
+  end
+
+  def name_fix name
+    if name.is_a?(Symbol)
+      name.to_s.classify if name.is_a?(Symbol)
+    else
+      name.to_s
+    end
+  end
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: typero
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.7.0
 platform: ruby
 authors:
 - Dino Reic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-30 00:00:00.000000000 Z
+date: 2020-02-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fast_blank
@@ -34,6 +34,7 @@ files:
 - "./.version"
 - "./lib/adapters/sequel.rb"
 - "./lib/typero.rb"
+- "./lib/typero/schema.rb"
 - "./lib/typero/type.rb"
 - "./lib/typero/type/array.rb"
 - "./lib/typero/type/boolean.rb"
@@ -42,8 +43,8 @@ files:
 - "./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/image.rb"
 - "./lib/typero/type/integer.rb"
 - "./lib/typero/type/label.rb"
 - "./lib/typero/type/oib.rb"
@@ -51,6 +52,7 @@ files:
 - "./lib/typero/type/string.rb"
 - "./lib/typero/type/text.rb"
 - "./lib/typero/type/url.rb"
+- "./lib/typero/typero.rb"
 homepage: https://github.com/dux/typero
 licenses:
 - MIT
@@ -70,7 +72,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Ruby type system

data/lib/typero/type/geography.rb

@@ -1,13 +0,0 @@
-# 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
-