tramway-core 1.18.1.1 → 1.18.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff863d7c75ba76a10d1f9c751b9710474a16b0cd126a6974224d8cbcb26d9dd4
-  data.tar.gz: b890fdbb1e3a33e6dc9cac04ca8cc3d91a5c240a9337c4313b576faf44f47c7b
+  metadata.gz: c4642075ecb6eb14dd53a6c0c34da6089ca1e8ffac92baee5e750c8d3ca215c9
+  data.tar.gz: 496474d5bdb285a300f1d8877da45d68743b4527c4a1974915395406a798cd6a
 SHA512:
-  metadata.gz: 2ae3500906ffdc568ce881fad3c6581958bfcb32d5f145242f93eac7d6710a05a0d549e734ae3542040366cc75e584846f5100bdcada8e29e9529975f6e194af
-  data.tar.gz: f6be135129633829f2585831fc2576a566618f023f1bc4ab15f7b96e35437c9fddc668c6fa14a02d273d3c46e8c5ee5be4149946f6df8a679fe5628c8a26d398
+  metadata.gz: 4d0b406d85678d22316cef99327f517c3d9ee709519458a233ae9bacaac22a8a22afdea28a28379bcc37e2e81d2a841f862aff216531d066272e37612dff9365
+  data.tar.gz: f4fd66bbbecd7bea23b934208fc7b8e721e4bd9054bf5f67946be29eaa17cd854a25d0b303b5f792f388ebd137c70e48e60b5f9a4d00ed24eb9cb1bb5876f81a

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)
@@ -176,12 +177,28 @@ Something like this:
 copy_to_clipboard "some_id" # some_id is HTML id of element. Content of this element will be copied to the clipboard after pressing the button
 ```
 
-## How to create model that will be an Application Model for the Tramway
+# Every Tramway application need initialized @application object (or if you create Tramway plugin, it should be @application_engine object).
+
+You don't need to initialize this object yourself, just configurate application with Tramway. You have **2** options of this:
+
+## Option 1. If you want to change @application object just in the code base.
+
+```shell
+rails g tramway:core:application
+```
+
+*config/initializers/tramway.rb*
+
+```ruby
+Tramway::Core.initialize_application name: :your_application_name
+```
+
+## Option 2. If you want to change @application object from admin panel. How to create model that will be an Application Model for the Tramway
 
 #### 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
 ```
 
@@ -195,7 +212,7 @@ Tramway::Core.initialize_application model_class: Organization
 
 ```ruby
 rails c
-Organization.create! public_name: 'Tramway', name: :organization, tagline: 'Tramway is not buggy, LOL!'
+Organization.create! public_name: 'Tramway', name: :organization, tagline: 'Tramway is not buggy, LOL!', main_image: 'https://raw.githubusercontent.com/ulmic/tramway-dev/develop/logo.png'
 ```
 
 #### 4. Add model to singleton to the `tramway-admin` admin panel to be able to change its data

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,14 +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)
-      return if association_type(association) == :has_one && object.send(association_name) == nil
+      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).in? [ :belongs_to, :has_one ]
     end
   end
 end

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

@@ -40,11 +40,19 @@ module Tramway::Core::Associations::ObjectHelper
 
     begin
       form_class.constantize
-    rescue
+    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/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.1'
+    VERSION = '1.18.3.2'
   end
 end

data/lib/tramway/error.rb

@@ -22,6 +22,7 @@ class Tramway::Error < RuntimeError
       @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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tramway-core
 version: !ruby/object:Gem::Version
-  version: 1.18.1.1
+  version: 1.18.3.2
 platform: ruby
 authors:
 - Pavel Kalashnikov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-30 00:00:00.000000000 Z
+date: 2020-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: audited
@@ -119,22 +119,16 @@ dependencies:
   name: haml-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -361,6 +355,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