tramway-core 1.17.7.2 → 1.18.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea351fe0ccc735e8df8c11efd9136b6f5d3287b0bd9d7d0e98fe94bd74c9b070
-  data.tar.gz: 11ea49c81f3ace9ffc97f4b3396ba52ce7d61135dbc50eb621e2ccbca342d05a
+  metadata.gz: bc1dd51b28f3431c8df5cd27f8350d7dc2b4bedcf7a811c48130a9eb8d1d207b
+  data.tar.gz: fe2291fcb3bc27d9de9ebe3753ea493ef99a19ebb49db88fcf6e3b9917b2c6be
 SHA512:
-  metadata.gz: 26bd97b39c3494f4d7356905397f5ec68d3fce0cecb839a4d731efdbe81a80da6e48f1bd8bb50528cd530cc500a580c1752df3991f992f807963aa51c77482c2
-  data.tar.gz: 435a9723200273b1c857c668c144b26d07183f422c97f2c1aead5134ab38ae660fe09042de475b77b937b76ac2f8498fe0cdf09f04b64a44c7765c5b96b52fb8
+  metadata.gz: 63428cee65707e287d8abb8e2d110f1b83342213a14d43f77bebb20530a9fb0765bd81d4659360a258f59d6597e32120d415ee80a508c9abb4bc49681d357b20
+  data.tar.gz: 3d597d30be2064ece9c9d7520964445868349ab8c924400f5f944fe18abade3efb673a1026ebc5dc576b178900ee4831682aff7a51e38f23c8bfd056cc2b03e3

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/models/tramway/core/application_record.rb

@@ -42,6 +42,15 @@ class Tramway::Core::ApplicationRecord < ActiveRecord::Base
     def search_by(*attributes, **associations)
       pg_search_scope :full_text_search, against: attributes, associated_against: associations
     end
+
+    def uploader(attribute_name, uploader_name, **options)
+      mount_uploader attribute_name, "#{uploader_name.to_s.camelize}Uploader".constantize
+      @versions = options[:versions] if uploader_name == :photo
+    end
+
+    def photo_versions
+      @versions
+    end
   end
 
   # FIXME: detect inhertited locales

data/app/uploaders/application_uploader.rb

@@ -6,6 +6,16 @@ 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?
+    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
@@ -20,29 +20,14 @@ class PhotoUploader < ApplicationUploader
     super && width.present? && height.present?
   end
 
-  version :medium do
+  version :medium, if: :medium_version_is_needed? do
     process resize_to_fill: [400, 400]
   end
 
-  version :small do
+  version :small, if: :small_version_is_needed? do
     process resize_to_fill: [100, 100]
   end
 
-  # FIXME: move to tramway-landing uploader
-  version :card do
-    process resize_to_fill: [400, 400, 'North']
-  end
-
-  # FIXME: move to tramway-landing uploader
-  version :horizontal do
-    process resize_to_fill: [800, 350, 'North']
-  end
-
-  # FIXME: move to tramway-landing uploader
-  version :mini do
-    process resize_to_limit: [300, nil]
-  end
-
   attr_reader :width, :height
 
   before :cache, :capture_size
@@ -58,4 +43,16 @@ class PhotoUploader < ApplicationUploader
       @width, @height = `identify -format "%wx %h" #{file.path}`.split(/x/).map(&:to_i)
     end
   end
+
+  def medium_version_is_needed?(_new_file)
+    version_is_needed? :medium
+  end
+
+  def small_version_is_needed?(_new_file)
+    version_is_needed? :small
+  end
+
+  def version_is_needed?(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.7.2'
+    VERSION = '1.18.0.1'
   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.7.2
+  version: 1.18.0.1
 platform: ruby
 authors:
 - Pavel Kalashnikov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-19 00:00:00.000000000 Z
+date: 2020-04-24 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