Tag#id
Oleg
committed Dec 03, 2011
commit 06bebffaf8196db763048494cb1a06419c392bc8
Showing 3
changed files with
21 additions
and 21 deletions
comfortable_mexican_sofa/tag.rb b/lib/comfortable_mexican_sofa/tag.rb
+2
-2
| @@ | @@ -41,7 +41,7 @@ module ComfortableMexicanSofa::Tag |
| module InstanceMethods | |
| # String indentifier of the tag | |
| - | def identifier |
| + | def id |
| "#{self.class.to_s.demodulize.underscore}_#{self.label}" | |
| end | |
| @@ | @@ -105,7 +105,7 @@ private |
| if tag_signature | |
| if tag = self.initialize_tag(page, tag_signature) | |
| tag.parent = parent_tag if parent_tag | |
| - | if tag.ancestors.select{|a| a.identifier == tag.identifier}.blank? |
| + | if tag.ancestors.select{|a| a.id == tag.id}.blank? |
| page.tags << tag | |
| self.process_content(page, tag.render, tag) | |
| end | |
test/unit/models/block_test.rb
+2
-2
| @@ | @@ -10,8 +10,8 @@ class CmsBlockTest < ActiveSupport::TestCase |
| def test_tag | |
| block = cms_blocks(:default_page_text) | |
| - | assert block.page.tags(true).collect(&:identifier).member?('page_text_default_page_text') |
| - | assert_equal 'page_text_default_page_text', block.tag.identifier |
| + | assert block.page.tags(true).collect(&:id).member?('page_text_default_page_text') |
| + | assert_equal 'page_text_default_page_text', block.tag.id |
| end | |
| def test_creation_via_page_nested_attributes | |
test/unit/tag_test.rb
+17
-17
| @@ | @@ -81,11 +81,11 @@ class TagTest < ActiveSupport::TestCase |
| ), page.content(true) | |
| assert_equal 4, page.tags.size | |
| - | 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 'field_text_default_field_text', page.tags[0].id |
| + | assert_equal 'page_text_default_page_text', page.tags[1].id |
| + | assert_equal 'snippet_default', page.tags[2].id |
| assert_equal page.tags[1], page.tags[2].parent | |
| - | assert_equal 'snippet_default', page.tags[3].identifier |
| + | assert_equal 'snippet_default', page.tags[3].id |
| end | |
| def test_content_for_new_page | |
| @@ | @@ -110,9 +110,9 @@ class TagTest < ActiveSupport::TestCase |
| ), page.content | |
| assert_equal 3, page.tags.size | |
| - | 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 'field_text_default_field_text', page.tags[0].id |
| + | assert_equal 'page_text_default_page_text', page.tags[1].id |
| + | assert_equal 'snippet_default', page.tags[2].id |
| end | |
| def test_content_for_new_page_with_initilized_cms_blocks | |
| @@ | @@ -149,11 +149,11 @@ class TagTest < ActiveSupport::TestCase |
| ), page.content | |
| assert_equal 4, page.tags.size | |
| - | 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 'field_text_default_field_text', page.tags[0].id |
| + | assert_equal 'page_text_default_page_text', page.tags[1].id |
| + | assert_equal 'snippet_default', page.tags[2].id |
| assert_equal page.tags[1], page.tags[2].parent | |
| - | assert_equal 'snippet_default', page.tags[3].identifier |
| + | assert_equal 'snippet_default', page.tags[3].id |
| end | |
| def test_content_with_repeated_tags | |
| @@ | @@ -176,13 +176,13 @@ class TagTest < ActiveSupport::TestCase |
| ), page.content(true) | |
| assert_equal 6, page.tags.size | |
| - | 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 'field_text_default_field_text', page.tags[0].id |
| + | assert_equal 'page_text_default_page_text', page.tags[1].id |
| + | assert_equal 'snippet_default', page.tags[2].id |
| assert_equal page.tags[1], page.tags[2].parent | |
| - | 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 'snippet_default', page.tags[3].id |
| + | assert_equal 'page_text_default_page_text', page.tags[4].id |
| + | assert_equal 'snippet_default', page.tags[5].id |
| assert_equal page.tags[4], page.tags[5].parent | |
| end | |