tramway-core 1.18 → 1.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57bc94fcad00f60e39f4b5eb62b9c959a0739d3063d9ee3017349c9ef8e91c04
-  data.tar.gz: 4b11029d70b3dd9f45bfc7ec4e73fc8fb4b3f9ae60eec90756431ab92d611aa7
+  metadata.gz: 88f57e54e293b5c5a85a88563762fd8c26df2ccbcb6eedebcb8ad1636d19ab08
+  data.tar.gz: 721461846180ea4eb78ebdbc314029be09ff3c391c995900ef0d2a498236af62
 SHA512:
-  metadata.gz: 6955a32c4a63a19ea949694636d64b7725aa571fc601e213276e67555ac8300bea5bbff4ca3c9337eeba9e8001dcf40b4b9dda4ca6e7bb6f0ab1d2d1d13cb2f5
-  data.tar.gz: cad297b01c90cff4e6a66048cec29e39faba8744ec4148ddf6d1e1fcf80775974bc361414ea8dc05c4788749e87d8cef5ec39832dc150d32e9f80704b8d4d100
+  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
@@ -157,7 +181,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 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 db:migrate
 ```
 

data/app/forms/tramway/core/application_form.rb

@@ -39,11 +39,15 @@ class Tramway::Core::ApplicationForm
     delegate :defined_enums, to: :model_class
 
     def properties(*props)
+      props.each { |prop| property prop }
+    end
+
+    def property(prop)
       @@properties ||= []
-      @@properties += props
-      props.each do |prop|
-        delegate prop, to: :model
-        define_method("#{prop}=") { |value| model.send "#{prop}=", value }
+      @@properties << prop
+      delegate prop, to: :model
+      define_method("#{prop}=") do |value|
+        model.send "#{prop}=", value
       end
     end
 

data/app/forms/tramway/core/application_forms/association_object_helpers.rb

@@ -7,7 +7,7 @@ module Tramway::Core::ApplicationForms::AssociationObjectHelpers
     else
       self.class.send(:define_method, "#{association}=") do |value|
         model.send "#{association}_id=", value
-        super class_name.find value
+        model.send "#{association}=", class_name.find(value)
       end
     end
   end
@@ -20,7 +20,7 @@ module Tramway::Core::ApplicationForms::AssociationObjectHelpers
         Tramway::Error.raise_error :tramway, :core, :application_form, :initialize, :polymorphic_class_is_nil,
           association_name: association
       else
-        super association_class.find value.split('_')[-1]
+        model.send "#{association}=", association_class.find(value.split('_')[-1])
         send "#{association}_type=", association_class.to_s
       end
     end

data/app/forms/tramway/core/application_forms/properties_object_helper.rb

@@ -5,19 +5,12 @@ module Tramway::Core::ApplicationForms::PropertiesObjectHelper
     @form_properties = args
   end
 
-  def form_properties_additional(**args)
-    @form_properties_additional = args
-  end
-
   def properties
-    return @form_properties if @form_properties
-
+    @form_properties ||= {}
     yaml_config_file_path = Rails.root.join('app', 'forms', "#{self.class.name.underscore}.yml")
 
-    return [] unless File.exist? yaml_config_file_path
+    return @form_properties unless File.exist? yaml_config_file_path
 
-    @form_properties = YAML.load_file(yaml_config_file_path).deep_symbolize_keys
-    @form_properties.deep_merge! @form_properties_additional if @form_properties_additional
-    @form_properties
+    @form_properties.deep_merge YAML.load_file(yaml_config_file_path).deep_symbolize_keys
   end
 end

data/app/forms/tramway/core/application_forms/submit_helper.rb

@@ -4,7 +4,10 @@ module Tramway::Core::ApplicationForms::SubmitHelper
   def submit(params)
     if params
       params.each { |key, value| send("#{key}=", value) }
-      save || collecting_associations_errors
+      result = save
+      result.tap do
+        collecting_associations_errors unless result
+      end
     else
       Tramway::Error.raise_error(:tramway, :core, :application_form, :submit, :params_should_not_be_nil)
     end

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/more_properties_helper.rb

@@ -9,8 +9,12 @@ module Tramway::Core::ExtendableFormsHelpers::MorePropertiesHelper
 
   def define_assignment_method(property)
     define_method "#{property[0]}=" do |value|
-      property[1][:validates].each do |pair|
-        make_validates property[0], pair, value
+      if property[1][:validates].present?
+        property[1][:validates].each do |pair|
+          make_validates property[0], pair, value
+        end
+      else
+        model.values.merge property[0] => value
       end
     end
   end

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

@@ -5,14 +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
-      super(params) && model.errors.empty?
+
+      return unless model.errors.empty?
+
+      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/application_uploader.rb

@@ -14,6 +14,7 @@ class ApplicationUploader < CarrierWave::Uploader::Base
   def id_directory
     if model.respond_to?(:uuid)
       model.reload unless model.uuid.present?
+      model.uuid
     else
       model.id
     end

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/app/uploaders/photo_uploader.rb

@@ -4,7 +4,7 @@ class PhotoUploader < ApplicationUploader
   include ImageDefaults
 
   def default_url
-    ActionController::Base.helpers.asset_path('images/default_photo.png')
+    ActionController::Base.helpers.asset_path('mona_lisa_from_prado_square.png')
   end
 
   def url
@@ -16,10 +16,6 @@ class PhotoUploader < ApplicationUploader
     end
   end
 
-  def present?
-    super && width.present? && height.present?
-  end
-
   version :medium, if: :medium_version_is_needed? do
     process resize_to_fill: [400, 400]
   end

data/lib/tramway/core/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Core
-    VERSION = '1.18'
+    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'
+  version: 1.18.1
 platform: ruby
 authors:
 - Pavel Kalashnikov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-23 00:00:00.000000000 Z
+date: 2020-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: audited