comfortable_mexican_sofa 1.0.3 → 1.0.4

data/VERSION

@@ -1 +1 @@
-1.0.3
+1.0.4

data/comfortable_mexican_sofa.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{comfortable_mexican_sofa}
-  s.version = "1.0.3"
+  s.version = "1.0.4"
 
   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/cms_tag.rb

@@ -6,7 +6,8 @@
 #   end
 module CmsTag
   
-  attr_accessor :parent
+  attr_accessor :params,
+                :parent
   
   module ClassMethods
     # Regex that is used to match tags in the content
@@ -26,7 +27,8 @@ module CmsTag
           self.initialize_or_find(cms_page, match[1])
         else
           tag = self.new
-          tag.label = match[1]
+          tag.label   = match[1]
+          tag.params  = match[2]
           tag
         end
       end

data/lib/comfortable_mexican_sofa/cms_tag/helper.rb

@@ -6,7 +6,7 @@ class CmsTag::Helper
   
   def self.regex_tag_signature(label = nil)
     label ||= /\w+/
-    /<\s*cms:helper:(#{label})\s*\/?>/
+    /<\s*cms:helper:(#{label}):?(.*?)\s*\/?>/
   end
   
   def regex_tag_signature
@@ -14,7 +14,7 @@ class CmsTag::Helper
   end
   
   def content
-    "<%= #{label} %>"
+    "<%= #{label}(#{params.split(':').collect{|p| "'#{p}'"}.join(', ')}) %>"
   end
   
 end

data/lib/comfortable_mexican_sofa/cms_tag/partial.rb

@@ -6,7 +6,7 @@ class CmsTag::Partial
   
   def self.regex_tag_signature(label = nil)
     label ||= /[\w\/]+/
-    /<\s*cms:partial:(#{label})\s*\/?>/
+    /<\s*cms:partial:(#{label}):?(.*?)\s*\/?>/
   end
   
   def regex_tag_signature
@@ -14,7 +14,8 @@ class CmsTag::Partial
   end
   
   def content
-    "<%= render :partial => '#{label}' %>"
+    ps = params.split(':').collect_with_index{|p, i| ":param_#{i+1} => '#{p}'"}.join(', ')
+    "<%= render :partial => '#{label}'#{ps.blank?? nil : ", :locals => {#{ps}}"} %>"
   end
   
 end

data/lib/comfortable_mexican_sofa/cms_tag/snippet.rb

@@ -1,5 +1,7 @@
 class CmsTag::Snippet < CmsSnippet
   
+  attr_accessor :label
+  
   include CmsTag
   
   def identifier

data/lib/comfortable_mexican_sofa/rails_extensions.rb

@@ -8,4 +8,15 @@ class String
   def capitalize_all(delimiter = ' ')
     self.split(delimiter).collect{|w| w.capitalize }.join(' ')
   end
+end
+
+module Enumerable
+  # Like a normal collect, only with index
+  def collect_with_index
+    result = []
+    self.each_with_index do |elt, idx|
+      result << yield(elt, idx)
+    end
+    result
+  end
 end

data/test/unit/cms_tags/helper_test.rb

@@ -3,11 +3,13 @@ require File.dirname(__FILE__) + '/../../test_helper'
 class HelperTest < ActiveSupport::TestCase
   
   def test_initialize_tag
-    %w(
-      <cms:helper:method_name/>
-    ).each do |tag_signature|
-      assert tag = CmsTag::Helper.initialize_tag(cms_pages(:default), tag_signature)
-    end
+    assert CmsTag::Helper.initialize_tag(cms_pages(:default), '<cms:helper:method_name/>')
+  end
+  
+  def test_initialize_tag_with_parameters
+    assert tag = CmsTag::Helper.initialize_tag(cms_pages(:default), '<cms:helper:method_name:param1:param2/>')
+    assert tag.label = 'method_name'
+    assert tag.params = 'param1:param2'
   end
   
   def test_initialize_tag_failure
@@ -22,8 +24,12 @@ class HelperTest < ActiveSupport::TestCase
   
   def test_content_and_render
     tag = CmsTag::Helper.initialize_tag(cms_pages(:default), "<cms:helper:method_name/>")
-    assert_equal "<%= method_name %>", tag.content
-    assert_equal "<%= method_name %>", tag.render
+    assert_equal "<%= method_name() %>", tag.content
+    assert_equal "<%= method_name() %>", tag.render
+    
+    tag = CmsTag::Helper.initialize_tag(cms_pages(:default), "<cms:helper:method_name:param1:param2/>")
+    assert_equal "<%= method_name('param1', 'param2') %>", tag.content
+    assert_equal "<%= method_name('param1', 'param2') %>", tag.render
   end
   
 end

data/test/unit/cms_tags/partial_test.rb

@@ -11,6 +11,12 @@ class PartialTest < ActiveSupport::TestCase
     end
   end
   
+  def test_initialize_tag_with_parameters
+    assert tag = CmsTag::Partial.initialize_tag(cms_pages(:default), '<cms:partial:path/to/partial:param1:param2/>')
+    assert tag.label = 'path/to/partial'
+    assert tag.params = 'param1:param2'
+  end
+  
   def test_initialize_tag_failure
     %w(
       <cms:partial>
@@ -25,6 +31,10 @@ class PartialTest < ActiveSupport::TestCase
     tag = CmsTag::Partial.initialize_tag(cms_pages(:default), "<cms:partial:path/to/patial>")
     assert_equal "<%= render :partial => 'path/to/patial' %>", tag.content
     assert_equal "<%= render :partial => 'path/to/patial' %>", tag.render
+    
+    tag = CmsTag::Partial.initialize_tag(cms_pages(:default), '<cms:partial:path/to/partial:param1:param2/>')
+    assert_equal "<%= render :partial => 'path/to/partial', :locals => {:param_1 => 'param1', :param_2 => 'param2'} %>", tag.content
+    assert_equal "<%= render :partial => 'path/to/partial', :locals => {:param_1 => 'param1', :param_2 => 'param2'} %>", tag.render
   end
   
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: false
   segments: 
   - 1
   - 0
-  - 3
-  version: 1.0.3
+  - 4
+  version: 1.0.4
 platform: ruby
 authors: 
 - Oleg Khabarov