cms-lite 0.4.1 → 0.5.0

data/README.rdoc

@@ -15,7 +15,6 @@ and you're ready to go.
 === Add the gem to environment.rb
   config.gem 'cms-lite', :lib => 'cms_lite'
 
-
 === Handy Rake Tasks
 CMS Lite comes with rake tasks that can help you manage your project.  These include the ability to send all files from one language
 to google for translation into 24 other languages.  To gain access to these tasks simple add the following lines to Rakefile:
@@ -32,8 +31,18 @@ then visit:
 or 
   http://localhost:3000/cmslite-protected/hello-world
 
+== Usage
+To have a page with the url 'http://www.example.com/blue/home' create a page '/content/pages/en/blue/home.html.erb
+To create a page that requires a login at the url 'http://www.example.com/red/protected' create a page '/content/protected-page/en/red/protected.html.erb'
+
+If you want a page mapped directly off the root ie http://www.example.com/wow create a directory called default and put the file there.
+ie 'content/pages/en/default/wow.html.erb'
+
+You can add new 'content' paths by calling append_content_path:
+  CmsLite.append_content_path("somewhere/else/content")
+This let's you add pages like 'somewhere/else/content/en/green/home.html.erb' and find them at http://www.example.com/green/home
 
-=== Translate your content with Google
+== Translate your content with Google
   rake cms_lite:translate 
   
   Will translate all files in the 'en' directory into the following languages (codes):

data/Rakefile

@@ -71,7 +71,7 @@ begin
         )
 
         host = "#{config['username']}@rubyforge.org"
-        remote_dir = "/var/www/gforge-projects/the-perfect-gem/"
+        remote_dir = "/var/www/gforge-projects/cms-lite/"
         local_dir = 'rdoc'
 
         Rake::SshDirPublisher.new(host, remote_dir, local_dir).upload

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.5.0

data/app/controllers/cms_lite_controller.rb

@@ -14,7 +14,8 @@ class CmsLiteController < ApplicationController
   def render_content_page(cms_lite_path, request_layout = '')
     content_page = nil
     CmsLite.content_paths.each do |content_path|
-      path = File.join(RAILS_ROOT, content_path, cms_lite_path, I18n.locale.to_s, params[:content_key], params[:content_page].join('/'))
+      content_page_key = params[:content_page].is_a?(Array) ? params[:content_page].join('/') : params[:content_page]
+      path = File.join(RAILS_ROOT, content_path, cms_lite_path, I18n.locale.to_s, params[:content_key], content_page_key)
       format = params[:format] || 'htm'
       content_page = Dir.glob("#{path}.#{format}").first
       content_page = Dir.glob("#{path}").first  if content_page.nil?

data/cms-lite.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cms-lite}
-  s.version = "0.4.1"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Ball"]
-  s.date = %q{2009-07-21}
+  s.date = %q{2009-07-22}
   s.description = %q{CMS gem that makes it simple to interact with your content developers by serving pages from '/content'.}
   s.email = %q{justinball@gmail.com}
   s.extra_rdoc_files = [
@@ -58,6 +58,7 @@ Gem::Specification.new do |s|
      "test/rails_root/config/initializers/requires.rb",
      "test/rails_root/config/initializers/session_store.rb",
      "test/rails_root/config/routes.rb",
+     "test/rails_root/content/pages/en/default/root.html.erb",
      "test/rails_root/content/pages/en/demo/hi.html.erb",
      "test/rails_root/content/pages/en/open/hello.html.erb",
      "test/rails_root/content/protected-pages/en/demo/hi.html.erb",
@@ -265,6 +266,7 @@ Gem::Specification.new do |s|
      "test/rails_root/test/unit/.keep",
      "test/rails_root/test/unit/cms_lite_test.rb",
      "test/rails_root/themes/blue/content/pages/en/blue/blue.html.erb",
+     "test/rails_root/themes/blue/content/pages/en/default/blue_root.html.erb",
      "test/rails_root/themes/blue/content/pages/en/open/blue.html.erb",
      "test/rails_root/themes/blue/description.txt",
      "test/rails_root/themes/blue/locales/en.yml",

data/config/cms_lite_routes.rb

@@ -1,11 +1,11 @@
 ActionController::Routing::Routes.draw do |map|
 
   CmsLite.cms_routes.each do |cms_route|
-    map.connect cms_route[:uri], :controller => 'cms_lite', :action => 'show_page', :content_key => cms_route[:content_key]
+    map.connect cms_route[:uri], CmsLite.build_route_options('show_page', cms_route)
   end
   
   CmsLite.protected_cms_routes.each do |cms_route|
-    map.connect cms_route[:uri], :controller => 'cms_lite', :action => 'show_protected_page', :content_key => cms_route[:content_key]
+    map.connect cms_route[:uri], CmsLite.build_route_options('show_protected_page', cms_route)
   end
-  
+
 end

data/lib/cms_lite.rb

@@ -7,6 +7,7 @@ class CmsLite
   CONTENT_PATH = 'content'
   PAGES_PATH = 'pages'
   PROTECTED_PAGES_PATH = 'protected-pages'
+  ROOT_PATH = 'default' # pages located in this directory will be served off the root of the website. ie http://www.example.com/my-page
   
   class << self
     
@@ -43,10 +44,23 @@ class CmsLite
             path = File.basename(content_item)
             content_key = content_item.gsub(localization_directory, '')
             if !content_key.blank?
-              cms_route = { :uri => "/#{path}/*content_page",
-                            :content_key => content_key }
-              if !cms_routes.include?(cms_route)
-                cms_routes << cms_route
+              # pages found in the root path get root mapping
+              if path == ROOT_PATH
+                Dir.glob("#{content_item}/*").each do |root_page|
+                  root_page_key = File.basename(File.basename(root_page, ".*"), ".*") # for files that look like root.html.erb
+                  cms_route = { :uri => "/#{root_page_key}",
+                                :content_page => "#{root_page_key}",
+                                :content_key => content_key }
+                  if !cms_routes.include?(cms_route)
+                    cms_routes << cms_route
+                  end
+                end
+              else
+                cms_route = { :uri => "/#{path}/*content_page",
+                              :content_key => content_key }
+                if !cms_routes.include?(cms_route)
+                  cms_routes << cms_route
+                end
               end
             end
           end
@@ -55,6 +69,12 @@ class CmsLite
       cms_routes
     end
     
+    def build_route_options(action, cms_route)
+      options = { :controller => 'cms_lite', :action => action, :content_key => cms_route[:content_key] }
+      options = options.merge(:content_page => cms_route[:content_page]) if cms_route[:content_page]
+      options
+    end
+    
     def content_paths
       @@content_paths ||= [CONTENT_PATH]
     end

data/test/rails_root/content/pages/en/default/root.html.erb

@@ -0,0 +1 @@
+hello from the root

data/test/rails_root/features/view_cms_pages.feature

@@ -9,26 +9,37 @@ Scenario: Anonymous user visits public cms lite page
   When I go to "/open/hello"
   Then I should see "hello world"
 
+Scenario: Anonymous user visits root public page
+  Given cms lite file "content/pages/en/default/root.html.erb" contains "hello from the root"
+  And I am not logged in
+  When I go to "/root"
+  Then I should see "hello from the root"
+  
 Scenario: Anonymous user visits public cms lite page in blue theme
   Given cms lite file "themes/blue/content/pages/en/open/blue.html.erb" contains "blue world"
   And I am not logged in
   When I go to "/open/blue"
   Then I should see "blue world"
-    
+
+Scenario: Anonymous user visits public root page in blue theme
+  Given cms lite file "themes/blue/content/pages/en/default/blue_root.html.erb" contains "blue root"
+  And I am not logged in
+  When I go to "/blue_root"
+  Then I should see "blue root"
+      
 Scenario: Anonymous user visits protected cms lite page
   Given protected cms lite file "content/protected-pages/en/protected/safe-hello.html.erb" contains "protect hello world"
   And I am not logged in
   When I go to "/protected/safe-hello"
   Then I should see the login
 	And I should see a "notice" flash message
-	
+
 Scenario: Logged in user visits protected cms lite page
   Given protected cms lite file "content/protected-pages/en/protected/safe-hello.html.erb" contains "protect hello world"
   And I log in as new user
   When I go to "/protected/safe-hello"
   Then I should see "protect hello world"
-  
-  
+
 Scenario: Logged in user visits protected cms lite page in red theme
   Given protected cms lite file "themes/red/content/protected-pages/en/red/red.html.erb" contains "protect red world"
   And I log in as new user

data/test/rails_root/test/functional/cms_lite_controller_test.rb

@@ -12,6 +12,13 @@ class CmsLiteControllerTest < ActionController::TestCase
       should_respond_with :success
     end
     
+    context "unprotected root pages" do
+      setup do
+        get :show_page, :content_key => '/default', :content_page => 'root'
+      end
+      should_respond_with :success
+    end
+    
     context "protected pages"do
       context "not logged in" do
         setup do

data/test/rails_root/test/test_helper.rb

@@ -2,6 +2,7 @@ $:.reject! { |e| e.include? 'TextMate' }
 ENV["RAILS_ENV"] = "test"
 require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
 require 'test_help'
+require 'ruby-debug'
 gem 'thoughtbot-factory_girl' # from github
 require 'factory_girl'
 require 'mocha'
@@ -35,4 +36,10 @@ class ActiveSupport::TestCase
   def ensure_flash(val)
     assert_contains flash.values, val, ", Flash: #{flash.inspect}"
   end
+  
+  # For Selenium
+  # setup do |session|
+  #   session.host! "localhost:3001"
+  # end
+    
 end

data/test/rails_root/themes/blue/content/pages/en/default/blue_root.html.erb

@@ -0,0 +1 @@
+blue root

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cms-lite
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors: 
 - Justin Ball
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-21 00:00:00 -06:00
+date: 2009-07-22 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -71,6 +71,7 @@ files:
 - test/rails_root/config/initializers/requires.rb
 - test/rails_root/config/initializers/session_store.rb
 - test/rails_root/config/routes.rb
+- test/rails_root/content/pages/en/default/root.html.erb
 - test/rails_root/content/pages/en/demo/hi.html.erb
 - test/rails_root/content/pages/en/open/hello.html.erb
 - test/rails_root/content/protected-pages/en/demo/hi.html.erb
@@ -278,6 +279,7 @@ files:
 - test/rails_root/test/unit/.keep
 - test/rails_root/test/unit/cms_lite_test.rb
 - test/rails_root/themes/blue/content/pages/en/blue/blue.html.erb
+- test/rails_root/themes/blue/content/pages/en/default/blue_root.html.erb
 - test/rails_root/themes/blue/content/pages/en/open/blue.html.erb
 - test/rails_root/themes/blue/description.txt
 - test/rails_root/themes/blue/locales/en.yml