tramway-core 1.12.1 → 1.13.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16172a47127987a0492d51f269ccd76ab319bf8323636ba20f3ac36745fb2007
-  data.tar.gz: ac86409a6b1fbc1462f07a5a5b999ff81755a9af28c8b3e834a786983915f006
+  metadata.gz: 98fc3b4eb72607b71692a66f9984842cc63cd135f7c498090b5a89ec22d25648
+  data.tar.gz: 955159d6eb34fc36e753a3aba3167846a788a7ce37e9e5d3d657fb542c0d6312
 SHA512:
-  metadata.gz: 6e45054851f49dbc7c1aff4c267c5eb0a6c95a95569808649313991699160bf90e93f96293c69658ad5b23a60b5b188ab585eb1da8ec05e902a689544e3f82d6
-  data.tar.gz: 58786a322921c254d038f39dfc3d4b8338f78f77bb7a8d6c6826b916c8b6957530a034229ad42dfc93165f0f1ffb5d9e9c779a86a9510b54bdd7bb20ab25ae77
+  metadata.gz: 8901bf8f3c13d43b4bc750dfef901e079bc351eae922674883066ffffaca448c7ba5c3913ef96bf7caed2f52d1872358780295d3dd46c07178f758b6e5ab35b5
+  data.tar.gz: ceb839ae0aa3d97d75a0e7c98c212bd8502ad21f8f411d20871bce24f608fd7818d67284ed271a0ffa22515d8c47b0403422f9aa0aa559b0b66f9e174c0cf2c5

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/decorators/tramway/core/application_decorator.rb

@@ -111,8 +111,17 @@ class Tramway::Core::ApplicationDecorator
 
   include Tramway::Core::Concerns::AttributesDecoratorHelper
 
+  RESERVED_WORDS = [ 'fields' ]
+
   def attributes
     object.attributes.reduce({}) do |hash, attribute|
+      if attribute[0].in? RESERVED_WORDS
+        error = Tramway::Error.new(
+          plugin: :core,
+          method: :attributes,
+          message: ("Method `#{attribute[0]}` is reserved word. Please, create or delegate method in #{self.class.name} with another name."))
+        raise error.message
+      end
       value = try(attribute[0]) ? send(attribute[0]) : object.send(attribute[0])
       if attribute[0].to_s.in? object.class.state_machines.keys.map(&:to_s)
         hash.merge! attribute[0] => state_machine_view(object, attribute[0])

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/forms/tramway/core/extended_application_form.rb

@@ -3,19 +3,19 @@ class Tramway::Core::ExtendedApplicationForm < Tramway::Core::ApplicationForm
     def properties(*args)
       @@extendable_properties ||= []
       @@extendable_properties += args
-      super *args
+      super(*args)
     end
   end
 
-    def initialize(model)
-      @@extendable_properties.each do |prop|
-        unless model.respond_to? prop
-          model.class.define_method prop do
-          end
-          model.class.define_method "#{prop}=" do |value|
-          end
+  def initialize(model)
+    @@extendable_properties.each do |prop|
+      unless model.respond_to? prop
+        model.class.define_method prop do
+        end
+        model.class.define_method "#{prop}=" do |value|
         end
       end
-      super
     end
+    super
+  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

@@ -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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-core
 version: !ruby/object:Gem::Version
-  version: 1.12.1
+  version: 1.13.1.1
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-07 00:00:00.000000000 Z
+date: 2019-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: reform-rails
@@ -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