comfortable_mexican_sofa 1.0.2 → 1.0.3

data/Gemfile

@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
-gem 'rails',          '>=3.0.0'
+gem 'rails',          '>=3.0.1'
 gem 'sqlite3-ruby',   :require => 'sqlite3'
 gem 'active_link_to', '>=0.0.6'
 gem 'paperclip',      '>=2.3.3'

data/Gemfile.lock

@@ -2,12 +2,12 @@ GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    actionmailer (3.0.0)
-      actionpack (= 3.0.0)
+    actionmailer (3.0.1)
+      actionpack (= 3.0.1)
       mail (~> 2.2.5)
-    actionpack (3.0.0)
-      activemodel (= 3.0.0)
-      activesupport (= 3.0.0)
+    actionpack (3.0.1)
+      activemodel (= 3.0.1)
+      activesupport (= 3.0.1)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
       i18n (~> 0.4.1)
@@ -16,26 +16,25 @@ GEM
       rack-test (~> 0.5.4)
       tzinfo (~> 0.3.23)
     active_link_to (0.0.6)
-    activemodel (3.0.0)
-      activesupport (= 3.0.0)
+    activemodel (3.0.1)
+      activesupport (= 3.0.1)
       builder (~> 2.1.2)
       i18n (~> 0.4.1)
-    activerecord (3.0.0)
-      activemodel (= 3.0.0)
-      activesupport (= 3.0.0)
+    activerecord (3.0.1)
+      activemodel (= 3.0.1)
+      activesupport (= 3.0.1)
       arel (~> 1.0.0)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.0)
-      activemodel (= 3.0.0)
-      activesupport (= 3.0.0)
-    activesupport (3.0.0)
+    activeresource (3.0.1)
+      activemodel (= 3.0.1)
+      activesupport (= 3.0.1)
+    activesupport (3.0.1)
     arel (1.0.1)
       activesupport (~> 3.0.0)
     builder (2.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    gemcutter (0.5.0)
-      json_pure
+    gemcutter (0.6.1)
     git (1.2.5)
     i18n (0.4.1)
     jeweler (1.4.0)
@@ -43,38 +42,38 @@ GEM
       git (>= 1.2.5)
       rubyforge (>= 2.0.0)
     json_pure (1.4.6)
-    mail (2.2.5)
+    mail (2.2.7)
       activesupport (>= 2.3.6)
       mime-types
       treetop (>= 1.4.5)
     mime-types (1.16)
-    paperclip (2.3.3)
+    paperclip (2.3.4)
       activerecord
       activesupport
     polyglot (0.3.1)
     rack (1.2.1)
     rack-mount (0.6.13)
       rack (>= 1.0.0)
-    rack-test (0.5.4)
+    rack-test (0.5.6)
       rack (>= 1.0)
-    rails (3.0.0)
-      actionmailer (= 3.0.0)
-      actionpack (= 3.0.0)
-      activerecord (= 3.0.0)
-      activeresource (= 3.0.0)
-      activesupport (= 3.0.0)
+    rails (3.0.1)
+      actionmailer (= 3.0.1)
+      actionpack (= 3.0.1)
+      activerecord (= 3.0.1)
+      activeresource (= 3.0.1)
+      activesupport (= 3.0.1)
       bundler (~> 1.0.0)
-      railties (= 3.0.0)
-    railties (3.0.0)
-      actionpack (= 3.0.0)
-      activesupport (= 3.0.0)
+      railties (= 3.0.1)
+    railties (3.0.1)
+      actionpack (= 3.0.1)
+      activesupport (= 3.0.1)
       rake (>= 0.8.4)
       thor (~> 0.14.0)
     rake (0.8.7)
     rubyforge (2.0.4)
       json_pure (>= 1.1.7)
     sqlite3-ruby (1.3.1)
-    thor (0.14.0)
+    thor (0.14.3)
     treetop (1.4.8)
       polyglot (>= 0.3.1)
     tzinfo (0.3.23)
@@ -87,5 +86,5 @@ DEPENDENCIES
   jeweler (>= 1.4.0)
   mime-types
   paperclip (>= 2.3.3)
-  rails (>= 3.0.0)
+  rails (>= 3.0.1)
   sqlite3-ruby

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.0.3

data/app/controllers/cms_admin/base_controller.rb

@@ -1,7 +1,6 @@
-# Authentication module must have #authenticate method
-include ComfortableMexicanSofa.config.authentication.to_s.constantize
-
 class CmsAdmin::BaseController < ApplicationController
+  # Authentication module must have #authenticate method
+  include ComfortableMexicanSofa.config.authentication.to_s.constantize
   
   before_filter :authenticate,
                 :load_admin_cms_site

data/app/controllers/cms_content_controller.rb

@@ -26,7 +26,12 @@ protected
   end
   
   def load_cms_page
-    @cms_page = @cms_site.cms_pages.find_by_full_path!("/#{params[:cms_path]}")
+    # Attempting to load seed page
+    if ComfortableMexicanSofa.configuration.seed_data_path
+      @cms_page = CmsPage.load_from_file(@cms_site, "/#{params[:cms_path]}")
+    end
+    
+    @cms_page ||= @cms_site.cms_pages.find_by_full_path!("/#{params[:cms_path]}")
     return redirect_to(@cms_page.target_page.full_path) if @cms_page.target_page
   rescue ActiveRecord::RecordNotFound
     if @cms_page = @cms_site.cms_pages.find_by_full_path('/404')

data/app/models/cms_layout.rb

@@ -7,9 +7,16 @@ class CmsLayout < ActiveRecord::Base
   has_many :cms_pages, :dependent => :nullify
   
   # -- Validations ----------------------------------------------------------
-  validates :cms_site_id, :presence => true
-  validates :label,       :presence => true
-  validates :content,     :presence => true
+  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 }
+  validates :content,
+    :presence   => true
     
   # -- Class Methods --------------------------------------------------------
   # Tree-like structure for layouts
@@ -33,6 +40,17 @@ class CmsLayout < ActiveRecord::Base
     end.compact
   end
   
+  # Attempting to initialize layout object from yaml file that is found in config.seed_data_path
+  def self.load_from_file(site, name)
+    return nil if ComfortableMexicanSofa.config.seed_data_path.blank?
+    file_path = "#{ComfortableMexicanSofa.config.seed_data_path}/#{site.hostname}/layouts/#{name}.yml"
+    return nil unless File.exists?(file_path)
+    attributes            = YAML.load_file(file_path).symbolize_keys!
+    attributes[:parent]   = CmsLayout.load_from_file(site, attributes[:parent])
+    attributes[:cms_site] = site
+    new(attributes)
+  end
+  
   # -- Instance Methods -----------------------------------------------------
   # magical merging tag is <cms:page:content> If parent layout has this tag
   # defined its content will be merged. If no such tag found, parent content
@@ -47,10 +65,10 @@ class CmsLayout < ActiveRecord::Base
   end
   
   def merged_css
-    self.parent ? self.parent.merged_css + self.css : self.css.to_s
+    self.parent ? [self.parent.merged_css, self.css].join("\n") : self.css.to_s
   end
   
   def merged_js
-    self.parent ? self.parent.merged_js + self.js : self.js.to_s
+    self.parent ? [self.parent.merged_js, self.js].join("\n") : self.js.to_s
   end
 end

data/app/models/cms_page.rb

@@ -45,6 +45,20 @@ class CmsPage < ActiveRecord::Base
     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, url)
+    return nil if ComfortableMexicanSofa.config.seed_data_path.blank?
+    url = (url == '/')? '/index' : url.to_s.chomp('/')
+    file_path = "#{ComfortableMexicanSofa.config.seed_data_path}/#{site.hostname}/pages#{url}.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
+    new(attributes)
+  end
+  
   # -- Instance Methods -----------------------------------------------------
   # Processing content will return rendered content and will populate 
   # self.cms_tags with instances of CmsTag

data/app/models/cms_snippet.rb

@@ -19,7 +19,19 @@ class CmsSnippet < ActiveRecord::Base
   end
   
   def self.initialize_or_find(cms_page, slug)
-    find_by_slug(slug) || new(:slug => slug)
+    if ComfortableMexicanSofa.configuration.seed_data_path
+      s = CmsTag::Snippet.load_from_file(cms_page.cms_site, slug)
+    end
+    s || find_by_slug(slug) || new(:slug => slug)
+  end
+  
+  # Attempting to initialize snippet object from yaml file that is found in config.seed_data_path
+  def self.load_from_file(site, name)
+    return nil if ComfortableMexicanSofa.config.seed_data_path.blank?
+    file_path = "#{ComfortableMexicanSofa.config.seed_data_path}/#{site.hostname}/snippets/#{name}.yml"
+    return nil unless File.exists?(file_path)
+    attributes = YAML.load_file(file_path).symbolize_keys!
+    new(attributes)
   end
   
 end

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

@@ -1,4 +1,5 @@
-<%= form.text_field :label, :label => 'Layout Name' %>
+<%= form.text_field :label, :label => 'Layout Name', :id => (@cms_layout.new_record?? 'slugify' : nil)%>
+<%= form.text_field :slug, :id => 'slug' %>
 <%= 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 %>

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

@@ -14,6 +14,9 @@
     </div>
     <div class='label'>
       <%= link_to cms_layout.label, edit_cms_admin_layout_path(cms_layout) %>
+      <div class='sublabel'>
+        <%= link_to cms_layout.slug, edit_cms_admin_layout_path(cms_layout) %>
+      </div>
     </div>
   </div>
   <% if cms_layout.children.present? %>

data/comfortable_mexican_sofa.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{comfortable_mexican_sofa}
-  s.version = "1.0.2"
+  s.version = "1.0.3"
 
   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-19}
+  s.date = %q{2010-10-25}
   s.description = %q{}
   s.email = %q{oleg@theworkinggroup.ca}
   s.extra_rdoc_files = [
@@ -85,6 +85,7 @@ Gem::Specification.new do |s|
      "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_string.rb",
@@ -120,7 +121,12 @@ Gem::Specification.new do |s|
      "public/stylesheets/comfortable_mexican_sofa/structure.css",
      "public/stylesheets/comfortable_mexican_sofa/typography.css",
      "script/rails",
-     "test/fixtures/README.md",
+     "test/cms_seeds/test.host/layouts/default.yml",
+     "test/cms_seeds/test.host/layouts/nested.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/default.yml",
      "test/fixtures/cms_blocks.yml",
      "test/fixtures/cms_layouts.yml",
      "test/fixtures/cms_pages.yml",
@@ -136,6 +142,7 @@ 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/render_cms_seed_test.rb",
      "test/integration/render_cms_test.rb",
      "test/integration/sites_test.rb",
      "test/test_helper.rb",
@@ -150,14 +157,14 @@ Gem::Specification.new do |s|
      "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_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",
-     "tmp/restart.txt"
+     "test/unit/cms_upload_test.rb"
   ]
   s.homepage = %q{http://github.com/theworkinggroup/comfortable-mexican-sofa}
   s.rdoc_options = ["--charset=UTF-8"]
@@ -172,6 +179,7 @@ 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/render_cms_seed_test.rb",
      "test/integration/render_cms_test.rb",
      "test/integration/sites_test.rb",
      "test/test_helper.rb",
@@ -186,6 +194,7 @@ Gem::Specification.new do |s|
      "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_string_test.rb",

data/config/routes.rb

@@ -14,9 +14,9 @@ Rails.application.routes.draw do
   end
   
   scope :controller => :cms_content do
-    get '/cms-css/:id'  => :render_css,   :format => 'css'
-    get '/cms-js/:id'   => :render_js,    :format => 'js'
-    get '/'             => :render_html,  :path => '(*cms_path)'
+    get '/cms-css/:id'  => :render_css,   :as => 'cms_css',   :format => 'css'
+    get '/cms-js/:id'   => :render_js,    :as => 'cms_js',    :format => 'js'
+    get '/'             => :render_html,  :as => 'cms_html',  :path => '(*cms_path)'
   end
   
 end

data/db/migrate/01_create_cms.rb

@@ -14,14 +14,15 @@ class CreateCms < ActiveRecord::Migration
       t.integer :parent_id
       t.string  :app_layout
       t.string  :label
+      t.string  :slug
       t.text    :content
       t.text    :css
       t.text    :js
       t.integer :position, :null => false, :default => 0
       t.timestamps
     end
-    add_index :cms_layouts, [:cms_site_id, :label]
     add_index :cms_layouts, [:parent_id, :position]
+    add_index :cms_layouts, [:cms_site_id, :slug], :unique => true
     
     # -- Pages --------------------------------------------------------------
     create_table :cms_pages do |t|

data/lib/comfortable_mexican_sofa/cms_tag/helper.rb

@@ -0,0 +1,20 @@
+class CmsTag::Helper
+  
+  attr_accessor :label
+  
+  include CmsTag
+  
+  def self.regex_tag_signature(label = nil)
+    label ||= /\w+/
+    /<\s*cms:helper:(#{label})\s*\/?>/
+  end
+  
+  def regex_tag_signature
+    self.class.regex_tag_signature(label)
+  end
+  
+  def content
+    "<%= #{label} %>"
+  end
+  
+end

data/lib/comfortable_mexican_sofa/configuration.rb

@@ -6,14 +6,15 @@ class ComfortableMexicanSofa::Configuration
   # Module that will handle authentication to access cms-admin area
   attr_accessor :authentication
   
-  # Enable cms to manage multiple sites
-  attr_accessor :multiple_sites
+  # Location of YAML files that can be used to render pages instead of pulling
+  # data from the database. Not active if not specified.
+  attr_accessor :seed_data_path
   
   # Configuration defaults
   def initialize
-    @cms_title      = 'ComfortableMexicanSofa'
-    @authentication = 'CmsHttpAuthentication'
-    @multiple_sites = false
+    @cms_title        = 'ComfortableMexicanSofa'
+    @authentication   = 'ComfortableMexicanSofa::HttpAuth'
+    @seed_data_path   = nil
   end
   
 end

data/lib/generators/README

@@ -1,12 +1,17 @@
-  ____                 __            _        _     _      
- / ___|___  _ __ ___  / _| ___  _ __| |_ __ _| |__ | | ___ 
-| |   / _ \| '_ ` _ \| |_ / _ \| '__| __/ _` | '_ \| |/ _ \
-| |__| (_) | | | | | |  _| (_) | |  | || (_| | |_) | |  __/
- \____\___/|_| |_| |_|_|  \___/|_|   \__\__,_|_.__/|_|\___|
- __  __           _                   ____         __       
-|  \/  | _____  _(_) ___ __ _ _ __   / ___|  ___  / _| __ _ 
-| |\/| |/ _ \ \/ / |/ __/ _` | '_ \  \___ \ / _ \| |_ / _` |
-| |  | |  __/>  <| | (_| (_| | | | |  ___) | (_) |  _| (_| |
-|_|  |_|\___/_/\_\_|\___\__,_|_| |_| |____/ \___/|_|  \__,_|
+    ____                 __            _        _     _      
+   / ___|___  _ __ ___  / _| ___  _ __| |_ __ _| |__ | | ___ 
+  | |   / _ \| '_ ` _ \| |_ / _ \| '__| __/ _` | '_ \| |/ _ \
+  | |__| (_) | | | | | |  _| (_) | |  | || (_| | |_) | |  __/
+   \____\___/|_| |_| |_|_|  \___/|_|   \__\__,_|_.__/|_|\___|
+   __  __           _                   ____         __       
+  |  \/  | _____  _(_) ___ __ _ _ __   / ___|  ___  / _| __ _ 
+  | |\/| |/ _ \ \/ / |/ __/ _` | '_ \  \___ \ / _ \| |_ / _` |
+  | |  | |  __/>  <| | (_| (_| | | | |  ___) | (_) |  _| (_| |
+  |_|  |_|\___/_/\_\_|\___\__,_|_| |_| |____/ \___/|_|  \__,_|
 
-Hey, thanks for being AWESOME!
+Hey! Everything is almost done. Please don't forget to
+  
+  * run migrations -> `rake db:migrate`
+  
+After that go to http://your-awesome-app/cms-admin to start
+populating content.

data/test/cms_seeds/test.host/layouts/default.yml

@@ -0,0 +1,2 @@
+label: Default Layout
+content: <html><cms:page:content/></html>

data/test/cms_seeds/test.host/layouts/nested.yml

@@ -0,0 +1,3 @@
+label: Nested Layout
+parent: default
+content: <div><cms:page:content/></div>

data/test/cms_seeds/test.host/pages/child.yml

@@ -0,0 +1,10 @@
+label: Child Page
+parent: /
+cms_layout: default
+slug: child
+cms_blocks_attributes:
+  - 
+    label: content
+    type: CmsTag::PageText
+    content: |-
+      Child Page Content

data/test/cms_seeds/test.host/pages/child/subchild.yml

@@ -0,0 +1,10 @@
+label: Child Page
+parent: /child
+cms_layout: nested
+slug: subchild
+cms_blocks_attributes:
+  - 
+    label: content
+    type: CmsTag::PageText
+    content: |-
+      Sub Child Page Content <cms:snippet:default/>

data/test/cms_seeds/test.host/pages/index.yml

@@ -0,0 +1,10 @@
+label: Default Page
+parent:
+cms_layout: default
+slug: 
+cms_blocks_attributes:
+  - 
+    label: content
+    type: CmsTag::PageText
+    content: |-
+      Default Page Content

data/test/cms_seeds/test.host/snippets/default.yml

@@ -0,0 +1,3 @@
+label: Default Snippet
+slug: default
+content: Content for Default Snippet

data/test/fixtures/cms_layouts.yml

@@ -1,6 +1,7 @@
 default:
   cms_site: default
   label: Default Layout
+  slug: default
   parent:
   content: |-
     <cms:field:default_field_text:text>
@@ -9,39 +10,27 @@ default:
     layout_content_b
     <cms:snippet:default>
     layout_content_c
-  css: |-
-    body { background-color: red }
-    p { color: #fff }
-  js: |-
-    $(document).ready(function() {
-      alert('hi');
-    })
+  css: default_css
+  js: default_js
     
 nested:
   cms_site: default
   label: Nested Layout
+  slug: nested
   parent:
   content: |-
     <cms:page:header/>
     <cms:page:content/>
-  css: |-
-    body { background-color: red }
-  js: |-
-    $(document).ready(function() {
-      alert('hi');
-    })
+  css: nested_css
+  js: nested_js
     
 child:
   cms_site: default
   label: Child Layout
+  slug: child
   parent: nested
   content: |-
     <cms:page:left_column>
     <cms:page:right_column>
-  css: |-
-    body { p: #fff }
-  js: |-
-    js: |-
-      $(document).ready(function() {
-        alert('sup');
-      })
+  css: child_css
+  js: child_js

data/test/functional/cms_admin/layouts_controller_test.rb

@@ -37,6 +37,7 @@ class CmsAdmin::LayoutsControllerTest < ActionController::TestCase
     assert_difference 'CmsLayout.count' do
       post :create, :cms_layout => {
         :label    => 'Test Layout',
+        :slug     => 'test',
         :content  => 'Test Content'
       }
       assert_response :redirect

data/test/integration/render_cms_seed_test.rb

@@ -0,0 +1,16 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class RenderCmsSeedTest < ActionDispatch::IntegrationTest
+  
+  def test_render_with_seed_data_enabled
+    get '/child/subchild'
+    assert_response 404
+    
+    ComfortableMexicanSofa.configuration.seed_data_path = File.expand_path('../cms_seeds', File.dirname(__FILE__))
+    
+    get '/child/subchild'
+    assert_response :success
+    assert_equal '<html><div>Sub Child Page Content Content for Default Snippet</div></html>', response.body
+  end
+  
+end

data/test/test_helper.rb

@@ -11,6 +11,7 @@ class ActiveSupport::TestCase
     ComfortableMexicanSofa.configure do |config|
       config.cms_title      = 'ComfortableMexicanSofa'
       config.authentication = 'ComfortableMexicanSofa::HttpAuth'
+      config.seed_data_path = nil
     end
     ComfortableMexicanSofa::HttpAuth.username = 'username'
     ComfortableMexicanSofa::HttpAuth.password = 'password'

data/test/unit/cms_configuration_test.rb

@@ -6,6 +6,7 @@ class CmsConfigurationTest < ActiveSupport::TestCase
     assert config = ComfortableMexicanSofa.configuration
     assert_equal 'ComfortableMexicanSofa', config.cms_title
     assert_equal 'ComfortableMexicanSofa::HttpAuth', config.authentication
+    assert_equal nil, config.seed_data_path
   end
   
   def test_initialization_overrides

data/test/unit/cms_layout_test.rb

@@ -11,13 +11,16 @@ class CmsLayoutTest < ActiveSupport::TestCase
   def test_validations
     layout = CmsLayout.create
     assert layout.errors.present?
-    assert_has_errors_on layout, [:label, :content]
+    assert_has_errors_on layout, [:label, :slug, :content]
   end
   
   def test_options_for_select
-    assert_equal ['Default Layout', 'Nested Layout', '. . Child Layout'], CmsLayout.options_for_select(cms_sites(:default)).collect{|t| t.first}
-    assert_equal ['Default Layout', 'Nested Layout'], CmsLayout.options_for_select(cms_sites(:default), cms_layouts(:child)).collect{|t| t.first}
-    assert_equal ['Default Layout'], CmsLayout.options_for_select(cms_sites(:default), cms_layouts(:nested)).collect{|t| t.first}
+    assert_equal ['Default Layout', 'Nested Layout', '. . Child Layout'],
+      CmsLayout.options_for_select(cms_sites(:default)).collect{|t| t.first}
+    assert_equal ['Default Layout', 'Nested Layout'],
+      CmsLayout.options_for_select(cms_sites(:default), cms_layouts(:child)).collect{|t| t.first}
+    assert_equal ['Default Layout'],
+      CmsLayout.options_for_select(cms_sites(:default), cms_layouts(:nested)).collect{|t| t.first}
   end
   
   def test_app_layouts_for_select
@@ -36,13 +39,28 @@ class CmsLayoutTest < ActiveSupport::TestCase
   end
   
   def test_merged_css
-    merged_css = cms_layouts(:nested).css + cms_layouts(:child).css
-    assert_equal merged_css, cms_layouts(:child).merged_css
+    assert_equal "nested_css\nchild_css", cms_layouts(:child).merged_css
   end
   
   def test_merged_js
-    merged_js = cms_layouts(:nested).js + cms_layouts(:child).js
-    assert_equal merged_js, cms_layouts(:child).merged_js
+    assert_equal "nested_js\nchild_js", cms_layouts(:child).merged_js
+  end
+  
+  def test_load_from_file
+    assert !CmsLayout.load_from_file(cms_sites(:default), 'default')
+    
+    ComfortableMexicanSofa.configuration.seed_data_path = File.expand_path('../cms_seeds', File.dirname(__FILE__))
+    
+    assert !CmsLayout.load_from_file(cms_sites(:default), 'bogus')
+    
+    assert layout = CmsLayout.load_from_file(cms_sites(:default), 'default')
+    assert_equal 'Default Layout', layout.label
+    assert_equal '<html><cms:page:content/></html>', layout.content
+    
+    assert layout = CmsLayout.load_from_file(cms_sites(:default), 'nested')
+    assert_equal 'Nested Layout', layout.label
+    assert_equal '<div><cms:page:content/></div>', layout.content
+    assert_equal '<html><div><cms:page:content/></div></html>', layout.merged_content
   end
   
 end

data/test/unit/cms_page_test.rb

@@ -112,12 +112,41 @@ class CmsPageTest < ActiveSupport::TestCase
   end
   
   def test_options_for_select
-    assert_equal ['Default Page', '. . Child Page'], CmsPage.options_for_select(cms_sites(:default)).collect{|t| t.first }
-    assert_equal ['Default Page'], CmsPage.options_for_select(cms_sites(:default), cms_pages(:child)).collect{|t| t.first }
-    assert_equal [], CmsPage.options_for_select(cms_sites(:default), cms_pages(:default))
+    assert_equal ['Default Page', '. . Child Page'], 
+      CmsPage.options_for_select(cms_sites(:default)).collect{|t| t.first }
+    assert_equal ['Default Page'], 
+      CmsPage.options_for_select(cms_sites(:default), cms_pages(:child)).collect{|t| t.first }
+    assert_equal [], 
+      CmsPage.options_for_select(cms_sites(:default), cms_pages(:default))
     
     page = CmsPage.new(new_params(:parent => cms_pages(:default)))
-    assert_equal ['Default Page', '. . Child Page'], CmsPage.options_for_select(cms_sites(:default), page).collect{|t| t.first }
+    assert_equal ['Default Page', '. . Child Page'],
+      CmsPage.options_for_select(cms_sites(:default), page).collect{|t| t.first }
+  end
+  
+  def test_load_from_file
+    assert !CmsPage.load_from_file(cms_sites(:default), '/')
+    
+    ComfortableMexicanSofa.configuration.seed_data_path = File.expand_path('../cms_seeds', File.dirname(__FILE__))
+    
+    assert !CmsPage.load_from_file(cms_sites(:default), '/bogus')
+    
+    assert page = CmsPage.load_from_file(cms_sites(:default), '/')
+    assert_equal 'Default Page', page.label
+    assert_equal 1, page.cms_blocks.size
+    assert page.cms_layout
+    assert_equal '<html>Default Page Content</html>', page.content
+    
+    assert page = CmsPage.load_from_file(cms_sites(:default), '/child')
+    assert_equal 1, page.cms_blocks.size
+    assert page.cms_layout
+    assert_equal '<html>Child Page Content</html>', page.content
+    
+    assert page = CmsPage.load_from_file(cms_sites(:default), '/child/subchild')
+    assert_equal 1, page.cms_blocks.size
+    assert page.cms_layout
+    assert_equal 'Nested Layout', page.cms_layout.label
+    assert_equal '<html><div>Sub Child Page Content Content for Default Snippet</div></html>', page.content
   end
   
 protected

data/test/unit/cms_snippet_test.rb

@@ -20,4 +20,16 @@ class CmsSnippetTest < ActiveSupport::TestCase
     assert_equal '', CmsSnippet.content_for('nonexistent_snippet')
   end
   
+  def test_load_from_file
+    assert !CmsSnippet.load_from_file(cms_sites(:default), 'default')
+    
+    ComfortableMexicanSofa.configuration.seed_data_path = File.expand_path('../cms_seeds', File.dirname(__FILE__))
+    
+    assert !CmsSnippet.load_from_file(cms_sites(:default), 'bogus')
+    
+    assert snippet = CmsSnippet.load_from_file(cms_sites(:default), 'default')
+    assert_equal 'Default Snippet', snippet.label
+    assert_equal 'Content for Default Snippet', snippet.content
+  end
+  
 end

data/test/unit/cms_tags/helper_test.rb

@@ -0,0 +1,29 @@
+require File.dirname(__FILE__) + '/../../test_helper'
+
+class HelperTest < ActiveSupport::TestCase
+  
+  def test_initialize_tag
+    %w(
+      <cms:helper:method_name/>
+    ).each do |tag_signature|
+      assert tag = CmsTag::Helper.initialize_tag(cms_pages(:default), tag_signature)
+    end
+  end
+  
+  def test_initialize_tag_failure
+    %w(
+      <cms:helper>
+      <cms:not_helper:method_name/>
+      not_a_tag
+    ).each do |tag_signature|
+      assert_nil CmsTag::Helper.initialize_tag(cms_pages(:default), tag_signature)
+    end
+  end
+  
+  def test_content_and_render
+    tag = CmsTag::Helper.initialize_tag(cms_pages(:default), "<cms:helper:method_name/>")
+    assert_equal "<%= method_name %>", tag.content
+    assert_equal "<%= method_name %>", tag.render
+  end
+  
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 1
   - 0
-  - 2
-  version: 1.0.2
+  - 3
+  version: 1.0.3
 platform: ruby
 authors: 
 - Oleg Khabarov
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-19 00:00:00 -04:00
+date: 2010-10-25 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -145,6 +145,7 @@ files:
 - 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_string.rb
@@ -180,7 +181,12 @@ files:
 - public/stylesheets/comfortable_mexican_sofa/structure.css
 - public/stylesheets/comfortable_mexican_sofa/typography.css
 - script/rails
-- test/fixtures/README.md
+- test/cms_seeds/test.host/layouts/default.yml
+- test/cms_seeds/test.host/layouts/nested.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/default.yml
 - test/fixtures/cms_blocks.yml
 - test/fixtures/cms_layouts.yml
 - test/fixtures/cms_pages.yml
@@ -196,6 +202,7 @@ files:
 - test/functional/cms_admin/uploads_controller_test.rb
 - test/functional/cms_content_controller_test.rb
 - test/integration/authentication_test.rb
+- test/integration/render_cms_seed_test.rb
 - test/integration/render_cms_test.rb
 - test/integration/sites_test.rb
 - test/test_helper.rb
@@ -210,6 +217,7 @@ files:
 - 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_string_test.rb
@@ -217,7 +225,6 @@ files:
 - test/unit/cms_tags/partial_test.rb
 - test/unit/cms_tags/snippet_test.rb
 - test/unit/cms_upload_test.rb
-- tmp/restart.txt
 has_rdoc: true
 homepage: http://github.com/theworkinggroup/comfortable-mexican-sofa
 licenses: []
@@ -260,6 +267,7 @@ test_files:
 - test/functional/cms_admin/uploads_controller_test.rb
 - test/functional/cms_content_controller_test.rb
 - test/integration/authentication_test.rb
+- test/integration/render_cms_seed_test.rb
 - test/integration/render_cms_test.rb
 - test/integration/sites_test.rb
 - test/test_helper.rb
@@ -274,6 +282,7 @@ test_files:
 - 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_string_test.rb

data/test/fixtures/README.md

@@ -1,22 +0,0 @@
-Default Test Application Data Structure
-=======================================
-Layout
-------
-    <cms:field:default_field:text>
-    layout_content_a
-    <cms:page:default_page:text>
-    layout_content_b
-    <cms:snippet:default_snippet>
-    layout_content_c
-Page
-----
-### CmsBlock::FieldText
-    default_field_content
-### CmsBlock::PageText
-    default_page_content_a
-    <cms:snippet:default_snippet>
-    default_page_content_a
-Snippets
--------
-### Snippet
-    default_snippet_content