tramway-core 1.17.8 → 1.18.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eeac1ff8281b7c5e6dd665fbe2916cd3f2bc917d90a203ac361729c305016711
-  data.tar.gz: ef749f395fb09fccba8acc35a842a1f390ae62274d345c108966aa1ea1f024b6
+  metadata.gz: 938b9d2f7ef998e7ffd0c45cdd9c3b0062a6b65336ae9f8b8c7d587cc984e973
+  data.tar.gz: ef56b0928a74d9754e2a88376d66e403e2bac10270fdf89c58a1244edb836b61
 SHA512:
-  metadata.gz: 86ce9b156c732ecdab742176ffe56af75c2fbc80f3d84bad3c50ac6c30491d0ff190118b6a64b58f732f17f673ffb060c9eff70bb7cd28589bd2be0cd082bf3b
-  data.tar.gz: ed9043ffbe86655297870364278f43e54680bdfbc34f860827189e0f365c8268b032ec6936dcefe3cbf2491dc56d66bf672700c08d9f565c58e5d1a4f4f6e43f
+  metadata.gz: 66b553bb6e941340b3e5929520e36da8e42e8e006493dd29adf73a3cc826ec5c363cfb804646159fab033959d3435ab6f0ef5f3fe2bca9ed2fc0b0871d38e9d8
+  data.tar.gz: d88d5f0042e1b8ce1ef0e2b8a1b2a3d688492bade95a727a00f2b57f8a4a6ef0d3ea74389601b69416431d4c68d2cafbbc82745d7f85e12486776adf1b83bb7b

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

@@ -1,16 +1,17 @@
 # frozen_string_literal: true
 
-class Tramway::Core::ApplicationForm < ::Reform::Form
+class Tramway::Core::ApplicationForm
   include Tramway::Core::ApplicationForms::AssociationObjectHelpers
   include Tramway::Core::ApplicationForms::ConstantObjectActions
   include Tramway::Core::ApplicationForms::PropertiesObjectHelper
   include Tramway::Core::ApplicationForms::ObjectHelpers
+  include Tramway::Core::ApplicationForms::SubmitHelper
 
   attr_accessor :submit_message
 
   def initialize(object = nil)
-    object ||= self.class.model_class.new
-    super(object).tap do
+    tap do
+      @object = object
       @@model_class = object.class
       @@enumerized_attributes = object.class.try :enumerized_attributes
       @@associations ||= []
@@ -23,14 +24,6 @@ class Tramway::Core::ApplicationForm < ::Reform::Form
     end
   end
 
-  def submit(params)
-    if params
-      validate(params) ? save : collecting_associations_errors
-    else
-      Tramway::Error.raise_error(:tramway, :core, :application_form, :submit, :params_should_not_be_nil)
-    end
-  end
-
   def model_name
     @@model_class.model_name
   end
@@ -40,19 +33,29 @@ class Tramway::Core::ApplicationForm < ::Reform::Form
   end
 
   class << self
+    include Tramway::Core::ApplicationForms::AssociationClassHelpers
     include Tramway::Core::ApplicationForms::ConstantClassActions
 
     delegate :defined_enums, to: :model_class
 
+    def properties(*props)
+      props.each { |prop| property prop }
+    end
+
+    def property(prop)
+      @@properties ||= []
+      @@properties << prop
+      delegate prop, to: :model
+      define_method("#{prop}=") do |value|
+        model.send "#{prop}=", value
+      end
+    end
+
     def association(property)
       properties property
       @@associations = ((defined?(@@associations) && @@associations) || []) + [property]
     end
 
-    def associations(*properties)
-      properties.each { |property| association property }
-    end
-
     def full_class_name_associations
       @@associations&.reduce({}) do |hash, association|
         options = @@model_class.reflect_on_all_associations(:belongs_to).select do |a|
@@ -113,13 +116,4 @@ class Tramway::Core::ApplicationForm < ::Reform::Form
       model.send("#{association}=", send(association)) if errors.details[association] == [{ error: :blank }]
     end
   end
-
-  def save
-    super
-  rescue ArgumentError => e
-    Tramway::Error.raise_error :tramway, :core, :application_form, :save, :argument_error, message: e.message
-  rescue StandardError => e
-    Tramway::Error.raise_error :tramway, :core, :application_form, :save, :looks_like_you_have_method,
-      method_name: e.name.to_s.gsub('=', ''), model_class: @@model_class, class_name: self.class
-  end
 end

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

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module Tramway::Core::ApplicationForms::AssociationClassHelpers
+  def associations(*properties)
+    properties.each { |property| association property }
+  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/object_helpers.rb

@@ -8,4 +8,8 @@ module Tramway::Core::ApplicationForms::ObjectHelpers
   def persisted?
     model.id.nil?
   end
+
+  def model
+    @object
+  end
 end

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

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Tramway::Core::ApplicationForms::SubmitHelper
+  def submit(params)
+    if params
+      params.each { |key, value| send("#{key}=", value) }
+      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
+  end
+
+  def save
+    model.save
+  rescue ArgumentError => e
+    Tramway::Error.raise_error :tramway, :core, :application_form, :save, :argument_error, message: e.message
+  rescue StandardError => e
+    Tramway::Error.raise_error :tramway, :core, :application_form, :save, :looks_like_you_have_method,
+      method_name: e.name.to_s.gsub('=', ''), model_class: @@model_class, class_name: self.class
+  end
+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/application_uploader.rb

@@ -6,6 +6,17 @@ class ApplicationUploader < CarrierWave::Uploader::Base
   storage :file
 
   def store_dir
-    "system/uploads/#{model.class.model_name.to_s.underscore}/#{mounted_as}/#{model.id}"
+    "system/uploads/#{model.class.model_name.to_s.underscore}/#{mounted_as}/#{id_directory}"
+  end
+
+  private
+
+  def id_directory
+    if model.respond_to?(:uuid)
+      model.reload unless model.uuid.present?
+      model.uuid
+    else
+      model.id
+    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
@@ -53,6 +53,6 @@ class PhotoUploader < ApplicationUploader
   end
 
   def version_is_needed?(version)
-    model.class.photo_versions.include? version
+    model.class.photo_versions&.include? version
   end
 end

data/lib/tramway/core.rb

@@ -5,7 +5,6 @@ require 'tramway/collection'
 require 'tramway/collections/helper'
 require 'tramway/error'
 require 'font_awesome5_rails'
-require 'reform'
 require 'pg_search'
 require 'validators/presence_validator'
 

data/lib/tramway/core/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Core
-    VERSION = '1.17.8'
+    VERSION = '1.18.0.2'
   end
 end

data/lib/yaml/errors.yml

@@ -35,6 +35,6 @@ tramway:
       attributes:
         method_is_reserved_word: "Method `%{attribute_name}` is reserved word. Please, create or delegate method in %{class_name} with another name."
       title:
-        please_implement_title: "Please, implement `title` method in a %{class_name} or delegate it from %{object_class}"
+        please_implement_title: "Please, implement `title` method in a %{class_name} or delegate it to %{object_class}"
       link:
         method_link_uses_file_attribute: "Method `link` uses `file` attribute of the decorated object. If decorated object doesn't contain `file`, you shouldn't use `link` method."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tramway-core
 version: !ruby/object:Gem::Version
-  version: 1.17.8
+  version: 1.18.0.2
 platform: ruby
 authors:
 - Pavel Kalashnikov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-22 00:00:00.000000000 Z
+date: 2020-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: audited
@@ -197,34 +197,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: reform
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: reform-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.1.7
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.1.7
 - !ruby/object:Gem::Dependency
   name: rmagick
   requirement: !ruby/object:Gem::Requirement
@@ -362,11 +334,13 @@ files:
 - app/decorators/tramway/core/concerns/attributes_decorator_helper.rb
 - app/decorators/tramway/core/delegating/class_helper.rb
 - app/forms/tramway/core/application_form.rb
+- app/forms/tramway/core/application_forms/association_class_helpers.rb
 - app/forms/tramway/core/application_forms/association_object_helpers.rb
 - app/forms/tramway/core/application_forms/constant_class_actions.rb
 - app/forms/tramway/core/application_forms/constant_object_actions.rb
 - app/forms/tramway/core/application_forms/object_helpers.rb
 - app/forms/tramway/core/application_forms/properties_object_helper.rb
+- app/forms/tramway/core/application_forms/submit_helper.rb
 - app/forms/tramway/core/extendable_form.rb
 - app/forms/tramway/core/extendable_forms_helpers/class_builder.rb
 - app/forms/tramway/core/extendable_forms_helpers/ignored_properties_helper.rb