tramway-core 1.14.1.2 → 1.14.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e37bc7fd023ce8768a173d48b50575ac71538cb27078c8cabf2d4aaf996c53c
-  data.tar.gz: 253c5c1543f25b34905341bdc11d9a31e84737cf11a2c1e547c5f0c3d9d16cb6
+  metadata.gz: 83e5c3f0d70596f3ebaa37ecee23ceef049e69332bce0005bfb065b7c969766b
+  data.tar.gz: bc7b8f743cdda6eb446d500058263580c894a4259184cc99c7ef0abddfcdaa7f
 SHA512:
-  metadata.gz: 2bb111d0932442985c8a93edd2e3c0acfdeef417565d032560f895584e8efb783c9f3a1323688f8680a29a0cf95485c658e2029b4b0e78f10c7f536374484f20
-  data.tar.gz: fd7a7cdcc2b47374e1c1405b1278219ba4e7e17fc0209bf22895339d24c619d2156a5af641c16b5423ad0ed0ae1ea95f738d1c669938e1015d251d5205aaca27
+  metadata.gz: db01de1fe36af20e77b0f50f3950dd274bd1cfe18c8a3bd2174d1e8c1521ef9a2e8f08e8eca83b5e609093604ed00c738765ebf66fb51e332bc40c680a7a8d68
+  data.tar.gz: aa7e0bafceeb1822da3375551a9551d7d15124d279ff841184450eefe93b4ddfe91bcc1a8613de806fb5819984aa07dd03f82509fbb11b7015a31091435a0791

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

@@ -33,7 +33,15 @@ module Tramway::Core
     def submit(params)
       if params
         if validate params
-          save 
+          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|
@@ -42,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
@@ -58,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
@@ -138,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/app/models/tramway/core/application_record.rb

@@ -20,7 +20,7 @@ module Tramway
 
       scope :active, -> { where state: :active }
 
-      include ::PgSearch
+      include ::PgSearch::Model
 
       # FIXME: detect inhertited locales
       class << self

data/lib/tramway/core/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Core
-    VERSION = '1.14.1.2'
+    VERSION = '1.14.2.4'
   end
 end

metadata

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