tramway-core 1.12.0.1 → 1.13.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6d2e6652e488e39aa90a36063ca076f1f3998b347598426f738c0e40fc2f3eb
-  data.tar.gz: 74a56e41f069f66f619099041f6fd9f7553090fda9562036785d34239206a7ba
+  metadata.gz: 49a4349d7dbfe36f3536a92ccd18d76d6f0cdf86c513637961ff97d1e06df29a
+  data.tar.gz: 8be9e068cb027c8b3c56fb8b10fffc14b47e8caec5f285ff41a1b27daaedb952
 SHA512:
-  metadata.gz: ba64dde2874fda5048abddd70d2ae6c2f083ba2a3cb5892ea18204a7bcbcf31ef622fa7adaa5fbf182056b6df5a4db988c40a23e9519e0615ad12030c5063efe
-  data.tar.gz: 601befd1b0c35e3da4e49d2430c546a57984df5ba55a89a1b1a473a9e53c76464187be577c9ab6892e8e2ce3ec36f78e9ad0a485ac95f532dd182997c9aa11ed
+  metadata.gz: 994bd99028e45e64b24a36fc01c901cb0a7dfac84cf906487446be4d94fe214bf349b83caabf2c7c1585e866d76e5f8c7f7f757daf8c8543a48dc4cbd61ba25b
+  data.tar.gz: 8530fb7a9f75b5dfbda7b8312cd9a4f1e7d4b8304eb0123e999a615f33eb7f8758d058781f55ae505104f7ee297d38f6c72f82c3217e28ae8be5b658a66ff56d

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

@@ -11,7 +11,11 @@ module Tramway::Core
           if class_name.is_a? Array
             self.class.send(:define_method, "#{association}=") do |value|
               association_class = send("#{association}_type")
-              super association_class.constantize.find value
+              if association_class.nil?
+                raise Tramway::Error.new(plugin: :core, method: :initialize, message: 'Polymorphic association class is nil. Maybe, you should write `assocation #{association_name}` after `properties #{association_name}_id, #{association_name}_type`')
+              else
+                super association_class.constantize.find value
+              end
             end
           else
             self.class.send(:define_method, "#{association}=") do |value|

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

@@ -7,7 +7,7 @@
     = 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}]" }
 - when 'select'
   - parsed_json = field.options.is_a?(Hash) ? field.options : (JSON.parse(field.options) unless field.options == '')
-  - if parsed_json && parsed_json.dig('collection', 'name')
+  - 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
     - else

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,9 @@
+en:
+  activerecord:
+    attributes:
+      tramway/core/application_record:
+        created_at: Created at
+        updated_at: Updated at
+        state: State
+  errors:
+    wrong_email_or_password: Wrong email or password

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/config/locales/ru/helpers.yml

@@ -17,3 +17,8 @@ ru:
       found: Найденные
     "yes": Да
     "no": Нет
+  tramway:
+    admin:
+      welcome:
+        index:
+          title: Админка

data/config/locales/ru/messages.yml

@@ -4,3 +4,5 @@ ru:
       shared:
         messages:
           some_errors_was_found: Найдены ошибки
+  errors:
+    wrong_email_or_password: Неверный логин или пароль

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.12.0.1'
+    VERSION = '1.13.0.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-core
 version: !ruby/object:Gem::Version
-  version: 1.12.0.1
+  version: 1.13.0.2
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-05 00:00:00.000000000 Z
+date: 2019-09-22 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
@@ -396,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