comfortable_mexican_sofa 1.0.11 → 1.0.12

data/README.md

@@ -14,7 +14,7 @@ Add gem definition to your Gemfile:
     config.gem 'comfortable_mexican_sofa'
     
 Then from the Rails project's root run:
-
+    
     bundle install
     rails g cms
     rake db:migrate

data/VERSION

@@ -1 +1 @@
-1.0.11
+1.0.12

data/comfortable_mexican_sofa.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{comfortable_mexican_sofa}
-  s.version = "1.0.11"
+  s.version = "1.0.12"
 
   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{2010-11-01}
+  s.date = %q{2010-11-03}
   s.description = %q{}
   s.email = %q{oleg@theworkinggroup.ca}
   s.extra_rdoc_files = [

data/lib/comfortable_mexican_sofa/cms_tag.rb

@@ -6,7 +6,7 @@
 #   end
 module CmsTag
   
-  TOKENIZER_REGEX = /(\{\{\s*cms:.*?\}\})|((?:[^\{\{]|\{\{(?!\s*cms:.*?\}\}))+)/
+  TOKENIZER_REGEX = /(\{\{\s*cms:[^{}]*\}\})|((?:\{?[^{])+|\{+)/
   
   attr_accessor :params,
                 :parent

data/test/unit/cms_tag_test.rb

@@ -5,13 +5,25 @@ class CmsTagTest < ActiveSupport::TestCase
   def test_tokenizer_regex
     regex = CmsTag::TOKENIZER_REGEX
     
+    tokens = 'text { text } text'.scan(regex)
+    assert_equal nil,                   tokens[0][0]
+    assert_equal 'text { text } text',  tokens[0][1]
+    
     tokens = 'content<{{cms:some_tag content'.scan(regex)
-    assert_equal nil, tokens[0][0]
-    assert_equal 'content<{{cms:some_tag content', tokens[0][1]
+    assert_equal nil,                     tokens[0][0]
+    assert_equal 'content<',              tokens[0][1]
+    assert_equal nil,                     tokens[1][0]
+    assert_equal '{{',                    tokens[1][1]
+    assert_equal nil,                     tokens[2][0]
+    assert_equal 'cms:some_tag content',  tokens[2][1]
     
     tokens = 'content<{{cms some_tag}}>content'.scan(regex)
-    assert_equal nil, tokens[0][0]
-    assert_equal 'content<{{cms some_tag}}>content', tokens[0][1]
+    assert_equal nil,                     tokens[0][0]
+    assert_equal 'content<',              tokens[0][1]
+    assert_equal nil,                     tokens[1][0]
+    assert_equal '{{',                    tokens[1][1]
+    assert_equal nil,                     tokens[2][0]
+    assert_equal 'cms some_tag}}>content',tokens[2][1]
     
     tokens = 'content<{{cms:some_tag}}>content'.scan(regex)
     assert_equal nil,                     tokens[0][0]

data/test/unit/cms_tags/partial_test.rb

@@ -32,6 +32,10 @@ class PartialTest < ActiveSupport::TestCase
     assert_equal "<%= render :partial => 'path/to/partial' %>", tag.content
     assert_equal "<%= render :partial => 'path/to/partial' %>", tag.render
     
+    tag = CmsTag::Partial.initialize_tag(cms_pages(:default), '{{cms:partial:path/to/partial:param1}}')
+    assert_equal "<%= render :partial => 'path/to/partial', :locals => {:param_1 => 'param1'} %>", tag.content
+    assert_equal "<%= render :partial => 'path/to/partial', :locals => {:param_1 => 'param1'} %>", 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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 15
   prerelease: false
   segments: 
   - 1
   - 0
-  - 11
-  version: 1.0.11
+  - 12
+  version: 1.0.12
 platform: ruby
 authors: 
 - Oleg Khabarov
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-01 00:00:00 -04:00
+date: 2010-11-03 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency