comfortable_mexican_sofa 1.4.21 → 1.4.22

data/VERSION

@@ -1 +1 @@
-1.4.21
+1.4.22

data/comfortable_mexican_sofa.gemspec

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

data/lib/comfortable_mexican_sofa/form_builder.rb

@@ -61,7 +61,7 @@ class ComfortableMexicanSofa::FormBuilder < ActionView::Helpers::FormBuilder
     
     field_css_class = case tag
     when ComfortableMexicanSofa::Tag::PageDateTime, ComfortableMexicanSofa::Tag::FieldDateTime
-      'date'
+      'datetime'
     when ComfortableMexicanSofa::Tag::PageText, ComfortableMexicanSofa::Tag::FieldText
       'code'
     when ComfortableMexicanSofa::Tag::PageRichText

data/lib/comfortable_mexican_sofa/tags/collection.rb

@@ -20,7 +20,7 @@ class ComfortableMexicanSofa::Tag::Collection
   
   # Path to the partial. Example: `path/to/partial`
   def collection_partial
-    self.params[1] || self.collection_class.underscore.pluralize
+    self.params[1] || "partials/#{self.collection_class.underscore.pluralize}"
   end
   
   # Title method for the Collection objects. Default is `label`

data/test/functional/cms_admin/pages_controller_test.rb

@@ -49,7 +49,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
   def test_get_new_with_field_datetime
     cms_layouts(:default).update_attribute(:content, '{{cms:field:test_label:datetime}}')
     get :new, :site_id => cms_sites(:default)
-    assert_select "input[type='text'][name='page[blocks_attributes][][content]'][class='date']"
+    assert_select "input[type='text'][name='page[blocks_attributes][][content]'][class='datetime']"
     assert_select "input[type='hidden'][name='page[blocks_attributes][][label]'][value='test_label']"
   end
 
@@ -77,7 +77,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
   def test_get_new_with_page_datetime
     cms_layouts(:default).update_attribute(:content, '{{cms:page:test_label:datetime}}')
     get :new, :site_id => cms_sites(:default)
-    assert_select "input[type='text'][name='page[blocks_attributes][][content]'][class='date']"
+    assert_select "input[type='text'][name='page[blocks_attributes][][content]'][class='datetime']"
     assert_select "input[type='hidden'][name='page[blocks_attributes][][label]'][value='test_label']"
   end
 

data/test/unit/tag_test.rb

@@ -243,7 +243,7 @@ class TagTest < ActiveSupport::TestCase
           :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 => 'cms/snippets', :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 => 'partials/cms/snippets', :locals => {:model => 'Cms::Snippet', :identifier => '#{snippet.id}'} %> &lt;%= 1 + 1 %&gt;", page.content
   end
   
   def test_content_with_irb_enabled
@@ -269,7 +269,7 @@ class TagTest < ActiveSupport::TestCase
           :content  => snippet.id }
       ]
     )
-    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
+    assert_equal "<% 1 + 1 %> text <% 2 + 2 %> snippet <%= 2 + 2 %> <%= render :partial => 'path/to' %> <%= method() %> text <%= render :partial => 'partials/cms/snippets', :locals => {:model => 'Cms::Snippet', :identifier => '#{snippet.id}'} %> <%= 1 + 1 %>", page.content
   end
   
 end

data/test/unit/tags/collection_test.rb

@@ -13,12 +13,12 @@ class CollectionTagTest < ActiveSupport::TestCase
     assert tag = ComfortableMexicanSofa::Tag::Collection.initialize_tag(
       cms_pages(:default), '{{ cms:collection:snippet:cms/snippet }}'
     )
-    assert_equal 'snippet',         tag.label
-    assert_equal 'Cms::Snippet',    tag.collection_class
-    assert_equal 'cms/snippets',    tag.collection_partial
-    assert_equal 'label',           tag.collection_title
-    assert_equal 'id',              tag.collection_identifier
-    assert_equal [],                tag.collection_params
+    assert_equal 'snippet',               tag.label
+    assert_equal 'Cms::Snippet',          tag.collection_class
+    assert_equal 'partials/cms/snippets', 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
@@ -80,7 +80,7 @@ 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 => 'cms/snippets', :locals => {:model => 'Cms::Snippet', :identifier => '#{snippet.id}'} %>", tag.render
+    assert_equal "<%= render :partial => 'partials/cms/snippets', :locals => {:model => 'Cms::Snippet', :identifier => '#{snippet.id}'} %>", tag.render
   end
   
   def test_content_and_render_detailed

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version
-  version: 1.4.21
+  version: 1.4.22
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2011-09-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70347786828380 !ruby/object:Gem::Requirement
+  requirement: &70115040490720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70347786828380
+  version_requirements: *70115040490720
 - !ruby/object:Gem::Dependency
   name: active_link_to
-  requirement: &70347786827600 !ruby/object:Gem::Requirement
+  requirement: &70115040490140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70347786827600
+  version_requirements: *70115040490140
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70347786826860 !ruby/object:Gem::Requirement
+  requirement: &70115040489540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +44,7 @@ dependencies:
         version: 2.3.14
   type: :runtime
   prerelease: false
-  version_requirements: *70347786826860
+  version_requirements: *70115040489540
 description: ''
 email: oleg@theworkinggroup.ca
 executables: []
@@ -349,7 +349,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4146543032644537540
+      hash: 1925889487784406071
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: