comfortable_mexican_sofa 1.6.26 → 1.6.30

Sign up to get free protection for your applications and to get access to all the features.
@@ -0,0 +1,14 @@
1
+ .bundle
2
+ db/*.sqlite3
3
+ log/*.log
4
+ tmp/**/*
5
+ .DS_Store
6
+ db/schema.rb
7
+ db/development_structure.sql
8
+ pkg
9
+ rdoc
10
+ /tmp
11
+ public/*
12
+ Gemfile.lock
13
+ .rvmrc
14
+ /coverage
data/Gemfile CHANGED
@@ -1,10 +1,7 @@
1
1
  source 'http://rubygems.org'
2
2
 
3
- gem 'rails', '>= 3.0.0'
4
- gem 'active_link_to', '~> 1.0.0'
5
- gem 'paperclip', '>= 2.3.0'
3
+ gemfile
6
4
 
7
5
  group :test do
8
6
  gem 'sqlite3'
9
- gem 'jeweler'
10
7
  end
data/Rakefile CHANGED
@@ -1,23 +1,5 @@
1
- # Add your own tasks in files placed in lib/tasks ending in .rake,
2
- # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
3
-
4
1
  require File.expand_path('../config/application', __FILE__)
5
2
  require 'rubygems'
6
3
  require 'rake'
7
4
 
8
5
  ComfortableMexicanSofa::Application.load_tasks
9
-
10
- begin
11
- require 'jeweler'
12
- Jeweler::Tasks.new do |gem|
13
- gem.name = 'comfortable_mexican_sofa'
14
- gem.summary = 'ComfortableMexicanSofa is a powerful CMS Engine for Ruby on Rails 3 applications'
15
- gem.description = ''
16
- gem.email = 'oleg@theworkinggroup.ca'
17
- gem.homepage = 'http://github.com/comfy/comfortable-mexican-sofa'
18
- gem.authors = ['Oleg Khabarov', 'The Working Group Inc']
19
- end
20
- Jeweler::GemcutterTasks.new
21
- rescue LoadError
22
- puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
23
- end
@@ -50,7 +50,7 @@ class Cms::Site < ActiveRecord::Base
50
50
  Cms::Site.find_all_by_hostname(real_host_from_aliases(host)).each do |site|
51
51
  if site.path.blank?
52
52
  cms_site = site
53
- elsif "#{path}/".match /^\/#{Regexp.escape(site.path.to_s)}\//
53
+ elsif "#{path.to_s.split('?')[0]}/".match /^\/#{Regexp.escape(site.path.to_s)}\//
54
54
  cms_site = site
55
55
  break
56
56
  end
@@ -1,351 +1,23 @@
1
- # Generated by jeweler
2
- # DO NOT EDIT THIS FILE DIRECTLY
3
- # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
4
- # -*- encoding: utf-8 -*-
1
+ # encoding: utf-8
5
2
 
6
- Gem::Specification.new do |s|
7
- s.name = "comfortable_mexican_sofa"
8
- s.version = "1.6.26"
9
-
10
- s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
- s.authors = ["Oleg Khabarov", "The Working Group Inc"]
12
- s.date = "2013-01-24"
13
- s.description = ""
14
- s.email = "oleg@theworkinggroup.ca"
15
- s.extra_rdoc_files = [
16
- "LICENSE",
17
- "README.md"
18
- ]
19
- s.files = [
20
- ".travis.yml",
21
- "Gemfile",
22
- "LICENSE",
23
- "README.md",
24
- "Rakefile",
25
- "VERSION",
26
- "app/assets/images/comfortable_mexican_sofa/arrow_bottom.gif",
27
- "app/assets/images/comfortable_mexican_sofa/arrow_right.gif",
28
- "app/assets/images/comfortable_mexican_sofa/checkerboard.gif",
29
- "app/assets/images/comfortable_mexican_sofa/elrte/elrte-toolbar.png",
30
- "app/assets/images/comfortable_mexican_sofa/elrte/google-maps.png",
31
- "app/assets/images/comfortable_mexican_sofa/elrte/iframe.png",
32
- "app/assets/images/comfortable_mexican_sofa/elrte/media-director.png",
33
- "app/assets/images/comfortable_mexican_sofa/elrte/media-flash.png",
34
- "app/assets/images/comfortable_mexican_sofa/elrte/media-quicktime.png",
35
- "app/assets/images/comfortable_mexican_sofa/elrte/media-realaudio.png",
36
- "app/assets/images/comfortable_mexican_sofa/elrte/media-rutube.png",
37
- "app/assets/images/comfortable_mexican_sofa/elrte/media-vimeo.png",
38
- "app/assets/images/comfortable_mexican_sofa/elrte/media-winmedia.png",
39
- "app/assets/images/comfortable_mexican_sofa/elrte/media-youtube.png",
40
- "app/assets/images/comfortable_mexican_sofa/elrte/outline-div.png",
41
- "app/assets/images/comfortable_mexican_sofa/elrte/outline-p.png",
42
- "app/assets/images/comfortable_mexican_sofa/elrte/pagebreak.gif",
43
- "app/assets/images/comfortable_mexican_sofa/elrte/pixel.gif",
44
- "app/assets/images/comfortable_mexican_sofa/elrte/smileys/evilgrin.png",
45
- "app/assets/images/comfortable_mexican_sofa/elrte/smileys/grin.png",
46
- "app/assets/images/comfortable_mexican_sofa/elrte/smileys/happy.png",
47
- "app/assets/images/comfortable_mexican_sofa/elrte/smileys/smile.png",
48
- "app/assets/images/comfortable_mexican_sofa/elrte/smileys/surprised.png",
49
- "app/assets/images/comfortable_mexican_sofa/elrte/smileys/tongue.png",
50
- "app/assets/images/comfortable_mexican_sofa/elrte/smileys/unhappy.png",
51
- "app/assets/images/comfortable_mexican_sofa/elrte/smileys/waii.png",
52
- "app/assets/images/comfortable_mexican_sofa/elrte/smileys/wink.png",
53
- "app/assets/images/comfortable_mexican_sofa/icon_draft.gif",
54
- "app/assets/images/comfortable_mexican_sofa/icon_layout.gif",
55
- "app/assets/images/comfortable_mexican_sofa/icon_move.gif",
56
- "app/assets/images/comfortable_mexican_sofa/icon_regular.gif",
57
- "app/assets/images/comfortable_mexican_sofa/icon_snippet.gif",
58
- "app/assets/images/comfortable_mexican_sofa/jquery_ui/ui-bg_flat_0_aaaaaa_40x100.png",
59
- "app/assets/images/comfortable_mexican_sofa/jquery_ui/ui-bg_flat_75_ffffff_40x100.png",
60
- "app/assets/images/comfortable_mexican_sofa/jquery_ui/ui-bg_glass_55_fbf9ee_1x400.png",
61
- "app/assets/images/comfortable_mexican_sofa/jquery_ui/ui-bg_glass_65_ffffff_1x400.png",
62
- "app/assets/images/comfortable_mexican_sofa/jquery_ui/ui-bg_glass_75_dadada_1x400.png",
63
- "app/assets/images/comfortable_mexican_sofa/jquery_ui/ui-bg_glass_75_e6e6e6_1x400.png",
64
- "app/assets/images/comfortable_mexican_sofa/jquery_ui/ui-bg_glass_95_fef1ec_1x400.png",
65
- "app/assets/images/comfortable_mexican_sofa/jquery_ui/ui-bg_highlight-soft_75_cccccc_1x100.png",
66
- "app/assets/images/comfortable_mexican_sofa/jquery_ui/ui-bg_inset-soft_95_fef1ec_1x100.png",
67
- "app/assets/images/comfortable_mexican_sofa/jquery_ui/ui-icons_222222_256x240.png",
68
- "app/assets/images/comfortable_mexican_sofa/jquery_ui/ui-icons_2e83ff_256x240.png",
69
- "app/assets/images/comfortable_mexican_sofa/jquery_ui/ui-icons_454545_256x240.png",
70
- "app/assets/images/comfortable_mexican_sofa/jquery_ui/ui-icons_888888_256x240.png",
71
- "app/assets/images/comfortable_mexican_sofa/jquery_ui/ui-icons_cd0a0a_256x240.png",
72
- "app/assets/images/comfortable_mexican_sofa/nav_arrow.png",
73
- "app/assets/images/comfortable_mexican_sofa/x.png",
74
- "app/assets/javascripts/comfortable_mexican_sofa/application.js",
75
- "app/assets/javascripts/comfortable_mexican_sofa/codemirror/codemirror.js",
76
- "app/assets/javascripts/comfortable_mexican_sofa/elrte/elrte.codemirror.js",
77
- "app/assets/javascripts/comfortable_mexican_sofa/elrte/elrte.js",
78
- "app/assets/javascripts/comfortable_mexican_sofa/elrte/elrte.sofa_image.js",
79
- "app/assets/javascripts/comfortable_mexican_sofa/elrte/elrte.sofa_link.js",
80
- "app/assets/javascripts/comfortable_mexican_sofa/jquery.js",
81
- "app/assets/javascripts/comfortable_mexican_sofa/jquery_ui.js",
82
- "app/assets/javascripts/comfortable_mexican_sofa/jquery_ui_timepicker.js",
83
- "app/assets/javascripts/comfortable_mexican_sofa/rails.js",
84
- "app/assets/stylesheets/comfortable_mexican_sofa/application.css",
85
- "app/assets/stylesheets/comfortable_mexican_sofa/codemirror.css",
86
- "app/assets/stylesheets/comfortable_mexican_sofa/content.css",
87
- "app/assets/stylesheets/comfortable_mexican_sofa/dialogs.css",
88
- "app/assets/stylesheets/comfortable_mexican_sofa/elrte.css",
89
- "app/assets/stylesheets/comfortable_mexican_sofa/files.css",
90
- "app/assets/stylesheets/comfortable_mexican_sofa/form.css",
91
- "app/assets/stylesheets/comfortable_mexican_sofa/jquery_ui.css",
92
- "app/assets/stylesheets/comfortable_mexican_sofa/reset.css",
93
- "app/assets/stylesheets/comfortable_mexican_sofa/structure.css",
94
- "app/assets/stylesheets/comfortable_mexican_sofa/typography.css",
95
- "app/assets/stylesheets/comfortable_mexican_sofa/widgets.css",
96
- "app/controllers/application_controller.rb",
97
- "app/controllers/cms_admin/base_controller.rb",
98
- "app/controllers/cms_admin/categories_controller.rb",
99
- "app/controllers/cms_admin/dialogs_controller.rb",
100
- "app/controllers/cms_admin/files_controller.rb",
101
- "app/controllers/cms_admin/layouts_controller.rb",
102
- "app/controllers/cms_admin/pages_controller.rb",
103
- "app/controllers/cms_admin/revisions_controller.rb",
104
- "app/controllers/cms_admin/sites_controller.rb",
105
- "app/controllers/cms_admin/snippets_controller.rb",
106
- "app/controllers/cms_content_controller.rb",
107
- "app/models/cms/block.rb",
108
- "app/models/cms/categorization.rb",
109
- "app/models/cms/category.rb",
110
- "app/models/cms/file.rb",
111
- "app/models/cms/layout.rb",
112
- "app/models/cms/page.rb",
113
- "app/models/cms/revision.rb",
114
- "app/models/cms/site.rb",
115
- "app/models/cms/snippet.rb",
116
- "app/views/cms_admin/categories/_categories.html.erb",
117
- "app/views/cms_admin/categories/_edit.html.erb",
118
- "app/views/cms_admin/categories/_form.html.erb",
119
- "app/views/cms_admin/categories/_index.html.erb",
120
- "app/views/cms_admin/categories/_show.html.erb",
121
- "app/views/cms_admin/categories/create.js.erb",
122
- "app/views/cms_admin/categories/destroy.js.erb",
123
- "app/views/cms_admin/categories/edit.js.erb",
124
- "app/views/cms_admin/categories/update.js.erb",
125
- "app/views/cms_admin/dialogs/image.html.erb",
126
- "app/views/cms_admin/dialogs/link.html.erb",
127
- "app/views/cms_admin/files/_file.html.erb",
128
- "app/views/cms_admin/files/_form.html.erb",
129
- "app/views/cms_admin/files/_index.html.erb",
130
- "app/views/cms_admin/files/_page_form.html.erb",
131
- "app/views/cms_admin/files/create.js.erb",
132
- "app/views/cms_admin/files/destroy.js.erb",
133
- "app/views/cms_admin/files/edit.html.erb",
134
- "app/views/cms_admin/files/index.html.erb",
135
- "app/views/cms_admin/files/new.html.erb",
136
- "app/views/cms_admin/layouts/_form.html.erb",
137
- "app/views/cms_admin/layouts/_index_branch.html.erb",
138
- "app/views/cms_admin/layouts/edit.html.erb",
139
- "app/views/cms_admin/layouts/index.html.erb",
140
- "app/views/cms_admin/layouts/new.html.erb",
141
- "app/views/cms_admin/pages/_form.html.erb",
142
- "app/views/cms_admin/pages/_form_blocks.html.erb",
143
- "app/views/cms_admin/pages/_index_branch.html.erb",
144
- "app/views/cms_admin/pages/edit.html.erb",
145
- "app/views/cms_admin/pages/form_blocks.js.erb",
146
- "app/views/cms_admin/pages/index.html.erb",
147
- "app/views/cms_admin/pages/new.html.erb",
148
- "app/views/cms_admin/pages/toggle_branch.js.erb",
149
- "app/views/cms_admin/revisions/show.html.erb",
150
- "app/views/cms_admin/sites/_form.html.erb",
151
- "app/views/cms_admin/sites/_mirrors.html.erb",
152
- "app/views/cms_admin/sites/edit.html.erb",
153
- "app/views/cms_admin/sites/index.html.erb",
154
- "app/views/cms_admin/sites/new.html.erb",
155
- "app/views/cms_admin/snippets/_form.html.erb",
156
- "app/views/cms_admin/snippets/edit.html.erb",
157
- "app/views/cms_admin/snippets/index.html.erb",
158
- "app/views/cms_admin/snippets/new.html.erb",
159
- "app/views/cms_content/render_sitemap.xml.builder",
160
- "app/views/layouts/cms_admin.html.erb",
161
- "app/views/layouts/cms_admin/_body.html.erb",
162
- "app/views/layouts/cms_admin/_center.html.erb",
163
- "app/views/layouts/cms_admin/_head.html.erb",
164
- "app/views/layouts/cms_admin/_left.html.erb",
165
- "app/views/layouts/cms_admin/_right.html.erb",
166
- "comfortable_mexican_sofa.gemspec",
167
- "config.ru",
168
- "config/application.rb",
169
- "config/boot.rb",
170
- "config/database.yml",
171
- "config/environment.rb",
172
- "config/environments/development.rb",
173
- "config/environments/production.rb",
174
- "config/environments/test.rb",
175
- "config/initializers/comfortable_mexican_sofa.rb",
176
- "config/initializers/paperclip.rb",
177
- "config/locales/de.yml",
178
- "config/locales/en.yml",
179
- "config/locales/es.yml",
180
- "config/locales/fr.yml",
181
- "config/locales/ja.yml",
182
- "config/locales/pl.yml",
183
- "config/locales/pt-BR.yml",
184
- "config/locales/ru.yml",
185
- "config/locales/sv.yml",
186
- "config/locales/zh-CN.yml",
187
- "config/routes.rb",
188
- "db/cms_fixtures/sample-site/layouts/default/_default.yml",
189
- "db/cms_fixtures/sample-site/layouts/default/content.html",
190
- "db/cms_fixtures/sample-site/layouts/default/css.css",
191
- "db/cms_fixtures/sample-site/layouts/default/js.js",
192
- "db/cms_fixtures/sample-site/layouts/default/nested/_nested.yml",
193
- "db/cms_fixtures/sample-site/layouts/default/nested/content.html",
194
- "db/cms_fixtures/sample-site/layouts/default/nested/css.css",
195
- "db/cms_fixtures/sample-site/layouts/default/nested/js.js",
196
- "db/cms_fixtures/sample-site/pages/index/_index.yml",
197
- "db/cms_fixtures/sample-site/pages/index/child/_child.yml",
198
- "db/cms_fixtures/sample-site/pages/index/child/left.html",
199
- "db/cms_fixtures/sample-site/pages/index/child/right.html",
200
- "db/cms_fixtures/sample-site/pages/index/content.html",
201
- "db/cms_fixtures/sample-site/snippets/default/_default.yml",
202
- "db/cms_fixtures/sample-site/snippets/default/content.html",
203
- "db/migrate/01_create_cms.rb",
204
- "db/seeds.rb",
205
- "db/upgrade_migrations/02_upgrade_to_1_1_0.rb",
206
- "db/upgrade_migrations/03_upgrade_to_1_2_0.rb",
207
- "db/upgrade_migrations/04_upgrade_to_1_3_0.rb",
208
- "db/upgrade_migrations/05_upgrade_to_1_4_0.rb",
209
- "db/upgrade_migrations/06_upgrade_to_1_5_0.rb",
210
- "db/upgrade_migrations/07_upgrade_to_1_6_0.rb",
211
- "doc/preview.png",
212
- "doc/sofa.png",
213
- "lib/comfortable_mexican_sofa.rb",
214
- "lib/comfortable_mexican_sofa/authentication/dummy_auth.rb",
215
- "lib/comfortable_mexican_sofa/authentication/http_auth.rb",
216
- "lib/comfortable_mexican_sofa/configuration.rb",
217
- "lib/comfortable_mexican_sofa/engine.rb",
218
- "lib/comfortable_mexican_sofa/error.rb",
219
- "lib/comfortable_mexican_sofa/extensions/acts_as_tree.rb",
220
- "lib/comfortable_mexican_sofa/extensions/has_revisions.rb",
221
- "lib/comfortable_mexican_sofa/extensions/is_categorized.rb",
222
- "lib/comfortable_mexican_sofa/extensions/is_mirrored.rb",
223
- "lib/comfortable_mexican_sofa/extensions/rails.rb",
224
- "lib/comfortable_mexican_sofa/fixtures.rb",
225
- "lib/comfortable_mexican_sofa/form_builder.rb",
226
- "lib/comfortable_mexican_sofa/render_methods.rb",
227
- "lib/comfortable_mexican_sofa/sitemap.rb",
228
- "lib/comfortable_mexican_sofa/tag.rb",
229
- "lib/comfortable_mexican_sofa/tags/asset.rb",
230
- "lib/comfortable_mexican_sofa/tags/collection.rb",
231
- "lib/comfortable_mexican_sofa/tags/field_datetime.rb",
232
- "lib/comfortable_mexican_sofa/tags/field_integer.rb",
233
- "lib/comfortable_mexican_sofa/tags/field_rich_text.rb",
234
- "lib/comfortable_mexican_sofa/tags/field_string.rb",
235
- "lib/comfortable_mexican_sofa/tags/field_text.rb",
236
- "lib/comfortable_mexican_sofa/tags/file.rb",
237
- "lib/comfortable_mexican_sofa/tags/helper.rb",
238
- "lib/comfortable_mexican_sofa/tags/page_datetime.rb",
239
- "lib/comfortable_mexican_sofa/tags/page_file.rb",
240
- "lib/comfortable_mexican_sofa/tags/page_files.rb",
241
- "lib/comfortable_mexican_sofa/tags/page_integer.rb",
242
- "lib/comfortable_mexican_sofa/tags/page_rich_text.rb",
243
- "lib/comfortable_mexican_sofa/tags/page_string.rb",
244
- "lib/comfortable_mexican_sofa/tags/page_text.rb",
245
- "lib/comfortable_mexican_sofa/tags/partial.rb",
246
- "lib/comfortable_mexican_sofa/tags/snippet.rb",
247
- "lib/comfortable_mexican_sofa/version.rb",
248
- "lib/comfortable_mexican_sofa/view_hooks.rb",
249
- "lib/comfortable_mexican_sofa/view_methods.rb",
250
- "lib/generators/comfy/cms/README",
251
- "lib/generators/comfy/cms/cms_generator.rb",
252
- "lib/tasks/comfortable_mexican_sofa.rake",
253
- "script/rails",
254
- "test/fixtures/cms/blocks.yml",
255
- "test/fixtures/cms/categories.yml",
256
- "test/fixtures/cms/categorizations.yml",
257
- "test/fixtures/cms/files.yml",
258
- "test/fixtures/cms/layouts.yml",
259
- "test/fixtures/cms/pages.yml",
260
- "test/fixtures/cms/revisions.yml",
261
- "test/fixtures/cms/sites.yml",
262
- "test/fixtures/cms/snippets.yml",
263
- "test/fixtures/files/data.zip",
264
- "test/fixtures/files/document.pdf",
265
- "test/fixtures/files/image.gif",
266
- "test/fixtures/files/image.jpg",
267
- "test/fixtures/views/_nav_hook.html.erb",
268
- "test/fixtures/views/_nav_hook_2.html.erb",
269
- "test/fixtures/views/render_test/_test.html.erb",
270
- "test/fixtures/views/render_test/new.html.erb",
271
- "test/fixtures/views/render_test/render_layout.html.erb",
272
- "test/functional/cms_admin/base_controller_test.rb",
273
- "test/functional/cms_admin/categories_controller_test.rb",
274
- "test/functional/cms_admin/dialogs_controller_test.rb",
275
- "test/functional/cms_admin/files_controller_test.rb",
276
- "test/functional/cms_admin/layouts_controller_test.rb",
277
- "test/functional/cms_admin/pages_controller_test.rb",
278
- "test/functional/cms_admin/revisions_controller_test.rb",
279
- "test/functional/cms_admin/sites_controller_test.rb",
280
- "test/functional/cms_admin/snippets_controller_test.rb",
281
- "test/functional/cms_content_controller_test.rb",
282
- "test/gemfiles/Gemfile.rails.3.0",
283
- "test/gemfiles/Gemfile.rails.3.1",
284
- "test/gemfiles/Gemfile.rails.3.2",
285
- "test/integration/authentication_test.rb",
286
- "test/integration/fixtures_test.rb",
287
- "test/integration/mirrors_test.rb",
288
- "test/integration/render_cms_test.rb",
289
- "test/integration/routing_extensions_test.rb",
290
- "test/integration/sites_test.rb",
291
- "test/integration/view_hooks_test.rb",
292
- "test/test_helper.rb",
293
- "test/unit/configuration_test.rb",
294
- "test/unit/fixtures_test.rb",
295
- "test/unit/form_builder_test.rb",
296
- "test/unit/mirrors_test.rb",
297
- "test/unit/models/block_test.rb",
298
- "test/unit/models/categorization_test.rb",
299
- "test/unit/models/category_test.rb",
300
- "test/unit/models/file_test.rb",
301
- "test/unit/models/layout_test.rb",
302
- "test/unit/models/page_test.rb",
303
- "test/unit/models/site_test.rb",
304
- "test/unit/models/snippet_test.rb",
305
- "test/unit/revisions_test.rb",
306
- "test/unit/sitemap_test.rb",
307
- "test/unit/tag_test.rb",
308
- "test/unit/tags/asset_test.rb",
309
- "test/unit/tags/collection_test.rb",
310
- "test/unit/tags/field_datetime_test.rb",
311
- "test/unit/tags/field_integer_test.rb",
312
- "test/unit/tags/field_rich_text_test.rb",
313
- "test/unit/tags/field_string_test.rb",
314
- "test/unit/tags/field_text_test.rb",
315
- "test/unit/tags/file_test.rb",
316
- "test/unit/tags/helper_test.rb",
317
- "test/unit/tags/page_datetime_test.rb",
318
- "test/unit/tags/page_file_test.rb",
319
- "test/unit/tags/page_files_test.rb",
320
- "test/unit/tags/page_integer_test.rb",
321
- "test/unit/tags/page_rich_text_test.rb",
322
- "test/unit/tags/page_string_test.rb",
323
- "test/unit/tags/page_text_test.rb",
324
- "test/unit/tags/partial_test.rb",
325
- "test/unit/tags/snippet_test.rb",
326
- "test/unit/view_methods_test.rb"
327
- ]
328
- s.homepage = "http://github.com/comfy/comfortable-mexican-sofa"
329
- s.require_paths = ["lib"]
330
- s.rubygems_version = "1.8.23"
331
- s.summary = "ComfortableMexicanSofa is a powerful CMS Engine for Ruby on Rails 3 applications"
332
-
333
- if s.respond_to? :specification_version then
334
- s.specification_version = 3
335
-
336
- if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
337
- s.add_runtime_dependency(%q<rails>, [">= 3.0.0"])
338
- s.add_runtime_dependency(%q<active_link_to>, ["~> 1.0.0"])
339
- s.add_runtime_dependency(%q<paperclip>, [">= 2.3.0"])
340
- else
341
- s.add_dependency(%q<rails>, [">= 3.0.0"])
342
- s.add_dependency(%q<active_link_to>, ["~> 1.0.0"])
343
- s.add_dependency(%q<paperclip>, [">= 2.3.0"])
344
- end
345
- else
346
- s.add_dependency(%q<rails>, [">= 3.0.0"])
347
- s.add_dependency(%q<active_link_to>, ["~> 1.0.0"])
348
- s.add_dependency(%q<paperclip>, [">= 2.3.0"])
349
- end
350
- end
3
+ $:.unshift File.expand_path('../lib', __FILE__)
4
+ require 'comfortable_mexican_sofa/version'
351
5
 
6
+ Gem::Specification.new do |s|
7
+ s.name = "comfortable_mexican_sofa"
8
+ s.version = ComfortableMexicanSofa::VERSION
9
+ s.authors = ["Oleg Khabarov", "The Working Group Inc"]
10
+ s.email = ["oleg@khabarov.ca"]
11
+ s.homepage = "http://github.com/comfy/comfortable-mexican-sofa"
12
+ s.summary = "CMS Engine for Rails 3 apps"
13
+ s.description = "CMS Engine for Rails 3 apps"
14
+
15
+ s.files = `git ls-files`.split("\n")
16
+ s.platform = Gem::Platform::RUBY
17
+ s.require_paths = ['lib']
18
+ s.rubyforge_project = '[none]'
19
+
20
+ s.add_dependency 'rails', '>= 3.0.0'
21
+ s.add_dependency 'active_link_to', '~> 1.0.0'
22
+ s.add_dependency 'paperclip', '>= 2.3.0'
23
+ end
@@ -1,7 +1,3 @@
1
1
  module ComfortableMexicanSofa
2
- VERSION = begin
3
- IO.read(File.join(File.dirname(__FILE__), '/../../VERSION')).chomp
4
- rescue
5
- 'UNKNOWN'
6
- end
2
+ VERSION = "1.6.30"
7
3
  end
@@ -123,11 +123,15 @@ class CmsSiteTest < ActiveSupport::TestCase
123
123
  assert_equal nil, Cms::Site.find_site('test2.host')
124
124
  assert_equal nil, Cms::Site.find_site('test2.host', '/some/path')
125
125
  assert_equal site_b, Cms::Site.find_site('test2.host', '/en')
126
+ assert_equal site_b, Cms::Site.find_site('test2.host', '/en?a=b')
126
127
  assert_equal site_b, Cms::Site.find_site('test2.host', '/en/some/path')
128
+ assert_equal site_b, Cms::Site.find_site('test2.host', '/en/some/path?a=b')
127
129
  assert_equal nil, Cms::Site.find_site('test2.host', '/english/some/path')
128
130
 
129
131
  assert_equal site_c, Cms::Site.find_site('test2.host', '/fr')
132
+ assert_equal site_c, Cms::Site.find_site('test2.host', '/fr?a=b')
130
133
  assert_equal site_c, Cms::Site.find_site('test2.host', '/fr/some/path')
134
+ assert_equal site_c, Cms::Site.find_site('test2.host', '/fr/some/path?a=b')
131
135
  end
132
136
 
133
137
  def test_find_site_with_site_alias
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.6.26
4
+ version: 1.6.30
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2013-01-24 00:00:00.000000000 Z
13
+ date: 2013-03-28 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: rails
@@ -60,20 +60,19 @@ dependencies:
60
60
  - - ! '>='
61
61
  - !ruby/object:Gem::Version
62
62
  version: 2.3.0
63
- description: ''
64
- email: oleg@theworkinggroup.ca
63
+ description: CMS Engine for Rails 3 apps
64
+ email:
65
+ - oleg@khabarov.ca
65
66
  executables: []
66
67
  extensions: []
67
- extra_rdoc_files:
68
- - LICENSE
69
- - README.md
68
+ extra_rdoc_files: []
70
69
  files:
70
+ - .gitignore
71
71
  - .travis.yml
72
72
  - Gemfile
73
73
  - LICENSE
74
74
  - README.md
75
75
  - Rakefile
76
- - VERSION
77
76
  - app/assets/images/comfortable_mexican_sofa/arrow_bottom.gif
78
77
  - app/assets/images/comfortable_mexican_sofa/arrow_right.gif
79
78
  - app/assets/images/comfortable_mexican_sofa/checkerboard.gif
@@ -387,9 +386,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
387
386
  - - ! '>='
388
387
  - !ruby/object:Gem::Version
389
388
  version: '0'
390
- segments:
391
- - 0
392
- hash: 1707127231452077452
393
389
  required_rubygems_version: !ruby/object:Gem::Requirement
394
390
  none: false
395
391
  requirements:
@@ -397,9 +393,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
397
393
  - !ruby/object:Gem::Version
398
394
  version: '0'
399
395
  requirements: []
400
- rubyforge_project:
396
+ rubyforge_project: ! '[none]'
401
397
  rubygems_version: 1.8.23
402
398
  signing_key:
403
399
  specification_version: 3
404
- summary: ComfortableMexicanSofa is a powerful CMS Engine for Ruby on Rails 3 applications
400
+ summary: CMS Engine for Rails 3 apps
405
401
  test_files: []
data/VERSION DELETED
@@ -1 +0,0 @@
1
- 1.6.26