comfortable_mexican_sofa 1.0.38 → 1.0.39

data/VERSION

@@ -1 +1 @@
-1.0.38
+1.0.39

data/comfortable_mexican_sofa.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{comfortable_mexican_sofa}
-  s.version = "1.0.38"
+  s.version = "1.0.39"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Oleg Khabarov", "The Working Group Inc"]
@@ -192,6 +192,7 @@ Gem::Specification.new do |s|
     "test/fixtures/files/invalid_file.gif",
     "test/fixtures/files/valid_image.jpg",
     "test/fixtures/views/_nav_hook.html.erb",
+    "test/fixtures/views/_nav_hook_2.html.erb",
     "test/functional/cms_admin/layouts_controller_test.rb",
     "test/functional/cms_admin/pages_controller_test.rb",
     "test/functional/cms_admin/sites_controller_test.rb",

data/lib/comfortable_mexican_sofa/view_hooks.rb

@@ -7,16 +7,19 @@ module ComfortableMexicanSofa::ViewHooks
   
   # Renders hook content
   def self.render(name, template, options = {})
-    if self.hooks[name.to_sym]
-      template.render({:partial => self.hooks[name.to_sym]}.merge(options))
+    out = ''
+    (self.hooks[name.to_sym] || []).each do |path|
+      out += template.render({:partial => path}.merge(options))
     end
+    return out
   end
   
   # Will declare a partial that will be rendered for this hook
   # Example:
   # ComfortableMexicanSofa::ViewHooks.add(:navigation, 'shared/navigation')
   def self.add(name, partial_path)
-    self.hooks[name.to_sym] = partial_path
+    self.hooks[name.to_sym] ||= []
+    self.hooks[name.to_sym] << partial_path
   end
   
   # Removing previously declared hook

data/test/fixtures/views/_nav_hook_2.html.erb

@@ -0,0 +1 @@
+hook_content_2

data/test/integration/view_hooks_test.rb

@@ -11,6 +11,17 @@ class ViewHooksTest < ActionDispatch::IntegrationTest
     assert_match /hook_content/, response.body
   end
   
+  def test_hooks_rendering_with_multiples
+    CmsAdmin::SitesController.append_view_path(File.expand_path('../fixtures/views', File.dirname(__FILE__)))
+    ComfortableMexicanSofa::ViewHooks.add(:navigation, '/nav_hook')
+    ComfortableMexicanSofa::ViewHooks.add(:navigation, '/nav_hook_2')
+    
+    http_auth :get, cms_admin_sites_path
+    assert_response :success
+    assert_match /hook_content/, response.body
+    assert_match /hook_content_2/, response.body
+  end
+  
   def test_hooks_rendering_with_no_hook
     ComfortableMexicanSofa::ViewHooks.remove(:navigation)
     

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 38
-  version: 1.0.38
+  - 39
+  version: 1.0.39
 platform: ruby
 authors: 
 - Oleg Khabarov
@@ -319,6 +319,7 @@ files:
 - test/fixtures/files/invalid_file.gif
 - test/fixtures/files/valid_image.jpg
 - test/fixtures/views/_nav_hook.html.erb
+- test/fixtures/views/_nav_hook_2.html.erb
 - test/functional/cms_admin/layouts_controller_test.rb
 - test/functional/cms_admin/pages_controller_test.rb
 - test/functional/cms_admin/sites_controller_test.rb
@@ -367,7 +368,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1387758075576454082
+      hash: -1835926868299303327
       segments: 
       - 0
       version: "0"