comfortable_mexican_sofa 1.4.21 → 1.4.22
Sign up to get free protection for your applications and to get access to all the features.
- data/VERSION +1 -1
- data/comfortable_mexican_sofa.gemspec +1 -1
- data/lib/comfortable_mexican_sofa/form_builder.rb +1 -1
- data/lib/comfortable_mexican_sofa/tags/collection.rb +1 -1
- data/test/functional/cms_admin/pages_controller_test.rb +2 -2
- data/test/unit/tag_test.rb +2 -2
- data/test/unit/tags/collection_test.rb +7 -7
- metadata +8 -8
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
1.4.
|
1
|
+
1.4.22
|
@@ -5,7 +5,7 @@
|
|
5
5
|
|
6
6
|
Gem::Specification.new do |s|
|
7
7
|
s.name = "comfortable_mexican_sofa"
|
8
|
-
s.version = "1.4.
|
8
|
+
s.version = "1.4.22"
|
9
9
|
|
10
10
|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
11
11
|
s.authors = ["Oleg Khabarov", "The Working Group Inc"]
|
@@ -61,7 +61,7 @@ class ComfortableMexicanSofa::FormBuilder < ActionView::Helpers::FormBuilder
|
|
61
61
|
|
62
62
|
field_css_class = case tag
|
63
63
|
when ComfortableMexicanSofa::Tag::PageDateTime, ComfortableMexicanSofa::Tag::FieldDateTime
|
64
|
-
'
|
64
|
+
'datetime'
|
65
65
|
when ComfortableMexicanSofa::Tag::PageText, ComfortableMexicanSofa::Tag::FieldText
|
66
66
|
'code'
|
67
67
|
when ComfortableMexicanSofa::Tag::PageRichText
|
@@ -20,7 +20,7 @@ class ComfortableMexicanSofa::Tag::Collection
|
|
20
20
|
|
21
21
|
# Path to the partial. Example: `path/to/partial`
|
22
22
|
def collection_partial
|
23
|
-
self.params[1] || self.collection_class.underscore.pluralize
|
23
|
+
self.params[1] || "partials/#{self.collection_class.underscore.pluralize}"
|
24
24
|
end
|
25
25
|
|
26
26
|
# Title method for the Collection objects. Default is `label`
|
@@ -49,7 +49,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
|
|
49
49
|
def test_get_new_with_field_datetime
|
50
50
|
cms_layouts(:default).update_attribute(:content, '{{cms:field:test_label:datetime}}')
|
51
51
|
get :new, :site_id => cms_sites(:default)
|
52
|
-
assert_select "input[type='text'][name='page[blocks_attributes][][content]'][class='
|
52
|
+
assert_select "input[type='text'][name='page[blocks_attributes][][content]'][class='datetime']"
|
53
53
|
assert_select "input[type='hidden'][name='page[blocks_attributes][][label]'][value='test_label']"
|
54
54
|
end
|
55
55
|
|
@@ -77,7 +77,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
|
|
77
77
|
def test_get_new_with_page_datetime
|
78
78
|
cms_layouts(:default).update_attribute(:content, '{{cms:page:test_label:datetime}}')
|
79
79
|
get :new, :site_id => cms_sites(:default)
|
80
|
-
assert_select "input[type='text'][name='page[blocks_attributes][][content]'][class='
|
80
|
+
assert_select "input[type='text'][name='page[blocks_attributes][][content]'][class='datetime']"
|
81
81
|
assert_select "input[type='hidden'][name='page[blocks_attributes][][label]'][value='test_label']"
|
82
82
|
end
|
83
83
|
|
data/test/unit/tag_test.rb
CHANGED
@@ -243,7 +243,7 @@ class TagTest < ActiveSupport::TestCase
|
|
243
243
|
:content => snippet.id }
|
244
244
|
]
|
245
245
|
)
|
246
|
-
assert_equal "<% 1 + 1 %> text <% 2 + 2 %> snippet <%= 2 + 2 %> <%= render :partial => 'path/to' %> <%= method() %> text <%= render :partial => 'cms/snippets', :locals => {:model => 'Cms::Snippet', :identifier => '#{snippet.id}'} %> <%= 1 + 1 %>", page.content
|
246
|
+
assert_equal "<% 1 + 1 %> text <% 2 + 2 %> snippet <%= 2 + 2 %> <%= render :partial => 'path/to' %> <%= method() %> text <%= render :partial => 'partials/cms/snippets', :locals => {:model => 'Cms::Snippet', :identifier => '#{snippet.id}'} %> <%= 1 + 1 %>", page.content
|
247
247
|
end
|
248
248
|
|
249
249
|
def test_content_with_irb_enabled
|
@@ -269,7 +269,7 @@ class TagTest < ActiveSupport::TestCase
|
|
269
269
|
:content => snippet.id }
|
270
270
|
]
|
271
271
|
)
|
272
|
-
assert_equal "<% 1 + 1 %> text <% 2 + 2 %> snippet <%= 2 + 2 %> <%= render :partial => 'path/to' %> <%= method() %> text <%= render :partial => 'cms/snippets', :locals => {:model => 'Cms::Snippet', :identifier => '#{snippet.id}'} %> <%= 1 + 1 %>", page.content
|
272
|
+
assert_equal "<% 1 + 1 %> text <% 2 + 2 %> snippet <%= 2 + 2 %> <%= render :partial => 'path/to' %> <%= method() %> text <%= render :partial => 'partials/cms/snippets', :locals => {:model => 'Cms::Snippet', :identifier => '#{snippet.id}'} %> <%= 1 + 1 %>", page.content
|
273
273
|
end
|
274
274
|
|
275
275
|
end
|
@@ -13,12 +13,12 @@ class CollectionTagTest < ActiveSupport::TestCase
|
|
13
13
|
assert tag = ComfortableMexicanSofa::Tag::Collection.initialize_tag(
|
14
14
|
cms_pages(:default), '{{ cms:collection:snippet:cms/snippet }}'
|
15
15
|
)
|
16
|
-
assert_equal 'snippet',
|
17
|
-
assert_equal 'Cms::Snippet',
|
18
|
-
assert_equal 'cms/snippets',
|
19
|
-
assert_equal 'label',
|
20
|
-
assert_equal 'id',
|
21
|
-
assert_equal [],
|
16
|
+
assert_equal 'snippet', tag.label
|
17
|
+
assert_equal 'Cms::Snippet', tag.collection_class
|
18
|
+
assert_equal 'partials/cms/snippets', tag.collection_partial
|
19
|
+
assert_equal 'label', tag.collection_title
|
20
|
+
assert_equal 'id', tag.collection_identifier
|
21
|
+
assert_equal [], tag.collection_params
|
22
22
|
end
|
23
23
|
|
24
24
|
def test_initialize_tag_detailed
|
@@ -80,7 +80,7 @@ class CollectionTagTest < ActiveSupport::TestCase
|
|
80
80
|
tag.content = snippet.id
|
81
81
|
assert_equal snippet.id, tag.block.content
|
82
82
|
assert_equal snippet.id, tag.content
|
83
|
-
assert_equal "<%= render :partial => 'cms/snippets', :locals => {:model => 'Cms::Snippet', :identifier => '#{snippet.id}'} %>", tag.render
|
83
|
+
assert_equal "<%= render :partial => 'partials/cms/snippets', :locals => {:model => 'Cms::Snippet', :identifier => '#{snippet.id}'} %>", tag.render
|
84
84
|
end
|
85
85
|
|
86
86
|
def test_content_and_render_detailed
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: comfortable_mexican_sofa
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.4.
|
4
|
+
version: 1.4.22
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -14,7 +14,7 @@ date: 2011-09-26 00:00:00.000000000Z
|
|
14
14
|
dependencies:
|
15
15
|
- !ruby/object:Gem::Dependency
|
16
16
|
name: rails
|
17
|
-
requirement: &
|
17
|
+
requirement: &70115040490720 !ruby/object:Gem::Requirement
|
18
18
|
none: false
|
19
19
|
requirements:
|
20
20
|
- - ! '>='
|
@@ -22,10 +22,10 @@ dependencies:
|
|
22
22
|
version: 3.0.0
|
23
23
|
type: :runtime
|
24
24
|
prerelease: false
|
25
|
-
version_requirements: *
|
25
|
+
version_requirements: *70115040490720
|
26
26
|
- !ruby/object:Gem::Dependency
|
27
27
|
name: active_link_to
|
28
|
-
requirement: &
|
28
|
+
requirement: &70115040490140 !ruby/object:Gem::Requirement
|
29
29
|
none: false
|
30
30
|
requirements:
|
31
31
|
- - ! '>='
|
@@ -33,10 +33,10 @@ dependencies:
|
|
33
33
|
version: 1.0.0
|
34
34
|
type: :runtime
|
35
35
|
prerelease: false
|
36
|
-
version_requirements: *
|
36
|
+
version_requirements: *70115040490140
|
37
37
|
- !ruby/object:Gem::Dependency
|
38
38
|
name: paperclip
|
39
|
-
requirement: &
|
39
|
+
requirement: &70115040489540 !ruby/object:Gem::Requirement
|
40
40
|
none: false
|
41
41
|
requirements:
|
42
42
|
- - ! '>='
|
@@ -44,7 +44,7 @@ dependencies:
|
|
44
44
|
version: 2.3.14
|
45
45
|
type: :runtime
|
46
46
|
prerelease: false
|
47
|
-
version_requirements: *
|
47
|
+
version_requirements: *70115040489540
|
48
48
|
description: ''
|
49
49
|
email: oleg@theworkinggroup.ca
|
50
50
|
executables: []
|
@@ -349,7 +349,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
349
349
|
version: '0'
|
350
350
|
segments:
|
351
351
|
- 0
|
352
|
-
hash:
|
352
|
+
hash: 1925889487784406071
|
353
353
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
354
354
|
none: false
|
355
355
|
requirements:
|