tramway-core 1.14.7.1 → 1.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 342f7e0203c9760eb999b73aab0851970249cb4842b372f190e7b64f80072ba1
-  data.tar.gz: 8d65b2c788927529f8c0e7202ada01fd18ffd26e3a8b16a1f0297c6ba04bbc92
+  metadata.gz: 90e0f6addfaa061388a54435ff519ba09544d1948dc8a2130f51457b23bef215
+  data.tar.gz: eb50727af2688a79eaa59b64320b1d127deb02658d2f0fc3587e7c6f43069217
 SHA512:
-  metadata.gz: 3fa66055ce40a7e966fb66196243cb20e21f41be28c59682cce821b0d78473598da6d39e68837478d62ae66f15ed19382ca8b64748db00b67fd11b2701b39936
-  data.tar.gz: db16cc89c4230e09804443baa8024b98ae0c50a827718ad366041821d19d26202cbd144a0ccc64d859258884793b6e58c5fcf59f7cf093e32f388417e28e921d
+  metadata.gz: 7a22b749b982662f6c9aace0e951d5d408107501311143312bd38240d0a8fe33d0f4bfa9c9c58c4766ff4362944b0fc74a402e2bfc228f5729606297ffea7268
+  data.tar.gz: 8cfa52bb4c944ec0fb3f60875eaa7be874905d58be07943ae93775556bf4e651e6207d91f7216df717af657fae1121e7771e611c2e88c65ddd0ba22eccc2fc8c

data/README.md

@@ -31,6 +31,55 @@ Tramway::Core.initialize_application model_class: ::Tramway::Conference::Unity #
 ```ruby
 Rails.application.config.assets.precompile += %w( *.jpg *.png *.js )
 ```
+# Usage
+## Decorators
+### Helper methods
+
+#### date_view
+Returns a date in the format depending on localization
+
+*app/decorators/\*_decorator.rb*
+```ruby
+def created_at
+  date_view object.created_at
+end
+```
+#### datetime_view
+Returns a date and time in the format depending on localization
+
+*app/decorators/*_decorator.rb*
+```ruby
+def created_at
+  datetime_view object.created_at
+end
+```
+#### state_machine_view
+Returns the state of an object according to a state machine
+
+*app/decorators/*_decorator.rb*
+```ruby
+def state
+  state_machine_view object, :state
+end
+```
+#### image_view
+Returns an image in a particular format depending on the parameters of the original image file
+
+*app/decorators/\*_decorator.rb*
+```ruby
+def avatar
+  image_view object.avatar
+end
+```
+#### enumerize_view
+Returns object enumerations as text
+
+*app/decorators/\*_decorator.rb*
+```ruby
+def field_type
+  enumerize_view object.field_type
+end
+```
 
 # Базовые классы
 

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

@@ -1,8 +1,10 @@
 #= require jquery
 #= require jquery_ujs
+#= require popper
 #= 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) ->
@@ -27,3 +29,5 @@ $(document).ready ->
       anchor = $(this).data('anchor')
       unless $(anchor).offset() == undefined
         $(window).scrollTop $(anchor).offset().top
+
+  clipboard = new Clipboard '.clipboard-btn'

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

@@ -4,10 +4,15 @@ module Tramway
   module Core
     class ApplicationController < ActionController::Base
       before_action :application
+      before_action :load_extensions
 
       def application
         @application = ::Tramway::Core.application_object
       end
+
+      def load_extensions
+        ::Tramway::Extensions.load if defined? ::Tramway::Extensions
+      end
     end
   end
 end

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

@@ -6,6 +6,7 @@ class Tramway::Core::ApplicationDecorator
   include ActionView::Helpers
   include ActionView::Context
   include ::FontAwesome5::Rails::IconHelper
+  include ::Tramway::Core::CopyToClipboardHelper
 
   def initialize(object)
     @object = object
@@ -48,7 +49,7 @@ class Tramway::Core::ApplicationDecorator
       end
     end
 
-    def decorate_association(association_name, decorator: nil)
+    def decorate_association(association_name, decorator: nil, as: nil)
       @@decorated_associations ||= []
       @@decorated_associations << association_name
 
@@ -77,6 +78,10 @@ class Tramway::Core::ApplicationDecorator
           return decorator_class_name.decorate object.send association_name
         end
       end
+
+      define_method "#{association_name}_as" do
+        as
+      end
     end
 
     def model_class

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

@@ -35,10 +35,10 @@ module Tramway::Core
         if validate params
           begin
             save.tap do
-              #self.class.remove_validations_from_model!
+              # self.class.remove_validations_from_model!
             end
           rescue StandardError => e
-            #self.class.remove_validations_from_model!
+            # self.class.remove_validations_from_model!
             error = Tramway::Error.new(plugin: :core, method: :submit, message: "Looks like you have method `#{e.name.to_s.gsub('=', '')}` in #{@@model_class}. You should rename it or rename property in #{self.class}")
             raise error.message
           end
@@ -51,11 +51,11 @@ module Tramway::Core
             end
           end
           (association_error && save).tap do
-            #self.class.remove_validations_from_model!
+            # self.class.remove_validations_from_model!
           end
         end
       else
-        #self.class.remove_validations_from_model!
+        # self.class.remove_validations_from_model!
         error = Tramway::Error.new(plugin: :core, method: :submit, message: 'ApplicationForm::Params should not be nil')
         raise error.message
       end
@@ -75,6 +75,7 @@ module Tramway::Core
 
     def properties
       return @form_properties if @form_properties
+
       yaml_config_file_path = Rails.root.join('app', 'forms', "#{self.class.name.underscore}.yml")
       if File.exist? yaml_config_file_path
         @form_properties = YAML.load_file(yaml_config_file_path).deep_symbolize_keys
@@ -165,17 +166,17 @@ module Tramway::Core
 
       def validates(attribute, **options)
         if !defined?(@@model_class) || @@model_class.nil?
-          error = Tramway::Error.new(plugin: :core, method: :validates, message: "You need to set `model_class` name while using validations. Just write `self.model_class = YOUR_MODEL_NAME` in the class area.")
+          error = Tramway::Error.new(plugin: :core, method: :validates, message: 'You need to set `model_class` name while using validations. Just write `self.model_class = YOUR_MODEL_NAME` in the class area.')
           raise error.message
         end
         @@model_class.validates attribute, **options
-      #  @@validations ||= {}
-      #  @@validations.deep_merge! attribute => options
+        #  @@validations ||= {}
+        #  @@validations.deep_merge! attribute => options
       end
-      
+
       # FIXME: Removes all validations in a field. We must implement own validations
-      
-      #def remove_validations_from_model!
+
+      # def remove_validations_from_model!
       #  return unless defined? @@validations
       #  @@validations&.each do |validation|
       #    @@model_class.class_eval do
@@ -187,7 +188,7 @@ module Tramway::Core
       #      end
       #    end
       #  end
-      #end
+      # end
     end
   end
 end

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

@@ -40,7 +40,7 @@ class Tramway::Core::ExtendableForm
 
             case property[1][:object].field_type
             when 'file'
-              field = property[1][:object] 
+              field = property[1][:object]
               define_method "#{property[0]}=" do |value|
                 file_instance = property[1][:association_model].find_or_create_by "#{model.class.name.underscore}_id" => model.id, "#{field.class.name.underscore}_id" => field.id
                 file_instance.file = value
@@ -63,9 +63,7 @@ class Tramway::Core::ExtendableForm
 
           define_method :jsonb_ignored_properties do |properties|
             properties.map do |property|
-              if property[1][:object].field_type == 'file'
-                property[0].to_s
-              end
+              property[0].to_s if property[1][:object].field_type == 'file'
             end.compact
           end
         end)

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

@@ -0,0 +1,13 @@
+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
+      end
+    end
+  end
+end

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

@@ -8,7 +8,7 @@ module Tramway
           title_text = "#{page_title} | #{@application.try(:title) || @application.public_name}"
           content_for(:title) { title_text }
         else
-          error = Tramway::Error.new(plugin: :core, method: :title, message: 'You should set Tramway::Core::Application class using `::Tramway::Core.initialize_application model_class: #{model_class_name}` in config/initializers/tramway.rb OR may be you don\'t have any records of application model')
+          error = Tramway::Error.new(plugin: :core, method: :title, message: 'You should set Tramway::Core::Application class using `::Tramway::Core.initialize_application model_class: #{model_class_name}` in config/initializers/tramway.rb OR maybe you don\'t have any records of application model')
           raise error.message
         end
       end

data/app/models/tramway/core/application_record.rb

@@ -19,6 +19,8 @@ module Tramway
       end
 
       scope :active, -> { where state: :active }
+      scope :created_by_user, ->(user_id) { joins(:audits).where('audits.action = \'create\' AND audits.user_id = ?', user_id) }
+      scope :admin_scope, ->(_arg) { all }
 
       include ::PgSearch::Model
 

data/app/views/tramway/core/404.haml

@@ -0,0 +1 @@
+!= @message

data/config/locales/ru/helpers.yml

@@ -13,6 +13,7 @@ ru:
       search: Искать
       reset: Сбросить
       download: Скачать
+      add: Добавить
     scope:
       found: Найденные
     "yes": Да

data/lib/tramway/collections/helper.rb

@@ -4,7 +4,7 @@ module Tramway
   module Collections
     module Helper
       def collection_list_by(name:)
-        begin 
+        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"

data/lib/tramway/core.rb

@@ -23,11 +23,11 @@ module Tramway
         if @application&.model_class.present?
           begin
             @application.model_class.first
-          rescue
+          rescue StandardError
             nil
           end
         else
-          @application 
+          @application
         end
       end
 

data/lib/tramway/core/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Core
-    VERSION = '1.14.7.1'
+    VERSION = '1.16.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-core
 version: !ruby/object:Gem::Version
-  version: 1.14.7.1
+  version: 1.16.1
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-13 00:00:00.000000000 Z
+date: 2020-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: audited
@@ -52,6 +52,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ckeditor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 4.2.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 4.2.4
+- !ruby/object:Gem::Dependency
+  name: clipboard-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: enumerize
   requirement: !ruby/object:Gem::Requirement
@@ -332,6 +360,7 @@ files:
 - app/forms/tramway/core/extendable_form.rb
 - app/forms/tramway/core/extended_application_form.rb
 - app/forms/tramway/core/form_creator.rb
+- app/helpers/tramway/core/copy_to_clipboard_helper.rb
 - app/helpers/tramway/core/title_helper.rb
 - app/inputs/date_picker_input.rb
 - app/models/tramway/core/application_record.rb
@@ -339,6 +368,7 @@ files:
 - app/uploaders/file_uploader.rb
 - app/uploaders/image_defaults.rb
 - app/uploaders/photo_uploader.rb
+- app/views/tramway/core/404.haml
 - app/views/tramway/core/shared/_input_extended.html.haml
 - app/views/tramway/core/shared/_messages.html.haml
 - app/views/tramway/core/shared/input_extended_types/_checkbox.html.haml