comfortable_mexican_sofa 1.5.3 → 1.5.4

data/.travis.yml

@@ -2,12 +2,13 @@ rvm:
   - 1.8.7
   - 1.9.2
   # - 1.9.3
-  # - rbx-2.0
+  - rbx-2.0
   - ree
   # - jruby
 gemfile:
   - test/gemfiles/Gemfile.rails-3.0.x
   - test/gemfiles/Gemfile.rails-3.1.x
+  - test/gemfiles/Gemfile.rails-3.1.stable
 notifications:
   recipients:
     - oleg@twg.ca

data/Gemfile

@@ -2,7 +2,7 @@ source 'http://rubygems.org'
 
 gem 'rails',          '>=3.0.0'
 gem 'active_link_to', '~>1.0.0'
-gem 'paperclip',      '~>2.4.1'
+gem 'paperclip',      '~>2.3.0'
 
 group :test do
   gem 'sqlite3'

data/VERSION

@@ -1 +1 @@
-1.5.3
+1.5.4

data/app/models/cms/page.rb

@@ -23,10 +23,10 @@ class Cms::Page < ActiveRecord::Base
   
   # -- Callbacks ------------------------------------------------------------
   before_validation :assigns_label,
-                    :assign_parent,
-                    :assign_full_path
+                    :assign_parent
   before_create :assign_position
-  before_save :set_cached_content
+  before_save :assign_full_path,
+              :set_cached_content
   after_save  :sync_child_pages
   
   # -- Validations ----------------------------------------------------------
@@ -37,12 +37,10 @@ class Cms::Page < ActiveRecord::Base
   validates :slug,
     :presence   => true,
     :format     => /^\w[a-z0-9_-]*$/i,
+    :uniqueness => { :scope => :parent_id },
     :unless     => lambda{ |p| p.site && (p.site.pages.count == 0 || p.site.pages.root == self) }
   validates :layout,
     :presence   => true
-  validates :full_path,
-    :presence   => true,
-    :uniqueness => { :scope => :site_id }
   validate :validate_target_page
   
   # -- Scopes ---------------------------------------------------------------

data/comfortable_mexican_sofa.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "comfortable_mexican_sofa"
-  s.version = "1.5.3"
+  s.version = "1.5.4"
 
   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 = "2011-09-30"
+  s.date = "2011-10-03"
   s.description = ""
   s.email = "oleg@theworkinggroup.ca"
   s.extra_rdoc_files = [
@@ -206,7 +206,6 @@ Gem::Specification.new do |s|
     "lib/comfortable_mexican_sofa/authentication/dummy_auth.rb",
     "lib/comfortable_mexican_sofa/authentication/http_auth.rb",
     "lib/comfortable_mexican_sofa/configuration.rb",
-    "lib/comfortable_mexican_sofa/controller_methods.rb",
     "lib/comfortable_mexican_sofa/engine.rb",
     "lib/comfortable_mexican_sofa/error.rb",
     "lib/comfortable_mexican_sofa/extensions/acts_as_tree.rb",
@@ -216,6 +215,7 @@ Gem::Specification.new do |s|
     "lib/comfortable_mexican_sofa/extensions/rails.rb",
     "lib/comfortable_mexican_sofa/fixtures.rb",
     "lib/comfortable_mexican_sofa/form_builder.rb",
+    "lib/comfortable_mexican_sofa/render_methods.rb",
     "lib/comfortable_mexican_sofa/tag.rb",
     "lib/comfortable_mexican_sofa/tags/asset.rb",
     "lib/comfortable_mexican_sofa/tags/collection.rb",
@@ -254,6 +254,8 @@ Gem::Specification.new do |s|
     "test/fixtures/files/valid_image.jpg",
     "test/fixtures/views/_nav_hook.html.erb",
     "test/fixtures/views/_nav_hook_2.html.erb",
+    "test/fixtures/views/render_test/_test.html.erb",
+    "test/fixtures/views/render_test/render_layout.html.erb",
     "test/functional/cms_admin/base_controller_test.rb",
     "test/functional/cms_admin/categories_controller_test.rb",
     "test/functional/cms_admin/files_controller_test.rb",
@@ -264,6 +266,7 @@ Gem::Specification.new do |s|
     "test/functional/cms_admin/snippets_controller_test.rb",
     "test/functional/cms_content_controller_test.rb",
     "test/gemfiles/Gemfile.rails-3.0.x",
+    "test/gemfiles/Gemfile.rails-3.1.stable",
     "test/gemfiles/Gemfile.rails-3.1.x",
     "test/integration/authentication_test.rb",
     "test/integration/fixtures_test.rb",
@@ -317,16 +320,16 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rails>, [">= 3.0.0"])
       s.add_runtime_dependency(%q<active_link_to>, ["~> 1.0.0"])
-      s.add_runtime_dependency(%q<paperclip>, ["~> 2.4.1"])
+      s.add_runtime_dependency(%q<paperclip>, ["~> 2.3.0"])
     else
       s.add_dependency(%q<rails>, [">= 3.0.0"])
       s.add_dependency(%q<active_link_to>, ["~> 1.0.0"])
-      s.add_dependency(%q<paperclip>, ["~> 2.4.1"])
+      s.add_dependency(%q<paperclip>, ["~> 2.3.0"])
     end
   else
     s.add_dependency(%q<rails>, [">= 3.0.0"])
     s.add_dependency(%q<active_link_to>, ["~> 1.0.0"])
-    s.add_dependency(%q<paperclip>, ["~> 2.4.1"])
+    s.add_dependency(%q<paperclip>, ["~> 2.3.0"])
   end
 end
 

data/lib/comfortable_mexican_sofa.rb

@@ -8,7 +8,7 @@ end
   'comfortable_mexican_sofa/configuration',
   'comfortable_mexican_sofa/authentication/http_auth',
   'comfortable_mexican_sofa/authentication/dummy_auth',
-  'comfortable_mexican_sofa/controller_methods',
+  'comfortable_mexican_sofa/render_methods',
   'comfortable_mexican_sofa/view_hooks',
   'comfortable_mexican_sofa/view_methods',
   'comfortable_mexican_sofa/form_builder',

data/lib/comfortable_mexican_sofa/error.rb

@@ -8,4 +8,10 @@ module ComfortableMexicanSofa
       super "Cannot find CMS page at #{path}"
     end
   end
+  
+  class MissingLayout < ComfortableMexicanSofa::Error
+    def initialize(slug)
+      super "Cannot find CMS layout with slug: #{slug}"
+    end
+  end
 end

data/lib/comfortable_mexican_sofa/render_methods.rb

@@ -0,0 +1,72 @@
+module ComfortableMexicanSofa::RenderMethods
+  
+  def self.included(base)
+    
+    # If application controller doesn't have template associated with it
+    # CMS will attempt to find one. This is so you don't have to explicitly
+    # call render :cms_page => '/something'
+    base.rescue_from 'ActionView::MissingTemplate' do |e|
+      begin
+        render :cms_page => request.path
+      rescue ComfortableMexicanSofa::MissingPage
+        raise e
+      end
+    end
+    
+    # Now you can render cms_page simply by calling:
+    #   render :cms_page => '/path/to/page'
+    # This way application controllers can use CMS content while populating
+    # instance variables that can be used in partials (that are included by
+    # by the cms page and/or layout)
+    #
+    # Or how about not worrying about setting up CMS pages and rendering 
+    # application view using a CMS layout?
+    #   render :cms_layout => 'layout_slug', :cms_blocks => {
+    #     :block_label_a => 'content text',
+    #     :block_label_b => { :template => 'path/to/template' },
+    #     :block_label_c => { :partial  => 'path/to/partial' }
+    #   }
+    # This way you are populating page block content and rendering 
+    # an instantialized CMS page.
+    def render(options = {}, locals = {}, &block)
+      if options.is_a?(Hash) && path = options.delete(:cms_page)
+        @cms_site = Cms::Site.find_site(request.host.downcase, request.fullpath)
+        if @cms_page = @cms_site && @cms_site.pages.find_by_full_path(path)
+          @cms_layout = @cms_page.layout
+          cms_app_layout = @cms_layout.try(:app_layout)
+          options[:layout] ||= cms_app_layout.blank?? nil : cms_app_layout
+          options[:inline] = @cms_page.content
+          super(options, locals, &block)
+        else
+          raise ComfortableMexicanSofa::MissingPage.new(path)
+        end
+        
+      elsif options.is_a?(Hash) && slug = options.delete(:cms_layout)
+        @cms_site = Cms::Site.find_site(request.host.downcase, request.fullpath)
+        if @cms_layout = @cms_site && @cms_site.layouts.find_by_slug(slug)
+          cms_app_layout = @cms_layout.try(:app_layout)
+          cms_page = @cms_site.pages.build(:layout => @cms_layout)
+          cms_blocks = options.delete(:cms_blocks) || { :content => render_to_string }
+          cms_blocks.each do |block_label, value|
+            content = if value.is_a?(Hash)
+              render_to_string(value.keys.first.to_sym => value[value.keys.first])
+            else
+              value.to_s
+            end
+            cms_page.blocks.build(:label => block_label.to_s, :content => content)
+          end
+          options[:layout] ||= cms_app_layout.blank?? nil : cms_app_layout
+          options[:inline] = cms_page.content(true)
+          super(options, locals, &block)
+        else
+          raise ComfortableMexicanSofa::MissingLayout.new(slug)
+        end
+        
+      else
+        super(options, locals, &block)
+      end
+    end
+  end
+end
+
+ActionController::Base.send :include, ComfortableMexicanSofa::RenderMethods

data/test/fixtures/views/render_test/_test.html.erb

@@ -0,0 +1 @@
+TestPartial <%= @test_value %>

data/test/fixtures/views/render_test/render_layout.html.erb

@@ -0,0 +1 @@
+TestTemplate <%= @test_value %>

data/test/gemfiles/Gemfile.rails-3.0.x

@@ -2,7 +2,7 @@ source 'http://rubygems.org'
 
 gem 'rails',          '~>3.0.10'
 gem 'active_link_to', '~>1.0.0'
-gem 'paperclip',      '~>2.4.2'
+gem 'paperclip',      '~>2.3.0'
 
 group :test do
   gem 'sqlite3'

data/test/gemfiles/Gemfile.rails-3.1.stable

@@ -0,0 +1,10 @@
+source 'http://rubygems.org'
+
+gem 'rails', :git => 'git://github.com/rails/rails.git', :branch => '3-1-stable'
+gem 'active_link_to', '~>1.0.0'
+gem 'paperclip',      '~>2.3.0'
+
+group :test do
+  gem 'sqlite3'
+  gem 'jeweler'
+end

data/test/gemfiles/Gemfile.rails-3.1.x

@@ -2,7 +2,7 @@ source 'http://rubygems.org'
 
 gem 'rails',          '~>3.1.0'
 gem 'active_link_to', '~>1.0.0'
-gem 'paperclip',      '~>2.4.2'
+gem 'paperclip',      '~>2.3.0'
 
 group :test do
   gem 'sqlite3'

data/test/integration/render_cms_test.rb

@@ -4,11 +4,14 @@ class RenderCmsTest < ActionDispatch::IntegrationTest
   
   def setup
     Rails.application.routes.draw do
-      get '/render-implicit'  => 'render_test#implicit'
-      get '/render-explicit'  => 'render_test#explicit'
-      get '/render-text'      => 'render_test#render_text'
-      get '/render-update'    => 'render_test#render_update'
+      get '/render-basic'   => 'render_test#render_basic'
+      get '/render-page'    => 'render_test#render_page'
+      get '/render-layout'  => 'render_test#render_layout'
     end
+    cms_layouts(:default).update_attribute(:content, '{{cms:page:content}}')
+    cms_pages(:child).update_attribute(:blocks_attributes, [
+      { :label => 'content', :content => 'TestBlockContent' }
+    ])
     super
   end
   
@@ -17,68 +20,152 @@ class RenderCmsTest < ActionDispatch::IntegrationTest
   end
   
   class ::RenderTestController < ApplicationController
-    def implicit
-      render
-    end
-    def explicit
-      render :cms_page => '/render-explicit-page'
+    append_view_path(File.expand_path('../fixtures/views', File.dirname(__FILE__)))
+    
+    def render_basic
+      case params[:type]
+      when 'text'
+        render :text => 'TestText'
+      when 'update'
+        render :update do |page| 
+          page.alert('rendered text')
+        end
+      else
+        render
+      end
     end
-    def render_text
-      render :text => 'rendered text'
+    
+    def render_page
+      case params[:type]
+      when 'page_implicit'
+        render
+      when 'page_explicit'
+        render :cms_page => '/test-page'
+      when 'page_explicit_with_status'
+        render :cms_page => '/test-page', :status => 404
+      else
+        raise 'Invalid or no param[:type] provided'
+      end
     end
-    def render_update
-      render :update do |page|
-        page.alert('rendered text')
+    
+    def render_layout
+      @test_value = 'TestValue'
+      case params[:type]
+      when 'layout_defaults'
+        render :cms_layout => 'default'
+      when 'layout'
+        render :cms_layout => 'default', :cms_blocks => {
+          :content    => 'TestText',
+          :content_b  => { :partial  => 'render_test/test' },
+          :content_c  => { :template => 'render_test/render_layout' }
+        }
+      when 'layout_with_status'
+        render :cms_layout => 'default', :status => 404
+      when 'layout_invalid'
+        render :cms_layout => 'invalid'
+      else
+        raise 'Invalid or no param[:type] provided'
       end
     end
   end
   
-  def test_get_with_no_template
+  # -- Basic Render Tests ---------------------------------------------------
+  def test_text
+    get '/render-basic?type=text'
+    assert_response :success
+    assert_equal 'TestText', response.body
+  end
+  
+  def test_update
+    return 'Not supported in >= 3.1' if Rails::VERSION::MAJOR == 3 && Rails::VERSION::MINOR >= 1
+    get '/render-basic?type=update'
+    assert_response :success
+  end
+  
+  def test_implicit_cms_page_failure
     assert_exception_raised ActionView::MissingTemplate do
-      get '/render-implicit'
+      get '/render-basic'
     end
   end
   
-  def test_get_with_implicit_cms_template
+  # -- Page Render Test -----------------------------------------------------
+  def test_implicit_cms_page
     page = cms_pages(:child)
-    page.slug = 'render-implicit'
-    page.save!
-    get '/render-implicit'
+    page.update_attribute(:slug, 'render-basic')
+    get '/render-basic?type=page_implicit'
     assert_response :success
     assert assigns(:cms_site)
     assert assigns(:cms_layout)
     assert assigns(:cms_page)
+    assert_equal page, assigns(:cms_page)
+    assert_equal 'TestBlockContent', response.body
   end
   
-  def test_get_with_explicit_cms_template
+  def test_explicit_cms_page
     page = cms_pages(:child)
-    page.slug = 'render-explicit-page'
-    page.save!
-    get '/render-explicit'
+    page.update_attribute(:slug, 'test-page')
+    get '/render-page?type=page_explicit'
     assert_response :success
     assert assigns(:cms_site)
     assert assigns(:cms_layout)
     assert assigns(:cms_page)
+    assert_equal page, assigns(:cms_page)
+    assert_equal 'TestBlockContent', response.body
+  end
+  
+  def test_explicit_cms_page_with_status
+    page = cms_pages(:child)
+    page.update_attribute(:slug, 'test-page')
+    get '/render-page?type=page_explicit_with_status'
+    assert_response 404
+    assert assigns(:cms_site)
+    assert assigns(:cms_layout)
+    assert assigns(:cms_page)
+    assert_equal page, assigns(:cms_page)
+    assert_equal 'TestBlockContent', response.body
   end
   
-  def test_get_with_explicit_cms_template_failure
+  def test_explicit_cms_page_failure
     page = cms_pages(:child)
-    page.slug = 'render-explicit-404'
-    page.save!
+    page.update_attribute(:slug, 'invalid')
     assert_exception_raised ComfortableMexicanSofa::MissingPage do
-      get '/render-explicit'
+      get '/render-page?type=page_explicit'
     end
   end
   
-  def test_get_render_text
-    get '/render-text'
+  # -- Layout Render Tests --------------------------------------------------
+  def test_cms_layout_defaults
+    get '/render-layout?type=layout_defaults'
     assert_response :success
+    assert_equal 'TestTemplate TestValue', response.body
+    assert assigns(:cms_site)
+    assert assigns(:cms_layout)
+    assert_equal cms_layouts(:default), assigns(:cms_layout)
   end
   
-  def test_get_render_update
-    return 'Not supported >= 3.1' if Rails::VERSION::MAJOR == 3 && Rails::VERSION::MINOR >= 1
-    get '/render-update'
+  def test_cms_layout
+    cms_layouts(:default).update_attribute(:content, '{{cms:page:content}} {{cms:page:content_b}} {{cms:page:content_c}}')
+    get '/render-layout?type=layout'
     assert_response :success
+    assert_equal 'TestText TestPartial TestValue TestTemplate TestValue', response.body
+    assert assigns(:cms_site)
+    assert assigns(:cms_layout)
+    assert_equal cms_layouts(:default), assigns(:cms_layout)
+  end
+  
+  def test_cms_layout_with_status
+    get '/render-layout?type=layout_with_status'
+    assert_response 404
+    assert_equal 'TestTemplate TestValue', response.body
+    assert assigns(:cms_site)
+    assert assigns(:cms_layout)
+    assert_equal cms_layouts(:default), assigns(:cms_layout)
+  end
+  
+  def test_cms_layout_failure
+    assert_exception_raised ComfortableMexicanSofa::MissingLayout do
+      get '/render-layout?type=layout_invalid'
+    end
   end
   
 end

data/test/unit/view_methods_test.rb

@@ -1,9 +1,8 @@
 require File.expand_path('../test_helper', File.dirname(__FILE__))
 
 class ViewMethodsTest < ActionView::TestCase
-  include ComfortableMexicanSofa::ViewMethods
   
-  class HelpersTestController < ActionController::Base
+  class ::HelpersTestController < ActionController::Base
     helper { def hello; 'hello' end }
     def test_cms_snippet_content
       render :inline => '<%= cms_snippet_content(:default) %>'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.5.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-30 00:00:00.000000000Z
+date: 2011-10-03 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70194576315620 !ruby/object:Gem::Requirement
+  requirement: &70223424480860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70194576315620
+  version_requirements: *70223424480860
 - !ruby/object:Gem::Dependency
   name: active_link_to
-  requirement: &70194576314720 !ruby/object:Gem::Requirement
+  requirement: &70223424480280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,18 +33,18 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70194576314720
+  version_requirements: *70223424480280
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70194576313600 !ruby/object:Gem::Requirement
+  requirement: &70223424479600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.4.1
+        version: 2.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70194576313600
+  version_requirements: *70223424479600
 description: ''
 email: oleg@theworkinggroup.ca
 executables: []
@@ -242,7 +242,6 @@ files:
 - lib/comfortable_mexican_sofa/authentication/dummy_auth.rb
 - lib/comfortable_mexican_sofa/authentication/http_auth.rb
 - lib/comfortable_mexican_sofa/configuration.rb
-- lib/comfortable_mexican_sofa/controller_methods.rb
 - lib/comfortable_mexican_sofa/engine.rb
 - lib/comfortable_mexican_sofa/error.rb
 - lib/comfortable_mexican_sofa/extensions/acts_as_tree.rb
@@ -252,6 +251,7 @@ files:
 - lib/comfortable_mexican_sofa/extensions/rails.rb
 - lib/comfortable_mexican_sofa/fixtures.rb
 - lib/comfortable_mexican_sofa/form_builder.rb
+- lib/comfortable_mexican_sofa/render_methods.rb
 - lib/comfortable_mexican_sofa/tag.rb
 - lib/comfortable_mexican_sofa/tags/asset.rb
 - lib/comfortable_mexican_sofa/tags/collection.rb
@@ -290,6 +290,8 @@ files:
 - test/fixtures/files/valid_image.jpg
 - test/fixtures/views/_nav_hook.html.erb
 - test/fixtures/views/_nav_hook_2.html.erb
+- test/fixtures/views/render_test/_test.html.erb
+- test/fixtures/views/render_test/render_layout.html.erb
 - test/functional/cms_admin/base_controller_test.rb
 - test/functional/cms_admin/categories_controller_test.rb
 - test/functional/cms_admin/files_controller_test.rb
@@ -300,6 +302,7 @@ files:
 - test/functional/cms_admin/snippets_controller_test.rb
 - test/functional/cms_content_controller_test.rb
 - test/gemfiles/Gemfile.rails-3.0.x
+- test/gemfiles/Gemfile.rails-3.1.stable
 - test/gemfiles/Gemfile.rails-3.1.x
 - test/integration/authentication_test.rb
 - test/integration/fixtures_test.rb
@@ -355,7 +358,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4239594918956687847
+      hash: 1060939018448966854
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/comfortable_mexican_sofa/controller_methods.rb

@@ -1,41 +0,0 @@
-module ComfortableMexicanSofa::ControllerMethods
-  
-  def self.included(base)
-    
-    # If application controller doesn't have template associated with it
-    # CMS will attempt to find one. This is so you don't have to explicitly
-    # call render :cms_page => '/something'
-    base.rescue_from 'ActionView::MissingTemplate' do |e|
-      begin
-        render :cms_page => request.path
-      rescue ComfortableMexicanSofa::MissingPage
-        raise e
-      end
-    end
-    
-    # Now you can render cms_page simply by calling:
-    #   render :cms_page => '/path/to/page'
-    # This way application controllers can use CMS content while populating
-    # instance variables that can be used in partials (that are included by
-    # by the cms page and/or layout)
-    def render(options = {}, locals = {}, &block)
-      if options.is_a?(Hash) && path = options.delete(:cms_page)
-        @cms_site   = Cms::Site.find_site(request.host.downcase, request.fullpath)
-        @cms_page   = @cms_site && @cms_site.pages.find_by_full_path(path)
-        if @cms_page
-          @cms_layout = @cms_page.layout
-          cms_app_layout = @cms_layout.try(:app_layout)
-          options[:layout] ||= cms_app_layout.blank?? nil : cms_app_layout
-          options[:inline] = @cms_page.content
-          super(options, locals, &block)
-        else
-          raise ComfortableMexicanSofa::MissingPage.new(path)
-        end
-      else
-        super(options, locals, &block)
-      end
-    end
-  end
-end
-
-ActionController::Base.send :include, ComfortableMexicanSofa::ControllerMethods