tramway-core 1.11.2.1 → 1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37e67486fa7b4d30a04458655b613d872ecd1c4e04281831d7196c1af7a66844
-  data.tar.gz: 4a45ed90f8a69a8c772ff1ac5c82cd139618b17e6417e9730cab89b67ab1b3f4
+  metadata.gz: c07ed465cd6546dc6ac1e57fa6876286172bfb317ccd84ec0358f833667d18fb
+  data.tar.gz: dc7460762de2427947949bc59c6dc2fa16af47ca15baafd260ce525332b9abf0
 SHA512:
-  metadata.gz: e1d7d0bb96e4af2272de7df6b71ebda6a445a89b06c2d2b7a816b5697d62a88fd12f316893fb0b84dd7125db0dff125d8702a7f23a7a59ba0a6121af0ed10194
-  data.tar.gz: 13d6dd9a69f67cdff2f058bf376b38d3e93e4751ea49e127ab82585f41e983260b885a7a1301b4915f815f30252d4ce82fb8c42a4e09125514555dad31c4331e
+  metadata.gz: 4fb5af42164b10eccb81a855ae4cb3735cb80b685a50817d23dcfc6dd6081fa90e45b0e61d8d00c091f99f5d2f7276fcc493e5ce25ff1d94e8ed9d4608398a4f
+  data.tar.gz: 8aac6e1b68f642988b51481fdbd58484e65e9213d212d4d7d417b22842da2501808ac16ac4a506f1bf040c761fd209e341dd17ad8fca5df3748841da82e9d93a

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

@@ -119,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/helpers/tramway/core/title_helper.rb

@@ -16,7 +16,11 @@ module Tramway
       end
 
       def page_title(action, model_name)
-        t("helpers.actions.#{action}") + ' ' + genitive(model_name)
+        if I18n.locale == :ru
+          t("helpers.actions.#{action}") + ' ' + genitive(model_name)
+        else
+          t("helpers.actions.#{action}") + ' ' + model_name.model_name.human.downcase
+        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/config/locales/en/dates.yml

@@ -0,0 +1,10 @@
+en:
+  date:
+    from: from
+    to: to
+    formats:
+      default: "%m/%d/%Y"
+    month_names: [~, January, February, March, April, May, June, July, August, September, October, November, December]
+  time:
+    formats:
+      default: "%m/%d/%Y %H:%M"

data/config/locales/en/helpers.yml

@@ -0,0 +1,19 @@
+en:
+  helpers:
+    links:
+      enter: Sign In
+      save: Save
+      back: Back
+      sign_out: Sign Out
+      actions: Actions
+      open: Open
+    actions:
+      create: Create
+      update: Update
+      search: Search
+      reset: Reset
+      download: Download
+    scope:
+      found: Found
+    "yes": yes
+    "no": no

data/config/locales/en/messages.yml

@@ -0,0 +1,6 @@
+en:
+  tramway:
+    core:
+      shared:
+        messages:
+          some_errors_was_found: There are errors

data/config/locales/en/models.yml

@@ -0,0 +1,7 @@
+en:
+  activerecord:
+    attributes:
+      tramway/core/application_record:
+        created_at: Created at
+        updated_at: Updated at
+        state: State

data/config/locales/en/simple_form_extension.yml

@@ -0,0 +1,8 @@
+en:
+  simple_form:
+    extension:
+      selectize:
+        add: Add
+      file:
+        select: Select file
+        change: Change file

data/config/locales/en/state_machines.yml

@@ -0,0 +1,8 @@
+en:
+  activerecord:
+    state_machines:
+      tramway/core/application_record:
+        state:
+          states:
+            active: Active
+            removed: Removed

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.1'
+    VERSION = '1.13'
   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.1
+  version: '1.13'
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-19 00:00:00.000000000 Z
+date: 2019-09-08 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
@@ -356,6 +356,12 @@ files:
 - config/initializers/assets.rb
 - config/initializers/carrierwave.rb
 - config/initializers/plurals.rb
+- config/locales/en/dates.yml
+- config/locales/en/helpers.yml
+- config/locales/en/messages.yml
+- config/locales/en/models.yml
+- config/locales/en/simple_form_extension.yml
+- config/locales/en/state_machines.yml
 - config/locales/ru/dates.yml
 - config/locales/ru/helpers.yml
 - config/locales/ru/messages.yml
@@ -376,6 +382,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 +402,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