comfortable_mexican_sofa 1.4.16 → 1.4.17

data/VERSION

@@ -1 +1 @@
-1.4.16
+1.4.17

data/app/controllers/cms_content_controller.rb

@@ -11,8 +11,8 @@ class CmsContentController < ApplicationController
     :only => [:render_css, :render_js]
   
   def render_html(status = 200)
-    if layout = @cms_page.layout
-      app_layout = (layout.app_layout.blank? || request.xhr?) ? false : layout.app_layout
+    if @cms_layout = @cms_page.layout
+      app_layout = (@cms_layout.app_layout.blank? || request.xhr?) ? false : @cms_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/comfortable_mexican_sofa.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{comfortable_mexican_sofa}
-  s.version = "1.4.16"
+  s.version = "1.4.17"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Oleg Khabarov", "The Working Group Inc"]

data/lib/comfortable_mexican_sofa/controller_methods.rb

@@ -20,13 +20,13 @@ module ComfortableMexicanSofa::ControllerMethods
     # by the cms page and/or layout)
     def render(options = {}, locals = {}, &block)
       if options.is_a?(Hash) && path = options.delete(:cms_page)
-        site = Cms::Site.find_site(request.host.downcase, request.fullpath)
-        page = site && site.pages.find_by_full_path(path)
-        if page
-          cms_app_layout = page.layout.try(:app_layout)
+        @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] = page.content
-          @cms_page = page
+          options[:inline] = @cms_page.content
           super(options, locals, &block)
         else
           raise ComfortableMexicanSofa::MissingPage.new(path)

data/test/functional/cms_content_controller_test.rb

@@ -4,7 +4,10 @@ class CmsContentControllerTest < ActionController::TestCase
 
   def test_render_page
     get :render_html, :cms_path => ''
-    assert_equal assigns(:cms_page), cms_pages(:default)
+    assert_equal cms_sites(:default), assigns(:cms_site)
+    assert_equal cms_layouts(:default), assigns(:cms_layout)
+    assert_equal cms_pages(:default), assigns(:cms_page)
+    
     assert_response :success
     assert_equal rendered_content_formatter(
       '

data/test/integration/render_cms_test.rb

@@ -45,6 +45,9 @@ class RenderCmsTest < ActionDispatch::IntegrationTest
     page.save!
     get '/render-implicit'
     assert_response :success
+    assert assigns(:cms_site)
+    assert assigns(:cms_layout)
+    assert assigns(:cms_page)
   end
   
   def test_get_with_explicit_cms_template
@@ -53,6 +56,9 @@ class RenderCmsTest < ActionDispatch::IntegrationTest
     page.save!
     get '/render-explicit'
     assert_response :success
+    assert assigns(:cms_site)
+    assert assigns(:cms_layout)
+    assert assigns(:cms_page)
   end
   
   def test_get_with_explicit_cms_template_failure

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version
-  version: 1.4.16
+  version: 1.4.17
   prerelease: 
 platform: ruby
 authors:
@@ -15,7 +15,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70098588879960 !ruby/object:Gem::Requirement
+  requirement: &70252456634400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70098588879960
+  version_requirements: *70252456634400
 - !ruby/object:Gem::Dependency
   name: active_link_to
-  requirement: &70098588879420 !ruby/object:Gem::Requirement
+  requirement: &70252456630840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70098588879420
+  version_requirements: *70252456630840
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70098588878880 !ruby/object:Gem::Requirement
+  requirement: &70252456630360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,7 +45,7 @@ dependencies:
         version: 2.3.14
   type: :runtime
   prerelease: false
-  version_requirements: *70098588878880
+  version_requirements: *70252456630360
 description: ''
 email: oleg@theworkinggroup.ca
 executables: []
@@ -349,7 +349,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3028671969758726451
+      hash: 1666253122703358863
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: