comfortable_mexican_sofa 1.0.48 → 1.0.49

data/README.md

@@ -1,5 +1,5 @@
-Comfortable Mexican Sofa (MicroCMS)
-===================================
+ComfortableMexicanSofa (MicroCMS)
+=================================
 
 ComfortableMexicanSofa is a tiny and powerful micro CMS for your Rails 3 application. This CMS is a plugin for your application, not the other way around. Implemented as an Engine so installation is no different than for any other plugin out there.
 
@@ -89,7 +89,7 @@ Sofa is able to manage multiple sites from the same application. For instance: '
     
 Integrating CMS with your app
 -----------------------------
-Comfortable Mexican Sofa is a plugin, so it allows you to easily access content it manages. Here's some things you can do.
+ComfortableMexicanSofa is a plugin, so it allows you to easily access content it manages. Here's some things you can do.
 
 You can use your existing application layout. When creating CMS layouts there's an option to use an application layout. Suddenly all CMS pages using that layout will be rendered through <%= yield %> of your application layout.
 
@@ -130,7 +130,7 @@ From your views you can use `cms_form_for` method to re-use Sofa's FormBuilder.
 
 You will probably want to add a navigation link on the left side, and for that you will want to use ViewHook functionality. Create a partial that has a link to your admin area and declare in in Sofa's initializer: `ComfortableMexicanSofa::ViewHooks.add(:navigation, '/admin/navigation')`. Similarly you can add extra stylesheets, etc into admin area in the same way.
     
-Do you have other authentication system in place (like Devise, AuthLogic, etc) and wish to use that? For that, you will need to create a module that does the authentication check and make Comfortable Mexican Sofa use it. For example:
+Do you have other authentication system in place (like Devise, AuthLogic, etc) and wish to use that? For that, you will need to create a module that does the authentication check and make ComfortableMexicanSofa use it. For example:
     
     module CmsDeviseAuth
       def authenticate
@@ -144,7 +144,7 @@ You can put this module in /config/initializers/comfortable\_mexican\_sofa.rb an
 
 Working with seeds
 ------------------
-Comfortable Mexican Sofa has seeds, functionality that helps manage content during development phase. It's very different from Rails seeds as Sofa's seeds are loaded with each page load. The database is completely bypassed when seeds are active. This way, you can source-control content before going live, disabling seeds and dumping everything into the database.
+ComfortableMexicanSofa has seeds, functionality that helps manage content during development phase. It's very different from Rails seeds as Sofa's seeds are loaded with each page load. The database is completely bypassed when seeds are active. This way, you can source-control content before going live, disabling seeds and dumping everything into the database.
 
 First, you will need to set a path where fixture files will be found (inside Sofa's initializer):
     
@@ -164,13 +164,19 @@ There's a rake task that makes moving seeds into database (and vice-versa) easy:
     
 Active Components
 -----------------
-Comfortable Mexican Sofa utilizes the following:
+ComfortableMexicanSofa utilizes the following:
 
 * **[https://github.com/rails/rails](https://github.com/rails/rails)** - Ruby on Rails 3.*, of course
 * **[https://github.com/thoughtbot/paperclip](https://github.com/thoughtbot/paperclip)** - Paperclip to handle file uploads
 * **[https://github.com/twg/active_link_to](https://github.com/twg/active_link_to)** - Easy method to handle logic behind 'active' links
 
-* * *
+Contributing to ComfortableMexicanSofa
+--------------------------------------
+
+* Fork the project
+* Start a feature/bugfix branch (don't just work on the master branch)
+* Commit and push until you are happy with your contribution
+* Create a Pull Request
 
 ![Looks pretty comfortable to me. No idea what makes it Mexican.](https://github.com/twg/comfortable-mexican-sofa/raw/master/doc/sofa.png)
 

data/VERSION

@@ -1 +1 @@
-1.0.48
+1.0.49

data/app/models/cms_layout.rb

@@ -109,9 +109,10 @@ protected
     FileUtils.rm File.expand_path("cms-js/#{self.slug}.js",   Rails.public_path), :force => true
   end
   
-  # Forcing page content reload. This will happen in cascade due to #clear_cache mathod above.
+  # Forcing page content reload
   def clear_cached_page_content
     self.cms_pages.each{ |page| page.save! }
+    self.children.each{ |child_layout| child_layout.save! }
   end
   
 end

data/app/views/cms_admin/snippets/_form.html.erb

@@ -3,5 +3,5 @@
 <% end %>
 
 <%= form.text_field :label, :id => (@cms_snippet.new_record?? 'slugify' : nil) %>
-<%= form.text_field :slug, :id => 'slug' %>
+<%= form.text_field :slug, :id => 'slug', :class => 'delimiter-underscore' %>
 <%= form.text_area :content, :class => 'code' %>

data/comfortable_mexican_sofa.gemspec

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

data/public/javascripts/comfortable_mexican_sofa/cms.js

@@ -31,17 +31,23 @@ $.CMS = function(){
     
     slugify: function(){
       $('input#slugify').bind('keyup.cms', function() {
-        $('input#slug').val( slugify( $(this).val() ) );
+        var slug_input = $('input#slug');
+        var delimiter = slug_input.hasClass('delimiter-underscore') ? '_' : '-';
+        slug_input.val( slugify( $(this).val(), delimiter ) );
       });
-      
-      function slugify(str){
+
+      function slugify(str, delimiter){
+        var opposite_delimiter = (delimiter == '-') ? '_' : '-';
         str = str.replace(/^\s+|\s+$/g, '');
-        var from = "ÀÁÄÂÈÉËÊÌÍÏÎÒÓÖÔÙÚÜÛàáäâèéëêìíïîòóöôùúüûÑñÇç·/_,:;";
-        var to   = "aaaaeeeeiiiioooouuuuaaaaeeeeiiiioooouuuunncc------";
+        var from = "ÀÁÄÂÈÉËÊÌÍÏÎÒÓÖÔÙÚÜÛàáäâèéëêìíïîòóöôùúüûÑñÇç";
+        var to   = "aaaaeeeeiiiioooouuuuaaaaeeeeiiiioooouuuunncc";
         for (var i=0, l=from.length ; i<l ; i++) {
           str = str.replace(new RegExp(from[i], "g"), to[i]);
         }
-        str = str.replace(/[^a-zA-Z0-9 -]/g, '').replace(/\s+/g, '-').toLowerCase();
+        var chars_to_replace_with_delimiter = new RegExp('[·/,:;'+ opposite_delimiter +']', 'g');
+        str = str.replace(chars_to_replace_with_delimiter, delimiter);
+        var chars_to_remove = new RegExp('[^a-zA-Z0-9 '+ delimiter +']', 'g');
+        str = str.replace(chars_to_remove, '').replace(/\s+/g, delimiter).toLowerCase();
         return str;
       }
     },

data/test/functional/cms_content_controller_test.rb

@@ -78,7 +78,6 @@ class CmsContentControllerTest < ActionController::TestCase
       :is_published   => '1',
       :cms_blocks_attributes => [
         { :label    => 'default_page_text',
-          :type     => 'CmsTag::PageText',
           :content  => 'text <%= 2 + 2 %> text' }
       ]
     )
@@ -98,7 +97,6 @@ class CmsContentControllerTest < ActionController::TestCase
       :is_published   => '1',
       :cms_blocks_attributes => [
         { :label    => 'default_page_text',
-          :type     => 'CmsTag::PageText',
           :content  => 'text <%= 2 + 2 %> text' }
       ]
     )

data/test/unit/cms_layout_test.rb

@@ -135,12 +135,45 @@ class CmsLayoutTest < ActiveSupport::TestCase
   end
   
   def test_update_forces_page_content_reload
-    layout = cms_layouts(:default)
-    page = cms_pages(:default)
-    assert_equal layout, page.cms_layout
-    layout.update_attribute(:content, 'updated {{cms:page:default_page_text:text}} updated')
-    page.reload
-    assert_equal "updated default_page_text_content_a\ndefault_snippet_content\ndefault_page_text_content_b updated", page.content
+    layout_1 = cms_layouts(:nested)
+    layout_2 = cms_layouts(:child)
+    page_1 = cms_sites(:default).cms_pages.create!(
+      :label          => 'page_1',
+      :slug           => 'page-1',
+      :parent_id      => cms_pages(:default).id,
+      :cms_layout_id  => layout_1.id,
+      :is_published   => '1',
+      :cms_blocks_attributes => [
+        { :label    => 'header',
+          :content  => 'header_content' },
+        { :label    => 'content',
+          :content  => 'content_content' }
+      ]
+    )
+    page_2 = cms_sites(:default).cms_pages.create!(
+      :label          => 'page_2',
+      :slug           => 'page-2',
+      :parent_id      => cms_pages(:default).id,
+      :cms_layout_id  => layout_2.id,
+      :is_published   => '1',
+      :cms_blocks_attributes => [
+        { :label    => 'header',
+          :content  => 'header_content' },
+        { :label    => 'left_column',
+          :content  => 'left_column_content' },
+        { :label    => 'right_column',
+          :content  => 'left_column_content' }
+      ]
+    )
+    assert_equal "header_content\ncontent_content", page_1.content
+    assert_equal "header_content\nleft_column_content\nleft_column_content", page_2.content
+    
+    layout_1.update_attribute(:content, "Updated {{cms:page:content}}")
+    page_1.reload
+    page_2.reload
+    
+    assert_equal "Updated content_content", page_1.content
+    assert_equal "Updated left_column_content\nleft_column_content", page_2.content
   end
   
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 48
-  version: 1.0.48
+  - 49
+  version: 1.0.49
 platform: ruby
 authors: 
 - Oleg Khabarov
@@ -384,7 +384,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3244962332587742397
+      hash: -3061887318835465352
       segments: 
       - 0
       version: "0"