comfortable_mexican_sofa 1.6.14 → 1.6.15

data/README.md

@@ -5,7 +5,7 @@ ComfortableMexicanSofa is a powerful CMS Engine for your Rails 3 applications.
 
 Features
 --------
-* Simple integration with Rails 3.0 and 3.1 apps
+* Simple integration with Rails 3 apps (with or without assets pipeline)
 * Build your application in Rails, not in CMS
 * Powerful page templating capability using [Tags](https://github.com/comfy/comfortable-mexican-sofa/wiki/Tags)
 * [Multiple Sites](https://github.com/comfy/comfortable-mexican-sofa/wiki/Sites) from a single installation

data/VERSION

@@ -1 +1 @@
-1.6.14
+1.6.15

data/app/assets/stylesheets/comfortable_mexican_sofa/content.css

@@ -122,29 +122,35 @@
 #cms_body ul.list li .item .toggle.open a {
   background-image: url(/assets/comfortable_mexican_sofa/arrow_bottom.gif);
 }
-#cms_body ul.list li .item .icon {
+#cms_body ul.list li .item .icon,
+#cms_body table.formatted td .icon {
   float: left;
   width: 28px;
   height: 28px;
   background: url(/assets/comfortable_mexican_sofa/icon_regular.gif);
 }
-#cms_body ul.list li .item .icon.draft {
+#cms_body ul.list li .item .icon.draft,
+#cms_body table.formatted td .icon.draft {
   background: url(/assets/comfortable_mexican_sofa/icon_draft.gif);
 }
-#cms_body ul.list li .item .icon .dragger {
+#cms_body ul.list li .item .icon .dragger,
+#cms_body table.formatted td .icon .dragger {
   width: 28px;
   height: 28px;
   background: url(/assets/comfortable_mexican_sofa/icon_move.gif);
   cursor: move;
   display: none;
 }
-#cms_body ul.list li .item .icon:hover .dragger {
+#cms_body ul.list li .item .icon:hover .dragger,
+#cms_body table.formatted td .icon:hover .dragger {
   display: block;
 }
-#cms_body ul.list li .item .icon .dragger span {
+#cms_body ul.list li .item .icon .dragger span,
+#cms_body table.formatted td .icon .dragger span {
   display: none;
 }
-#cms_body ul.list li .item .label {
+#cms_body ul.list li .item .label,
+#cms_body table.formatted td .label {
   margin-left: 32px;
   font-size: 14px;
   font-weight: bold;
@@ -158,7 +164,8 @@
   text-transform: uppercase;
   color: #888;
 }
-#cms_body ul.list li .item .label .sublabel {
+#cms_body ul.list li .item .label .sublabel,
+#cms_body table.formatted td .label .sublabel {
   font-size: 10px;
   font-weight: normal;
 }
@@ -197,6 +204,12 @@
 #cms_body table.formatted tr:hover td {
   background-color: #fff
 }
+#cms_body table.formatted tr td.action_links a {
+  opacity: 0.2;
+}
+#cms_body table.formatted tr:hover td.action_links a {
+  opacity: 1;
+}
 
 /* -- Missing Translations ---------------------------------------------- */
 #cms_body .translation_missing {

data/app/controllers/cms_content_controller.rb

@@ -54,7 +54,7 @@ protected
       I18n.locale = @cms_site.locale
     else
       I18n.locale = I18n.default_locale
-      render :text => I18n.t('cms.content.site_not_found'), :status => 404
+      raise ActionController::RoutingError.new('Site Not Found')
     end
   end
   
@@ -66,7 +66,7 @@ protected
     if @cms_page = @cms_site.pages.published.find_by_full_path('/404')
       render_html(404)
     else
-      render :text => I18n.t('cms.content.page_not_found'), :status => 404
+      raise ActionController::RoutingError.new('Page Not Found')
     end
   end
 

data/app/models/cms/category.rb

@@ -14,7 +14,7 @@ class Cms::Category < ActiveRecord::Base
     :presence   => true
   validates :label,
     :presence   => true,
-    :uniqueness => { :scope => :categorized_type }
+    :uniqueness => { :scope => [:categorized_type, :site_id] }
   validates :categorized_type,
     :presence   => true
     
@@ -24,4 +24,4 @@ class Cms::Category < ActiveRecord::Base
     where(:categorized_type => type)
   }
   
-end
+end

data/app/models/cms/layout.rb

@@ -49,7 +49,7 @@ class Cms::Layout < ActiveRecord::Base
   def self.app_layouts_for_select
     Dir.glob(File.expand_path('app/views/layouts/**/*.html.*', Rails.root)).collect do |filename|
       filename.gsub!("#{File.expand_path('app/views/layouts', Rails.root)}/", '')
-      filename.split('/').last[0...1] == '_' ? nil : filename
+      filename.split('/').last[0...1] == '_' ? nil : filename.split('.').first
     end.compact.sort
   end
   

data/comfortable_mexican_sofa.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "comfortable_mexican_sofa"
-  s.version = "1.6.14"
+  s.version = "1.6.15"
 
   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 = "2012-02-24"
+  s.date = "2012-03-15"
   s.description = ""
   s.email = "oleg@theworkinggroup.ca"
   s.extra_rdoc_files = [
@@ -176,6 +176,7 @@ Gem::Specification.new do |s|
     "config/initializers/paperclip.rb",
     "config/locales/en.yml",
     "config/locales/es.yml",
+    "config/locales/ja.yml",
     "config/locales/pt-BR.yml",
     "config/locales/zh-CN.yml",
     "config/routes.rb",
@@ -224,6 +225,7 @@ Gem::Specification.new do |s|
     "lib/comfortable_mexican_sofa/tags/collection.rb",
     "lib/comfortable_mexican_sofa/tags/field_datetime.rb",
     "lib/comfortable_mexican_sofa/tags/field_integer.rb",
+    "lib/comfortable_mexican_sofa/tags/field_rich_text.rb",
     "lib/comfortable_mexican_sofa/tags/field_string.rb",
     "lib/comfortable_mexican_sofa/tags/field_text.rb",
     "lib/comfortable_mexican_sofa/tags/file.rb",
@@ -302,6 +304,7 @@ Gem::Specification.new do |s|
     "test/unit/tags/collection_test.rb",
     "test/unit/tags/field_datetime_test.rb",
     "test/unit/tags/field_integer_test.rb",
+    "test/unit/tags/field_rich_text_test.rb",
     "test/unit/tags/field_string_test.rb",
     "test/unit/tags/field_text_test.rb",
     "test/unit/tags/file_test.rb",

data/config/initializers/paperclip.rb

@@ -1,3 +1,3 @@
-Paperclip.options[:command_path] = case Rails.env
+defined?(Paperclip) && Paperclip.options[:command_path] = case Rails.env
   when 'development', 'test' then '/usr/local/bin'
 end

data/config/locales/es.yml

@@ -221,4 +221,4 @@ es:
       image:
         insert: Insertar Imagen
       link:
-        create: Create Link
+        create: Crear Link

data/config/locales/ja.yml

@@ -0,0 +1,225 @@
+# encoding: utf-8
+ja:
+  # -- Models ---------------------------------------------------------------
+  attributes:
+    label: ラベル
+    slug: スラッグ
+    parent_id: 親
+    content: コンテンツ
+  activerecord:
+    models:
+      cms/site: サイト
+      cms/layout: レイアウト
+      cms/page: ページ
+      cms/snippet: スニペット
+    attributes:
+      cms/site:
+        hostname: ホスト名
+        path: パス
+        locale: 言語
+        is_mirrored: ミラーリング済み
+      cms/layout:
+        label: レイアウト名
+        app_layout: アプリケーションレイアウト
+        parent_id: 親レイアウト
+        css: スタイルシート
+        js: Javascript
+      cms/page:
+        label: ラベル
+        layout_id: レイアウト
+        slug: スラッグ
+        target_page_id: ページにリダイレクト
+        is_published: パブリッシュ済み
+        
+  # -- Controllers ----------------------------------------------------------
+  cms:
+    base:
+      site_not_found: サイトが見つかりません
+      fixtures_enabled: CMS フィクスチャが有効です。 ここでの変更はすべて破棄されます。
+      
+    sites:
+      created: サイトが作成されました
+      creation_failure: サイトの作成に失敗しました
+      updated: サイトが更新されました
+      update_failure: サイトの更新に失敗しました
+      deleted: サイトが削除されました
+      not_found: サイトが見つかりません
+      
+    layouts:
+      created: レイアウトが作成されました
+      creation_failure: レイアウトの作成に失敗しました
+      updated: レイアウトが更新されました
+      update_failure: レイアウトの更新に失敗しました
+      deleted: レイアウトが削除されました
+      not_found: レイアウトが見つかりません
+      
+    pages:
+      created: ページが作成されました
+      creation_failure: ページの作成に失敗しました
+      updated: ページが更新されました
+      update_failure: ページの更新に失敗しました
+      deleted: ページが削除されました
+      not_found: ページが見つかりません
+      layout_not_found: レイアウトが見つかりません。 レイアウトを作成してください。
+      
+    snippets:
+      created: スニペットが作成されました
+      creation_failure: スニペットの作成に失敗しました
+      updated: スニペットが更新されました
+      update_failure: スニペットの更新に失敗しました
+      deleted: スニペットが削除されました
+      not_found: スニペットが見つかりません
+      
+    revisions:
+      reverted: コンテンツが元に戻りました
+      record_not_found: レコードが見つかりません
+      not_found: リビジョンが見つかりません
+      
+    files:
+      created: ファイルがアップロードされました
+      creation_failure: ファイルのアップロードに失敗しました
+      updated: ファイルが更新されました
+      update_failure: ファイルの更新に失敗しました
+      deleted: ファイルが削除されました
+      not_found: ファイルが見つかりません
+      
+    content:
+      site_not_found: サイトが見つかりません
+      layout_not_found: レイアウトが見つかりません
+      page_not_found: ページが見つかりません
+  
+  # -- Views ----------------------------------------------------------------
+  cms_admin:
+    base:
+      sites: サイト
+      layouts: レイアウト
+      pages: ページ
+      snippets: スニペット
+      files: ファイル
+      
+    sites:
+      index:
+        title: サイト
+        new_link: 新規サイトを作成
+        select: サイトを選択
+        edit: 編集
+        delete: 削除
+        are_you_sure: このサイトを削除してもよろしいですか？
+      new:
+        title: 新規サイト
+      edit:
+        title: サイトを編集
+      form:
+        create: サイトを作成
+        update: サイトを更新
+        
+    layouts:
+      index:
+        title: レイアウト
+        new_link: 新規レイアウトを作成
+      index_branch:
+        add_child_layout: 子レイアウトを追加
+        edit: 編集
+        delete: 削除
+        are_you_sure: よろしいですか？
+      new:
+        title: 新規レイアウト
+      edit:
+        title: レイアウトを編集
+        revision: リビジョン
+      form:
+        select_parent_layout: 親レイアウトを選択
+        select_app_layout: アプリケーションレイアウトを選択
+        create: レイアウトを作成
+        update: レイアウトを更新
+      
+    pages:
+      index:
+        title: ページ
+        new_link: 新規ページを作成
+      index_branch:
+        toggle: 切り替え
+        add_child_page: 子ページを追加
+        edit: 編集
+        delete: 削除
+        are_you_sure: よろしいですか？
+      new:
+        title: 新規ページ
+      edit:
+        title: ページを編集
+        revision: リビジョン
+      form:
+        select_target_page: リダイレクトなし
+        preview: プレビュー
+        create: ページを作成
+        update: ページを更新
+      form_blocks:
+        no_tags: |-
+          レイアウトにはコンテンツタグが定義されていません。<br/>
+          コンテンツを編集してページまたはフィールドタグを含めてください。 例:  <code>{{cms:page:content}}</code>
+      
+    snippets:
+      index:
+        title: スニペット
+        new_link: 新規スニペットを作成
+        edit: 編集
+        delete: 削除
+        are_you_sure: よろしいですか？
+      new:
+        title: 新規スニペット
+      edit:
+        title: スニペットを編集
+        revision: リビジョン
+      form:
+        create: スニペットを作成
+        update: スニペットを更新
+          
+    revisions:
+      show:
+        title: リビジョン
+        revision: リビジョン
+        full_path: フルパス
+        slug: スラッグ
+        update: このリビジョンに更新
+      
+    files:
+      index:
+        title: ファイル
+        new_link: 新規ファイルをアップロード
+        edit: 編集
+        delete: 削除
+        are_you_sure: よろしいですか？
+        button: ファイルをアップロード
+      new:
+        title: 新規ファイル
+      edit:
+        title: ファイルを編集
+      form:
+        current_file: 現在のファイル
+        create: ファイルをアップロード
+        update: ファイルを更新
+      page_form:
+        are_you_sure: よろしいですか？
+      file:
+        are_you_sure: よろしいですか？
+        
+    categories:
+      index:
+        label: カテゴリー
+        edit: 編集
+        done: 完了
+        all: すべて
+        add: 追加
+      show:
+        are_you_sure: よろしいですか？
+      edit:
+        save: 保存
+      form:
+        label: カテゴリー
+        
+    dialogs:
+      image:
+        insert: 画像を挿入
+      link:
+        create: リンクを作成
+      

data/config/routes.rb

@@ -6,7 +6,7 @@ Rails.application.routes.draw do
       resources :pages do
         get  :form_blocks,    :on => :member
         get  :toggle_branch,  :on => :member
-        put :reorder,        :on => :collection
+        put :reorder,         :on => :collection
         resources :revisions, :only => [:index, :show, :revert] do
           put :revert, :on => :member
         end
@@ -15,7 +15,7 @@ Rails.application.routes.draw do
         put :reorder, :on => :collection
       end
       resources :layouts do
-        post :reorder, :on => :collection
+        put :reorder, :on => :collection
         resources :revisions, :only => [:index, :show, :revert] do
           put :revert, :on => :member
         end

data/lib/comfortable_mexican_sofa/configuration.rb

@@ -82,7 +82,8 @@ class ComfortableMexicanSofa::Configuration
       'en'    => 'English',
       'es'    => 'Español',
       'pt-BR' => 'Português Brasileiro',
-      'zh-CN' => '简体中文' 
+      'zh-CN' => '简体中文',
+      'ja'    => '日本語'
     }
     @admin_locale         = nil
     @database_config      = nil

data/lib/comfortable_mexican_sofa/tags/field_rich_text.rb

@@ -0,0 +1,17 @@
+class ComfortableMexicanSofa::Tag::FieldRichText
+  include ComfortableMexicanSofa::Tag
+  
+  def self.regex_tag_signature(identifier = nil)
+    identifier ||= /[\w\-]+/
+    /\{\{\s*cms:field:(#{identifier}):rich_text\s*?\}\}/
+  end
+  
+  def content
+    block.content
+  end
+  
+  def render
+    ''
+  end
+  
+end

data/test/functional/cms_admin/pages_controller_test.rb

@@ -77,6 +77,14 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
     assert_select "textarea[name='page[blocks_attributes][0][content]'][class='code']"
     assert_select "input[type='hidden'][name='page[blocks_attributes][0][identifier]'][value='test_label']"
   end
+  
+  def test_get_new_with_rich_page_text
+    cms_layouts(:default).update_attribute(: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 "input[type='hidden'][name='page[blocks_attributes][0][identifier]'][value='test_label']"
+  end
 
   def test_get_new_with_page_datetime
     cms_layouts(:default).update_attribute(:content, '{{cms:page:test_label:datetime}}')

data/test/functional/cms_content_controller_test.rb

@@ -38,9 +38,9 @@ class CmsContentControllerTest < ActionController::TestCase
   end
   
   def test_render_page_not_found
-    get :render_html, :cms_path => 'doesnotexist'
-    assert_response 404
-    assert_equal 'Page Not Found', response.body
+    assert_exception_raised ActionController::RoutingError, 'Page Not Found' do
+      get :render_html, :cms_path => 'doesnotexist'
+    end
   end
   
   def test_render_page_not_found_with_custom_404
@@ -66,9 +66,9 @@ class CmsContentControllerTest < ActionController::TestCase
   def test_render_page_with_no_site
     Cms::Site.destroy_all
     
-    get :render_html, :cms_path => ''
-    assert_response 404
-    assert_equal 'Site Not Found', response.body
+    assert_exception_raised ActionController::RoutingError, 'Site Not Found' do
+      get :render_html, :cms_path => ''
+    end
   end
   
   def test_render_page_with_no_layout
@@ -90,8 +90,10 @@ class CmsContentControllerTest < ActionController::TestCase
   def test_render_page_unpublished
     page = cms_pages(:default)
     page.update_attribute(:is_published, false)
-    get :render_html, :cms_path => ''
-    assert_response 404
+    
+    assert_exception_raised ActionController::RoutingError, 'Page Not Found' do
+      get :render_html, :cms_path => ''
+    end
   end
   
   def test_render_page_with_irb_disabled

data/test/gemfiles/Gemfile.rails.3.0

@@ -1,8 +1,8 @@
 source 'http://rubygems.org'
 
-gem 'rails',          '~>3.0.11'
-gem 'active_link_to', '~>1.0.0'
-gem 'paperclip',      '~>2.3.0'
+gem 'rails',          '3.0.12'
+gem 'active_link_to', '1.0.0'
+gem 'paperclip',      '>=2.3.0'
 
 group :test do
   gem 'sqlite3'

data/test/gemfiles/Gemfile.rails.3.1

@@ -1,8 +1,8 @@
 source 'http://rubygems.org'
 
-gem 'rails',          '~>3.1.3'
-gem 'active_link_to', '~>1.0.0'
-gem 'paperclip',      '~>2.3.0'
+gem 'rails',          '3.1.4'
+gem 'active_link_to', '1.0.0'
+gem 'paperclip',      '>=2.3.0'
 
 group :test do
   gem 'sqlite3'

data/test/gemfiles/Gemfile.rails.3.2

@@ -1,8 +1,8 @@
 source 'http://rubygems.org'
 
-gem 'rails',          '~>3.2.0'
-gem 'active_link_to', '~>1.0.0'
-gem 'paperclip',      '~>2.3.0'
+gem 'rails',          '3.2.2'
+gem 'active_link_to', '1.0.0'
+gem 'paperclip',      '>=2.3.0'
 
 group :test do
   gem 'sqlite3'

data/test/integration/routing_extensions_test.rb

@@ -11,8 +11,9 @@ class RoutingExtensionsTest < ActionDispatch::IntegrationTest
     ComfortableMexicanSofa.config.admin_route_prefix = 'custom-admin'
     Rails.application.reload_routes!
     
-    http_auth :get, '/cms-admin/sites'
-    assert_response 404
+    assert_exception_raised ActionController::RoutingError, 'Page Not Found' do
+      http_auth :get, '/cms-admin/sites'
+    end
     
     http_auth :get, '/custom-admin/sites'
     assert_response :success
@@ -31,8 +32,9 @@ class RoutingExtensionsTest < ActionDispatch::IntegrationTest
     ComfortableMexicanSofa.config.admin_route_prefix = ''
     Rails.application.reload_routes!
     
-    http_auth :get, '/cms-admin'
-    assert_response 404
+    assert_exception_raised ActionController::RoutingError, 'Page Not Found' do
+      http_auth :get, '/cms-admin'
+    end
   end
   
   def test_get_admin_with_all_routes_disabled

data/test/integration/sites_test.rb

@@ -32,9 +32,14 @@ class SitesTest < ActionDispatch::IntegrationTest
     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')
     
+    [site_a, site_b, site_c].each do |site|
+      layout  = site.layouts.create!(:identifier => 'test')
+      site.pages.create!(:label => 'index', :layout => layout)
+      site.pages.create!(:label => '404', :slug => '404', :layout => layout)
+    end
+    
     %w(/ /path-a /path-a/child /path-c).each do |path|
       get path
-      assert_response 404
       assert assigns(:cms_site), path
       assert_equal site_a, assigns(:cms_site)
       assert_equal path.gsub(/^\//, ''), @controller.params[:cms_path].to_s
@@ -42,7 +47,6 @@ class SitesTest < ActionDispatch::IntegrationTest
     
     %w(/path-b /path-b/child).each do |path|
       get path
-      assert_response 404
       assert assigns(:cms_site), path
       assert_equal site_b, assigns(:cms_site)
       assert_equal path.gsub(/^\/path-b/, '').gsub(/^\//, ''), @controller.params[:cms_path].to_s
@@ -50,7 +54,6 @@ class SitesTest < ActionDispatch::IntegrationTest
     
     %w(/path-c/child /path-c/child/child).each do |path|
       get path
-      assert_response 404
       assert assigns(:cms_site), path
       assert_equal site_c, assigns(:cms_site)
       assert_equal path.gsub(/^\/path-c\/child/, '').gsub(/^\//, ''), @controller.params[:cms_path].to_s

data/test/test_helper.rb

@@ -45,18 +45,12 @@ class ActiveSupport::TestCase
   end
   
   # Example usage:
-  #   assert_has_errors_on( @record, [:field_1, :field_2] )
-  #   assert_has_errors_on( @record, {:field_1 => 'Message1', :field_2 => 'Message 2'} )
-  def assert_has_errors_on(record, fields)
-    fields = [fields].flatten unless fields.is_a?(Hash)
-    fields.each do |field, message|
-      assert record.errors.to_hash.has_key?(field.to_sym), "#{record.class.name} should error on invalid #{field}"
-      if message && record.errors[field].is_a?(Array) && !message.is_a?(Array)
-        assert_not_nil record.errors[field].index(message)
-      elsif message
-        assert_equal message, record.errors[field]
-      end
-    end
+  #   assert_has_errors_on @record, :field_1, :field_2
+  def assert_has_errors_on(record, *fields)
+    unmatched = record.errors.keys - fields.flatten
+    assert unmatched.blank?, "#{record.class} has errors on '#{unmatched.join(', ')}'"
+    unmatched = fields.flatten - record.errors.keys
+    assert unmatched.blank?, "#{record.class} doesn't have errors on '#{unmatched.join(', ')}'"
   end
   
   # Example usage:

data/test/unit/models/categorization_test.rb

@@ -11,7 +11,7 @@ class CmsCategorizationTest < ActiveSupport::TestCase
   def test_validation
     category = Cms::Categorization.new
     assert category.invalid?
-    assert_has_errors_on category, [:categorized_type, :categorized_id]
+    assert_has_errors_on category, :category_id, :categorized_type, :categorized_id
   end
   
   def test_creation

data/test/unit/models/file_test.rb

@@ -12,7 +12,7 @@ class CmsFileTest < ActiveSupport::TestCase
     assert_no_difference 'Cms::File.count' do
       file = Cms::File.create
       assert file.errors.present?
-      assert_has_errors_on file, [:file_file_name]
+      assert_has_errors_on file, :site_id, :file_file_name, :file
     end
   end
   

data/test/unit/models/layout_test.rb

@@ -55,7 +55,7 @@ class CmsLayoutTest < ActiveSupport::TestCase
     FileUtils.touch(File.expand_path('app/views/layouts/_partial.html.erb', Rails.root))
     FileUtils.touch(File.expand_path('app/views/layouts/not_a_layout.erb', Rails.root))
     
-    assert_equal ['cms_admin.html.erb', 'cms_admin/nested.html.erb'], Cms::Layout.app_layouts_for_select
+    assert_equal ['cms_admin', 'cms_admin/nested'], Cms::Layout.app_layouts_for_select
     
     FileUtils.rm(File.expand_path('app/views/layouts/cms_admin/nested.html.erb', Rails.root))
     FileUtils.rm(File.expand_path('app/views/layouts/_partial.html.erb', Rails.root))

data/test/unit/models/page_test.rb

@@ -13,7 +13,7 @@ class CmsPageTest < ActiveSupport::TestCase
     page = Cms::Page.new
     page.save
     assert page.invalid?
-    assert_has_errors_on page, [:layout, :slug, :label]
+    assert_has_errors_on page, :site_id, :layout, :slug, :label
   end
   
   def test_validation_of_parent_presence

data/test/unit/models/snippet_test.rb

@@ -12,7 +12,7 @@ class CmsSnippetTest < ActiveSupport::TestCase
     snippet = Cms::Snippet.new
     snippet.save
     assert snippet.invalid?
-    assert_has_errors_on snippet, [:label, :identifier]
+    assert_has_errors_on snippet, :site_id, :label, :identifier
   end
   
   def test_label_assignment

data/test/unit/tags/field_rich_text_test.rb

@@ -0,0 +1,43 @@
+require File.expand_path('../../test_helper', File.dirname(__FILE__))
+
+class FieldRichTextTagTest < ActiveSupport::TestCase
+  
+  def test_initialize_tag
+    assert tag = ComfortableMexicanSofa::Tag::FieldRichText.initialize_tag(
+      cms_pages(:default), '{{ cms:field:content:rich_text }}'
+    )
+    assert_equal 'content', tag.identifier
+    assert tag = ComfortableMexicanSofa::Tag::FieldRichText.initialize_tag(
+      cms_pages(:default), '{{cms:field:content:rich_text}}'
+    )
+    assert_equal 'content', tag.identifier
+    assert tag = ComfortableMexicanSofa::Tag::FieldRichText.initialize_tag(
+      cms_pages(:default), '{{cms:field:dash-content:rich_text}}'
+    )
+    assert_equal 'dash-content', tag.identifier
+  end
+  
+  def test_initialize_tag_failure
+    [
+      '{{cms:field:content:not_rich_text}}',
+      '{{cms:field:content}}',
+      '{{cms:not_page:content}}',
+      '{not_a_tag}'
+    ].each do |tag_signature|
+      assert_nil ComfortableMexicanSofa::Tag::FieldRichText.initialize_tag(
+        cms_pages(:default), tag_signature
+      )
+    end
+  end
+  
+  def test_content_and_render
+    tag = ComfortableMexicanSofa::Tag::FieldRichText.initialize_tag(
+      cms_pages(:default), '{{cms:field:content:rich_text}}'
+    )
+    assert tag.block.content.blank?
+    tag.block.content = 'test_content'
+    assert_equal 'test_content', tag.content
+    assert_equal '', tag.render
+  end
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version
-  version: 1.6.14
+  version: 1.6.15
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-24 00:00:00.000000000Z
+date: 2012-03-15 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70275681873660 !ruby/object:Gem::Requirement
+  requirement: &70278706716960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70275681873660
+  version_requirements: *70278706716960
 - !ruby/object:Gem::Dependency
   name: active_link_to
-  requirement: &70275681865720 !ruby/object:Gem::Requirement
+  requirement: &70278706693880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70275681865720
+  version_requirements: *70278706693880
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70275681864260 !ruby/object:Gem::Requirement
+  requirement: &70278706687500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +44,7 @@ dependencies:
         version: 2.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70275681864260
+  version_requirements: *70278706687500
 description: ''
 email: oleg@theworkinggroup.ca
 executables: []
@@ -212,6 +212,7 @@ files:
 - config/initializers/paperclip.rb
 - config/locales/en.yml
 - config/locales/es.yml
+- config/locales/ja.yml
 - config/locales/pt-BR.yml
 - config/locales/zh-CN.yml
 - config/routes.rb
@@ -260,6 +261,7 @@ files:
 - lib/comfortable_mexican_sofa/tags/collection.rb
 - lib/comfortable_mexican_sofa/tags/field_datetime.rb
 - lib/comfortable_mexican_sofa/tags/field_integer.rb
+- lib/comfortable_mexican_sofa/tags/field_rich_text.rb
 - lib/comfortable_mexican_sofa/tags/field_string.rb
 - lib/comfortable_mexican_sofa/tags/field_text.rb
 - lib/comfortable_mexican_sofa/tags/file.rb
@@ -338,6 +340,7 @@ files:
 - test/unit/tags/collection_test.rb
 - test/unit/tags/field_datetime_test.rb
 - test/unit/tags/field_integer_test.rb
+- test/unit/tags/field_rich_text_test.rb
 - test/unit/tags/field_string_test.rb
 - test/unit/tags/field_text_test.rb
 - test/unit/tags/file_test.rb
@@ -366,7 +369,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4525357111478288434
+      hash: 4356669167521672038
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: