comfortable_mexican_sofa 1.0.50 → 1.0.51
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/VERSION +1 -1
- data/app/models/cms_page.rb +1 -0
- data/comfortable_mexican_sofa.gemspec +3 -4
- data/lib/comfortable_mexican_sofa/view_methods.rb +2 -2
- metadata +5 -41
data/VERSION
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
1.0.
|
|
1
|
+
1.0.51
|
data/app/models/cms_page.rb
CHANGED
|
@@ -39,6 +39,7 @@ class CmsPage < ActiveRecord::Base
|
|
|
39
39
|
validate :validate_target_page
|
|
40
40
|
|
|
41
41
|
# -- Scopes ---------------------------------------------------------------
|
|
42
|
+
default_scope order(:position)
|
|
42
43
|
scope :published, where(:is_published => true)
|
|
43
44
|
|
|
44
45
|
# -- Class Methods --------------------------------------------------------
|
|
@@ -5,11 +5,11 @@
|
|
|
5
5
|
|
|
6
6
|
Gem::Specification.new do |s|
|
|
7
7
|
s.name = %q{comfortable_mexican_sofa}
|
|
8
|
-
s.version = "1.0.
|
|
8
|
+
s.version = "1.0.51"
|
|
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"]
|
|
12
|
-
s.date = %q{2011-
|
|
12
|
+
s.date = %q{2011-04-13}
|
|
13
13
|
s.description = %q{}
|
|
14
14
|
s.email = %q{oleg@theworkinggroup.ca}
|
|
15
15
|
s.extra_rdoc_files = [
|
|
@@ -246,7 +246,7 @@ Gem::Specification.new do |s|
|
|
|
246
246
|
]
|
|
247
247
|
s.homepage = %q{http://github.com/twg/comfortable-mexican-sofa}
|
|
248
248
|
s.require_paths = ["lib"]
|
|
249
|
-
s.rubygems_version = %q{1.
|
|
249
|
+
s.rubygems_version = %q{1.7.2}
|
|
250
250
|
s.summary = %q{ComfortableMexicanSofa is a Rails Engine CMS gem}
|
|
251
251
|
s.test_files = [
|
|
252
252
|
"test/functional/cms_admin/layouts_controller_test.rb",
|
|
@@ -286,7 +286,6 @@ Gem::Specification.new do |s|
|
|
|
286
286
|
]
|
|
287
287
|
|
|
288
288
|
if s.respond_to? :specification_version then
|
|
289
|
-
current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
|
|
290
289
|
s.specification_version = 3
|
|
291
290
|
|
|
292
291
|
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
|
|
@@ -23,7 +23,7 @@ module ComfortableMexicanSofa::ViewMethods
|
|
|
23
23
|
# Content of a snippet. Example:
|
|
24
24
|
# cms_snippet_content(:my_snippet)
|
|
25
25
|
def cms_snippet_content(snippet_slug)
|
|
26
|
-
return '' unless snippet = CmsSnippet.
|
|
26
|
+
return '' unless snippet = CmsSnippet.load_for_slug(@cms_site, snippet_slug)
|
|
27
27
|
snippet.content.to_s.html_safe
|
|
28
28
|
end
|
|
29
29
|
|
|
@@ -33,7 +33,7 @@ module ComfortableMexicanSofa::ViewMethods
|
|
|
33
33
|
# cms_page_content(:left_column) # if @cms_page is present
|
|
34
34
|
def cms_page_content(block_label, page = nil)
|
|
35
35
|
return '' unless page ||= @cms_page
|
|
36
|
-
return '' unless block = page.cms_blocks.
|
|
36
|
+
return '' unless block = page.cms_blocks.select{|b| b.label == block_label}.first
|
|
37
37
|
block.content.to_s.html_safe
|
|
38
38
|
end
|
|
39
39
|
end
|
metadata
CHANGED
|
@@ -1,12 +1,8 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: comfortable_mexican_sofa
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
prerelease:
|
|
5
|
-
|
|
6
|
-
- 1
|
|
7
|
-
- 0
|
|
8
|
-
- 50
|
|
9
|
-
version: 1.0.50
|
|
4
|
+
prerelease:
|
|
5
|
+
version: 1.0.51
|
|
10
6
|
platform: ruby
|
|
11
7
|
authors:
|
|
12
8
|
- Oleg Khabarov
|
|
@@ -15,8 +11,7 @@ autorequire:
|
|
|
15
11
|
bindir: bin
|
|
16
12
|
cert_chain: []
|
|
17
13
|
|
|
18
|
-
date: 2011-
|
|
19
|
-
default_executable:
|
|
14
|
+
date: 2011-04-13 00:00:00 Z
|
|
20
15
|
dependencies:
|
|
21
16
|
- !ruby/object:Gem::Dependency
|
|
22
17
|
name: rails
|
|
@@ -25,10 +20,6 @@ dependencies:
|
|
|
25
20
|
requirements:
|
|
26
21
|
- - ">="
|
|
27
22
|
- !ruby/object:Gem::Version
|
|
28
|
-
segments:
|
|
29
|
-
- 3
|
|
30
|
-
- 0
|
|
31
|
-
- 3
|
|
32
23
|
version: 3.0.3
|
|
33
24
|
type: :runtime
|
|
34
25
|
prerelease: false
|
|
@@ -40,10 +31,6 @@ dependencies:
|
|
|
40
31
|
requirements:
|
|
41
32
|
- - ">="
|
|
42
33
|
- !ruby/object:Gem::Version
|
|
43
|
-
segments:
|
|
44
|
-
- 0
|
|
45
|
-
- 0
|
|
46
|
-
- 6
|
|
47
34
|
version: 0.0.6
|
|
48
35
|
type: :runtime
|
|
49
36
|
prerelease: false
|
|
@@ -55,10 +42,6 @@ dependencies:
|
|
|
55
42
|
requirements:
|
|
56
43
|
- - ">="
|
|
57
44
|
- !ruby/object:Gem::Version
|
|
58
|
-
segments:
|
|
59
|
-
- 2
|
|
60
|
-
- 3
|
|
61
|
-
- 8
|
|
62
45
|
version: 2.3.8
|
|
63
46
|
type: :runtime
|
|
64
47
|
prerelease: false
|
|
@@ -70,8 +53,6 @@ dependencies:
|
|
|
70
53
|
requirements:
|
|
71
54
|
- - ">="
|
|
72
55
|
- !ruby/object:Gem::Version
|
|
73
|
-
segments:
|
|
74
|
-
- 0
|
|
75
56
|
version: "0"
|
|
76
57
|
type: :runtime
|
|
77
58
|
prerelease: false
|
|
@@ -83,8 +64,6 @@ dependencies:
|
|
|
83
64
|
requirements:
|
|
84
65
|
- - ">="
|
|
85
66
|
- !ruby/object:Gem::Version
|
|
86
|
-
segments:
|
|
87
|
-
- 0
|
|
88
67
|
version: "0"
|
|
89
68
|
type: :development
|
|
90
69
|
prerelease: false
|
|
@@ -96,10 +75,6 @@ dependencies:
|
|
|
96
75
|
requirements:
|
|
97
76
|
- - ">="
|
|
98
77
|
- !ruby/object:Gem::Version
|
|
99
|
-
segments:
|
|
100
|
-
- 3
|
|
101
|
-
- 0
|
|
102
|
-
- 3
|
|
103
78
|
version: 3.0.3
|
|
104
79
|
type: :runtime
|
|
105
80
|
prerelease: false
|
|
@@ -111,10 +86,6 @@ dependencies:
|
|
|
111
86
|
requirements:
|
|
112
87
|
- - ">="
|
|
113
88
|
- !ruby/object:Gem::Version
|
|
114
|
-
segments:
|
|
115
|
-
- 0
|
|
116
|
-
- 0
|
|
117
|
-
- 6
|
|
118
89
|
version: 0.0.6
|
|
119
90
|
type: :runtime
|
|
120
91
|
prerelease: false
|
|
@@ -126,10 +97,6 @@ dependencies:
|
|
|
126
97
|
requirements:
|
|
127
98
|
- - ">="
|
|
128
99
|
- !ruby/object:Gem::Version
|
|
129
|
-
segments:
|
|
130
|
-
- 2
|
|
131
|
-
- 3
|
|
132
|
-
- 8
|
|
133
100
|
version: 2.3.8
|
|
134
101
|
type: :runtime
|
|
135
102
|
prerelease: false
|
|
@@ -370,7 +337,6 @@ files:
|
|
|
370
337
|
- test/unit/cms_tags/snippet_test.rb
|
|
371
338
|
- test/unit/cms_upload_test.rb
|
|
372
339
|
- test/unit/view_methods_test.rb
|
|
373
|
-
has_rdoc: true
|
|
374
340
|
homepage: http://github.com/twg/comfortable-mexican-sofa
|
|
375
341
|
licenses: []
|
|
376
342
|
|
|
@@ -384,7 +350,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
|
384
350
|
requirements:
|
|
385
351
|
- - ">="
|
|
386
352
|
- !ruby/object:Gem::Version
|
|
387
|
-
hash:
|
|
353
|
+
hash: 3791197822029962853
|
|
388
354
|
segments:
|
|
389
355
|
- 0
|
|
390
356
|
version: "0"
|
|
@@ -393,13 +359,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
393
359
|
requirements:
|
|
394
360
|
- - ">="
|
|
395
361
|
- !ruby/object:Gem::Version
|
|
396
|
-
segments:
|
|
397
|
-
- 0
|
|
398
362
|
version: "0"
|
|
399
363
|
requirements: []
|
|
400
364
|
|
|
401
365
|
rubyforge_project:
|
|
402
|
-
rubygems_version: 1.
|
|
366
|
+
rubygems_version: 1.7.2
|
|
403
367
|
signing_key:
|
|
404
368
|
specification_version: 3
|
|
405
369
|
summary: ComfortableMexicanSofa is a Rails Engine CMS gem
|