typero 0.9.5 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0bcd151d7d7b875c6db7aec28c85c3abcf10596a4f596622050d7e18cdb81e9e
-  data.tar.gz: d54b9c76d6587e5872f19deba20febd7430e19022fe869a1360339c8156205d9
+  metadata.gz: 54d18d3e66cf73fd0d6f6c42f319cb744fb3cc3f5e11e5e4a24b961c36792a34
+  data.tar.gz: 65f87c041f1a498c82d707d897d93eab7294a0d373a4d9aca5ec9aefe5da27b7
 SHA512:
-  metadata.gz: 5b639372e86d329ef150809f52f964a459c3faf369a86d219292a2af6b8364ed5c2745079d409944472ec59316cae690e0f1d554cecdeacb625bb5ccf4b39f29
-  data.tar.gz: 0e887a10b853325c7b27f3c90ab57b3c1987d38576e3f1128fb27eb4982d2aaefdbf6e5ded9e80a75c7085c5674686196b13653eed62db853d6d50fe0c15ad39
+  metadata.gz: 1a63e1a470f0e21162f3c11e40fe4977b4432bb30d3f154330840f344b1dc91c49dc453213139b8e5299f4afe587ae3bf6427fa0aabedd0cc0910188e6463ca5
+  data.tar.gz: 0dd2e24597fa25a0543b851fa3218fc69e129fa671c3ed52edf6110994876c14e3ceb88002ebfec130782722b51dee184cf30dbb0012384da9eba7654d8db24c

data/.version

@@ -1 +1 @@
-0.9.5
+0.9.6

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,14 +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
+    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  = {}
@@ -99,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
 
     ###

data/lib/typero/typero.rb

@@ -1,26 +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__)
-  SCHEMAS ||= {}
 
   # check and coerce value
   # Typero.type(:label) -> Typero::LabelType
@@ -55,45 +36,30 @@ module Typero
   # get schema
   # Typero.schema(:blog)
 
-  # get schema with options (as array)
-  # Typero.schema(:blog, :with_schema)
-
-  # get all schema names with type: model
+  # get all schema that matches any option
   # Typero.schema(type: :model)
   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
-          SCHEMAS[klass] = [schema, opts || {}]
-        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
+        # Schema not given, get schema
+        #   Typero.schema type: :model
         out = []
 
-        for key, _ in SCHEMAS
-          schema, opts = _
-          next unless opts[name.keys.first] == name.values.first
-          out.push key.classify
+        for schema in Schema::SCHEMA_STORE.values
+          if schema.opts[name.keys.first] == name.values.first
+            out.push schema.klass
+          end
         end
 
         out
-      elsif klass
-        # Typero.schema :user
-        schema   = SCHEMAS[klass]
-        schema ||= class_finder klass, :schema
-
-        if opts
-          schema
-        else
-          schema.respond_to?(:[]) ? schema[0] : schema
-        end
       else
-        raise ArgumentError, 'Schema type not defined.'
+        # Typero.schema :user
+        Typero::Schema::SCHEMA_STORE[klass] || raise('Schema "%s" not found' % klass)
       end
     end
   end
@@ -104,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.5
+  version: 0.9.6
 platform: ruby
 authors:
 - Dino Reic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-20 00:00:00.000000000 Z
+date: 2022-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fast_blank