comfortable_mexican_sofa 1.3.8 → 1.4.0

data/test/functional/cms_admin/pages_controller_test.rb

@@ -15,7 +15,25 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
     assert_response :redirect
     assert_redirected_to :action => :new
   end
-
+  
+  def test_get_index_with_category
+    category = Cms::Category.create!(:label => 'Test Category', :categorized_type => 'Cms::Page')
+    category.categorizations.create!(:categorized => cms_pages(:child))
+    
+    get :index, :site_id => cms_sites(:default), :category => category.label
+    assert_response :success
+    assert assigns(:pages)
+    assert_equal 1, assigns(:pages).count
+    assert assigns(:pages).first.categories.member? category
+  end
+  
+  def test_get_index_with_category_invalid
+    get :index, :site_id => cms_sites(:default), :category => 'invalid'
+    assert_response :success
+    assert assigns(:pages)
+    assert_equal 0, assigns(:pages).count
+  end
+  
   def test_get_new
     site = cms_sites(:default)
     get :new, :site_id => site

data/test/functional/cms_admin/snippets_controller_test.rb

@@ -15,6 +15,24 @@ class CmsAdmin::SnippetsControllerTest < ActionController::TestCase
     assert_response :redirect
     assert_redirected_to :action => :new
   end
+  
+  def test_get_index_with_category
+    category = Cms::Category.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
+    assert_response :success
+    assert assigns(:snippets)
+    assert_equal 1, assigns(:snippets).count
+    assert assigns(:snippets).first.categories.member? category
+  end
+  
+  def test_get_index_with_category_invalid
+    get :index, :site_id => cms_sites(:default), :category => 'invalid'
+    assert_response :success
+    assert assigns(:snippets)
+    assert_equal 0, assigns(:snippets).count
+  end
 
   def test_get_new
     site = cms_sites(:default)

data/test/unit/models/block_test.rb

@@ -1,6 +1,6 @@
 require File.expand_path('../../test_helper', File.dirname(__FILE__))
 
-class BlockTest < ActiveSupport::TestCase
+class CmsBlockTest < ActiveSupport::TestCase
   
   def test_fixtures_validity
     Cms::Block.all.each do |block|

data/test/unit/models/categorization_test.rb

@@ -0,0 +1,76 @@
+require File.expand_path('../../test_helper', File.dirname(__FILE__))
+
+class CmsCategorizationTest < ActiveSupport::TestCase
+  
+  def test_fixtures_validity
+    Cms::Categorization.all.each do |categorization|
+      assert categorization.valid?, categorization.errors.full_messages.to_s
+    end
+  end
+  
+  def test_validation
+    category = Cms::Categorization.new
+    assert category.invalid?
+    assert_has_errors_on category, [:categorized_type, :categorized_id]
+  end
+  
+  def test_creation
+    assert_difference 'Cms::Categorization.count' do
+      categorization = cms_categories(:default).categorizations.create!(
+        :categorized => cms_snippets(:default)
+      )
+    end
+  end
+  
+  def test_categorized_relationship
+    file = cms_files(:default)
+    assert file.respond_to?(:category_ids)
+    assert_equal 1, file.categories.count
+    assert_equal cms_categories(:default), file.categories.first
+    
+    assert cms_snippets(:default).respond_to?(:category_ids)
+    assert_equal 0, cms_snippets(:default).categories.count
+    assert cms_pages(:default).respond_to?(:category_ids)
+    assert_equal 0, cms_pages(:default).categories.count
+  end
+  
+  def test_categorized_destruction
+    file = cms_files(:default)
+    assert_difference ['Cms::File.count', 'Cms::Categorization.count'], -1 do
+      file.destroy
+    end
+  end
+  
+  def test_categorized_syncing
+    snippet = cms_snippets(:default)
+    assert_equal 0, snippet.categories.count
+    
+    snippet.update_attribute(:category_ids, {
+      cms_categories(:default).id => 1,
+      'invalid'                   => 1
+    })
+    snippet.reload
+    assert_equal 1, snippet.categories.count
+    
+    snippet.update_attribute(:category_ids, {
+      cms_categories(:default).id => 0,
+      'invalid'                   => 0
+    })
+    snippet.reload
+    assert_equal 0, snippet.categories.count
+  end
+  
+  def test_scope_for_category
+    category = cms_categories(:default)
+    assert_equal 1, Cms::File.for_category(category.label).count
+    assert_equal 0, Cms::File.for_category('invalid').count
+    assert_equal 1, Cms::File.for_category(category.label, 'invalid').count
+    assert_equal 1, Cms::File.for_category(nil).count
+    
+    new_category = Cms::Category.create!(:label => 'Test Category', :categorized_type => 'Cms::File')
+    new_category.categorizations.create!(:categorized => cms_files(:default))
+    assert_equal 1, Cms::File.for_category(category.label, new_category.label).all.size
+    assert_equal 1, Cms::File.for_category(category.label, new_category.label).count(:distinct => true)
+  end
+  
+end

data/test/unit/models/category_test.rb

@@ -0,0 +1,39 @@
+require File.expand_path('../../test_helper', File.dirname(__FILE__))
+
+class CmsCategoryTest < ActiveSupport::TestCase
+  
+  def test_fixtures_validity
+    Cms::Category.all.each do |category|
+      assert category.valid?, category.errors.full_messages.to_s
+    end
+  end
+  
+  def test_validation
+    category = Cms::Category.new
+    assert category.invalid?
+    assert_has_errors_on category, [:label, :categorized_type]
+  end
+  
+  def test_creation
+    assert_difference 'Cms::Category.count' do
+      Cms::Category.create(
+        :label => 'Test Category',
+        :categorized_type => 'Cms::Snippet'
+      )
+    end
+  end
+  
+  def test_destruction
+    category = cms_categories(:default)
+    assert_equal 1, category.categorizations.count
+    assert_difference ['Cms::Category.count', 'Cms::Categorization.count'], -1 do
+      category.destroy
+    end
+  end
+  
+  def test_scope_of_type
+    assert_equal 1, Cms::Category.of_type('Cms::File').count
+    assert_equal 0, Cms::Category.of_type('Invalid').count
+  end
+  
+end

data/test/unit/models/file_test.rb

@@ -0,0 +1,33 @@
+require File.expand_path('../../test_helper', File.dirname(__FILE__))
+
+class CmsFileTest < ActiveSupport::TestCase
+  
+  def test_fixtures_validity
+    Cms::File.all.each do |file|
+      assert file.valid?, file.errors.full_messages.to_s
+    end
+  end
+  
+  def test_validations
+    assert_no_difference 'Cms::File.count' do
+      file = Cms::File.create
+      assert file.errors.present?
+      assert_has_errors_on file, [:file_file_name]
+    end
+  end
+  
+  def test_create
+    assert_difference 'Cms::File.count' do
+      file = cms_sites(:default).files.create(
+        :file => fixture_file_upload('files/valid_image.jpg')
+      )
+      assert_equal 'Valid Image', file.label
+    end
+  end
+  
+  def test_create_failure
+    assert_no_difference 'Cms::File.count' do
+      cms_sites(:default).files.create(:file => '')
+    end
+  end
+end

data/test/unit/models/site_test.rb

@@ -51,6 +51,15 @@ class CmsSiteTest < ActiveSupport::TestCase
     assert_equal '', site.path
   end
   
+  def test_creation
+    assert_difference 'Cms::Site.count' do
+      Cms::Site.create!(
+        :label    => 'Test Site',
+        :hostname => 'test.test'
+      )
+    end
+  end
+  
   def test_cascading_destroy
     assert_difference 'Cms::Site.count', -1 do
       assert_difference 'Cms::Layout.count', -3 do

data/test/unit/tags/asset_test.rb

@@ -1,6 +1,6 @@
 require File.expand_path('../../test_helper', File.dirname(__FILE__))
 
-class AssetTest < ActiveSupport::TestCase
+class AssetTagTest < ActiveSupport::TestCase
   
   def test_initialize_tag
     assert tag = ComfortableMexicanSofa::Tag::Asset.initialize_tag(

data/test/unit/tags/field_datetime_test.rb

@@ -1,6 +1,6 @@
 require File.expand_path('../../test_helper', File.dirname(__FILE__))
 
-class FieldDateTimeTest < ActiveSupport::TestCase
+class FieldDateTimeTagTest < ActiveSupport::TestCase
   
   def test_initialize_tag
     assert tag = ComfortableMexicanSofa::Tag::FieldDateTime.initialize_tag(

data/test/unit/tags/field_integer_test.rb

@@ -1,6 +1,6 @@
 require File.expand_path('../../test_helper', File.dirname(__FILE__))
 
-class FieldIntegerTest < ActiveSupport::TestCase
+class FieldIntegerTagTest < ActiveSupport::TestCase
   
   def test_initialize_tag
     assert tag = ComfortableMexicanSofa::Tag::FieldInteger.initialize_tag(

data/test/unit/tags/field_string_test.rb

@@ -1,6 +1,6 @@
 require File.expand_path('../../test_helper', File.dirname(__FILE__))
 
-class FieldStringTest < ActiveSupport::TestCase
+class FieldStringTagTest < ActiveSupport::TestCase
   
   def test_initialize_tag
     assert tag = ComfortableMexicanSofa::Tag::FieldString.initialize_tag(

data/test/unit/tags/field_text_test.rb

@@ -1,6 +1,6 @@
 require File.expand_path('../../test_helper', File.dirname(__FILE__))
 
-class FieldTextTest < ActiveSupport::TestCase
+class FieldTextTagTest < ActiveSupport::TestCase
   
   def test_initialize_tag
     assert tag = ComfortableMexicanSofa::Tag::FieldText.initialize_tag(

data/test/unit/tags/file_test.rb

@@ -0,0 +1,67 @@
+require File.expand_path('../../test_helper', File.dirname(__FILE__))
+
+class FileTagTest < ActiveSupport::TestCase
+  
+  def test_initialize_tag
+    assert tag = ComfortableMexicanSofa::Tag::File.initialize_tag(
+      cms_pages(:default), '{{ cms:file:sample.jpg:image:alt text }}'
+    )
+    assert_equal cms_files(:default), tag.file
+    assert_equal 'sample.jpg', tag.label
+    assert_equal ['image', 'alt text'], tag.params
+  end
+  
+  def test_initialize_tag_failure
+    [
+      '{{cms:file}}',
+      '{{cms:not_file:label}}',
+      '{not_a_tag}'
+    ].each do |tag_signature|
+      assert_nil ComfortableMexicanSofa::Tag::File.initialize_tag(
+        cms_pages(:default), tag_signature
+      )
+    end
+  end
+  
+  def test_render_for_invalid
+    tag = ComfortableMexicanSofa::Tag::File.initialize_tag(
+      cms_pages(:default), '{{cms:file:invalid.jpg}}'
+    )
+    assert_nil tag.file
+    assert_equal '', tag.render
+  end
+  
+  def test_render
+    file = cms_files(:default)
+    assert tag = ComfortableMexicanSofa::Tag::File.initialize_tag(
+      cms_pages(:default), '{{ cms:file:sample.jpg }}'
+    )
+    assert_equal file.file.url, tag.render
+  end
+  
+  def test_render_for_link
+    file = cms_files(:default)
+    assert tag = ComfortableMexicanSofa::Tag::File.initialize_tag(
+      cms_pages(:default), '{{ cms:file:sample.jpg:link }}'
+    )
+    assert_equal "<a href='#{file.file.url}' target='_blank'>sample.jpg</a>", tag.render
+    
+    assert tag = ComfortableMexicanSofa::Tag::File.initialize_tag(
+      cms_pages(:default), '{{ cms:file:sample.jpg:link:link text }}'
+    )
+    assert_equal "<a href='#{file.file.url}' target='_blank'>link text</a>", tag.render
+  end
+  
+  def test_render_for_image
+    file = cms_files(:default)
+    assert tag = ComfortableMexicanSofa::Tag::File.initialize_tag(
+      cms_pages(:default), '{{ cms:file:sample.jpg:image }}'
+    )
+    assert_equal "<img src='#{file.file.url}' alt='sample.jpg' />", tag.render
+    
+    assert tag = ComfortableMexicanSofa::Tag::File.initialize_tag(
+      cms_pages(:default), '{{ cms:file:sample.jpg:image:alt text }}'
+    )
+    assert_equal "<img src='#{file.file.url}' alt='alt text' />", tag.render
+  end
+end

data/test/unit/tags/helper_test.rb

@@ -1,6 +1,6 @@
 require File.expand_path('../../test_helper', File.dirname(__FILE__))
 
-class HelperTest < ActiveSupport::TestCase
+class HelperTagTest < ActiveSupport::TestCase
   
   def test_initialize_tag
     assert tag = ComfortableMexicanSofa::Tag::Helper.initialize_tag(

data/test/unit/tags/page_datetime_test.rb

@@ -1,6 +1,6 @@
 require File.expand_path('../../test_helper', File.dirname(__FILE__))
 
-class PageDateTimeTest < ActiveSupport::TestCase
+class PageDateTimeTagTest < ActiveSupport::TestCase
   
   def test_initialize_tag
     assert tag = ComfortableMexicanSofa::Tag::PageDateTime.initialize_tag(

data/test/unit/tags/page_integer_test.rb

@@ -1,6 +1,6 @@
 require File.expand_path('../../test_helper', File.dirname(__FILE__))
 
-class PageIntegerTest < ActiveSupport::TestCase
+class PageIntegerTagTest < ActiveSupport::TestCase
   
   def test_initialize_tag
     assert tag = ComfortableMexicanSofa::Tag::PageInteger.initialize_tag(

data/test/unit/tags/page_rich_text.rb

@@ -1,6 +1,6 @@
 require File.expand_path('../../test_helper', File.dirname(__FILE__))
 
-class PageRichTextTest < ActiveSupport::TestCase
+class PageRichTextTagTest < ActiveSupport::TestCase
   
   def test_initialize_tag
     assert tag = ComfortableMexicanSofa::Tag::PageRichText.initialize_tag(

data/test/unit/tags/page_string_test.rb

@@ -1,6 +1,6 @@
 require File.expand_path('../../test_helper', File.dirname(__FILE__))
 
-class PageStringTest < ActiveSupport::TestCase
+class PageStringTagTest < ActiveSupport::TestCase
   
   def test_initialize_tag
     assert tag = ComfortableMexicanSofa::Tag::PageString.initialize_tag(

data/test/unit/tags/page_text_test.rb

@@ -1,6 +1,6 @@
 require File.expand_path('../../test_helper', File.dirname(__FILE__))
 
-class PageTextTest < ActiveSupport::TestCase
+class PageTextTagTest < ActiveSupport::TestCase
   
   def test_initialize_tag
     assert tag = ComfortableMexicanSofa::Tag::PageText.initialize_tag(

data/test/unit/tags/partial_test.rb

@@ -1,6 +1,6 @@
 require File.expand_path('../../test_helper', File.dirname(__FILE__))
 
-class PartialTest < ActiveSupport::TestCase
+class PartialTagTest < ActiveSupport::TestCase
   
   def test_initialize_tag
     assert tag = ComfortableMexicanSofa::Tag::Partial.initialize_tag(

data/test/unit/tags/snippet_test.rb

@@ -1,6 +1,6 @@
 require File.expand_path('../../test_helper', File.dirname(__FILE__))
 
-class SnippetTest < ActiveSupport::TestCase
+class SnippetTagTest < ActiveSupport::TestCase
   
   def test_initialize_tag
     assert tag = ComfortableMexicanSofa::Tag::Snippet.initialize_tag(

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version
-  version: 1.3.8
+  version: 1.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,23 +10,23 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-12 00:00:00.000000000 -04:00
+date: 2011-08-26 00:00:00.000000000 -04:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70228698047440 !ruby/object:Gem::Requirement
+  requirement: &70178115869400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0.rc6
   type: :runtime
   prerelease: false
-  version_requirements: *70228698047440
+  version_requirements: *70178115869400
 - !ruby/object:Gem::Dependency
   name: active_link_to
-  requirement: &70228698046720 !ruby/object:Gem::Requirement
+  requirement: &70178115868920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70228698046720
+  version_requirements: *70178115868920
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70228698045760 !ruby/object:Gem::Requirement
+  requirement: &70178115868440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,7 +45,7 @@ dependencies:
         version: 2.3.14
   type: :runtime
   prerelease: false
-  version_requirements: *70228698045760
+  version_requirements: *70178115868440
 description: ''
 email: oleg@theworkinggroup.ca
 executables: []
@@ -74,6 +74,7 @@ files:
 - app/assets/images/comfortable_mexican_sofa/jquery_ui/ui-bg_glass_75_e6e6e6_1x400.png
 - app/assets/images/comfortable_mexican_sofa/jquery_ui/ui-bg_glass_95_fef1ec_1x400.png
 - app/assets/images/comfortable_mexican_sofa/jquery_ui/ui-bg_highlight-soft_75_cccccc_1x100.png
+- app/assets/images/comfortable_mexican_sofa/jquery_ui/ui-bg_inset-soft_95_fef1ec_1x100.png
 - app/assets/images/comfortable_mexican_sofa/jquery_ui/ui-icons_222222_256x240.png
 - app/assets/images/comfortable_mexican_sofa/jquery_ui/ui-icons_2e83ff_256x240.png
 - app/assets/images/comfortable_mexican_sofa/jquery_ui/ui-icons_454545_256x240.png
@@ -84,8 +85,6 @@ files:
 - app/assets/javascripts/comfortable_mexican_sofa/codemirror/codemirror.js
 - app/assets/javascripts/comfortable_mexican_sofa/jquery.js
 - app/assets/javascripts/comfortable_mexican_sofa/jquery_ui.js
-- app/assets/javascripts/comfortable_mexican_sofa/plupload/plupload.html5.js
-- app/assets/javascripts/comfortable_mexican_sofa/plupload/plupload.js
 - app/assets/javascripts/comfortable_mexican_sofa/rails.js
 - app/assets/javascripts/comfortable_mexican_sofa/wymeditor/iframe/default/lbl-blockquote.png
 - app/assets/javascripts/comfortable_mexican_sofa/wymeditor/iframe/default/lbl-h1.png
@@ -136,20 +135,40 @@ files:
 - app/assets/stylesheets/comfortable_mexican_sofa/widgets.css
 - app/controllers/application_controller.rb
 - app/controllers/cms_admin/base_controller.rb
+- app/controllers/cms_admin/categories_controller.rb
+- app/controllers/cms_admin/files_controller.rb
 - app/controllers/cms_admin/layouts_controller.rb
 - app/controllers/cms_admin/pages_controller.rb
 - app/controllers/cms_admin/revisions_controller.rb
 - app/controllers/cms_admin/sites_controller.rb
 - app/controllers/cms_admin/snippets_controller.rb
-- app/controllers/cms_admin/uploads_controller.rb
 - app/controllers/cms_content_controller.rb
 - app/models/cms/block.rb
+- app/models/cms/categorization.rb
+- app/models/cms/category.rb
+- app/models/cms/file.rb
 - app/models/cms/layout.rb
 - app/models/cms/page.rb
 - app/models/cms/revision.rb
 - app/models/cms/site.rb
 - app/models/cms/snippet.rb
-- app/models/cms/upload.rb
+- app/views/cms_admin/categories/_categories.html.erb
+- app/views/cms_admin/categories/_edit.html.erb
+- app/views/cms_admin/categories/_form.html.erb
+- app/views/cms_admin/categories/_index.html.erb
+- app/views/cms_admin/categories/_show.html.erb
+- app/views/cms_admin/categories/create.js.erb
+- app/views/cms_admin/categories/destroy.js.erb
+- app/views/cms_admin/categories/edit.js.erb
+- app/views/cms_admin/categories/update.js.erb
+- app/views/cms_admin/files/_file.html.erb
+- app/views/cms_admin/files/_form.html.erb
+- app/views/cms_admin/files/_index.html.erb
+- app/views/cms_admin/files/create.js.erb
+- app/views/cms_admin/files/destroy.js.erb
+- app/views/cms_admin/files/edit.html.erb
+- app/views/cms_admin/files/index.html.erb
+- app/views/cms_admin/files/new.html.erb
 - app/views/cms_admin/layouts/_form.html.erb
 - app/views/cms_admin/layouts/_index_branch.html.erb
 - app/views/cms_admin/layouts/edit.html.erb
@@ -173,9 +192,6 @@ files:
 - app/views/cms_admin/snippets/edit.html.erb
 - app/views/cms_admin/snippets/index.html.erb
 - app/views/cms_admin/snippets/new.html.erb
-- app/views/cms_admin/uploads/_file.html.erb
-- app/views/cms_admin/uploads/_index.html.erb
-- app/views/cms_admin/uploads/destroy.js.erb
 - app/views/layouts/cms_admin.html.erb
 - app/views/layouts/cms_admin/_body.html.erb
 - app/views/layouts/cms_admin/_center.html.erb
@@ -215,27 +231,30 @@ files:
 - db/migrate/upgrades/02_upgrade_to_1_1_0.rb
 - db/migrate/upgrades/03_upgrade_to_1_2_0.rb
 - db/migrate/upgrades/04_upgrade_to_1_3_0.rb
+- db/migrate/upgrades/05_upgrade_to_1_4_0.rb
 - db/seeds.rb
 - doc/page_editing.png
 - doc/sofa.png
 - lib/comfortable_mexican_sofa.rb
-- lib/comfortable_mexican_sofa/acts_as_tree.rb
 - lib/comfortable_mexican_sofa/configuration.rb
 - lib/comfortable_mexican_sofa/controller_methods.rb
 - lib/comfortable_mexican_sofa/engine.rb
 - lib/comfortable_mexican_sofa/error.rb
+- lib/comfortable_mexican_sofa/extensions/acts_as_tree.rb
+- lib/comfortable_mexican_sofa/extensions/has_revisions.rb
+- lib/comfortable_mexican_sofa/extensions/is_categorized.rb
+- lib/comfortable_mexican_sofa/extensions/is_mirrored.rb
+- lib/comfortable_mexican_sofa/extensions/rails.rb
 - lib/comfortable_mexican_sofa/fixtures.rb
 - lib/comfortable_mexican_sofa/form_builder.rb
-- lib/comfortable_mexican_sofa/has_revisions.rb
 - lib/comfortable_mexican_sofa/http_auth.rb
-- lib/comfortable_mexican_sofa/is_mirrored.rb
-- lib/comfortable_mexican_sofa/rails_extensions.rb
 - lib/comfortable_mexican_sofa/tag.rb
 - lib/comfortable_mexican_sofa/tags/asset.rb
 - lib/comfortable_mexican_sofa/tags/field_datetime.rb
 - lib/comfortable_mexican_sofa/tags/field_integer.rb
 - lib/comfortable_mexican_sofa/tags/field_string.rb
 - lib/comfortable_mexican_sofa/tags/field_text.rb
+- lib/comfortable_mexican_sofa/tags/file.rb
 - lib/comfortable_mexican_sofa/tags/helper.rb
 - lib/comfortable_mexican_sofa/tags/page_datetime.rb
 - lib/comfortable_mexican_sofa/tags/page_integer.rb
@@ -244,7 +263,6 @@ files:
 - lib/comfortable_mexican_sofa/tags/page_text.rb
 - lib/comfortable_mexican_sofa/tags/partial.rb
 - lib/comfortable_mexican_sofa/tags/snippet.rb
-- lib/comfortable_mexican_sofa/tags/upload.rb
 - lib/comfortable_mexican_sofa/version.rb
 - lib/comfortable_mexican_sofa/view_hooks.rb
 - lib/comfortable_mexican_sofa/view_methods.rb
@@ -253,23 +271,26 @@ files:
 - lib/tasks/comfortable_mexican_sofa.rake
 - script/rails
 - test/fixtures/cms/blocks.yml
+- test/fixtures/cms/categories.yml
+- test/fixtures/cms/categorizations.yml
+- test/fixtures/cms/files.yml
 - test/fixtures/cms/layouts.yml
 - test/fixtures/cms/pages.yml
 - test/fixtures/cms/revisions.yml
 - test/fixtures/cms/sites.yml
 - test/fixtures/cms/snippets.yml
-- test/fixtures/cms/uploads.yml
 - test/fixtures/files/invalid_file.gif
 - test/fixtures/files/valid_image.jpg
 - test/fixtures/views/_nav_hook.html.erb
 - test/fixtures/views/_nav_hook_2.html.erb
 - test/functional/cms_admin/base_controller_test.rb
+- test/functional/cms_admin/categories_controller_test.rb
+- test/functional/cms_admin/files_controller_test.rb
 - test/functional/cms_admin/layouts_controller_test.rb
 - test/functional/cms_admin/pages_controller_test.rb
 - test/functional/cms_admin/revisions_controller_test.rb
 - test/functional/cms_admin/sites_controller_test.rb
 - test/functional/cms_admin/snippets_controller_test.rb
-- test/functional/cms_admin/uploads_controller_test.rb
 - test/functional/cms_content_controller_test.rb
 - test/integration/authentication_test.rb
 - test/integration/fixtures_test.rb
@@ -284,11 +305,13 @@ files:
 - test/unit/form_builder_test.rb
 - test/unit/mirrors_test.rb
 - test/unit/models/block_test.rb
+- test/unit/models/categorization_test.rb
+- test/unit/models/category_test.rb
+- test/unit/models/file_test.rb
 - test/unit/models/layout_test.rb
 - test/unit/models/page_test.rb
 - test/unit/models/site_test.rb
 - test/unit/models/snippet_test.rb
-- test/unit/models/upload_test.rb
 - test/unit/revisions_test.rb
 - test/unit/tag_test.rb
 - test/unit/tags/asset_test.rb
@@ -296,6 +319,7 @@ files:
 - test/unit/tags/field_integer_test.rb
 - test/unit/tags/field_string_test.rb
 - test/unit/tags/field_text_test.rb
+- test/unit/tags/file_test.rb
 - test/unit/tags/helper_test.rb
 - test/unit/tags/page_datetime_test.rb
 - test/unit/tags/page_integer_test.rb
@@ -304,7 +328,6 @@ files:
 - test/unit/tags/page_text_test.rb
 - test/unit/tags/partial_test.rb
 - test/unit/tags/snippet_test.rb
-- test/unit/tags/upload_test.rb
 - test/unit/view_methods_test.rb
 has_rdoc: true
 homepage: http://github.com/twg/comfortable-mexican-sofa
@@ -321,7 +344,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2059952711421247881
+      hash: 2197173272088711680
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: