tramway-core 1.18.1.2 → 1.18.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2eca2bd589fed76d9385bbed1319fbd061e418521966d81561bf8ffeaa3648c9
-  data.tar.gz: 67488c6b5304f9941220b9bcb97d6ca5271e414e323d7c64806805e5aea5deb5
+  metadata.gz: 5cf506df0d33b4bb514fb338de95dfce0296dd921c5156fee49b427896516a67
+  data.tar.gz: e13a9a940fc2f2fa54d0e9a450003f469cb357e99b0f86549f0e8f34df8a694c
 SHA512:
-  metadata.gz: 3f8da95bb6038a4e3bb956fcf0a7851cb2e81a82392a92fd00a1d1337eaad0a13f5a852a2a8701bcead04eb1250ac17335d5bf44deb18c4dbcf3df980026e275
-  data.tar.gz: be00745caa58c4703b5dca9eb53ef6dc8d16917d39c510f0d95efac655c165fa5eec00e6813424eba5edd0f78377c60bbdb77688a3f7895b4ab8d9910f051617
+  metadata.gz: 400e256729e362e04970979425fa31650a4741034671d7ecf37e11770e76698423d166c220ffd852d2bd43238e7584c10e3bfd62e81f9d1f138c03aa62094c2f
+  data.tar.gz: a6946fbee6c8a47b8f3098c2c96e21b75e389c511b68c36ce846ed8914ddd9d8a0dc7d0d8a2cc1632391e4d4efb370d37bc8deda8185abee27b30ddda2043e7c

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/assets/javascripts/tramway/core/application.js

@@ -1,7 +1,7 @@
 //= require jquery
 //= require jquery_ujs
 //= require jquery3
-//= require popper
+// require popper FIXME should be optional requiring
 //= require bootstrap
 //= require bootstrap-datepicker-1.8.0
 //= require bootstrap-datepicker-1.8.0.ru.min

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/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.2'
+    VERSION = '1.18.3.3'
   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.2
+  version: 1.18.3.3
 platform: ruby
 authors:
 - Pavel Kalashnikov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-01 00:00:00.000000000 Z
+date: 2020-08-10 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