tramway-core 1.18.1.2 → 1.18.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2eca2bd589fed76d9385bbed1319fbd061e418521966d81561bf8ffeaa3648c9
-  data.tar.gz: 67488c6b5304f9941220b9bcb97d6ca5271e414e323d7c64806805e5aea5deb5
+  metadata.gz: f15409a5475b15fd5f275bebbf8d9017e727e01b66a6f7d5b2f509bdb00e022b
+  data.tar.gz: 6853236cba6a0d4ca13447223b1ffb052bcbe722faae44a30f9ba224f255fcf2
 SHA512:
-  metadata.gz: 3f8da95bb6038a4e3bb956fcf0a7851cb2e81a82392a92fd00a1d1337eaad0a13f5a852a2a8701bcead04eb1250ac17335d5bf44deb18c4dbcf3df980026e275
-  data.tar.gz: be00745caa58c4703b5dca9eb53ef6dc8d16917d39c510f0d95efac655c165fa5eec00e6813424eba5edd0f78377c60bbdb77688a3f7895b4ab8d9910f051617
+  metadata.gz: 3be3d4cc9bc7002fc1885c12e9a7abe239c4b7941f8b88a76d7134a7b6ae5f7438a6c15778648c5cf14988c03dc0702b7baaa65467940af7cac607c5d2c2056e
+  data.tar.gz: e4606632334f0f73294433283b37d0d68be05e1d45fc7c7f31c4e9708d09f7c3aee81a3b424668933a94f42c7aa5eb492aef03b1da619ead5e4a01d5379c10a9

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)

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.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.2
+  version: 1.18.2
 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-05-26 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