tramway-core 1.17.1.1 → 1.17.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4be07671b875ed3901b13904f9d54f3915ab5c4c42d637609a25bebee8b233a0
-  data.tar.gz: 77d1050db409315611f0fda8586c20cd15aa9b85e49d23f86ebc995556e420da
+  metadata.gz: 0c40b8698ddbb5a6d4a3bcd28c91178aea7c2b69ecbd91a3aa0c1c52935acff9
+  data.tar.gz: fa1d9920ee66893ad98b227d48806ba71e932216f927e33124ebd0c98be4d4b3
 SHA512:
-  metadata.gz: 875d00ccf2b6cdfa9bdb7fb64ab77b60b517be9f4ae24f856b5e79e2e90c068d97f074ea4df90b70f70457dbbbd955525d850f3f6a5939ba404eec020d144fc6
-  data.tar.gz: 3c0ffdef1b9dba8d41353908a82d2841879b9490d191e10ca017ed16d6b14bbabceeb5da27318dbf1939203820eed1d3227980e59f0410864e74785e48d85f68
+  metadata.gz: 289701396c7578d7202d1bbf7bcfd794e360ef258c0396b82b98eacc76049a974a75e122a63e48893bb1cc8fd966e921c0fcc8a642c7dcfde2e45c8bb39b1eb7
+  data.tar.gz: f69609928571b316461d3ddf7d25fc59b5abadb0d0d788c53572d146be06f585400a8736f44d64adab5b7935eca4c3e6387086890f3e3ee2a47bb3f80c1896e6

data/README.md

@@ -33,7 +33,53 @@ Tramway::Core.initialize_application model_class: ::Tramway::Conference::Unity #
 Rails.application.config.assets.precompile += %w( *.jpg *.png *.js )
 ```
 # Usage
+
 ## Decorators
+### Associations
+
+Your can decorate association models. Supporting all types of association
+
+*app/decorators/your_model_decorator.rb*
+```ruby
+class YourModelDecorator < Tramway::Core::ApplicationDecorator
+  decorate_association :some_model
+  decorate_association :another_model, decorator: SpecificDecoratorForThisCase
+  decorate_association :another_one_model, as: :repeat_here_as_parameter_from_model
+  decorate_association :something_else_model, state_machines: [ :here_array_of_state_machines_you_want_to_see_in_YourModel_show_page ] # support from tramway-admin gem
+end
+```
+
+You can decorate a lot of models in one line
+
+*app/decorators/your_model_decorator.rb*
+```ruby
+class YourModelDecorator < Tramway::Core::ApplicationDecorator
+  decorate_associations :some_model, :another_model, :another_one_model, :something_else_model
+end
+```
+
+Also, you can configurate what associations you want to see in YourModel page in admin panel *support only for [tramway-admin](https://rubygems.org/gems/tramway-admin) gem*
+
+*app/decorators/your_model_decorator.rb*
+```ruby
+class YourModelDecorator < Tramway::Core::ApplicationDecorator
+  class << self
+    def show_associations
+      [ :some_model, :another_model, :another_one_model ]
+    end
+  end
+end
+```
+
+### Delegating attributes
+
+*app/decorators/your_model_decorator.rb*
+```ruby
+class YourModelDecorator < Tramway::Core::ApplicationDecorator
+  delegate_attributes :title, :something_else, :another_atttribute
+end
+```
+
 ### Helper methods
 
 #### date_view

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

@@ -22,8 +22,12 @@ class Tramway::Core::ApplicationDecorator
     raise error.message
   end
 
+  delegate :id, to: :object
+  delegate :human_state_name, to: :object
+
   class << self
     include ::Tramway::Core::Associations::ClassHelper
+    include ::Tramway::Core::Delegating::ClassHelper
 
     def collections
       [:all]
@@ -61,8 +65,6 @@ class Tramway::Core::ApplicationDecorator
     end
   end
 
-  delegate :id, to: :object
-  delegate :human_state_name, to: :object
 
   def link
     if object.try :file

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

@@ -18,6 +18,12 @@ module Tramway::Core::Associations::ClassHelper
     end
   end
 
+  def decorate_associations(*association_names)
+    association_names.each do |association_name|
+      decorate_association association_name
+    end
+  end
+
 
   def define_main_association_method(association_name, decorator)
     define_method association_name do

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

@@ -0,0 +1,7 @@
+module Tramway::Core::Delegating::ClassHelper
+  def delegate_attributes(*attributes)
+    attributes.each do |attr|
+      delegate attr, to: :object
+    end
+  end
+end

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

@@ -12,11 +12,13 @@ module Tramway::Core
         self.class.full_class_name_associations.each do |association, class_name|
           if class_name.is_a? Array
             self.class.send(:define_method, "#{association}=") do |value|
-              association_class = send("#{association}_type")
+              association_class = value.split('_')[0..-2].join('_').camelize
+              association_class = association_class.constantize if association_class.is_a? String
               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
+                super association_class.find value.split('_')[-1]
+                send "#{association}_type=", association_class.to_s
               end
             end
           else
@@ -34,28 +36,19 @@ module Tramway::Core
       if params
         if validate params
           begin
-            save.tap do
-              # self.class.remove_validations_from_model!
-            end
+            save
           rescue StandardError => e
-            # 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
         else
-          association_error = false
           @@associations.each do |association|
             if errors.details[association] == [{ error: :blank }]
               model.send("#{association}=", send(association))
-              association_error = true
             end
           end
-          (association_error && save).tap do
-            # self.class.remove_validations_from_model!
-          end
         end
       else
-        # 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
@@ -180,25 +173,7 @@ module Tramway::Core
           raise error.message
         end
         @@model_class.validates 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!
-      #  return unless defined? @@validations
-      #  @@validations&.each do |validation|
-      #    @@model_class.class_eval do
-      #      _validators.except validation[0]
-      #
-      #      binding.pry
-      #      _validate_callbacks.each do |callback|
-      #        callback.raw_filter.attributes.delete validation[0]
-      #      end
-      #    end
-      #  end
-      # end
     end
   end
 end

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

@@ -19,7 +19,7 @@ class Tramway::Core::ExtendableForm
             model.values = extended_params.permit!.to_h.reduce(model.values) do |hash, pair|
               hash.merge! pair[0] => pair[1]
             end
-            super params
+            super(params) && model.errors.empty?
           end
 
           define_method 'properties' do

data/lib/tramway/core/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-core
 version: !ruby/object:Gem::Version
-  version: 1.17.1.1
+  version: 1.17.2
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-12 00:00:00.000000000 Z
+date: 2020-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: audited
@@ -358,6 +358,7 @@ files:
 - 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/decorators/tramway/core/delegating/class_helper.rb
 - app/forms/tramway/core/application_form.rb
 - app/forms/tramway/core/extendable_form.rb
 - app/forms/tramway/core/extended_application_form.rb