comfortable_mexican_sofa 1.4.19 → 1.4.20

data/VERSION

@@ -1 +1 @@
-1.4.19
+1.4.20

data/comfortable_mexican_sofa.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{comfortable_mexican_sofa}
-  s.version = "1.4.19"
+  s.version = "1.4.20"
 
   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-22}
+  s.date = %q{2011-09-24}
   s.description = %q{}
   s.email = %q{oleg@theworkinggroup.ca}
   s.extra_rdoc_files = [
@@ -218,6 +218,7 @@ Gem::Specification.new do |s|
     "lib/comfortable_mexican_sofa/form_builder.rb",
     "lib/comfortable_mexican_sofa/tag.rb",
     "lib/comfortable_mexican_sofa/tags/asset.rb",
+    "lib/comfortable_mexican_sofa/tags/collection.rb",
     "lib/comfortable_mexican_sofa/tags/field_datetime.rb",
     "lib/comfortable_mexican_sofa/tags/field_integer.rb",
     "lib/comfortable_mexican_sofa/tags/field_string.rb",
@@ -283,6 +284,7 @@ Gem::Specification.new do |s|
     "test/unit/revisions_test.rb",
     "test/unit/tag_test.rb",
     "test/unit/tags/asset_test.rb",
+    "test/unit/tags/collection_test.rb",
     "test/unit/tags/field_datetime_test.rb",
     "test/unit/tags/field_integer_test.rb",
     "test/unit/tags/field_string_test.rb",
@@ -291,7 +293,7 @@ Gem::Specification.new do |s|
     "test/unit/tags/helper_test.rb",
     "test/unit/tags/page_datetime_test.rb",
     "test/unit/tags/page_integer_test.rb",
-    "test/unit/tags/page_rich_text.rb",
+    "test/unit/tags/page_rich_text_test.rb",
     "test/unit/tags/page_string_test.rb",
     "test/unit/tags/page_text_test.rb",
     "test/unit/tags/partial_test.rb",

data/lib/comfortable_mexican_sofa/form_builder.rb

@@ -78,16 +78,8 @@ class ComfortableMexicanSofa::FormBuilder < ActionView::Helpers::FormBuilder
         :id     => nil, 
         :class  => field_css_class
       )
-    
-    %(
-      <div class='form_element #{css_class}'>
-        <div class='label'>#{label}</div>
-        <div class='value'>
-          #{field}
-          #{@template.hidden_field_tag('page[blocks_attributes][][label]', tag.label, :id => nil)}
-        </div>
-      </div>
-    ).html_safe
+    content = "#{field} #{@template.hidden_field_tag('page[blocks_attributes][][label]', tag.label, :id => nil)}"
+    simple_field(label, content, :class => css_class)
   end
   
   def field_date_time(tag)
@@ -126,4 +118,19 @@ class ComfortableMexicanSofa::FormBuilder < ActionView::Helpers::FormBuilder
     default_tag_field(tag, :content_field_method => :text_area_tag)
   end
   
+  def collection(tag)
+    options = [["---- Select #{tag.collection_class.titleize} ----", nil]] + 
+      tag.collection_class.constantize.all.collect do |m| 
+        [m.send(tag.collection_title), m.send(tag.collection_identifier)]
+      end
+      
+    content = @template.select_tag(
+      'page[blocks_attributes][][content]',
+      @template.options_for_select(options, :selected => tag.content),
+      :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 )
+  end
+  
 end

data/lib/comfortable_mexican_sofa/tag.rb

@@ -88,7 +88,7 @@ module ComfortableMexicanSofa::Tag
     
     # Checks if this tag is using Cms::Block
     def is_cms_block?
-      %w(page field).member?(self.class.to_s.demodulize.underscore.split(/_/).first)
+      %w(page field collection).member?(self.class.to_s.demodulize.underscore.split(/_/).first)
     end
     
     # Used in displaying form elements for Cms::Block

data/lib/comfortable_mexican_sofa/tags/collection.rb

@@ -0,0 +1,54 @@
+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 }}
+  def self.regex_tag_signature(label = nil)
+    label ||= /[\w\/\-]+/
+    /\{\{\s*cms:collection:(#{label}):([\w\/\-\:]+)\s*\}\}/
+  end
+  
+  def collection_partial
+    self.params.first
+  end
+  
+  def collection_class
+    label.classify
+  end
+  
+  def collection_title
+    self.params[1] || 'label'
+  end
+  
+  def collection_identifier
+    self.params[2] || 'id'
+  end
+  
+  def collection_params
+    self.params[3..-1] || []
+  end
+  
+  def content=(value)
+    block.content = value
+  end
+  
+  def content
+    block.content
+  end
+  
+  def render
+    if self.content.present?
+      ps = collection_params.collect_with_index{|p, i| ":param_#{i+1} => '#{p}'"}.join(', ')
+      ps = ps.present?? ", #{ps}" : ''
+      "<%= render :partial => '#{collection_partial}', :locals => {:model => '#{collection_class}', :identifier => '#{content}'#{ps}} %>"
+    else
+      ''
+    end
+  end
+  
+end

data/test/functional/cms_admin/pages_controller_test.rb

@@ -101,6 +101,17 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
     assert_select "textarea[name='page[blocks_attributes][][content]'][class='code']"
     assert_select "input[type='hidden'][name='page[blocks_attributes][][label]'][value='test_label']"
   end
+  
+  def test_get_new_with_collection
+    snippet = cms_snippets(:default)
+    cms_layouts(:default).update_attribute(:content, '{{cms:collection:cms/snippet:snippets/show}}')
+    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']"
+  end
 
   def test_get_new_with_rich_page_text
     cms_layouts(:default).update_attribute(:content, '{{cms:page:test_label:rich_text}}')

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

data/test/unit/tags/collection_test.rb

@@ -0,0 +1,76 @@
+require File.expand_path('../../test_helper', File.dirname(__FILE__))
+
+class CollectionTagTest < ActiveSupport::TestCase
+  
+  def test_initialize_tag
+    assert tag = ComfortableMexicanSofa::Tag::Collection.initialize_tag(
+      cms_pages(:default), '{{ cms:collection:cms/snippet:path/to/partial }}'
+    )
+    assert_equal 'cms/snippet',     tag.label
+    assert_equal 'Cms::Snippet',    tag.collection_class
+    assert_equal 'path/to/partial', tag.collection_partial
+    assert_equal 'label',           tag.collection_title
+    assert_equal 'id',              tag.collection_identifier
+    assert_equal [],                tag.collection_params
+  end
+  
+  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 }}'
+    )
+    assert_equal 'cms/snippet',     tag.label
+    assert_equal 'Cms::Snippet',    tag.collection_class
+    assert_equal 'path/to/partial', tag.collection_partial
+    assert_equal 'title',           tag.collection_title
+    assert_equal 'slug',            tag.collection_identifier
+    assert_equal ['param_a', 'param_b'], tag.collection_params
+  end
+  
+  def test_initialize_tag_failure
+    [ 
+      '{{cms:collection}}',
+      '{{cms:collection:label}}',
+      '{{cms:not_collection:label:partial}}',
+      '{not_a_tag}'
+    ].each do |tag_signature|
+      assert_nil ComfortableMexicanSofa::Tag::Collection.initialize_tag(
+        cms_pages(:default), tag_signature
+      )
+    end
+  end
+  
+  def test_content_and_render
+    tag = ComfortableMexicanSofa::Tag::Collection.initialize_tag(
+      cms_pages(:default), '{{ cms:collection:cms/snippet:path/to/partial }}'
+    )
+    assert tag.content.blank?
+    
+    snippet = cms_snippets(:default)
+    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
+  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.content.blank?
+    
+    snippet = cms_snippets(:default)
+    tag.content = snippet.slug
+    assert_equal snippet.slug, tag.block.content
+    assert_equal snippet.slug, tag.content
+    assert_equal "<%= render :partial => 'path/to/partial', :locals => {:model => 'Cms::Snippet', :identifier => '#{snippet.slug}', :param_1 => 'param_a', :param_2 => 'param_b'} %>", tag.render
+  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.content.blank?
+    assert_equal '', tag.render
+  end
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version
-  version: 1.4.19
+  version: 1.4.20
   prerelease: 
 platform: ruby
 authors:
@@ -10,12 +10,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-22 00:00:00.000000000 -04:00
+date: 2011-09-24 00:00:00.000000000 -04:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70343682601860 !ruby/object:Gem::Requirement
+  requirement: &70220046708640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70343682601860
+  version_requirements: *70220046708640
 - !ruby/object:Gem::Dependency
   name: active_link_to
-  requirement: &70343682597740 !ruby/object:Gem::Requirement
+  requirement: &70220046707420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70343682597740
+  version_requirements: *70220046707420
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70343682597140 !ruby/object:Gem::Requirement
+  requirement: &70220046706160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,7 +45,7 @@ dependencies:
         version: 2.3.14
   type: :runtime
   prerelease: false
-  version_requirements: *70343682597140
+  version_requirements: *70220046706160
 description: ''
 email: oleg@theworkinggroup.ca
 executables: []
@@ -255,6 +255,7 @@ files:
 - lib/comfortable_mexican_sofa/form_builder.rb
 - lib/comfortable_mexican_sofa/tag.rb
 - lib/comfortable_mexican_sofa/tags/asset.rb
+- lib/comfortable_mexican_sofa/tags/collection.rb
 - lib/comfortable_mexican_sofa/tags/field_datetime.rb
 - lib/comfortable_mexican_sofa/tags/field_integer.rb
 - lib/comfortable_mexican_sofa/tags/field_string.rb
@@ -320,6 +321,7 @@ files:
 - test/unit/revisions_test.rb
 - test/unit/tag_test.rb
 - test/unit/tags/asset_test.rb
+- test/unit/tags/collection_test.rb
 - test/unit/tags/field_datetime_test.rb
 - test/unit/tags/field_integer_test.rb
 - test/unit/tags/field_string_test.rb
@@ -328,7 +330,7 @@ files:
 - test/unit/tags/helper_test.rb
 - test/unit/tags/page_datetime_test.rb
 - test/unit/tags/page_integer_test.rb
-- test/unit/tags/page_rich_text.rb
+- test/unit/tags/page_rich_text_test.rb
 - test/unit/tags/page_string_test.rb
 - test/unit/tags/page_text_test.rb
 - test/unit/tags/partial_test.rb
@@ -349,7 +351,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 467182363861644455
+      hash: -2622555031626774518
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: