tramway-core 1.18.0.4 → 1.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc4e360083a946fd3e4d022ed65747d56f21a42adb46cda0224d6873cf8db42d
-  data.tar.gz: c1a39ccd53513c8ab09d9d2e1ff576b9c309ba7f07e7f2238b03501dfb20057b
+  metadata.gz: 88f57e54e293b5c5a85a88563762fd8c26df2ccbcb6eedebcb8ad1636d19ab08
+  data.tar.gz: 721461846180ea4eb78ebdbc314029be09ff3c391c995900ef0d2a498236af62
 SHA512:
-  metadata.gz: 77f182880e0b69605f74e99a660ce5d855efc2b37f3179fd38df111fd9eaae0bd7fb67adaa1b6a3ed16bf0b779508e99da07062b203f25f005d66d432741ae00
-  data.tar.gz: aec229afedc05c8353a4a499f50c91dea8510a0e8ffb5dec7756f241a61ef4f62cd1fcd0586fa80ccffa287be0c8fa76909af35592abfeadcf85ea6f0f8a7303
+  metadata.gz: b641dc9b842fb20fef05c90a73ed0007ddb9804b45cef8e6b74b2c6eea99e6610580d79450a7ef121a53a373685369addb83078e0db5e658c2129306c542c62c
+  data.tar.gz: 7f19244857938c969c03e52d49c063d34b52e25e4aad17d9bdee41bc7d12b2e650f241ec51a2f6a90ce71ab2cc2fd5409ac5d26857c59b464d44a095632d69c8

data/README.md

@@ -34,7 +34,31 @@ Rails.application.config.assets.precompile += %w( *.jpg *.png *.js )
 ```
 # Usage
 
-## Decorators
+## Tramway::Core::ApplicationRecord
+
+### uploader
+
+Tramway use [carrierwave](https://github.com/carrierwaveuploader/carrierwave) for file uploading by default. To mount uploader you should use `uploader` method
+
+Interface: `uploader(attribute_name, uploader_name, **options)`
+
+* attribute_name - ActiveRecord attribute to mount uploader
+* 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)
+* 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)
+
+Example:
+
+```ruby
+class User < Tramway::Core::ApplicationRecord
+  uploader :avatar, :photo, version: [ :small, :medium ], extensions: [ :jpg, :jpeg ]
+end
+```
+
+## Tramway::Core::ApplicationDecorator
 ### Associations
 
 Your can decorate association models. Supporting all types of association

data/app/forms/tramway/core/extendable_forms_helpers/class_builder.rb

@@ -24,7 +24,7 @@ module Tramway::Core::ExtendableFormsHelpers::ClassBuilder
           field = property[1][:object]
           define_file_property_assignment_method property, field
         else
-          #next unless property[1][:validates].present?
+          # next unless property[1][:validates].present?
 
           define_assignment_method property
         end

data/app/forms/tramway/core/extendable_forms_helpers/submit/class_helpers.rb

@@ -5,20 +5,14 @@ module Tramway::Core::ExtendableFormsHelpers::Submit::ClassHelpers
     define_method 'submit' do |params|
       model.values ||= {}
       extended_params = extended(simple_properties, more_properties, params)
-      params.each do |key, value|
-        method_name = "#{key}="
-        send method_name, value if respond_to?(method_name)
-      end
+      every_attribute_set params
       model.values = extended_params.reduce(model.values) do |hash, pair|
         hash.merge! pair[0] => pair[1]
       end
 
       return unless model.errors.empty?
-      params.each { |key, value| send("#{key}=", value) }
-      result = save
-      result.tap do
-        collecting_associations_errors unless result
-      end
+
+      save_in_submit params
     end
   end
 end

data/app/forms/tramway/core/extendable_forms_helpers/submit/object_helpers.rb

@@ -4,4 +4,18 @@ module Tramway::Core::ExtendableFormsHelpers::Submit::ObjectHelpers
   def extended(simple_properties, more_properties, params)
     params.except(*simple_properties.keys).except(*jsonb_ignored_properties(more_properties)).permit!.to_h
   end
+
+  def every_attribute_set(params)
+    params.each do |key, value|
+      method_name = "#{key}="
+      send(method_name, value) if respond_to?(method_name)
+    end
+  end
+
+  def save_in_submit(_params)
+    result = save
+    result.tap do
+      collecting_associations_errors unless result
+    end
+  end
 end

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

@@ -46,11 +46,16 @@ class Tramway::Core::ApplicationRecord < ActiveRecord::Base
     def uploader(attribute_name, uploader_name, **options)
       mount_uploader attribute_name, "#{uploader_name.to_s.camelize}Uploader".constantize
       @versions = options[:versions] if uploader_name == :photo
+      @extensions = options[:extensions]
     end
 
     def photo_versions
       @versions
     end
+
+    def file_extensions
+      @extensions
+    end
   end
 
   # FIXME: detect inhertited locales

data/app/uploaders/file_uploader.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class FileUploader < ApplicationUploader
-  def extension_white_list
-    %w[pdf doc docx xls csv xlsx jpg svg png jpeg gif]
+  def extension_whitelist
+    model.class.file_extensions || %w[pdf doc docx xls csv xlsx jpg svg png jpeg gif]
   end
 end

data/app/uploaders/image_defaults.rb

@@ -8,7 +8,7 @@ module ImageDefaults
       [mounted_as, version_name].compact.join('_') << '.gif'
   end
 
-  def extension_white_list
-    %w[jpg jpeg gif png]
+  def extension_whitelist
+    model.class.file_extensions || %w[jpg jpeg gif png]
   end
 end

data/lib/tramway/core/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tramway-core
 version: !ruby/object:Gem::Version
-  version: 1.18.0.4
+  version: 1.18.1
 platform: ruby
 authors:
 - Pavel Kalashnikov