tramway-core 1.18.1 → 1.18.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88f57e54e293b5c5a85a88563762fd8c26df2ccbcb6eedebcb8ad1636d19ab08
-  data.tar.gz: 721461846180ea4eb78ebdbc314029be09ff3c391c995900ef0d2a498236af62
+  metadata.gz: 54caa49641af517f7999adde3d7f7f757b528456b0d1a7e999de0af99419b08a
+  data.tar.gz: 1ebba7d8790d3dfd465dfd3dbe4f9118bb235f09b3daed23d4914a442f673aa4
 SHA512:
-  metadata.gz: b641dc9b842fb20fef05c90a73ed0007ddb9804b45cef8e6b74b2c6eea99e6610580d79450a7ef121a53a373685369addb83078e0db5e658c2129306c542c62c
-  data.tar.gz: 7f19244857938c969c03e52d49c063d34b52e25e4aad17d9bdee41bc7d12b2e650f241ec51a2f6a90ce71ab2cc2fd5409ac5d26857c59b464d44a095632d69c8
+  metadata.gz: 9e5e6af1ec6aaed1a8abca8347ccdfcc871e753e520a4b39fbaf24f1b30fa44a723e876c5c3cb25f9426d5411a311fc3e4399f33b3f1aa0a156c3234049bfa31
+  data.tar.gz: d38c5cdaaedf73eeb3eadbae99405852afd4aecb50e6c4b406b4e8e0ea9903c59644b9b1c558eb66623a49e82e4279b0241ad957fbe2443385ef9199e3db3907

data/README.md

@@ -46,6 +46,7 @@ Interface: `uploader(attribute_name, uploader_name, **options)`
 * uploader_name - **short** uploader name. You need to connect uploaders which are compatible with Tramway. Available uploaders:
   * :photo - you can see it [here](https://github.com/Purple-Magic/tramway-core/blob/develop/app/uploaders/photo_uploader.rb)
   * :file - you can see it [here](https://github.com/Purple-Magic/tramway-core/blob/develop/app/uploaders/file_uploader.rb)
+  * :ico - you can see [here](https://github.com/Purple-Magic/tramway-core/blob/develop/app/uploaders/ico_uploader.rb)
 * options - you are available to set options for uploaders exactly for this model. Available options:
   * versions - **only for :photo**. Set needed versions for file to be cropped. If empty - 0 zero versions will be used. All versions you can see [here](https://github.com/Purple-Magic/tramway-core/blob/develop/app/uploaders/photo_uploader.rb)
   * extensions - whitelist of file extensions. If empty will be used default whitelist from the uploaders (links above)
@@ -181,7 +182,7 @@ copy_to_clipboard "some_id" # some_id is HTML id of element. Content of this ele
 #### 1. Generate model that you to use. We create Organization, for example
 
 ```shell
-rails g model organization name:text public_name:text tagline:text address:text phone:text coordinates:point state: text favicon:text # remember! State field is required, if you use tramway-admin
+rails g tramway:core:application
 rails db:migrate
 ```
 

data/app/controllers/tramway/core/application_controller.rb

@@ -15,4 +15,8 @@ class Tramway::Core::ApplicationController < ActionController::Base
   def model_class
     params[:model].constantize
   end
+
+  def authenticated_user
+    (defined?(current_user) && current_user.try(:model)) || (defined?(current_admin) && current_admin.model)
+  end
 end

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

@@ -68,6 +68,10 @@ class Tramway::Core::ApplicationDecorator
     def model_name
       model_class.try(:model_name)
     end
+
+    def list_filters
+      {}
+    end
   end
 
   def link

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

@@ -29,12 +29,17 @@ module Tramway::Core::Associations::ClassHelper
   def define_main_association_method(association_name, decorator)
     define_method association_name do
       association = object.class.reflect_on_association(association_name)
+      type = association_type(association)
+      return if association_has_one_without_object(object, association_name, type)
+
       check_association object, association_name, association
       decorator_class_name = decorator || decorator_class_name(class_name(association))
-      if association_type(association).in? %i[has_many has_and_belongs_to_many]
-        return associations_collection(object, association_name, decorator_class_name)
+      case type
+      when :has_many, :has_and_belongs_to_many
+        associations_collection(object, association_name, decorator_class_name)
+      when :belongs_to, :has_one
+        decorator_class_name.decorate(association_object(object, association_name))
       end
-      return decorator_class_name.decorate object.send association_name if association_type(association) == :belongs_to
     end
   end
 end

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

@@ -36,6 +36,23 @@ module Tramway::Core::Associations::ObjectHelper
   end
 
   def add_association_form_class_name(object, association_name)
-    "Admin::#{object.class.to_s.pluralize}::Add#{association_name.to_s.camelize.singularize}Form".constantize
+    form_class = "Admin::#{object.class.to_s.pluralize}::Add#{association_name.to_s.camelize.singularize}Form"
+
+    begin
+      form_class.constantize
+    rescue StandardError
+      Tramway::Error.raise_error(
+        :tramway, :core, :associations, :object_helper, :habtm_add_class_not_defined,
+        class: form_class, association_name: association_name
+      )
+    end
+  end
+
+  def association_has_one_without_object(object, association_name, association_type)
+    association_type == :has_one && object.send(association_name).nil?
+  end
+
+  def association_object(object, association_name)
+    object.send association_name
   end
 end

data/app/helpers/tramway/core/inputs/associations_helper.rb

@@ -2,9 +2,10 @@
 
 module Tramway::Core::Inputs::AssociationsHelper
   def build_collection_for_association(form_object, property)
+    user = defined?(current_user) ? current_user : current_admin
     full_class_name_association = form_object.class.full_class_name_association(property)
     check_valid_association full_class_name_association
-    full_class_name_association.active.send("#{current_user.role}_scope", current_user.id).map do |obj|
+    full_class_name_association.active.send("#{user.role}_scope", user.id).map do |obj|
       decorator_class(full_class_name_association).decorate obj
     end.sort_by(&:name)
   end

data/app/helpers/tramway/core/inputs/polymorphic_associations_helper.rb

@@ -2,8 +2,9 @@
 
 module Tramway::Core::Inputs::PolymorphicAssociationsHelper
   def build_collection_for_polymorphic_association(form_object, property)
+    user = defined?(current_user) ? current_user : current_admin
     object_names = full_class_names(form_object, property).map do |class_name|
-      class_name.active.send("#{current_user.role}_scope", current_user.id).map do |obj|
+      class_name.active.send("#{user.role}_scope", user.id).map do |obj|
         decorator_class(class_name).decorate obj
       end
     end.flatten

data/app/models/tramway/core/application_record.rb

@@ -12,7 +12,7 @@ class Tramway::Core::ApplicationRecord < ActiveRecord::Base
     state :removed
 
     event :remove do
-      transition active: :remove
+      transition active: :removed
     end
   end
 

data/app/uploaders/ico_uploader.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class IcoUploader < ApplicationUploader
+  def extension_whitelist
+    model.class.file_extensions || %w[ico]
+  end
+end

data/lib/tramway/core/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Core
-    VERSION = '1.18.1'
+    VERSION = '1.18.3.1'
   end
 end

data/lib/tramway/error.rb

@@ -21,6 +21,8 @@ class Tramway::Error < RuntimeError
     def raise_error(*coordinates, **options)
       @errors ||= YAML.load_file("#{Tramway::Core.root}/yaml/errors.yml").with_indifferent_access
       error = @errors.dig(*coordinates)
+      raise 'Error is not defined in YAML' unless error
+
       options.each do |pair|
         error.gsub!("%{#{pair[0]}}", pair[1].to_s)
       end

data/lib/yaml/errors.yml

@@ -29,6 +29,7 @@ tramway:
     associations:
       object_helper:
         please_specify_association_name: "Please, specify `%{association_name}` association class_name in %{object_class} model. For example: `has_many :%{association_name}, class_name: '%{association_class_name}'`"
+        habtm_add_class_not_defined: "You should define class `%{class}` to be able add and remove `%{association_name}`"
       class_helper:
         model_does_not_have_association: "Model %{object_class} does not have association named `%{association_name}`"
     application_decorator:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tramway-core
 version: !ruby/object:Gem::Version
-  version: 1.18.1
+  version: 1.18.3.1
 platform: ruby
 authors:
 - Pavel Kalashnikov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-26 00:00:00.000000000 Z
+date: 2020-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: audited
@@ -361,6 +361,7 @@ files:
 - app/models/tramway/core/application_record.rb
 - app/uploaders/application_uploader.rb
 - app/uploaders/file_uploader.rb
+- app/uploaders/ico_uploader.rb
 - app/uploaders/image_defaults.rb
 - app/uploaders/photo_uploader.rb
 - app/views/tramway/core/404.haml