comfortable_mexican_sofa 1.6.31 → 1.7.0

data/lib/comfortable_mexican_sofa/version.rb

@@ -1,3 +1,7 @@
 module ComfortableMexicanSofa
-  VERSION = "1.6.31"
-end
+  VERSION = begin 
+    IO.read(File.join(File.dirname(__FILE__), '/../../VERSION')).chomp
+  rescue
+    'UNKNOWN'
+  end
+end

data/lib/comfortable_mexican_sofa/view_methods.rb

@@ -1,13 +1,10 @@
 module ComfortableMexicanSofa::ViewMethods
-  # Wrapper around CmsFormBuilder
-  def comfy_form_for(record_or_name_or_array, *args, &proc)
-    options = args.extract_options!
-    form_for(record_or_name_or_array, *(args << options.merge(:builder => ComfortableMexicanSofa::FormBuilder)), &proc)
-  end
   
-  # Wrapper for <span>
-  def span_tag(*args)
-    content_tag(:span, *args)
+  # Wrapper around ComfortableMexicanSofa::FormBuilder
+  def comfy_form_for(record, options = {}, &proc)
+    options[:builder] = ComfortableMexicanSofa::FormBuilder
+    options[:type] ||= :horizontal
+    formatted_form_for(record, options, &proc)
   end
   
   # Injects some content somewhere inside cms admin area

data/test/functional/cms_admin/files_controller_test.rb

@@ -69,7 +69,7 @@ class CmsAdmin::FilesControllerTest < ActionController::TestCase
       assert_equal 'Test File', file.label
       assert_equal 'Test Description', file.description
       assert_redirected_to :action => :edit, :id => file
-      assert_equal 'Files uploaded', flash[:notice]
+      assert_equal 'Files uploaded', flash[:success]
     end
   end
   
@@ -106,7 +106,7 @@ class CmsAdmin::FilesControllerTest < ActionController::TestCase
       assert_equal 'Test Description', file_b.description
       
       assert_redirected_to :action => :edit, :id => file_b
-      assert_equal 'Files uploaded', flash[:notice]
+      assert_equal 'Files uploaded', flash[:success]
     end
   end
   
@@ -133,7 +133,7 @@ class CmsAdmin::FilesControllerTest < ActionController::TestCase
     }
     assert_response :redirect
     assert_redirected_to :action => :edit, :site_id => file.site, :id => file
-    assert_equal 'File updated', flash[:notice]
+    assert_equal 'File updated', flash[:success]
     file.reload
     assert_equal 'New File', file.label
     assert_equal 'New Description', file.description
@@ -156,7 +156,7 @@ class CmsAdmin::FilesControllerTest < ActionController::TestCase
       delete :destroy, :site_id => cms_sites(:default), :id => cms_files(:default)
       assert_response :redirect
       assert_redirected_to :action => :index
-      assert_equal 'File deleted', flash[:notice]
+      assert_equal 'File deleted', flash[:success]
     end
   end
   

data/test/functional/cms_admin/layouts_controller_test.rb

@@ -54,7 +54,7 @@ class CmsAdmin::LayoutsControllerTest < ActionController::TestCase
       layout = Cms::Layout.last
       assert_equal cms_sites(:default), layout.site
       assert_redirected_to :action => :edit, :site_id => layout.site, :id => layout
-      assert_equal 'Layout created', flash[:notice]
+      assert_equal 'Layout created', flash[:success]
     end
   end
   
@@ -75,7 +75,7 @@ class CmsAdmin::LayoutsControllerTest < ActionController::TestCase
     }
     assert_response :redirect
     assert_redirected_to :action => :edit, :site_id => layout.site, :id => layout
-    assert_equal 'Layout updated', flash[:notice]
+    assert_equal 'Layout updated', flash[:success]
     layout.reload
     assert_equal 'New Label', layout.label
     assert_equal 'New {{cms:page:content}}', layout.content
@@ -98,7 +98,7 @@ class CmsAdmin::LayoutsControllerTest < ActionController::TestCase
       delete :destroy, :site_id => cms_sites(:default), :id => cms_layouts(:default)
       assert_response :redirect
       assert_redirected_to :action => :index
-      assert_equal 'Layout deleted', flash[:notice]
+      assert_equal 'Layout deleted', flash[:success]
     end
   end
   

data/test/functional/cms_admin/pages_controller_test.rb

@@ -50,7 +50,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
     cms_layouts(:default).update_column(:content, '{{cms:field:test_label:datetime}}')
     get :new, :site_id => cms_sites(:default)
     assert_response :success
-    assert_select "input[type='text'][name='page[blocks_attributes][0][content]'][class='datetime']"
+    assert_select "input[type='text'][name='page[blocks_attributes][0][content]'][data-datetime]"
     assert_select "input[type='hidden'][name='page[blocks_attributes][0][identifier]'][value='test_label']"
   end
 
@@ -74,7 +74,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
     cms_layouts(:default).update_column(:content, '{{cms:field:test_label:text}}')
     get :new, :site_id => cms_sites(:default)
     assert_response :success
-    assert_select "textarea[name='page[blocks_attributes][0][content]'][class='code']"
+    assert_select "textarea[name='page[blocks_attributes][0][content]'][data-cm-mode='text/html']"
     assert_select "input[type='hidden'][name='page[blocks_attributes][0][identifier]'][value='test_label']"
   end
   
@@ -82,7 +82,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
     cms_layouts(:default).update_column(:content, '{{cms:field:test_label:rich_text}}')
     get :new, :site_id => cms_sites(:default)
     assert_response :success
-    assert_select "textarea[name='page[blocks_attributes][0][content]'][class='rich_text']"
+    assert_select "textarea[name='page[blocks_attributes][0][content]'][data-rich-text]"
     assert_select "input[type='hidden'][name='page[blocks_attributes][0][identifier]'][value='test_label']"
   end
 
@@ -90,7 +90,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
     cms_layouts(:default).update_column(:content, '{{cms:page:test_label:datetime}}')
     get :new, :site_id => cms_sites(:default)
     assert_response :success
-    assert_select "input[type='text'][name='page[blocks_attributes][0][content]'][class='datetime']"
+    assert_select "input[type='text'][name='page[blocks_attributes][0][content]'][data-datetime]"
     assert_select "input[type='hidden'][name='page[blocks_attributes][0][identifier]'][value='test_label']"
   end
 
@@ -114,7 +114,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
     cms_layouts(:default).update_column(:content, '{{cms:page:test_label}}')
     get :new, :site_id => cms_sites(:default)
     assert_response :success
-    assert_select "textarea[name='page[blocks_attributes][0][content]'][class='code']"
+    assert_select "textarea[name='page[blocks_attributes][0][content]'][data-cm-mode=text/html]"
     assert_select "input[type='hidden'][name='page[blocks_attributes][0][identifier]'][value='test_label']"
   end
   
@@ -150,7 +150,15 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
     cms_layouts(:default).update_column(:content, '{{cms:page:test_label:rich_text}}')
     get :new, :site_id => cms_sites(:default)
     assert_response :success
-    assert_select "textarea[name='page[blocks_attributes][0][content]'][class='rich_text']"
+    assert_select "textarea[name='page[blocks_attributes][0][content]'][data-rich-text]"
+    assert_select "input[type='hidden'][name='page[blocks_attributes][0][identifier]'][value='test_label']"
+  end
+  
+  def test_get_new_with_page_markdown
+    cms_layouts(:default).update_column(:content, '{{cms:page:test_label:markdown}}')
+    get :new, :site_id => cms_sites(:default)
+    assert_response :success
+    assert_select "textarea[name='page[blocks_attributes][0][content]'][data-cm-mode=text/x-markdown]"
     assert_select "input[type='hidden'][name='page[blocks_attributes][0][identifier]'][value='test_label']"
   end
   
@@ -174,9 +182,9 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
     cms_layouts(:default).update_column(:content, '{{cms:page:test_label}}{{cms:page:test_label}}')
     get :new, :site_id => cms_sites(:default)
     assert_response :success
-    assert_select "textarea[name='page[blocks_attributes][0][content]'][class='code']"
+    assert_select "textarea[name='page[blocks_attributes][0][content]']"
     assert_select "input[type='hidden'][name='page[blocks_attributes][0][identifier]'][value='test_label']"
-    assert_select "textarea[name='page[blocks_attributes][1][content]'][class='code']", 0
+    assert_select "textarea[name='page[blocks_attributes][1][content]']", 0
     assert_select "input[type='hidden'][name='page[blocks_attributes][1][identifier]'][value='test_label']", 0
   end
   
@@ -240,7 +248,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
         page = Cms::Page.last
         assert_equal cms_sites(:default), page.site
         assert_redirected_to :action => :edit, :id => page
-        assert_equal 'Page created', flash[:notice]
+        assert_equal 'Page created', flash[:success]
       end
     end
   end
@@ -274,7 +282,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
       page.reload
       assert_response :redirect
       assert_redirected_to :action => :edit, :id => page
-      assert_equal 'Page updated', flash[:notice]
+      assert_equal 'Page updated', flash[:success]
       assert_equal 'Updated Label', page.label
     end
   end
@@ -295,7 +303,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
       page.reload
       assert_response :redirect
       assert_redirected_to :action => :edit, :id => page
-      assert_equal 'Page updated', flash[:notice]
+      assert_equal 'Page updated', flash[:success]
       assert_equal 'Updated Label', page.label
       assert_equal ['content', 'default_field_text', 'default_page_text', 'header'], page.blocks.collect{|b| b.identifier}
     end
@@ -317,7 +325,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
         delete :destroy, :site_id => cms_sites(:default), :id => cms_pages(:default)
         assert_response :redirect
         assert_redirected_to :action => :index
-        assert_equal 'Page deleted', flash[:notice]
+        assert_equal 'Page deleted', flash[:success]
       end
     end
   end

data/test/functional/cms_admin/revisions_controller_test.rb

@@ -95,7 +95,7 @@ class CmsAdmin::RevisionsControllerTest < ActionController::TestCase
       put :revert, :site_id => cms_sites(:default), :layout_id => layout, :id => cms_revisions(:layout)
       assert_response :redirect
       assert_redirected_to edit_cms_admin_site_layout_path(layout.site, layout)
-      assert_equal 'Content Reverted', flash[:notice]
+      assert_equal 'Content Reverted', flash[:success]
       
       layout.reload
       assert_equal 'revision {{cms:page:default_page_text}}', layout.content
@@ -111,7 +111,7 @@ class CmsAdmin::RevisionsControllerTest < ActionController::TestCase
       put :revert, :site_id => cms_sites(:default), :page_id => page, :id => cms_revisions(:page)
       assert_response :redirect
       assert_redirected_to edit_cms_admin_site_page_path(page.site, page)
-      assert_equal 'Content Reverted', flash[:notice]
+      assert_equal 'Content Reverted', flash[:success]
       
       page.reload
       assert_equal [
@@ -128,7 +128,7 @@ class CmsAdmin::RevisionsControllerTest < ActionController::TestCase
       put :revert, :site_id => cms_sites(:default), :snippet_id => snippet, :id => cms_revisions(:snippet)
       assert_response :redirect
       assert_redirected_to edit_cms_admin_site_snippet_path(snippet.site, snippet)
-      assert_equal 'Content Reverted', flash[:notice]
+      assert_equal 'Content Reverted', flash[:success]
       
       snippet.reload
       assert_equal 'revision content', snippet.content

data/test/functional/cms_admin/sites_controller_test.rb

@@ -51,7 +51,7 @@ class CmsAdmin::SitesControllerTest < ActionController::TestCase
       assert_response :redirect
       site = Cms::Site.last
       assert_redirected_to cms_admin_site_layouts_path(site)
-      assert_equal 'Site created', flash[:notice]
+      assert_equal 'Site created', flash[:success]
     end
   end
 
@@ -74,7 +74,7 @@ class CmsAdmin::SitesControllerTest < ActionController::TestCase
     }
     assert_response :redirect
     assert_redirected_to :action => :edit, :id => site
-    assert_equal 'Site updated', flash[:notice]
+    assert_equal 'Site updated', flash[:success]
     site.reload
     assert_equal 'New Site', site.label
     assert_equal 'new.site.local', site.hostname
@@ -99,7 +99,7 @@ class CmsAdmin::SitesControllerTest < ActionController::TestCase
       delete :destroy, :id => cms_sites(:default)
       assert_response :redirect
       assert_redirected_to :action => :index
-      assert_equal 'Site deleted', flash[:notice]
+      assert_equal 'Site deleted', flash[:success]
     end
   end
 end

data/test/functional/cms_admin/snippets_controller_test.rb

@@ -71,7 +71,7 @@ class CmsAdmin::SnippetsControllerTest < ActionController::TestCase
       snippet = Cms::Snippet.last
       assert_equal cms_sites(:default), snippet.site
       assert_redirected_to :action => :edit, :id => snippet
-      assert_equal 'Snippet created', flash[:notice]
+      assert_equal 'Snippet created', flash[:success]
     end
   end
 
@@ -92,7 +92,7 @@ class CmsAdmin::SnippetsControllerTest < ActionController::TestCase
     }
     assert_response :redirect
     assert_redirected_to :action => :edit, :site_id => snippet.site, :id => snippet
-    assert_equal 'Snippet updated', flash[:notice]
+    assert_equal 'Snippet updated', flash[:success]
     snippet.reload
     assert_equal 'New-Snippet', snippet.label
     assert_equal 'New Content', snippet.content
@@ -115,7 +115,7 @@ class CmsAdmin::SnippetsControllerTest < ActionController::TestCase
       delete :destroy, :site_id => cms_sites(:default), :id => cms_snippets(:default)
       assert_response :redirect
       assert_redirected_to :action => :index
-      assert_equal 'Snippet deleted', flash[:notice]
+      assert_equal 'Snippet deleted', flash[:success]
     end
   end
   

data/test/functional/cms_content_controller_test.rb

@@ -27,7 +27,7 @@ class CmsContentControllerTest < ActionController::TestCase
     get :render_html, :cms_path => ''
     assert_response :success
     assert assigns(:cms_page)
-    assert_select "body[class='c_cms_content a_render_html']"
+    assert_select "body[class='c-cms-content a-render-html']"
   end
   
   def test_render_page_with_xhr

data/test/gemfiles/Gemfile.rails.3.1

@@ -1,10 +1,16 @@
 source 'http://rubygems.org'
 
-gem 'rails',          '3.1.7'
-gem 'active_link_to', '1.0.0'
-gem 'paperclip',      '>= 2.3.0'
+gem 'rails',          '~> 3.1.0'
+gem 'formatted_form', '>= 2.1.0'
+gem 'active_link_to', '>= 1.0.0'
+gem 'paperclip',      '>= 3.4.0'
+gem 'redcarpet',      '>= 2.2.0'
+gem 'jquery-rails',   '>= 2.2.0'
+gem 'haml-rails',     '>= 0.3.0'
+gem 'sass-rails',     '>= 3.1.0'
+gem 'coffee-rails',   '>= 3.1.0'
 
 group :test do
   gem 'sqlite3'
   gem 'jeweler'
-end
+end

data/test/gemfiles/Gemfile.rails.3.2

@@ -1,10 +1,16 @@
 source 'http://rubygems.org'
 
-gem 'rails',          '3.2.7'
-gem 'active_link_to', '1.0.0'
-gem 'paperclip',      '>= 2.3.0'
+gem 'rails',          '~> 3.2.0'
+gem 'formatted_form', '>= 2.1.0'
+gem 'active_link_to', '>= 1.0.0'
+gem 'paperclip',      '>= 3.4.0'
+gem 'redcarpet',      '>= 2.2.0'
+gem 'jquery-rails',   '>= 2.2.0'
+gem 'haml-rails',     '>= 0.3.0'
+gem 'sass-rails',     '>= 3.1.0'
+gem 'coffee-rails',   '>= 3.1.0'
 
 group :test do
   gem 'sqlite3'
   gem 'jeweler'
-end
+end

data/test/gemfiles/Gemfile.rails.4.0

@@ -0,0 +1,16 @@
+source 'http://rubygems.org'
+
+gem 'rails',          '~> 4.0.0.beta1'
+gem 'formatted_form', '>= 2.1.0'
+gem 'active_link_to', '>= 1.0.0'
+gem 'paperclip',      '>= 3.4.0'
+gem 'redcarpet',      '>= 2.2.0'
+gem 'jquery-rails',   '>= 2.2.0'
+gem 'haml-rails',     '>= 0.3.0'
+gem 'sass-rails',     '~> 4.0.0.beta1'
+gem 'coffee-rails',   '~> 4.0.0.beta1'
+
+group :test do
+  gem 'sqlite3'
+  gem 'jeweler'
+end

data/test/test_helper.rb

@@ -36,7 +36,7 @@ class ActiveSupport::TestCase
         'ja'    => '日本語'
       }
       config.admin_locale         = nil
-      config.upload_file_options  = { :url => '/system/:class/:id/:attachment/:style/:filename' }
+      config.upload_file_options  = { }
       config.admin_cache_sweeper  = nil
       config.allow_irb            = false
       config.allowed_helpers      = nil
@@ -86,21 +86,6 @@ class ActiveSupport::TestCase
     string.gsub(/^[ ]+/, '')
   end
 
-  # Example usage:
-  #   with_translations(:en, :sections => { :products => "Our Products" }) do
-  #     assert_equal I18n.translate('products', :scope => 'sections'), "Our Products"
-  #     assert_equal I18n.translate('sections'), { :products => "Our Products" }
-  #   end
-  def with_translations(locale, translations, &block)
-    begin
-      I18n.backend.store_translations locale, translations
-      I18n.locale = locale
-      yield
-    ensure
-      I18n.reload!
-    end
-  end
-
 end
 
 class ActionController::TestCase

data/test/unit/configuration_test.rb

@@ -25,9 +25,7 @@ class ConfigurationTest < ActiveSupport::TestCase
     }), config.locales
     assert_equal nil, config.admin_locale
     assert_equal nil, config.database_config
-    assert_equal ({
-      :url => '/system/:class/:id/:attachment/:style/:filename'
-    }), config.upload_file_options
+    assert_equal ({}), config.upload_file_options
     assert_equal nil, config.admin_cache_sweeper
     assert_equal false, config.allow_irb
     assert_equal nil, config.allowed_helpers

data/test/unit/models/page_test.rb

@@ -55,24 +55,6 @@ 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
@@ -215,7 +197,7 @@ class CmsPageTest < ActiveSupport::TestCase
     assert_equal page.read_attribute(:content), page.content
     assert_equal page.read_attribute(:content), page.content(true)
     
-    page.update_attributes(:content => 'changed')
+    page.update_attributes({:content => 'changed'}, :without_protection => true)
     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)

data/test/unit/models/site_test.rb

@@ -49,7 +49,7 @@ class CmsSiteTest < ActiveSupport::TestCase
   def test_identifier_assignment
     site = Cms::Site.new(:hostname => 'my-site.host')
     assert site.valid?
-    assert_equal 'my_site_host', site.identifier
+    assert_equal 'my-site-host', site.identifier
   end
   
   def test_hostname_assignment
@@ -123,15 +123,11 @@ class CmsSiteTest < ActiveSupport::TestCase
     assert_equal nil,     Cms::Site.find_site('test2.host')
     assert_equal nil,     Cms::Site.find_site('test2.host', '/some/path')
     assert_equal site_b,  Cms::Site.find_site('test2.host', '/en')
-    assert_equal site_b,  Cms::Site.find_site('test2.host', '/en?a=b')
     assert_equal site_b,  Cms::Site.find_site('test2.host', '/en/some/path')
-    assert_equal site_b,  Cms::Site.find_site('test2.host', '/en/some/path?a=b')
     assert_equal nil,     Cms::Site.find_site('test2.host', '/english/some/path')
     
     assert_equal site_c,  Cms::Site.find_site('test2.host', '/fr')
-    assert_equal site_c,  Cms::Site.find_site('test2.host', '/fr?a=b')
     assert_equal site_c,  Cms::Site.find_site('test2.host', '/fr/some/path')
-    assert_equal site_c,  Cms::Site.find_site('test2.host', '/fr/some/path?a=b')
   end
   
   def test_find_site_with_site_alias