comfortable_mexican_sofa 1.11.2 → 1.12.0

data/test/models/snippet_test.rb

@@ -3,20 +3,20 @@ require_relative '../test_helper'
 class CmsSnippetTest < ActiveSupport::TestCase
   
   def test_fixtures_validity
-    Cms::Snippet.all.each do |snippet|
+    Comfy::Cms::Snippet.all.each do |snippet|
       assert snippet.valid?, snippet.errors.full_messages.to_s
     end
   end
   
   def test_validations
-    snippet = Cms::Snippet.new
+    snippet = Comfy::Cms::Snippet.new
     snippet.save
     assert snippet.invalid?
     assert_has_errors_on snippet, :site_id, :label, :identifier
   end
   
   def test_label_assignment
-    snippet = cms_sites(:default).snippets.new(
+    snippet = comfy_cms_sites(:default).snippets.new(
       :identifier => 'test'
     )
     assert snippet.valid?
@@ -24,8 +24,8 @@ class CmsSnippetTest < ActiveSupport::TestCase
   end
   
   def test_create
-    assert_difference 'Cms::Snippet.count' do
-      snippet = cms_sites(:default).snippets.create(
+    assert_difference 'Comfy::Cms::Snippet.count' do
+      snippet = comfy_cms_sites(:default).snippets.create(
         :label      => 'Test Snippet',
         :identifier => 'test',
         :content    => 'Test Content'
@@ -38,12 +38,12 @@ class CmsSnippetTest < ActiveSupport::TestCase
   end
   
   def test_update_forces_page_content_reload
-    snippet = cms_snippets(:default)
-    page = cms_pages(:default)
-    assert_match snippet.content, page.content
+    snippet = comfy_cms_snippets(:default)
+    page = comfy_cms_pages(:default)
+    assert_match snippet.content, page.content_cache
     snippet.update_attributes(:content => 'new_snippet_content')
     page.reload
-    assert_match /new_snippet_content/, page.content
+    assert_match /new_snippet_content/, page.content_cache
   end
   
 end

data/test/test_helper.rb

@@ -1,10 +1,11 @@
 # encoding: utf-8
+ENV['RAILS_ENV'] = 'test'
 
 require 'coveralls'
-Coveralls.wear!('rails')
+Coveralls.wear! 'rails'
 
-ENV['RAILS_ENV'] = 'test'
 require_relative '../config/environment'
+
 require 'rails/test_help'
 require 'rails/generators'
 require 'mocha/setup'
@@ -32,11 +33,8 @@ class ActiveSupport::TestCase
       config.fixtures_path        = File.expand_path('db/cms_fixtures', Rails.root)
       config.revisions_limit      = 25
       config.locales              = { 
-        'en'    => 'English',
-        'es'    => 'Español',
-        'pt-BR' => 'Português Brasileiro',
-        'zh-CN' => '简体中文',
-        'ja'    => '日本語'
+        'en' => 'English',
+        'es' => 'Español'
       }
       config.admin_locale         = nil
       config.upload_file_options  = { }
@@ -90,8 +88,8 @@ class ActiveSupport::TestCase
   end
   
   def stub_paperclip
-    Cms::Block.any_instance.stubs(:save_attached_files).returns(true)
-    Cms::Block.any_instance.stubs(:delete_attached_files).returns(true)
+    Comfy::Cms::Block.any_instance.stubs(:save_attached_files).returns(true)
+    Comfy::Cms::Block.any_instance.stubs(:delete_attached_files).returns(true)
     Paperclip::Attachment.any_instance.stubs(:post_process).returns(true)
   end
   

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version
-  version: 1.11.2
+  version: 1.12.0
 platform: ruby
 authors:
 - Oleg Khabarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-03 00:00:00.000000000 Z
+date: 2014-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 4.0.0
 - !ruby/object:Gem::Dependency
-  name: formatted_form
+  name: bootstrap_form
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.1.1
 - !ruby/object:Gem::Dependency
   name: active_link_to
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 4.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 4.0.3
 - !ruby/object:Gem::Dependency
   name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
@@ -192,7 +192,35 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 0.14.0
-description: ComfortableMexicanSofa is a powerful CMS Engine for Rails 4 applications
+- !ruby/object:Gem::Dependency
+  name: tinymce-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+- !ruby/object:Gem::Dependency
+  name: bootstrap-sass
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+description: ComfortableMexicanSofa is a powerful Rails 4 CMS Engine
 email:
 - oleg@khabarov.ca
 executables: []
@@ -201,14 +229,13 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .travis.yml
+- CONTRIBUTING.md
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - app/assets/images/comfortable_mexican_sofa/arrow_bottom.gif
 - app/assets/images/comfortable_mexican_sofa/arrow_right.gif
-- app/assets/images/comfortable_mexican_sofa/bootstrap/glyphicons-halflings-white.png
-- app/assets/images/comfortable_mexican_sofa/bootstrap/glyphicons-halflings.png
 - app/assets/images/comfortable_mexican_sofa/checkerboard.gif
 - app/assets/images/comfortable_mexican_sofa/icon_draft.gif
 - app/assets/images/comfortable_mexican_sofa/icon_file.gif
@@ -220,125 +247,121 @@ files:
 - app/assets/javascripts/comfortable_mexican_sofa/admin/application.js
 - app/assets/javascripts/comfortable_mexican_sofa/application.js.coffee
 - app/assets/javascripts/comfortable_mexican_sofa/lib/bootstrap-datetimepicker.js
-- app/assets/javascripts/comfortable_mexican_sofa/lib/bootstrap-wysihtml5.js
-- app/assets/javascripts/comfortable_mexican_sofa/lib/bootstrap.js
-- app/assets/javascripts/comfortable_mexican_sofa/lib/wysihtml5.js
+- app/assets/javascripts/comfortable_mexican_sofa/lib/diff.js.coffee
+- app/assets/javascripts/comfortable_mexican_sofa/lib/diff/diff_match_patch.min.js
+- app/assets/javascripts/comfortable_mexican_sofa/lib/diff/pretty_text_diff.min.js
 - app/assets/stylesheets/comfortable_mexican_sofa/admin/application.css
 - app/assets/stylesheets/comfortable_mexican_sofa/application.css.sass
 - app/assets/stylesheets/comfortable_mexican_sofa/base.css.sass
 - app/assets/stylesheets/comfortable_mexican_sofa/bootstrap_overrides.css.sass
 - app/assets/stylesheets/comfortable_mexican_sofa/codemirror_overrides.css.sass
 - app/assets/stylesheets/comfortable_mexican_sofa/lib/bootstrap-datetimepicker.css
-- app/assets/stylesheets/comfortable_mexican_sofa/lib/bootstrap-wysihtml5.css
-- app/assets/stylesheets/comfortable_mexican_sofa/lib/bootstrap.css
-- app/assets/stylesheets/comfortable_mexican_sofa/wysihtml5_overrides.css.sass
-- app/controllers/admin/cms/base_controller.rb
-- app/controllers/admin/cms/categories_controller.rb
-- app/controllers/admin/cms/files_controller.rb
-- app/controllers/admin/cms/layouts_controller.rb
-- app/controllers/admin/cms/pages_controller.rb
-- app/controllers/admin/cms/revisions_controller.rb
-- app/controllers/admin/cms/sites_controller.rb
-- app/controllers/admin/cms/snippets_controller.rb
 - app/controllers/application_controller.rb
-- app/controllers/cms/assets_controller.rb
-- app/controllers/cms/base_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/concerns/cms/base.rb
-- app/views/admin/cms/categories/_categories.html.haml
-- app/views/admin/cms/categories/_edit.html.haml
-- app/views/admin/cms/categories/_form.html.haml
-- app/views/admin/cms/categories/_index.html.haml
-- app/views/admin/cms/categories/_show.html.haml
-- app/views/admin/cms/categories/create.js.erb
-- app/views/admin/cms/categories/destroy.js.erb
-- app/views/admin/cms/categories/edit.js.erb
-- app/views/admin/cms/categories/update.js.erb
-- app/views/admin/cms/files/_file.html.haml
-- app/views/admin/cms/files/_form.html.haml
-- app/views/admin/cms/files/_index.html.haml
-- app/views/admin/cms/files/_page_form.html.haml
-- app/views/admin/cms/files/destroy.js.coffee
-- app/views/admin/cms/files/edit.html.haml
-- app/views/admin/cms/files/index.html.haml
-- app/views/admin/cms/files/new.html.haml
-- app/views/admin/cms/layouts/_form.html.haml
-- app/views/admin/cms/layouts/_index_branch.html.haml
-- app/views/admin/cms/layouts/edit.html.haml
-- app/views/admin/cms/layouts/index.html.haml
-- app/views/admin/cms/layouts/new.html.haml
-- app/views/admin/cms/pages/_form.html.haml
-- app/views/admin/cms/pages/_form_blocks.html.haml
-- app/views/admin/cms/pages/_index_branch.html.haml
-- app/views/admin/cms/pages/edit.html.haml
-- app/views/admin/cms/pages/form_blocks.js.erb
-- app/views/admin/cms/pages/index.html.haml
-- app/views/admin/cms/pages/new.html.haml
-- app/views/admin/cms/pages/toggle_branch.js.erb
-- app/views/admin/cms/partials/_body_before.html.haml
-- app/views/admin/cms/partials/_file_form_after.html.haml
-- app/views/admin/cms/partials/_file_form_before.html.haml
-- app/views/admin/cms/partials/_files_after.html.haml
-- app/views/admin/cms/partials/_files_before.html.haml
-- app/views/admin/cms/partials/_html_footer.html.haml
-- app/views/admin/cms/partials/_html_head.html.haml
-- app/views/admin/cms/partials/_layout_form_after.html.haml
-- app/views/admin/cms/partials/_layout_form_before.html.haml
-- app/views/admin/cms/partials/_layouts_after.html.haml
-- app/views/admin/cms/partials/_layouts_before.html.haml
-- app/views/admin/cms/partials/_navigation_after.html.haml
-- app/views/admin/cms/partials/_navigation_before.html.haml
-- app/views/admin/cms/partials/_navigation_inner.html.haml
-- app/views/admin/cms/partials/_page_form_after.html.haml
-- app/views/admin/cms/partials/_page_form_before.html.haml
-- app/views/admin/cms/partials/_page_form_inner.html.haml
-- app/views/admin/cms/partials/_pages_after.html.haml
-- app/views/admin/cms/partials/_pages_before.html.haml
-- app/views/admin/cms/partials/_right_column_after.html.haml
-- app/views/admin/cms/partials/_right_column_before.html.haml
-- app/views/admin/cms/partials/_site_form_after.html.haml
-- app/views/admin/cms/partials/_site_form_before.html.haml
-- app/views/admin/cms/partials/_sites_after.html.haml
-- app/views/admin/cms/partials/_sites_before.html.haml
-- app/views/admin/cms/partials/_snippet_form_after.html.haml
-- app/views/admin/cms/partials/_snippet_form_before.html.haml
-- app/views/admin/cms/partials/_snippets_after.html.haml
-- app/views/admin/cms/partials/_snippets_before.html.haml
-- app/views/admin/cms/revisions/show.html.haml
-- app/views/admin/cms/sites/_form.html.haml
-- app/views/admin/cms/sites/_mirrors.html.haml
-- app/views/admin/cms/sites/edit.html.haml
-- app/views/admin/cms/sites/index.html.haml
-- app/views/admin/cms/sites/new.html.haml
-- app/views/admin/cms/snippets/_form.html.haml
-- app/views/admin/cms/snippets/edit.html.haml
-- app/views/admin/cms/snippets/index.html.haml
-- app/views/admin/cms/snippets/new.html.haml
-- app/views/cms/content/render_sitemap.xml.builder
-- app/views/kaminari/_first_page.html.haml
-- app/views/kaminari/_gap.html.haml
-- app/views/kaminari/_last_page.html.haml
-- app/views/kaminari/_next_page.html.haml
-- app/views/kaminari/_page.html.haml
-- app/views/kaminari/_paginator.html.haml
-- app/views/kaminari/_prev_page.html.haml
-- app/views/layouts/admin/cms.html.haml
-- app/views/layouts/admin/cms/_body.html.haml
-- app/views/layouts/admin/cms/_center.html.haml
-- app/views/layouts/admin/cms/_footer.html.haml
-- app/views/layouts/admin/cms/_footer_js.html.haml
-- app/views/layouts/admin/cms/_head.html.haml
-- app/views/layouts/admin/cms/_left.html.haml
-- app/views/layouts/admin/cms/_right.html.haml
+- app/controllers/comfy/admin/cms/base_controller.rb
+- app/controllers/comfy/admin/cms/categories_controller.rb
+- app/controllers/comfy/admin/cms/files_controller.rb
+- app/controllers/comfy/admin/cms/layouts_controller.rb
+- app/controllers/comfy/admin/cms/pages_controller.rb
+- app/controllers/comfy/admin/cms/revisions_controller.rb
+- app/controllers/comfy/admin/cms/sites_controller.rb
+- app/controllers/comfy/admin/cms/snippets_controller.rb
+- app/controllers/comfy/cms/assets_controller.rb
+- app/controllers/comfy/cms/base_controller.rb
+- app/controllers/comfy/cms/content_controller.rb
+- app/models/comfy/cms/block.rb
+- app/models/comfy/cms/categorization.rb
+- app/models/comfy/cms/category.rb
+- app/models/comfy/cms/file.rb
+- app/models/comfy/cms/layout.rb
+- app/models/comfy/cms/page.rb
+- app/models/comfy/cms/revision.rb
+- app/models/comfy/cms/site.rb
+- app/models/comfy/cms/snippet.rb
+- app/views/comfy/admin/cms/categories/_categories.html.haml
+- app/views/comfy/admin/cms/categories/_edit.html.haml
+- app/views/comfy/admin/cms/categories/_form.html.haml
+- app/views/comfy/admin/cms/categories/_index.html.haml
+- app/views/comfy/admin/cms/categories/_show.html.haml
+- app/views/comfy/admin/cms/categories/create.js.erb
+- app/views/comfy/admin/cms/categories/destroy.js.erb
+- app/views/comfy/admin/cms/categories/edit.js.erb
+- app/views/comfy/admin/cms/categories/update.js.erb
+- app/views/comfy/admin/cms/files/_file.html.haml
+- app/views/comfy/admin/cms/files/_form.html.haml
+- app/views/comfy/admin/cms/files/_index.html.haml
+- app/views/comfy/admin/cms/files/_page_form.html.haml
+- app/views/comfy/admin/cms/files/destroy.js.coffee
+- app/views/comfy/admin/cms/files/edit.html.haml
+- app/views/comfy/admin/cms/files/index.html.haml
+- app/views/comfy/admin/cms/files/new.html.haml
+- app/views/comfy/admin/cms/layouts/_form.html.haml
+- app/views/comfy/admin/cms/layouts/_index_branch.html.haml
+- app/views/comfy/admin/cms/layouts/edit.html.haml
+- app/views/comfy/admin/cms/layouts/index.html.haml
+- app/views/comfy/admin/cms/layouts/new.html.haml
+- app/views/comfy/admin/cms/pages/_form.html.haml
+- app/views/comfy/admin/cms/pages/_form_blocks.html.haml
+- app/views/comfy/admin/cms/pages/_index_branch.html.haml
+- app/views/comfy/admin/cms/pages/edit.html.haml
+- app/views/comfy/admin/cms/pages/form_blocks.js.erb
+- app/views/comfy/admin/cms/pages/index.html.haml
+- app/views/comfy/admin/cms/pages/new.html.haml
+- app/views/comfy/admin/cms/pages/toggle_branch.js.erb
+- app/views/comfy/admin/cms/partials/_body_before.html.haml
+- app/views/comfy/admin/cms/partials/_file_form_after.html.haml
+- app/views/comfy/admin/cms/partials/_file_form_before.html.haml
+- app/views/comfy/admin/cms/partials/_files_after.html.haml
+- app/views/comfy/admin/cms/partials/_files_before.html.haml
+- app/views/comfy/admin/cms/partials/_html_footer.html.haml
+- app/views/comfy/admin/cms/partials/_html_head.html.haml
+- app/views/comfy/admin/cms/partials/_layout_form_after.html.haml
+- app/views/comfy/admin/cms/partials/_layout_form_before.html.haml
+- app/views/comfy/admin/cms/partials/_layouts_after.html.haml
+- app/views/comfy/admin/cms/partials/_layouts_before.html.haml
+- app/views/comfy/admin/cms/partials/_navigation_after.html.haml
+- app/views/comfy/admin/cms/partials/_navigation_before.html.haml
+- app/views/comfy/admin/cms/partials/_navigation_inner.html.haml
+- app/views/comfy/admin/cms/partials/_page_form_after.html.haml
+- app/views/comfy/admin/cms/partials/_page_form_before.html.haml
+- app/views/comfy/admin/cms/partials/_page_form_inner.html.haml
+- app/views/comfy/admin/cms/partials/_pages_after.html.haml
+- app/views/comfy/admin/cms/partials/_pages_before.html.haml
+- app/views/comfy/admin/cms/partials/_right_column_after.html.haml
+- app/views/comfy/admin/cms/partials/_right_column_before.html.haml
+- app/views/comfy/admin/cms/partials/_site_form_after.html.haml
+- app/views/comfy/admin/cms/partials/_site_form_before.html.haml
+- app/views/comfy/admin/cms/partials/_sites_after.html.haml
+- app/views/comfy/admin/cms/partials/_sites_before.html.haml
+- app/views/comfy/admin/cms/partials/_snippet_form_after.html.haml
+- app/views/comfy/admin/cms/partials/_snippet_form_before.html.haml
+- app/views/comfy/admin/cms/partials/_snippets_after.html.haml
+- app/views/comfy/admin/cms/partials/_snippets_before.html.haml
+- app/views/comfy/admin/cms/revisions/show.html.haml
+- app/views/comfy/admin/cms/sites/_form.html.haml
+- app/views/comfy/admin/cms/sites/_mirrors.html.haml
+- app/views/comfy/admin/cms/sites/edit.html.haml
+- app/views/comfy/admin/cms/sites/index.html.haml
+- app/views/comfy/admin/cms/sites/new.html.haml
+- app/views/comfy/admin/cms/snippets/_form.html.haml
+- app/views/comfy/admin/cms/snippets/edit.html.haml
+- app/views/comfy/admin/cms/snippets/index.html.haml
+- app/views/comfy/admin/cms/snippets/new.html.haml
+- app/views/comfy/cms/content/render_sitemap.xml.builder
+- app/views/kaminari/comfy/_first_page.html.haml
+- app/views/kaminari/comfy/_gap.html.haml
+- app/views/kaminari/comfy/_last_page.html.haml
+- app/views/kaminari/comfy/_next_page.html.haml
+- app/views/kaminari/comfy/_page.html.haml
+- app/views/kaminari/comfy/_paginator.html.haml
+- app/views/kaminari/comfy/_prev_page.html.haml
+- app/views/layouts/comfy/admin/cms.html.haml
+- app/views/layouts/comfy/admin/cms/_body.html.haml
+- app/views/layouts/comfy/admin/cms/_center.html.haml
+- app/views/layouts/comfy/admin/cms/_footer.html.haml
+- app/views/layouts/comfy/admin/cms/_footer_js.html.haml
+- app/views/layouts/comfy/admin/cms/_head.html.haml
+- app/views/layouts/comfy/admin/cms/_left.html.haml
+- app/views/layouts/comfy/admin/cms/_right.html.haml
 - comfortable_mexican_sofa.gemspec
 - config.ru
 - config/application.rb
@@ -351,6 +374,7 @@ files:
 - config/initializers/comfortable_mexican_sofa.rb
 - config/initializers/paperclip.rb
 - config/initializers/secret_token.rb
+- config/locales/da.yml
 - config/locales/de.yml
 - config/locales/en.yml
 - config/locales/es.yml
@@ -372,14 +396,15 @@ files:
 - db/cms_fixtures/sample-site/layouts/default/content.html
 - db/cms_fixtures/sample-site/layouts/default/javascript.js
 - db/cms_fixtures/sample-site/layouts/default/nested/attributes.yml
-- db/cms_fixtures/sample-site/layouts/default/nested/content.html
+- db/cms_fixtures/sample-site/layouts/default/nested/content.haml
 - db/cms_fixtures/sample-site/layouts/default/nested/javascript.js
 - db/cms_fixtures/sample-site/layouts/default/nested/stylesheet.css
 - db/cms_fixtures/sample-site/layouts/default/stylesheet.css
 - db/cms_fixtures/sample-site/pages/index/attributes.yml
 - db/cms_fixtures/sample-site/pages/index/child/attributes.yml
-- db/cms_fixtures/sample-site/pages/index/child/left.html
+- db/cms_fixtures/sample-site/pages/index/child/left.haml
 - db/cms_fixtures/sample-site/pages/index/child/right.html
+- db/cms_fixtures/sample-site/pages/index/child/thumbnail.png
 - db/cms_fixtures/sample-site/pages/index/content.html
 - db/cms_fixtures/sample-site/snippets/default/attributes.yml
 - db/cms_fixtures/sample-site/snippets/default/content.html
@@ -391,8 +416,8 @@ files:
 - db/upgrade_migrations/05_upgrade_to_1_4_0.rb
 - db/upgrade_migrations/06_upgrade_to_1_5_0.rb
 - db/upgrade_migrations/07_upgrade_to_1_6_0.rb
+- db/upgrade_migrations/08_upgrade_to_1_12_0.rb
 - doc/preview.png
-- doc/sofa.png
 - lib/comfortable_mexican_sofa.rb
 - lib/comfortable_mexican_sofa/authentication/dummy_auth.rb
 - lib/comfortable_mexican_sofa/authentication/http_auth.rb
@@ -400,6 +425,7 @@ files:
 - 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/cms_manageable.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
@@ -456,25 +482,25 @@ files:
 - lib/generators/comfy/scaffold/templates/views/show.haml
 - lib/tasks/comfortable_mexican_sofa.rake
 - script/rails
-- test/controllers/admin/cms/base_controller_test.rb
-- test/controllers/admin/cms/categories_controller_test.rb
-- test/controllers/admin/cms/files_controller_test.rb
-- test/controllers/admin/cms/layouts_controller_test.rb
-- test/controllers/admin/cms/pages_controller_test.rb
-- test/controllers/admin/cms/revisions_controller_test.rb
-- test/controllers/admin/cms/sites_controller_test.rb
-- test/controllers/admin/cms/snippets_controller_test.rb
-- test/controllers/cms/assets_controller_test.rb
-- test/controllers/cms/content_controller_test.rb
-- 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/controllers/comfy/admin/cms/base_controller_test.rb
+- test/controllers/comfy/admin/cms/categories_controller_test.rb
+- test/controllers/comfy/admin/cms/files_controller_test.rb
+- test/controllers/comfy/admin/cms/layouts_controller_test.rb
+- test/controllers/comfy/admin/cms/pages_controller_test.rb
+- test/controllers/comfy/admin/cms/revisions_controller_test.rb
+- test/controllers/comfy/admin/cms/sites_controller_test.rb
+- test/controllers/comfy/admin/cms/snippets_controller_test.rb
+- test/controllers/comfy/cms/assets_controller_test.rb
+- test/controllers/comfy/cms/content_controller_test.rb
+- test/fixtures/comfy/cms/blocks.yml
+- test/fixtures/comfy/cms/categories.yml
+- test/fixtures/comfy/cms/categorizations.yml
+- test/fixtures/comfy/cms/files.yml
+- test/fixtures/comfy/cms/layouts.yml
+- test/fixtures/comfy/cms/pages.yml
+- test/fixtures/comfy/cms/revisions.yml
+- test/fixtures/comfy/cms/sites.yml
+- test/fixtures/comfy/cms/snippets.yml
 - test/fixtures/files/data.zip
 - test/fixtures/files/document.pdf
 - test/fixtures/files/image.gif
@@ -499,6 +525,7 @@ files:
 - test/fixtures/views/render_test/render_layout.html.erb
 - test/gemfiles/Gemfile.rails.4.0
 - test/gemfiles/Gemfile.rails.4.1
+- test/gemfiles/Gemfile.rails.master
 - test/generators/cms_generator_test.rb
 - test/generators/scaffold_generator_test.rb
 - test/integration/authentication_test.rb
@@ -571,5 +598,5 @@ rubyforge_project:
 rubygems_version: 2.1.10
 signing_key: 
 specification_version: 4
-summary: CMS Engine for Rails 4 apps
+summary: Rails 4 CMS Engine
 test_files: []