comfortable_mexican_sofa 1.0.16 → 1.0.17

data/VERSION

@@ -1 +1 @@
-1.0.16
+1.0.17

data/app/models/cms_layout.rb

@@ -77,8 +77,12 @@ class CmsLayout < ActiveRecord::Base
   # is ignored.
   def merged_content
     if parent
-      c = parent.merged_content.gsub CmsTag::PageText.regex_tag_signature('content'), content
-      c == parent.merged_content ? content : c
+      regex = CmsTag::PageText.regex_tag_signature('content')
+      if parent.merged_content.match(regex)
+        parent.merged_content.gsub(regex, content)
+      else
+        content
+      end
     else
       content
     end

data/comfortable_mexican_sofa.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{comfortable_mexican_sofa}
-  s.version = "1.0.16"
+  s.version = "1.0.17"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Oleg Khabarov", "The Working Group Inc"]

data/test/unit/cms_layout_test.rb

@@ -49,15 +49,22 @@ class CmsLayoutTest < ActiveSupport::TestCase
     assert_equal ['cms_admin.html.erb'], CmsLayout.app_layouts_for_select
   end
   
-  def test_merged_content
+  def test_merged_content_with_same_child_content
     parent_layout = cms_layouts(:nested)
-    layout = cms_layouts(:child)
-    assert_equal "{{cms:page:header}}\n{{cms:page:left_column}}\n{{cms:page:right_column}}", layout.merged_content
-    assert_equal "{{cms:page:left_column}}\n{{cms:page:right_column}}", layout.content
+    assert_equal "{{cms:page:header}}\n{{cms:page:content}}", parent_layout.content
+    assert_equal "{{cms:page:header}}\n{{cms:page:content}}", parent_layout.merged_content
+    
+    child_layout = cms_layouts(:child)
+    assert_equal parent_layout, child_layout.parent
+    assert_equal "{{cms:page:left_column}}\n{{cms:page:right_column}}", child_layout.content
+    assert_equal "{{cms:page:header}}\n{{cms:page:left_column}}\n{{cms:page:right_column}}", child_layout.merged_content
+    
+    child_layout.update_attribute(:content, '{{cms:page:content}}')
+    assert_equal "{{cms:page:header}}\n{{cms:page:content}}", child_layout.merged_content
     
     parent_layout.update_attribute(:content, '{{cms:page:whatever}}')
-    layout.reload
-    assert_equal "{{cms:page:left_column}}\n{{cms:page:right_column}}", layout.merged_content
+    child_layout.reload
+    assert_equal '{{cms:page:content}}', child_layout.merged_content
   end
   
   def test_merged_css

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version 
-  hash: 55
+  hash: 53
   prerelease: false
   segments: 
   - 1
   - 0
-  - 16
-  version: 1.0.16
+  - 17
+  version: 1.0.17
 platform: ruby
 authors: 
 - Oleg Khabarov