CmsTag is now ComfortableMexicanSofa::Tag. Everything is safely namespaced now

Oleg committed Apr 17, 2011

commit c1d9eb07c685e1f7a2eba12aa345a36910e188c6

app/models/cms/block.rb +0 -2

@@	@@ -25,8 +25,6 @@ class Cms::Block < ActiveRecord::Base
	:page => page
	)
	end
-	rescue => e
-	raise "WTF! #{e.to_s}"
	end

	end

app/models/cms/layout.rb +1 -1

@@	@@ -68,7 +68,7 @@ class Cms::Layout < ActiveRecord::Base
	protected

	def check_content_tag_presence
-	CmsTag.process_content((test_page = site.pages.new), content)
+	ComfortableMexicanSofa::Tag.process_content((test_page = site.pages.new), content)
	if test_page.tags.select{\|t\| t.class.superclass == Cms::Block}.blank?
	self.errors.add(:content, 'No cms page tags defined')
	end

app/models/cms/page.rb +1 -1

@@	@@ -81,7 +81,7 @@ class Cms::Page < ActiveRecord::Base
	@content = nil if force_reload
	@content \|\|= begin
	self.tags = [] # resetting
-	layout ? CmsTag.process_content(self, layout.merged_content) : ''
+	layout ? ComfortableMexicanSofa::Tag.process_content(self, layout.merged_content) : ''
	end
	end

app/views/cms_admin/pages/_form_blocks.html.erb +2 -2

@@	@@ -1,7 +1,7 @@
	<div id='form_blocks'>
	<%= fields_for :blocks, :builder => ComfortableMexicanSofa::FormBuilder do \|cms_blocks\| %>
-	<% @cms_page.tags(true).each do \|tag\| %>
-	<%= cms_blocks.send(tag.class.name.underscore.downcase.idify, tag)%>
+	<% @cms_page.tags(true).select{\|t\| t.class < Cms::Block}.each do \|tag\| %>
+	<%= cms_blocks.send(tag.class.to_s.demodulize.underscore, tag)%>
	<% end %>
	<% end %>
	</div>
	\ No newline at end of file

comfortable_mexican_sofa.rb b/lib/comfortable_mexican_sofa.rb +0 -2

@@	@@ -13,7 +13,6 @@
	end

	module ComfortableMexicanSofa
-
	class << self

	# Modify CMS configuration
@@	@@ -32,5 +31,4 @@ module ComfortableMexicanSofa
	alias :config :configuration

	end
-
	end
	\ No newline at end of file

comfortable_mexican_sofa/cms_tag.rb b/lib/comfortable_mexican_sofa/cms_tag.rb +6 -5

@@	@@ -4,7 +4,7 @@
	# include CmsTag
	# ...
	# end
-	module CmsTag
+	module ComfortableMexicanSofa::Tag

	TOKENIZER_REGEX = /(\{\{\scms:[^{}]\}\})\|((?:\{?[^{])+\|\{+)/

@@	@@ -42,7 +42,7 @@ module CmsTag

	# String indentifier of the tag
	def identifier
-	"#{self.class.name.underscore}_#{self.label}"
+	"#{self.class.to_s.demodulize.underscore}_#{self.label}"
	end

	# Ancestors of this tag constructed during rendering process.
@@	@@ -68,7 +68,8 @@ module CmsTag
	# as a default.
	def render
	# cleaning content from possible irb stuff. Partial and Helper tags are OK.
-	if !ComfortableMexicanSofa.config.allow_irb && ![CmsTag::Partial, CmsTag::Helper].member?(self.class)
+	if !ComfortableMexicanSofa.config.allow_irb &&
+	![ComfortableMexicanSofa::Tag::Partial, ComfortableMexicanSofa::Tag::Helper].member?(self.class)
	content.to_s.gsub('<%', '<%').gsub('%>', '%>')
	else
	content.to_s
@@	@@ -106,8 +107,8 @@ private
	end

	def self.included(tag)
-	tag.send(:include, CmsTag::InstanceMethods)
-	tag.send(:extend, CmsTag::ClassMethods)
+	tag.send(:include, ComfortableMexicanSofa::Tag::InstanceMethods)
+	tag.send(:extend, ComfortableMexicanSofa::Tag::ClassMethods)
	@@tag_classes \|\|= []
	@@tag_classes << tag
	end

comfortable_mexican_sofa/cms_tag/field_datetime.rb b/lib/comfortable_mexican_sofa/cms_tag/field_datetime.rb +2 -3

@@	@@ -1,6 +1,5 @@
-	class CmsTag::FieldDateTime < Cms::Block
-
-	include CmsTag
+	class ComfortableMexicanSofa::Tag::FieldDateTime < Cms::Block
+	include ComfortableMexicanSofa::Tag

	def self.regex_tag_signature(label = nil)
	label \|\|= /[\w\-]+/

comfortable_mexican_sofa/cms_tag/field_integer.rb b/lib/comfortable_mexican_sofa/cms_tag/field_integer.rb +2 -3

@@	@@ -1,6 +1,5 @@
-	class CmsTag::FieldInteger < Cms::Block
-
-	include CmsTag
+	class ComfortableMexicanSofa::Tag::FieldInteger < Cms::Block
+	include ComfortableMexicanSofa::Tag

	def self.regex_tag_signature(label = nil)
	label \|\|= /[\w\-]+/

comfortable_mexican_sofa/cms_tag/field_string.rb b/lib/comfortable_mexican_sofa/cms_tag/field_string.rb +2 -3

@@	@@ -1,6 +1,5 @@
-	class CmsTag::FieldString < Cms::Block
-
-	include CmsTag
+	class ComfortableMexicanSofa::Tag::FieldString < Cms::Block
+	include ComfortableMexicanSofa::Tag

	def self.regex_tag_signature(label = nil)
	label \|\|= /[\w\-]+/

comfortable_mexican_sofa/cms_tag/field_text.rb b/lib/comfortable_mexican_sofa/cms_tag/field_text.rb +2 -3

@@	@@ -1,6 +1,5 @@
-	class CmsTag::FieldText < Cms::Block
-
-	include CmsTag
+	class ComfortableMexicanSofa::Tag::FieldText < Cms::Block
+	include ComfortableMexicanSofa::Tag

	def self.regex_tag_signature(label = nil)
	label \|\|= /[\w\-]+/

comfortable_mexican_sofa/cms_tag/helper.rb b/lib/comfortable_mexican_sofa/cms_tag/helper.rb +2 -3

@@	@@ -1,9 +1,8 @@
-	class CmsTag::Helper
+	class ComfortableMexicanSofa::Tag::Helper
+	include ComfortableMexicanSofa::Tag

	attr_accessor :label

-	include CmsTag
-
	def self.regex_tag_signature(label = nil)
	label \|\|= /[\w\-]+/
	/\{\{\scms:helper:(#{label}):?(.?)\s*\}\}/

comfortable_mexican_sofa/cms_tag/page_datetime.rb b/lib/comfortable_mexican_sofa/cms_tag/page_datetime.rb +2 -3

@@	@@ -1,6 +1,5 @@
-	class CmsTag::PageDateTime < Cms::Block
-
-	include CmsTag
+	class ComfortableMexicanSofa::Tag::PageDateTime < Cms::Block
+	include ComfortableMexicanSofa::Tag

	def self.regex_tag_signature(label = nil)
	label \|\|= /[\w\-]+/

comfortable_mexican_sofa/cms_tag/page_integer.rb b/lib/comfortable_mexican_sofa/cms_tag/page_integer.rb +2 -3

@@	@@ -1,6 +1,5 @@
-	class CmsTag::PageInteger < Cms::Block
-
-	include CmsTag
+	class ComfortableMexicanSofa::Tag::PageInteger < Cms::Block
+	include ComfortableMexicanSofa::Tag

	def self.regex_tag_signature(label = nil)
	label \|\|= /[\w\-]+/

comfortable_mexican_sofa/cms_tag/page_rich_text.rb b/lib/comfortable_mexican_sofa/cms_tag/page_rich_text.rb +2 -3

@@	@@ -1,6 +1,5 @@
-	class CmsTag::PageRichText < Cms::Block
-
-	include CmsTag
+	class ComfortableMexicanSofa::Tag::PageRichText < Cms::Block
+	include ComfortableMexicanSofa::Tag

	def self.regex_tag_signature(label = nil)
	label \|\|= /[\w\-]+/

comfortable_mexican_sofa/cms_tag/page_string.rb b/lib/comfortable_mexican_sofa/cms_tag/page_string.rb +2 -3

@@	@@ -1,6 +1,5 @@
-	class CmsTag::PageString < Cms::Block
-
-	include CmsTag
+	class ComfortableMexicanSofa::Tag::PageString < Cms::Block
+	include ComfortableMexicanSofa::Tag

	def self.regex_tag_signature(label = nil)
	label \|\|= /[\w\-]+/

comfortable_mexican_sofa/cms_tag/page_text.rb b/lib/comfortable_mexican_sofa/cms_tag/page_text.rb +2 -3

@@	@@ -1,6 +1,5 @@
-	class CmsTag::PageText < Cms::Block
-
-	include CmsTag
+	class ComfortableMexicanSofa::Tag::PageText < Cms::Block
+	include ComfortableMexicanSofa::Tag

	def self.regex_tag_signature(label = nil)
	label \|\|= /[\w\-]+/

comfortable_mexican_sofa/cms_tag/partial.rb b/lib/comfortable_mexican_sofa/cms_tag/partial.rb +2 -3

@@	@@ -1,9 +1,8 @@
-	class CmsTag::Partial
+	class ComfortableMexicanSofa::Tag::Partial
+	include ComfortableMexicanSofa::Tag

	attr_accessor :label

-	include CmsTag
-
	def self.regex_tag_signature(label = nil)
	label \|\|= /[\w\/\-]+/
	/\{\{\scms:partial:(#{label}):?(.?)\s*\}\}/

comfortable_mexican_sofa/cms_tag/snippet.rb b/lib/comfortable_mexican_sofa/cms_tag/snippet.rb +3 -4

@@	@@ -1,9 +1,8 @@
-	class CmsTag::Snippet < Cms::Snippet
-
-	include CmsTag
+	class ComfortableMexicanSofa::Tag::Snippet < Cms::Snippet
+	include ComfortableMexicanSofa::Tag

	def identifier
-	"#{self.class.name.underscore}_#{self.slug}"
+	"#{self.class.to_s.demodulize.underscore}_#{self.slug}"
	end

	def self.regex_tag_signature(label = nil)

comfortable_mexican_sofa/form_builder.rb b/lib/comfortable_mexican_sofa/form_builder.rb +4 -12

@@	@@ -59,8 +59,10 @@ class ComfortableMexicanSofa::FormBuilder < ActionView::Helpers::FormBuilder
	css_class = options[:css_class] \|\| tag.class.name.underscore.downcase.idify

	field_css_class = case tag
-	when CmsTag::PageRichText then 'rich_text'
-	when CmsTag::PageText, CmsTag::FieldText then 'code'
+	when ComfortableMexicanSofa::Tag::PageRichText
+	'rich_text'
+	when ComfortableMexicanSofa::Tag::PageText, ComfortableMexicanSofa::Tag::FieldText
+	'code'
	end

	options[:content_field_method] \|\|= :text_field_tag
@@	@@ -116,14 +118,4 @@ class ComfortableMexicanSofa::FormBuilder < ActionView::Helpers::FormBuilder
	default_tag_field(tag, :content_field_method => :text_area_tag)
	end

-	# Capturing all calls of cms_tag_* type. For those we'll try to render
-	# a form element. Everything else can trigger MethodNotFound error.
-	def method_missing(method_name, *args)
-	if m = method_name.to_s.match(/^cms_tag_(\w+)$/)
-	send(m[1], *args) if respond_to?(m[1])
-	else
-	super
-	end
-	end
-
	end
	\ No newline at end of file

test/unit/cms_tag_test.rb +19 -19

@@	@@ -3,7 +3,7 @@ require File.expand_path('../test_helper', File.dirname(__FILE__))
	class CmsTagTest < ActiveSupport::TestCase

	def test_tokenizer_regex
-	regex = CmsTag::TOKENIZER_REGEX
+	regex = ComfortableMexicanSofa::Tag::TOKENIZER_REGEX

	tokens = 'text { text } text'.scan(regex)
	assert_equal nil, tokens[0][0]
@@	@@ -60,7 +60,7 @@ class CmsTagTest < ActiveSupport::TestCase

	def test_tokenizer_regex_limit
	string = '<p>text</p>' * 400
-	tokens = string.scan(CmsTag::TOKENIZER_REGEX)
+	tokens = string.scan(ComfortableMexicanSofa::Tag::TOKENIZER_REGEX)
	assert_equal 1, tokens.count
	assert_equal nil, tokens[0][0]
	assert_equal string, tokens[0][1]
@@	@@ -81,11 +81,11 @@ class CmsTagTest < ActiveSupport::TestCase
	), page.content(true)

	assert_equal 4, page.tags.size
-	assert_equal 'cms_tag/field_text_default_field_text', page.tags[0].identifier
-	assert_equal 'cms_tag/page_text_default_page_text', page.tags[1].identifier
-	assert_equal 'cms_tag/snippet_default', page.tags[2].identifier
+	assert_equal 'field_text_default_field_text', page.tags[0].identifier
+	assert_equal 'page_text_default_page_text', page.tags[1].identifier
+	assert_equal 'snippet_default', page.tags[2].identifier
	assert_equal page.tags[1], page.tags[2].parent
-	assert_equal 'cms_tag/snippet_default', page.tags[3].identifier
+	assert_equal 'snippet_default', page.tags[3].identifier
	end

	def test_content_for_new_page
@@	@@ -110,9 +110,9 @@ class CmsTagTest < ActiveSupport::TestCase
	), page.content

	assert_equal 3, page.tags.size
-	assert_equal 'cms_tag/field_text_default_field_text', page.tags[0].identifier
-	assert_equal 'cms_tag/page_text_default_page_text', page.tags[1].identifier
-	assert_equal 'cms_tag/snippet_default', page.tags[2].identifier
+	assert_equal 'field_text_default_field_text', page.tags[0].identifier
+	assert_equal 'page_text_default_page_text', page.tags[1].identifier
+	assert_equal 'snippet_default', page.tags[2].identifier
	end

	def test_content_for_new_page_with_initilized_cms_blocks
@@	@@ -149,11 +149,11 @@ class CmsTagTest < ActiveSupport::TestCase
	), page.content

	assert_equal 4, page.tags.size
-	assert_equal 'cms_tag/field_text_default_field_text', page.tags[0].identifier
-	assert_equal 'cms_tag/page_text_default_page_text', page.tags[1].identifier
-	assert_equal 'cms_tag/snippet_default', page.tags[2].identifier
+	assert_equal 'field_text_default_field_text', page.tags[0].identifier
+	assert_equal 'page_text_default_page_text', page.tags[1].identifier
+	assert_equal 'snippet_default', page.tags[2].identifier
	assert_equal page.tags[1], page.tags[2].parent
-	assert_equal 'cms_tag/snippet_default', page.tags[3].identifier
+	assert_equal 'snippet_default', page.tags[3].identifier
	end

	def test_content_with_repeated_tags
@@	@@ -176,13 +176,13 @@ class CmsTagTest < ActiveSupport::TestCase
	), page.content(true)

	assert_equal 6, page.tags.size
-	assert_equal 'cms_tag/field_text_default_field_text', page.tags[0].identifier
-	assert_equal 'cms_tag/page_text_default_page_text', page.tags[1].identifier
-	assert_equal 'cms_tag/snippet_default', page.tags[2].identifier
+	assert_equal 'field_text_default_field_text', page.tags[0].identifier
+	assert_equal 'page_text_default_page_text', page.tags[1].identifier
+	assert_equal 'snippet_default', page.tags[2].identifier
	assert_equal page.tags[1], page.tags[2].parent
-	assert_equal 'cms_tag/snippet_default', page.tags[3].identifier
-	assert_equal 'cms_tag/page_text_default_page_text', page.tags[4].identifier
-	assert_equal 'cms_tag/snippet_default', page.tags[5].identifier
+	assert_equal 'snippet_default', page.tags[3].identifier
+	assert_equal 'page_text_default_page_text', page.tags[4].identifier
+	assert_equal 'snippet_default', page.tags[5].identifier
	assert_equal page.tags[4], page.tags[5].parent
	end

test/unit/cms_tags/field_datetime_test.rb +15 -5

@@	@@ -3,11 +3,17 @@ require File.expand_path('../../test_helper', File.dirname(__FILE__))
	class FieldDateTimeTest < ActiveSupport::TestCase

	def test_initialize_tag
-	assert tag = CmsTag::FieldDateTime.initialize_tag(cms_pages(:default), '{{ cms:field:content:datetime }}')
+	assert tag = ComfortableMexicanSofa::Tag::FieldDateTime.initialize_tag(
+	cms_pages(:default), '{{ cms:field:content:datetime }}'
+	)
	assert_equal 'content', tag.label
-	assert tag = CmsTag::FieldDateTime.initialize_tag(cms_pages(:default), '{{cms:field:content:datetime}}')
+	assert tag = ComfortableMexicanSofa::Tag::FieldDateTime.initialize_tag(
+	cms_pages(:default), '{{cms:field:content:datetime}}'
+	)
	assert_equal 'content', tag.label
-	assert tag = CmsTag::FieldDateTime.initialize_tag(cms_pages(:default), '{{cms:field:dash-content:datetime}}')
+	assert tag = ComfortableMexicanSofa::Tag::FieldDateTime.initialize_tag(
+	cms_pages(:default), '{{cms:field:dash-content:datetime}}'
+	)
	assert_equal 'dash-content', tag.label
	end

@@	@@ -18,12 +24,16 @@ class FieldDateTimeTest < ActiveSupport::TestCase
	'{{cms:not_field:content}}',
	'{not_a_tag}'
	].each do \|tag_signature\|
-	assert_nil CmsTag::FieldDateTime.initialize_tag(cms_pages(:default), tag_signature)
+	assert_nil ComfortableMexicanSofa::Tag::FieldDateTime.initialize_tag(
+	cms_pages(:default), tag_signature
+	)
	end
	end

	def test_content_and_render
-	tag = CmsTag::FieldDateTime.initialize_tag(cms_pages(:default), '{{cms:field:content:datetime}}')
+	tag = ComfortableMexicanSofa::Tag::FieldDateTime.initialize_tag(
+	cms_pages(:default), '{{cms:field:content:datetime}}'
+	)
	assert tag.content.blank?
	time = 2.days.ago
	tag.content = time

test/unit/cms_tags/field_integer_test.rb +15 -5

@@	@@ -3,11 +3,17 @@ require File.expand_path('../../test_helper', File.dirname(__FILE__))
	class FieldIntegerTest < ActiveSupport::TestCase

	def test_initialize_tag
-	assert tag = CmsTag::FieldInteger.initialize_tag(cms_pages(:default), '{{ cms:field:content:integer }}')
+	assert tag = ComfortableMexicanSofa::Tag::FieldInteger.initialize_tag(
+	cms_pages(:default), '{{ cms:field:content:integer }}'
+	)
	assert_equal 'content', tag.label
-	assert tag = CmsTag::FieldInteger.initialize_tag(cms_pages(:default), '{{cms:field:content:integer}}')
+	assert tag = ComfortableMexicanSofa::Tag::FieldInteger.initialize_tag(
+	cms_pages(:default), '{{cms:field:content:integer}}'
+	)
	assert_equal 'content', tag.label
-	assert tag = CmsTag::FieldInteger.initialize_tag(cms_pages(:default), '{{cms:field:dash-content:integer}}')
+	assert tag = ComfortableMexicanSofa::Tag::FieldInteger.initialize_tag(
+	cms_pages(:default), '{{cms:field:dash-content:integer}}'
+	)
	assert_equal 'dash-content', tag.label
	end

@@	@@ -18,12 +24,16 @@ class FieldIntegerTest < ActiveSupport::TestCase
	'{{cms:not_field:content}}',
	'{not_a_tag}'
	].each do \|tag_signature\|
-	assert_nil CmsTag::FieldInteger.initialize_tag(cms_pages(:default), tag_signature)
+	assert_nil ComfortableMexicanSofa::Tag::FieldInteger.initialize_tag(
+	cms_pages(:default), tag_signature
+	)
	end
	end

	def test_content_and_render
-	tag = CmsTag::FieldInteger.initialize_tag(cms_pages(:default), '{{cms:field:content:integer}}')
+	tag = ComfortableMexicanSofa::Tag::FieldInteger.initialize_tag(
+	cms_pages(:default), '{{cms:field:content:integer}}'
+	)
	assert tag.content.blank?
	tag.content = '5'
	assert_equal '5', tag.content

test/unit/cms_tags/field_string_test.rb +18 -6

@@	@@ -3,13 +3,21 @@ require File.expand_path('../../test_helper', File.dirname(__FILE__))
	class FieldStringTest < ActiveSupport::TestCase

	def test_initialize_tag
-	assert tag = CmsTag::FieldString.initialize_tag(cms_pages(:default), '{{ cms:field:content:string }}')
+	assert tag = ComfortableMexicanSofa::Tag::FieldString.initialize_tag(
+	cms_pages(:default), '{{ cms:field:content:string }}'
+	)
	assert_equal 'content', tag.label
-	assert tag = CmsTag::FieldString.initialize_tag(cms_pages(:default), '{{cms:field:content:string}}')
+	assert tag = ComfortableMexicanSofa::Tag::FieldString.initialize_tag(
+	cms_pages(:default), '{{cms:field:content:string}}'
+	)
	assert_equal 'content', tag.label
-	assert tag = CmsTag::FieldString.initialize_tag(cms_pages(:default), '{{cms:field:content}}')
+	assert tag = ComfortableMexicanSofa::Tag::FieldString.initialize_tag(
+	cms_pages(:default), '{{cms:field:content}}'
+	)
	assert_equal 'content', tag.label
-	assert tag = CmsTag::FieldString.initialize_tag(cms_pages(:default), '{{cms:field:dash-content}}')
+	assert tag = ComfortableMexicanSofa::Tag::FieldString.initialize_tag(
+	cms_pages(:default), '{{cms:field:dash-content}}'
+	)
	assert_equal 'dash-content', tag.label
	end

@@	@@ -19,12 +27,16 @@ class FieldStringTest < ActiveSupport::TestCase
	'{{cms:not_field:content}}',
	'{not_a_tag}'
	].each do \|tag_signature\|
-	assert_nil CmsTag::FieldString.initialize_tag(cms_pages(:default), tag_signature)
+	assert_nil ComfortableMexicanSofa::Tag::FieldString.initialize_tag(
+	cms_pages(:default), tag_signature
+	)
	end
	end

	def test_content_and_render
-	tag = CmsTag::FieldString.initialize_tag(cms_pages(:default), '{{cms:field:content}}')
+	tag = ComfortableMexicanSofa::Tag::FieldString.initialize_tag(
+	cms_pages(:default), '{{cms:field:content}}'
+	)
	assert tag.content.blank?
	tag.content = 'test_content'
	assert_equal 'test_content', tag.content

test/unit/cms_tags/field_text_test.rb +15 -5

@@	@@ -3,11 +3,17 @@ require File.expand_path('../../test_helper', File.dirname(__FILE__))
	class FieldTextTest < ActiveSupport::TestCase

	def test_initialize_tag
-	assert tag = CmsTag::FieldText.initialize_tag(cms_pages(:default), '{{ cms:field:content:text }}')
+	assert tag = ComfortableMexicanSofa::Tag::FieldText.initialize_tag(
+	cms_pages(:default), '{{ cms:field:content:text }}'
+	)
	assert_equal 'content', tag.label
-	assert tag = CmsTag::FieldText.initialize_tag(cms_pages(:default), '{{cms:field:content:text}}')
+	assert tag = ComfortableMexicanSofa::Tag::FieldText.initialize_tag(
+	cms_pages(:default), '{{cms:field:content:text}}'
+	)
	assert_equal 'content', tag.label
-	assert tag = CmsTag::FieldText.initialize_tag(cms_pages(:default), '{{cms:field:dash-content:text}}')
+	assert tag = ComfortableMexicanSofa::Tag::FieldText.initialize_tag(
+	cms_pages(:default), '{{cms:field:dash-content:text}}'
+	)
	assert_equal 'dash-content', tag.label
	end

@@	@@ -17,12 +23,16 @@ class FieldTextTest < ActiveSupport::TestCase
	'{{cms:not_field:content:text}}',
	'{not_a_tag}'
	].each do \|tag_signature\|
-	assert_nil CmsTag::FieldText.initialize_tag(cms_pages(:default), tag_signature)
+	assert_nil ComfortableMexicanSofa::Tag::FieldText.initialize_tag(
+	cms_pages(:default), tag_signature
+	)
	end
	end

	def test_content_and_render
-	tag = CmsTag::FieldText.initialize_tag(cms_pages(:default), '{{cms:field:content:text}}')
+	tag = ComfortableMexicanSofa::Tag::FieldText.initialize_tag(
+	cms_pages(:default), '{{cms:field:content:text}}'
+	)
	assert tag.content.blank?
	tag.content = 'test_content'
	assert_equal 'test_content', tag.content

test/unit/cms_tags/helper_test.rb +18 -6

@@	@@ -3,14 +3,20 @@ require File.expand_path('../../test_helper', File.dirname(__FILE__))
	class HelperTest < ActiveSupport::TestCase

	def test_initialize_tag
-	assert tag = CmsTag::Helper.initialize_tag(cms_pages(:default), '{{ cms:helper:method_name }}')
+	assert tag = ComfortableMexicanSofa::Tag::Helper.initialize_tag(
+	cms_pages(:default), '{{ cms:helper:method_name }}'
+	)
	assert_equal 'method_name', tag.label
-	assert tag = CmsTag::Helper.initialize_tag(cms_pages(:default), '{{ cms:helper:method-name }}')
+	assert tag = ComfortableMexicanSofa::Tag::Helper.initialize_tag(
+	cms_pages(:default), '{{ cms:helper:method-name }}'
+	)
	assert_equal 'method-name', tag.label
	end

	def test_initialize_tag_with_parameters
-	assert tag = CmsTag::Helper.initialize_tag(cms_pages(:default), '{{ cms:helper:method_name:param1:param2 }}')
+	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'
	end
@@	@@ -21,16 +27,22 @@ class HelperTest < ActiveSupport::TestCase
	'{{cms:not_helper:method_name}}',
	'{not_a_tag}'
	].each do \|tag_signature\|
-	assert_nil CmsTag::Helper.initialize_tag(cms_pages(:default), tag_signature)
+	assert_nil ComfortableMexicanSofa::Tag::Helper.initialize_tag(
+	cms_pages(:default), tag_signature
+	)
	end
	end

	def test_content_and_render
-	tag = CmsTag::Helper.initialize_tag(cms_pages(:default), '{{cms:helper:method_name}}')
+	tag = ComfortableMexicanSofa::Tag::Helper.initialize_tag(
+	cms_pages(:default), '{{cms:helper:method_name}}'
+	)
	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}}')
+	tag = ComfortableMexicanSofa::Tag::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

test/unit/cms_tags/page_datetime_test.rb +15 -5

@@	@@ -3,11 +3,17 @@ require File.expand_path('../../test_helper', File.dirname(__FILE__))
	class PageDateTimeTest < ActiveSupport::TestCase

	def test_initialize_tag
-	assert tag = CmsTag::PageDateTime.initialize_tag(cms_pages(:default), '{{ cms:page:content:datetime }}')
+	assert tag = ComfortableMexicanSofa::Tag::PageDateTime.initialize_tag(
+	cms_pages(:default), '{{ cms:page:content:datetime }}'
+	)
	assert_equal 'content', tag.label
-	assert tag = CmsTag::PageDateTime.initialize_tag(cms_pages(:default), '{{cms:page:content:datetime}}')
+	assert tag = ComfortableMexicanSofa::Tag::PageDateTime.initialize_tag(
+	cms_pages(:default), '{{cms:page:content:datetime}}'
+	)
	assert_equal 'content', tag.label
-	assert tag = CmsTag::PageDateTime.initialize_tag(cms_pages(:default), '{{cms:page:dash-content:datetime}}')
+	assert tag = ComfortableMexicanSofa::Tag::PageDateTime.initialize_tag(
+	cms_pages(:default), '{{cms:page:dash-content:datetime}}'
+	)
	assert_equal 'dash-content', tag.label
	end

@@	@@ -18,12 +24,16 @@ class PageDateTimeTest < ActiveSupport::TestCase
	'{{cms:not_page:content}}',
	'{not_a_tag}'
	].each do \|tag_signature\|
-	assert_nil CmsTag::PageDateTime.initialize_tag(cms_pages(:default), tag_signature)
+	assert_nil ComfortableMexicanSofa::Tag::PageDateTime.initialize_tag(
+	cms_pages(:default), tag_signature
+	)
	end
	end

	def test_content_and_render
-	tag = CmsTag::PageDateTime.initialize_tag(cms_pages(:default), '{{cms:page:content:datetime}}')
+	tag = ComfortableMexicanSofa::Tag::PageDateTime.initialize_tag(
+	cms_pages(:default), '{{cms:page:content:datetime}}'
+	)
	assert tag.content.blank?
	time = 2.days.ago
	tag.content = time

test/unit/cms_tags/page_integer_test.rb +15 -5

@@	@@ -3,11 +3,17 @@ require File.expand_path('../../test_helper', File.dirname(__FILE__))
	class PageIntegerTest < ActiveSupport::TestCase

	def test_initialize_tag
-	assert tag = CmsTag::PageInteger.initialize_tag(cms_pages(:default), '{{ cms:page:content:integer }}')
+	assert tag = ComfortableMexicanSofa::Tag::PageInteger.initialize_tag(
+	cms_pages(:default), '{{ cms:page:content:integer }}'
+	)
	assert_equal 'content', tag.label
-	assert tag = CmsTag::PageInteger.initialize_tag(cms_pages(:default), '{{cms:page:content:integer}}')
+	assert tag = ComfortableMexicanSofa::Tag::PageInteger.initialize_tag(
+	cms_pages(:default), '{{cms:page:content:integer}}'
+	)
	assert_equal 'content', tag.label
-	assert tag = CmsTag::PageInteger.initialize_tag(cms_pages(:default), '{{cms:page:dash-content:integer}}')
+	assert tag = ComfortableMexicanSofa::Tag::PageInteger.initialize_tag(
+	cms_pages(:default), '{{cms:page:dash-content:integer}}'
+	)
	assert_equal 'dash-content', tag.label
	end

@@	@@ -18,12 +24,16 @@ class PageIntegerTest < ActiveSupport::TestCase
	'{{cms:not_page:content}}',
	'{not_a_tag}'
	].each do \|tag_signature\|
-	assert_nil CmsTag::PageInteger.initialize_tag(cms_pages(:default), tag_signature)
+	assert_nil ComfortableMexicanSofa::Tag::PageInteger.initialize_tag(
+	cms_pages(:default), tag_signature
+	)
	end
	end

	def test_content_and_render
-	tag = CmsTag::PageInteger.initialize_tag(cms_pages(:default), '{{cms:page:content:integer}}')
+	tag = ComfortableMexicanSofa::Tag::PageInteger.initialize_tag(
+	cms_pages(:default), '{{cms:page:content:integer}}'
+	)
	assert tag.content.blank?
	tag.content = '5'
	assert_equal '5', tag.content

test/unit/cms_tags/page_rich_text.rb +15 -5

@@	@@ -3,11 +3,17 @@ require File.expand_path('../../test_helper', File.dirname(__FILE__))
	class PageRichTextTest < ActiveSupport::TestCase

	def test_initialize_tag
-	assert tag = CmsTag::PageRichText.initialize_tag(cms_pages(:default), '{{ cms:page:content:rich_text }}')
+	assert tag = ComfortableMexicanSofa::Tag::PageRichText.initialize_tag(
+	cms_pages(:default), '{{ cms:page:content:rich_text }}'
+	)
	assert_equal 'content', tag.label
-	assert tag = CmsTag::PageRichText.initialize_tag(cms_pages(:default), '{{cms:page:content:rich_text}}')
+	assert tag = ComfortableMexicanSofa::Tag::PageRichText.initialize_tag(
+	cms_pages(:default), '{{cms:page:content:rich_text}}'
+	)
	assert_equal 'content', tag.label
-	assert tag = CmsTag::PageRichText.initialize_tag(cms_pages(:default), '{{cms:page:dash-content:rich_text}}')
+	assert tag = ComfortableMexicanSofa::Tag::PageRichText.initialize_tag(
+	cms_pages(:default), '{{cms:page:dash-content:rich_text}}'
+	)
	assert_equal 'dash-content', tag.label
	end

@@	@@ -18,12 +24,16 @@ class PageRichTextTest < ActiveSupport::TestCase
	'{{cms:not_page:content}}',
	'{not_a_tag}'
	].each do \|tag_signature\|
-	assert_nil CmsTag::PageRichText.initialize_tag(cms_pages(:default), tag_signature)
+	assert_nil ComfortableMexicanSofa::Tag::PageRichText.initialize_tag(
+	cms_pages(:default), tag_signature
+	)
	end
	end

	def test_content_and_render
-	tag = CmsTag::PageRichText.initialize_tag(cms_pages(:default), '{{cms:page:content:rich_text}}')
+	tag = ComfortableMexicanSofa::Tag::PageRichText.initialize_tag(
+	cms_pages(:default), '{{cms:page:content:rich_text}}'
+	)
	assert tag.content.blank?
	tag.content = 'test_content'
	assert_equal 'test_content', tag.content

test/unit/cms_tags/page_string_test.rb +15 -5

@@	@@ -3,11 +3,17 @@ require File.expand_path('../../test_helper', File.dirname(__FILE__))
	class PageStringTest < ActiveSupport::TestCase

	def test_initialize_tag
-	assert tag = CmsTag::PageString.initialize_tag(cms_pages(:default), '{{ cms:page:content:string }}')
+	assert tag = ComfortableMexicanSofa::Tag::PageString.initialize_tag(
+	cms_pages(:default), '{{ cms:page:content:string }}'
+	)
	assert_equal 'content', tag.label
-	assert tag = CmsTag::PageString.initialize_tag(cms_pages(:default), '{{cms:page:content:string}}')
+	assert tag = ComfortableMexicanSofa::Tag::PageString.initialize_tag(
+	cms_pages(:default), '{{cms:page:content:string}}'
+	)
	assert_equal 'content', tag.label
-	assert tag = CmsTag::PageString.initialize_tag(cms_pages(:default), '{{cms:page:dash-content:string}}')
+	assert tag = ComfortableMexicanSofa::Tag::PageString.initialize_tag(
+	cms_pages(:default), '{{cms:page:dash-content:string}}'
+	)
	assert_equal 'dash-content', tag.label
	end

@@	@@ -18,12 +24,16 @@ class PageStringTest < ActiveSupport::TestCase
	'{{cms:not_page:content}}',
	'{not_a_tag}'
	].each do \|tag_signature\|
-	assert_nil CmsTag::PageString.initialize_tag(cms_pages(:default), tag_signature)
+	assert_nil ComfortableMexicanSofa::Tag::PageString.initialize_tag(
+	cms_pages(:default), tag_signature
+	)
	end
	end

	def test_content_and_render
-	tag = CmsTag::PageString.initialize_tag(cms_pages(:default), '{{cms:page:content:string}}')
+	tag = ComfortableMexicanSofa::Tag::PageString.initialize_tag(
+	cms_pages(:default), '{{cms:page:content:string}}'
+	)
	assert tag.content.blank?
	tag.content = 'test_content'
	assert_equal 'test_content', tag.content

test/unit/cms_tags/page_text_test.rb +18 -6

@@	@@ -3,13 +3,21 @@ require File.expand_path('../../test_helper', File.dirname(__FILE__))
	class PageTextTest < ActiveSupport::TestCase

	def test_initialize_tag
-	assert tag = CmsTag::PageText.initialize_tag(cms_pages(:default), '{{ cms:page:content:text }}')
+	assert tag = ComfortableMexicanSofa::Tag::PageText.initialize_tag(
+	cms_pages(:default), '{{ cms:page:content:text }}'
+	)
	assert_equal 'content', tag.label
-	assert tag = CmsTag::PageText.initialize_tag(cms_pages(:default), '{{cms:page:content}}')
+	assert tag = ComfortableMexicanSofa::Tag::PageText.initialize_tag(
+	cms_pages(:default), '{{cms:page:content}}'
+	)
	assert_equal 'content', tag.label
-	assert tag = CmsTag::PageText.initialize_tag(cms_pages(:default), '{{cms:page:content:text}}')
+	assert tag = ComfortableMexicanSofa::Tag::PageText.initialize_tag(
+	cms_pages(:default), '{{cms:page:content:text}}'
+	)
	assert_equal 'content', tag.label
-	assert tag = CmsTag::PageText.initialize_tag(cms_pages(:default), '{{cms:page:dash-content}}')
+	assert tag = ComfortableMexicanSofa::Tag::PageText.initialize_tag(
+	cms_pages(:default), '{{cms:page:dash-content}}'
+	)
	assert_equal 'dash-content', tag.label
	end

@@	@@ -19,12 +27,16 @@ class PageTextTest < ActiveSupport::TestCase
	'{{cms:not_page:content}}',
	'{not_a_tag}'
	].each do \|tag_signature\|
-	assert_nil CmsTag::PageText.initialize_tag(cms_pages(:default), tag_signature)
+	assert_nil ComfortableMexicanSofa::Tag::PageText.initialize_tag(
+	cms_pages(:default), tag_signature
+	)
	end
	end

	def test_content_and_render
-	tag = CmsTag::PageText.initialize_tag(cms_pages(:default), '{{cms:page:content}}')
+	tag = ComfortableMexicanSofa::Tag::PageText.initialize_tag(
+	cms_pages(:default), '{{cms:page:content}}'
+	)
	assert tag.content.blank?
	tag.content = 'test_content'
	assert_equal 'test_content', tag.content

test/unit/cms_tags/partial_test.rb +24 -8

@@	@@ -3,16 +3,24 @@ require File.expand_path('../../test_helper', File.dirname(__FILE__))
	class PartialTest < ActiveSupport::TestCase

	def test_initialize_tag
-	assert tag = CmsTag::Partial.initialize_tag(cms_pages(:default), '{{ cms:partial:partial_name }}')
+	assert tag = ComfortableMexicanSofa::Tag::Partial.initialize_tag(
+	cms_pages(:default), '{{ cms:partial:partial_name }}'
+	)
	assert_equal 'partial_name', tag.label
-	assert tag = CmsTag::Partial.initialize_tag(cms_pages(:default), '{{cms:partial:path/to/partial}}')
+	assert tag = ComfortableMexicanSofa::Tag::Partial.initialize_tag(
+	cms_pages(:default), '{{cms:partial:path/to/partial}}'
+	)
	assert_equal 'path/to/partial', tag.label
-	assert tag = CmsTag::Partial.initialize_tag(cms_pages(:default), '{{cms:partial:path/to/dashed-partial}}')
+	assert tag = ComfortableMexicanSofa::Tag::Partial.initialize_tag(
+	cms_pages(:default), '{{cms:partial:path/to/dashed-partial}}'
+	)
	assert_equal 'path/to/dashed-partial', tag.label
	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 = ComfortableMexicanSofa::Tag::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
@@	@@ -23,20 +31,28 @@ class PartialTest < ActiveSupport::TestCase
	'{{cms:not_partial:label}}',
	'{not_a_tag}'
	].each do \|tag_signature\|
-	assert_nil CmsTag::Partial.initialize_tag(cms_pages(:default), tag_signature)
+	assert_nil ComfortableMexicanSofa::Tag::Partial.initialize_tag(
+	cms_pages(:default), tag_signature
+	)
	end
	end

	def test_content_and_render
-	tag = CmsTag::Partial.initialize_tag(cms_pages(:default), '{{cms:partial:path/to/partial}}')
+	tag = ComfortableMexicanSofa::Tag::Partial.initialize_tag(
+	cms_pages(:default), '{{cms:partial:path/to/partial}}'
+	)
	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}}')
+	tag = ComfortableMexicanSofa::Tag::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}}')
+	tag = ComfortableMexicanSofa::Tag::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

test/unit/cms_tags/snippet_test.rb +18 -6

@@	@@ -3,11 +3,17 @@ require File.expand_path('../../test_helper', File.dirname(__FILE__))
	class SnippetTest < ActiveSupport::TestCase

	def test_initialize_tag
-	assert tag = CmsTag::Snippet.initialize_tag(cms_pages(:default), '{{ cms:snippet:label }}')
+	assert tag = ComfortableMexicanSofa::Tag::Snippet.initialize_tag(
+	cms_pages(:default), '{{ cms:snippet:label }}'
+	)
	assert_equal 'label', tag.slug
-	assert tag = CmsTag::Snippet.initialize_tag(cms_pages(:default), '{{cms:snippet:label}}')
+	assert tag = ComfortableMexicanSofa::Tag::Snippet.initialize_tag(
+	cms_pages(:default), '{{cms:snippet:label}}'
+	)
	assert_equal 'label', tag.slug
-	assert tag = CmsTag::Snippet.initialize_tag(cms_pages(:default), '{{cms:snippet:dash-label}}')
+	assert tag = ComfortableMexicanSofa::Tag::Snippet.initialize_tag(
+	cms_pages(:default), '{{cms:snippet:dash-label}}'
+	)
	assert_equal 'dash-label', tag.slug
	end

@@	@@ -17,16 +23,22 @@ class SnippetTest < ActiveSupport::TestCase
	'{{cms:not_snippet:label}}',
	'{not_a_tag}'
	].each do \|tag_signature\|
-	assert_nil CmsTag::Snippet.initialize_tag(cms_pages(:default), tag_signature)
+	assert_nil ComfortableMexicanSofa::Tag::Snippet.initialize_tag(
+	cms_pages(:default), tag_signature
+	)
	end
	end

	def test_content_and_render
-	tag = CmsTag::Snippet.initialize_tag(cms_pages(:default), '{{cms:snippet:default}}')
+	tag = ComfortableMexicanSofa::Tag::Snippet.initialize_tag(
+	cms_pages(:default), '{{cms:snippet:default}}'
+	)
	assert_equal 'default_snippet_content', tag.content
	assert_equal 'default_snippet_content', tag.render

-	tag = CmsTag::Snippet.initialize_tag(cms_pages(:default), "{{cms:snippet:doesnot_exist}}")
+	tag = ComfortableMexicanSofa::Tag::Snippet.initialize_tag(
+	cms_pages(:default), "{{cms:snippet:doesnot_exist}}"
+	)
	assert_equal nil, tag.content
	assert_equal '', tag.render
	end

test/unit/models/block_test.rb +2 -2

@@	@@ -31,11 +31,11 @@ class BlockTest < ActiveSupport::TestCase
	end

	def test_initialize_or_find
-	tag = CmsTag::PageText.initialize_or_find(cms_pages(:default), :default_field_text)
+	tag = ComfortableMexicanSofa::Tag::PageText.initialize_or_find(cms_pages(:default), :default_field_text)
	assert_equal 'default_field_text', tag.label
	assert_equal 'default_field_text_content', tag.content

-	tag = CmsTag::PageText.initialize_or_find(cms_pages(:default), :new_block)
+	tag = ComfortableMexicanSofa::Tag::PageText.initialize_or_find(cms_pages(:default), :new_block)
	assert_equal 'new_block', tag.label
	assert tag.content.blank?
	end