comfortable_mexican_sofa 1.0.36 → 1.0.37

data/Rakefile

@@ -23,36 +23,4 @@ begin
   Jeweler::GemcutterTasks.new
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
-
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/test_*.rb'
-    test.verbose = true
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
-end
-
-task :default => :test
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "gem #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
 end

data/VERSION

@@ -1 +1 @@
-1.0.36
+1.0.37

data/app/controllers/cms_admin/pages_controller.rb

@@ -1,8 +1,9 @@
 class CmsAdmin::PagesController < CmsAdmin::BaseController
   
   before_filter :build_cms_page,    :only => [:new, :create]
-  before_filter :build_upload_file, :only => [:new, :edit]
   before_filter :load_cms_page,     :only => [:edit, :update, :destroy]
+  before_filter :preview_cms_page,  :only => [:create, :update]
+  before_filter :build_upload_file, :only => [:new, :edit]
   
   def index
     return redirect_to :action => :new if @cms_site.cms_pages.count == 0
@@ -27,7 +28,7 @@ class CmsAdmin::PagesController < CmsAdmin::BaseController
   end
   
   def update
-    @cms_page.update_attributes!(params[:cms_page])
+    @cms_page.save!
     flash[:notice] = 'Page updated'
     redirect_to :action => :edit, :id => @cms_page
   rescue ActiveRecord::RecordInvalid
@@ -60,10 +61,17 @@ protected
   
   def load_cms_page
     @cms_page = @cms_site.cms_pages.find(params[:id])
+    @cms_page.attributes = params[:cms_page]
     @cms_page.cms_layout ||= (@cms_page.parent && @cms_page.parent.cms_layout || @cms_site.cms_layouts.first)
   rescue ActiveRecord::RecordNotFound
     flash[:error] = 'Page not found'
     redirect_to :action => :index
   end
   
+  def preview_cms_page
+    if params[:preview]
+      layout = @cms_page.cms_layout.app_layout.blank?? false : @cms_page.cms_layout.app_layout
+      render :inline => @cms_page.content(true), :layout => layout
+    end
+  end
 end

data/app/models/cms_layout.rb

@@ -55,6 +55,8 @@ class CmsLayout < ActiveRecord::Base
     attributes[:parent]   = CmsLayout.load_from_file(site, attributes[:parent])
     attributes[:cms_site] = site
     new(attributes)
+  rescue
+    raise "Failed to load from #{file_path}"  
   end
   
   # Wrapper around load_from_file and find_by_slug

data/app/models/cms_page.rb

@@ -63,6 +63,8 @@ class CmsPage < ActiveRecord::Base
     attributes[:parent]     = CmsPage.load_from_file(site, attributes[:parent])
     attributes[:cms_site]   = site
     new(attributes)
+  rescue
+    raise "Failed to load from #{file_path}"
   end
   
   # Wrapper around load_from_file and find_by_full_path

data/app/models/cms_snippet.rb

@@ -33,6 +33,8 @@ class CmsSnippet < ActiveRecord::Base
     return nil unless File.exists?(file_path)
     attributes = YAML.load_file(file_path).symbolize_keys!
     new(attributes)
+  rescue
+    raise "Failed to load from #{file_path}"
   end
   
   # Wrapper around load_from_file and find_by_slug

data/app/views/cms_admin/pages/_form.html.erb

@@ -29,4 +29,9 @@
 
 <%= render :partial => 'form_blocks' %>
 
-<%= form.check_box :is_published, :label => 'Published' %>
+<%= form.simple_field nil, nil, :class => 'form_save' do %>
+  <%= form.check_box :is_published, :disable_builder => true %>
+  <%= form.label_for :is_published, :label => 'Published' %>
+  <%= form.submit @cms_page.new_record?? 'Create Page' : 'Update Page', :disable_builder => true %>
+  <%= form.submit 'Preview', :name => 'preview', :id => 'cms_page_preview', :disable_builder => true %>
+<% end %>

data/app/views/cms_admin/pages/edit.html.erb

@@ -2,5 +2,4 @@
 
 <%= cms_form_for @cms_page, :url => {:action => :update} do |form| %>
   <%= render :partial => 'form', :object => form %>
-  <%= form.submit 'Update Page' %>
 <% end %>

data/app/views/cms_admin/pages/new.html.erb

@@ -2,5 +2,4 @@
 
 <%= cms_form_for @cms_page, :url => {:action => :create} do |form| %>
   <%= render :partial => 'form', :object => form %>
-  <%= form.submit 'Create Page' %>
 <% end %>

data/app/views/cms_admin/uploads/_file.html.erb

@@ -5,6 +5,6 @@
         file_name = file_name.truncate(30) + file_ext
       end 
   %>
-  <%= link_to file_name, file.file.url, :target => '_blank' %>
+  <%= link_to file_name, file.file.url, :target => '_blank', :class => 'filename' %>
   <%= link_to span_tag('x'), cms_admin_upload_path(file), :method => :delete, :remote => true, :class => 'delete' %>
 </div>

data/app/views/cms_admin/uploads/_index.html.erb

@@ -1,7 +1,9 @@
 <div id='file_uploads' class='box'>
-  <button id="uploader_button" href="#">Select Files to Upload</button>
+  <div class='actions'>
+    <button id="uploader_button" href="#">Upload Files</button>
+  </div>
   <div id='uploaded_files'>
-    <% CmsUpload.order('created_at DESC').all.each do |file| %>
+    <% CmsUpload.order('file_file_name').all.each do |file| %>
       <%= render :partial => 'cms_admin/uploads/file', :object => file %>
     <% end %>
   </div>

data/comfortable_mexican_sofa.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{comfortable_mexican_sofa}
-  s.version = "1.0.36"
+  s.version = "1.0.37"
 
   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 = %q{2010-12-16}
+  s.date = %q{2011-01-07}
   s.description = %q{}
   s.email = %q{oleg@theworkinggroup.ca}
   s.extra_rdoc_files = [
@@ -166,11 +166,14 @@ Gem::Specification.new do |s|
     "public/stylesheets/comfortable_mexican_sofa/structure.css",
     "public/stylesheets/comfortable_mexican_sofa/typography.css",
     "script/rails",
+    "test/cms_seeds/test.host/layouts/broken.yml",
     "test/cms_seeds/test.host/layouts/default.yml",
     "test/cms_seeds/test.host/layouts/nested.yml",
+    "test/cms_seeds/test.host/pages/broken.yml",
     "test/cms_seeds/test.host/pages/child.yml",
     "test/cms_seeds/test.host/pages/child/subchild.yml",
     "test/cms_seeds/test.host/pages/index.yml",
+    "test/cms_seeds/test.host/snippets/broken.yml",
     "test/cms_seeds/test.host/snippets/default.yml",
     "test/fixtures/cms_blocks.yml",
     "test/fixtures/cms_layouts.yml",

data/db/migrate/01_create_cms.rb

@@ -74,7 +74,6 @@ class CreateCms < ActiveRecord::Migration
   
   def self.down
     drop_table :cms_sites
-    drop_table :cms_hosts
     drop_table :cms_layouts
     drop_table :cms_pages
     drop_table :cms_snippets

data/lib/comfortable_mexican_sofa/form_builder.rb

@@ -24,10 +24,10 @@ class ComfortableMexicanSofa::FormBuilder < ActionView::Helpers::FormBuilder
     ).html_safe
   end
   
-  def simple_field(label = nil, content = nil, &block)
+  def simple_field(label = nil, content = nil, options = {}, &block)
     content ||= @template.capture(&block) if block_given?
     %(
-      <div class='form_element'>
+      <div class='form_element #{options.delete(:class)}'>
         <div class='label'>#{label}</div>
         <div class='value'>#{content}</div>
       </div>
@@ -40,11 +40,11 @@ class ComfortableMexicanSofa::FormBuilder < ActionView::Helpers::FormBuilder
   end
   
   def submit(value, options = {}, &block)
+    return super if options.delete(:disable_builder)
     extra_content = @template.capture(&block) if block_given?
-    cancel_link ||= options[:cancel_url] ? ' or ' + options.delete(:cancel_url) : ''
     %(
       <div class='form_element submit_element'>
-        #{super(value, options)} #{extra_content} #{cancel_link}
+        #{super(value, options)} #{extra_content}
       </div>
     ).html_safe
   end

data/lib/tasks/comfortable_mexican_sofa.rake

@@ -32,8 +32,12 @@ namespace :comfortable_mexican_sofa do
       puts 'Importing Layouts'
       puts '-----------------'
       layouts = Dir.glob(File.expand_path('layouts/*.yml', @seed_path)).collect do |layout_file_path|
-        attributes = YAML.load_file(layout_file_path).symbolize_keys!
-        @site.cms_layouts.load_from_file(@site, attributes[:slug])
+        begin
+          attributes = YAML.load_file(layout_file_path).symbolize_keys!
+          @site.cms_layouts.load_from_file(@site, attributes[:slug])
+        rescue
+          nil
+        end
       end.compact
       CmsLayout.connection.transaction do
         # Fixtures are not ordered in any particular way. Saving order matters,
@@ -71,8 +75,12 @@ namespace :comfortable_mexican_sofa do
       puts 'Importing Pages'
       puts '---------------'
       pages = Dir.glob(File.expand_path('pages/**/*.yml', @seed_path)).collect do |page_file_path|
-        attributes = YAML.load_file(page_file_path).symbolize_keys!
-        @site.cms_pages.load_from_file(@site, attributes[:full_path])
+        begin
+          attributes = YAML.load_file(page_file_path).symbolize_keys!
+          @site.cms_pages.load_from_file(@site, attributes[:full_path])
+        rescue
+          nil
+        end
       end.compact
       CmsPage.connection.transaction do
         # Fixtures are not ordered in any particular way. Saving order matters,
@@ -120,8 +128,12 @@ namespace :comfortable_mexican_sofa do
       puts 'Importing Snippets'
       puts '------------------'
       snippets = Dir.glob(File.expand_path('snippets/*.yml', @seed_path)).collect do |snippet_file_path|
-        attributes = YAML.load_file(snippet_file_path).symbolize_keys!
-        @site.cms_snippets.load_from_file(@site, attributes[:slug])
+        begin
+          attributes = YAML.load_file(snippet_file_path).symbolize_keys!
+          @site.cms_snippets.load_from_file(@site, attributes[:slug])
+        rescue
+          nil
+        end
       end.compact
       CmsSnippet.connection.transaction do
         snippets.each do |snippet|

data/public/javascripts/comfortable_mexican_sofa/cms.js

@@ -9,6 +9,7 @@ $.CMS = function(){
     $.CMS.load_page_blocks();
     $.CMS.enable_rich_text();
     $.CMS.enable_date_picker();
+    if($('form.new_cms_page, form.edit_cms_page').get(0)) $.CMS.enable_page_save_form();
     if($('#page_save').get(0))        $.CMS.enable_page_save_widget();
     if($('#uploader_button').get(0))  $.CMS.enable_uploader();
     
@@ -103,6 +104,15 @@ $.CMS = function(){
       })
     },
     
+    enable_page_save_form : function(){
+      $('input[name=commit]').click(function() {
+        $(this).parents('form').attr('target', '');
+      });
+      $('input[name=preview]').click(function() {
+        $(this).parents('form').attr('target', '_blank');
+      });
+    },
+    
     enable_uploader : function(){
       auth_token = $("meta[name=csrf-token]").attr('content');
       var uploader = new plupload.Uploader({

data/public/stylesheets/comfortable_mexican_sofa/structure.css

@@ -59,7 +59,7 @@ html, body {
   padding: 5px;
   border-radius: 3px;
   -moz-border-radius: 3px;
-  margin-bottom: 25px;
+  margin-bottom: 10px;
   overflow: hidden;
 }
 #page_save button {
@@ -73,9 +73,11 @@ html, body {
   margin-right: 5px;
 }
 
-#file_uploads button {
-  width: 100%;
-  margin-bottom: 10px;
+#file_uploads .actions {
+  overflow: hidden;
+}
+#file_uploads .actions button {
+  float: right;
 }
 #file_uploads #uploaded_files {
   max-height: 500px;
@@ -86,7 +88,7 @@ html, body {
   overflow: hidden;
   font-size: 11px;
   background-color: #fff;
-  margin-bottom: 2px;
+  margin-top: 2px;
   opacity: 0.8;
 }
 #file_uploads #uploaded_files .file.pending {
@@ -158,12 +160,14 @@ html, body {
 .form_element .value {
   margin-left: 160px;
 }
-.form_element .value input,
+.form_element .value input[type='text'],
+.form_element .value input[type='password'],
 .form_element .value textarea,
 .form_element .value select {
   width: 98%;
 }
-.form_element .value input,
+.form_element .value input[type='text'],
+.form_element .value input[type='password'],
 .form_element .value select,
 .form_element .value textarea {
   border: 1px solid #ccc;
@@ -207,6 +211,15 @@ html, body {
 .form_element .value .field_with_errors textarea {
   border-color: #9e0b0f;
 }
+.form_element.form_save {
+  background-color: #E0E0E0;
+  border-radius: 3px;
+  -moz-border-radius: 3px;
+  padding: 5px 0px;
+}
+.form_element.form_save label {
+  margin: 0px 5px;
+}
 
 /* -- Listings ----------------------------------------------------------- */
 ul.list li .item {

data/test/cms_seeds/test.host/layouts/broken.yml

@@ -0,0 +1 @@
+broken yml file

data/test/cms_seeds/test.host/pages/broken.yml

@@ -0,0 +1 @@
+broken yml file

data/test/cms_seeds/test.host/snippets/broken.yml

@@ -0,0 +1 @@
+broken yml file

data/test/functional/cms_admin/layouts_controller_test.rb

@@ -1,4 +1,4 @@
-require  File.dirname(__FILE__) + '/../../test_helper'
+require File.expand_path('../../test_helper', File.dirname(__FILE__))
 
 class CmsAdmin::LayoutsControllerTest < ActionController::TestCase
   

data/test/functional/cms_admin/pages_controller_test.rb

@@ -1,4 +1,4 @@
-require  File.dirname(__FILE__) + '/../../test_helper'
+require File.expand_path('../../test_helper', File.dirname(__FILE__))
 
 class CmsAdmin::PagesControllerTest < ActionController::TestCase
   
@@ -126,19 +126,17 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
   
   def test_creation
     assert_difference 'CmsPage.count' do
-      assert_difference 'CmsBlock.count', 3 do
+      assert_difference 'CmsBlock.count', 2 do
         post :create, :cms_page => {
           :label          => 'Test Page',
           :slug           => 'test-page',
           :parent_id      => cms_pages(:default).id,
           :cms_layout_id  => cms_layouts(:default).id,
           :cms_blocks_attributes => [
-            { :label    => 'content',
+            { :label    => 'default_page_text',
               :content  => 'content content' },
-            { :label    => 'title',
-              :content  => 'title content' },
-            { :label    => 'number',
-              :content  => '999' }
+            { :label    => 'default_field_text',
+              :content  => 'title content' }
           ]
         }
         assert_response :redirect
@@ -155,18 +153,16 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
       post :create, :cms_page => {
         :cms_layout_id  => cms_layouts(:default).id,
         :cms_blocks_attributes => [
-          { :label    => 'content',
+          { :label    => 'default_page_text',
             :content  => 'content content' },
-          { :label    => 'title',
-            :content  => 'title content' },
-          { :label    => 'number',
-            :content  => '999' }
+          { :label    => 'default_field_text',
+            :content  => 'title content' }
         ]
       }
       assert_response :success
       page = assigns(:cms_page)
-      assert_equal 3, page.cms_blocks.size
-      assert_equal ['content content', 'title content', '999'], page.cms_blocks.collect{|b| b.content}
+      assert_equal 2, page.cms_blocks.size
+      assert_equal ['content content', 'title content'], page.cms_blocks.collect{|b| b.content}
       assert_template :new
       assert_equal 'Failed to create page', flash[:error]
     end
@@ -252,4 +248,38 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
     assert_template :form_blocks
   end
   
+  def test_creation_preview
+    assert_no_difference 'CmsPage.count' do
+      post :create, :preview => 'Preview', :cms_page => {
+        :label          => 'Test Page',
+        :slug           => 'test-page',
+        :parent_id      => cms_pages(:default).id,
+        :cms_layout_id  => cms_layouts(:default).id,
+        :cms_blocks_attributes => [
+          { :label    => 'default_page_text',
+            :content  => 'preview content' }
+        ]
+      }
+      assert_response :success
+      assert_match /preview content/, response.body
+    end
+  end
+  
+  def test_update_preview
+    page = cms_pages(:default)
+    assert_no_difference 'CmsPage.count' do
+      put :update, :preview => 'Preview', :id => page, :cms_page => {
+        :label => 'Updated Label',
+        :cms_blocks_attributes => [
+          { :label    => 'default_page_text',
+            :content  => 'preview content',
+            :id       => cms_blocks(:default_page_text).id}
+        ]
+      }
+      assert_response :success
+      assert_match /preview content/, response.body
+      page.reload
+      assert_not_equal 'Updated Label', page.label
+    end
+  end
 end

data/test/functional/cms_admin/sites_controller_test.rb

@@ -1,4 +1,4 @@
-require  File.dirname(__FILE__) + '/../../test_helper'
+require File.expand_path('../../test_helper', File.dirname(__FILE__))
 
 class CmsAdmin::SitesControllerTest < ActionController::TestCase
   

data/test/functional/cms_admin/snippets_controller_test.rb

@@ -1,4 +1,4 @@
-require  File.dirname(__FILE__) + '/../../test_helper'
+require File.expand_path('../../test_helper', File.dirname(__FILE__))
 
 class CmsAdmin::SnippetsControllerTest < ActionController::TestCase
 

data/test/functional/cms_admin/uploads_controller_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require File.expand_path('../../test_helper', File.dirname(__FILE__))
 
 class CmsAdmin::UploadsControllerTest < ActionController::TestCase
   

data/test/functional/cms_content_controller_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require File.expand_path('../test_helper', File.dirname(__FILE__))
 
 class CmsContentControllerTest < ActionController::TestCase
 

data/test/integration/authentication_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require File.expand_path('../test_helper', File.dirname(__FILE__))
 
 class AuthenticationTest < ActionDispatch::IntegrationTest
   

data/test/integration/rake_tasks_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require File.expand_path('../test_helper', File.dirname(__FILE__))
 
 require 'rake'
 require 'rake/rdoctask'

data/test/integration/render_cms_seed_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require File.expand_path('../test_helper', File.dirname(__FILE__))
 
 class RenderCmsSeedTest < ActionDispatch::IntegrationTest
   

data/test/integration/render_cms_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require File.expand_path('../test_helper', File.dirname(__FILE__))
 
 class RenderCmsTest < ActionDispatch::IntegrationTest
   

data/test/integration/sites_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require File.expand_path('../test_helper', File.dirname(__FILE__))
 
 class SitesTest < ActionDispatch::IntegrationTest
   

data/test/integration/view_hooks_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require File.expand_path('../test_helper', File.dirname(__FILE__))
 
 class ViewHooksTest < ActionDispatch::IntegrationTest
   

data/test/unit/cms_block_test.rb

@@ -4,7 +4,7 @@ class CmsBlockTest < ActiveSupport::TestCase
   
   def test_fixtures_validity
     CmsBlock.all.each do |block|
-      assert block.valid?, block.errors.full_messages
+      assert block.valid?, block.errors.full_messages.to_s
     end
   end
   

data/test/unit/cms_layout_test.rb

@@ -4,7 +4,7 @@ class CmsLayoutTest < ActiveSupport::TestCase
   
   def test_fixtures_validity
     CmsLayout.all.each do |layout|
-      assert layout.valid?
+      assert layout.valid?, layout.errors.full_messages.to_s
     end
   end
   
@@ -109,6 +109,14 @@ class CmsLayoutTest < ActiveSupport::TestCase
     assert_equal '<html><div>{{cms:page:content}}</div></html>', layout.merged_content
   end
   
+  def test_load_from_file_broken
+    ComfortableMexicanSofa.configuration.seed_data_path = File.expand_path('../cms_seeds', File.dirname(__FILE__))
+    error_message = "Failed to load from #{ComfortableMexicanSofa.configuration.seed_data_path}/test.host/layouts/broken.yml"
+    assert_exception_raised RuntimeError, error_message do
+      CmsLayout.load_from_file(cms_sites(:default), 'broken')
+    end
+  end
+  
   def test_load_for_slug
     assert layout = CmsLayout.load_for_slug!(cms_sites(:default), 'default')
     assert !layout.new_record?

data/test/unit/cms_page_test.rb

@@ -4,7 +4,7 @@ class CmsPageTest < ActiveSupport::TestCase
   
   def test_fixtures_validity
     CmsPage.all.each do |page|
-      assert page.valid?, page.errors.full_messages
+      assert page.valid?, page.errors.full_messages.to_s
       assert_equal page.read_attribute(:content), page.content(true)
     end
   end
@@ -19,7 +19,7 @@ class CmsPageTest < ActiveSupport::TestCase
   def test_validation_of_parent_presence
     page = cms_sites(:default).cms_pages.new(new_params)
     assert !page.parent
-    assert page.valid?, page.errors.full_messages
+    assert page.valid?, page.errors.full_messages.to_s
     assert_equal cms_pages(:default), page.parent
   end
   
@@ -173,6 +173,14 @@ class CmsPageTest < ActiveSupport::TestCase
     assert_equal '<html><div>Sub Child Page Content Content for Default Snippet</div></html>', page.content
   end
   
+  def test_load_from_file_broken
+    ComfortableMexicanSofa.configuration.seed_data_path = File.expand_path('../cms_seeds', File.dirname(__FILE__))
+    error_message = "Failed to load from #{ComfortableMexicanSofa.configuration.seed_data_path}/test.host/pages/broken.yml"
+    assert_exception_raised RuntimeError, error_message do
+      CmsPage.load_from_file(cms_sites(:default), '/broken')
+    end
+  end
+  
   def test_load_for_full_path
     assert page = CmsPage.load_for_full_path!(cms_sites(:default), '/')
     assert !page.new_record?

data/test/unit/cms_site_test.rb

@@ -4,7 +4,7 @@ class CmsSiteTest < ActiveSupport::TestCase
   
   def test_fixtures_validity
     CmsSite.all.each do |site|
-      assert site.valid?, site.errors.full_messages
+      assert site.valid?, site.errors.full_messages.to_s
     end
   end
   

data/test/unit/cms_snippet_test.rb

@@ -4,7 +4,7 @@ class CmsSnippetTest < ActiveSupport::TestCase
   
   def test_fixtures_validity
     CmsSnippet.all.each do |snippet|
-      assert snippet.valid?, snippet.errors.full_messages
+      assert snippet.valid?, snippet.errors.full_messages.to_s
     end
   end
   
@@ -32,6 +32,14 @@ class CmsSnippetTest < ActiveSupport::TestCase
     assert_equal 'Content for Default Snippet', snippet.content
   end
   
+  def test_load_from_file_broken
+    ComfortableMexicanSofa.configuration.seed_data_path = File.expand_path('../cms_seeds', File.dirname(__FILE__))
+    error_message = "Failed to load from #{ComfortableMexicanSofa.configuration.seed_data_path}/test.host/snippets/broken.yml"
+    assert_exception_raised RuntimeError, error_message do
+      CmsSnippet.load_from_file(cms_sites(:default), 'broken')
+    end
+  end
+  
   def test_load_for_slug
     assert snippet = CmsSnippet.load_for_slug!(cms_sites(:default), 'default')
     assert !snippet.new_record?

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version 
-  hash: 95
   prerelease: false
   segments: 
   - 1
   - 0
-  - 36
-  version: 1.0.36
+  - 37
+  version: 1.0.37
 platform: ruby
 authors: 
 - Oleg Khabarov
@@ -16,131 +15,123 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-16 00:00:00 -05:00
+date: 2011-01-07 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  name: rails
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 1
         segments: 
         - 3
         - 0
         - 3
         version: 3.0.3
   type: :runtime
-  name: rails
   prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
+  name: active_link_to
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
         segments: 
         - 0
         - 0
         - 6
         version: 0.0.6
   type: :runtime
-  name: active_link_to
   prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
+  name: paperclip
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
         segments: 
         - 2
         - 3
         - 8
         version: 2.3.8
   type: :runtime
-  name: paperclip
   prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
+  name: mime-types
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
   type: :runtime
-  name: mime-types
   prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
+  name: sqlite3-ruby
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
-  name: sqlite3-ruby
   prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
+  name: rails
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 1
         segments: 
         - 3
         - 0
         - 3
         version: 3.0.3
   type: :runtime
-  name: rails
   prerelease: false
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
+  name: active_link_to
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
         segments: 
         - 0
         - 0
         - 6
         version: 0.0.6
   type: :runtime
-  name: active_link_to
   prerelease: false
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
+  name: paperclip
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
         segments: 
         - 2
         - 3
         - 8
         version: 2.3.8
   type: :runtime
-  name: paperclip
   prerelease: false
   version_requirements: *id008
 description: ""
@@ -302,11 +293,14 @@ files:
 - public/stylesheets/comfortable_mexican_sofa/structure.css
 - public/stylesheets/comfortable_mexican_sofa/typography.css
 - script/rails
+- test/cms_seeds/test.host/layouts/broken.yml
 - test/cms_seeds/test.host/layouts/default.yml
 - test/cms_seeds/test.host/layouts/nested.yml
+- test/cms_seeds/test.host/pages/broken.yml
 - test/cms_seeds/test.host/pages/child.yml
 - test/cms_seeds/test.host/pages/child/subchild.yml
 - test/cms_seeds/test.host/pages/index.yml
+- test/cms_seeds/test.host/snippets/broken.yml
 - test/cms_seeds/test.host/snippets/default.yml
 - test/fixtures/cms_blocks.yml
 - test/fixtures/cms_layouts.yml
@@ -365,7 +359,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 1225201023293296474
       segments: 
       - 0
       version: "0"
@@ -374,7 +368,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"