comfortable_mexican_sofa 1.6.23 → 1.6.24

data/test/functional/cms_content_controller_test.rb

@@ -23,7 +23,7 @@ class CmsContentControllerTest < ActionController::TestCase
   end
   
   def test_render_page_with_app_layout
-    cms_layouts(:default).update_attribute(:app_layout, 'cms_admin')
+    cms_layouts(:default).update_column(:app_layout, 'cms_admin')
     get :render_html, :cms_path => ''
     assert_response :success
     assert assigns(:cms_page)
@@ -31,7 +31,7 @@ class CmsContentControllerTest < ActionController::TestCase
   end
   
   def test_render_page_with_xhr
-    cms_layouts(:default).update_attribute(:app_layout, 'cms_admin')
+    cms_layouts(:default).update_column(:app_layout, 'cms_admin')
     xhr :get, :render_html, :cms_path => ''
     assert_response :success
     assert assigns(:cms_page)
@@ -81,7 +81,7 @@ class CmsContentControllerTest < ActionController::TestCase
   end
   
   def test_render_page_with_redirect
-    cms_pages(:child).update_attribute(:target_page, cms_pages(:default))
+    cms_pages(:child).update_column(:target_page_id, cms_pages(:default).id)
     assert_equal cms_pages(:default), cms_pages(:child).target_page
     get :render_html, :cms_path => 'child-page'
     assert_response :redirect
@@ -90,7 +90,7 @@ class CmsContentControllerTest < ActionController::TestCase
   
   def test_render_page_unpublished
     page = cms_pages(:default)
-    page.update_attribute(:is_published, false)
+    page.update_column(:is_published, false)
     
     assert_exception_raised ActionController::RoutingError, 'Page Not Found' do
       get :render_html, :cms_path => ''
@@ -167,7 +167,7 @@ class CmsContentControllerTest < ActionController::TestCase
 
   def test_render_sitemap_with_path
     site = cms_sites(:default)
-    site.update_attribute(:path, 'en')
+    site.update_column(:path, 'en')
     
     get :render_sitemap, :cms_path => site.path, :format => :xml
     assert_response :success
@@ -177,7 +177,7 @@ class CmsContentControllerTest < ActionController::TestCase
   
   def test_render_sitemap_with_path_invalid_with_single_site
     site = cms_sites(:default)
-    site.update_attribute(:path, 'en')
+    site.update_column(:path, 'en')
     
     get :render_sitemap, :cms_path => 'fr', :format => :xml
     assert_response :success

data/test/gemfiles/Gemfile.rails.3.0

@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
-gem 'rails',          '3.0.12'
+gem 'rails',          '3.0.16'
 gem 'active_link_to', '1.0.0'
 gem 'paperclip',      '>= 2.3.0'
 

data/test/gemfiles/Gemfile.rails.3.1

@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
-gem 'rails',          '3.1.4'
+gem 'rails',          '3.1.7'
 gem 'active_link_to', '1.0.0'
 gem 'paperclip',      '>= 2.3.0'
 

data/test/gemfiles/Gemfile.rails.3.2

@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
-gem 'rails',          '3.2.2'
+gem 'rails',          '3.2.7'
 gem 'active_link_to', '1.0.0'
 gem 'paperclip',      '>= 2.3.0'
 

data/test/integration/fixtures_test.rb

@@ -6,7 +6,7 @@ class FixturesTest < ActionDispatch::IntegrationTest
   
   def setup
     host! 'example.com'
-    cms_sites(:default).update_attribute(:hostname, 'example.com')
+    cms_sites(:default).update_column(:hostname, 'example.com')
   end
   
   def test_fixtures_disabled

data/test/integration/mirrors_test.rb

@@ -4,7 +4,7 @@ class MirrorsTest < ActionDispatch::IntegrationTest
   
   def setup
     @site_a = cms_sites(:default)
-    @site_a.update_attribute(:is_mirrored, true)
+    @site_a.update_column(:is_mirrored, true)
     @site_b = Cms::Site.create!(:identifier => 'test_b', :hostname => 'test-b.host', :is_mirrored => true)
     # making mirrors
     Cms::Layout.all.each{ |l| l.save! }

data/test/integration/render_cms_test.rb

@@ -8,8 +8,8 @@ class RenderCmsTest < ActionDispatch::IntegrationTest
       get '/render-page'    => 'render_test#render_page'
       get '/render-layout'  => 'render_test#render_layout'
     end
-    cms_layouts(:default).update_attribute(:content, '{{cms:page:content}}')
-    cms_pages(:child).update_attribute(:blocks_attributes, [
+    cms_layouts(:default).update_column(:content, '{{cms:page:content}}')
+    cms_pages(:child).update_attributes(:blocks_attributes => [
       { :identifier => 'content', :content => 'TestBlockContent' }
     ])
     super
@@ -108,7 +108,7 @@ class RenderCmsTest < ActionDispatch::IntegrationTest
   # -- Page Render Test -----------------------------------------------------
   def test_implicit_cms_page
     page = cms_pages(:child)
-    page.update_attribute(:slug, 'render-basic')
+    page.update_attributes(:slug => 'render-basic')
     get '/render-basic?type=page_implicit'
     assert_response :success
     assert assigns(:cms_site)
@@ -120,7 +120,7 @@ class RenderCmsTest < ActionDispatch::IntegrationTest
   
   def test_explicit_cms_page
     page = cms_pages(:child)
-    page.update_attribute(:slug, 'test-page')
+    page.update_attributes(slug: 'test-page')
     get '/render-page?type=page_explicit'
     assert_response :success
     assert assigns(:cms_site)
@@ -132,7 +132,7 @@ class RenderCmsTest < ActionDispatch::IntegrationTest
   
   def test_explicit_cms_page_with_status
     page = cms_pages(:child)
-    page.update_attribute(:slug, 'test-page')
+    page.update_attributes(:slug => 'test-page')
     get '/render-page?type=page_explicit_with_status'
     assert_response 404
     assert assigns(:cms_site)
@@ -144,7 +144,7 @@ class RenderCmsTest < ActionDispatch::IntegrationTest
   
   def test_explicit_cms_page_failure
     page = cms_pages(:child)
-    page.update_attribute(:slug, 'invalid')
+    page.update_attributes(:slug => 'invalid')
     assert_exception_raised ComfortableMexicanSofa::MissingPage do
       get '/render-page?type=page_explicit'
     end
@@ -176,7 +176,7 @@ class RenderCmsTest < ActionDispatch::IntegrationTest
   end
   
   def test_cms_layout
-    cms_layouts(:default).update_attribute(:content, '{{cms:page:content}} {{cms:page:content_b}} {{cms:page:content_c}}')
+    cms_layouts(:default).update_column(:content, '{{cms:page:content}} {{cms:page:content_b}} {{cms:page:content_c}}')
     get '/render-layout?type=layout'
     assert_response :success
     assert_equal 'TestText TestPartial TestValue TestTemplate TestValue', response.body

data/test/integration/sites_test.rb

@@ -66,7 +66,7 @@ class SitesTest < ActionDispatch::IntegrationTest
     assert assigns(:cms_site)
     assert_equal :en, I18n.locale
     
-    cms_sites(:default).update_attribute(:locale, 'fr')
+    cms_sites(:default).update_column(:locale, 'fr')
     get '/'
     assert_response :success
     assert assigns(:cms_site)
@@ -78,7 +78,7 @@ class SitesTest < ActionDispatch::IntegrationTest
     assert_response :success
     assert_equal :en, I18n.locale
     
-    cms_sites(:default).update_attribute(:locale, 'fr')
+    cms_sites(:default).update_column(:locale, 'fr')
     http_auth :get, cms_admin_site_pages_path(cms_sites(:default))
     assert_response :success
     assert_equal :fr, I18n.locale
@@ -87,7 +87,7 @@ class SitesTest < ActionDispatch::IntegrationTest
   def test_get_admin_with_forced_locale
     ComfortableMexicanSofa.config.admin_locale = :en
     
-    cms_sites(:default).update_attribute(:locale, 'fr')
+    cms_sites(:default).update_column(:locale, 'fr')
     http_auth :get, cms_admin_site_pages_path(cms_sites(:default))
     assert_response :success
     assert_equal :en, I18n.locale

data/test/test_helper.rb

@@ -122,3 +122,18 @@ class ActionDispatch::IntegrationTest
     send(method, path, options, {'HTTP_AUTHORIZATION' => "Basic #{Base64.encode64(username + ':' + password)}"})
   end
 end
+
+
+# Injecting `update_column` for installs on Rails < 3.1
+module ComfortableMexicanSofa
+  module Deprication
+    module ActiveRecord
+      def update_column(name, value)
+        update_attribute(name, value)
+      end
+    end
+  end
+end
+unless Cms::Page.new.respond_to?(:update_column)
+  ActiveRecord::Base.send :include, ComfortableMexicanSofa::Deprication::ActiveRecord
+end

data/test/unit/fixtures_test.rb

@@ -29,9 +29,9 @@ class FixturesTest < ActiveSupport::TestCase
     layout        = cms_layouts(:default)
     nested_layout = cms_layouts(:nested)
     child_layout  = cms_layouts(:child)
-    layout.update_attribute(:updated_at, 10.years.ago)
-    nested_layout.update_attribute(:updated_at, 10.years.ago)
-    child_layout.update_attribute(:updated_at, 10.years.ago)
+    layout.update_column(:updated_at, 10.years.ago)
+    nested_layout.update_column(:updated_at, 10.years.ago)
+    child_layout.update_column(:updated_at, 10.years.ago)
     
     assert_difference 'Cms::Layout.count', -1 do
       ComfortableMexicanSofa::Fixtures.import_layouts('test.host', 'example.com')
@@ -81,10 +81,10 @@ class FixturesTest < ActiveSupport::TestCase
     Cms::Page.delete_all
     
     layout = cms_layouts(:default)
-    layout.update_attribute(:content, '<html>{{cms:page:content}}</html>')
+    layout.update_column(:content, '<html>{{cms:page:content}}</html>')
     
     nested = cms_layouts(:nested)
-    nested.update_attribute(:content, '<html>{{cms:page:left}}<br/>{{cms:page:right}}</html>')
+    nested.update_column(:content, '<html>{{cms:page:left}}<br/>{{cms:page:right}}</html>')
     
     assert_difference 'Cms::Page.count', 2 do
       ComfortableMexicanSofa::Fixtures.import_pages('test.host', 'example.com')
@@ -107,11 +107,11 @@ class FixturesTest < ActiveSupport::TestCase
   
   def test_import_pages_updating_and_deleting
     page = cms_pages(:default)
-    page.update_attribute(:updated_at, 10.years.ago)
+    page.update_column(:updated_at, 10.years.ago)
     assert_equal 'Default Page', page.label
     
     child = cms_pages(:child)
-    child.update_attribute(:slug, 'old')
+    child.update_column(:slug, 'old')
     
     assert_no_difference 'Cms::Page.count' do
       ComfortableMexicanSofa::Fixtures.import_pages('test.host', 'example.com')
@@ -156,7 +156,7 @@ class FixturesTest < ActiveSupport::TestCase
       :layout => cms_layouts(:default),
       :blocks_attributes => [ { :identifier => 'to_delete', :content => 'test content' } ]
     )
-    page.update_attribute(:updated_at, 10.years.ago)
+    page.update_column(:updated_at, 10.years.ago)
     
     ComfortableMexicanSofa::Fixtures.import_pages('test.host', 'example.com')
     page.reload
@@ -182,7 +182,7 @@ class FixturesTest < ActiveSupport::TestCase
   
   def test_import_snippets_updating
     snippet = cms_snippets(:default)
-    snippet.update_attribute(:updated_at, 10.years.ago)
+    snippet.update_column(:updated_at, 10.years.ago)
     assert_equal 'default', snippet.identifier
     assert_equal 'Default Snippet', snippet.label
     assert_equal 'default_snippet_content', snippet.content
@@ -198,7 +198,7 @@ class FixturesTest < ActiveSupport::TestCase
   
   def test_import_snippets_deleting
     snippet = cms_snippets(:default)
-    snippet.update_attribute(:identifier, 'old')
+    snippet.update_column(:identifier, 'old')
     
     assert_no_difference 'Cms::Snippet.count' do
       ComfortableMexicanSofa::Fixtures.import_snippets('test.host', 'example.com')

data/test/unit/mirrors_test.rb

@@ -198,7 +198,7 @@ class MirrorsTest < ActiveSupport::TestCase
         assert_difference 'mirror.pages.count', 1 do
           assert_difference 'mirror.snippets.count', 1 do
             
-            mirror.update_attribute(:is_mirrored, true)
+            mirror.update_attributes(:is_mirrored => true)
             
             site.reload
             assert site.layouts.where(:identifier => 'mirror_layout').present?

data/test/unit/models/block_test.rb

@@ -83,7 +83,7 @@ class CmsBlockTest < ActiveSupport::TestCase
   
   def test_creation_and_update_via_nested_attributes_with_file
     layout = cms_layouts(:default)
-    layout.update_attribute(:content, '{{cms:page_file:file}}')
+    layout.update_column(:content, '{{cms:page_file:file}}')
     
     page = nil
     assert_difference ['Cms::Page.count', 'Cms::Block.count', 'Cms::File.count'] do
@@ -125,7 +125,7 @@ class CmsBlockTest < ActiveSupport::TestCase
   
   def test_creation_and_update_via_nested_attributes_with_files
     layout = cms_layouts(:default)
-    layout.update_attribute(:content, '{{cms:page_files:files}}')
+    layout.update_column(:content, '{{cms:page_files:files}}')
     
     page = nil
     assert_difference ['Cms::Page.count', 'Cms::Block.count'] do
@@ -168,7 +168,7 @@ class CmsBlockTest < ActiveSupport::TestCase
   
   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}}')
+    layout.update_column(:content, '{{cms:page:header}}{{cms:page_file:file}}{{cms:page:footer}}')
     
     assert_difference 'Cms::Page.count' do
       assert_difference 'Cms::Block.count', 3 do

data/test/unit/models/categorization_test.rb

@@ -45,14 +45,14 @@ class CmsCategorizationTest < ActiveSupport::TestCase
     snippet = cms_snippets(:default)
     assert_equal 0, snippet.categories.count
     
-    snippet.update_attribute(:category_ids, {
+    snippet.update_attributes(:category_ids => {
       cms_categories(:default).id => 1,
       'invalid'                   => 1
     })
     snippet.reload
     assert_equal 1, snippet.categories.count
     
-    snippet.update_attribute(:category_ids, {
+    snippet.update_attributes(:category_ids => {
       cms_categories(:default).id => 0,
       'invalid'                   => 0
     })

data/test/unit/models/file_test.rb

@@ -75,7 +75,7 @@ class CmsFileTest < ActiveSupport::TestCase
     assert_equal 1, Cms::File.images.count
     assert_equal 0, Cms::File.not_images.count
     
-    file.update_attribute(:file_content_type, 'application/pdf')
+    file.update_column(:file_content_type, 'application/pdf')
     assert_equal 0, Cms::File.images.count
     assert_equal 1, Cms::File.not_images.count
   end

data/test/unit/models/layout_test.rb

@@ -72,10 +72,10 @@ class CmsLayoutTest < ActiveSupport::TestCase
     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}}')
+    child_layout.update_column(: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}}')
+    parent_layout.update_column(:content, '{{cms:page:whatever}}')
     child_layout.reload
     assert_equal '{{cms:page:content}}', child_layout.merged_content
   end
@@ -114,7 +114,7 @@ class CmsLayoutTest < ActiveSupport::TestCase
     assert_equal "header_content\ncontent_content", page_1.content
     assert_equal "header_content\nleft_column_content\nleft_column_content", page_2.content
     
-    layout_1.update_attribute(:content, "Updated {{cms:page:content}}")
+    layout_1.update_attributes(:content => "Updated {{cms:page:content}}")
     page_1.reload
     page_2.reload
     

data/test/unit/models/page_test.rb

@@ -55,6 +55,24 @@ class CmsPageTest < ActiveSupport::TestCase
 
     page.slug = 'acción'
     assert page.valid?
+
+    page.slug = 'a'*256
+    assert page.invalid?
+    assert page.errors[:slug].present?
+
+    page.slug = 'a'*254
+    assert page.valid?
+  end
+
+
+  def test_validation_of_full_path
+    page = cms_pages(:child)
+    page.slug = 'a'*255
+    assert page.invalid?
+    assert page.errors[:full_path].present?
+
+    page.slug = 'a'*254
+    assert page.valid?
   end
 
   def test_validation_of_slug_allows_unicode_accent_characters
@@ -195,7 +213,7 @@ class CmsPageTest < ActiveSupport::TestCase
     assert_equal page.read_attribute(:content), page.content
     assert_equal page.read_attribute(:content), page.content(true)
     
-    page.update_attribute(:content, 'changed')
+    page.update_attributes(:content => 'changed')
     assert_equal page.read_attribute(:content), page.content
     assert_equal page.read_attribute(:content), page.content(true)
     assert_not_equal 'changed', page.read_attribute(:content)
@@ -203,7 +221,7 @@ class CmsPageTest < ActiveSupport::TestCase
   
   def test_scope_published
     assert_equal 2, Cms::Page.published.count
-    cms_pages(:child).update_attribute(:is_published, false)
+    cms_pages(:child).update_column(:is_published, false)
     assert_equal 1, Cms::Page.published.count
   end
   
@@ -218,7 +236,7 @@ class CmsPageTest < ActiveSupport::TestCase
     assert_equal 'http://test.host/', cms_pages(:default).url
     assert_equal 'http://test.host/child-page', cms_pages(:child).url
     
-    site.update_attribute(:path, '/en/site')
+    site.update_column(:path, '/en/site')
     cms_pages(:default).reload
     cms_pages(:child).reload
     

data/test/unit/models/site_test.rb

@@ -91,7 +91,7 @@ class CmsSiteTest < ActiveSupport::TestCase
     site = cms_sites(:default)
     assert !site.is_mirrored
     assert_equal 0, Cms::Site.mirrored.count
-    site.update_attribute(:is_mirrored, true)
+    site.update_column(:is_mirrored, true)
     assert_equal 1, Cms::Site.mirrored.count
   end
   

data/test/unit/models/snippet_test.rb

@@ -41,7 +41,7 @@ class CmsSnippetTest < ActiveSupport::TestCase
     snippet = cms_snippets(:default)
     page = cms_pages(:default)
     assert_match snippet.content, page.content
-    snippet.update_attribute(:content, 'new_snippet_content')
+    snippet.update_attributes(:content => 'new_snippet_content')
     page.reload
     assert_match /new_snippet_content/, page.content
   end

data/test/unit/revisions_test.rb

@@ -49,7 +49,7 @@ class RevisionsTest < ActiveSupport::TestCase
   def test_creation_for_layout_ignore
     layout = cms_layouts(:default)
     assert_no_difference 'layout.revisions.count' do
-      layout.update_attribute(:label, 'new label')
+      layout.update_attributes(:label => 'new label')
     end
   end
   
@@ -79,7 +79,7 @@ class RevisionsTest < ActiveSupport::TestCase
   def test_creation_for_page_ignore
     page = cms_pages(:default)
     assert_no_difference 'page.revisions.count' do
-      page.update_attribute(:label, 'new label')
+      page.update_attributes(:label => 'new label')
     end
   end
   
@@ -88,7 +88,7 @@ class RevisionsTest < ActiveSupport::TestCase
     old_attributes  = snippet.attributes.slice('content')
     
     assert_difference 'snippet.revisions.count' do
-      snippet.update_attribute(:content, 'new content')
+      snippet.update_attributes(:content => 'new content')
       snippet.reload
       assert_equal 2, snippet.revisions.count
       revision = snippet.revisions.first
@@ -99,7 +99,7 @@ class RevisionsTest < ActiveSupport::TestCase
   def test_creation_for_snippet_ignore
     snippet = cms_snippets(:default)
     assert_no_difference 'snippet.revisions.count' do
-      snippet.update_attribute(:label, 'new label')
+      snippet.update_attributes(:label => 'new label')
     end
   end
   
@@ -173,7 +173,7 @@ class RevisionsTest < ActiveSupport::TestCase
     assert_equal 1, snippet.revisions.count
     
     assert_no_difference 'snippet.revisions.count' do
-      snippet.update_attribute(:content, 'new content')
+      snippet.update_attributes(:content => 'new content')
       assert_nil Cms::Revision.find_by_id(revision.id)
       
       snippet.reload