tramway-core 1.16.1.9 → 1.17.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9d93697abadf805c03a8f59ca2b668cab12552545b6af27a4b1a571c9535cf9
-  data.tar.gz: 4aee49c180d9a59e3e07d581c61dec839ced793cb94c2d72ea0e41a15e2d4463
+  metadata.gz: 4be07671b875ed3901b13904f9d54f3915ab5c4c42d637609a25bebee8b233a0
+  data.tar.gz: 77d1050db409315611f0fda8586c20cd15aa9b85e49d23f86ebc995556e420da
 SHA512:
-  metadata.gz: b1ca0e35871ed2e6af56f3ed56df47fca14d350f712c17d089d17cb7e8066f535a4020e0af3a5e47feaa26ce14d0d187c6247aab5abaa1f04686016e4211390e
-  data.tar.gz: d96dbf15bc8209aa512d44e9789e108f2a89b21e86918ae8fd9b6d733f2d4658b61e05c7833fb08d80760c30c4b3617dc25c1001e8147c75987e3251605a3bd9
+  metadata.gz: 875d00ccf2b6cdfa9bdb7fb64ab77b60b517be9f4ae24f856b5e79e2e90c068d97f074ea4df90b70f70457dbbbd955525d850f3f6a5939ba404eec020d144fc6
+  data.tar.gz: 3c0ffdef1b9dba8d41353908a82d2841879b9490d191e10ca017ed16d6b14bbabceeb5da27318dbf1939203820eed1d3227980e59f0410864e74785e48d85f68

data/README.md

@@ -106,6 +106,39 @@ Something like this:
 copy_to_clipboard "some_id" # some_id is HTML id of element. Content of this element will be copied to the clipboard after pressing the button
 ```
 
+## How to create model that will be an Application Model for the Tramway
+
+#### 1. Generate model that you to use. We create Organization, for example
+
+```shell
+rails g model organization name:text public_name:text tagline:text address:text phone:text coordinates:point, state: text # remember! State field is required, if you use tramway-admin
+rails db:migrate
+```
+
+#### 2. Add model_class to Initializer
+
+```ruby
+Tramway::Core.initialize_application model_class: Organization
+```
+
+#### 3. Create 1 instance of Organization model
+
+```ruby
+rails c
+Organization.create! public_name: 'Tramway', name: :organization, tagline: 'Tramway is not buggy, LOL!'
+```
+
+#### 4. Add model to singleton to the `tramway-admin` admin panel to be able to change its data
+
+```ruby
+Tramway::Admin.set_singleton_models Organization, project: :organization # now you should use organization.name here
+```
+
+#### 5. Then continue configuration of your model in admin panel with tramway-admin gem [instruction, starting from point 8](https://github.com/ulmic/tramway-dev/tree/develop/tramway-admin#8-configurate-navbar)
+
+#### 6. Now you are able to change your application main info in admin panel
+
+## In Russian
 
 # Базовые классы
 

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

@@ -0,0 +1,51 @@
+//= require jquery
+//= require jquery_ujs
+//= require jquery3
+//= require popper
+//= require bootstrap
+//= require bootstrap-datepicker-1.8.0
+//= require bootstrap-datepicker-1.8.0.ru.min
+//= require font_awesome5
+//= require clipboard
+//= require_tree .
+
+window.i18n_locale = function(locale) {
+  switch (locale) {
+    case 'en':
+      return({ date_format: 'yyyy-mm-dd', locale: locale });
+      break;
+    case 'ru':
+      return({ date_format: 'dd.mm.yyyy', locale: locale });
+      break;
+    default:
+      return({ date_format: 'yyyy-mm-dd', locale: locale });
+      break;
+  }
+}
+
+$(document).ready(function() {
+  if (!(window.current_locale)) {
+    console.log('You should set `window.current_locale` before all Javascript code');
+  }
+
+  if ($('.date_picker').length != 0) {
+    $('.date_picker').datepicker({
+      format: window.current_locale.date_format,
+      language: window.current_locale.locale
+    });
+  }
+
+  $('.link').click(function() {
+    const href = $(this).data('href');
+    if (href) {
+      location.href = href;
+    } else {
+      const anchor = $(this).data('anchor');
+      if (!$(anchor).offset() == undefined) {
+        $(window).scrollTop($(anchor).offset().top);
+      }
+    };
+  });
+
+  let clipboard = new Clipboard('.clipboard-btn');
+});

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

@@ -7,6 +7,7 @@ class Tramway::Core::ApplicationDecorator
   include ActionView::Context
   include ::FontAwesome5::Rails::IconHelper
   include ::Tramway::Core::CopyToClipboardHelper
+  include ::Tramway::Core::Associations::ObjectHelper
 
   def initialize(object)
     @object = object
@@ -22,6 +23,8 @@ class Tramway::Core::ApplicationDecorator
   end
 
   class << self
+    include ::Tramway::Core::Associations::ClassHelper
+
     def collections
       [:all]
     end
@@ -49,45 +52,6 @@ class Tramway::Core::ApplicationDecorator
       end
     end
 
-    def decorate_association(association_name, decorator: nil, as: nil, state_machines: [])
-      @@decorated_associations ||= []
-      @@decorated_associations << association_name
-
-      define_method association_name do
-        association = object.class.reflect_on_association(association_name)
-        if association.nil?
-          error = Tramway::Error.new(plugin: :core, method: :decorate_association, message: "Model #{object.class} does not have association named `#{association_name}`")
-          raise error.message
-        end
-        class_name = if association.polymorphic?
-                       object.send(association_name).class
-                     else
-                       unless association.options[:class_name]
-                         error = Tramway::Error.new(plugin: :core, method: :decorate_association, message: "Please, specify `#{association_name}` association class_name in #{object.class} model. For example: `has_many :#{association_name}, class_name: '#{association_name.to_s.singularize.camelize}'`")
-                         raise error.message
-                       end
-                       association.options[:class_name]
-                     end
-        decorator_class_name = decorator || "#{class_name.to_s.singularize}Decorator".constantize
-        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.class == ActiveRecord::Reflection::BelongsToReflection
-          return decorator_class_name.decorate object.send association_name
-        end
-      end
-
-      define_method "#{association_name}_as" do
-        as
-      end
-
-      define_method "#{association_name}_state_machines" do
-        state_machines
-      end
-    end
-
     def model_class
       to_s.sub(/Decorator$/, '').constantize
     end

data/app/decorators/tramway/core/associations/class_helper.rb

@@ -0,0 +1,40 @@
+module Tramway::Core::Associations::ClassHelper
+  def decorate_association(association_name, decorator: nil, as: nil, state_machines: [])
+    @@decorated_associations ||= []
+    @@decorated_associations << association_name
+
+    define_main_association_method association_name, decorator
+
+    define_method "#{association_name}_as" do
+      as
+    end
+
+    define_method "#{association_name}_state_machines" do
+      state_machines
+    end
+
+    define_method "add_#{association_name}_form" do
+      "Admin::#{object.class.to_s.pluralize}::Add#{association_name.to_s.camelize.singularize}Form".constantize.new object
+    end
+  end
+
+
+  def define_main_association_method(association_name, decorator)
+    define_method association_name do
+      association = object.class.reflect_on_association(association_name)
+      if association.nil?
+        error = Tramway::Error.new(plugin: :core, method: :decorate_association, message: "Model #{object.class} does not have association named `#{association_name}`")
+        raise error.message
+      end
+      decorator_class_name = decorator || "#{class_name(association).to_s.singularize}Decorator".constantize
+      if association.class.in? [ ActiveRecord::Reflection::HasManyReflection, ActiveRecord::Reflection::HasAndBelongsToManyReflection ]
+        return object.send(association_name).active.map do |association_object|
+          decorator_class_name.decorate association_object
+        end
+      end
+      if association.class == ActiveRecord::Reflection::BelongsToReflection
+        return decorator_class_name.decorate object.send association_name
+      end
+    end
+  end
+end

data/app/decorators/tramway/core/associations/object_helper.rb

@@ -0,0 +1,13 @@
+module Tramway::Core::Associations::ObjectHelper
+  def class_name(association)
+    if association.polymorphic?
+      object.send(association_name).class
+    else
+      unless association.options[:class_name]
+        error = Tramway::Error.new(plugin: :core, method: :decorate_association, message: "Please, specify `#{association_name}` association class_name in #{object.class} model. For example: `has_many :#{association_name}, class_name: '#{association_name.to_s.singularize.camelize}'`")
+        raise error.message
+      end
+      association.options[:class_name]
+    end
+  end
+end

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

@@ -65,6 +65,10 @@ module Tramway::Core
       @@model_class.model_name
     end
 
+    def associations
+      @@associations
+    end
+
     def form_properties(**args)
       @form_properties = args
     end
@@ -99,7 +103,7 @@ module Tramway::Core
 
     def attributes
       properties.reduce({}) do |hash, property|
-        hash.merge! property => send(property.first)
+        hash.merge! property.first => model.values[property.first.to_s]
       end
     end
 

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

@@ -51,10 +51,19 @@ class Tramway::Core::ExtendableForm
 
               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.default.#{pair[0]}", value: value)
+                  case pair[0].to_s
+                  when 'presence'
+                    validator_object = "#{pair[0].to_s.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.default.#{pair[0]}", value: value)
+                    end
+                  when 'inclusion'
+                    in_array = pair[1][:in]
+                    unless value.in? in_array
+                      model.errors.add property[0],
+                        I18n.t("activerecord.errors.models.#{model.class.name.underscore}.attributes.default.#{pair[0]}", value: value)
+                    end
                   end
                 end
               end

data/app/helpers/tramway/core/copy_to_clipboard_helper.rb

@@ -1,12 +1,14 @@
+# frozen_string_literal: true
+
 module Tramway
   module Core
     module CopyToClipboardHelper
       def copy_to_clipboard(id)
         button_tag class: 'btn btn-info clipboard-btn',
-          data: { clipboard_action: 'copy', clipboard_target: "##{id}" },
-          style: 'margin-left: 15px' do
-            fa_icon 'copy'
-          end
+                   data: { clipboard_action: 'copy', clipboard_target: "##{id}" },
+                   style: 'margin-left: 15px' do
+          fa_icon 'copy'
+        end
       end
     end
   end

data/app/uploaders/photo_uploader.rb

@@ -12,7 +12,7 @@ class PhotoUploader < ApplicationUploader
       file.file.match(%r{/system/uploads/.*}).to_s
     else
       default_url = '/assets/tramway/core/mona_lisa_from_prado_square.jpg'
-      File.exists?(default_url) ? default_url : ''
+      File.exist?(default_url) ? default_url : ''
     end
   end
 

data/app/views/tramway/core/shared/input_extended_types/_checkbox.html.haml

@@ -1 +1 @@
-= f.input field.title.to_sym, as: :boolean, input_html: { class: class_name, id: "#{class_name}_#{field.title.to_sym}", name: "#{class_name}[#{field.title}]" }, checked_value: value == field.title.to_sym, required: field.required
+= f.input field.title.to_sym, as: :boolean, input_html: { class: class_name, id: "#{class_name}_#{field.title.to_sym}", name: "#{class_name}[#{field.title}]" }, checked_value: :true, unchecked_value: :false, required: field.required

data/config/locales/en/helpers.yml

@@ -13,6 +13,7 @@ en:
       search: Search
       reset: Reset
       download: Download
+      add: Add
     scope:
       found: Found
     "yes": yes

data/lib/tramway/core/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Core
-    VERSION = '1.16.1.9'
+    VERSION = '1.17.1.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-core
 version: !ruby/object:Gem::Version
-  version: 1.16.1.9
+  version: 1.17.1.1
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-01 00:00:00.000000000 Z
+date: 2020-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: audited
@@ -118,22 +118,22 @@ dependencies:
   name: haml-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -166,22 +166,22 @@ dependencies:
   name: mini_magick
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.8.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.8.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.8.0
 - !ruby/object:Gem::Dependency
   name: pg_search
   requirement: !ruby/object:Gem::Requirement
@@ -228,22 +228,22 @@ dependencies:
   name: rmagick
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.16.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.16'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.16.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.16'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.16.0
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
@@ -349,12 +349,14 @@ files:
 - app/assets/images/tramway/core/mona_lisa_from_prado_square.jpg
 - app/assets/javascripts/bootstrap-datepicker-1.8.0.js
 - app/assets/javascripts/bootstrap-datepicker-1.8.0.ru.min.js
-- app/assets/javascripts/tramway/core/application.js.coffee
+- app/assets/javascripts/tramway/core/application.js
 - app/assets/stylesheets/bootstrap-datepicker-1.8.0.css
 - app/assets/stylesheets/tramway/core/application.sass
 - app/controllers/tramway/core/application_controller.rb
 - app/decorators/tramway/core/application_decorated_collection.rb
 - app/decorators/tramway/core/application_decorator.rb
+- app/decorators/tramway/core/associations/class_helper.rb
+- app/decorators/tramway/core/associations/object_helper.rb
 - app/decorators/tramway/core/concerns/attributes_decorator_helper.rb
 - app/forms/tramway/core/application_form.rb
 - app/forms/tramway/core/extendable_form.rb
@@ -424,7 +426,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Core for all Tramway Rails Engines

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

@@ -1,35 +0,0 @@
-#= require jquery
-#= require jquery_ujs
-#= require jquery3
-#= require popper
-#= require bootstrap
-#= require bootstrap-datepicker-1.8.0
-#= require bootstrap-datepicker-1.8.0.ru.min
-#= require font_awesome5
-#= require clipboard
-#= 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 window.current_locale
-    console.log 'You should set `window.current_locale` before all Javascript code'
-  unless $('.date_picker').length == 0
-    $('.date_picker').datepicker({
-      format: window.current_locale.date_format,
-      language: window.current_locale.locale
-    })
-
-  $('.link').click ->
-    href = $(this).data('href')
-    if href
-      location.href = href
-    else
-      anchor = $(this).data('anchor')
-      unless $(anchor).offset() == undefined
-        $(window).scrollTop $(anchor).offset().top
-
-  clipboard = new Clipboard '.clipboard-btn'