tramway-core 1.14.2 → 1.14.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb5b2831168305f5fb47711c10df069683ad46ba2089053100b908b23fce11b0
-  data.tar.gz: 439bd89e8eb0f148698491d4665d56596999c47362a9c89e4666f66baf569cdc
+  metadata.gz: 4097c0630d7dcef57b863d746510bb92826a738381c9f14aeb6dd60ac88ad5a9
+  data.tar.gz: b554f9e93d3b656237764ab63f728e4042f36e239d1ddafa346fcc9fcc9dd377
 SHA512:
-  metadata.gz: 19f99f6b019c6ac4fd47f5d2243e3e6acd2b67061a6c0689240a61796b9a703a0f7ec37b73010316ad48431bb65bee46be8c67072e223677331698a18298f564
-  data.tar.gz: e3902dcf41884d14e7f76c7675a74dfc01cf89881834712ef9753265ddc3be53b9f6d50157cee9ba510ca9a7b08b250c5d6da26100eb1e380fc18002aa34c620
+  metadata.gz: 94489bf533fa58eaf2a10940dc38afa24d4f6e92247b4979f7557c2d895bcdf3e6700a4634024f6df34a9a801c28581a13320815985890b9398fa44266b99e6c
+  data.tar.gz: 65f11aca85093709c7f87a669777fdce19b4a3797d9c7c369ad6dcbe0c26efbcec8ca67e26f1f5ce13a7d1a6b8f441350c324a7b0090c30a695a1c71dbdf2fe5

data/app/decorators/tramway/core/application_decorator.rb

@@ -54,6 +54,10 @@ class Tramway::Core::ApplicationDecorator
 
       define_method association_name do
         association = object.class.reflect_on_association(association_name)
+        if association.nil?
+          error = Tramway::Error.new(plugin: :core, method: :decorate_association, message: "Model #{object.class} does not have association named `#{association_name}`")
+          raise error.message
+        end
         class_name = if association.polymorphic?
                        object.send(association_name).class
                      else

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
@@ -144,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.2'
+    VERSION = '1.14.3'
   end
 end

metadata

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