comfortable_mexican_sofa 1.5.10 → 1.5.11

data/.travis.yml

@@ -1,14 +1,13 @@
 rvm:
   - 1.8.7
   - 1.9.2
-  # - 1.9.3
+  - 1.9.3
   # - 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
+  - test/gemfiles/Gemfile.rails-3.0.10
+  - test/gemfiles/Gemfile.rails-3.1.1
 notifications:
   recipients:
     - oleg@twg.ca

data/VERSION

@@ -1 +1 @@
-1.5.10
+1.5.11

data/app/controllers/cms_content_controller.rb

@@ -52,11 +52,6 @@ protected
     end
   end
   
-  def load_fixtures
-    return unless ComfortableMexicanSofa.config.enable_fixtures
-    ComfortableMexicanSofa::Fixtures.import_all(@cms_site.hostname)
-  end
-  
   def load_cms_page
     @cms_page = @cms_site.pages.published.find_by_full_path!("/#{params[:cms_path]}")
     return redirect_to(@cms_page.target_page.full_path) if @cms_page.target_page

data/comfortable_mexican_sofa.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "comfortable_mexican_sofa"
-  s.version = "1.5.10"
+  s.version = "1.5.11"
 
   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-10-28"
+  s.date = "2011-11-17"
   s.description = ""
   s.email = "oleg@theworkinggroup.ca"
   s.extra_rdoc_files = [
@@ -240,6 +240,7 @@ Gem::Specification.new do |s|
     "lib/generators/README",
     "lib/generators/cms_generator.rb",
     "lib/tasks/comfortable_mexican_sofa.rake",
+    "rvmrc.example",
     "script/rails",
     "test/fixtures/cms/blocks.yml",
     "test/fixtures/cms/categories.yml",
@@ -266,9 +267,8 @@ Gem::Specification.new do |s|
     "test/functional/cms_admin/sites_controller_test.rb",
     "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/gemfiles/Gemfile.rails-3.0.10",
+    "test/gemfiles/Gemfile.rails-3.1.1",
     "test/integration/authentication_test.rb",
     "test/integration/fixtures_test.rb",
     "test/integration/mirrors_test.rb",

data/config/initializers/comfortable_mexican_sofa.rb

@@ -34,13 +34,25 @@ ComfortableMexicanSofa.configure do |config|
   #   config.upload_file_options = {:storage => :filesystem}
   
   # Sofa allows you to setup entire site from files. Database is updated with each
-  # request (if nessesary). Please note that database entries are destroyed if there's
+  # request (if necessary). Please note that database entries are destroyed if there's
   # no corresponding file. Fixtures are disabled by default.
   #   config.enable_fixtures = false
   
   # Path where fixtures can be located.
   #   config.fixtures_path = File.expand_path('db/cms_fixtures', Rails.root)
   
+  # Importing fixtures into Database  
+  # To load fixtures into the database just run this rake task:
+  #   local: $ rake comfortable_mexican_sofa:fixtures:import FROM=example.local TO=localhost
+  #   Heroku: $ heroku run rake comfortable_mexican_sofa:fixtures:import FROM=example.local TO=yourapp.herokuapp.com
+  # From indicates folder the fixtures are in and to is the Site hostname you have defined in the database.
+
+  # Exporting fixtures into Files
+  # If you need to dump database contents into fixture files run:
+  #   local: $ rake comfortable_mexican_sofa:fixtures:export FROM=localhost TO=example.local
+  #   Heroku: $ heroku run rake comfortable_mexican_sofa:fixtures:export FROM=yourapp.herokuapp.com TO=example.local
+  # This will create example.local folder and dump all content from example.com Site.
+  
   # Content for Layouts, Pages and Snippets has a revision history. You can revert
   # a previous version using this system. You can control how many revisions per
   # object you want to keep. Set it to 0 if you wish to turn this feature off.

data/lib/comfortable_mexican_sofa/error.rb

@@ -3,15 +3,22 @@ module ComfortableMexicanSofa
   class Error < StandardError
   end
   
-  class MissingPage < ComfortableMexicanSofa::Error
-    def initialize(path)
-      super "Cannot find CMS page at #{path}"
+  class MissingSite < ComfortableMexicanSofa::Error
+    def initialize(slug)
+      super "Cannot find CMS Site with slug: #{slug}"
     end
   end
   
   class MissingLayout < ComfortableMexicanSofa::Error
     def initialize(slug)
-      super "Cannot find CMS layout with slug: #{slug}"
+      super "Cannot find CMS Layout with slug: #{slug}"
     end
   end
+  
+  class MissingPage < ComfortableMexicanSofa::Error
+    def initialize(path)
+      super "Cannot find CMS Page at #{path}"
+    end
+  end
+  
 end

data/lib/comfortable_mexican_sofa/render_methods.rb

@@ -26,11 +26,25 @@ module ComfortableMexicanSofa::RenderMethods
     #     :block_label_b => { :template => 'path/to/template' },
     #     :block_label_c => { :partial  => 'path/to/partial' }
     #   }
-    # This way you are populating page block content and rendering 
+    #
+    # This way you are populating page block content and rendering
     # an instantialized CMS page.
+    #
+    # Site is loaded automatically based on the request. However you can force
+    # it by passing :cms_site parameter with site's slug. For example:
+    #   render :cms_page => '/path/to/page', :cms_site => 'default'
+    # 
     def render(options = {}, locals = {}, &block)
+      
+      # TODO: add slug to Cms::Site as well
+      if options.is_a?(Hash) && site_slug = options.delete(:cms_site)
+        unless @cms_site = Cms::Site.find_by_label(site_slug)
+          raise ComfortableMexicanSofa::MissingSite.new(site_slug)
+        end
+      end
+      
       if options.is_a?(Hash) && path = options.delete(:cms_page)
-        @cms_site = Cms::Site.find_site(request.host.downcase, request.fullpath)
+        @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)
@@ -42,7 +56,7 @@ module ComfortableMexicanSofa::RenderMethods
         end
         
       elsif options.is_a?(Hash) && slug = options.delete(:cms_layout)
-        @cms_site = Cms::Site.find_site(request.host.downcase, request.fullpath)
+        @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)

data/rvmrc.example

@@ -0,0 +1 @@
+rvm use 1.9.2@comfortable-mexican-sofa --create

data/test/gemfiles/{Gemfile.rails-3.1.x → Gemfile.rails-3.1.1}

@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
-gem 'rails',          '~>3.1.0'
+gem 'rails',          '~>3.1.1'
 gem 'active_link_to', '~>1.0.0'
 gem 'paperclip',      '~>2.3.0'
 

data/test/integration/render_cms_test.rb

@@ -19,6 +19,19 @@ class RenderCmsTest < ActionDispatch::IntegrationTest
     load(File.expand_path('config/routes.rb', Rails.root))
   end
   
+  def create_site_b
+    site    = Cms::Site.create!(
+      :label    => 'SiteB',
+      :hostname => 'site-b.test')
+    layout  = site.layouts.create!(
+      :slug     => 'default',
+      :content  => 'site-b {{cms:page:content}}')
+    page    = site.pages.create!(
+      :label  => 'default',
+      :layout => layout,
+      :blocks_attributes  => [{ :label => 'content', :content => 'SiteBContent' }])
+  end
+  
   class ::RenderTestController < ApplicationController
     append_view_path(File.expand_path('../fixtures/views', File.dirname(__FILE__)))
     
@@ -43,6 +56,8 @@ class RenderCmsTest < ActionDispatch::IntegrationTest
         render :cms_page => '/test-page'
       when 'page_explicit_with_status'
         render :cms_page => '/test-page', :status => 404
+      when 'page_explicit_with_site'
+        render :cms_page => '/', :cms_site => 'SiteB'
       else
         raise 'Invalid or no param[:type] provided'
       end
@@ -63,6 +78,8 @@ class RenderCmsTest < ActionDispatch::IntegrationTest
         render :cms_layout => 'default', :status => 404
       when 'layout_invalid'
         render :cms_layout => 'invalid'
+      when 'layout_defaults_with_site'
+        render :cms_layout => 'default', :cms_site => 'SiteB'
       else
         raise 'Invalid or no param[:type] provided'
       end
@@ -133,6 +150,21 @@ class RenderCmsTest < ActionDispatch::IntegrationTest
     end
   end
   
+  def test_explicit_with_site
+    create_site_b
+    get '/render-page?type=page_explicit_with_site'
+    assert_response :success
+    assert assigns(:cms_site)
+    assert_equal 'SiteB', assigns(:cms_site).label
+    assert_equal 'site-b SiteBContent', response.body
+  end
+  
+  def test_explicit_with_site_failure
+    assert_exception_raised ComfortableMexicanSofa::MissingSite do
+      get '/render-page?type=page_explicit_with_site'
+    end
+  end
+  
   # -- Layout Render Tests --------------------------------------------------
   def test_cms_layout_defaults
     get '/render-layout?type=layout_defaults'
@@ -168,4 +200,19 @@ class RenderCmsTest < ActionDispatch::IntegrationTest
     end
   end
   
+  def test_cms_layout_defaults_with_site
+    create_site_b
+    get '/render-layout?type=layout_defaults_with_site'
+    assert_response :success
+    assert assigns(:cms_site)
+    assert_equal 'SiteB', assigns(:cms_site).label
+    assert_equal 'site-b TestTemplate TestValue', response.body
+  end
+  
+  def test_cms_layout_defaults_with_site_failure
+    assert_exception_raised ComfortableMexicanSofa::MissingSite do
+      get '/render-layout?type=layout_defaults_with_site'
+    end
+  end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version
-  version: 1.5.10
+  version: 1.5.11
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-28 00:00:00.000000000Z
+date: 2011-11-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70149522890920 !ruby/object:Gem::Requirement
+  requirement: &70264886592940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70149522890920
+  version_requirements: *70264886592940
 - !ruby/object:Gem::Dependency
   name: active_link_to
-  requirement: &70149522889800 !ruby/object:Gem::Requirement
+  requirement: &70264886591540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70149522889800
+  version_requirements: *70264886591540
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70149522888620 !ruby/object:Gem::Requirement
+  requirement: &70264886588600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,7 +44,7 @@ dependencies:
         version: 2.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70149522888620
+  version_requirements: *70264886588600
 description: ''
 email: oleg@theworkinggroup.ca
 executables: []
@@ -276,6 +276,7 @@ files:
 - lib/generators/README
 - lib/generators/cms_generator.rb
 - lib/tasks/comfortable_mexican_sofa.rake
+- rvmrc.example
 - script/rails
 - test/fixtures/cms/blocks.yml
 - test/fixtures/cms/categories.yml
@@ -302,9 +303,8 @@ files:
 - test/functional/cms_admin/sites_controller_test.rb
 - 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/gemfiles/Gemfile.rails-3.0.10
+- test/gemfiles/Gemfile.rails-3.1.1
 - test/integration/authentication_test.rb
 - test/integration/fixtures_test.rb
 - test/integration/mirrors_test.rb
@@ -359,7 +359,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3119090265743627335
+      hash: 3416423876498059333
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

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

@@ -1,10 +0,0 @@
-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