tramway-core 1.14.5.1 → 1.14.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88a5b6d1820af54e52195efd56531012f6f54f78b222c5f4d7c9999c2cb04dc0
-  data.tar.gz: cac6232fff7793e057cdb2bc91c119b8eb411fb18907b71bf1f0816ce7e38c65
+  metadata.gz: f46965fe008bd76fc777840560abb3a2a5f079d469ac1ac909657cb8c7e23d1f
+  data.tar.gz: 12a6b2c2716dd7876a98ae216cc25aee95a3916f3b117bbaf5c426e91a2c2992
 SHA512:
-  metadata.gz: e55dcbe7469267535bc321f9c6b819badd81d53af81488dfc71b405a6319ab7e9308668ec005c84597db0bda7af0e1b1cb166729c69923f00b87af2aa0fd8f2e
-  data.tar.gz: 194a6765b153bf8d2f6eb6a7c216986db7af1381e31c091a8968f24e97972f52449a0ebb6b620f8d8764b29f438898385a4d90ce675747bcc96193ffa09e362a
+  metadata.gz: 19f8b496bfc15c82c7df8d9e371abc6a76b06452d1b44802979cd0b2bc36f26f64df58b76476d1fdce233ec26e51debc29c0be482d62685deb0933440ef71b9f
+  data.tar.gz: 7b8fcf18061b22fc989a77bf02c8b595d2b86ef1a2148c987417e161f17555a4263adb1b52be9cd517acf9136cd48bfaa5e92009656e0c75be88a7ecee11e8d0

data/README.md

@@ -27,6 +27,11 @@ Tramway::Core.initialize_application name: "Your application's name"
 Tramway::Core.initialize_application model_class: ::Tramway::Conference::Unity # example was taken from tramway-conference gem
 ```
 
+*config/initializers/assets.rb*
+```ruby
+Rails.application.config.assets.precompile += %w( *.jpg *.png *.js )
+```
+
 # Базовые классы
 
 * ApplicationDecorator - Базовый класс декоратора. В него по умолчанию включены `ActionView::Helpers` и `ActionView::Context` и `FontAwesome5` (версия гема FontAwesome, которая поддерживает 5 версию шрифта). `FontAwesome` считается в `Tramway` основным шрифтом для иконок.

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

@@ -27,4 +27,3 @@ $(document).ready ->
       anchor = $(this).data('anchor')
       unless $(anchor).offset() == undefined
         $(window).scrollTop $(anchor).offset().top
-

data/app/controllers/tramway/core/application_controller.rb

@@ -3,6 +3,11 @@
 module Tramway
   module Core
     class ApplicationController < ActionController::Base
+      before_action :application
+
+      def application
+        @application = ::Tramway::Core.application_object
+      end
     end
   end
 end

data/app/decorators/tramway/core/concerns/attributes_decorator_helper.rb

@@ -14,30 +14,32 @@ module Tramway::Core::Concerns::AttributesDecoratorHelper
   end
 
   def image_view(original, thumb: nil, filename: nil)
-    thumb ||= original.small
-    filename ||= original.path.split('/').last
-    src_thumb = if thumb.is_a?(CarrierWave::Uploader::Base)
-                  thumb.url
-                elsif thumb.match(%r{^(?:[a-zA-Z0-9+/]{4})*(?:|(?:[a-zA-Z0-9+/]{3}=)|(?:[a-zA-Z0-9+/]{2}==)|(?:[a-zA-Z0-9+/]{1}===))$})
-                  "data:image/jpeg;base64,#{thumb}"
-                else
-                  thumb
-                end
-    src_original = if original.is_a?(CarrierWave::Uploader::Base)
-                  original.url
-                elsif original.match(%r{^(?:[a-zA-Z0-9+/]{4})*(?:|(?:[a-zA-Z0-9+/]{3}=)|(?:[a-zA-Z0-9+/]{2}==)|(?:[a-zA-Z0-9+/]{1}===))$})
-                  "data:image/jpeg;base64,#{original}"
-                else
-                  original
-                end
-    content_tag(:div) do
-      begin
-        concat image_tag src_thumb
-      rescue NoMethodError => e
-        error = Tramway::Error.new plugin: :core, method: :image_view, message: "You should mount PhotoUploader to your model. Just add `mount_uploader \#{attribute_name}, PhotoUploader` to your model. #{e.message}"
-        raise error.message
+    if original.present?
+      thumb ||= original.small
+      filename ||= original.path.split('/').last
+      src_thumb = if thumb.is_a?(CarrierWave::Uploader::Base)
+                    thumb.url
+                  elsif thumb.match(%r{^(?:[a-zA-Z0-9+/]{4})*(?:|(?:[a-zA-Z0-9+/]{3}=)|(?:[a-zA-Z0-9+/]{2}==)|(?:[a-zA-Z0-9+/]{1}===))$})
+                    "data:image/jpeg;base64,#{thumb}"
+                  else
+                    thumb
+                  end
+      src_original = if original.is_a?(CarrierWave::Uploader::Base)
+                       original.url
+                     elsif original.match(%r{^(?:[a-zA-Z0-9+/]{4})*(?:|(?:[a-zA-Z0-9+/]{3}=)|(?:[a-zA-Z0-9+/]{2}==)|(?:[a-zA-Z0-9+/]{1}===))$})
+                       "data:image/jpeg;base64,#{original}"
+                     else
+                       original
+                     end
+      content_tag(:div) do
+        begin
+          concat image_tag src_thumb
+        rescue NoMethodError => e
+          error = Tramway::Error.new plugin: :core, method: :image_view, message: "You should mount PhotoUploader to your model. Just add `mount_uploader \#{attribute_name}, PhotoUploader` to your model. #{e.message}"
+          raise error.message
+        end
+        concat link_to(fa_icon(:download), src_original, class: 'btn btn-success', download: filename)
       end
-      concat link_to(fa_icon(:download), src_original, class: 'btn btn-success', download: filename)
     end
   end
 

data/lib/tramway/collections/helper.rb

@@ -4,9 +4,13 @@ module Tramway
   module Collections
     module Helper
       def collection_list_by(name:)
-        require name # needed to load class name with collection
+        begin 
+          require name # needed to load class name with collection
+        rescue LoadError
+          raise "No such file #{name}. You should create file in the `lib/#{name}.rb` or elsewhere you want"
+        end
         unless ::Tramway::Collection.descendants.map(&:to_s).include?(name.camelize)
-          raise "There no such collection named #{name.camelize}. Please create class with self method `list` and extended of `Tramway::Collection`"
+          raise "There no such collection named #{name.camelize}. Please create class with self method `list` and extended of `Tramway::Collection`. You should reload your server after creating this collection."
         end
 
         name.camelize.constantize.list

data/lib/tramway/core.rb

@@ -20,7 +20,7 @@ module Tramway
       end
 
       def application_object
-        @application.model_class.present? ? @application.model_class.first : @application 
+        @application&.model_class.present? ? @application.model_class.first : @application 
       end
 
       attr_reader :application

data/lib/tramway/core/application.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Tramway::Core::Application
-  attr_accessor :name, :url, :model_class, :title, :tagline, :found_date
+  attr_accessor :name, :url, :model_class, :title, :tagline, :found_date, :phone, :email
 
   def public_name
     name.to_s.gsub('_', ' ').camelize

data/lib/tramway/core/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Core
-    VERSION = '1.14.5.1'
+    VERSION = '1.14.7'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-core
 version: !ruby/object:Gem::Version
-  version: 1.14.5.1
+  version: 1.14.7
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-09 00:00:00.000000000 Z
+date: 2020-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: audited
@@ -124,22 +124,16 @@ dependencies:
   name: loofah
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 2.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 2.3.1
 - !ruby/object:Gem::Dependency
   name: mini_magick
   requirement: !ruby/object:Gem::Requirement