tramway-core 1.17.3.1 → 1.17.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48e1c947dad194f06baa925068b67088cf7f62847b0e8f675431c8a9f927f8f2
-  data.tar.gz: fada3528a9b191eb8ddbf0a524f5d117caf694b3b280e6b7d8fd753c778386a8
+  metadata.gz: ff3312136cc5e939cc9948d495df56951db7f9263eb15350627c9b04e8cb6407
+  data.tar.gz: 76b5da26c35481745798638acc2d9733098ae72336372ee6617a448122db71f9
 SHA512:
-  metadata.gz: 230d46ff585f5dfd4773621d2d26b294b7c51eae32611fce795ab17051647f7a88057615f78e9dbd4361935589c7ce145923db47b3c8ee83384696c3bc579d3b
-  data.tar.gz: 4d35f00d6faae4717b297d3b65ef085e7875df33efa052da1e62e7d96d880be8e3517bbacd5bec4df14292408184c4cb42e4febbcdf6bb64474bfcaefaac5f62
+  metadata.gz: de88772c33ebe611368ba67a004bd86d9cf74601b91a1b7688ba8ce9d2669b5305169da3fcecdcc40b268b579cd406b877ce59d832bdc0635809cb6e7a65f045
+  data.tar.gz: f70ca13587e303220071f3b57a89ce6c4642fedf31a2ddbf869a05392825daa60c48bb66d6bfd4f03253ec03901da00f4504bf5cbacdd71ecb54a77a9d56a362

data/README.md

@@ -132,7 +132,7 @@ end
 
 ### CopyToClipboardHelper
 
-[app/helpers/tramway/core/copy_to_clipboard_helper.rb](https://github.com/ulmic/tramway-dev/blob/develop/tramway-core/app/helpers/tramway/core/copy_to_clipboard_helper.rb)
+[app/helpers/tramway/core/copy_to_clipboard_helper.rb] (https://github.com/ulmic/tramway-dev/blob/develop/tramway-core/app/helpers/tramway/core/copy_to_clipboard_helper.rb)
 
 #### Install
 

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

@@ -96,7 +96,7 @@ class Tramway::Core::ApplicationForm < ::Reform::Form
           @@model_class = model_class_name.constantize
         rescue StandardError
           Tramway::Error.raise_error :tramway, :core, :application_form, :model_class, :there_is_not_model_class,
-            name: name, model_class_name: model_class_name
+                                     name: name, model_class_name: model_class_name
         end
       end
     end
@@ -123,8 +123,10 @@ class Tramway::Core::ApplicationForm < ::Reform::Form
 
   def save
     super
+  rescue ArgumentError => e
+    Tramway::Error.raise_error :tramway, :core, :application_form, :save, :argument_error, message: e.message
   rescue StandardError => e
-    Tramway::Error.raise_error :tramway, :core, :application_form, :submit, :looks_like_you_have_method,
-      method_name: e.name.to_s.gsub('=', ''), model_class: @@model_class, class_name: self.class
+    Tramway::Error.raise_error :tramway, :core, :application_form, :save, :looks_like_you_have_method,
+                               method_name: e.name.to_s.gsub('=', ''), model_class: @@model_class, class_name: self.class
   end
 end

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

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

data/app/helpers/tramway/core/inputs_helper.rb

@@ -18,7 +18,7 @@ module Tramway::Core::InputsHelper
         value: (form_object.send(property) || form_object.model.send("#{property}_id") || value)
       },
       selected: (form_object.model.send("#{property}_id") || value),
-      collection: full_class_name_association.active.map do |obj|
+      collection: full_class_name_association.active.send("#{current_user.role}_scope", current_user.id).map do |obj|
         decorator_class(full_class_name_association).decorate obj
       end.sort_by(&:name)
     }.merge options
@@ -27,7 +27,7 @@ module Tramway::Core::InputsHelper
   def polymorphic_association_params(object:, form_object:, property:, value:, options: {})
     full_class_names = form_object.model.class.send("#{property}_type").values.map &:constantize
     collection = full_class_names.map do |class_name|
-      class_name.active.map do |obj|
+      class_name.active.send("#{current_user.role}_scope", current_user.id).map do |obj|
         decorator_class(class_name).decorate obj
       end
     end.flatten.sort_by { |obj| obj.name.to_s }

data/app/uploaders/photo_uploader.rb

@@ -16,6 +16,10 @@ class PhotoUploader < ApplicationUploader
     end
   end
 
+  def present?
+    super && width.present? && height.present?
+  end
+
   version :medium do
     process resize_to_fill: [400, 400]
   end

data/lib/tramway/core/application.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Tramway::Core::Application
-  attr_accessor :name, :url, :model_class, :title, :tagline, :found_date, :phone, :email
+  attr_accessor :name, :url, :model_class, :title, :tagline, :found_date, :phone, :email, :main_image, :favicon
 
   def public_name
     name.to_s.gsub('_', ' ').camelize

data/lib/tramway/core/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Core
-    VERSION = '1.17.3.1'
+    VERSION = '1.17.6'
   end
 end

data/lib/yaml/errors.yml

@@ -13,8 +13,10 @@ tramway:
       validates:
         you_need_to_set_model_class: 'You need to set `model_class` name while using validations. Just write `self.model_class = YOUR_MODEL_NAME` in the class area.'
       submit:
-        looks_like_you_have_method: "Looks like you have method `%{method_name}` in %{model_class}. You should rename it or rename property in %{class_name}"
         params_should_not_be_nil: "ApplicationForm::Params should not be nil"
+      save:
+        looks_like_you_have_method: "Looks like you have method `%{method_name}` in %{model_class}. You should rename it or rename property in %{class_name}"
+        argument_error: "We have ArgumentError with message: %{message}"
       model_class: 
         there_is_not_model_class: "There is not model class name for %{name}. Should be %{model_class_name} or you can use another class to initialize form object or just initialize form with object."
     concerns:

metadata

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