comfortable_mexican_sofa 1.0.1 → 1.0.2

data/app/models/cms_site.rb

@@ -0,0 +1,23 @@
+class CmsSite < ActiveRecord::Base
+  
+  # -- 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
+  
+  # -- Validations ----------------------------------------------------------
+  validates :label,
+    :presence   => true,
+    :uniqueness => true
+  validates :hostname,
+    :presence   => true,
+    :uniqueness => true,
+    :format     => { :with => /^[\w\.\-]+$/ }
+    
+  # -- Class Methods --------------------------------------------------------
+  def self.options_for_select
+    CmsSite.all.collect{|s| ["#{s.label} (#{s.hostname})", s.id]}
+  end
+  
+end

data/app/models/cms_snippet.rb

@@ -1,20 +1,25 @@
 class CmsSnippet < ActiveRecord::Base
-    
-  # -- Validations ----------------------------------------------------------
   
-  validates :label,
-    :presence => true,
-    :uniqueness => true,
-    :format => { :with => /^\w[a-z0-9_-]*$/i }
+  # -- Relationships --------------------------------------------------------
+  belongs_to :cms_site
   
+  # -- Validations ----------------------------------------------------------
+  validates :cms_site_id,
+    :presence   => true
+  validates :label,
+    :presence   => true
+  validates :slug,
+    :presence   => true,
+    :uniqueness => { :scope => :cms_site_id },
+    :format     => { :with => /^\w[a-z0-9_-]*$/i }
+    
   # -- Class Methods --------------------------------------------------------
-  
-  def self.content_for(label)
-    (s = find_by_label(label)) ? s.content : ''
+  def self.content_for(slug)
+    (s = find_by_slug(slug)) ? s.content : ''
   end
   
-  def self.initialize_or_find(cms_page, label)
-    find_by_label(label) || new(:label => label)
+  def self.initialize_or_find(cms_page, slug)
+    find_by_slug(slug) || new(:slug => slug)
   end
-
+  
 end

data/app/models/cms_upload.rb

@@ -7,9 +7,11 @@ class CmsUpload < ActiveRecord::Base
   before_post_process :image?
   
   # -- Relationships --------------------------------------------------------
-  belongs_to :cms_page
+  belongs_to :cms_site
   
   # -- Validations ----------------------------------------------------------
+  validates :cms_site_id,
+    :presence   => true
   validates_attachment_presence :file 
   
   # -- Instance Methods -----------------------------------------------------
@@ -25,12 +27,7 @@ class CmsUpload < ActiveRecord::Base
   end
   
   def icon
-    if self.image?
-      self.file.url(:thumb)
-    else
-      ext = self.file_file_name.split('.').last
-      FILE_ICONS.include?(ext) ? "cms/file_icons/#{ext}.png" : "cms/file_icons/_blank.png"
-    end
+    self.image?? self.file.url(:thumb) : 'TODO'
   end
   
 end

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

@@ -1,5 +1,5 @@
 <%= form.text_field :label, :label => 'Layout Name' %>
-<%= form.select :parent_id, CmsLayout.options_for_select(@cms_layout), :include_blank => true %>
+<%= form.select :parent_id, CmsLayout.options_for_select(@cms_site, @cms_layout), :include_blank => true %>
 <%= form.select :app_layout, CmsLayout.app_layouts_for_select, :include_blank => true %>
 <%= form.text_area :content %>
 <%= form.text_area :css %>

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

@@ -1,6 +1,6 @@
 <%= link_to span_tag('Create New Layout'), new_cms_admin_layout_path, :class => 'big_button' %>
 <h1>Layouts</h1>
 
-<ul class='tree'>
+<ul class='list'>
   <%= render :partial => 'index_branch', :collection => @cms_layouts %>
 </ul>

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

@@ -2,8 +2,9 @@
 
 <div class='page_form_extras'>
   <%= form.text_field :slug, :id => 'slug' %>
-  <%= form.select :cms_layout_id, CmsLayout.options_for_select, {}, 'data-page-id' => @cms_page.id.to_i, :label => 'Layout' %>
-  <%= form.select :parent_id, CmsPage.options_for_select(@cms_page) %>
+  <%= form.select :cms_layout_id, CmsLayout.options_for_select(@cms_site), {}, 'data-page-id' => @cms_page.id.to_i, :label => 'Layout' %>
+  <%= form.select :parent_id, CmsPage.options_for_select(@cms_site, @cms_page) %>
+  <%= form.select :target_page_id, CmsPage.options_for_select(@cms_site, @cms_page, nil, 0, false), :include_blank => true, :label => 'Redirect To Page' %>
 </div>
 
 <%= render :partial => 'form_blocks' %>

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

@@ -1,5 +1,5 @@
 <div id='form_blocks'>
-  <%= fields_for :cms_blocks, :builder => CmsFormBuilder do |cms_blocks| %>
+  <%= fields_for :cms_blocks, :builder => ComfortableMexicanSofa::FormBuilder do |cms_blocks| %>
     <% @cms_page.cms_tags(true).each do |tag| %>
       <%= cms_blocks.send(tag.class.to_s.underscore.downcase.idify, tag)%>
     <% end %>

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

@@ -14,7 +14,7 @@
     </div>
     <div class='label'>
       <%= link_to cms_page.label, edit_cms_admin_page_path(cms_page) %>
-      <div class='url'>
+      <div class='sublabel'>
         <%= link_to cms_page.full_path, cms_page.full_path %>
       </div>
     </div>

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

@@ -1,6 +1,6 @@
 <%= link_to span_tag('Create New Page'), new_cms_admin_page_path, :class => 'big_button' %>
 <h1>Pages</h1>
 
-<ul class='tree'>
+<ul class='list'>
   <%= render :partial => 'index_branch', :collection => @cms_pages %>
 </ul>

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

@@ -0,0 +1,2 @@
+<%= form.text_field :label %>
+<%= form.text_field :hostname %>

data/app/views/cms_admin/sites/edit.html.erb

@@ -0,0 +1,6 @@
+<h1> Editing Site </h1>
+
+<%= cms_form_for @cms_site, :url => {:action => :update} do |form| %>
+  <%= render :partial => 'form', :object => form %>
+  <%= form.submit 'Update Site' %>
+<% end %>

data/app/views/cms_admin/sites/index.html.erb

@@ -0,0 +1,22 @@
+<%= link_to span_tag('Create New Site'), new_cms_admin_site_path, :class => 'big_button' %>
+<h1>Sites</h1>
+
+<ul class='list'>
+  <% @cms_sites.each do |cms_site| %>
+    <li id='cms_site_<%= cms_site.id %>'>
+      <div class='item'>
+        <div class='icon'></div>
+        <div class='action_links'>
+          <%= link_to 'Edit', edit_cms_admin_site_path(cms_site) %>
+          <%= link_to 'Delete', cms_admin_site_path(cms_site), :method => :delete, :confirm => 'Are you sure?' %>
+        </div>
+        <div class='label'>
+          <%= link_to cms_site.label, edit_cms_admin_site_path(cms_site) %>
+          <div class='sublabel'>
+            <%= link_to cms_site.hostname, "http://#{cms_site.hostname}/cms-admin" %>
+          </div>
+        </div>
+      </div>
+    </li>
+  <% end %>
+</ul>

data/app/views/cms_admin/sites/new.html.erb

@@ -0,0 +1,6 @@
+<h1> New Site </h1>
+
+<%= cms_form_for @cms_site, :url => {:action => :create} do |form| %>
+  <%= render :partial => 'form', :object => form %>
+  <%= form.submit 'Create Site' %>
+<% end %>

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

@@ -1,2 +1,3 @@
-<%= form.text_field :label %>
+<%= form.text_field :label, :id => (@cms_snippet.new_record?? 'slugify' : nil) %>
+<%= form.text_field :slug, :id => 'slug' %>
 <%= form.text_area :content %>

data/app/views/cms_admin/snippets/index.html.erb

@@ -1,3 +1,22 @@
+<%= link_to span_tag('Create New Snippet'), new_cms_admin_snippet_path, :class => 'big_button' %>
 <h1>Snippets</h1>
 
-<%= debug @cms_snippets %>
+<ul class='list'>
+  <% @cms_snippets.each do |cms_snippet| %>
+    <li id='cms_snippet_<%= cms_snippet.id %>'>
+      <div class='item'>
+        <div class='icon'></div>
+        <div class='action_links'>
+          <%= link_to 'Edit', edit_cms_admin_snippet_path(cms_snippet) %>
+          <%= link_to 'Delete', cms_admin_snippet_path(cms_snippet), :method => :delete, :confirm => 'Are you sure?' %>
+        </div>
+        <div class='label'>
+          <%= link_to cms_snippet.label, edit_cms_admin_snippet_path(cms_snippet) %>
+          <div class='sublabel'>
+            <%= link_to cms_snippet.slug, edit_cms_admin_snippet_path(cms_snippet) %>
+          </div>
+        </div>
+      </div>
+    </li>
+  <% end %>
+</ul>

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

@@ -2,7 +2,7 @@
 <html>
   <head>
     <meta http-equiv="Content-type" content="text/html; charset=utf-8">
-    <title>Comfortable Mexican Sofa</title>
+    <title><%= ComfortableMexicanSofa.config.cms_title %></title>
     <%= csrf_meta_tag %>
     <%= stylesheet_link_tag :cms %>
     <%= javascript_include_tag :cms %>
@@ -12,6 +12,7 @@
     <div class='body_wrapper'>
       <div class='left_column'>
         <div class='left_column_content'>
+          <%= active_link_to 'Sites', cms_admin_sites_path %>
           <%= active_link_to 'Layouts', cms_admin_layouts_path %>
           <%= active_link_to 'Pages', cms_admin_pages_path %>
           <%= active_link_to 'Snippets', cms_admin_snippets_path %>

data/comfortable_mexican_sofa.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{comfortable_mexican_sofa}
-  s.version = "1.0.1"
+  s.version = "1.0.2"
 
   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{2010-10-14}
+  s.date = %q{2010-10-19}
   s.description = %q{}
   s.email = %q{oleg@theworkinggroup.ca}
   s.extra_rdoc_files = [
@@ -26,12 +26,14 @@ Gem::Specification.new do |s|
      "app/controllers/cms_admin/base_controller.rb",
      "app/controllers/cms_admin/layouts_controller.rb",
      "app/controllers/cms_admin/pages_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_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",
@@ -46,6 +48,10 @@ Gem::Specification.new do |s|
      "app/views/cms_admin/pages/form_blocks.js.erb",
      "app/views/cms_admin/pages/index.html.erb",
      "app/views/cms_admin/pages/new.html.erb",
+     "app/views/cms_admin/sites/_form.html.erb",
+     "app/views/cms_admin/sites/edit.html.erb",
+     "app/views/cms_admin/sites/index.html.erb",
+     "app/views/cms_admin/sites/new.html.erb",
      "app/views/cms_admin/snippets/_form.html.erb",
      "app/views/cms_admin/snippets/edit.html.erb",
      "app/views/cms_admin/snippets/index.html.erb",
@@ -64,6 +70,7 @@ Gem::Specification.new do |s|
      "config/environments/development.rb",
      "config/environments/production.rb",
      "config/environments/test.rb",
+     "config/initializers/comfortable_mexican_sofa.rb",
      "config/initializers/mime_types.rb",
      "config/initializers/paperclip.rb",
      "config/locales/en.yml",
@@ -72,10 +79,7 @@ Gem::Specification.new do |s|
      "db/seeds.rb",
      "doc/README_FOR_APP",
      "lib/comfortable_mexican_sofa.rb",
-     "lib/comfortable_mexican_sofa/cms_acts_as_tree.rb",
-     "lib/comfortable_mexican_sofa/cms_engine.rb",
-     "lib/comfortable_mexican_sofa/cms_form_builder.rb",
-     "lib/comfortable_mexican_sofa/cms_rails_extensions.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",
@@ -87,6 +91,13 @@ Gem::Specification.new do |s|
      "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/form_builder.rb",
+     "lib/comfortable_mexican_sofa/http_auth.rb",
+     "lib/comfortable_mexican_sofa/rails_extensions.rb",
+     "lib/comfortable_mexican_sofa/view_methods.rb",
      "lib/generators/README",
      "lib/generators/cms_generator.rb",
      "public/404.html",
@@ -113,20 +124,26 @@ Gem::Specification.new do |s|
      "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/functional/cms_admin/base_controller_test.rb",
      "test/functional/cms_admin/layouts_controller_test.rb",
      "test/functional/cms_admin/pages_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/render_cms_test.rb",
+     "test/integration/sites_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",
@@ -148,16 +165,21 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{ComfortableMexicanSofa is a Rails Engine CMS gem}
   s.test_files = [
-    "test/functional/cms_admin/base_controller_test.rb",
-     "test/functional/cms_admin/layouts_controller_test.rb",
+    "test/functional/cms_admin/layouts_controller_test.rb",
      "test/functional/cms_admin/pages_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/render_cms_test.rb",
+     "test/integration/sites_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",

data/config/initializers/comfortable_mexican_sofa.rb

@@ -0,0 +1,10 @@
+# Comfortable Mexican Sofa initializer. Change defaults to whatever you require
+
+ComfortableMexicanSofa.configure do |config|
+  config.cms_title      = 'ComfortableMexicanSofa'
+  config.authentication = 'ComfortableMexicanSofa::HttpAuth'
+end
+
+# Credentials for CmsHttpAuthentication
+ComfortableMexicanSofa::HttpAuth.username = 'username'
+ComfortableMexicanSofa::HttpAuth.password = 'password'

data/config/routes.rb

@@ -1,12 +1,14 @@
 Rails.application.routes.draw do
   
   namespace :cms_admin, :path => 'cms-admin', :except => :show do
-    resources :layouts
+    get '/' => redirect('/cms-admin/pages')
     resources :pages do
       member do 
         match :form_blocks
       end
     end
+    resources :sites
+    resources :layouts
     resources :snippets
     resources :uploads
   end

data/db/migrate/01_create_cms.rb

@@ -1,9 +1,16 @@
 class CreateCms < ActiveRecord::Migration
   
   def self.up
+    # -- Sites --------------------------------------------------------------
+    create_table :cms_sites do |t|
+      t.string :label
+      t.string :hostname
+    end
+    add_index :cms_sites, :hostname
     
     # -- Layouts ------------------------------------------------------------
     create_table :cms_layouts do |t|
+      t.integer :cms_site_id
       t.integer :parent_id
       t.string  :app_layout
       t.string  :label
@@ -13,13 +20,15 @@ class CreateCms < ActiveRecord::Migration
       t.integer :position, :null => false, :default => 0
       t.timestamps
     end
-    add_index :cms_layouts, :label
+    add_index :cms_layouts, [:cms_site_id, :label]
     add_index :cms_layouts, [:parent_id, :position]
     
     # -- Pages --------------------------------------------------------------
     create_table :cms_pages do |t|
+      t.integer :cms_site_id
       t.integer :cms_layout_id
       t.integer :parent_id
+      t.integer :target_page_id
       t.string  :label
       t.string  :slug
       t.string  :full_path
@@ -28,7 +37,7 @@ class CreateCms < ActiveRecord::Migration
       t.integer :children_count,  :null => false, :default => 0
       t.timestamps
     end
-    add_index :cms_pages, :full_path
+    add_index :cms_pages, [:cms_site_id, :full_path]
     add_index :cms_pages, [:parent_id, :position]
     
     # -- Page Blocks --------------------------------------------------------
@@ -43,27 +52,32 @@ class CreateCms < ActiveRecord::Migration
       t.timestamps
     end
     add_index :cms_blocks, [:cms_page_id, :type, :label]
-    # TODO: index this
     
     # -- Snippets -----------------------------------------------------------
     create_table :cms_snippets do |t|
+      t.integer :cms_site_id
       t.string  :label
+      t.string  :slug
       t.text    :content
       t.timestamps
     end
-    add_index :cms_snippets, :label, :unique => true
+    add_index :cms_snippets, [:cms_site_id, :slug], :unique => true
     
     # -- Assets -------------------------------------------------------------
     create_table :cms_uploads do |t|
+      t.integer :cms_site_id
       t.string  :file_file_name
       t.string  :file_content_type
       t.integer :file_file_size
       t.timestamps
     end
+    add_index :cms_uploads, [:cms_site_id, :file_file_name]
     
   end
   
   def self.down
+    drop_table :cms_sites
+    drop_table :cms_hosts
     drop_table :cms_layouts
     drop_table :cms_pages
     drop_table :cms_snippets