comfortable_mexican_sofa 1.4.22 → 1.5.0

data/test/unit/tags/page_files_test.rb

@@ -0,0 +1,72 @@
+require File.expand_path('../../test_helper', File.dirname(__FILE__))
+
+class PageFilesTagTest < ActiveSupport::TestCase
+  
+  def test_initialize_tag
+    assert tag = ComfortableMexicanSofa::Tag::PageFiles.initialize_tag(
+      cms_pages(:default), '{{ cms:page_files:label }}'
+    )
+    assert 'url', tag.type
+    
+    assert tag = ComfortableMexicanSofa::Tag::PageFiles.initialize_tag(
+      cms_pages(:default), '{{ cms:page_files:label:partial }}'
+    )
+    assert 'partial', tag.type
+  end
+  
+  def test_initialize_tag_failure
+    [
+      '{{cms:page_files}}',
+      '{{cms:not_page_files:label}}',
+      '{not_a_tag}'
+    ].each do |tag_signature|
+      assert_nil ComfortableMexicanSofa::Tag::PageFiles.initialize_tag(
+        cms_pages(:default), tag_signature
+      )
+    end
+  end
+  
+  def test_content_and_render
+    page = cms_pages(:default)
+    
+    assert tag = ComfortableMexicanSofa::Tag::PageFiles.initialize_tag(page, '{{ cms:page_files:files:partial }}')
+    assert_equal "<%= render :partial => 'partials/page_files', :locals => {:identifier => []} %>", tag.render
+    
+    assert tag = ComfortableMexicanSofa::Tag::PageFiles.initialize_tag(page, '{{ cms:page_files:files }}')
+    assert_equal [], tag.content
+    assert_equal '', tag.render
+    
+    page.update_attributes!(
+      :blocks_attributes => [
+        { :label    => 'files',
+          :content  => [fixture_file_upload('files/valid_image.jpg'), fixture_file_upload('files/invalid_file.gif')] }
+      ]
+    )
+    files = tag.block.files
+    file_a, file_b = files
+    
+    assert_equal files, tag.content
+    assert_equal "/system/files/#{file_a.id}/original/valid_image.jpg, /system/files/#{file_b.id}/original/invalid_file.gif", tag.render
+    
+    assert tag = ComfortableMexicanSofa::Tag::PageFiles.initialize_tag(page, '{{ cms:page_files:files:link }}')
+    assert_equal "<a href='/system/files/#{file_a.id}/original/valid_image.jpg' target='_blank'>Valid Image</a> <a href='/system/files/#{file_b.id}/original/invalid_file.gif' target='_blank'>Invalid File</a>", 
+      tag.render
+      
+    assert tag = ComfortableMexicanSofa::Tag::PageFiles.initialize_tag(page, '{{ cms:page_files:files:image }}')
+    assert_equal "<img src='/system/files/#{file_a.id}/original/valid_image.jpg' alt='Valid Image' /> <img src='/system/files/#{file_b.id}/original/invalid_file.gif' alt='Invalid File' />", 
+      tag.render
+    
+    assert tag = ComfortableMexicanSofa::Tag::PageFiles.initialize_tag(page, '{{ cms:page_files:files:partial }}')
+    assert_equal "<%= render :partial => 'partials/page_files', :locals => {:identifier => [#{files.collect(&:id).join(',')}]} %>", 
+      tag.render
+      
+    assert tag = ComfortableMexicanSofa::Tag::PageFiles.initialize_tag(page, '{{ cms:page_files:files:partial:path/to/partial }}')
+    assert_equal "<%= render :partial => 'path/to/partial', :locals => {:identifier => [#{files.collect(&:id).join(',')}]} %>", 
+      tag.render
+    
+    assert tag = ComfortableMexicanSofa::Tag::PageFiles.initialize_tag(page, '{{ cms:page_files:files:partial:path/to/partial:a:b }}')
+    assert_equal "<%= render :partial => 'path/to/partial', :locals => {:identifier => [#{files.collect(&:id).join(',')}], :param_1 => 'a', :param_2 => 'b'} %>", 
+      tag.render
+  end
+  
+end

data/test/unit/tags/page_integer_test.rb

@@ -34,8 +34,8 @@ class PageIntegerTagTest < ActiveSupport::TestCase
     tag = ComfortableMexicanSofa::Tag::PageInteger.initialize_tag(
       cms_pages(:default), '{{cms:page: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 '5', tag.render
   end

data/test/unit/tags/page_rich_text_test.rb

@@ -34,8 +34,8 @@ class PageRichTextTagTest < ActiveSupport::TestCase
     tag = ComfortableMexicanSofa::Tag::PageRichText.initialize_tag(
       cms_pages(:default), '{{cms:page:content:rich_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 'test_content', tag.render
   end

data/test/unit/tags/page_string_test.rb

@@ -34,8 +34,8 @@ class PageStringTagTest < ActiveSupport::TestCase
     tag = ComfortableMexicanSofa::Tag::PageString.initialize_tag(
       cms_pages(:default), '{{cms:page:content:string}}'
     )
-    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 'test_content', tag.render
   end

data/test/unit/tags/page_text_test.rb

@@ -37,8 +37,8 @@ class PageTextTagTest < ActiveSupport::TestCase
     tag = ComfortableMexicanSofa::Tag::PageText.initialize_tag(
       cms_pages(:default), '{{cms:page: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 'test_content', tag.render
   end

data/test/unit/view_methods_test.rb

@@ -1,6 +1,7 @@
 require File.expand_path('../test_helper', File.dirname(__FILE__))
 
-class ViewMethodsTest < ActiveSupport::TestCase
+class ViewMethodsTest < ActionView::TestCase
+  include ComfortableMexicanSofa::ViewMethods
   
   class HelpersTestController < ActionController::Base
     helper { def hello; 'hello' end }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version
-  version: 1.4.22
+  version: 1.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-26 00:00:00.000000000Z
+date: 2011-09-28 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70115040490720 !ruby/object:Gem::Requirement
+  requirement: &70317417314480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,29 +22,29 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70115040490720
+  version_requirements: *70317417314480
 - !ruby/object:Gem::Dependency
   name: active_link_to
-  requirement: &70115040490140 !ruby/object:Gem::Requirement
+  requirement: &70317417312680 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70115040490140
+  version_requirements: *70317417312680
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70115040489540 !ruby/object:Gem::Requirement
+  requirement: &70317417309920 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.3.14
+        version: 2.4.2
   type: :runtime
   prerelease: false
-  version_requirements: *70115040489540
+  version_requirements: *70317417309920
 description: ''
 email: oleg@theworkinggroup.ca
 executables: []
@@ -165,6 +165,7 @@ files:
 - app/views/cms_admin/files/_file.html.erb
 - app/views/cms_admin/files/_form.html.erb
 - app/views/cms_admin/files/_index.html.erb
+- app/views/cms_admin/files/_page_form.html.erb
 - app/views/cms_admin/files/create.js.erb
 - app/views/cms_admin/files/destroy.js.erb
 - app/views/cms_admin/files/edit.html.erb
@@ -233,11 +234,10 @@ files:
 - db/migrate/upgrades/03_upgrade_to_1_2_0.rb
 - db/migrate/upgrades/04_upgrade_to_1_3_0.rb
 - db/migrate/upgrades/05_upgrade_to_1_4_0.rb
+- db/migrate/upgrades/06_upgrade_to_1_5_0.rb
 - db/seeds.rb
 - doc/preview.png
 - doc/sofa.png
-- gemfiles/Gemfile.rails-3.0.x
-- gemfiles/Gemfile.rails-3.1.x
 - lib/comfortable_mexican_sofa.rb
 - lib/comfortable_mexican_sofa/authentication/dummy_auth.rb
 - lib/comfortable_mexican_sofa/authentication/http_auth.rb
@@ -262,6 +262,8 @@ files:
 - lib/comfortable_mexican_sofa/tags/file.rb
 - lib/comfortable_mexican_sofa/tags/helper.rb
 - lib/comfortable_mexican_sofa/tags/page_datetime.rb
+- lib/comfortable_mexican_sofa/tags/page_file.rb
+- lib/comfortable_mexican_sofa/tags/page_files.rb
 - lib/comfortable_mexican_sofa/tags/page_integer.rb
 - lib/comfortable_mexican_sofa/tags/page_rich_text.rb
 - lib/comfortable_mexican_sofa/tags/page_string.rb
@@ -297,6 +299,8 @@ files:
 - test/functional/cms_admin/sites_controller_test.rb
 - test/functional/cms_admin/snippets_controller_test.rb
 - test/functional/cms_content_controller_test.rb
+- test/gemfiles/Gemfile.rails-3.0.x
+- test/gemfiles/Gemfile.rails-3.1.x
 - test/integration/authentication_test.rb
 - test/integration/fixtures_test.rb
 - test/integration/mirrors_test.rb
@@ -328,6 +332,8 @@ files:
 - test/unit/tags/file_test.rb
 - test/unit/tags/helper_test.rb
 - test/unit/tags/page_datetime_test.rb
+- test/unit/tags/page_file_test.rb
+- test/unit/tags/page_files_test.rb
 - test/unit/tags/page_integer_test.rb
 - test/unit/tags/page_rich_text_test.rb
 - test/unit/tags/page_string_test.rb
@@ -349,7 +355,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1925889487784406071
+      hash: -1963305696869515669
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/gemfiles/Gemfile.rails-3.0.x

@@ -1,14 +0,0 @@
-source 'http://rubygems.org'
-
-gem 'rails',          '3.0.10'
-gem 'active_link_to', '>=1.0.0'
-gem 'paperclip',      '>=2.3.14'
-
-group :development do
-  # gem 'sqlite3'
-end
-
-group :test do
-  gem 'sqlite3'
-  gem 'jeweler', '>=1.4.0'
-end

data/gemfiles/Gemfile.rails-3.1.x

@@ -1,14 +0,0 @@
-source 'http://rubygems.org'
-
-gem 'rails',          '3.1.0'
-gem 'active_link_to', '>=1.0.0'
-gem 'paperclip',      '>=2.3.14'
-
-group :development do
-  # gem 'sqlite3'
-end
-
-group :test do
-  gem 'sqlite3'
-  gem 'jeweler', '>=1.4.0'
-end