comfortable_mexican_sofa 1.3.4 → 1.3.5

data/README.md

@@ -6,12 +6,12 @@ Features
 --------
 * Simple integration with Rails 3.0 and 3.1 apps
 * Build your application in Rails, not in CMS
-* Powerful page templating capability
-* Multiple Sites from a single installation
+* Powerful page templating capability using [Tags](https://github.com/twg/comfortable-mexican-sofa/wiki/Tags)
+* [Multiple Sites](https://github.com/twg/comfortable-mexican-sofa/wiki/Sites) from a single installation
 * Multilingual
-* Fixtures for initial content population
-* Revision History
-* Great reusable admin interface
+* [Fixtures](https://github.com/twg/comfortable-mexican-sofa/wiki/Working-with-CMS-fixtures) for initial content population
+* [Revision History](https://github.com/twg/comfortable-mexican-sofa/wiki/Revisions)
+* [Great reusable admin interface](https://github.com/twg/comfortable-mexican-sofa/wiki/Reusing-sofa%27s-admin-area)
 * Almost no 3rd party library dependencies
 
 Installation
@@ -51,110 +51,6 @@ For more information please [see Wiki pages](https://github.com/twg/comfortable-
 
 ![Sofa's Page Edit View](https://github.com/twg/comfortable-mexican-sofa/raw/master/doc/page_editing.png)
 
-CMS Tags Overview
------------------
-There are a [number of cms tags]() that define where the content goes and how it's populated. **Page** and **Field** tags are used during layout creation. **Snippet**, **Helper** and **Partial** tags can be peppered pretty much anywhere. Tag is structured like so:
-    
-    {{ cms:page:content:text }}
-        \    \     \      \ 
-         \    \     \      ‾ tag format or extra attributes
-          \    \     ‾‾‾‾‾‾‾ label/slug/path for the tag, 
-           \    ‾‾‾‾‾‾‾‾‾‾‾‾ tag type (page, field, snippet, helper, partial)
-            ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾ cms tag identifier
-           
-Here's a number of tag variations:
-    
-    # Page tags are pieces of text content that will get rendered on the page. Format defines how form field
-    # gets rendered in the page editing/creation section of the admin area.
-    
-    {{ cms:page:some_label:text }}
-    {{ cms:page:some_label }}             # shorthand for above. 'text' is default format for pages
-    {{ cms:page:some_label:string }}      # in admin area text field is displayed instead of textarea
-    {{ cms:page:some_label:datetime }}    # similarly, datetime widget in the admin area
-    {{ cms:page:some_label:integer }}     # a number field
-    {{ cms:page:some_label:rich_text }}   # wymiwyg editor will be used to edit this content
-    
-    # Field tags are pieces of text content that are NOT rendered on the page. They can be accessed via
-    # your application's layout / helpers / partials etc. Useful for populating this like <meta> tags.
-    # Field formats are exactly the same as for Page tags.
-    
-    {{ cms:field:some_label:string }}
-    {{ cms:field:some_label }}            # same as above. 'string' is default format for fields
-    
-    # Snippet tags are bits or reusable content that can be used anywhere. Imagine creating content like
-    # a sharing widget, or business address that you want to randomly use across your site.
-    
-    {{ cms:snippet:some_label }}
-    
-    # Helper is a wrapper for your regular helpers. Normally you cannot have IRB in CMS content, so there are
-    # tags that allow calling helpers and partials.
-    
-    {{ cms:helper:method_name }}          # same as <%= method_name() %>
-    {{ cms:helper:method_name:x:y:z }}    # same as <%= method_name('x', 'y', 'z') %>
-    
-    # Partial tags are wrappers just like above helper ones.
-    
-    {{ cms:partial:path/to/partial }}     # same as <%= render :partial => 'path/to/partial' %>
-    {{ cms:partial:path/to/partial:a:b }} # same as <%= render :partial => 'path/to/partial',
-                                          #   :locals => { :param_1 => 'a', :param_1 => 'b' } %>
-    
-Integrating CMS with your app
------------------------------
-ComfortableMexicanSofa is a plugin, so it allows you to easily access content it manages. Here's some things you can do.
-
-You can use your existing application layout. When creating CMS layouts there's an option to use an application layout. Suddenly all CMS pages using that layout will be rendered through <%= yield %> of your application layout.
-
-You can use CMS pages as regular views:
-    
-    def show
-      @dinosaur = Dinosaur.find(params[:id])
-      # CMS page probably should have either helper or partial tag to display @dinosaur details
-      render :cms_page => '/dinosaur
-    end
-    
-Actually, you don't need to explicitly render a CMS page like that. Sofa will try to rescue a TemplateNotFound by providing a matching CMS page.
-
-You can access **Page** or **Field** tag content directly from your application (layouts/helpers/partials) via `cms_page_content` method. This is how you can pull things like meta tags into your application layout.
-    
-    # if @cms_page is available (meaning Sofa is doing the rendering)
-    cms_page_content(:page_or_field_label)
-    
-    # anywhere else
-    cms_page_content(:page_or_field_label, CmsPage.find_by_slug(...))
-    
-Similarly you can access **Snippet** content:
-    
-    cms_snippet_content(:snippet_slug)
-    
-You can also directly access `@cms_site`, `@cms_layout` and `@cms_page` objects from helpers, partials and application layouts used in rendering of a CMS page.
-    
-Extending Admin Area
---------------------
-
-If you wish, you can re-use Sofa's admin area for things you need to administer in your application. To do this, first you will need to make your admin controllers to inherit from CmsAdmin::BaseController. This way, your admin views will be using Sofa's admin layout and it's basic HttpAuth.
-    
-    class Admin::CategoriesController < CmsAdmin::BaseController
-      # your code goes here
-    end
-    
-From your views you can use `cms_form_for` method to re-use Sofa's FormBuilder. There are also some existing styles for tables, will\_paginate helpers, etc. Take a look in [/public/stylesheets/comfortable\_mexican\_sofa/content.css](https://github.com/twg/comfortable-mexican-sofa/blob/master/public/stylesheets/comfortable_mexican_sofa/content.css)
-
-You will probably want to add a navigation link on the left side, and for that you will want to use ViewHook functionality. Create a partial that has a link to your admin area and declare in Sofa's initializer: `ComfortableMexicanSofa::ViewHooks.add(:navigation, '/admin/navigation')`. Similarly you can add extra stylesheets, etc into admin area in the same way.
-    
-Do you have other authentication system in place (like Devise, AuthLogic, etc) and wish to use that? For that, you will need to create a module that does the authentication check and make ComfortableMexicanSofa use it. For example:
-    
-    module CmsDeviseAuth
-      def authenticate
-        unless current_user && current_user.admin?
-          redirect_to new_user_session_path
-        end
-      end
-    end
-    
-You can put this module in /config/initializers/comfortable\_mexican\_sofa.rb and change authentication method: `config.authentication = 'CmsDeviseAuth'`. Now to access Sofa's admin area users will be authenticated against your existing authentication system.
-
-![Looks pretty comfortable to me. No idea what makes it Mexican.](https://github.com/twg/comfortable-mexican-sofa/raw/master/doc/sofa.png)
-
 ComfortableMexicanSofa is released under the [MIT license](https://github.com/twg/comfortable-mexican-sofa/raw/master/LICENSE) 
 
 Copyright 2009-2011 Oleg Khabarov, [The Working Group Inc](http://www.twg.ca)

data/Rakefile

@@ -11,7 +11,7 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name        = 'comfortable_mexican_sofa'
-    gem.summary     = 'ComfortableMexicanSofa is a powerful micro CMS for Ruby on Rails 3 applications'
+    gem.summary     = 'ComfortableMexicanSofa is a powerful CMS Engine for Ruby on Rails 3 applications'
     gem.description = ''
     gem.email       = 'oleg@theworkinggroup.ca'
     gem.homepage    = 'http://github.com/twg/comfortable-mexican-sofa'

data/VERSION

@@ -1 +1 @@
-1.3.4
+1.3.5

data/app/controllers/cms_content_controller.rb

@@ -30,15 +30,19 @@ protected
   end
   
   def load_cms_site
-    @cms_site ||= Cms::Site.first if Cms::Site.count == 1
-    Cms::Site.find_all_by_hostname(request.host.downcase).each do |site|
-      if site.path.blank?
-        @cms_site = site
-      elsif "#{request.fullpath}/".match /^\/#{Regexp.escape(site.path.to_s)}\//
-        @cms_site = site
-        break
-      end
-    end unless @cms_site
+    if params[:site_id]
+      @cms_site ||= Cms::Site.find_by_id(params[:site_id])
+    else
+      @cms_site ||= Cms::Site.first if Cms::Site.count == 1
+      Cms::Site.find_all_by_hostname(request.host.downcase).each do |site|
+        if site.path.blank?
+          @cms_site = site
+        elsif "#{request.fullpath}/".match /^\/#{Regexp.escape(site.path.to_s)}\//
+          @cms_site = site
+          break
+        end
+      end unless @cms_site
+    end
     
     if @cms_site
       params[:cms_path].to_s.gsub!(/^#{@cms_site.path}/, '').gsub!(/^\//, '')
@@ -67,7 +71,7 @@ protected
   end
 
   def load_cms_layout
-    @cms_layout = @cms_site.layouts.find_by_slug!(params[:id])
+    @cms_layout = @cms_site.layouts.find_by_slug!(params[:layout_slug])
   rescue ActiveRecord::RecordNotFound
     render :nothing => true, :status => 404
   end

data/comfortable_mexican_sofa.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{comfortable_mexican_sofa}
-  s.version = "1.3.4"
+  s.version = "1.3.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Oleg Khabarov", "The Working Group Inc"]
@@ -273,7 +273,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/twg/comfortable-mexican-sofa}
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.6.2}
-  s.summary = %q{ComfortableMexicanSofa is a powerful micro CMS for Ruby on Rails 3 applications}
+  s.summary = %q{ComfortableMexicanSofa is a powerful CMS Engine for Ruby on Rails 3 applications}
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/config/routes.rb

@@ -30,9 +30,9 @@ Rails.application.routes.draw do
   end unless ComfortableMexicanSofa.config.admin_route_prefix.blank?
   
   scope :controller => :cms_content do
-    get 'cms-css/:id' => :render_css,   :as => 'cms_css'
-    get 'cms-js/:id'  => :render_js,    :as => 'cms_js'
-    get '/'           => :render_html,  :as => 'cms_html',  :path => "(*cms_path)"
+    get 'cms-css/:site_id/:layout_slug' => :render_css,  :as => 'cms_css'
+    get 'cms-js/:site_id/:layout_slug'  => :render_js,   :as => 'cms_js'
+    get '/' => :render_html,  :as => 'cms_html',  :path => "(*cms_path)"
   end
   
 end

data/lib/comfortable_mexican_sofa/tags/asset.rb

@@ -13,11 +13,11 @@ class ComfortableMexicanSofa::Tag::Asset
     
     case type
     when 'css'
-      out = "#{page.site.path}/cms-css/#{label}.css"
+      out = "/cms-css/#{page.site.id}/#{label}.css"
       out = "<link href='#{out}' media='screen' rel='stylesheet' type='text/css' />" if format == 'html_tag'
       out
     when 'js'
-      out = "#{page.site.path}/cms-js/#{label}.js"
+      out = "/cms-js/#{page.site.id}/#{label}.js"
       out = "<script src='#{out}' type='text/javascript'></script>" if format == 'html_tag'
       out
     end

data/test/functional/cms_content_controller_test.rb

@@ -122,26 +122,26 @@ class CmsContentControllerTest < ActionController::TestCase
   end
   
   def test_render_css
-    get :render_css, :id => cms_layouts(:default).slug
+    get :render_css, :site_id => cms_sites(:default).id, :layout_slug => cms_layouts(:default).slug
     assert_response :success
     assert_match %r{text\/css}, response.headers["Content-Type"]
     assert_equal cms_layouts(:default).css, response.body
   end
   
   def test_render_css_not_found
-    get :render_css, :id => 'bogus'
+    get :render_css, :site_id => cms_sites(:default).id, :layout_slug => 'bogus'
     assert_response 404
   end
   
   def test_render_js
-    get :render_js, :id => cms_layouts(:default).slug
+    get :render_js, :site_id => cms_sites(:default).id, :layout_slug => cms_layouts(:default).slug
     assert_response :success
     assert_match %r{text\/javascript}, response.headers["Content-Type"]
     assert_equal cms_layouts(:default).js, response.body
   end
   
   def test_render_js_not_found
-    get :render_js, :id => 'bogus'
+    get :render_js, :site_id => cms_sites(:default).id, :layout_slug => 'bogus'
     assert_response 404
   end
   

data/test/unit/tags/asset_test.rb

@@ -33,24 +33,24 @@ class AssetTest < ActiveSupport::TestCase
     tag = ComfortableMexicanSofa::Tag::Asset.initialize_tag(
       cms_pages(:default), '{{ cms:asset:default:css }}'
     )
-    assert_equal '/cms-css/default.css', tag.render
+    assert_equal "/cms-css/#{cms_sites(:default).id}/default.css", tag.render
     
     tag = ComfortableMexicanSofa::Tag::Asset.initialize_tag(
       cms_pages(:default), '{{ cms:asset:default:css:html_tag }}'
     )
-    assert_equal "<link href='/cms-css/default.css' media='screen' rel='stylesheet' type='text/css' />", tag.render
+    assert_equal "<link href='/cms-css/#{cms_sites(:default).id}/default.css' media='screen' rel='stylesheet' type='text/css' />", tag.render
   end
   
   def test_render_for_js
     tag = ComfortableMexicanSofa::Tag::Asset.initialize_tag(
       cms_pages(:default), '{{ cms:asset:default:js }}'
     )
-    assert_equal '/cms-js/default.js', tag.render
+    assert_equal "/cms-js/#{cms_sites(:default).id}/default.js", tag.render
     
     tag = ComfortableMexicanSofa::Tag::Asset.initialize_tag(
       cms_pages(:default), '{{ cms:asset:default:js:html_tag }}'
     )
-    assert_equal "<script src='/cms-js/default.js' type='text/javascript'></script>", tag.render
+    assert_equal "<script src='/cms-js/#{cms_sites(:default).id}/default.js' type='text/javascript'></script>", tag.render
   end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.5
   prerelease: 
 platform: ruby
 authors:
@@ -15,7 +15,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70307918702120 !ruby/object:Gem::Requirement
+  requirement: &70187511396100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70307918702120
+  version_requirements: *70187511396100
 - !ruby/object:Gem::Dependency
   name: active_link_to
-  requirement: &70307918701380 !ruby/object:Gem::Requirement
+  requirement: &70187511394840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: 0.0.10
   type: :runtime
   prerelease: false
-  version_requirements: *70307918701380
+  version_requirements: *70187511394840
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70307918700620 !ruby/object:Gem::Requirement
+  requirement: &70187511394080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,7 +45,7 @@ dependencies:
         version: 2.3.14
   type: :runtime
   prerelease: false
-  version_requirements: *70307918700620
+  version_requirements: *70187511394080
 description: ''
 email: oleg@theworkinggroup.ca
 executables: []
@@ -321,7 +321,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2942682638602800909
+      hash: 1451043806041481492
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -333,5 +333,5 @@ rubyforge_project:
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: ComfortableMexicanSofa is a powerful micro CMS for Ruby on Rails 3 applications
+summary: ComfortableMexicanSofa is a powerful CMS Engine for Ruby on Rails 3 applications
 test_files: []