tramway-core 1.18.0.1 → 1.18.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc1dd51b28f3431c8df5cd27f8350d7dc2b4bedcf7a811c48130a9eb8d1d207b
-  data.tar.gz: fe2291fcb3bc27d9de9ebe3753ea493ef99a19ebb49db88fcf6e3b9917b2c6be
+  metadata.gz: ff863d7c75ba76a10d1f9c751b9710474a16b0cd126a6974224d8cbcb26d9dd4
+  data.tar.gz: b890fdbb1e3a33e6dc9cac04ca8cc3d91a5c240a9337c4313b576faf44f47c7b
 SHA512:
-  metadata.gz: 63428cee65707e287d8abb8e2d110f1b83342213a14d43f77bebb20530a9fb0765bd81d4659360a258f59d6597e32120d415ee80a508c9abb4bc49681d357b20
-  data.tar.gz: 3d597d30be2064ece9c9d7520964445868349ab8c924400f5f944fe18abade3efb673a1026ebc5dc576b178900ee4831682aff7a51e38f23c8bfd056cc2b03e3
+  metadata.gz: 2ae3500906ffdc568ce881fad3c6581958bfcb32d5f145242f93eac7d6710a05a0d549e734ae3542040366cc75e584846f5100bdcada8e29e9529975f6e194af
+  data.tar.gz: f6be135129633829f2585831fc2576a566618f023f1bc4ab15f7b96e35437c9fddc668c6fa14a02d273d3c46e8c5ee5be4149946f6df8a679fe5628c8a26d398

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/decorators/tramway/core/associations/class_helper.rb

@@ -29,12 +29,14 @@ 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
+
       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)
       end
-      return decorator_class_name.decorate object.send association_name if association_type(association) == :belongs_to
+      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

@@ -36,6 +36,15 @@ module Tramway::Core::Associations::ObjectHelper
   end
 
   def add_association_form_class_name(object, association_name)
-    "Admin::#{object.class.to_s.pluralize}::Add#{association_name.to_s.camelize.singularize}Form".constantize
+    form_class = "Admin::#{object.class.to_s.pluralize}::Add#{association_name.to_s.camelize.singularize}Form"
+
+    begin
+      form_class.constantize
+    rescue
+      Tramway::Error.raise_error(
+        :tramway, :core, :associations, :object_helper, :habtm_add_class_not_defined,
+        class: form_class, association_name: association_name
+      )
+    end
   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/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,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

@@ -12,7 +12,7 @@ class Tramway::Core::ApplicationRecord < ActiveRecord::Base
     state :removed
 
     event :remove do
-      transition active: :remove
+      transition active: :removed
     end
   end
 
@@ -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

@@ -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.0.1'
+    VERSION = '1.18.1.1'
   end
 end

data/lib/tramway/error.rb

@@ -21,6 +21,7 @@ class Tramway::Error < RuntimeError
     def raise_error(*coordinates, **options)
       @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

data/lib/yaml/errors.yml

@@ -29,6 +29,7 @@ tramway:
     associations:
       object_helper:
         please_specify_association_name: "Please, specify `%{association_name}` association class_name in %{object_class} model. For example: `has_many :%{association_name}, class_name: '%{association_class_name}'`"
+        habtm_add_class_not_defined: "You should define class `%{class}` to be able add and remove `%{association_name}`"
       class_helper:
         model_does_not_have_association: "Model %{object_class} does not have association named `%{association_name}`"
     application_decorator:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tramway-core
 version: !ruby/object:Gem::Version
-  version: 1.18.0.1
+  version: 1.18.1.1
 platform: ruby
 authors:
 - Pavel Kalashnikov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-24 00:00:00.000000000 Z
+date: 2020-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: audited