tramway-core 1.16.1.5 → 1.16.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6e95b821e3743c540a04d8972861cec96926adb1fb210c9a51a39c5caa711cd
-  data.tar.gz: 456b6f0345b026debd72949521ab48b0bbc8b855d38045ca2bd70c7f6868b7de
+  metadata.gz: adc76271757be0c7460400fff39e98dcf26d0b82de5fb53cbf6f1e603d581a2c
+  data.tar.gz: 0d1dbda847666e5a1eee2b1b244d9902706f475019c42c4337ac248ab24c519d
 SHA512:
-  metadata.gz: 8e9d365a1af79128772bec57746ad6fc1bfc61e840179ac98eed919b620b6656ff7d1448a6f6cf12a6ec69c73e8a72f2a9c4666a0ccbd70c34e08e878812d794
-  data.tar.gz: 796ce3b5eab185625a02945ff9e90ab78cb2e74bae61de21bb4aa68180c199dae52fd63cd1ef46864edf42cb788d07aa5f4956b1573e3942b9375f73ce512d35
+  metadata.gz: 48e33eaa840cebc55156308ec72175a92c8938d930549d768247f9d96b8584662d9eb5648192da535e485070236d5904e340933a3621f9068bde5e6ecb5bc6db
+  data.tar.gz: f2d61018cd3571c8dff6f943a6cceb2f39c1bdc8947f951d1c64a050a9d9c962f7ef1cc9bb1bc525f068f627d6228052727e8be2eb3df837ae302b5daa5c5c80

data/app/decorators/tramway/core/application_decorator.rb

@@ -49,7 +49,7 @@ class Tramway::Core::ApplicationDecorator
       end
     end
 
-    def decorate_association(association_name, decorator: nil, as: nil)
+    def decorate_association(association_name, decorator: nil, as: nil, state_machines: [])
       @@decorated_associations ||= []
       @@decorated_associations << association_name
 
@@ -82,6 +82,10 @@ class Tramway::Core::ApplicationDecorator
       define_method "#{association_name}_as" do
         as
       end
+
+      define_method "#{association_name}_state_machines" do
+        state_machines
+      end
     end
 
     def model_class

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

@@ -97,6 +97,12 @@ module Tramway::Core
       end
     end
 
+    def attributes
+      properties.reduce({}) do |hash, property|
+        hash.merge! property.first => model.values[property.first.to_s]
+      end
+    end
+
     class << self
       delegate :defined_enums, to: :model_class
 

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

@@ -54,7 +54,7 @@ class Tramway::Core::ExtendableForm
                   validator_object = "#{pair[0].camelize}Validator".constantize.new(attributes: :not_blank)
                   if pair[1] == 'true' && !validator_object.send(:valid?, value)
                     model.errors.add property[0],
-                      I18n.t("activerecord.errors.models.#{model.class.name.underscore}.attributes.#{property[0]}.#{pair[0]}", value: value)
+                      I18n.t("activerecord.errors.models.#{model.class.name.underscore}.attributes.default.#{pair[0]}", value: value)
                   end
                 end
               end

data/app/uploaders/photo_uploader.rb

@@ -11,7 +11,8 @@ class PhotoUploader < ApplicationUploader
     if file.present? && File.exist?(file.file)
       file.file.match(%r{/system/uploads/.*}).to_s
     else
-      '/assets/tramway/core/mona_lisa_from_prado_square.jpg'
+      default_url = '/assets/tramway/core/mona_lisa_from_prado_square.jpg'
+      File.exists?(default_url) ? default_url : ''
     end
   end
 

data/app/views/tramway/core/shared/input_extended_types/_checkbox.html.haml

@@ -1 +1 @@
-= f.input field.title.to_sym, as: :boolean, input_html: { class: class_name, id: "#{class_name}_#{field.title.to_sym}", name: "#{class_name}[#{field.title}]" }, checked_value: value == field.title.to_sym
+= f.input field.title.to_sym, as: :boolean, input_html: { class: class_name, id: "#{class_name}_#{field.title.to_sym}", name: "#{class_name}[#{field.title}]" }, checked_value: value == field.title.to_sym, required: field.required

data/app/views/tramway/core/shared/input_extended_types/_select.html.haml

@@ -1,16 +1,16 @@
 - parsed_json = field.options.is_a?(Hash) ? field.options : (JSON.parse(field.options) unless field.options == '')
 - if parsed_json&.dig('collection', 'name')
   - if value.present?
-    = f.input field.title.to_sym, as: :select, collection: collection_list_by(name: parsed_json['collection']['name']), input_html: { class: class_name, id: "#{class_name}_#{field.title}", name: "#{class_name}[#{field.title}]" }, selected: value
+    = f.input field.title.to_sym, as: :select, collection: collection_list_by(name: parsed_json['collection']['name']), input_html: { class: class_name, id: "#{class_name}_#{field.title}", name: "#{class_name}[#{field.title}]" }, selected: value, required: field.required
   - else
-    = f.input field.title.to_sym, as: :select, collection: collection_list_by(name: parsed_json['collection']['name']), input_html: { class: class_name, id: "#{class_name}_#{field.title}", name: "#{class_name}[#{field.title}]" }
+    = f.input field.title.to_sym, as: :select, collection: collection_list_by(name: parsed_json['collection']['name']), input_html: { class: class_name, id: "#{class_name}_#{field.title}", name: "#{class_name}[#{field.title}]" }, required: field.required
 - elsif parsed_json&.dig('collection', 'array')
   - if value.present?
-    = f.input field.title.to_sym, as: :select, collection: parsed_json.dig('collection', 'array'), input_html: { class: class_name, id: "#{class_name}_#{field.title}", name: "#{class_name}[#{field.title}]" }, selected: value
+    = f.input field.title.to_sym, as: :select, collection: parsed_json.dig('collection', 'array'), input_html: { class: class_name, id: "#{class_name}_#{field.title}", name: "#{class_name}[#{field.title}]" }, selected: value, required: field.required
   - else
-    = f.input field.title.to_sym, as: :select, collection: parsed_json.dig('collection', 'array'), input_html: { class: class_name, id: "#{class_name}_#{field.title}", name: "#{class_name}[#{field.title}]" }
+    = f.input field.title.to_sym, as: :select, collection: parsed_json.dig('collection', 'array'), input_html: { class: class_name, id: "#{class_name}_#{field.title}", name: "#{class_name}[#{field.title}]" }, required: field.required
 - else
   - if value.present?
-    = f.input field.title.to_sym, as: :select, input_html: { class: class_name, id: "#{class_name}_#{field.title}", name: "#{class_name}[#{field.title}]" }, selected: value
+    = f.input field.title.to_sym, as: :select, input_html: { class: class_name, id: "#{class_name}_#{field.title}", name: "#{class_name}[#{field.title}]" }, selected: value, required: field.required
   - else
-    = f.input field.title.to_sym, as: :select, input_html: { class: class_name, id: "#{class_name}_#{field.title}", name: "#{class_name}[#{field.title}]" }
+    = f.input field.title.to_sym, as: :select, input_html: { class: class_name, id: "#{class_name}_#{field.title}", name: "#{class_name}[#{field.title}]" }, required: field.required

data/app/views/tramway/core/shared/input_extended_types/_simple.html.haml

@@ -1,4 +1,4 @@
 - if value.present?
-  = f.input field.title.to_sym, as: field.field_type, input_html: { class: class_name, id: "#{class_name}_#{field.title}", name: "#{class_name}[#{field.title}]", value: value }
+  = f.input field.title.to_sym, as: field.field_type, input_html: { class: class_name, id: "#{class_name}_#{field.title}", name: "#{class_name}[#{field.title}]", value: value }, required: field.required
 - else
-  = f.input field.title.to_sym, as: field.field_type, input_html: { class: class_name, id: "#{class_name}_#{field.title}", name: "#{class_name}[#{field.title}]" }
+  = f.input field.title.to_sym, as: field.field_type, input_html: { class: class_name, id: "#{class_name}_#{field.title}", name: "#{class_name}[#{field.title}]" }, required: field.required

data/lib/tramway/core/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Core
-    VERSION = '1.16.1.5'
+    VERSION = '1.16.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-core
 version: !ruby/object:Gem::Version
-  version: 1.16.1.5
+  version: 1.16.2
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-16 00:00:00.000000000 Z
+date: 2020-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: audited