comfortable_mexican_sofa 1.5.0 → 1.5.1

data/VERSION

@@ -1 +1 @@
-1.5.0
+1.5.1

data/app/models/cms/block.rb

@@ -39,6 +39,7 @@ protected
       self.files.collect{|f| f.mark_for_destruction } if single_file
       self.files.build(:site => self.page.site, :file => file)
     end
+    
     self.content = nil unless self.content.is_a?(String)
   end
 end

data/app/models/cms/file.rb

@@ -18,8 +18,10 @@ class Cms::File < ActiveRecord::Base
   validates_attachment_presence :file
   
   # -- Callbacks ------------------------------------------------------------
-  before_save :assign_label
+  before_save   :assign_label
   before_create :assign_position
+  after_save    :reload_page_cache
+  after_destroy :reload_page_cache
   
   # -- Scopes ---------------------------------------------------------------
   default_scope order(:position)
@@ -35,4 +37,10 @@ protected
     self.position = max ? max + 1 : 0
   end
   
+  # FIX: Terrible, but no way of creating cached page content overwise
+  def reload_page_cache
+    return unless self.block
+    self.block.page.save!
+  end
+  
 end

data/comfortable_mexican_sofa.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "comfortable_mexican_sofa"
-  s.version = "1.5.0"
+  s.version = "1.5.1"
 
   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-09-28"
+  s.date = "2011-09-29"
   s.description = ""
   s.email = "oleg@theworkinggroup.ca"
   s.extra_rdoc_files = [

data/lib/comfortable_mexican_sofa/form_builder.rb

@@ -142,7 +142,7 @@ class ComfortableMexicanSofa::FormBuilder < ActionView::Helpers::FormBuilder
       :id => nil
     )
     content << @template.hidden_field_tag("page[blocks_attributes][#{index}][label]", tag.label, :id => nil)
-    simple_field(tag.label, content, :class => tag.class.to_s.demodulize.underscore )
+    simple_field(tag.label.titleize, content, :class => tag.class.to_s.demodulize.underscore )
   end
   
 end

data/test/unit/models/block_test.rb

@@ -81,6 +81,9 @@ class CmsBlockTest < ActiveSupport::TestCase
       assert_equal nil, block.content
       assert_equal 1, block.files.count
       assert_equal 'valid_image.jpg', block.files.first.file_file_name
+      
+      page.reload
+      assert_equal block.files.first.file.url, page.content
     end
     
     assert_no_difference ['Cms::Block.count', 'Cms::File.count'] do
@@ -94,6 +97,7 @@ class CmsBlockTest < ActiveSupport::TestCase
       block = page.blocks.first
       assert_equal 1, block.files.count
       assert_equal 'invalid_file.gif', block.files.first.file_file_name
+      assert_equal block.files.first.file.url, page.content
     end
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-28 00:00:00.000000000Z
+date: 2011-09-29 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70317417314480 !ruby/object:Gem::Requirement
+  requirement: &70107792060400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70317417314480
+  version_requirements: *70107792060400
 - !ruby/object:Gem::Dependency
   name: active_link_to
-  requirement: &70317417312680 !ruby/object:Gem::Requirement
+  requirement: &70107792059760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70317417312680
+  version_requirements: *70107792059760
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70317417309920 !ruby/object:Gem::Requirement
+  requirement: &70107792058960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,7 +44,7 @@ dependencies:
         version: 2.4.2
   type: :runtime
   prerelease: false
-  version_requirements: *70317417309920
+  version_requirements: *70107792058960
 description: ''
 email: oleg@theworkinggroup.ca
 executables: []
@@ -355,7 +355,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1963305696869515669
+      hash: -4124442329296358220
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: