tramway-core 1.17.9.1 → 1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d8a307c16b02463c022b9f145452524200abc08aec25f72a0abf57d389c2495
-  data.tar.gz: 886e56668981f2f0623ab5b84d4219e88e8c762cd4e7ef426d8782b1a579cfef
+  metadata.gz: 57bc94fcad00f60e39f4b5eb62b9c959a0739d3063d9ee3017349c9ef8e91c04
+  data.tar.gz: 4b11029d70b3dd9f45bfc7ec4e73fc8fb4b3f9ae60eec90756431ab92d611aa7
 SHA512:
-  metadata.gz: 252e6926182c9f443a75cc9075804f4075ba7224ef888d2399ac910b1d00435cd92209bb367607da4a60cb7ff8d740388accdb02de45d878b44a8a9ef2ac5769
-  data.tar.gz: d01a72a18c43dfdcd3cf53d710a8f8e4a87db3d5a24d9480c4009993b58cfdb9a5ad36a740f521c8558b00e397597a7bf4fbee052deabe10ce6b6c5f1fe4f2a2
+  metadata.gz: 6955a32c4a63a19ea949694636d64b7725aa571fc601e213276e67555ac8300bea5bbff4ca3c9337eeba9e8001dcf40b4b9dda4ca6e7bb6f0ab1d2d1d13cb2f5
+  data.tar.gz: cad297b01c90cff4e6a66048cec29e39faba8744ec4148ddf6d1e1fcf80775974bc361414ea8dc05c4788749e87d8cef5ec39832dc150d32e9f80704b8d4d100

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,25 @@ 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)
+      @@properties ||= []
+      @@properties += props
+      props.each do |prop|
+        delegate prop, to: :model
+        define_method("#{prop}=") { |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 +112,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/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,21 @@
+# frozen_string_literal: true
+
+module Tramway::Core::ApplicationForms::SubmitHelper
+  def submit(params)
+    if params
+      params.each { |key, value| send("#{key}=", value) }
+      save || collecting_associations_errors
+    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/uploaders/application_uploader.rb

@@ -6,7 +6,16 @@ class ApplicationUploader < CarrierWave::Uploader::Base
   storage :file
 
   def store_dir
-    directory_id = (model.reload && model.try(:uuid)) || model.id
-    "system/uploads/#{model.class.model_name.to_s.underscore}/#{mounted_as}/#{directory_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?
+    else
+      model.id
+    end
   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.9.1'
+    VERSION = '1.18'
   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.9.1
+  version: '1.18'
 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-23 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