tramway-core 1.15.1 → 1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ff76332aa909eb5a15e3e5bec7ac91800b7d8b3f739a9408e39ed1a03727486
-  data.tar.gz: b95e3167b3a5686559707b88d0959abc09d7165e6ef0d41987bbc8d1f1cee1b4
+  metadata.gz: b65406e59a86c298559e164d9e16a55b62f83b20ecba159b86b682aa9af037bc
+  data.tar.gz: 7a4177835f457e7b5c48f59c0980965c3c05052d75d3f52b2c1f7a9a4f270ca9
 SHA512:
-  metadata.gz: 32ff27f78222c1373369fd055aa40334e881caab6da886d763dfaaab90d0b841d9fd24eb4360203e6e28fb368bbb8bd29f0de0f8978add292487447656fd680a
-  data.tar.gz: a79db87f481d08debcd1ac67aaa2f0b3b044d74acac333836e313dfe76ae48990d638d508ee80bdfb2772bfcecd7ed346916863ca61e5b7a151583c3d27c9f10
+  metadata.gz: 480f307ce1de6c9202e5a9d42539df4f34b8374037c5d643ab61592374f592fddeb63890eb094e61ee6c667660088121feb0158bf7b374c605d3a3236ac4bf77
+  data.tar.gz: 5e96737dabbb4aace66cc0123ea1d59c0b7cd11aad65ce544153213394c359accd6544d6f3515dbbd4a98b5ec7d5639e4a2c208b79d3f452639630b5591ac919

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

@@ -48,7 +48,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 +77,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/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/core/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Core
-    VERSION = '1.15.1'
+    VERSION = '1.16'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-core
 version: !ruby/object:Gem::Version
-  version: 1.15.1
+  version: '1.16'
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-20 00:00:00.000000000 Z
+date: 2020-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: audited
@@ -353,6 +353,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