tramway-core 1.14 → 1.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aff2dd709eb25da798153cd9a21f3bd9f2542eb7386c64897539e9ebb516f45f
-  data.tar.gz: e3fb920952051837900f15710c7b2538b30eb99f2edf9d01bda5d04e0b39c4c8
+  metadata.gz: bb5b2831168305f5fb47711c10df069683ad46ba2089053100b908b23fce11b0
+  data.tar.gz: 439bd89e8eb0f148698491d4665d56596999c47362a9c89e4666f66baf569cdc
 SHA512:
-  metadata.gz: 583b78f563f4ccc605adb76f283ed94f51d44574a4c3e0a67636a8a32f7edef123829463ddf3c8a2af5de630c08c0869c8b4b3181ae81787fcf8f8dff98a5f24
-  data.tar.gz: 5ec16b360a0def6d1ad04bfd5e520d28ca40b0915e352ad8bc23da04fbfcd045a303c167dea4562c23baa2e3b09de4ca0ba0a0f0d7771544e1179bb943411d69
+  metadata.gz: 19f99f6b019c6ac4fd47f5d2243e3e6acd2b67061a6c0689240a61796b9a703a0f7ec37b73010316ad48431bb65bee46be8c67072e223677331698a18298f564
+  data.tar.gz: e3902dcf41884d14e7f76c7675a74dfc01cf89881834712ef9753265ddc3be53b9f6d50157cee9ba510ca9a7b08b250c5d6da26100eb1e380fc18002aa34c620

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

@@ -32,7 +32,18 @@ module Tramway::Core
 
     def submit(params)
       if params
-        save if validate params
+        if validate params
+          save 
+        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,8 +58,20 @@ module Tramway::Core
       @form_properties = args
     end
 
+    def form_properties_additional(**args)
+      @form_properties_additional = args
+    end
+
     def properties
-      @form_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
     end
 
     def build_errors; end

data/lib/tramway/core/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Core
-    VERSION = '1.14'
+    VERSION = '1.14.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-core
 version: !ruby/object:Gem::Version
-  version: '1.14'
+  version: 1.14.2
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-18 00:00:00.000000000 Z
+date: 2019-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: audited
@@ -248,20 +248,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.5.0
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.5'
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.5.0
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.5'
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement