comfortable_mexican_sofa 1.5.11 → 1.6.0

data/test/functional/cms_admin/revisions_controller_test.rb

@@ -115,8 +115,8 @@ class CmsAdmin::RevisionsControllerTest < ActionController::TestCase
       
       page.reload
       assert_equal [
-        { :label => 'default_field_text', :content => 'revision field content'  },
-        { :label => 'default_page_text',  :content => 'revision page content'   }
+        { :identifier => 'default_field_text', :content => 'revision field content'  },
+        { :identifier => 'default_page_text',  :content => 'revision page content'   }
       ], page.blocks_attributes
     end
   end

data/test/functional/cms_admin/sites_controller_test.rb

@@ -44,8 +44,9 @@ class CmsAdmin::SitesControllerTest < ActionController::TestCase
   def test_create
     assert_difference 'Cms::Site.count' do
       post :create, :site => {
-        :label    => 'Test Site',
-        :hostname => 'test.site.local'
+        :label      => 'Test Site',
+        :identifier => 'test-site',
+        :hostname   => 'test.site.local'
       }
       assert_response :redirect
       site = Cms::Site.last

data/test/functional/cms_admin/snippets_controller_test.rb

@@ -17,7 +17,7 @@ class CmsAdmin::SnippetsControllerTest < ActionController::TestCase
   end
   
   def test_get_index_with_category
-    category = Cms::Category.create!(:label => 'Test Category', :categorized_type => 'Cms::Snippet')
+    category = cms_sites(:default).categories.create!(:label => 'Test Category', :categorized_type => 'Cms::Snippet')
     category.categorizations.create!(:categorized => cms_snippets(:default))
     
     get :index, :site_id => cms_sites(:default), :category => category.label
@@ -63,9 +63,9 @@ class CmsAdmin::SnippetsControllerTest < ActionController::TestCase
   def test_create
     assert_difference 'Cms::Snippet.count' do
       post :create, :site_id => cms_sites(:default), :snippet => {
-        :label    => 'Test Snippet',
-        :slug     => 'test-snippet',
-        :content  => 'Test Content'
+        :label      => 'Test Snippet',
+        :identifier => 'test-snippet',
+        :content    => 'Test Content'
       }
       assert_response :redirect
       snippet = Cms::Snippet.last
@@ -101,12 +101,12 @@ class CmsAdmin::SnippetsControllerTest < ActionController::TestCase
   def test_update_failure
     snippet = cms_snippets(:default)
     put :update, :site_id => snippet.site, :id => snippet, :snippet => {
-      :slug => ''
+      :identifier => ''
     }
     assert_response :success
     assert_template :edit
     snippet.reload
-    assert_not_equal '', snippet.slug
+    assert_not_equal '', snippet.identifier
     assert_equal 'Failed to update snippet', flash[:error]
   end
 
@@ -122,8 +122,8 @@ class CmsAdmin::SnippetsControllerTest < ActionController::TestCase
   def test_reorder
     snippet_one = cms_snippets(:default)
     snippet_two = cms_sites(:default).snippets.create!(
-      :label  => 'test',
-      :slug   => 'test'
+      :label      => 'test',
+      :identifier => 'test'
     )
     assert_equal 0, snippet_one.position
     assert_equal 1, snippet_two.position

data/test/functional/cms_content_controller_test.rb

@@ -51,9 +51,8 @@ class CmsContentControllerTest < ActionController::TestCase
       :layout_id      => cms_layouts(:default).id,
       :is_published   => '1',
       :blocks_attributes => [
-        { :label    => 'default_page_text',
-          :type     => 'CmsTag::PageText',
-          :content  => 'custom 404 page content' }
+        { :identifier => 'default_page_text',
+          :content    => 'custom 404 page content' }
       ]
     )
     assert_equal '/404', page.full_path
@@ -105,8 +104,8 @@ class CmsContentControllerTest < ActionController::TestCase
       :layout_id      => cms_layouts(:default).id,
       :is_published   => '1',
       :blocks_attributes => [
-        { :label    => 'default_page_text',
-          :content  => 'text <%= 2 + 2 %> text' }
+        { :identifier => 'default_page_text',
+          :content    => 'text <%= 2 + 2 %> text' }
       ]
     )
     get :render_html, :cms_path => 'irb'
@@ -124,8 +123,8 @@ class CmsContentControllerTest < ActionController::TestCase
       :layout_id  => cms_layouts(:default).id,
       :is_published   => '1',
       :blocks_attributes => [
-        { :label    => 'default_page_text',
-          :content  => 'text <%= 2 + 2 %> text' }
+        { :identifier => 'default_page_text',
+          :content    => 'text <%= 2 + 2 %> text' }
       ]
     )
     get :render_html, :cms_path => 'irb'
@@ -134,26 +133,26 @@ class CmsContentControllerTest < ActionController::TestCase
   end
   
   def test_render_css
-    get :render_css, :site_id => cms_sites(:default).id, :layout_slug => cms_layouts(:default).slug
+    get :render_css, :site_id => cms_sites(:default).id, :identifier => cms_layouts(:default).identifier
     assert_response :success
     assert_match %r{text\/css}, response.headers["Content-Type"]
     assert_equal cms_layouts(:default).css, response.body
   end
   
   def test_render_css_not_found
-    get :render_css, :site_id => cms_sites(:default).id, :layout_slug => 'bogus'
+    get :render_css, :site_id => cms_sites(:default).id, :identifier => 'bogus'
     assert_response 404
   end
   
   def test_render_js
-    get :render_js, :site_id => cms_sites(:default).id, :layout_slug => cms_layouts(:default).slug
+    get :render_js, :site_id => cms_sites(:default).id, :identifier => cms_layouts(:default).identifier
     assert_response :success
     assert_match %r{text\/javascript}, response.headers["Content-Type"]
     assert_equal cms_layouts(:default).js, response.body
   end
   
   def test_render_js_not_found
-    get :render_js, :site_id => cms_sites(:default).id, :layout_slug => 'bogus'
+    get :render_js, :site_id => cms_sites(:default).id, :identifier => 'bogus'
     assert_response 404
   end
   

data/test/gemfiles/{Gemfile.rails-3.0.10 → Gemfile.rails-3.0}

@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
-gem 'rails',          '~>3.0.10'
+gem 'rails',          '~>3.0.11'
 gem 'active_link_to', '~>1.0.0'
 gem 'paperclip',      '~>2.3.0'
 

data/test/gemfiles/{Gemfile.rails-3.1.1 → Gemfile.rails-3.1}

@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
-gem 'rails',          '~>3.1.1'
+gem 'rails',          '~>3.1.3'
 gem 'active_link_to', '~>1.0.0'
 gem 'paperclip',      '~>2.3.0'
 

data/test/integration/fixtures_test.rb

@@ -13,8 +13,8 @@ class FixturesTest < ActionDispatch::IntegrationTest
       assert_response :success
       
       assert_equal 'Default Page', Cms::Page.root.label
-      assert_equal 'Default Layout', Cms::Layout.find_by_slug('default').label
-      assert_equal 'Default Snippet', Cms::Snippet.find_by_slug('default').label
+      assert_equal 'Default Layout', Cms::Layout.find_by_identifier('default').label
+      assert_equal 'Default Snippet', Cms::Snippet.find_by_identifier('default').label
     end
   end
   
@@ -31,8 +31,8 @@ class FixturesTest < ActionDispatch::IntegrationTest
           assert_response :success
           
           assert_equal 'Home Fixture Page', Cms::Page.root.label
-          assert_equal 'Default Fixture Layout', Cms::Layout.find_by_slug('default').label
-          assert_equal 'Default Fixture Snippet', Cms::Snippet.find_by_slug('default').label
+          assert_equal 'Default Fixture Layout', Cms::Layout.find_by_identifier('default').label
+          assert_equal 'Default Fixture Snippet', Cms::Snippet.find_by_identifier('default').label
           
           assert_equal "<html>\n  <body>\n    Home Page Fixture Content\nFixture Content for Default Snippet\n  </body>\n</html>", response.body
         end

data/test/integration/mirrors_test.rb

@@ -5,7 +5,7 @@ class MirrorsTest < ActionDispatch::IntegrationTest
   def setup
     @site_a = cms_sites(:default)
     @site_a.update_attribute(:is_mirrored, true)
-    @site_b = Cms::Site.create!(:hostname => 'test-b.host', :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! }
     Cms::Page.all.each{ |p| p.save! }

data/test/integration/render_cms_test.rb

@@ -10,7 +10,7 @@ class RenderCmsTest < ActionDispatch::IntegrationTest
     end
     cms_layouts(:default).update_attribute(:content, '{{cms:page:content}}')
     cms_pages(:child).update_attribute(:blocks_attributes, [
-      { :label => 'content', :content => 'TestBlockContent' }
+      { :identifier => 'content', :content => 'TestBlockContent' }
     ])
     super
   end
@@ -21,15 +21,15 @@ class RenderCmsTest < ActionDispatch::IntegrationTest
   
   def create_site_b
     site    = Cms::Site.create!(
-      :label    => 'SiteB',
-      :hostname => 'site-b.test')
+      :identifier => 'site-b',
+      :hostname   => 'site-b.test')
     layout  = site.layouts.create!(
-      :slug     => 'default',
-      :content  => 'site-b {{cms:page:content}}')
+      :identifier => 'default',
+      :content    => 'site-b {{cms:page:content}}')
     page    = site.pages.create!(
       :label  => 'default',
       :layout => layout,
-      :blocks_attributes  => [{ :label => 'content', :content => 'SiteBContent' }])
+      :blocks_attributes  => [{ :identifier => 'content', :content => 'SiteBContent' }])
   end
   
   class ::RenderTestController < ApplicationController
@@ -57,7 +57,7 @@ class RenderCmsTest < ActionDispatch::IntegrationTest
       when 'page_explicit_with_status'
         render :cms_page => '/test-page', :status => 404
       when 'page_explicit_with_site'
-        render :cms_page => '/', :cms_site => 'SiteB'
+        render :cms_page => '/', :cms_site => 'site-b'
       else
         raise 'Invalid or no param[:type] provided'
       end
@@ -79,7 +79,7 @@ class RenderCmsTest < ActionDispatch::IntegrationTest
       when 'layout_invalid'
         render :cms_layout => 'invalid'
       when 'layout_defaults_with_site'
-        render :cms_layout => 'default', :cms_site => 'SiteB'
+        render :cms_layout => 'default', :cms_site => 'site-b'
       else
         raise 'Invalid or no param[:type] provided'
       end
@@ -155,7 +155,7 @@ class RenderCmsTest < ActionDispatch::IntegrationTest
     get '/render-page?type=page_explicit_with_site'
     assert_response :success
     assert assigns(:cms_site)
-    assert_equal 'SiteB', assigns(:cms_site).label
+    assert_equal 'site-b', assigns(:cms_site).identifier
     assert_equal 'site-b SiteBContent', response.body
   end
   
@@ -205,7 +205,7 @@ class RenderCmsTest < ActionDispatch::IntegrationTest
     get '/render-layout?type=layout_defaults_with_site'
     assert_response :success
     assert assigns(:cms_site)
-    assert_equal 'SiteB', assigns(:cms_site).label
+    assert_equal 'site-b', assigns(:cms_site).identifier
     assert_equal 'site-b TestTemplate TestValue', response.body
   end
   

data/test/integration/sites_test.rb

@@ -28,9 +28,9 @@ class SitesTest < ActionDispatch::IntegrationTest
   
   def test_get_public_page_with_sites_with_different_paths
     Cms::Site.delete_all
-    site_a = Cms::Site.create!(:label => 'Site A', :hostname => 'test.host', :path => '')
-    site_b = Cms::Site.create!(:label => 'Site B', :hostname => 'test.host', :path => 'path-b')
-    site_c = Cms::Site.create!(:label => 'Site C', :hostname => 'test.host', :path => 'path-c/child')
+    site_a = Cms::Site.create!(:identifier => 'site-a', :hostname => 'test.host', :path => '')
+    site_b = Cms::Site.create!(:identifier => 'site-b', :hostname => 'test.host', :path => 'path-b')
+    site_c = Cms::Site.create!(:identifier => 'site-c', :hostname => 'test.host', :path => 'path-c/child')
     
     %w(/ /path-a /path-a/child /path-c).each do |path|
       get path

data/test/test_helper.rb

@@ -4,6 +4,9 @@ ENV['RAILS_ENV'] = 'test'
 require File.expand_path('../../config/environment', __FILE__)
 require 'rails/test_help'
 
+# No need to add cache-busters in test environment
+Paperclip::Attachment.default_options[:use_timestamp] = false
+
 class ActiveSupport::TestCase
   
   # Disabling the noise

data/test/unit/fixtures_test.rb

@@ -8,13 +8,13 @@ class FixturesTest < ActiveSupport::TestCase
     assert_difference 'Cms::Layout.count', 2 do
       ComfortableMexicanSofa::Fixtures.import_layouts('test.host', 'example.com')
       
-      assert layout = Cms::Layout.find_by_slug('default')
+      assert layout = Cms::Layout.find_by_identifier('default')
       assert_equal 'Default Fixture Layout', layout.label
       assert_equal "<html>\n  <body>\n    {{ cms:page:content }}\n  </body>\n</html>", layout.content
       assert_equal 'body{color: red}', layout.css
       assert_equal '// default js', layout.js
       
-      assert nested_layout = Cms::Layout.find_by_slug('nested')
+      assert nested_layout = Cms::Layout.find_by_identifier('nested')
       assert_equal layout, nested_layout.parent
       assert_equal 'Default Fixture Nested Layout', nested_layout.label
       assert_equal "<div class='left'> {{ cms:page:left }} </div>\n<div class='right'> {{ cms:page:right }} </div>", nested_layout.content
@@ -47,7 +47,7 @@ class FixturesTest < ActiveSupport::TestCase
       assert_equal 'div{float:left}', nested_layout.css
       assert_equal '// nested js', nested_layout.js
       
-      assert_nil Cms::Layout.find_by_slug('child')
+      assert_nil Cms::Layout.find_by_identifier('child')
     end
   end
   
@@ -66,7 +66,7 @@ class FixturesTest < ActiveSupport::TestCase
     
     ComfortableMexicanSofa::Fixtures.import_layouts('test.host', 'example.com')
     layout.reload
-    assert_equal 'default', layout.slug
+    assert_equal 'default', layout.identifier
     assert_equal 'Default Layout', layout.label
     assert_equal "{{cms:field:default_field_text:text}}\nlayout_content_a\n{{cms:page:default_page_text:text}}\nlayout_content_b\n{{cms:snippet:default}}\nlayout_content_c", layout.content
     assert_equal 'default_css', layout.css
@@ -139,7 +139,7 @@ class FixturesTest < ActiveSupport::TestCase
     assert_difference 'Cms::Snippet.count' do
       ComfortableMexicanSofa::Fixtures.import_snippets('test.host', 'example.com')
       assert snippet = Cms::Snippet.last
-      assert_equal 'default', snippet.slug
+      assert_equal 'default', snippet.identifier
       assert_equal 'Default Fixture Snippet', snippet.label
       assert_equal 'Fixture Content for Default Snippet', snippet.content
     end
@@ -148,14 +148,14 @@ class FixturesTest < ActiveSupport::TestCase
   def test_import_snippets_updating
     snippet = cms_snippets(:default)
     snippet.update_attribute(:updated_at, 10.years.ago)
-    assert_equal 'default', snippet.slug
+    assert_equal 'default', snippet.identifier
     assert_equal 'Default Snippet', snippet.label
     assert_equal 'default_snippet_content', snippet.content
     
     assert_no_difference 'Cms::Snippet.count' do
       ComfortableMexicanSofa::Fixtures.import_snippets('test.host', 'example.com')
       snippet.reload
-      assert_equal 'default', snippet.slug
+      assert_equal 'default', snippet.identifier
       assert_equal 'Default Fixture Snippet', snippet.label
       assert_equal 'Fixture Content for Default Snippet', snippet.content
     end
@@ -163,16 +163,16 @@ class FixturesTest < ActiveSupport::TestCase
   
   def test_import_snippets_deleting
     snippet = cms_snippets(:default)
-    snippet.update_attribute(:slug, 'old')
+    snippet.update_attribute(:identifier, 'old')
     
     assert_no_difference 'Cms::Snippet.count' do
       ComfortableMexicanSofa::Fixtures.import_snippets('test.host', 'example.com')
       assert snippet = Cms::Snippet.last
-      assert_equal 'default', snippet.slug
+      assert_equal 'default', snippet.identifier
       assert_equal 'Default Fixture Snippet', snippet.label
       assert_equal 'Fixture Content for Default Snippet', snippet.content
       
-      assert_nil Cms::Snippet.find_by_slug('old')
+      assert_nil Cms::Snippet.find_by_identifier('old')
     end
   end
   
@@ -187,7 +187,7 @@ class FixturesTest < ActiveSupport::TestCase
     
     ComfortableMexicanSofa::Fixtures.import_snippets('test.host', 'example.com')
     snippet.reload
-    assert_equal 'default', snippet.slug
+    assert_equal 'default', snippet.identifier
     assert_equal 'Default Snippet', snippet.label
     assert_equal 'default_snippet_content', snippet.content
   end

data/test/unit/mirrors_test.rb

@@ -4,20 +4,20 @@ class MirrorsTest < ActiveSupport::TestCase
   
   def setup
     Cms::Site.delete_all
-    @site_a = Cms::Site.create!(:label => 'Site A', :hostname => 'site-a.host', :is_mirrored => true)
-    @site_b = Cms::Site.create!(:label => 'Site B', :hostname => 'site-b.host', :is_mirrored => true)
+    @site_a = Cms::Site.create!(:identifier => 'site_a', :hostname => 'site-a.host', :is_mirrored => true)
+    @site_b = Cms::Site.create!(:identifier => 'site_b', :hostname => 'site-b.host', :is_mirrored => true)
   end
   
   def test_layout_creation
     assert_difference 'Cms::Layout.count', 2 do
-      layout = @site_a.layouts.create!(:slug => 'test')
+      layout = @site_a.layouts.create!(:identifier => 'test')
       assert_equal 1, layout.mirrors.size
-      assert_equal 'test', layout.mirrors.first.slug
+      assert_equal 'test', layout.mirrors.first.identifier
     end
   end
   
   def test_page_creation
-    layout = @site_a.layouts.create!(:slug => 'test')
+    layout = @site_a.layouts.create!(:identifier => 'test')
     
     assert_difference 'Cms::Page.count', 2 do
       page = @site_a.pages.create!(
@@ -31,16 +31,16 @@ class MirrorsTest < ActiveSupport::TestCase
   
   def test_snippet_creation
     assert_difference 'Cms::Snippet.count', 2 do
-      snippet = @site_a.snippets.create(:slug => 'test')
+      snippet = @site_a.snippets.create(:identifier => 'test')
       assert_equal 1, snippet.mirrors.size
-      assert_equal 'test', snippet.mirrors.first.slug
+      assert_equal 'test', snippet.mirrors.first.identifier
     end
   end
   
   def test_layout_update
-    layout_1a = @site_a.layouts.create!(:slug => 'test_a')
-    layout_1b = @site_a.layouts.create!(:slug => 'test_b')
-    layout_1c = @site_a.layouts.create!(:slug => 'nested', :parent => layout_1a)
+    layout_1a = @site_a.layouts.create!(:identifier => 'test_a')
+    layout_1b = @site_a.layouts.create!(:identifier => 'test_b')
+    layout_1c = @site_a.layouts.create!(:identifier => 'nested', :parent => layout_1a)
     
     assert layout_2a = layout_1a.mirrors.first
     assert layout_2b = layout_1b.mirrors.first
@@ -48,19 +48,19 @@ class MirrorsTest < ActiveSupport::TestCase
     assert_equal layout_2a, layout_2c.parent
     
     layout_1c.update_attributes!(
-      :slug     => 'updated',
-      :parent   => layout_1b,
-      :content  => 'updated content'
+      :identifier => 'updated',
+      :parent     => layout_1b,
+      :content    => 'updated content'
     )
     layout_2c.reload
-    assert_equal 'updated', layout_2c.slug
+    assert_equal 'updated', layout_2c.identifier
     assert_equal layout_2b, layout_2c.parent
     assert_not_equal 'updated content', layout_2c
   end
   
   def test_page_update
-    layout_1a = @site_a.layouts.create!(:slug => 'test_a')
-    layout_1b = @site_a.layouts.create!(:slug => 'test_b')
+    layout_1a = @site_a.layouts.create!(:identifier => 'test_a')
+    layout_1b = @site_a.layouts.create!(:identifier => 'test_b')
     
     page_1r = @site_a.pages.create!(:slug => 'root', :layout => layout_1a)
     page_1a = @site_a.pages.create!(:slug => 'test_a', :layout => layout_1a)
@@ -84,21 +84,21 @@ class MirrorsTest < ActiveSupport::TestCase
   end
   
   def test_snippet_update
-    snippet_1 = @site_a.snippets.create(:slug => 'test')
+    snippet_1 = @site_a.snippets.create(:identifier => 'test')
     assert snippet_2 = snippet_1.mirrors.first
     snippet_1.update_attributes!(
-      :slug     => 'updated',
-      :content  => 'updated content'
+      :identifier => 'updated',
+      :content    => 'updated content'
     )
     snippet_2.reload
-    assert_equal 'updated', snippet_2.slug
+    assert_equal 'updated', snippet_2.identifier
     assert_not_equal 'updated content', snippet_2.content
   end
   
   def test_layout_destroy
-    layout_1a = @site_a.layouts.create!(:slug => 'test_a')
-    layout_1b = @site_a.layouts.create!(:slug => 'test_b')
-    layout_1c = @site_a.layouts.create!(:slug => 'nested', :parent => layout_1b)
+    layout_1a = @site_a.layouts.create!(:identifier => 'test_a')
+    layout_1b = @site_a.layouts.create!(:identifier => 'test_b')
+    layout_1c = @site_a.layouts.create!(:identifier => 'nested', :parent => layout_1b)
     
     assert layout_2a = layout_1a.mirrors.first
     assert layout_2b = layout_1b.mirrors.first
@@ -116,7 +116,7 @@ class MirrorsTest < ActiveSupport::TestCase
   end
   
   def test_page_destroy
-    layout = @site_a.layouts.create!(:slug => 'test')
+    layout = @site_a.layouts.create!(:identifier => 'test')
     page_1r = @site_a.pages.create!(:slug => 'root', :layout => layout)
     page_1a = @site_a.pages.create!(:slug => 'test_a', :layout => layout)
     page_1b = @site_a.pages.create!(:slug => 'test_b', :layout => layout)
@@ -137,7 +137,7 @@ class MirrorsTest < ActiveSupport::TestCase
   end
   
   def test_snippet_destroy
-    snippet_1 = @site_a.snippets.create(:slug => 'test')
+    snippet_1 = @site_a.snippets.create(:identifier => 'test')
     assert snippet_2 = snippet_1.mirrors.first
     
     assert_difference ['@site_a.snippets.count', '@site_b.snippets.count'], -1 do