typero 0.9.4 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f8d03e15d714e38774a8f817aaf02c710e3ddca8b65f9d413aefb01678bd31b
-  data.tar.gz: ebd4cb0d01d43f7a93c3e2575daa832ba960dd8ece2a284676c763f4c43ef30c
+  metadata.gz: 54d18d3e66cf73fd0d6f6c42f319cb744fb3cc3f5e11e5e4a24b961c36792a34
+  data.tar.gz: 65f87c041f1a498c82d707d897d93eab7294a0d373a4d9aca5ec9aefe5da27b7
 SHA512:
-  metadata.gz: 7a8dc1fdac410f59695f486860f078359a8344492335759b2df69f2fa382e3366000d70d994c4c05bdfa613c6c9dc207b66fefd2e4731f97dca97f94eda94b85
-  data.tar.gz: e7c6581d6fc6558687b023505564c669f59ce8e5dc0a298392f83fab92e1f47b27704a0b7644143161c6a264d601c2ac2a382c8cc0bdfb54f97ea52789846891
+  metadata.gz: 1a63e1a470f0e21162f3c11e40fe4977b4432bb30d3f154330840f344b1dc91c49dc453213139b8e5299f4afe587ae3bf6427fa0aabedd0cc0910188e6463ca5
+  data.tar.gz: 0dd2e24597fa25a0543b851fa3218fc69e129fa671c3ed52edf6110994876c14e3ceb88002ebfec130782722b51dee184cf30dbb0012384da9eba7654d8db24c

data/.version

@@ -1 +1 @@
-0.9.4
+0.9.6

data/lib/adapters/sequel.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module Sequel::Plugins::TyperoAttributes
+module Sequel::Plugins::Typero
   module ClassMethods
     def typero
       Typero.schema self
@@ -48,5 +48,5 @@ module Sequel::Plugins::TyperoAttributes
   end
 end
 
-Sequel::Model.plugin :typero_attributes
+# Sequel::Model.plugin :typero
 

data/lib/typero/params.rb

@@ -1,4 +1,5 @@
-# Base class for schema validation
+# Base class for schema validation.
+# Accepts set of params and returns hash of porsed rules
 
 module Typero
   class Params
@@ -114,7 +115,7 @@ module Typero
     # db :timestamps
     # db :add_index, :code -> t.add_index :code
     def db *args
-      @db_rules.push args
+      @db_rules.push args.unshift(:db_rule!)
     end
 
     # set :age, type: :integer -> integer :age
@@ -126,4 +127,4 @@ module Typero
       set field, *args, &block
     end
   end
-end
+end

data/lib/typero/schema.rb

@@ -1,17 +1,51 @@
+# Typero.schema :user, type: :model do
+
+# Typero.schema :some_name, type: :model, db: DB_LOG do
+#   set :name, String, req: true
+#   set :email, :email, req: true
+#   set :emails, [:email], min: 2
+# end
+#
+# rules = Typero.schema :some_name
+#
+# or
+#
+# rules = Typero.schema do
+#   string :name, req: true    # generic email string
+#   email :email, req: true    # string of type email
+#   emails [:skills], min: 2   # list of emails in filed named "emails"
+# end
+#
+# errors = rules.validate (@object || @hash)
+# rules.valid? (@object)
+# rules.validate(@object) {|errors| ... }
+
 module Typero
   class Schema
-    SCHEMAS = {}
-    TYPES   = {}
+    SCHEMA_STORE ||= {}
+
+    attr_reader :klass
+    attr_reader :schema
+    attr_reader :opts
 
     # accepts dsl block to
-    def initialize &block
-      raise "Params not defined" unless block_given?
-      @schema = Params.new &block
+    def initialize name, opts = nil, &block
+      if block
+        @opts   = opts || {}
+        @schema = Params.new &block
+
+        if name
+          @klass = name
+          SCHEMA_STORE[name] = self
+        end
+      else
+        raise "Use Typero.schema(:name) to load stored schema"
+      end
     end
 
     # validates any instance object with hash variable interface
     # it also coarces values
-    def validate object, options=nil
+    def validate object, options = nil
       @options = options || {}
       @object  = object
       @errors  = {}
@@ -67,11 +101,12 @@ module Typero
 
           # if value is not list of allowed values, raise error
           allowed = opts[:allow] || opts[:allowed] || opts[:values]
-          if value && allowed && !allowed.include?(value)
+          if value && allowed && !allowed.map(&:to_s).include?(value.to_s)
             add_error field, 'Value "%s" is not allowed' % value, opts
           end
 
           value = check_filed_value field, value, opts
+
           add_required_error field, value, opts
         end
 
@@ -101,7 +136,7 @@ module Typero
         schema_opts = @schema.rules[field]
         opts[:array] = true if schema_opts[:array]
 
-        total << [type, field, opts]
+        total << [field, type, opts]
       end
 
       out += @schema.db_rules

data/lib/typero/type/type.rb

@@ -71,6 +71,10 @@ module Typero
 
         false
       end
+
+      def db_schema
+        new(nil).db_schema
+      end
     end
 
     ###
@@ -98,7 +102,11 @@ module Typero
         opts[:default].nil? ? default : opts[:default]
       else
         set
-        error_for(:not_in_range, opts[:values].join(', ')) if opts[:values] && !opts[:values].include?(@value)
+
+        if opts[:values] && !opts[:values].map(&:to_s).include?(@value.to_s)
+          error_for(:not_in_range, opts[:values].join(', '))
+        end
+
         value
       end
     end

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

@@ -7,6 +7,7 @@ class Typero::HashType < Typero::Type
     end
 
     @value ||= {}
+    @value.delete_if {|_, v| v.empty? }
 
     error_for(:not_hash_type_error) unless @value.respond_to?(:keys) && @value.respond_to?(:values)
 

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

@@ -3,7 +3,6 @@ class Typero::ModelType < Typero::Type
     value(&:to_h)
 
     errors = {}
-
     schema = opts[:model].is_a?(Typero::Schema) ? opts[:model] : Typero.schema(opts[:model])
 
     # by default models in schems are strict true (remove undefined keys)
@@ -11,6 +10,8 @@ class Typero::ModelType < Typero::Type
       errors[field] = error
     end
 
+    @value.delete_if {|_, v| v.empty? }
+
     raise TypeError.new errors.to_json if errors.keys.first
   end
 

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

@@ -4,12 +4,13 @@
 class Typero::PointType < Typero::Type
   def set
     if value.include?('/@')
+      # extract value from google maps link
       point = value.split('/@', 2).last.split(',')
       value { [point[0], point[1]].join(',') }
     end
 
     if !value.include?('POINT') && value.include?(',')
-      point = value.sub(/,\s*/, ' ')
+      point = value.sub(/\s*,\s*/, ' ')
       value { 'SRID=4326;POINT(%s)' % point }
     end
 

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

@@ -0,0 +1,20 @@
+# Same as point, but we keep data as a float in Array
+
+class Typero::SimplePointType < Typero::Type
+  def set
+    if value.include?('/@')
+      # extract value from google maps link
+      point = value.split('/@', 2).last.split(',')[0,2]
+      value { point }
+    end
+
+    if !value.include?('POINT') && value.include?(',')
+      value { value.split(/\s*,\s*/)[0,2] }
+    end
+  end
+
+  def db_schema
+    [:float, { array: true }]
+  end
+end
+

data/lib/typero/typero.rb

@@ -1,25 +1,7 @@
-# rules = Typero.schema do
-#   set :name, String, req: true
-#   set :email, :email, req: true
-#   set :skills, [:email], min: 2
-# end
-#
-# or
-#
-# rules = Typero.schema do
-#   string :name, req: true
-#   email :email, req: true
-#   email [:skills], min: 2
-# end
-#
-# errors = rules.validate @object
-# rules.valid?
-# rules.validate(@object) { |errors| ... }
-
 module Typero
   extend self
 
-  VERSION = File.read File.expand_path "../../.version", File.dirname(__FILE__)
+  VERSION ||= File.read File.expand_path "../../.version", File.dirname(__FILE__)
 
   # check and coerce value
   # Typero.type(:label) -> Typero::LabelType
@@ -45,39 +27,39 @@ module Typero
   end
   alias :set :type
 
-  # load or set type schema
+  # type schema
   # Typero.schema(:blog) { ... }
+
+  # type schema with option
   # Typero.schema(:blog, type: :model) { ... }
+
+  # get schema
   # Typero.schema(:blog)
+
+  # get all schema that matches any option
   # Typero.schema(type: :model)
-  def schema name=nil, opts=nil, &block
+  def schema name = nil, opts = nil, &block
     klass = name.to_s.classify if name && !name.is_a?(Hash)
 
     if block_given?
-      Typero::Schema.new(&block).tap do |schema|
-        if klass
-          Typero::Schema::SCHEMAS[klass] = schema
-
-          if opts && opts[:type]
-            Typero::Schema::TYPES[opts[:type]] ||= []
-            Typero::Schema::TYPES[opts[:type]].push klass unless Typero::Schema::TYPES[opts[:type]].include?(klass)
-          end
-        end
-      end
+      # Typero.schema type: :model, db: DB_LOG do
+      Typero::Schema.new(klass, opts, &block)
     else
-      # Schema not given, get schema
       if name.is_a?(Hash)
-        # Typero.schema type: :model
-        if type = name[:type]
-          Typero::Schema::TYPES[type]
+        # Schema not given, get schema
+        #   Typero.schema type: :model
+        out = []
+
+        for schema in Schema::SCHEMA_STORE.values
+          if schema.opts[name.keys.first] == name.values.first
+            out.push schema.klass
+          end
         end
-      elsif klass
-        # Typero.schema :user
-        schema   = Typero::Schema::SCHEMAS[klass]
-        schema ||= class_finder klass, :schema
-        schema || nil
+
+        out
       else
-        raise ArgumentError, 'Schema type not defined.'
+        # Typero.schema :user
+        Typero::Schema::SCHEMA_STORE[klass] || raise('Schema "%s" not found' % klass)
       end
     end
   end
@@ -88,21 +70,4 @@ module Typero
   rescue ArgumentError
     false
   end
-
-  private
-
-  # class_finder :user, :exporter, :representer
-  # find first UserExporter, User::Exporter, User::Representer, UserRepresenter
-  def class_finder *args
-    name = args.shift.to_s.classify
-
-    for el in args
-      for separator in ['_','/']
-        klass = [name, el].join(separator).classify
-        return klass.constantize if const_defined? klass
-      end
-    end
-
-    nil
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: typero
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.6
 platform: ruby
 authors:
 - Dino Reic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-31 00:00:00.000000000 Z
+date: 2022-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fast_blank
@@ -51,6 +51,7 @@ files:
 - "./lib/typero/type/types/model_type.rb"
 - "./lib/typero/type/types/oib_type.rb"
 - "./lib/typero/type/types/point_type.rb"
+- "./lib/typero/type/types/simple_point_type.rb"
 - "./lib/typero/type/types/string_type.rb"
 - "./lib/typero/type/types/text_type.rb"
 - "./lib/typero/type/types/time_type.rb"
@@ -76,7 +77,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: Ruby type system