tramway-core 1.12.0.2 → 1.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 739e25ed38aa108c1d473781baa49145c93bd71e
-  data.tar.gz: 38b8b5c98cc44f8e29cf2960815de6e36301fa55
+SHA256:
+  metadata.gz: 9f17da8e39166fb8bf4ed6efd78f50c7b2424e4c296b59a547614b1ee2eb5c8d
+  data.tar.gz: afe057eca20f716dd777be50de34edbc2ace1d301507a6d0e6345581338a25dd
 SHA512:
-  metadata.gz: 01d0b5a5adb563c6656de7957e7666d92d996b5a57a40b09f7440034504389a64bc9fc9b667312bc079bc081cb10cfeb0380499138bf3ce114f623bda907d9f5
-  data.tar.gz: 2ad68b857722d567f09de830244f19e1e8428890864f7ac170058c8ffffafbf4ac016e52a7d43b673123d738d6b37473c7f65fb04f3875958059a99f385a4191
+  metadata.gz: 1baf5692c4e9d0b6cf6471974ff2ea3b95fb673907bd890b081aca651f3685fa6e049a2641bf90d4578b45e5d90c7907956845ec2b179aae795fec53d5f6db0c
+  data.tar.gz: de8110872ce9bcae012fa705104c1d30a1474fa41919810d15831baf9fe39177d1b0e3a688e59f2216f06d1f3c60489bb0369822307793c2c78e9043bee7d1b3

data/app/assets/javascripts/tramway/core/application.js.coffee

@@ -5,11 +5,16 @@
 #= require font_awesome5
 #= require_tree .
 
+window.i18n_locale = (locale) ->
+  switch locale
+    when 'en' then { date_format: 'yyyy-mm-dd', locale: locale }
+    when 'ru' then { date_format: 'dd.mm.yyyy', locale: locale }
+
 $(document).ready ->
   unless $('.date_picker').length == 0
     $('.date_picker').datepicker({
-      format: 'dd.mm.yyyy',
-      language: 'ru'
+      format: window.current_locale.date_format,
+      language: window.current_locale.locale
     })
 
   $('.link').click ->
@@ -18,6 +23,6 @@ $(document).ready ->
       location.href = href
     else
       anchor = $(this).data('anchor')
-      console.log(anchor)
-      $(window).scrollTop $(anchor).offset().top
+      unless $(anchor).offset() == undefined
+        $(window).scrollTop $(anchor).offset().top
 

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.2'
+    VERSION = '1.13.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-core
 version: !ruby/object:Gem::Version
-  version: 1.12.0.2
+  version: 1.13.1
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-21 00:00:00.000000000 Z
+date: 2019-10-05 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.6.13
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Core for all Tramway Rails Engines