comfortable_mexican_sofa 1.4.22 → 1.5.0

data/test/functional/cms_admin/snippets_controller_test.rb

@@ -51,7 +51,6 @@ class CmsAdmin::SnippetsControllerTest < ActionController::TestCase
     assert assigns(:snippet)
     assert_template :edit
     assert_select "form[action=/cms-admin/sites/#{snippet.site.id}/snippets/#{snippet.id}]"
-    assert_select "form[action='/cms-admin/sites/#{snippet.site.id}/files?file[snippet_id]=#{snippet.id}']"
   end
 
   def test_get_edit_failure
@@ -119,5 +118,23 @@ class CmsAdmin::SnippetsControllerTest < ActionController::TestCase
       assert_equal 'Snippet deleted', flash[:notice]
     end
   end
+  
+  def test_reorder
+    snippet_one = cms_snippets(:default)
+    snippet_two = cms_sites(:default).snippets.create!(
+      :label  => 'test',
+      :slug   => 'test'
+    )
+    assert_equal 0, snippet_one.position
+    assert_equal 1, snippet_two.position
+
+    post :reorder, :site_id => cms_sites(:default), :cms_snippet => [snippet_two.id, snippet_one.id]
+    assert_response :success
+    snippet_one.reload
+    snippet_two.reload
+
+    assert_equal 1, snippet_one.position
+    assert_equal 0, snippet_two.position
+  end
 
 end

data/test/gemfiles/Gemfile.rails-3.0.x

@@ -0,0 +1,10 @@
+source 'http://rubygems.org'
+
+gem 'rails',          '~>3.0.10'
+gem 'active_link_to', '~>1.0.0'
+gem 'paperclip',      '~>2.4.2'
+
+group :test do
+  gem 'sqlite3'
+  gem 'jeweler'
+end

data/test/gemfiles/Gemfile.rails-3.1.x

@@ -0,0 +1,10 @@
+source 'http://rubygems.org'
+
+gem 'rails',          '~>3.1.0'
+gem 'active_link_to', '~>1.0.0'
+gem 'paperclip',      '~>2.4.2'
+
+group :test do
+  gem 'sqlite3'
+  gem 'jeweler'
+end

data/test/test_helper.rb

@@ -6,6 +6,7 @@ require 'rails/test_help'
 
 class ActiveSupport::TestCase
   
+  # Shut the fuck up
   $stdout_orig = $stdout
   $stderr_orig = $stderr
   $stdout = StringIO.new
@@ -21,18 +22,18 @@ class ActiveSupport::TestCase
   # resetting default configuration
   def reset_config
     ComfortableMexicanSofa.configure do |config|
-      config.cms_title                = 'ComfortableMexicanSofa MicroCMS'
-      config.admin_auth               = 'ComfortableMexicanSofa::HttpAuth'
-      config.public_auth              = 'ComfortableMexicanSofa::DummyAuth'
-      config.admin_route_prefix       = 'cms-admin'
-      config.admin_route_redirect     = ''
-      config.allow_irb                = false
-      config.enable_fixtures          = false
-      config.fixtures_path            = File.expand_path('db/cms_fixtures', Rails.root)
-      config.revisions_limit          = 25
-      config.locales                  = { :en => 'English', :es => 'Español' }
-      config.admin_locale             = nil
-      config.auto_file_categorization = false
+      config.cms_title            = 'ComfortableMexicanSofa MicroCMS'
+      config.admin_auth           = 'ComfortableMexicanSofa::HttpAuth'
+      config.public_auth          = 'ComfortableMexicanSofa::DummyAuth'
+      config.admin_route_prefix   = 'cms-admin'
+      config.admin_route_redirect = ''
+      config.allow_irb            = false
+      config.enable_fixtures      = false
+      config.fixtures_path        = File.expand_path('db/cms_fixtures', Rails.root)
+      config.revisions_limit      = 25
+      config.locales              = { :en => 'English', :es => 'Español' }
+      config.admin_locale         = nil
+      config.upload_file_options  = { }
     end
     ComfortableMexicanSofa::HttpAuth.username = 'username'
     ComfortableMexicanSofa::HttpAuth.password = 'password'

data/test/unit/configuration_test.rb

@@ -18,7 +18,7 @@ class ConfigurationTest < ActiveSupport::TestCase
     assert_equal ({:en => 'English', :es => 'Español'}), config.locales
     assert_equal nil, config.admin_locale
     assert_equal nil, config.database_config
-    assert_equal false, config.auto_file_categorization
+    assert_equal ({}), config.upload_file_options
   end
   
   def test_initialization_overrides

data/test/unit/models/block_test.rb

@@ -8,7 +8,13 @@ class CmsBlockTest < ActiveSupport::TestCase
     end
   end
   
-  def test_new_via_page_nested_attributes
+  def test_tag
+    block = cms_blocks(:default_page_text)
+    assert block.page.tags(true).collect(&:identifier).member?('page_text_default_page_text')
+    assert_equal 'page_text_default_page_text', block.tag.identifier
+  end
+  
+  def test_creation_via_page_nested_attributes
     assert_difference ['Cms::Page.count', 'Cms::Block.count'] do
       page = Cms::Page.create!(
         :site       => cms_sites(:default),
@@ -30,4 +36,109 @@ class CmsBlockTest < ActiveSupport::TestCase
     end
   end
   
+  def test_creation_via_page_nested_attributes_as_hash
+    assert_difference ['Cms::Page.count', 'Cms::Block.count'] do
+      page = Cms::Page.create!(
+        :site       => cms_sites(:default),
+        :layout     => cms_layouts(:default),
+        :label      => 'test page',
+        :slug       => 'test_page',
+        :parent_id  => cms_pages(:default).id,
+        :blocks_attributes => {
+          '0' => {
+            :label    => 'default_page_text',
+            :content  => 'test_content'
+          }
+        }
+      )
+      assert_equal 1, page.blocks.count
+      block = page.blocks.first
+      assert_equal 'default_page_text', block.label
+      assert_equal 'test_content', block.content
+    end
+  end
+  
+  def test_creation_and_update_via_nested_attributes_with_file
+    layout = cms_layouts(:default)
+    layout.update_attribute(:content, '{{cms:page_file:file}}')
+    
+    page = nil
+    assert_difference ['Cms::Page.count', 'Cms::Block.count', 'Cms::File.count'] do
+      page = Cms::Page.create!(
+        :site       => cms_sites(:default),
+        :layout     => layout,
+        :label      => 'test page',
+        :slug       => 'test_page',
+        :parent_id  => cms_pages(:default).id,
+        :blocks_attributes => [
+          { :label    => 'file',
+            :content  => [fixture_file_upload('files/valid_image.jpg'), fixture_file_upload('files/invalid_file.gif')] }
+        ]
+      )
+      assert_equal 1, page.blocks.count
+      block = page.blocks.first
+      assert_equal 'file', block.label
+      assert_equal nil, block.content
+      assert_equal 1, block.files.count
+      assert_equal 'valid_image.jpg', block.files.first.file_file_name
+    end
+    
+    assert_no_difference ['Cms::Block.count', 'Cms::File.count'] do
+      page.update_attributes!(
+        :blocks_attributes => [
+          { :label    => 'file',
+            :content  => fixture_file_upload('files/invalid_file.gif') }
+        ]
+      )
+      page.reload
+      block = page.blocks.first
+      assert_equal 1, block.files.count
+      assert_equal 'invalid_file.gif', block.files.first.file_file_name
+    end
+  end
+  
+  def test_creation_and_update_via_nested_attributes_with_files
+    layout = cms_layouts(:default)
+    layout.update_attribute(:content, '{{cms:page_files:files}}')
+    
+    page = nil
+    assert_difference ['Cms::Page.count', 'Cms::Block.count'] do
+      assert_difference 'Cms::File.count', 2 do
+        page = Cms::Page.create!(
+          :site       => cms_sites(:default),
+          :layout     => layout,
+          :label      => 'test page',
+          :slug       => 'test_page',
+          :parent_id  => cms_pages(:default).id,
+          :blocks_attributes => [
+            { :label    => 'files',
+              :content  => [fixture_file_upload('files/valid_image.jpg'), fixture_file_upload('files/invalid_file.gif')] }
+          ]
+        )
+        assert_equal 1, page.blocks.count
+        block = page.blocks.first
+        assert_equal 'files', block.label
+        assert_equal nil, block.content
+        assert_equal 2, block.files.count
+        assert_equal ['valid_image.jpg', 'invalid_file.gif'], block.files.collect(&:file_file_name)
+      end
+    end
+    
+    assert_no_difference 'Cms::Block.count' do
+      assert_difference 'Cms::File.count', 2 do
+        page.update_attributes!(
+          :blocks_attributes => [
+            { :label    => 'files',
+              :content  => [fixture_file_upload('files/valid_image.jpg'), fixture_file_upload('files/invalid_file.gif')] }
+          ]
+        )
+        page.reload
+        block = page.blocks.first
+        assert_equal 4, block.files.count
+        assert_equal ['valid_image.jpg', 'invalid_file.gif', 'valid_image.jpg', 'invalid_file.gif'], 
+          block.files.collect(&:file_file_name)
+      end
+    end
+  end
+  
 end

data/test/unit/models/file_test.rb

@@ -22,57 +22,7 @@ class CmsFileTest < ActiveSupport::TestCase
         :file => fixture_file_upload('files/valid_image.jpg')
       )
       assert_equal 'Valid Image', file.label
-    end
-  end
-  
-  def test_creation_with_layout_link_and_config_disabled
-    assert !ComfortableMexicanSofa.config.auto_file_categorization
-    assert_difference 'Cms::File.count' do
-      assert_no_difference ['Cms::Category.count', 'Cms::Categorization.count'] do
-        file = cms_sites(:default).files.create(
-          :file       => fixture_file_upload('files/valid_image.jpg'),
-          :layout_id  => cms_layouts(:default)
-        )
-      end
-    end
-  end
-  
-  def test_creation_with_layout_link
-    ComfortableMexicanSofa.config.auto_file_categorization = true
-    assert_difference ['Cms::File.count', 'Cms::Category.count', 'Cms::Categorization.count'] do
-      file = cms_sites(:default).files.create(
-        :file       => fixture_file_upload('files/valid_image.jpg'),
-        :layout_id  => cms_layouts(:default)
-      )
-      assert_equal 1, file.categories.count
-      assert_equal '[layout] default',  file.categories.first.label
-      assert_equal 'Cms::File', file.categories.first.categorized_type
-    end
-  end
-  
-  def test_creation_with_page_link
-    ComfortableMexicanSofa.config.auto_file_categorization = true
-    assert_difference ['Cms::File.count', 'Cms::Category.count', 'Cms::Categorization.count'] do
-      file = cms_sites(:default).files.create(
-        :file     => fixture_file_upload('files/valid_image.jpg'),
-        :page_id  => cms_pages(:default)
-      )
-      assert_equal 1, file.categories.count
-      assert_equal '[page] /',  file.categories.first.label
-      assert_equal 'Cms::File', file.categories.first.categorized_type
-    end
-  end
-  
-  def test_creation_with_snippet_link
-    ComfortableMexicanSofa.config.auto_file_categorization = true
-    assert_difference ['Cms::File.count', 'Cms::Category.count', 'Cms::Categorization.count'] do
-      file = cms_sites(:default).files.create(
-        :file       => fixture_file_upload('files/valid_image.jpg'),
-        :snippet_id => cms_snippets(:default)
-      )
-      assert_equal 1, file.categories.count
-      assert_equal '[snippet] default',  file.categories.first.label
-      assert_equal 'Cms::File', file.categories.first.categorized_type
+      assert_equal 1, file.position
     end
   end
   

data/test/unit/models/layout_test.rb

@@ -34,6 +34,7 @@ class CmsLayoutTest < ActiveSupport::TestCase
       assert_equal '{{cms:page:content}}', layout.content
       assert_equal 'css', layout.css
       assert_equal 'js', layout.js
+      assert_equal 1, layout.position
     end
   end
   

data/test/unit/models/snippet_test.rb

@@ -23,6 +23,20 @@ class CmsSnippetTest < ActiveSupport::TestCase
     assert_equal 'Test', snippet.label
   end
   
+  def test_create
+    assert_difference 'Cms::Snippet.count' do
+      snippet = cms_sites(:default).snippets.create(
+        :label    => 'Test Snippet',
+        :slug     => 'test',
+        :content  => 'Test Content'
+      )
+      assert_equal 'Test Snippet', snippet.label
+      assert_equal 'test', snippet.slug
+      assert_equal 'Test Content', snippet.content
+      assert_equal 1, snippet.position
+    end
+  end
+  
   def test_update_forces_page_content_reload
     snippet = cms_snippets(:default)
     page = cms_pages(:default)

data/test/unit/tags/collection_test.rb

@@ -74,10 +74,10 @@ class CollectionTagTest < ActiveSupport::TestCase
     assert tag = ComfortableMexicanSofa::Tag::Collection.initialize_tag(
       cms_pages(:default), '{{ cms:collection:snippet:cms/snippet }}'
     )
-    assert tag.content.blank?
+    assert tag.block.content.blank?
     
     snippet = cms_snippets(:default)
-    tag.content = snippet.id
+    tag.block.content = snippet.id
     assert_equal snippet.id, tag.block.content
     assert_equal snippet.id, tag.content
     assert_equal "<%= render :partial => 'partials/cms/snippets', :locals => {:model => 'Cms::Snippet', :identifier => '#{snippet.id}'} %>", tag.render
@@ -87,10 +87,10 @@ class CollectionTagTest < ActiveSupport::TestCase
     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?
+    assert tag.block.content.blank?
     
     snippet = cms_snippets(:default)
-    tag.content = snippet.slug
+    tag.block.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
@@ -100,7 +100,7 @@ class CollectionTagTest < ActiveSupport::TestCase
     assert tag = ComfortableMexicanSofa::Tag::Collection.initialize_tag(
       cms_pages(:default), '{{ cms:collection:snippet:cms/snippet:path/to/partial }}'
     )
-    assert tag.content.blank?
+    assert tag.block.content.blank?
     assert_equal '', tag.render
   end
   

data/test/unit/tags/field_datetime_test.rb

@@ -34,9 +34,9 @@ class FieldDateTimeTagTest < ActiveSupport::TestCase
     tag = ComfortableMexicanSofa::Tag::FieldDateTime.initialize_tag(
       cms_pages(:default), '{{cms:field:content:datetime}}'
     )
-    assert tag.content.blank?
+    assert tag.block.content.blank?
     time = 2.days.ago
-    tag.content = time
+    tag.block.content = time
     assert_equal time, tag.content
     assert_equal '', tag.render
   end

data/test/unit/tags/field_integer_test.rb

@@ -34,8 +34,8 @@ class FieldIntegerTagTest < ActiveSupport::TestCase
     tag = ComfortableMexicanSofa::Tag::FieldInteger.initialize_tag(
       cms_pages(:default), '{{cms:field:content:integer}}'
     )
-    assert tag.content.blank?
-    tag.content = '5'
+    assert tag.block.content.blank?
+    tag.block.content = '5'
     assert_equal '5', tag.content
     assert_equal '', tag.render
   end

data/test/unit/tags/field_string_test.rb

@@ -37,8 +37,8 @@ class FieldStringTagTest < ActiveSupport::TestCase
     tag = ComfortableMexicanSofa::Tag::FieldString.initialize_tag(
       cms_pages(:default), '{{cms:field:content}}'
     )
-    assert tag.content.blank?
-    tag.content = 'test_content'
+    assert tag.block.content.blank?
+    tag.block.content = 'test_content'
     assert_equal 'test_content', tag.content
     assert_equal '', tag.render
   end

data/test/unit/tags/field_text_test.rb

@@ -33,8 +33,8 @@ class FieldTextTagTest < ActiveSupport::TestCase
     tag = ComfortableMexicanSofa::Tag::FieldText.initialize_tag(
       cms_pages(:default), '{{cms:field:content:text}}'
     )
-    assert tag.content.blank?
-    tag.content = 'test_content'
+    assert tag.block.content.blank?
+    tag.block.content = 'test_content'
     assert_equal 'test_content', tag.content
     assert_equal '', tag.render
   end

data/test/unit/tags/page_datetime_test.rb

@@ -34,9 +34,9 @@ class PageDateTimeTagTest < ActiveSupport::TestCase
     tag = ComfortableMexicanSofa::Tag::PageDateTime.initialize_tag(
       cms_pages(:default), '{{cms:page:content:datetime}}'
     )
-    assert tag.content.blank?
+    assert tag.block.content.blank?
     time = 2.days.ago
-    tag.content = time
+    tag.block.content = time
     assert_equal time, tag.content
     assert_equal time.to_s, tag.render
   end

data/test/unit/tags/page_file_test.rb

@@ -0,0 +1,79 @@
+require File.expand_path('../../test_helper', File.dirname(__FILE__))
+
+class PageFileTagTest < ActiveSupport::TestCase
+  
+  def test_initialize_tag
+    assert tag = ComfortableMexicanSofa::Tag::PageFile.initialize_tag(
+      cms_pages(:default), '{{ cms:page_file:label }}'
+    )
+    assert 'url', tag.type
+    
+    assert tag = ComfortableMexicanSofa::Tag::PageFile.initialize_tag(
+      cms_pages(:default), '{{ cms:page_file:label:partial }}'
+    )
+    assert 'partial', tag.type
+  end
+  
+  def test_initialize_tag_failure
+    [
+      '{{cms:page_file}}',
+      '{{cms:not_page_file:label}}',
+      '{not_a_tag}'
+    ].each do |tag_signature|
+      assert_nil ComfortableMexicanSofa::Tag::PageFile.initialize_tag(
+        cms_pages(:default), tag_signature
+      )
+    end
+  end
+  
+  def test_content_and_render
+    page = cms_pages(:default)
+    
+    assert tag = ComfortableMexicanSofa::Tag::PageFile.initialize_tag(page, '{{ cms:page_file:file:partial }}')
+    assert_equal "<%= render :partial => 'partials/page_file', :locals => {:identifier => nil} %>", tag.render
+    
+    assert tag = ComfortableMexicanSofa::Tag::PageFile.initialize_tag(page, '{{ cms:page_file:file }}')
+    assert_equal nil, tag.content
+    assert_equal '', tag.render
+    
+    page.update_attributes!(
+      :blocks_attributes => [
+        { :label    => 'file',
+          :content  => fixture_file_upload('files/valid_image.jpg') }
+      ]
+    )
+    file = tag.block.files.first
+    
+    assert_equal file, tag.content
+    assert_equal "/system/files/#{file.id}/original/valid_image.jpg", tag.render
+    
+    assert tag = ComfortableMexicanSofa::Tag::PageFile.initialize_tag(page, '{{ cms:page_file:file:link }}')
+    assert_equal "<a href='/system/files/#{file.id}/original/valid_image.jpg' target='_blank'>file</a>", 
+      tag.render
+      
+    assert tag = ComfortableMexicanSofa::Tag::PageFile.initialize_tag(page, '{{ cms:page_file:file:link:link label }}')
+    assert_equal "<a href='/system/files/#{file.id}/original/valid_image.jpg' target='_blank'>link label</a>", 
+      tag.render
+      
+    assert tag = ComfortableMexicanSofa::Tag::PageFile.initialize_tag(page, '{{ cms:page_file:file:image }}')
+    assert_equal "<img src='/system/files/#{file.id}/original/valid_image.jpg' alt='file' />", 
+      tag.render
+      
+    assert tag = ComfortableMexicanSofa::Tag::PageFile.initialize_tag(page, '{{ cms:page_file:file:image:image alt }}')
+    assert_equal "<img src='/system/files/#{file.id}/original/valid_image.jpg' alt='image alt' />", 
+      tag.render
+      
+    assert tag = ComfortableMexicanSofa::Tag::PageFile.initialize_tag(page, '{{ cms:page_file:file:partial }}')
+    assert_equal "<%= render :partial => 'partials/page_file', :locals => {:identifier => #{file.id}} %>", 
+      tag.render
+      
+    assert tag = ComfortableMexicanSofa::Tag::PageFile.initialize_tag(page, '{{ cms:page_file:file:partial:path/to/partial }}')
+    assert_equal "<%= render :partial => 'path/to/partial', :locals => {:identifier => #{file.id}} %>", 
+      tag.render
+      
+    assert tag = ComfortableMexicanSofa::Tag::PageFile.initialize_tag(page, '{{ cms:page_file:file:partial:path/to/partial:a:b }}')
+    assert_equal "<%= render :partial => 'path/to/partial', :locals => {:identifier => #{file.id}, :param_1 => 'a', :param_2 => 'b'} %>", 
+      tag.render
+  end
+  
+end