comfortable_mexican_sofa 1.6.4 → 1.6.5

data/VERSION

@@ -1 +1 @@
-1.6.4
+1.6.5

data/app/models/cms/layout.rb

@@ -63,10 +63,10 @@ class Cms::Layout < ActiveRecord::Base
       if parent.merged_content.match(regex)
         parent.merged_content.gsub(regex, content.to_s)
       else
-        content
+        content.to_s
       end
     else
-      content
+      content.to_s
     end
   end
   

data/comfortable_mexican_sofa.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "comfortable_mexican_sofa"
-  s.version = "1.6.4"
+  s.version = "1.6.5"
 
   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 = "2012-01-03"
+  s.date = "2012-01-04"
   s.description = ""
   s.email = "oleg@theworkinggroup.ca"
   s.extra_rdoc_files = [

data/lib/comfortable_mexican_sofa/fixtures.rb

@@ -27,11 +27,11 @@ module ComfortableMexicanSofa::Fixtures
       if File.exists?(file_path = File.join(path, "_#{identifier}.yml"))
         if layout.new_record? || File.mtime(file_path) > layout.updated_at
           attributes = YAML.load_file(file_path).symbolize_keys!
-          layout.label      = attributes[:label] || slug.titleize
+          layout.label      = attributes[:label] || identifier.titleize
           layout.app_layout = attributes[:app_layout] || parent.try(:app_layout) 
         end
       elsif layout.new_record?
-        layout.label      = slug.titleize
+        layout.label      = identifier.titleize
         layout.app_layout = parent.try(:app_layout) 
       end
       
@@ -159,10 +159,10 @@ module ComfortableMexicanSofa::Fixtures
       if File.exists?(file_path = File.join(path, "_#{identifier}.yml"))
         if snippet.new_record? || File.mtime(file_path) > snippet.updated_at
           attributes = YAML.load_file(file_path).symbolize_keys!
-          snippet.label = attributes[:label] || slug.titleize
+          snippet.label = attributes[:label] || identifier.titleize
         end
       elsif snippet.new_record?
-        snippet.label = slug.titleize
+        snippet.label = identifier.titleize
       end
       
       # updating content

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version
-  version: 1.6.4
+  version: 1.6.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-03 00:00:00.000000000Z
+date: 2012-01-04 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70105868102320 !ruby/object:Gem::Requirement
+  requirement: &70306773927240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70105868102320
+  version_requirements: *70306773927240
 - !ruby/object:Gem::Dependency
   name: active_link_to
-  requirement: &70105868101600 !ruby/object:Gem::Requirement
+  requirement: &70306773926480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70105868101600
+  version_requirements: *70306773926480
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70105868100660 !ruby/object:Gem::Requirement
+  requirement: &70306773925880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +44,7 @@ dependencies:
         version: 2.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70105868100660
+  version_requirements: *70306773925880
 description: ''
 email: oleg@theworkinggroup.ca
 executables: []
@@ -360,7 +360,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3884986161663546839
+      hash: 2852536089884918471
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: