tramway 0.2.1.1 → 0.2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f21d3c15fcbad670039714c4661be3546849982618662fec4de88d5fa7f46ce3
-  data.tar.gz: ed77adc5f2247c5db97e23b0c6706219689afcbbedd02db3597d2e31f1adde23
+  metadata.gz: c2ed52c776d761d5afe99a7d31c99084191c032af8f35c13a49f1d3f6155d01f
+  data.tar.gz: e6cee0a18222ae4d3a99f63a8b8959bfaec6dab11107006040451254c14aa4b4
 SHA512:
-  metadata.gz: 58c2ce7f3f93ae17fd399d1fff01e0abce89f0a687aba960d5431be777f2ec2ae0078d68d9f9bdffadedce5b67004a4a487a30ad29e09e7927fb1b808a83843c
-  data.tar.gz: 2b1ff7fa17dfb4e8eed897bdaab83b32a58f0230a12a24d2bf37f9334779d7abf180949d50444b0e75623efd9db10a9b116d231a923b16efbb6af507d218a17b
+  metadata.gz: 676f475214beb3bab65636d145bf797d48efadf0519294c2551b26caf58c47270238fce3f2a3bb72953a9a8d55708aa88fc4cda61deed86d60cd82f8cbc47bf8
+  data.tar.gz: 3f5847c31384d66b892ab8eddec5a730579cd0fcebbf85302316b8f98c00677b7ff3b2c778cdb22e39427c7a3f10baa73c74599c7237c06c9b6a2c24c68fec60

data/lib/tramway/base_decorator.rb

@@ -1,34 +1,30 @@
 # frozen_string_literal: true
 
 require 'tramway/decorators/collection_decorator'
+require 'tramway/utils/decorators/render'
 
 module Tramway
   # Provides decorate function for Tramway projects
   #
   class BaseDecorator
     include Tramway::Decorators::CollectionDecorators
+    include Tramway::Utils::Decorators::Render
 
-    attr_reader :object, :context
+    attr_reader :object
 
-    def initialize(object, context)
+    def initialize(object)
       @object = object
-      @context = context
-    end
-
-    def render(*args)
-      context.render(*args, layout: false)
     end
 
     class << self
-      def decorate(object_or_array, context)
+      def decorate(object_or_array)
         if Tramway::Decorators::CollectionDecorators.collection?(object_or_array)
           Tramway::Decorators::CollectionDecorators.decorate_collection(
             collection: object_or_array,
-            context:,
             decorator: self
           )
         else
-          new(object_or_array, context)
+          new(object_or_array)
         end
       end
 

data/lib/tramway/decorators/collection_decorator.rb

@@ -7,9 +7,9 @@ module Tramway
     module CollectionDecorators
       module_function
 
-      def decorate_collection(collection:, context:, decorator:)
+      def decorate_collection(collection:, decorator:)
         collection.map do |item|
-          decorator.decorate item, context
+          decorator.decorate item
         end
       end
 

data/lib/tramway/helpers/decorate_helper.rb

@@ -8,7 +8,9 @@ module Tramway
     #
     module DecorateHelper
       def tramway_decorate(object_or_array, decorator: nil)
-        Tramway::Decorators::ClassHelper.decorator_class(object_or_array, decorator).decorate object_or_array, self
+        return [] if Tramway::Decorators::CollectionDecorators.collection?(object_or_array) && object_or_array.empty?
+
+        Tramway::Decorators::ClassHelper.decorator_class(object_or_array, decorator).decorate object_or_array
       end
     end
   end

data/lib/tramway/utils/decorators/render.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Tramway
+  module Utils
+    module Decorators
+      # Provides helper method render that depends on ActionController::Base.render method
+      #
+      module Render
+        def render(*args)
+          ActionController::Base.render(*args, layout: false)
+        end
+      end
+    end
+  end
+end

data/lib/tramway/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Tramway
-  VERSION = '0.2.1.1'
+  VERSION = '0.2.1.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tramway
 version: !ruby/object:Gem::Version
-  version: 0.2.1.1
+  version: 0.2.1.3
 platform: ruby
 authors:
 - kalashnikovisme
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-01 00:00:00.000000000 Z
+date: 2023-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml-rails
@@ -94,6 +94,7 @@ files:
 - lib/tramway/helpers/decorate_helper.rb
 - lib/tramway/helpers/navbar_helper.rb
 - lib/tramway/navbar.rb
+- lib/tramway/utils/decorators/render.rb
 - lib/tramway/version.rb
 homepage: https://github.com/purple-magic/tramway
 licenses: