comfortable_mexican_sofa 1.0.51 → 1.1.1

data/app/models/{cms_page.rb → cms/page.rb}

@@ -1,18 +1,20 @@
-class CmsPage < ActiveRecord::Base
+class Cms::Page < ActiveRecord::Base
+  
+  set_table_name :cms_pages
   
   # -- AR Extensions --------------------------------------------------------
   acts_as_tree :counter_cache => :children_count
   
-  attr_accessor :cms_tags
+  attr_accessor :tags
   
   # -- Relationships --------------------------------------------------------
-  belongs_to :cms_site
-  belongs_to :cms_layout
+  belongs_to :site
+  belongs_to :layout
   belongs_to :target_page,
-    :class_name => 'CmsPage'
-  has_many :cms_blocks,
+    :class_name => 'Cms::Page'
+  has_many :blocks,
     :dependent  => :destroy
-  accepts_nested_attributes_for :cms_blocks
+  accepts_nested_attributes_for :blocks
   
   # -- Callbacks ------------------------------------------------------------
   before_validation :assign_parent,
@@ -23,19 +25,19 @@ class CmsPage < ActiveRecord::Base
   after_save  :sync_child_pages
   
   # -- Validations ----------------------------------------------------------
-  validates :cms_site_id, 
+  validates :site_id, 
     :presence   => true
   validates :label,
     :presence   => true
   validates :slug,
     :presence   => true,
     :format     => /^\w[a-z0-9_-]*$/i,
-    :unless     => lambda{ |p| p == CmsPage.root || CmsPage.count == 0 }
-  validates :cms_layout,
+    :unless     => lambda{ |p| p == Cms::Page.root || p.site && p.site.pages.count == 0 }
+  validates :layout,
     :presence   => true
   validates :full_path,
     :presence   => true,
-    :uniqueness => { :scope => :cms_site_id }
+    :uniqueness => { :scope => :site_id }
   validate :validate_target_page
   
   # -- Scopes ---------------------------------------------------------------
@@ -44,50 +46,16 @@ class CmsPage < ActiveRecord::Base
   
   # -- Class Methods --------------------------------------------------------
   # Tree-like structure for pages
-  def self.options_for_select(cms_site, cms_page = nil, current_page = nil, depth = 0, exclude_self = true, spacer = '. . ')
-    return [] if (current_page ||= cms_site.cms_pages.root) == cms_page && exclude_self || !current_page
+  def self.options_for_select(site, page = nil, current_page = nil, depth = 0, exclude_self = true, spacer = '. . ')
+    return [] if (current_page ||= site.pages.root) == page && exclude_self || !current_page
     out = []
-    out << [ "#{spacer*depth}#{current_page.label}", current_page.id ] unless current_page == cms_page
+    out << [ "#{spacer*depth}#{current_page.label}", current_page.id ] unless current_page == page
     current_page.children.each do |child|
-      out += options_for_select(cms_site, cms_page, child, depth + 1, exclude_self, spacer)
+      out += options_for_select(site, page, child, depth + 1, exclude_self, spacer)
     end
     return out.compact
   end
   
-  # Attempting to initialize page object from yaml file that is found in config.seed_data_path
-  # This file defines all attributes of the page plus all the block information
-  def self.load_from_file(site, path)
-    return nil if ComfortableMexicanSofa.config.seed_data_path.blank?
-    path = (path == '/')? '/index' : path.to_s.chomp('/')
-    file_path = "#{ComfortableMexicanSofa.config.seed_data_path}/#{site.hostname}/pages#{path}.yml"
-    return nil unless File.exists?(file_path)
-    attributes              = YAML.load_file(file_path).symbolize_keys!
-    attributes[:cms_layout] = CmsLayout.load_from_file(site, attributes[:cms_layout])
-    attributes[:parent]     = CmsPage.load_from_file(site, attributes[:parent])
-    attributes[:cms_site]   = site
-    attributes[:target_page]= CmsPage.load_from_file(site, attributes[:target_page])
-    new(attributes)
-  rescue
-    raise "Failed to load from #{file_path}"
-  end
-  
-  # Wrapper around load_from_file and find_by_full_path
-  # returns page object if loaded / found
-  def self.load_for_full_path!(site, path)
-    if ComfortableMexicanSofa.configuration.seed_data_path
-      load_from_file(site, path)
-    else
-      site.cms_pages.find_by_full_path(path)
-    end || raise(ActiveRecord::RecordNotFound, "CmsPage with path: #{path} cannot be found")
-  end
-  
-  # Non-blowing-up version of the method above
-  def self.load_for_full_path(site, path)
-    load_for_full_path!(site, path) 
-  rescue ActiveRecord::RecordNotFound
-    nil
-  end
-  
   # -- Instance Methods -----------------------------------------------------
   # For previewing purposes sometimes we need to have full_path set
   def full_path
@@ -96,8 +64,8 @@ class CmsPage < ActiveRecord::Base
   
   # Transforms existing cms_block information into a hash that can be used
   # during form processing. That's the only way to modify cms_blocks.
-  def cms_blocks_attributes
-    self.cms_blocks.inject([]) do |arr, block|
+  def blocks_attributes
+    self.blocks.inject([]) do |arr, block|
       block_attr = {}
       block_attr[:label]    = block.label
       block_attr[:content]  = block.content
@@ -112,27 +80,28 @@ class CmsPage < ActiveRecord::Base
     @content = read_attribute(:content)
     @content = nil if force_reload
     @content ||= begin
-      self.cms_tags = [] # resetting
-      cms_layout ? CmsTag.process_content(self, cms_layout.merged_content) : ''
+      self.tags = [] # resetting
+      layout ? ComfortableMexicanSofa::Tag.process_content(self, layout.merged_content) : ''
     end
   end
   
   # Array of cms_tags for a page. Content generation is called if forced.
   # These also include initialized cms_blocks if present
-  def cms_tags(force_reload = false)
+  def tags(force_reload = false)
     self.content(true) if force_reload
-    @cms_tags ||= []
+    @tags ||= []
   end
   
   # Full url for a page
   def url
-    "http://#{self.cms_site.hostname}#{self.full_path}"
+    "http://#{self.site.hostname}#{self.full_path}"
   end
   
 protected
   
   def assign_parent
-    self.parent ||= CmsPage.root unless self == CmsPage.root || CmsPage.count == 0
+    return unless site
+    self.parent ||= site.pages.root unless self == site.pages.root || site.pages.count == 0
   end
   
   def assign_full_path

data/app/models/{cms_site.rb → cms/site.rb}

@@ -1,10 +1,12 @@
-class CmsSite < ActiveRecord::Base
+class Cms::Site < ActiveRecord::Base
+  
+  set_table_name :cms_sites
   
   # -- Relationships --------------------------------------------------------
-  has_many :cms_layouts,  :dependent => :destroy
-  has_many :cms_pages,    :dependent => :destroy
-  has_many :cms_snippets, :dependent => :destroy
-  has_many :cms_uploads,  :dependent => :destroy
+  has_many :layouts,  :dependent => :destroy
+  has_many :pages,    :dependent => :destroy
+  has_many :snippets, :dependent => :destroy
+  has_many :uploads,  :dependent => :destroy
   
   # -- Validations ----------------------------------------------------------
   validates :label,
@@ -17,7 +19,7 @@ class CmsSite < ActiveRecord::Base
     
   # -- Class Methods --------------------------------------------------------
   def self.options_for_select
-    CmsSite.all.collect{|s| ["#{s.label} (#{s.hostname})", s.id]}
+    Cms::Site.all.collect{|s| ["#{s.label} (#{s.hostname})", s.id]}
   end
   
 end

data/app/models/cms/snippet.rb

@@ -0,0 +1,36 @@
+class Cms::Snippet < ActiveRecord::Base
+  
+  set_table_name :cms_snippets
+  
+  # -- Relationships --------------------------------------------------------
+  belongs_to :site
+  
+  # -- Callbacks ------------------------------------------------------------
+  after_save    :clear_cached_page_content
+  after_destroy :clear_cached_page_content
+  
+  # -- Validations ----------------------------------------------------------
+  validates :site_id,
+    :presence   => true
+  validates :label,
+    :presence   => true
+  validates :slug,
+    :presence   => true,
+    :uniqueness => { :scope => :site_id },
+    :format     => { :with => /^\w[a-z0-9_-]*$/i }
+    
+  # -- Class Methods --------------------------------------------------------
+  def self.content_for(slug)
+    (s = find_by_slug(slug)) ? s.content : ''
+  end
+  
+protected
+  
+  # Note: This might be slow. We have no idea where the snippet is used, so
+  # gotta reload every single page. Kinda sucks, but might be ok unless there
+  # are hundreds of pages.
+  def clear_cached_page_content
+    site.pages.all.each{ |page| page.save! }
+  end
+  
+end

data/app/models/{cms_upload.rb → cms/upload.rb}

@@ -1,13 +1,15 @@
-class CmsUpload < ActiveRecord::Base
+class Cms::Upload < ActiveRecord::Base
+  
+  set_table_name :cms_uploads
 
   # -- AR Extensions --------------------------------------------------------
   has_attached_file :file, ComfortableMexicanSofa.config.upload_file_options
   
   # -- Relationships --------------------------------------------------------
-  belongs_to :cms_site
+  belongs_to :site
   
   # -- Validations ----------------------------------------------------------
-  validates :cms_site_id, :presence => true
+  validates :site_id, :presence => true
   validates_attachment_presence :file
   
 end

data/app/views/cms_admin/layouts/_form.html.erb

@@ -4,10 +4,10 @@
 
 <%= form.text_field :label, :label => 'Layout Name', :id => (@cms_layout.new_record?? 'slugify' : nil)%>
 <%= form.text_field :slug, :id => 'slug' %>
-<% if (options = CmsLayout.options_for_select(@cms_site, @cms_layout)).present? %>
+<% if (options = Cms::Layout.options_for_select(@cms_site, @cms_layout)).present? %>
   <%= form.select :parent_id, [['---- Select Parent Layout ----', nil]] + options %>
 <% end %>
-<% if (options = CmsLayout.app_layouts_for_select).present? %>
+<% if (options = Cms::Layout.app_layouts_for_select).present? %>
   <%= form.select :app_layout, [['---- Select Application Layout ----', nil]] + options %>
 <% end %>
 

data/app/views/cms_admin/pages/_form.html.erb

@@ -12,16 +12,16 @@
 <%= form.text_field :label, :id => (@cms_page.new_record?? 'slugify' : nil) %>
 
 <div class='page_form_extras'>
-  <% unless @cms_site.cms_pages.count == 0 || @cms_site.cms_pages.root == @cms_page%>
+  <% unless @cms_site.pages.count == 0 || @cms_site.pages.root == @cms_page%>
     <%= form.text_field :slug, :id => 'slug' %>
   <% end %>
-  <% if (options = CmsLayout.options_for_select(@cms_site)).present? %>
-    <%= form.select :cms_layout_id, options, {}, 'data-page-id' => @cms_page.id.to_i, :label => 'Layout' %>
+  <% if (options = Cms::Layout.options_for_select(@cms_site)).present? %>
+    <%= form.select :layout_id, options, {}, 'data-page-id' => @cms_page.id.to_i, :label => 'Layout' %>
   <% end %>
-  <% if (options = CmsPage.options_for_select(@cms_site, @cms_page)).present? %>
+  <% if (options = Cms::Page.options_for_select(@cms_site, @cms_page)).present? %>
     <%= form.select :parent_id, options %>
   <% end %>
-  <% if (options = CmsPage.options_for_select(@cms_site, @cms_page, nil, 0, false)).present? %>
+  <% if (options = Cms::Page.options_for_select(@cms_site, @cms_page, nil, 0, false)).present? %>
     <%= form.select :target_page_id, [['---- No Redirect ----', nil]] + options, :label => 'Redirect To Page' %>
   <% end %>
   <%= cms_hook :page_form, :object => form %>

data/app/views/cms_admin/pages/_form_blocks.html.erb

@@ -1,7 +1,7 @@
 <div id='form_blocks'>
-  <%= fields_for :cms_blocks, :builder => ComfortableMexicanSofa::FormBuilder do |cms_blocks| %>
-    <% @cms_page.cms_tags(true).each do |tag| %>
-      <%= cms_blocks.send(tag.class.name.underscore.downcase.idify, tag)%>
+  <%= fields_for :blocks, nil, :builder => ComfortableMexicanSofa::FormBuilder do |cms_blocks| %>
+    <% @cms_page.tags(true).select{|t| t.is_cms_block?}.each do |tag| %>
+      <%= cms_blocks.send(tag.class.to_s.demodulize.underscore, tag)%>
     <% end %>
   <% end %>
 </div>

data/app/views/cms_admin/uploads/_index.html.erb

@@ -3,7 +3,7 @@
     <a id='uploader_button' href='#' class='big button'>Upload Files</a>
   </div>
   <div id='uploaded_files'>
-    <% CmsUpload.order('file_file_name').all.each do |file| %>
+    <% Cms::Upload.order('file_file_name').all.each do |file| %>
       <%= render :partial => 'cms_admin/uploads/file', :object => file %>
     <% end %>
   </div>

data/app/views/layouts/cms_admin.html.erb

@@ -1,41 +1,5 @@
 <!DOCTYPE html>
 <html>
-  <head>
-    <meta http-equiv="Content-type" content="text/html; charset=utf-8">
-    <title><%= ComfortableMexicanSofa.config.cms_title %></title>
-    <%= csrf_meta_tag %>
-    <%= stylesheet_link_tag :cms, :cache => ('_cms' if ComfortableMexicanSofa.config.enable_caching) %>
-    <%= javascript_include_tag :cms, :cache => ('_cms' if ComfortableMexicanSofa.config.enable_caching) %>
-    <%= javascript_include_tag :tiny_mce %>
-    <%= yield :head %>
-    <%= cms_hook :html_head %>
-  </head>
-  <body class='c_<%= params[:controller].idify %> a_<%= params[:action].idify %>'>
-    <div class='body_wrapper'>
-      <div class='left_column'>
-        <div class='left_column_content'>
-          <% unless ComfortableMexicanSofa.config.auto_manage_sites %>
-            <%= active_link_to 'Sites', cms_admin_sites_path %>
-          <% end %>
-          <%= active_link_to 'Layouts', cms_admin_layouts_path %>
-          <%= active_link_to 'Pages', cms_admin_pages_path %>
-          <%= active_link_to 'Snippets', cms_admin_snippets_path %>
-          <%= cms_hook :navigation %>
-        </div>
-      </div>
-      <div class='right_column'>
-        <div class='right_column_content'>
-          <%= yield :right_column %>
-        </div>
-      </div>
-      <div class='center_column'>
-        <% flash.each do |type, message| %>
-          <div class='flash <%= type %>'><%= message %></div>
-        <% end %>
-        <div class='center_column_content'>
-          <%= yield %>
-        </div>
-      </div>
-    </div>
-  </body>
+  <%= render :partial => 'layouts/cms_admin/head' %>
+  <%= render :partial => 'layouts/cms_admin/body' %>
 </html>

data/app/views/layouts/cms_admin/_body.html.erb

@@ -0,0 +1,17 @@
+<body class='c_<%= params[:controller].idify %> a_<%= params[:action].idify %>'>
+  <div class='body_wrapper'>
+    <div class='left_column'>
+      <div class='left_column_content'>
+        <%= render :partial => 'layouts/cms_admin/left'%>
+      </div>
+    </div>
+    <div class='right_column'>
+      <div class='right_column_content'>
+        <%= render :partial => 'layouts/cms_admin/right'%>
+      </div>
+    </div>
+    <div class='center_column'>
+      <%= render :partial => 'layouts/cms_admin/center' %>
+    </div>
+  </div>
+</body>

data/app/views/layouts/cms_admin/_center.html.erb

@@ -0,0 +1,6 @@
+<% flash.each do |type, message| %>
+  <div class='flash <%= type %>'><%= message %></div>
+<% end %>
+<div class='center_column_content'>
+  <%= yield %>
+</div>

data/app/views/layouts/cms_admin/_head.html.erb

@@ -0,0 +1,11 @@
+<head>
+  <meta http-equiv="Content-type" content="text/html; charset=utf-8">
+  <title><%= ComfortableMexicanSofa.config.cms_title %></title>
+  <%= csrf_meta_tag %>
+  <%= stylesheet_link_tag :cms, :cache => ('_cms' if ComfortableMexicanSofa.config.enable_caching) %>
+  <%= javascript_include_tag :cms, :cache => ('_cms' if ComfortableMexicanSofa.config.enable_caching) %>
+  <%= javascript_include_tag :tiny_mce %>
+
+  <%= yield :head %>
+  <%= cms_hook :html_head %>
+</head>

data/app/views/layouts/cms_admin/_left.html.erb

@@ -0,0 +1,7 @@
+<% if ComfortableMexicanSofa.config.enable_multiple_sites %>
+  <%= active_link_to 'Sites', cms_admin_sites_path %>
+<% end %>
+<%= active_link_to 'Layouts', cms_admin_layouts_path %>
+<%= active_link_to 'Pages', cms_admin_pages_path %>
+<%= active_link_to 'Snippets', cms_admin_snippets_path %>
+<%= cms_hook :navigation %>

data/app/views/layouts/cms_admin/_right.html.erb

@@ -0,0 +1 @@
+<%= yield :right_column %>

data/comfortable_mexican_sofa.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{comfortable_mexican_sofa}
-  s.version = "1.0.51"
+  s.version = "1.1.1"
 
   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 = %q{2011-04-13}
+  s.date = %q{2011-05-02}
   s.description = %q{}
   s.email = %q{oleg@theworkinggroup.ca}
   s.extra_rdoc_files = [
@@ -32,12 +32,12 @@ Gem::Specification.new do |s|
     "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_layout.rb",
-    "app/models/cms_page.rb",
-    "app/models/cms_site.rb",
-    "app/models/cms_snippet.rb",
-    "app/models/cms_upload.rb",
+    "app/models/cms/block.rb",
+    "app/models/cms/layout.rb",
+    "app/models/cms/page.rb",
+    "app/models/cms/site.rb",
+    "app/models/cms/snippet.rb",
+    "app/models/cms/upload.rb",
     "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",
@@ -63,6 +63,11 @@ Gem::Specification.new do |s|
     "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",
+    "app/views/layouts/cms_admin/_head.html.erb",
+    "app/views/layouts/cms_admin/_left.html.erb",
+    "app/views/layouts/cms_admin/_right.html.erb",
     "comfortable_mexican_sofa.gemspec",
     "config.ru",
     "config/application.rb",
@@ -77,37 +82,48 @@ Gem::Specification.new do |s|
     "config/initializers/paperclip.rb",
     "config/locales/en.yml",
     "config/routes.rb",
-    "db/cms_seeds/example.local/layouts/default.yml",
-    "db/cms_seeds/example.local/layouts/nested.yml",
-    "db/cms_seeds/example.local/pages/child.yml",
-    "db/cms_seeds/example.local/pages/child/subchild.yml",
-    "db/cms_seeds/example.local/pages/index.yml",
-    "db/cms_seeds/example.local/snippets/example.yml",
+    "db/cms_fixtures/example.com/layouts/default/_default.yml",
+    "db/cms_fixtures/example.com/layouts/default/content.html",
+    "db/cms_fixtures/example.com/layouts/default/css.css",
+    "db/cms_fixtures/example.com/layouts/default/js.js",
+    "db/cms_fixtures/example.com/layouts/default/nested/_nested.yml",
+    "db/cms_fixtures/example.com/layouts/default/nested/content.html",
+    "db/cms_fixtures/example.com/layouts/default/nested/css.css",
+    "db/cms_fixtures/example.com/layouts/default/nested/js.js",
+    "db/cms_fixtures/example.com/pages/index/_index.yml",
+    "db/cms_fixtures/example.com/pages/index/child/_child.yml",
+    "db/cms_fixtures/example.com/pages/index/child/left.html",
+    "db/cms_fixtures/example.com/pages/index/child/right.html",
+    "db/cms_fixtures/example.com/pages/index/content.html",
+    "db/cms_fixtures/example.com/snippets/default/_default.yml",
+    "db/cms_fixtures/example.com/snippets/default/content.html",
     "db/migrate/01_create_cms.rb",
+    "db/migrate/upgrades/02_upgrade_to_1_1_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/cms_tag.rb",
-    "lib/comfortable_mexican_sofa/cms_tag/field_datetime.rb",
-    "lib/comfortable_mexican_sofa/cms_tag/field_integer.rb",
-    "lib/comfortable_mexican_sofa/cms_tag/field_string.rb",
-    "lib/comfortable_mexican_sofa/cms_tag/field_text.rb",
-    "lib/comfortable_mexican_sofa/cms_tag/helper.rb",
-    "lib/comfortable_mexican_sofa/cms_tag/page_datetime.rb",
-    "lib/comfortable_mexican_sofa/cms_tag/page_integer.rb",
-    "lib/comfortable_mexican_sofa/cms_tag/page_rich_text.rb",
-    "lib/comfortable_mexican_sofa/cms_tag/page_string.rb",
-    "lib/comfortable_mexican_sofa/cms_tag/page_text.rb",
-    "lib/comfortable_mexican_sofa/cms_tag/partial.rb",
-    "lib/comfortable_mexican_sofa/cms_tag/snippet.rb",
     "lib/comfortable_mexican_sofa/configuration.rb",
     "lib/comfortable_mexican_sofa/controller_methods.rb",
     "lib/comfortable_mexican_sofa/engine.rb",
+    "lib/comfortable_mexican_sofa/fixtures.rb",
     "lib/comfortable_mexican_sofa/form_builder.rb",
     "lib/comfortable_mexican_sofa/http_auth.rb",
     "lib/comfortable_mexican_sofa/rails_extensions.rb",
+    "lib/comfortable_mexican_sofa/tag.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/helper.rb",
+    "lib/comfortable_mexican_sofa/tags/page_datetime.rb",
+    "lib/comfortable_mexican_sofa/tags/page_integer.rb",
+    "lib/comfortable_mexican_sofa/tags/page_rich_text.rb",
+    "lib/comfortable_mexican_sofa/tags/page_string.rb",
+    "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/view_hooks.rb",
     "lib/comfortable_mexican_sofa/view_methods.rb",
     "lib/generators/README",
@@ -190,21 +206,12 @@ Gem::Specification.new do |s|
     "public/stylesheets/comfortable_mexican_sofa/structure.css",
     "public/stylesheets/comfortable_mexican_sofa/typography.css",
     "script/rails",
-    "test/cms_seeds/test.host/layouts/broken.yml",
-    "test/cms_seeds/test.host/layouts/default.yml",
-    "test/cms_seeds/test.host/layouts/nested.yml",
-    "test/cms_seeds/test.host/pages/broken.yml",
-    "test/cms_seeds/test.host/pages/child.yml",
-    "test/cms_seeds/test.host/pages/child/subchild.yml",
-    "test/cms_seeds/test.host/pages/index.yml",
-    "test/cms_seeds/test.host/snippets/broken.yml",
-    "test/cms_seeds/test.host/snippets/default.yml",
-    "test/fixtures/cms_blocks.yml",
-    "test/fixtures/cms_layouts.yml",
-    "test/fixtures/cms_pages.yml",
-    "test/fixtures/cms_sites.yml",
-    "test/fixtures/cms_snippets.yml",
-    "test/fixtures/cms_uploads.yml",
+    "test/fixtures/cms/blocks.yml",
+    "test/fixtures/cms/layouts.yml",
+    "test/fixtures/cms/pages.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",
@@ -216,38 +223,38 @@ Gem::Specification.new do |s|
     "test/functional/cms_admin/uploads_controller_test.rb",
     "test/functional/cms_content_controller_test.rb",
     "test/integration/authentication_test.rb",
-    "test/integration/rake_tasks_test.rb",
-    "test/integration/render_cms_seed_test.rb",
+    "test/integration/fixtures_test.rb",
     "test/integration/render_cms_test.rb",
     "test/integration/sites_test.rb",
     "test/integration/view_hooks_test.rb",
     "test/test_helper.rb",
-    "test/unit/cms_block_test.rb",
-    "test/unit/cms_configuration_test.rb",
-    "test/unit/cms_layout_test.rb",
-    "test/unit/cms_page_test.rb",
-    "test/unit/cms_site_test.rb",
-    "test/unit/cms_snippet_test.rb",
-    "test/unit/cms_tag_test.rb",
-    "test/unit/cms_tags/field_datetime_test.rb",
-    "test/unit/cms_tags/field_integer_test.rb",
-    "test/unit/cms_tags/field_string_test.rb",
-    "test/unit/cms_tags/field_text_test.rb",
-    "test/unit/cms_tags/helper_test.rb",
-    "test/unit/cms_tags/page_datetime_test.rb",
-    "test/unit/cms_tags/page_integer_test.rb",
-    "test/unit/cms_tags/page_rich_text.rb",
-    "test/unit/cms_tags/page_string_test.rb",
-    "test/unit/cms_tags/page_text_test.rb",
-    "test/unit/cms_tags/partial_test.rb",
-    "test/unit/cms_tags/snippet_test.rb",
-    "test/unit/cms_upload_test.rb",
+    "test/unit/configuration_test.rb",
+    "test/unit/fixtures_test.rb",
+    "test/unit/models/block_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/tag_test.rb",
+    "test/unit/tags/field_datetime_test.rb",
+    "test/unit/tags/field_integer_test.rb",
+    "test/unit/tags/field_string_test.rb",
+    "test/unit/tags/field_text_test.rb",
+    "test/unit/tags/helper_test.rb",
+    "test/unit/tags/page_datetime_test.rb",
+    "test/unit/tags/page_integer_test.rb",
+    "test/unit/tags/page_rich_text.rb",
+    "test/unit/tags/page_string_test.rb",
+    "test/unit/tags/page_text_test.rb",
+    "test/unit/tags/partial_test.rb",
+    "test/unit/tags/snippet_test.rb",
     "test/unit/view_methods_test.rb"
   ]
   s.homepage = %q{http://github.com/twg/comfortable-mexican-sofa}
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.7.2}
-  s.summary = %q{ComfortableMexicanSofa is a Rails Engine CMS gem}
+  s.summary = %q{ComfortableMexicanSofa is a powerful micro CMS for Ruby on Rails 3 applications}
   s.test_files = [
     "test/functional/cms_admin/layouts_controller_test.rb",
     "test/functional/cms_admin/pages_controller_test.rb",
@@ -256,32 +263,32 @@ Gem::Specification.new do |s|
     "test/functional/cms_admin/uploads_controller_test.rb",
     "test/functional/cms_content_controller_test.rb",
     "test/integration/authentication_test.rb",
-    "test/integration/rake_tasks_test.rb",
-    "test/integration/render_cms_seed_test.rb",
+    "test/integration/fixtures_test.rb",
     "test/integration/render_cms_test.rb",
     "test/integration/sites_test.rb",
     "test/integration/view_hooks_test.rb",
     "test/test_helper.rb",
-    "test/unit/cms_block_test.rb",
-    "test/unit/cms_configuration_test.rb",
-    "test/unit/cms_layout_test.rb",
-    "test/unit/cms_page_test.rb",
-    "test/unit/cms_site_test.rb",
-    "test/unit/cms_snippet_test.rb",
-    "test/unit/cms_tag_test.rb",
-    "test/unit/cms_tags/field_datetime_test.rb",
-    "test/unit/cms_tags/field_integer_test.rb",
-    "test/unit/cms_tags/field_string_test.rb",
-    "test/unit/cms_tags/field_text_test.rb",
-    "test/unit/cms_tags/helper_test.rb",
-    "test/unit/cms_tags/page_datetime_test.rb",
-    "test/unit/cms_tags/page_integer_test.rb",
-    "test/unit/cms_tags/page_rich_text.rb",
-    "test/unit/cms_tags/page_string_test.rb",
-    "test/unit/cms_tags/page_text_test.rb",
-    "test/unit/cms_tags/partial_test.rb",
-    "test/unit/cms_tags/snippet_test.rb",
-    "test/unit/cms_upload_test.rb",
+    "test/unit/configuration_test.rb",
+    "test/unit/fixtures_test.rb",
+    "test/unit/models/block_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/tag_test.rb",
+    "test/unit/tags/field_datetime_test.rb",
+    "test/unit/tags/field_integer_test.rb",
+    "test/unit/tags/field_string_test.rb",
+    "test/unit/tags/field_text_test.rb",
+    "test/unit/tags/helper_test.rb",
+    "test/unit/tags/page_datetime_test.rb",
+    "test/unit/tags/page_integer_test.rb",
+    "test/unit/tags/page_rich_text.rb",
+    "test/unit/tags/page_string_test.rb",
+    "test/unit/tags/page_text_test.rb",
+    "test/unit/tags/partial_test.rb",
+    "test/unit/tags/snippet_test.rb",
     "test/unit/view_methods_test.rb"
   ]
 
@@ -294,18 +301,12 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<paperclip>, [">= 2.3.8"])
       s.add_runtime_dependency(%q<mime-types>, [">= 0"])
       s.add_development_dependency(%q<sqlite3>, [">= 0"])
-      s.add_runtime_dependency(%q<rails>, [">= 3.0.3"])
-      s.add_runtime_dependency(%q<active_link_to>, [">= 0.0.6"])
-      s.add_runtime_dependency(%q<paperclip>, [">= 2.3.8"])
     else
       s.add_dependency(%q<rails>, [">= 3.0.3"])
       s.add_dependency(%q<active_link_to>, [">= 0.0.6"])
       s.add_dependency(%q<paperclip>, [">= 2.3.8"])
       s.add_dependency(%q<mime-types>, [">= 0"])
       s.add_dependency(%q<sqlite3>, [">= 0"])
-      s.add_dependency(%q<rails>, [">= 3.0.3"])
-      s.add_dependency(%q<active_link_to>, [">= 0.0.6"])
-      s.add_dependency(%q<paperclip>, [">= 2.3.8"])
     end
   else
     s.add_dependency(%q<rails>, [">= 3.0.3"])
@@ -313,9 +314,6 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<paperclip>, [">= 2.3.8"])
     s.add_dependency(%q<mime-types>, [">= 0"])
     s.add_dependency(%q<sqlite3>, [">= 0"])
-    s.add_dependency(%q<rails>, [">= 3.0.3"])
-    s.add_dependency(%q<active_link_to>, [">= 0.0.6"])
-    s.add_dependency(%q<paperclip>, [">= 2.3.8"])
   end
 end