tramway-core 1.16.2.1 → 1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 929785989e7be8ac305b420a555e8e47a0d9cd301c413ea902d1b86d14c5c44c
-  data.tar.gz: 5d6390f4b01917f9889e8044fd048460f7a520ae0a3803a75729614977435e89
+  metadata.gz: 794b0a09c09fa7b4ba63ed246ebe1dc1809f3744cd53acc4d9d58c4eebd690f3
+  data.tar.gz: c834a2ab88aac405a344945a5411034aea8ed952dd4f616dcceb22ea853de091
 SHA512:
-  metadata.gz: 44a801fd2329591b6f7de6352650d3e913cf49299fa35098a52c724e317d9abd42b57021204c3a9d2a78746d6bfa58b6b50cfe185af907a1bf0032e588ad531a
-  data.tar.gz: a2d64fd4fb44800d94fd3c2d9a4bb4e050c5d1eaf73189c0c8dd719090e8538cf1650213973349060b7872a95b7592f2a4b50ab2eb3e904666e1d6450cc84914
+  metadata.gz: e38836d55bed1db9f83e23f5c7705a0c98977fb845cffe18728ca30584d2659b153986b48f5c95c7d134ea08211caa3e9941ad09d9397adc7ea273a7e4388a94
+  data.tar.gz: 1a8d9e9a054b9f42a93e88f3d506c1d489e7a7a139dd0eaa0595bdc47642b6fc3f6b6b77f074e81803c4d0edce7114bd5b054d2ee2dafc2442778676abfe1396

data/app/decorators/tramway/core/application_decorator.rb

@@ -7,6 +7,7 @@ class Tramway::Core::ApplicationDecorator
   include ActionView::Context
   include ::FontAwesome5::Rails::IconHelper
   include ::Tramway::Core::CopyToClipboardHelper
+  include ::Tramway::Core::Associations::ObjectHelper
 
   def initialize(object)
     @object = object
@@ -22,6 +23,8 @@ class Tramway::Core::ApplicationDecorator
   end
 
   class << self
+    include ::Tramway::Core::Associations::ClassHelper
+
     def collections
       [:all]
     end
@@ -49,45 +52,6 @@ class Tramway::Core::ApplicationDecorator
       end
     end
 
-    def decorate_association(association_name, decorator: nil, as: nil, state_machines: [])
-      @@decorated_associations ||= []
-      @@decorated_associations << association_name
-
-      define_method association_name do
-        association = object.class.reflect_on_association(association_name)
-        if association.nil?
-          error = Tramway::Error.new(plugin: :core, method: :decorate_association, message: "Model #{object.class} does not have association named `#{association_name}`")
-          raise error.message
-        end
-        class_name = if association.polymorphic?
-                       object.send(association_name).class
-                     else
-                       unless association.options[:class_name]
-                         error = Tramway::Error.new(plugin: :core, method: :decorate_association, message: "Please, specify `#{association_name}` association class_name in #{object.class} model. For example: `has_many :#{association_name}, class_name: '#{association_name.to_s.singularize.camelize}'`")
-                         raise error.message
-                       end
-                       association.options[:class_name]
-                     end
-        decorator_class_name = decorator || "#{class_name.to_s.singularize}Decorator".constantize
-        if association.class == ActiveRecord::Reflection::HasManyReflection
-          return object.send(association_name).active.map do |association_object|
-            decorator_class_name.decorate association_object
-          end
-        end
-        if association.class == ActiveRecord::Reflection::BelongsToReflection
-          return decorator_class_name.decorate object.send association_name
-        end
-      end
-
-      define_method "#{association_name}_as" do
-        as
-      end
-
-      define_method "#{association_name}_state_machines" do
-        state_machines
-      end
-    end
-
     def model_class
       to_s.sub(/Decorator$/, '').constantize
     end

data/app/decorators/tramway/core/associations/class_helper.rb

@@ -0,0 +1,40 @@
+module Tramway::Core::Associations::ClassHelper
+  def decorate_association(association_name, decorator: nil, as: nil, state_machines: [])
+    @@decorated_associations ||= []
+    @@decorated_associations << association_name
+
+    define_main_association_method association_name, decorator
+
+    define_method "#{association_name}_as" do
+      as
+    end
+
+    define_method "#{association_name}_state_machines" do
+      state_machines
+    end
+
+    define_method "add_#{association_name}_form" do
+      "Admin::#{object.class.to_s.pluralize}::Add#{association_name.to_s.camelize.singularize}Form".constantize.new object
+    end
+  end
+
+
+  def define_main_association_method(association_name, decorator)
+    define_method association_name do
+      association = object.class.reflect_on_association(association_name)
+      if association.nil?
+        error = Tramway::Error.new(plugin: :core, method: :decorate_association, message: "Model #{object.class} does not have association named `#{association_name}`")
+        raise error.message
+      end
+      decorator_class_name = decorator || "#{class_name(association).to_s.singularize}Decorator".constantize
+      if association.class.in? [ ActiveRecord::Reflection::HasManyReflection, ActiveRecord::Reflection::HasAndBelongsToManyReflection ]
+        return object.send(association_name).active.map do |association_object|
+          decorator_class_name.decorate association_object
+        end
+      end
+      if association.class == ActiveRecord::Reflection::BelongsToReflection
+        return decorator_class_name.decorate object.send association_name
+      end
+    end
+  end
+end

data/app/decorators/tramway/core/associations/object_helper.rb

@@ -0,0 +1,13 @@
+module Tramway::Core::Associations::ObjectHelper
+  def class_name(association)
+    if association.polymorphic?
+      object.send(association_name).class
+    else
+      unless association.options[:class_name]
+        error = Tramway::Error.new(plugin: :core, method: :decorate_association, message: "Please, specify `#{association_name}` association class_name in #{object.class} model. For example: `has_many :#{association_name}, class_name: '#{association_name.to_s.singularize.camelize}'`")
+        raise error.message
+      end
+      association.options[:class_name]
+    end
+  end
+end

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

@@ -65,6 +65,10 @@ module Tramway::Core
       @@model_class.model_name
     end
 
+    def associations
+      @@associations
+    end
+
     def form_properties(**args)
       @form_properties = args
     end

data/app/helpers/tramway/core/copy_to_clipboard_helper.rb

@@ -1,12 +1,14 @@
+# frozen_string_literal: true
+
 module Tramway
   module Core
     module CopyToClipboardHelper
       def copy_to_clipboard(id)
         button_tag class: 'btn btn-info clipboard-btn',
-          data: { clipboard_action: 'copy', clipboard_target: "##{id}" },
-          style: 'margin-left: 15px' do
-            fa_icon 'copy'
-          end
+                   data: { clipboard_action: 'copy', clipboard_target: "##{id}" },
+                   style: 'margin-left: 15px' do
+          fa_icon 'copy'
+        end
       end
     end
   end

data/app/uploaders/photo_uploader.rb

@@ -12,7 +12,7 @@ class PhotoUploader < ApplicationUploader
       file.file.match(%r{/system/uploads/.*}).to_s
     else
       default_url = '/assets/tramway/core/mona_lisa_from_prado_square.jpg'
-      File.exists?(default_url) ? default_url : ''
+      File.exist?(default_url) ? default_url : ''
     end
   end
 

data/config/locales/en/helpers.yml

@@ -13,6 +13,7 @@ en:
       search: Search
       reset: Reset
       download: Download
+      add: Add
     scope:
       found: Found
     "yes": yes

data/lib/tramway/core/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Core
-    VERSION = '1.16.2.1'
+    VERSION = '1.17'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-core
 version: !ruby/object:Gem::Version
-  version: 1.16.2.1
+  version: '1.17'
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-05 00:00:00.000000000 Z
+date: 2020-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: audited
@@ -355,6 +355,8 @@ files:
 - app/controllers/tramway/core/application_controller.rb
 - app/decorators/tramway/core/application_decorated_collection.rb
 - app/decorators/tramway/core/application_decorator.rb
+- app/decorators/tramway/core/associations/class_helper.rb
+- app/decorators/tramway/core/associations/object_helper.rb
 - app/decorators/tramway/core/concerns/attributes_decorator_helper.rb
 - app/forms/tramway/core/application_form.rb
 - app/forms/tramway/core/extendable_form.rb