logic_pro 0.1.1 → 1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b89f8778ba7166bf27fb7d4f24aee4295e819836713b75bccbd8eba0acb86b8
-  data.tar.gz: ddbea924703c05ecf83ff7dbde606c5d40c24dfbd7aff8f5ac97ad5ab4fbf5ca
+  metadata.gz: 5109635393d541398056947ff85c5e7daef1864e889ec7c3ebbef78d7af52a8b
+  data.tar.gz: 1c76b1f3df0632c1c61a28dadaebe8cc08449f2b568f11ae664b23665616db62
 SHA512:
-  metadata.gz: 387fc5e33d7c231ea871df4f74c3fba3115ab0315deb790853728c089f17ad57e6170a77e386ab69b6164f3ce977d3c7a5cfc3dec70a80aa20bb942474bee162
-  data.tar.gz: 19aa8bc09775172d8d3448f4286cff1b01e67241c1632ef0ad24a1457d2cf8f8d5f48e17d813a7c1cbf862100e8cdd65269574e6f099ef36d832f17bff220fe6
+  metadata.gz: 016dff018da0fc260bc147a7fb00338351c6efca715c5fe8e060624555f45f9d0266ad0a3b03e8a490597991b9a1a106a5820ec12570bcc65fab4f109d1455fa
+  data.tar.gz: b72b30d3c2929414972f55600ca1b61c9969c5869bce172a1e0e6074d208c6daf757e098f3aa968feb8d06ef0d128231fa7374d5e74712130564b7c1ac5935bf

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    logic_pro (0.1.0)
+    logic_pro (1.0)
       activemodel
       dry-struct
       interactor
@@ -40,7 +40,7 @@ GEM
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     interactor (3.1.2)
-    minitest (5.16.2)
+    minitest (5.16.3)
     rake (12.3.3)
     rspec (3.11.0)
       rspec-core (~> 3.11.0)

data/lib/logic_pro/active_record_types.rb

@@ -0,0 +1,30 @@
+module LogicPro
+  module ActiveRecordTypes
+    def define_types(classes)
+      classes.each do |active_record_class_name|
+        active_record_class = "::#{active_record_class_name}".constantize
+        type_class_name = active_record_class.to_s.gsub('::', '_')
+
+        record_constructor = Constructor(active_record_class) do |entity|
+          if entity.blank? || entity.class.name == active_record_class.name
+            entity
+          else
+            raise "Invalid collection type #{collection.class} for #{active_record_class.name}"
+          end
+        end
+
+        collection_constructor = Constructor(active_record_class.none.class) do |collection|
+          if collection.respond_to?(:model) && collection.model.name == active_record_class.name
+            collection
+          else
+            raise "Invalid collection type #{collection.class} for #{active_record_class.name}"
+          end
+        end
+
+        const_set(type_class_name, record_constructor.meta(class_name: active_record_class.name))
+
+        const_set("#{type_class_name}Collection", collection_constructor.meta(class_name: active_record_class.none.class))
+      end
+    end
+  end
+end

data/lib/logic_pro/form.rb

@@ -2,9 +2,7 @@ module LogicPro
   class Form < Dry::Struct
     ATTRIBUTES_PROPERTIES = %i[abstract as].freeze
 
-    module Types
-      include LogicPro::Types
-    end
+    Types = LogicPro::Types
 
     transform_keys(&:to_sym)
 

data/lib/logic_pro/interactor_form.rb

@@ -2,13 +2,15 @@ module LogicPro
   module InteractorForm
     extend ActiveSupport::Concern
 
-    module Types
-      include LogicPro::Types
-    end
+    Types = LogicPro::Types
 
     class_methods do
       def context_form
-        @context_form ||= Object.const_set('ContextForm', Class.new(LogicPro::Form))
+        @context_form ||= begin
+          new_class = Class.new(LogicPro::Form)
+
+          const_set('ContextForm', new_class)
+        end
       end
 
       def attribute(*args)
@@ -27,8 +29,8 @@ module LogicPro
         context_form.validates(*args)
       end
 
-      def validate(*args)
-        context_form.validate(*args)
+      def validate(*args, **options)
+        context_form.validate(*args, **options)
       end
     end
 

data/lib/logic_pro/primitive_types.rb

@@ -9,5 +9,6 @@ module LogicPro
     Float = Constructor(::Float, &:to_f)
     Integer = Constructor(::Integer, &:to_i)
     DateTime = Constructor(::DateTime) { |value| ::DateTime.parse(value.to_s) if value.present? }
+    InteractorType = Constructor(::Interactor) { |value| value }
   end
 end

data/lib/logic_pro/types.rb

@@ -1,5 +1,6 @@
 module LogicPro
   module Types
     include LogicPro::PrimitiveTypes
+    extend LogicPro::ActiveRecordTypes
   end
 end

data/lib/logic_pro/version.rb

@@ -1,3 +1,3 @@
 module LogicPro
-  VERSION = "0.1.1"
+  VERSION = '1.1'.freeze
 end

data/lib/logic_pro.rb

@@ -1,7 +1,7 @@
 require 'interactor'
 require 'dry-struct'
 require 'logic_pro/version'
-require 'logic_pro/models_types'
+require 'logic_pro/active_record_types'
 require 'logic_pro/primitive_types'
 require 'logic_pro/types'
 require 'logic_pro/form'

data/logic_pro.gemspec

@@ -18,9 +18,9 @@ Gem::Specification.new do |spec|
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
 
-  spec.add_dependency "dry-struct"
-  spec.add_dependency "interactor"
-  spec.add_dependency "activemodel"
+  spec.add_dependency 'activemodel'
+  spec.add_dependency 'dry-struct'
+  spec.add_dependency 'interactor'
 
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: logic_pro
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: '1.1'
 platform: ruby
 authors:
 - bezrukavyi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-08-09 00:00:00.000000000 Z
+date: 2022-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: dry-struct
+  name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: interactor
+  name: dry-struct
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activemodel
+  name: interactor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -71,13 +71,17 @@ files:
 - bin/console
 - bin/setup
 - lib/logic_pro.rb
+- lib/logic_pro/active_record_types.rb
 - lib/logic_pro/form.rb
 - lib/logic_pro/interactor.rb
 - lib/logic_pro/interactor_form.rb
-- lib/logic_pro/models_types.rb
 - lib/logic_pro/primitive_types.rb
 - lib/logic_pro/types.rb
 - lib/logic_pro/version.rb
+- logic_pro-0.2.gem
+- logic_pro-0.4.1.gem
+- logic_pro-0.4.2.gem
+- logic_pro-1.0.gem
 - logic_pro.gemspec
 homepage: https://github.com/bezrukavyi/logic_pro
 licenses:

data/lib/logic_pro/models_types.rb

@@ -1,24 +0,0 @@
-module LogicPro
-  module ModelsTypes
-    def self.add(base, classes)
-      classes.each do |active_record_class_name|
-        active_record_class = active_record_class_name.constantize
-        type_class_name = active_record_class.to_s.gsub('Ratesmgr::', '').gsub('::', '_')
-
-        base.const_set(type_class_name, base::Instance(active_record_class).meta(class_name: active_record_class.name).optional)
-
-        collection_constructor = base::Constructor(active_record_class.none.class) do |collection|
-          if collection.respond_to?(:model) && collection.model == active_record_class
-            collection
-          else
-            raise "Invalid collection type #{collection.class} for #{active_record_class.name}"
-          end
-        end
-
-        base.const_set("#{type_class_name}Collection", collection_constructor.meta(class_name: active_record_class.none.class))
-      end
-
-      parent
-    end
-  end
-end