comfortable_mexican_sofa 1.3.5 → 1.3.6

data/Gemfile

@@ -1,7 +1,7 @@
 source 'http://rubygems.org'
 
 gem 'rails',          '>=3.0.0'
-gem 'active_link_to', '>=0.0.10'
+gem 'active_link_to', '>=1.0.0'
 gem 'paperclip',      '>=2.3.14'
 
 group :development do

data/VERSION

@@ -1 +1 @@
-1.3.5
+1.3.6

data/app/controllers/cms_content_controller.rb

@@ -7,7 +7,7 @@ class CmsContentController < ApplicationController
   
   def render_html(status = 200)
     if layout = @cms_page.layout
-      app_layout = layout.app_layout.blank?? false : layout.app_layout
+      app_layout = (layout.app_layout.blank? || request.xhr?) ? false : layout.app_layout
       render :inline => @cms_page.content, :layout => app_layout, :status => status
     else
       render :text => I18n.t('cms.content.layout_not_found'), :status => 404

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

@@ -1,5 +1,5 @@
 <ul class='nav'>
-  <li><%= active_link_to t('cms_admin.base.sites'), cms_admin_sites_path, :active => {:when => :self_only} %></li>
+  <li><%= active_link_to t('cms_admin.base.sites'), cms_admin_sites_path, :active => :exclusive %></li>
   <% if @site && params[:controller] != 'cms_admin/sites' %>
     <li><%= active_link_to t('cms_admin.base.layouts'), cms_admin_site_layouts_path(@site) %></li>
     <li><%= active_link_to t('cms_admin.base.pages'), cms_admin_site_pages_path(@site) %></li>

data/comfortable_mexican_sofa.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{comfortable_mexican_sofa}
-  s.version = "1.3.5"
+  s.version = "1.3.6"
 
   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{2011-07-21}
+  s.date = %q{2011-08-05}
   s.description = %q{}
   s.email = %q{oleg@theworkinggroup.ca}
   s.extra_rdoc_files = [
@@ -280,16 +280,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>, [">= 0.0.10"])
+      s.add_runtime_dependency(%q<active_link_to>, [">= 1.0.0"])
       s.add_runtime_dependency(%q<paperclip>, [">= 2.3.14"])
     else
       s.add_dependency(%q<rails>, [">= 3.0.0"])
-      s.add_dependency(%q<active_link_to>, [">= 0.0.10"])
+      s.add_dependency(%q<active_link_to>, [">= 1.0.0"])
       s.add_dependency(%q<paperclip>, [">= 2.3.14"])
     end
   else
     s.add_dependency(%q<rails>, [">= 3.0.0"])
-    s.add_dependency(%q<active_link_to>, [">= 0.0.10"])
+    s.add_dependency(%q<active_link_to>, [">= 1.0.0"])
     s.add_dependency(%q<paperclip>, [">= 2.3.14"])
   end
 end

data/test/functional/cms_content_controller_test.rb

@@ -22,9 +22,18 @@ class CmsContentControllerTest < ActionController::TestCase
     cms_layouts(:default).update_attribute(:app_layout, 'cms_admin.html.erb')
     get :render_html, :cms_path => ''
     assert_response :success
+    assert assigns(:cms_page)
     assert_select "body[class='c_cms_content a_render_html']"
   end
   
+  def test_render_page_with_xhr
+    cms_layouts(:default).update_attribute(:app_layout, 'cms_admin.html.erb')
+    xhr :get, :render_html, :cms_path => ''
+    assert_response :success
+    assert assigns(:cms_page)
+    assert_no_select "body[class='c_cms_content a_render_html']"
+  end
+  
   def test_render_page_not_found
     get :render_html, :cms_path => 'doesnotexist'
     assert_response 404

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version
-  version: 1.3.5
+  version: 1.3.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,12 +10,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-21 00:00:00.000000000 -04:00
+date: 2011-08-05 00:00:00.000000000 -04:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70187511396100 !ruby/object:Gem::Requirement
+  requirement: &70307288569600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,21 +23,21 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70187511396100
+  version_requirements: *70307288569600
 - !ruby/object:Gem::Dependency
   name: active_link_to
-  requirement: &70187511394840 !ruby/object:Gem::Requirement
+  requirement: &70307288568860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.10
+        version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70187511394840
+  version_requirements: *70307288568860
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70187511394080 !ruby/object:Gem::Requirement
+  requirement: &70307288567840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,7 +45,7 @@ dependencies:
         version: 2.3.14
   type: :runtime
   prerelease: false
-  version_requirements: *70187511394080
+  version_requirements: *70307288567840
 description: ''
 email: oleg@theworkinggroup.ca
 executables: []
@@ -321,7 +321,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1451043806041481492
+      hash: 3829226531073007590
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: