tramway-core 1.14.2.2 → 1.14.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18a93e1530863c7ddb15e6adb573d5ea06aae29357eabdf06ed433dc9e170cc6
-  data.tar.gz: 8066187cef4863fa4f7a830d90a90ed78afffb2aa29fef32760b5037d07da38c
+  metadata.gz: c9820c9e325290379c9a5ad29f176d676cc704b89bfc1d860c44d18671c8da02
+  data.tar.gz: c1e52196bdbdf3fe0bf2b2c818ea29b42101daf482a901a6bf637895eb605dba
 SHA512:
-  metadata.gz: d05a35d45517d87b4d25908edc824e07aedaea45ec617c7b296131104cb6d9435e3b1fcf60ba38e1594cc9ac570bc913910d797c74614d2916e72f60f45b43c0
-  data.tar.gz: 8554ecb444b5c84a819ee6fc4a8cd28bca1c250a39eb4113481bb788180bd1e6636d0e309e9542be054568f45d738e8d5cc4ad09d01320f896bfa425c8d211a7
+  metadata.gz: dad84b3585783d587299f0bf2d22e3d07dfef30f37c8f2a1a0c077d6defac10327495a6f836058a10a82711c6ab7c56b4be73ae2c43808b65e7621be99e3c5ea
+  data.tar.gz: 499cbb454235a26170f0dee382e38eb9eeaffb74eb1e4e7aac6c24f5763198eccdc3a92ff041bcd19f7d238f02e36ac0a220ecf64f60c906e03c9601429a57f0

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

@@ -34,8 +34,11 @@ module Tramway::Core
       if params
         if validate params
           begin
-            save 
+            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
@@ -47,9 +50,12 @@ module Tramway::Core
               association_error = true
             end
           end
-          association_error && save
+          (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
@@ -149,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.2.2'
+    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.2.2
+  version: 1.14.2.3
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-13 00:00:00.000000000 Z
+date: 2019-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: audited