tramway-core 1.18 → 1.18.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57bc94fcad00f60e39f4b5eb62b9c959a0739d3063d9ee3017349c9ef8e91c04
-  data.tar.gz: 4b11029d70b3dd9f45bfc7ec4e73fc8fb4b3f9ae60eec90756431ab92d611aa7
+  metadata.gz: bc1dd51b28f3431c8df5cd27f8350d7dc2b4bedcf7a811c48130a9eb8d1d207b
+  data.tar.gz: fe2291fcb3bc27d9de9ebe3753ea493ef99a19ebb49db88fcf6e3b9917b2c6be
 SHA512:
-  metadata.gz: 6955a32c4a63a19ea949694636d64b7725aa571fc601e213276e67555ac8300bea5bbff4ca3c9337eeba9e8001dcf40b4b9dda4ca6e7bb6f0ab1d2d1d13cb2f5
-  data.tar.gz: cad297b01c90cff4e6a66048cec29e39faba8744ec4148ddf6d1e1fcf80775974bc361414ea8dc05c4788749e87d8cef5ec39832dc150d32e9f80704b8d4d100
+  metadata.gz: 63428cee65707e287d8abb8e2d110f1b83342213a14d43f77bebb20530a9fb0765bd81d4659360a258f59d6597e32120d415ee80a508c9abb4bc49681d357b20
+  data.tar.gz: 3d597d30be2064ece9c9d7520964445868349ab8c924400f5f944fe18abade3efb673a1026ebc5dc576b178900ee4831682aff7a51e38f23c8bfd056cc2b03e3

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

@@ -39,11 +39,15 @@ class Tramway::Core::ApplicationForm
     delegate :defined_enums, to: :model_class
 
     def properties(*props)
+      props.each { |prop| property prop }
+    end
+
+    def property(prop)
       @@properties ||= []
-      @@properties += props
-      props.each do |prop|
-        delegate prop, to: :model
-        define_method("#{prop}=") { |value| model.send "#{prop}=", value }
+      @@properties << prop
+      delegate prop, to: :model
+      define_method("#{prop}=") do |value|
+        model.send "#{prop}=", value
       end
     end
 

data/app/forms/tramway/core/application_forms/association_object_helpers.rb

@@ -7,7 +7,7 @@ module Tramway::Core::ApplicationForms::AssociationObjectHelpers
     else
       self.class.send(:define_method, "#{association}=") do |value|
         model.send "#{association}_id=", value
-        super class_name.find value
+        model.send "#{association}=", class_name.find(value)
       end
     end
   end
@@ -20,7 +20,7 @@ module Tramway::Core::ApplicationForms::AssociationObjectHelpers
         Tramway::Error.raise_error :tramway, :core, :application_form, :initialize, :polymorphic_class_is_nil,
           association_name: association
       else
-        super association_class.find value.split('_')[-1]
+        model.send "#{association}=", association_class.find(value.split('_')[-1])
         send "#{association}_type=", association_class.to_s
       end
     end

data/app/forms/tramway/core/application_forms/submit_helper.rb

@@ -4,7 +4,10 @@ module Tramway::Core::ApplicationForms::SubmitHelper
   def submit(params)
     if params
       params.each { |key, value| send("#{key}=", value) }
-      save || collecting_associations_errors
+      result = save
+      result.tap do
+        collecting_associations_errors unless result
+      end
     else
       Tramway::Error.raise_error(:tramway, :core, :application_form, :submit, :params_should_not_be_nil)
     end

data/app/forms/tramway/core/extendable_forms_helpers/class_builder.rb

@@ -24,7 +24,7 @@ module Tramway::Core::ExtendableFormsHelpers::ClassBuilder
           field = property[1][:object]
           define_file_property_assignment_method property, field
         else
-          next unless property[1][:validates].present?
+          #next unless property[1][:validates].present?
 
           define_assignment_method property
         end

data/app/forms/tramway/core/extendable_forms_helpers/more_properties_helper.rb

@@ -9,8 +9,12 @@ module Tramway::Core::ExtendableFormsHelpers::MorePropertiesHelper
 
   def define_assignment_method(property)
     define_method "#{property[0]}=" do |value|
-      property[1][:validates].each do |pair|
-        make_validates property[0], pair, value
+      if property[1][:validates].present?
+        property[1][:validates].each do |pair|
+          make_validates property[0], pair, value
+        end
+      else
+        model.values.merge property[0] => value
       end
     end
   end

data/app/uploaders/photo_uploader.rb

@@ -4,7 +4,7 @@ class PhotoUploader < ApplicationUploader
   include ImageDefaults
 
   def default_url
-    ActionController::Base.helpers.asset_path('images/default_photo.png')
+    ActionController::Base.helpers.asset_path('mona_lisa_from_prado_square.png')
   end
 
   def url

data/lib/tramway/core/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Core
-    VERSION = '1.18'
+    VERSION = '1.18.0.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tramway-core
 version: !ruby/object:Gem::Version
-  version: '1.18'
+  version: 1.18.0.1
 platform: ruby
 authors:
 - Pavel Kalashnikov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-23 00:00:00.000000000 Z
+date: 2020-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: audited