comfortable_mexican_sofa 1.3.7 → 1.3.8

data/VERSION

@@ -1 +1 @@
-1.3.7
+1.3.8

data/app/assets/stylesheets/comfortable_mexican_sofa/structure.css

@@ -1,8 +1,5 @@
 /* -- Containers --------------------------------------------------------- */
-html {
-  height: 100%;
-}
-body#cms_body {
+html, body#cms_body {
   height: 100%;
   background-color: #252525;
 }

data/app/models/cms/layout.rb

@@ -41,11 +41,10 @@ class Cms::Layout < ActiveRecord::Base
   
   # List of available application layouts
   def self.app_layouts_for_select
-    Dir.glob(File.expand_path('app/views/layouts/*.html.*', Rails.root)).collect do |filename|
-      match = filename.match(/\w*.html.\w*$/)
-      app_layout = match && match[0]
-      app_layout.to_s[0...1] == '_' ? nil : app_layout
-    end.compact
+    Dir.glob(File.expand_path('app/views/layouts/**/*.html.*', Rails.root)).collect do |filename|
+      filename.gsub!("#{File.expand_path('app/views/layouts', Rails.root)}/", '')
+      filename.split('/').last[0...1] == '_' ? nil : filename
+    end.compact.sort
   end
   
   # -- Instance Methods -----------------------------------------------------

data/comfortable_mexican_sofa.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{comfortable_mexican_sofa}
-  s.version = "1.3.7"
+  s.version = "1.3.8"
 
   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-08-05}
+  s.date = %q{2011-08-12}
   s.description = %q{}
   s.email = %q{oleg@theworkinggroup.ca}
   s.extra_rdoc_files = [

data/test/unit/models/layout_test.rb

@@ -47,7 +47,15 @@ class CmsLayoutTest < ActiveSupport::TestCase
   end
   
   def test_app_layouts_for_select
-    assert_equal ['cms_admin.html.erb'], Cms::Layout.app_layouts_for_select
+    FileUtils.touch(File.expand_path('app/views/layouts/cms_admin/nested.html.erb', Rails.root))
+    FileUtils.touch(File.expand_path('app/views/layouts/_partial.html.erb', Rails.root))
+    FileUtils.touch(File.expand_path('app/views/layouts/not_a_layout.erb', Rails.root))
+    
+    assert_equal ['cms_admin.html.erb', 'cms_admin/nested.html.erb'], Cms::Layout.app_layouts_for_select
+    
+    FileUtils.rm(File.expand_path('app/views/layouts/cms_admin/nested.html.erb', Rails.root))
+    FileUtils.rm(File.expand_path('app/views/layouts/_partial.html.erb', Rails.root))
+    FileUtils.rm(File.expand_path('app/views/layouts/not_a_layout.erb', Rails.root))
   end
   
   def test_merged_content_with_same_child_content

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version
-  version: 1.3.7
+  version: 1.3.8
   prerelease: 
 platform: ruby
 authors:
@@ -10,12 +10,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-05 00:00:00.000000000 -04:00
+date: 2011-08-12 00:00:00.000000000 -04:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70175748607080 !ruby/object:Gem::Requirement
+  requirement: &70228698047440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70175748607080
+  version_requirements: *70228698047440
 - !ruby/object:Gem::Dependency
   name: active_link_to
-  requirement: &70175748602620 !ruby/object:Gem::Requirement
+  requirement: &70228698046720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70175748602620
+  version_requirements: *70228698046720
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70175748597980 !ruby/object:Gem::Requirement
+  requirement: &70228698045760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,7 +45,7 @@ dependencies:
         version: 2.3.14
   type: :runtime
   prerelease: false
-  version_requirements: *70175748597980
+  version_requirements: *70228698045760
 description: ''
 email: oleg@theworkinggroup.ca
 executables: []
@@ -321,7 +321,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1037417411978385818
+      hash: 2059952711421247881
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: