comfortable_mexican_sofa 1.4.20 → 1.4.21

data/.travis.yml

@@ -2,7 +2,7 @@ rvm:
   - 1.8.7
   - 1.9.2
   # - 1.9.3
-  - rbx-2.0
+  # - rbx-2.0
   - ree
   # - jruby
 gemfile:

data/VERSION

@@ -1 +1 @@
-1.4.20
+1.4.21

data/app/controllers/cms_admin/pages_controller.rb

@@ -101,6 +101,9 @@ protected
   def preview_cms_page
     if params[:preview]
       layout = @page.layout.app_layout.blank?? false : @page.layout.app_layout
+      @cms_site   = @page.site
+      @cms_layout = @page.layout
+      @cms_page   = @page
       render :inline => @page.content(true), :layout => layout
     end
   end

data/comfortable_mexican_sofa.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{comfortable_mexican_sofa}
-  s.version = "1.4.20"
+  s.name = "comfortable_mexican_sofa"
+  s.version = "1.4.21"
 
   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-09-24}
-  s.description = %q{}
-  s.email = %q{oleg@theworkinggroup.ca}
+  s.date = "2011-09-26"
+  s.description = ""
+  s.email = "oleg@theworkinggroup.ca"
   s.extra_rdoc_files = [
     "LICENSE",
     "README.md"
@@ -300,10 +300,10 @@ Gem::Specification.new do |s|
     "test/unit/tags/snippet_test.rb",
     "test/unit/view_methods_test.rb"
   ]
-  s.homepage = %q{http://github.com/twg/comfortable-mexican-sofa}
+  s.homepage = "http://github.com/twg/comfortable-mexican-sofa"
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{ComfortableMexicanSofa is a powerful CMS Engine for Ruby on Rails 3 applications}
+  s.rubygems_version = "1.8.10"
+  s.summary = "ComfortableMexicanSofa is a powerful CMS Engine for Ruby on Rails 3 applications"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/lib/comfortable_mexican_sofa/form_builder.rb

@@ -120,7 +120,7 @@ class ComfortableMexicanSofa::FormBuilder < ActionView::Helpers::FormBuilder
   
   def collection(tag)
     options = [["---- Select #{tag.collection_class.titleize} ----", nil]] + 
-      tag.collection_class.constantize.all.collect do |m| 
+      tag.collection_objects.collect do |m| 
         [m.send(tag.collection_title), m.send(tag.collection_identifier)]
       end
       
@@ -130,7 +130,7 @@ class ComfortableMexicanSofa::FormBuilder < ActionView::Helpers::FormBuilder
       :id => nil
     )
     content << @template.hidden_field_tag('page[blocks_attributes][][label]', tag.label, :id => nil)
-    simple_field(tag.collection_class.titleize, content, :class => tag.class.to_s.demodulize.underscore )
+    simple_field(tag.label, content, :class => tag.class.to_s.demodulize.underscore )
   end
   
 end

data/lib/comfortable_mexican_sofa/tags/collection.rb

@@ -1,36 +1,50 @@
 class ComfortableMexicanSofa::Tag::Collection
   include ComfortableMexicanSofa::Tag
   
-  # Simple example for Albums collection rendered out by albums/show partial
-  # making assumtion that we will use `label` and `id` as Album attributes
-  #   {{ cms:collection:Album:albums/show }}
-  # If Album uses `title` and `slug` tag will look as follows:
-  #   {{ cms:collection:Album:albums/show:title:slug }}
-  # If you need to send more paramers to the partial just attach them as such:
-  #   {{ cms:collection:Album:albums/show:title:slug:param_a:param_b }}
+  # Here's a full tag signature:
+  #   {{ cms:collection:label:collection_class:collection_partial:collection_title:collection_identifier:collection_params }}
+  # Most minimal tag can look like this:
+  #   {{ cms:collection:album:foo/my_album }}
+  # A more complete example of the above:
+  #   {{ cms:collection:album:foo/my_album:albums/show:title:slug:param_a:param_b }}
   def self.regex_tag_signature(label = nil)
     label ||= /[\w\/\-]+/
-    /\{\{\s*cms:collection:(#{label}):([\w\/\-\:]+)\s*\}\}/
+    /\{\{\s*cms:collection:(#{label}):(.*?)\s*\}\}/
   end
   
-  def collection_partial
-    self.params.first
+  # Class definitition. It's basically `Herp::DerpityDerp.undescore` so an example
+  # of valid definition is: `herp/derpity_derp`
+  def collection_class
+    self.params[0].classify
   end
   
-  def collection_class
-    label.classify
+  # Path to the partial. Example: `path/to/partial`
+  def collection_partial
+    self.params[1] || self.collection_class.underscore.pluralize
   end
   
+  # Title method for the Collection objects. Default is `label`
   def collection_title
-    self.params[1] || 'label'
+    self.params[2] || 'label'
   end
   
+  # Identifier that will be used to find selected collection object. Defaults to `id`
   def collection_identifier
-    self.params[2] || 'id'
+    self.params[3] || 'id'
   end
   
+  # Extra params that will be passed to the partial AND ALSO will be passed as parameters
+  # for the `cms_collection` scope you can define for your Collection object
   def collection_params
-    self.params[3..-1] || []
+    self.params[4..-1] || []
+  end
+  
+  # Array of objects used in the collection
+  # You may set up a scope on the model `scope :cms_collection, lambda|*args| do ... end `
+  # `args` will be the set of `collection_params`
+  def collection_objects
+    klass = self.collection_class.constantize
+    klass.respond_to?(:cms_collection) ? klass.cms_collection(*collection_params).all : klass.all
   end
   
   def content=(value)

data/test/functional/cms_admin/pages_controller_test.rb

@@ -104,13 +104,13 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
   
   def test_get_new_with_collection
     snippet = cms_snippets(:default)
-    cms_layouts(:default).update_attribute(:content, '{{cms:collection:cms/snippet:snippets/show}}')
+    cms_layouts(:default).update_attribute(:content, '{{cms:collection:snippet:cms/snippet}}')
     get :new, :site_id => cms_sites(:default)
     assert_select "select[name='page[blocks_attributes][][content]']" do
       assert_select "option[value='']", :html => '---- Select Cms/Snippet ----'
       assert_select "option[value='#{snippet.id}']", :html => snippet.label
     end
-    assert_select "input[type='hidden'][name='page[blocks_attributes][][label]'][value='cms/snippet']"
+    assert_select "input[type='hidden'][name='page[blocks_attributes][][label]'][value='snippet']"
   end
 
   def test_get_new_with_rich_page_text
@@ -280,12 +280,15 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
   end
 
   def test_creation_preview
+    site    = cms_sites(:default)
+    layout  = cms_layouts(:default)
+    
     assert_no_difference 'Cms::Page.count' do
-      post :create, :site_id => cms_sites(:default), :preview => 'Preview', :page => {
+      post :create, :site_id => site, :preview => 'Preview', :page => {
         :label      => 'Test Page',
         :slug       => 'test-page',
         :parent_id  => cms_pages(:default).id,
-        :layout_id  => cms_layouts(:default).id,
+        :layout_id  => layout.id,
         :blocks_attributes => [
           { :label    => 'default_page_text',
             :content  => 'preview content' }
@@ -293,6 +296,11 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
       }
       assert_response :success
       assert_match /preview content/, response.body
+      
+      assert_equal site, assigns(:cms_site)
+      assert_equal layout, assigns(:cms_layout)
+      assert assigns(:cms_page)
+      assert assigns(:cms_page).new_record?
     end
   end
 
@@ -311,6 +319,10 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
       assert_match /preview content/, response.body
       page.reload
       assert_not_equal 'Updated Label', page.label
+      
+      assert_equal page.site,   assigns(:cms_site)
+      assert_equal page.layout, assigns(:cms_layout)
+      assert_equal page,        assigns(:cms_page)
     end
   end
 

data/test/unit/tag_test.rb

@@ -226,7 +226,7 @@ class TagTest < ActiveSupport::TestCase
     site = cms_sites(:default)
     layout = site.layouts.create!(
       :slug     => 'no-irb-layout',
-      :content  => '<% 1 + 1 %> {{cms:page:content}} {{cms:collection:cms/snippet:snippets/show}} <%= 1 + 1 %>'
+      :content  => '<% 1 + 1 %> {{cms:page:content}} {{cms:collection:snippet:cms/snippet}} <%= 1 + 1 %>'
     )
     snippet = site.snippets.create!(
       :slug     => 'no-irb-snippet',
@@ -239,11 +239,11 @@ class TagTest < ActiveSupport::TestCase
       :blocks_attributes => [
         { :label    => 'content',
           :content  => 'text {{ cms:snippet:no-irb-snippet }} {{ cms:partial:path/to }} {{ cms:helper:method }} text' },
-        { :label    => 'cms/snippet',
+        { :label    => 'snippet',
           :content  => snippet.id }
       ]
     )
-    assert_equal "&lt;% 1 + 1 %&gt; text &lt;% 2 + 2 %&gt; snippet &lt;%= 2 + 2 %&gt; <%= render :partial => 'path/to' %> <%= method() %> text <%= render :partial => 'snippets/show', :locals => {:model => 'Cms::Snippet', :identifier => '#{snippet.id}'} %> &lt;%= 1 + 1 %&gt;", page.content
+    assert_equal "&lt;% 1 + 1 %&gt; text &lt;% 2 + 2 %&gt; snippet &lt;%= 2 + 2 %&gt; <%= render :partial => 'path/to' %> <%= method() %> text <%= render :partial => 'cms/snippets', :locals => {:model => 'Cms::Snippet', :identifier => '#{snippet.id}'} %> &lt;%= 1 + 1 %&gt;", page.content
   end
   
   def test_content_with_irb_enabled
@@ -252,7 +252,7 @@ class TagTest < ActiveSupport::TestCase
     site = cms_sites(:default)
     layout = site.layouts.create!(
       :slug     => 'irb-layout',
-      :content  => '<% 1 + 1 %> {{cms:page:content}} {{cms:collection:cms/snippet:snippets/show}} <%= 1 + 1 %>'
+      :content  => '<% 1 + 1 %> {{cms:page:content}} {{cms:collection:snippet:cms/snippet}} <%= 1 + 1 %>'
     )
     snippet = site.snippets.create!(
       :slug     => 'irb-snippet',
@@ -265,11 +265,11 @@ class TagTest < ActiveSupport::TestCase
       :blocks_attributes => [
         { :label    => 'content',
           :content  => 'text {{ cms:snippet:irb-snippet }} {{ cms:partial:path/to }} {{ cms:helper:method }} text' },
-        { :label    => 'cms/snippet',
+        { :label    => 'snippet',
           :content  => snippet.id }
       ]
     )
-    assert_equal "<% 1 + 1 %> text <% 2 + 2 %> snippet <%= 2 + 2 %> <%= render :partial => 'path/to' %> <%= method() %> text <%= render :partial => 'snippets/show', :locals => {:model => 'Cms::Snippet', :identifier => '#{snippet.id}'} %> <%= 1 + 1 %>", page.content
+    assert_equal "<% 1 + 1 %> text <% 2 + 2 %> snippet <%= 2 + 2 %> <%= render :partial => 'path/to' %> <%= method() %> text <%= render :partial => 'cms/snippets', :locals => {:model => 'Cms::Snippet', :identifier => '#{snippet.id}'} %> <%= 1 + 1 %>", page.content
   end
   
 end

data/test/unit/tags/collection_test.rb

@@ -2,13 +2,20 @@ require File.expand_path('../../test_helper', File.dirname(__FILE__))
 
 class CollectionTagTest < ActiveSupport::TestCase
   
+  module TestCollectionScope
+    def self.included(base)
+      base.scope :cms_collection, lambda{|*args| base.where(:slug => args.first) if args.first }
+    end
+  end
+  Cms::Snippet.send(:include, TestCollectionScope)
+  
   def test_initialize_tag
     assert tag = ComfortableMexicanSofa::Tag::Collection.initialize_tag(
-      cms_pages(:default), '{{ cms:collection:cms/snippet:path/to/partial }}'
+      cms_pages(:default), '{{ cms:collection:snippet:cms/snippet }}'
     )
-    assert_equal 'cms/snippet',     tag.label
+    assert_equal 'snippet',         tag.label
     assert_equal 'Cms::Snippet',    tag.collection_class
-    assert_equal 'path/to/partial', tag.collection_partial
+    assert_equal 'cms/snippets',    tag.collection_partial
     assert_equal 'label',           tag.collection_title
     assert_equal 'id',              tag.collection_identifier
     assert_equal [],                tag.collection_params
@@ -16,9 +23,9 @@ class CollectionTagTest < ActiveSupport::TestCase
   
   def test_initialize_tag_detailed
     assert tag = ComfortableMexicanSofa::Tag::Collection.initialize_tag(
-      cms_pages(:default), '{{ cms:collection:cms/snippet:path/to/partial:title:slug:param_a:param_b }}'
+      cms_pages(:default), '{{ cms:collection:snippet:cms/snippet:path/to/partial:title:slug:param_a:param_b }}'
     )
-    assert_equal 'cms/snippet',     tag.label
+    assert_equal 'snippet',         tag.label
     assert_equal 'Cms::Snippet',    tag.collection_class
     assert_equal 'path/to/partial', tag.collection_partial
     assert_equal 'title',           tag.collection_title
@@ -30,7 +37,7 @@ class CollectionTagTest < ActiveSupport::TestCase
     [ 
       '{{cms:collection}}',
       '{{cms:collection:label}}',
-      '{{cms:not_collection:label:partial}}',
+      '{{cms:not_collection:label:class:partial}}',
       '{not_a_tag}'
     ].each do |tag_signature|
       assert_nil ComfortableMexicanSofa::Tag::Collection.initialize_tag(
@@ -39,9 +46,33 @@ class CollectionTagTest < ActiveSupport::TestCase
     end
   end
   
+  def test_collection_objects
+    assert tag = ComfortableMexicanSofa::Tag::Collection.initialize_tag(
+      cms_pages(:default), '{{ cms:collection:snippet:cms/snippet }}'
+    )
+    assert snippets = tag.collection_objects
+    assert_equal 1, snippets.count
+    assert snippets.first.is_a?(Cms::Snippet)
+  end
+  
+  def test_collection_objects_with_scope
+    assert tag = ComfortableMexicanSofa::Tag::Collection.initialize_tag(
+      cms_pages(:default), "{{ cms:collection:snippet:cms/snippet:path/to/partial:label:slug:#{cms_snippets(:default).slug} }}"
+    )
+    assert snippets = tag.collection_objects
+    assert_equal 1, snippets.count
+    assert snippets.first.is_a?(Cms::Snippet)
+    
+    assert tag = ComfortableMexicanSofa::Tag::Collection.initialize_tag(
+      cms_pages(:default), "{{ cms:collection:snippet:cms/snippet:path/to/partial:label:slug:invalid }}"
+    )
+    assert snippets = tag.collection_objects
+    assert_equal 0, snippets.count
+  end
+  
   def test_content_and_render
-    tag = ComfortableMexicanSofa::Tag::Collection.initialize_tag(
-      cms_pages(:default), '{{ cms:collection:cms/snippet:path/to/partial }}'
+    assert tag = ComfortableMexicanSofa::Tag::Collection.initialize_tag(
+      cms_pages(:default), '{{ cms:collection:snippet:cms/snippet }}'
     )
     assert tag.content.blank?
     
@@ -49,12 +80,12 @@ class CollectionTagTest < ActiveSupport::TestCase
     tag.content = snippet.id
     assert_equal snippet.id, tag.block.content
     assert_equal snippet.id, tag.content
-    assert_equal "<%= render :partial => 'path/to/partial', :locals => {:model => 'Cms::Snippet', :identifier => '#{snippet.id}'} %>", tag.render
+    assert_equal "<%= render :partial => 'cms/snippets', :locals => {:model => 'Cms::Snippet', :identifier => '#{snippet.id}'} %>", tag.render
   end
   
   def test_content_and_render_detailed
-    tag = ComfortableMexicanSofa::Tag::Collection.initialize_tag(
-      cms_pages(:default), '{{ cms:collection:cms/snippet:path/to/partial:label:slug:param_a:param_b }}'
+    assert tag = ComfortableMexicanSofa::Tag::Collection.initialize_tag(
+      cms_pages(:default), '{{ cms:collection:snippet:cms/snippet:path/to/partial:label:slug:param_a:param_b }}'
     )
     assert tag.content.blank?
     
@@ -66,8 +97,8 @@ class CollectionTagTest < ActiveSupport::TestCase
   end
   
   def test_content_and_render_with_no_content
-    tag = ComfortableMexicanSofa::Tag::Collection.initialize_tag(
-      cms_pages(:default), '{{ cms:collection:cms/snippet:path/to/partial }}'
+    assert tag = ComfortableMexicanSofa::Tag::Collection.initialize_tag(
+      cms_pages(:default), '{{ cms:collection:snippet:cms/snippet:path/to/partial }}'
     )
     assert tag.content.blank?
     assert_equal '', tag.render

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version
-  version: 1.4.20
+  version: 1.4.21
   prerelease: 
 platform: ruby
 authors:
@@ -10,12 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-24 00:00:00.000000000 -04:00
-default_executable: 
+date: 2011-09-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70220046708640 !ruby/object:Gem::Requirement
+  requirement: &70347786828380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +22,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70220046708640
+  version_requirements: *70347786828380
 - !ruby/object:Gem::Dependency
   name: active_link_to
-  requirement: &70220046707420 !ruby/object:Gem::Requirement
+  requirement: &70347786827600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +33,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70220046707420
+  version_requirements: *70347786827600
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70220046706160 !ruby/object:Gem::Requirement
+  requirement: &70347786826860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,7 +44,7 @@ dependencies:
         version: 2.3.14
   type: :runtime
   prerelease: false
-  version_requirements: *70220046706160
+  version_requirements: *70347786826860
 description: ''
 email: oleg@theworkinggroup.ca
 executables: []
@@ -336,7 +335,6 @@ files:
 - test/unit/tags/partial_test.rb
 - test/unit/tags/snippet_test.rb
 - test/unit/view_methods_test.rb
-has_rdoc: true
 homepage: http://github.com/twg/comfortable-mexican-sofa
 licenses: []
 post_install_message: 
@@ -351,7 +349,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2622555031626774518
+      hash: -4146543032644537540
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -360,7 +358,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: ComfortableMexicanSofa is a powerful CMS Engine for Ruby on Rails 3 applications