tramway-core 1.14.1 → 1.14.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e06dd12520cbfb6d2bee1e3413a77981c47ec5e5e378824cfec90552c050cd52
-  data.tar.gz: '041449acadc36a3cc9fd48899d8cbe681cb2ff320f982d0eae6960fc951b61dd'
+  metadata.gz: 18a93e1530863c7ddb15e6adb573d5ea06aae29357eabdf06ed433dc9e170cc6
+  data.tar.gz: 8066187cef4863fa4f7a830d90a90ed78afffb2aa29fef32760b5037d07da38c
 SHA512:
-  metadata.gz: 52ed13303d8a9e93abc1a984660bb70a9be2a89a19de430263ad8fc66a3395a65aa0b0ff345d4a6753a3d583db63891f44770a7a5dd6fdcdaa4e92ab949054d9
-  data.tar.gz: 96627ac531b0bba886bbad49a455252531d51db9128a0173b389b7a4d14338b9d422cbca040c7696941f93555bbd2098a35a5e68f5bbc40885f1af8da1dd4d14
+  metadata.gz: d05a35d45517d87b4d25908edc824e07aedaea45ec617c7b296131104cb6d9435e3b1fcf60ba38e1594cc9ac570bc913910d797c74614d2916e72f60f45b43c0
+  data.tar.gz: 8554ecb444b5c84a819ee6fc4a8cd28bca1c250a39eb4113481bb788180bd1e6636d0e309e9542be054568f45d738e8d5cc4ad09d01320f896bfa425c8d211a7

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

@@ -32,7 +32,23 @@ module Tramway::Core
 
     def submit(params)
       if params
-        save if validate params
+        if validate params
+          begin
+            save 
+          rescue StandardError => e
+            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
+        end
       else
         error = Tramway::Error.new(plugin: :core, method: :submit, message: 'ApplicationForm::Params should not be nil')
         raise error.message
@@ -47,9 +63,20 @@ 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
-      @form_properties = YAML.load_file(Rails.root.join('app', 'forms', "#{self.class.name.underscore}.yml")).deep_symbolize_keys
+      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
     end
 
     def build_errors; end

data/lib/tramway/core/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Core
-    VERSION = '1.14.1'
+    VERSION = '1.14.2.2'
   end
 end

metadata

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