tramway-core 1.11.2 → 1.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08d6ae73913d795796280bd95921fd183b9c5931ad108ead009b16b78989d5fe'
-  data.tar.gz: 750b88db7c70b119c282a0f59d6f67f3b5cd82f1a8783eab48aff5223095d5f7
+  metadata.gz: 16172a47127987a0492d51f269ccd76ab319bf8323636ba20f3ac36745fb2007
+  data.tar.gz: ac86409a6b1fbc1462f07a5a5b999ff81755a9af28c8b3e834a786983915f006
 SHA512:
-  metadata.gz: 0b68b0b2247476b927ba050b4256926b9698453fbe38fb7eaa97d37c219da9f3307407c989c101746b254b7ccbf968599fb9446baf0c09472dc2464258dc70a5
-  data.tar.gz: d49b32f30fb6e1c33c6890c3aa610b2a1f93d32e71207622fb2e8b0b486a7296c553908f6cccc099b0d58701ab70f2f0bdddcdc69f6d62899c5ddad0cf70e186
+  metadata.gz: 6e45054851f49dbc7c1aff4c267c5eb0a6c95a95569808649313991699160bf90e93f96293c69658ad5b23a60b5b188ab585eb1da8ec05e902a689544e3f82d6
+  data.tar.gz: 58786a322921c254d038f39dfc3d4b8338f78f77bb7a8d6c6826b916c8b6957530a034229ad42dfc93165f0f1ffb5d9e9c779a86a9510b54bdd7bb20ab25ae77

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

@@ -62,14 +62,13 @@ class Tramway::Core::ApplicationDecorator
                        association.options[:class_name]
                      end
         decorator_class_name = decorator || "#{class_name.to_s.singularize}Decorator".constantize
-        # FIXME rails has_many association don't have belongs_to? method... bullshit. Need PR to rails
-        if association.try :has_many?
-          object.send(association_name).active.map do |association_object|
+        if association.class == ActiveRecord::Reflection::HasManyReflection
+          return object.send(association_name).active.map do |association_object|
             decorator_class_name.decorate association_object
           end
         end
-        if association.try :belongs_to?
-          decorator_class_name.decorate object.send association_name
+        if association.class == ActiveRecord::Reflection::BelongsToReflection
+          return decorator_class_name.decorate object.send association_name
         end
       end
     end
@@ -120,7 +119,7 @@ class Tramway::Core::ApplicationDecorator
       elsif value.class.in? [ ActiveSupport::TimeWithZone, DateTime, Time ]
         hash.merge! attribute[0] => datetime_view(attribute[1])
       elsif value.class.superclass == ApplicationUploader
-        hash.merge! attribute[0] => image_view(attribute[1])
+        hash.merge! attribute[0] => image_view(object.send(attribute[0]))
       elsif value.is_a? Enumerize::Value
         hash.merge! attribute[0] => enumerize_view(value)
       else

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

@@ -118,6 +118,10 @@ module Tramway::Core
       def validation_group_class
         ActiveModel
       end
+
+      def validates(attribute, **options)
+        model_class.validates attribute, **options
+      end
     end
   end
 end

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

@@ -10,6 +10,12 @@ class Tramway::Core::ExtendableForm
           define_method 'submit' do |params|
             model.values ||= {}
             extended_params = params.except(*simple_properties.keys)
+            params.each do |key, value|
+              method_name = "#{key}="
+              if respond_to?(method_name)
+                send method_name, value
+              end
+            end
             model.values = extended_params.permit!.to_h.reduce(model.values) do |hash, pair|
               hash.merge! pair[0] => pair[1]
             end
@@ -25,7 +31,7 @@ class Tramway::Core::ExtendableForm
             end
             more_properties.reduce(hash) do |h, property|
               h.merge! property[0] => {
-                extended_form_property: property[1]
+                extended_form_property: property[1][:object]
               }
             end
           end
@@ -34,6 +40,18 @@ class Tramway::Core::ExtendableForm
             define_method property[0] do 
               model.values[property[0]] if model.values
             end
+
+            if property[1][:validates].present?
+              define_method "#{property[0]}=" do |value|
+                property[1][:validates].each do |pair|
+                  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 })
+                  end
+                end
+              end
+            end
           end
         end)
       end

data/app/views/tramway/core/shared/_input_extended.html.haml

@@ -17,3 +17,6 @@
       = 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
     - else
       = f.input field.title.to_sym, as: :select, input_html: { class: class_name, id: "#{class_name}_#{field.title}", name: "#{class_name}[#{field.title}]" }
+- if params[:errors].present? && params[:errors][field.title]&.first
+  .alert.alert-danger
+    = params[:errors][field.title]&.first

data/lib/tramway/core.rb

@@ -5,6 +5,7 @@ require 'tramway/error'
 require 'font_awesome5_rails'
 require 'reform'
 require 'pg_search'
+require 'validators/presence_validator'
 
 module Tramway
   module Core

data/lib/tramway/core/engine.rb

@@ -9,8 +9,6 @@ module Tramway
       isolate_namespace Tramway::Core
 
       config.before_initialize do
-        config.i18n.available_locales = [:ru]
-        config.i18n.default_locale = :ru
         config.i18n.load_path += Dir["#{config.root}/config/locales/**/*.yml"]
       end
     end

data/lib/tramway/core/version.rb

@@ -1,5 +1,5 @@
 module Tramway
   module Core
-    VERSION = '1.11.2'
+    VERSION = '1.12.1'
   end
 end

data/lib/validators/presence_validator.rb

@@ -0,0 +1,8 @@
+class PresenceValidator
+  def initialize(attributes)
+  end
+
+  def valid?(value)
+    value.present?
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-core
 version: !ruby/object:Gem::Version
-  version: 1.11.2
+  version: 1.12.1
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-10 00:00:00.000000000 Z
+date: 2019-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: reform-rails
@@ -48,22 +48,22 @@ dependencies:
   name: simple_form
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.5'
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.5.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.5'
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.5.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
@@ -116,42 +116,42 @@ dependencies:
   name: mini_magick
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.8'
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.8.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.8'
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.8.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.8'
 - !ruby/object:Gem::Dependency
   name: rmagick
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.16'
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.16.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.16'
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.16.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.16'
 - !ruby/object:Gem::Dependency
   name: loofah
   requirement: !ruby/object:Gem::Requirement
@@ -176,22 +176,22 @@ dependencies:
   name: haml-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: font_awesome5_rails
   requirement: !ruby/object:Gem::Requirement
@@ -376,6 +376,7 @@ files:
 - lib/tramway/core/version.rb
 - lib/tramway/error.rb
 - lib/tramway/helpers/class_name_helpers.rb
+- lib/validators/presence_validator.rb
 homepage: https://github.com/kalashnikovisme/tramway-core
 licenses:
 - MIT
@@ -395,8 +396,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Core for all Tramway Rails Engines