tramway-core 1.14.1.1 → 1.14.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8dd03e903c3da051f37a4eefbb5e54a5efe47484cc37d3362ff1162edd25f440
-  data.tar.gz: 6d0f3fac662adafee2f7065918cc56fdf1a68c7c6e133f1f254ba5b0790c355e
+  metadata.gz: c9820c9e325290379c9a5ad29f176d676cc704b89bfc1d860c44d18671c8da02
+  data.tar.gz: c1e52196bdbdf3fe0bf2b2c818ea29b42101daf482a901a6bf637895eb605dba
 SHA512:
-  metadata.gz: c101e099080222ec11205155027a70493232181ee3c528bcf8fd13937e1c6e2eb318768d911ec8e9d5215c8c8eceb52946743c18f2ed0fd68676de18f3a19ba8
-  data.tar.gz: 220af3ce5f627bc11578324e5d17245140f77ffcd59c676c76ff24d804f57cd6ffdd0f79b7fdd8fe882f7ef2381c715b81939a91513a4efbe89d712a763b32c2
+  metadata.gz: dad84b3585783d587299f0bf2d22e3d07dfef30f37c8f2a1a0c077d6defac10327495a6f836058a10a82711c6ab7c56b4be73ae2c43808b65e7621be99e3c5ea
+  data.tar.gz: 499cbb454235a26170f0dee382e38eb9eeaffb74eb1e4e7aac6c24f5763198eccdc3a92ff041bcd19f7d238f02e36ac0a220ecf64f60c906e03c9601429a57f0

data/app/forms/tramway/core/application_form.rb

@@ -32,8 +32,30 @@ module Tramway::Core
 
     def submit(params)
       if params
-        save if validate params
+        if validate params
+          begin
+            save.tap do
+              #self.class.remove_validations_from_model!
+            end
+          rescue StandardError => e
+            #self.class.remove_validations_from_model!
+            error = Tramway::Error.new(plugin: :core, method: :submit, message: "Looks like you have method `#{e.name.to_s.gsub('=', '')}` in #{@@model_class}. You should rename it or rename property in #{self.class}")
+            raise error.message
+          end
+        else
+          association_error = false
+          @@associations.each do |association|
+            if errors.details[association] == [{ error: :blank }]
+              model.send("#{association}=", send(association))
+              association_error = true
+            end
+          end
+          (association_error && save).tap do
+            #self.class.remove_validations_from_model!
+          end
+        end
       else
+        #self.class.remove_validations_from_model!
         error = Tramway::Error.new(plugin: :core, method: :submit, message: 'ApplicationForm::Params should not be nil')
         raise error.message
       end
@@ -47,11 +69,17 @@ module Tramway::Core
       @form_properties = args
     end
 
+    def form_properties_additional(**args)
+      @form_properties_additional = args
+    end
+
     def properties
       return @form_properties if @form_properties
       yaml_config_file_path = Rails.root.join('app', 'forms', "#{self.class.name.underscore}.yml")
       if File.exist? yaml_config_file_path
         @form_properties = YAML.load_file(yaml_config_file_path).deep_symbolize_keys
+        @form_properties.deep_merge! @form_properties_additional if @form_properties_additional
+        @form_properties
       else
         []
       end
@@ -127,13 +155,39 @@ module Tramway::Core
         end
       end
 
+      def model_class=(name)
+        @@model_class = name
+      end
+
       def validation_group_class
         ActiveModel
       end
 
       def validates(attribute, **options)
-        model_class.validates attribute, **options
+        if !defined?(@@model_class) || @@model_class.nil?
+          error = Tramway::Error.new(plugin: :core, method: :validates, message: "You need to set `model_class` name while using validations. Just write `self.model_class = YOUR_MODEL_NAME` in the class area.")
+          raise error.message
+        end
+        @@model_class.validates attribute, **options
+      #  @@validations ||= {}
+      #  @@validations.deep_merge! attribute => options
       end
+      
+      # FIXME: Removes all validations in a field. We must implement own validations
+      
+      #def remove_validations_from_model!
+      #  return unless defined? @@validations
+      #  @@validations&.each do |validation|
+      #    @@model_class.class_eval do
+      #      _validators.except validation[0]
+      #
+      #      binding.pry
+      #      _validate_callbacks.each do |callback|
+      #        callback.raw_filter.attributes.delete validation[0]
+      #      end
+      #    end
+      #  end
+      #end
     end
   end
 end

data/lib/tramway/core/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Core
-    VERSION = '1.14.1.1'
+    VERSION = '1.14.2.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-core
 version: !ruby/object:Gem::Version
-  version: 1.14.1.1
+  version: 1.14.2.3
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-11 00:00:00.000000000 Z
+date: 2019-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: audited