comfortable_mexican_sofa 1.2.6 → 1.2.7

data/README.md

@@ -82,7 +82,7 @@ Here's a number of tag variations:
     {{ cms:partial:path/to/partial }}     # same as <%= render :partial => 'path/to/partial' %>
     {{ cms:partial:path/to/partial:a:b }} # same as <%= render :partial => 'path/to/partial',
                                           #   :locals => { :param_1 => 'a', :param_1 => 'b' } %>
-                                          
+
 Multiple Sites
 --------------
 Sofa is able to manage multiple sites from the same application. For instance: 'site-a.example.com' and 'site-b.example.com' will have distinct set of layouts, pages, snippets, etc. To enable multi-site functionality make sure you have this setting in the initializer: `config.enable_multiple_sites = true`.

data/VERSION

@@ -1 +1 @@
-1.2.6
+1.2.7

data/comfortable_mexican_sofa.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{comfortable_mexican_sofa}
-  s.version = "1.2.6"
+  s.version = "1.2.7"
 
   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-06-03}
+  s.date = %q{2011-06-04}
   s.description = %q{}
   s.email = %q{oleg@theworkinggroup.ca}
   s.extra_rdoc_files = [
@@ -178,6 +178,7 @@ Gem::Specification.new do |s|
     "lib/comfortable_mexican_sofa/is_mirrored.rb",
     "lib/comfortable_mexican_sofa/rails_extensions.rb",
     "lib/comfortable_mexican_sofa/tag.rb",
+    "lib/comfortable_mexican_sofa/tags/asset.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",
@@ -190,6 +191,7 @@ Gem::Specification.new do |s|
     "lib/comfortable_mexican_sofa/tags/page_text.rb",
     "lib/comfortable_mexican_sofa/tags/partial.rb",
     "lib/comfortable_mexican_sofa/tags/snippet.rb",
+    "lib/comfortable_mexican_sofa/tags/upload.rb",
     "lib/comfortable_mexican_sofa/version.rb",
     "lib/comfortable_mexican_sofa/view_hooks.rb",
     "lib/comfortable_mexican_sofa/view_methods.rb",
@@ -238,6 +240,7 @@ Gem::Specification.new do |s|
     "test/unit/models/upload_test.rb",
     "test/unit/revisions_test.rb",
     "test/unit/tag_test.rb",
+    "test/unit/tags/asset_test.rb",
     "test/unit/tags/field_datetime_test.rb",
     "test/unit/tags/field_integer_test.rb",
     "test/unit/tags/field_string_test.rb",
@@ -250,6 +253,7 @@ Gem::Specification.new do |s|
     "test/unit/tags/page_text_test.rb",
     "test/unit/tags/partial_test.rb",
     "test/unit/tags/snippet_test.rb",
+    "test/unit/tags/upload_test.rb",
     "test/unit/view_methods_test.rb"
   ]
   s.homepage = %q{http://github.com/twg/comfortable-mexican-sofa}

data/lib/comfortable_mexican_sofa/tag.rb

@@ -30,7 +30,7 @@ module ComfortableMexicanSofa::Tag
         tag = self.new
         tag.page    = page
         tag.label   = match[1]
-        tag.params  = match[2]
+        tag.params  = match[2].to_s.split(':')
         tag
       end
     end
@@ -84,6 +84,11 @@ module ComfortableMexicanSofa::Tag
       page.site.snippets.detect{|s| s.slug == self.label.to_s} || page.site.snippets.build(:slug => self.label.to_s)
     end
     
+    # Initializing Cms::Upload object
+    def upload
+      page.site.uploads.detect{|s| s.file_file_name == self.label.to_s}
+    end
+    
     # Checks if this tag is using Cms::Block
     def is_cms_block?
       %w(page field).member?(self.class.to_s.demodulize.underscore.split(/_/).first)

data/lib/comfortable_mexican_sofa/tags/asset.rb

@@ -0,0 +1,25 @@
+class ComfortableMexicanSofa::Tag::Asset
+  include ComfortableMexicanSofa::Tag
+
+  def self.regex_tag_signature(label = nil)
+    label ||= /[\w\-]+/
+    /\{\{\s*cms:asset:(#{label}):?(.*?)\s*\}\}/
+  end
+
+  def content
+    return unless (layout = Cms::Layout.find_by_slug(label))
+    type    = params[0]
+    format  = params[1]
+    
+    case type
+    when 'css'
+      out = "#{ComfortableMexicanSofa.config.content_route_prefix}/cms-css/#{label}.css"
+      out = "<link href='#{out}' media='screen' rel='stylesheet' type='text/css' />" if format == 'html_tag'
+      out
+    when 'js'
+      out = "#{ComfortableMexicanSofa.config.content_route_prefix}/cms-js/#{label}.js"
+      out = "<script src='#{out}' type='text/javascript'></script>" if format == 'html_tag'
+      out
+    end
+  end
+end

data/lib/comfortable_mexican_sofa/tags/helper.rb

@@ -7,7 +7,7 @@ class ComfortableMexicanSofa::Tag::Helper
   end
   
   def content
-    "<%= #{label}(#{params.split(':').collect{|p| "'#{p}'"}.join(', ')}) %>"
+    "<%= #{label}(#{params.collect{|p| "'#{p}'"}.join(', ')}) %>"
   end
   
 end

data/lib/comfortable_mexican_sofa/tags/partial.rb

@@ -7,7 +7,7 @@ class ComfortableMexicanSofa::Tag::Partial
   end
   
   def content
-    ps = params.split(':').collect_with_index{|p, i| ":param_#{i+1} => '#{p}'"}.join(', ')
+    ps = params.collect_with_index{|p, i| ":param_#{i+1} => '#{p}'"}.join(', ')
     "<%= render :partial => '#{label}'#{ps.blank?? nil : ", :locals => {#{ps}}"} %>"
   end
   

data/lib/comfortable_mexican_sofa/tags/upload.rb

@@ -0,0 +1,24 @@
+class ComfortableMexicanSofa::Tag::Upload
+  include ComfortableMexicanSofa::Tag
+  
+  def self.regex_tag_signature(label = nil)
+    label ||= /[\w\-\.]+/
+    /\{\{\s*cms:upload:(#{label}):?(.*?)\s*\}\}/
+  end
+  
+  def content
+    return unless upload
+    
+    format  = params[0]
+    text    = params[1] || label
+    
+    case format
+    when 'link'
+      "<a href='#{upload.file.url}' target='_blank'>#{text}</a>"
+    when 'image'
+      "<img src='#{upload.file.url}' alt='#{text}' />"
+    else
+      upload.file.url
+    end
+  end
+end

data/test/unit/tags/asset_test.rb

@@ -0,0 +1,56 @@
+require File.expand_path('../../test_helper', File.dirname(__FILE__))
+
+class AssetTest < ActiveSupport::TestCase
+  
+  def test_initialize_tag
+    assert tag = ComfortableMexicanSofa::Tag::Asset.initialize_tag(
+      cms_pages(:default), '{{ cms:asset:default:css:html_tag }}'
+    )
+    assert_equal 'default', tag.label
+    assert_equal ['css', 'html_tag'], tag.params
+  end
+  
+  def test_initialize_tag_failure
+    [
+      '{{cms:asset}}',
+      '{{cms:not_asset:method_name}}',
+      '{not_a_tag}'
+    ].each do |tag_signature|
+      assert_nil ComfortableMexicanSofa::Tag::Asset.initialize_tag(
+        cms_pages(:default), tag_signature
+      )
+    end
+  end
+  
+  def test_render_no_params
+    tag = ComfortableMexicanSofa::Tag::Asset.initialize_tag(
+      cms_pages(:default), '{{ cms:asset:default }}'
+    )
+    assert_equal '', tag.render
+  end
+  
+  def test_render_for_css
+    tag = ComfortableMexicanSofa::Tag::Asset.initialize_tag(
+      cms_pages(:default), '{{ cms:asset:default:css }}'
+    )
+    assert_equal '/cms-css/default.css', tag.render
+    
+    tag = ComfortableMexicanSofa::Tag::Asset.initialize_tag(
+      cms_pages(:default), '{{ cms:asset:default:css:html_tag }}'
+    )
+    assert_equal "<link href='/cms-css/default.css' media='screen' rel='stylesheet' type='text/css' />", tag.render
+  end
+  
+  def test_render_for_js
+    tag = ComfortableMexicanSofa::Tag::Asset.initialize_tag(
+      cms_pages(:default), '{{ cms:asset:default:js }}'
+    )
+    assert_equal '/cms-js/default.js', tag.render
+    
+    tag = ComfortableMexicanSofa::Tag::Asset.initialize_tag(
+      cms_pages(:default), '{{ cms:asset:default:js:html_tag }}'
+    )
+    assert_equal "<script src='/cms-js/default.js' type='text/javascript'></script>", tag.render
+  end
+  
+end

data/test/unit/tags/helper_test.rb

@@ -17,8 +17,8 @@ class HelperTest < ActiveSupport::TestCase
     assert tag = ComfortableMexicanSofa::Tag::Helper.initialize_tag(
       cms_pages(:default), '{{ cms:helper:method_name:param1:param2 }}'
     )
-    assert tag.label = 'method_name'
-    assert tag.params = 'param1:param2'
+    assert_equal 'method_name', tag.label
+    assert_equal ['param1', 'param2'], tag.params
   end
   
   def test_initialize_tag_failure

data/test/unit/tags/upload_test.rb

@@ -0,0 +1,67 @@
+require File.expand_path('../../test_helper', File.dirname(__FILE__))
+
+class UploadTest < ActiveSupport::TestCase
+  
+  def test_initialize_tag
+    assert tag = ComfortableMexicanSofa::Tag::Upload.initialize_tag(
+      cms_pages(:default), '{{ cms:upload:sample.jpg:image:alt text }}'
+    )
+    assert_equal cms_uploads(:default), tag.upload
+    assert_equal 'sample.jpg', tag.label
+    assert_equal ['image', 'alt text'], tag.params
+  end
+  
+  def test_initialize_tag_failure
+    [
+      '{{cms:upload}}',
+      '{{cms:not_upload:label}}',
+      '{not_a_tag}'
+    ].each do |tag_signature|
+      assert_nil ComfortableMexicanSofa::Tag::Upload.initialize_tag(
+        cms_pages(:default), tag_signature
+      )
+    end
+  end
+  
+  def test_render_for_invalid
+    tag = ComfortableMexicanSofa::Tag::Upload.initialize_tag(
+      cms_pages(:default), '{{cms:upload:invalid.jpg}}'
+    )
+    assert_nil tag.upload
+    assert_equal '', tag.render
+  end
+  
+  def test_render
+    upload = cms_uploads(:default)
+    assert tag = ComfortableMexicanSofa::Tag::Upload.initialize_tag(
+      cms_pages(:default), '{{ cms:upload:sample.jpg }}'
+    )
+    assert_equal upload.file.url, tag.render
+  end
+  
+  def test_render_for_link
+    upload = cms_uploads(:default)
+    assert tag = ComfortableMexicanSofa::Tag::Upload.initialize_tag(
+      cms_pages(:default), '{{ cms:upload:sample.jpg:link }}'
+    )
+    assert_equal "<a href='#{upload.file.url}' target='_blank'>sample.jpg</a>", tag.render
+    
+    assert tag = ComfortableMexicanSofa::Tag::Upload.initialize_tag(
+      cms_pages(:default), '{{ cms:upload:sample.jpg:link:link text }}'
+    )
+    assert_equal "<a href='#{upload.file.url}' target='_blank'>link text</a>", tag.render
+  end
+  
+  def test_render_for_image
+    upload = cms_uploads(:default)
+    assert tag = ComfortableMexicanSofa::Tag::Upload.initialize_tag(
+      cms_pages(:default), '{{ cms:upload:sample.jpg:image }}'
+    )
+    assert_equal "<img src='#{upload.file.url}' alt='sample.jpg' />", tag.render
+    
+    assert tag = ComfortableMexicanSofa::Tag::Upload.initialize_tag(
+      cms_pages(:default), '{{ cms:upload:sample.jpg:image:alt text }}'
+    )
+    assert_equal "<img src='#{upload.file.url}' alt='alt text' />", tag.render
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.2.6
+  version: 1.2.7
 platform: ruby
 authors: 
 - Oleg Khabarov
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-03 00:00:00 Z
+date: 2011-06-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -228,6 +228,7 @@ files:
 - lib/comfortable_mexican_sofa/is_mirrored.rb
 - lib/comfortable_mexican_sofa/rails_extensions.rb
 - lib/comfortable_mexican_sofa/tag.rb
+- lib/comfortable_mexican_sofa/tags/asset.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
@@ -240,6 +241,7 @@ files:
 - lib/comfortable_mexican_sofa/tags/page_text.rb
 - lib/comfortable_mexican_sofa/tags/partial.rb
 - lib/comfortable_mexican_sofa/tags/snippet.rb
+- lib/comfortable_mexican_sofa/tags/upload.rb
 - lib/comfortable_mexican_sofa/version.rb
 - lib/comfortable_mexican_sofa/view_hooks.rb
 - lib/comfortable_mexican_sofa/view_methods.rb
@@ -288,6 +290,7 @@ files:
 - test/unit/models/upload_test.rb
 - test/unit/revisions_test.rb
 - test/unit/tag_test.rb
+- test/unit/tags/asset_test.rb
 - test/unit/tags/field_datetime_test.rb
 - test/unit/tags/field_integer_test.rb
 - test/unit/tags/field_string_test.rb
@@ -300,6 +303,7 @@ files:
 - test/unit/tags/page_text_test.rb
 - test/unit/tags/partial_test.rb
 - test/unit/tags/snippet_test.rb
+- test/unit/tags/upload_test.rb
 - test/unit/view_methods_test.rb
 homepage: http://github.com/twg/comfortable-mexican-sofa
 licenses: []
@@ -314,7 +318,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2252075895576102116
+      hash: -45372711509925619
       segments: 
       - 0
       version: "0"