comfortable_mexican_sofa 1.5.9 → 1.5.10

data/VERSION

@@ -1 +1 @@
-1.5.9
+1.5.10

data/app/models/cms/file.rb

@@ -50,7 +50,8 @@ protected
   # FIX: Terrible, but no way of creating cached page content overwise
   def reload_page_cache
     return unless self.block
-    self.block.page.save!
+    p = self.block.page
+    Cms::Page.where(:id => p.id).update_all(:content => p.content(true))
   end
   
 end

data/app/models/cms/page.rb

@@ -18,8 +18,8 @@ class Cms::Page < ActiveRecord::Base
   belongs_to :target_page,
     :class_name => 'Cms::Page'
   has_many :blocks,
-    :dependent  => :destroy,
-    :autosave   => true
+    :autosave   => true,
+    :dependent  => :destroy
   
   # -- Callbacks ------------------------------------------------------------
   before_validation :assigns_label,

data/comfortable_mexican_sofa.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "comfortable_mexican_sofa"
-  s.version = "1.5.9"
+  s.version = "1.5.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Oleg Khabarov", "The Working Group Inc"]
-  s.date = "2011-10-27"
+  s.date = "2011-10-28"
   s.description = ""
   s.email = "oleg@theworkinggroup.ca"
   s.extra_rdoc_files = [

data/test/test_helper.rb

@@ -6,7 +6,7 @@ require 'rails/test_help'
 
 class ActiveSupport::TestCase
   
-  # Shut the fuck up
+  # Disabling the noise
   $stdout_orig = $stdout
   $stderr_orig = $stderr
   $stdout = StringIO.new

data/test/unit/models/block_test.rb

@@ -58,6 +58,32 @@ class CmsBlockTest < ActiveSupport::TestCase
     end
   end
   
+  def test_creation_via_page_nested_attributes_as_hash_with_duplicates
+    assert_difference ['Cms::Page.count', 'Cms::Block.count'] do
+      page = Cms::Page.create!(
+        :site       => cms_sites(:default),
+        :layout     => cms_layouts(:default),
+        :label      => 'test page',
+        :slug       => 'test_page',
+        :parent_id  => cms_pages(:default).id,
+        :blocks_attributes => {
+          '0' => {
+            :label    => 'default_page_text',
+            :content  => 'test_content'
+          },
+          '1' => {
+            :label    => 'default_page_text',
+            :content  => 'test_content'
+          }
+        }
+      )
+      assert_equal 1, page.blocks.count
+      block = page.blocks.first
+      assert_equal 'default_page_text', block.label
+      assert_equal 'test_content', block.content
+    end
+  end
+  
   def test_creation_and_update_via_nested_attributes_with_file
     layout = cms_layouts(:default)
     layout.update_attribute(:content, '{{cms:page_file:file}}')
@@ -145,4 +171,35 @@ class CmsBlockTest < ActiveSupport::TestCase
     end
   end
   
+  def test_creation_via_nested_attributes_with_file
+    layout = cms_layouts(:default)
+    layout.update_attribute(:content, '{{cms:page:header}}{{cms:page_file:file}}{{cms:page:footer}}')
+    
+    assert_difference 'Cms::Page.count' do
+      assert_difference 'Cms::Block.count', 3 do
+        page = Cms::Page.create!(
+          :site       => cms_sites(:default),
+          :layout     => layout,
+          :label      => 'test page',
+          :slug       => 'test_page',
+          :parent_id  => cms_pages(:default).id,
+          :blocks_attributes => {
+            '0' => {
+              :label    => 'header',
+              :content  => 'header content'
+            },
+            '1' => {
+              :label    => 'file',
+              :content  => fixture_file_upload('files/document.pdf')
+            },
+            '2' => {
+              :label    => 'footer',
+              :content  => 'footer content'
+            }
+          }
+        )
+      end
+    end
+  end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version
-  version: 1.5.9
+  version: 1.5.10
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-27 00:00:00.000000000Z
+date: 2011-10-28 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70272731521480 !ruby/object:Gem::Requirement
+  requirement: &70149522890920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70272731521480
+  version_requirements: *70149522890920
 - !ruby/object:Gem::Dependency
   name: active_link_to
-  requirement: &70272731519060 !ruby/object:Gem::Requirement
+  requirement: &70149522889800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70272731519060
+  version_requirements: *70149522889800
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70272731517260 !ruby/object:Gem::Requirement
+  requirement: &70149522888620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,7 +44,7 @@ dependencies:
         version: 2.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70272731517260
+  version_requirements: *70149522888620
 description: ''
 email: oleg@theworkinggroup.ca
 executables: []
@@ -359,7 +359,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3075842276873054567
+      hash: -3119090265743627335
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: