comfortable_mexican_sofa 1.6.23 → 1.6.24
Sign up to get free protection for your applications and to get access to all the features.
- data/VERSION +1 -1
- data/app/assets/javascripts/comfortable_mexican_sofa/application.js +17 -16
- data/app/assets/stylesheets/comfortable_mexican_sofa/form.css +48 -0
- data/app/controllers/cms_admin/files_controller.rb +1 -1
- data/app/models/cms/file.rb +2 -1
- data/app/models/cms/page.rb +26 -6
- data/app/views/cms_admin/categories/_show.html.erb +1 -1
- data/app/views/cms_admin/files/_file.html.erb +1 -1
- data/app/views/cms_admin/files/index.html.erb +1 -1
- data/app/views/cms_admin/layouts/_index_branch.html.erb +1 -1
- data/app/views/cms_admin/pages/_form.html.erb +1 -0
- data/app/views/cms_admin/pages/_form_blocks.html.erb +29 -5
- data/app/views/cms_admin/pages/_index_branch.html.erb +1 -1
- data/app/views/cms_admin/pages/form_blocks.js.erb +2 -1
- data/app/views/cms_admin/sites/index.html.erb +1 -1
- data/app/views/cms_admin/snippets/index.html.erb +1 -1
- data/comfortable_mexican_sofa.gemspec +4 -3
- data/config/locales/ru.yml +235 -0
- data/lib/comfortable_mexican_sofa/configuration.rb +24 -23
- data/lib/comfortable_mexican_sofa/tag.rb +6 -1
- data/lib/comfortable_mexican_sofa/tags/asset.rb +1 -1
- data/lib/comfortable_mexican_sofa/tags/collection.rb +1 -1
- data/lib/comfortable_mexican_sofa/tags/field_datetime.rb +1 -1
- data/lib/comfortable_mexican_sofa/tags/field_integer.rb +1 -1
- data/lib/comfortable_mexican_sofa/tags/field_rich_text.rb +1 -1
- data/lib/comfortable_mexican_sofa/tags/field_string.rb +1 -1
- data/lib/comfortable_mexican_sofa/tags/field_text.rb +1 -1
- data/lib/comfortable_mexican_sofa/tags/file.rb +1 -1
- data/lib/comfortable_mexican_sofa/tags/page_datetime.rb +1 -1
- data/lib/comfortable_mexican_sofa/tags/page_file.rb +1 -1
- data/lib/comfortable_mexican_sofa/tags/page_files.rb +1 -1
- data/lib/comfortable_mexican_sofa/tags/page_integer.rb +1 -1
- data/lib/comfortable_mexican_sofa/tags/page_rich_text.rb +1 -1
- data/lib/comfortable_mexican_sofa/tags/page_string.rb +1 -1
- data/lib/comfortable_mexican_sofa/tags/page_text.rb +1 -1
- data/lib/comfortable_mexican_sofa/view_methods.rb +10 -1
- data/test/functional/cms_admin/pages_controller_test.rb +18 -18
- data/test/functional/cms_content_controller_test.rb +6 -6
- data/test/gemfiles/Gemfile.rails.3.0 +1 -1
- data/test/gemfiles/Gemfile.rails.3.1 +1 -1
- data/test/gemfiles/Gemfile.rails.3.2 +1 -1
- data/test/integration/fixtures_test.rb +1 -1
- data/test/integration/mirrors_test.rb +1 -1
- data/test/integration/render_cms_test.rb +7 -7
- data/test/integration/sites_test.rb +3 -3
- data/test/test_helper.rb +15 -0
- data/test/unit/fixtures_test.rb +10 -10
- data/test/unit/mirrors_test.rb +1 -1
- data/test/unit/models/block_test.rb +3 -3
- data/test/unit/models/categorization_test.rb +2 -2
- data/test/unit/models/file_test.rb +1 -1
- data/test/unit/models/layout_test.rb +3 -3
- data/test/unit/models/page_test.rb +21 -3
- data/test/unit/models/site_test.rb +1 -1
- data/test/unit/models/snippet_test.rb +1 -1
- data/test/unit/revisions_test.rb +5 -5
- data/test/unit/tag_test.rb +27 -1
- data/test/unit/tags/collection_test.rb +7 -0
- data/test/unit/tags/field_datetime_test.rb +6 -0
- data/test/unit/tags/field_integer_test.rb +6 -0
- data/test/unit/tags/field_rich_text_test.rb +6 -0
- data/test/unit/tags/field_string_test.rb +6 -0
- data/test/unit/tags/field_text_test.rb +6 -0
- data/test/unit/tags/page_datetime_test.rb +6 -0
- data/test/unit/tags/page_file_test.rb +10 -2
- data/test/unit/tags/page_files_test.rb +9 -1
- data/test/unit/tags/page_integer_test.rb +6 -0
- data/test/unit/tags/page_rich_text_test.rb +6 -0
- data/test/unit/tags/page_string_test.rb +6 -0
- data/test/unit/tags/page_text_test.rb +6 -0
- data/test/unit/view_methods_test.rb +21 -3
- metadata +5 -4
@@ -1,20 +1,20 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
|
3
3
|
class ComfortableMexicanSofa::Configuration
|
4
|
-
|
4
|
+
|
5
5
|
# Don't like ComfortableMexicanSofa? Set it to whatever you like. :(
|
6
6
|
attr_accessor :cms_title
|
7
|
-
|
7
|
+
|
8
8
|
# Module that will handle authentication to access cms-admin area
|
9
9
|
attr_accessor :admin_auth
|
10
|
-
|
10
|
+
|
11
11
|
# Module that will handle authentication for public pages
|
12
12
|
attr_accessor :public_auth
|
13
|
-
|
14
|
-
# Default url to access admin area is http://yourhost/cms-admin/
|
13
|
+
|
14
|
+
# Default url to access admin area is http://yourhost/cms-admin/
|
15
15
|
# You can change 'cms-admin' to 'admin', for example.
|
16
16
|
attr_accessor :admin_route_prefix
|
17
|
-
|
17
|
+
|
18
18
|
# When arriving at /cms-admin you may chose to redirect to arbirtary path,
|
19
19
|
# for example '/cms-admin/users'
|
20
20
|
attr_accessor :admin_route_redirect
|
@@ -22,59 +22,59 @@ class ComfortableMexicanSofa::Configuration
|
|
22
22
|
# Normally we include default routes from https://github.com/comfy/comfortable-mexican-sofa/blob/master/config/routes.rb
|
23
23
|
# If you want to include the routes manually set this to false
|
24
24
|
attr_accessor :use_default_routes
|
25
|
-
|
25
|
+
|
26
26
|
# /sitemap.xml that is used by search engines for indexing. It's enabled by
|
27
27
|
# default, but you may turn it off.
|
28
28
|
attr_accessor :enable_sitemap
|
29
|
-
|
29
|
+
|
30
30
|
# Upload settings
|
31
31
|
attr_accessor :upload_file_options
|
32
|
-
|
32
|
+
|
33
33
|
# With each page load, files will be synched with the database. Database entries are
|
34
34
|
# destroyed if there's no corresponding file. Fixtures are disabled by default.
|
35
35
|
attr_accessor :enable_fixtures
|
36
|
-
|
36
|
+
|
37
37
|
# Path where fixtures can be located.
|
38
38
|
attr_accessor :fixtures_path
|
39
|
-
|
39
|
+
|
40
40
|
# Number of revisions kept. Default is 25. If you wish to disable: set this to 0.
|
41
41
|
attr_accessor :revisions_limit
|
42
|
-
|
42
|
+
|
43
43
|
# Locale definitions. If you want to define your own locale merge
|
44
44
|
# {:locale => 'Locale Title'} with this.
|
45
45
|
attr_accessor :locales
|
46
|
-
|
46
|
+
|
47
47
|
# Admin interface will respect the locale of the site being managed. However you can
|
48
48
|
# force it to English by setting this to `:en`
|
49
49
|
attr_accessor :admin_locale
|
50
|
-
|
50
|
+
|
51
51
|
# Database prefix. If you want to keep your comfortable mexican sofa tables
|
52
52
|
# in a location other than the default databases add a database_config.
|
53
53
|
# Setting this to `cms` will look for a cms_#{Rails.env} database definition
|
54
54
|
# in your database.yml file
|
55
55
|
attr_accessor :database_config
|
56
|
-
|
56
|
+
|
57
57
|
# A class that is included as a sweeper to admin base controller if it's set
|
58
58
|
attr_accessor :admin_cache_sweeper
|
59
|
-
|
59
|
+
|
60
60
|
# Not allowing irb code to be run inside page content. False by default.
|
61
61
|
attr_accessor :allow_irb
|
62
|
-
|
62
|
+
|
63
63
|
# Whitelist of all helper methods that can be used via {{cms:helper}} tag. By default
|
64
64
|
# all helpers are allowed except `eval`, `send`, `call` and few others. Empty array
|
65
65
|
# will prevent rendering of all helpers.
|
66
66
|
attr_accessor :allowed_helpers
|
67
|
-
|
67
|
+
|
68
68
|
# Whitelist of partials paths that can be used via {{cms:partial}} tag. All partials
|
69
69
|
# are accessible by default. Empty array will prevent rendering of all partials.
|
70
70
|
attr_accessor :allowed_partials
|
71
71
|
|
72
|
-
# Site aliases, if you want to have aliases for your site. Good for harmonizing
|
72
|
+
# Site aliases, if you want to have aliases for your site. Good for harmonizing
|
73
73
|
# production env with dev/testing envs.
|
74
74
|
# e.g. config.site_aliases = {'host.com' => 'host.inv', 'host_a.com' => ['host.lvh.me', 'host.dev']}
|
75
75
|
# Default is nil (not used)
|
76
76
|
attr_accessor :hostname_aliases
|
77
|
-
|
77
|
+
|
78
78
|
# Configuration defaults
|
79
79
|
def initialize
|
80
80
|
@cms_title = 'ComfortableMexicanSofa CMS Engine'
|
@@ -89,13 +89,14 @@ class ComfortableMexicanSofa::Configuration
|
|
89
89
|
@enable_fixtures = false
|
90
90
|
@fixtures_path = File.expand_path('db/cms_fixtures', Rails.root)
|
91
91
|
@revisions_limit = 25
|
92
|
-
@locales = {
|
92
|
+
@locales = {
|
93
93
|
'en' => 'English',
|
94
94
|
'es' => 'Español',
|
95
95
|
'pt-BR' => 'Português Brasileiro',
|
96
96
|
'zh-CN' => '简体中文',
|
97
97
|
'ja' => '日本語',
|
98
|
-
'sv' => 'Svenska'
|
98
|
+
'sv' => 'Svenska',
|
99
|
+
'ru' => 'Русский'
|
99
100
|
}
|
100
101
|
@admin_locale = nil
|
101
102
|
@database_config = nil
|
@@ -105,5 +106,5 @@ class ComfortableMexicanSofa::Configuration
|
|
105
106
|
@allowed_partials = nil
|
106
107
|
@hostname_aliases = nil
|
107
108
|
end
|
108
|
-
|
109
|
+
|
109
110
|
end
|
@@ -10,10 +10,12 @@ require 'csv'
|
|
10
10
|
# end
|
11
11
|
module ComfortableMexicanSofa::Tag
|
12
12
|
|
13
|
-
TOKENIZER_REGEX
|
13
|
+
TOKENIZER_REGEX = /(\{\{\s*cms:[^{}]*\}\})|((?:\{?[^{])+|\{+)/
|
14
|
+
IDENTIFIER_REGEX = /\w+[\-\.\w]+\w+/
|
14
15
|
|
15
16
|
attr_accessor :page,
|
16
17
|
:identifier,
|
18
|
+
:namespace,
|
17
19
|
:params,
|
18
20
|
:parent
|
19
21
|
|
@@ -29,6 +31,8 @@ module ComfortableMexicanSofa::Tag
|
|
29
31
|
|
30
32
|
# Initializing tag object for a particular Tag type
|
31
33
|
# First capture group in the regex is the tag identifier
|
34
|
+
# Namespace is the string separated by a dot. So if identifier is:
|
35
|
+
# 'sidebar.about' namespace is: 'sidebar'
|
32
36
|
def initialize_tag(page, tag_signature)
|
33
37
|
if match = tag_signature.match(regex_tag_signature)
|
34
38
|
|
@@ -41,6 +45,7 @@ module ComfortableMexicanSofa::Tag
|
|
41
45
|
tag = self.new
|
42
46
|
tag.page = page
|
43
47
|
tag.identifier = match[1]
|
48
|
+
tag.namespace = (ns = tag.identifier.split('.')[0...-1].join('.')).blank?? nil : ns
|
44
49
|
tag.params = params
|
45
50
|
tag
|
46
51
|
end
|
@@ -8,7 +8,7 @@ class ComfortableMexicanSofa::Tag::Collection
|
|
8
8
|
# A more complete example of the above:
|
9
9
|
# {{ cms:collection:album:foo/my_album:albums/show:title:slug:param_a:param_b }}
|
10
10
|
def self.regex_tag_signature(identifier = nil)
|
11
|
-
identifier ||=
|
11
|
+
identifier ||= IDENTIFIER_REGEX
|
12
12
|
/\{\{\s*cms:collection:(#{identifier}):(.*?)\s*\}\}/
|
13
13
|
end
|
14
14
|
|
@@ -6,7 +6,7 @@ class ComfortableMexicanSofa::Tag::PageFile
|
|
6
6
|
# Simple tag can be:
|
7
7
|
# {{ cms:page_file:some_label }}
|
8
8
|
def self.regex_tag_signature(identifier = nil)
|
9
|
-
identifier ||=
|
9
|
+
identifier ||= IDENTIFIER_REGEX
|
10
10
|
/\{\{\s*cms:page_file:(#{identifier}):?(.*?)\s*\}\}/
|
11
11
|
end
|
12
12
|
|
@@ -35,7 +35,16 @@ module ComfortableMexicanSofa::ViewMethods
|
|
35
35
|
def cms_page_content(identifier, page = nil)
|
36
36
|
return '' unless page ||= @cms_page
|
37
37
|
return '' unless block = page.blocks.find_by_identifier(identifier)
|
38
|
-
|
38
|
+
# If block is a page_file(s) we will return objects instead of attempting
|
39
|
+
# to render them out
|
40
|
+
case block.tag
|
41
|
+
when ComfortableMexicanSofa::Tag::PageFile
|
42
|
+
block.files.first
|
43
|
+
when ComfortableMexicanSofa::Tag::PageFiles
|
44
|
+
block.files
|
45
|
+
else
|
46
|
+
render :inline => ComfortableMexicanSofa::Tag.process_content(page, block.content)
|
47
|
+
end
|
39
48
|
end
|
40
49
|
end
|
41
50
|
|
@@ -47,7 +47,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
|
|
47
47
|
end
|
48
48
|
|
49
49
|
def test_get_new_with_field_datetime
|
50
|
-
cms_layouts(:default).
|
50
|
+
cms_layouts(:default).update_column(:content, '{{cms:field:test_label:datetime}}')
|
51
51
|
get :new, :site_id => cms_sites(:default)
|
52
52
|
assert_response :success
|
53
53
|
assert_select "input[type='text'][name='page[blocks_attributes][0][content]'][class='datetime']"
|
@@ -55,7 +55,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
|
|
55
55
|
end
|
56
56
|
|
57
57
|
def test_get_new_with_field_integer
|
58
|
-
cms_layouts(:default).
|
58
|
+
cms_layouts(:default).update_column(:content, '{{cms:field:test_label:integer}}')
|
59
59
|
get :new, :site_id => cms_sites(:default)
|
60
60
|
assert_response :success
|
61
61
|
assert_select "input[type='number'][name='page[blocks_attributes][0][content]']"
|
@@ -63,7 +63,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
|
|
63
63
|
end
|
64
64
|
|
65
65
|
def test_get_new_with_field_string
|
66
|
-
cms_layouts(:default).
|
66
|
+
cms_layouts(:default).update_column(:content, '{{cms:field:test_label:string}}')
|
67
67
|
get :new, :site_id => cms_sites(:default)
|
68
68
|
assert_response :success
|
69
69
|
assert_select "input[type='text'][name='page[blocks_attributes][0][content]']"
|
@@ -71,7 +71,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
|
|
71
71
|
end
|
72
72
|
|
73
73
|
def test_get_new_with_field_text
|
74
|
-
cms_layouts(:default).
|
74
|
+
cms_layouts(:default).update_column(:content, '{{cms:field:test_label:text}}')
|
75
75
|
get :new, :site_id => cms_sites(:default)
|
76
76
|
assert_response :success
|
77
77
|
assert_select "textarea[name='page[blocks_attributes][0][content]'][class='code']"
|
@@ -79,7 +79,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
|
|
79
79
|
end
|
80
80
|
|
81
81
|
def test_get_new_with_field_rich_text
|
82
|
-
cms_layouts(:default).
|
82
|
+
cms_layouts(:default).update_column(:content, '{{cms:field:test_label:rich_text}}')
|
83
83
|
get :new, :site_id => cms_sites(:default)
|
84
84
|
assert_response :success
|
85
85
|
assert_select "textarea[name='page[blocks_attributes][0][content]'][class='rich_text']"
|
@@ -87,7 +87,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
|
|
87
87
|
end
|
88
88
|
|
89
89
|
def test_get_new_with_page_datetime
|
90
|
-
cms_layouts(:default).
|
90
|
+
cms_layouts(:default).update_column(:content, '{{cms:page:test_label:datetime}}')
|
91
91
|
get :new, :site_id => cms_sites(:default)
|
92
92
|
assert_response :success
|
93
93
|
assert_select "input[type='text'][name='page[blocks_attributes][0][content]'][class='datetime']"
|
@@ -95,7 +95,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
|
|
95
95
|
end
|
96
96
|
|
97
97
|
def test_get_new_with_page_integer
|
98
|
-
cms_layouts(:default).
|
98
|
+
cms_layouts(:default).update_column(:content, '{{cms:page:test_label:integer}}')
|
99
99
|
get :new, :site_id => cms_sites(:default)
|
100
100
|
assert_response :success
|
101
101
|
assert_select "input[type='number'][name='page[blocks_attributes][0][content]']"
|
@@ -103,7 +103,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
|
|
103
103
|
end
|
104
104
|
|
105
105
|
def test_get_new_with_page_string
|
106
|
-
cms_layouts(:default).
|
106
|
+
cms_layouts(:default).update_column(:content, '{{cms:page:test_label:string}}')
|
107
107
|
get :new, :site_id => cms_sites(:default)
|
108
108
|
assert_response :success
|
109
109
|
assert_select "input[type='text'][name='page[blocks_attributes][0][content]']"
|
@@ -111,7 +111,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
|
|
111
111
|
end
|
112
112
|
|
113
113
|
def test_get_new_with_page_text
|
114
|
-
cms_layouts(:default).
|
114
|
+
cms_layouts(:default).update_column(:content, '{{cms:page:test_label}}')
|
115
115
|
get :new, :site_id => cms_sites(:default)
|
116
116
|
assert_response :success
|
117
117
|
assert_select "textarea[name='page[blocks_attributes][0][content]'][class='code']"
|
@@ -119,7 +119,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
|
|
119
119
|
end
|
120
120
|
|
121
121
|
def test_get_new_with_page_file
|
122
|
-
cms_layouts(:default).
|
122
|
+
cms_layouts(:default).update_column(:content, '{{cms:page_file:test_label}}')
|
123
123
|
get :new, :site_id => cms_sites(:default)
|
124
124
|
assert_response :success
|
125
125
|
assert_select "input[type='file'][name='page[blocks_attributes][0][content]']"
|
@@ -127,7 +127,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
|
|
127
127
|
end
|
128
128
|
|
129
129
|
def test_get_new_with_page_files
|
130
|
-
cms_layouts(:default).
|
130
|
+
cms_layouts(:default).update_column(:content, '{{cms:page_files:test_label}}')
|
131
131
|
get :new, :site_id => cms_sites(:default)
|
132
132
|
assert_response :success
|
133
133
|
assert_select "input[type='file'][name='page[blocks_attributes][0][content][]'][multiple=multiple]"
|
@@ -136,7 +136,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
|
|
136
136
|
|
137
137
|
def test_get_new_with_collection
|
138
138
|
snippet = cms_snippets(:default)
|
139
|
-
cms_layouts(:default).
|
139
|
+
cms_layouts(:default).update_column(:content, '{{cms:collection:snippet:cms/snippet}}')
|
140
140
|
get :new, :site_id => cms_sites(:default)
|
141
141
|
assert_response :success
|
142
142
|
assert_select "select[name='page[blocks_attributes][0][content]']" do
|
@@ -147,7 +147,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
|
|
147
147
|
end
|
148
148
|
|
149
149
|
def test_get_new_with_page_rich_text
|
150
|
-
cms_layouts(:default).
|
150
|
+
cms_layouts(:default).update_column(:content, '{{cms:page:test_label:rich_text}}')
|
151
151
|
get :new, :site_id => cms_sites(:default)
|
152
152
|
assert_response :success
|
153
153
|
assert_select "textarea[name='page[blocks_attributes][0][content]'][class='rich_text']"
|
@@ -155,7 +155,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
|
|
155
155
|
end
|
156
156
|
|
157
157
|
def test_get_new_with_several_tag_fields
|
158
|
-
cms_layouts(:default).
|
158
|
+
cms_layouts(:default).update_column(:content, '{{cms:page:label_a}}{{cms:page:label_b}}')
|
159
159
|
get :new, :site_id => cms_sites(:default)
|
160
160
|
assert_response :success
|
161
161
|
assert_select "textarea[name='page[blocks_attributes][0][content]']"
|
@@ -165,13 +165,13 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
|
|
165
165
|
end
|
166
166
|
|
167
167
|
def test_get_new_with_crashy_tag
|
168
|
-
cms_layouts(:default).
|
168
|
+
cms_layouts(:default).update_column(:content, '{{cms:collection:label:invalid}}')
|
169
169
|
get :new, :site_id => cms_sites(:default)
|
170
170
|
assert_response :success
|
171
171
|
end
|
172
172
|
|
173
173
|
def test_get_new_with_repeated_tag
|
174
|
-
cms_layouts(:default).
|
174
|
+
cms_layouts(:default).update_column(:content, '{{cms:page:test_label}}{{cms:page:test_label}}')
|
175
175
|
get :new, :site_id => cms_sites(:default)
|
176
176
|
assert_response :success
|
177
177
|
assert_select "textarea[name='page[blocks_attributes][0][content]'][class='code']"
|
@@ -207,7 +207,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
|
|
207
207
|
|
208
208
|
def test_get_edit_with_blank_layout
|
209
209
|
page = cms_pages(:default)
|
210
|
-
page.
|
210
|
+
page.update_column(:layout_id, nil)
|
211
211
|
get :edit, :site_id => page.site, :id => page
|
212
212
|
assert_response :success
|
213
213
|
assert assigns(:page)
|
@@ -216,7 +216,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
|
|
216
216
|
|
217
217
|
def test_get_edit_with_non_english_locale
|
218
218
|
site = cms_sites(:default)
|
219
|
-
site.
|
219
|
+
site.update_column(:locale, 'es')
|
220
220
|
get :edit, :site_id => site, :id => cms_pages(:default)
|
221
221
|
assert_response :success
|
222
222
|
end
|