refinerycms 0.9.9.20 → 0.9.9.21

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.
Files changed (9) hide show
  1. data/Gemfile +2 -2
  2. data/Gemfile.lock +37 -36
  3. data/bin/refinerycms +10 -1
  4. data/changelog.md +8 -0
  5. data/lib/refinerycms/all.rb +1 -1
  6. data/lib/refinerycms.rb +5 -3
  7. data/public/javascripts/translations.js +1 -1
  8. data/refinerycms.gemspec +10 -10
  9. metadata +10 -10
data/Gemfile CHANGED
@@ -31,12 +31,12 @@ gem 'mysql2', '~> 0.2.7'
31
31
  # REFINERY CMS ================================================================
32
32
  # Anything you put in here will be overridden when the app gets updated.
33
33
 
34
- # gem 'refinerycms', '~> 0.9.9.19'
34
+ # gem 'refinerycms', '~> 0.9.9.21'
35
35
 
36
36
  group :development, :test do
37
37
  # To use refinerycms-testing, uncomment it (if it's commented out) and run 'bundle install'
38
38
  # Then, run 'rails generate refinerycms_testing' which will copy its support files.
39
- gem 'refinerycms-testing', '~> 0.9.9.19'
39
+ gem 'refinerycms-testing', '~> 0.9.9.21'
40
40
  end
41
41
 
42
42
  # END REFINERY CMS ============================================================
data/Gemfile.lock CHANGED
@@ -1,50 +1,51 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- refinerycms (0.9.9.19)
4
+ refinerycms (0.9.9.21)
5
5
  bundler (~> 1.0)
6
- refinerycms-authentication (= 0.9.9.19)
7
- refinerycms-base (= 0.9.9.19)
8
- refinerycms-core (= 0.9.9.19)
9
- refinerycms-dashboard (= 0.9.9.19)
10
- refinerycms-images (= 0.9.9.19)
11
- refinerycms-pages (= 0.9.9.19)
12
- refinerycms-resources (= 0.9.9.19)
13
- refinerycms-settings (= 0.9.9.19)
14
- refinerycms-authentication (0.9.9.19)
15
- devise (~> 1.2.0)
16
- refinerycms-core (= 0.9.9.19)
17
- refinerycms-base (0.9.9.19)
18
- refinerycms-core (0.9.9.19)
6
+ refinerycms-authentication (= 0.9.9.21)
7
+ refinerycms-base (= 0.9.9.21)
8
+ refinerycms-core (= 0.9.9.21)
9
+ refinerycms-dashboard (= 0.9.9.21)
10
+ refinerycms-images (= 0.9.9.21)
11
+ refinerycms-pages (= 0.9.9.21)
12
+ refinerycms-resources (= 0.9.9.21)
13
+ refinerycms-settings (= 0.9.9.21)
14
+ refinerycms-authentication (0.9.9.21)
15
+ devise (~> 1.3.0)
16
+ friendly_id_globalize3 (~> 3.2.1)
17
+ refinerycms-core (= 0.9.9.21)
18
+ refinerycms-base (0.9.9.21)
19
+ refinerycms-core (0.9.9.21)
19
20
  acts_as_indexed (~> 0.7)
20
21
  friendly_id_globalize3 (~> 3.2.1)
21
22
  globalize3 (>= 0.1.0.beta)
22
23
  moretea-awesome_nested_set (~> 1.4)
23
24
  rails (~> 3.0.7)
24
- refinerycms-base (= 0.9.9.19)
25
+ refinerycms-base (= 0.9.9.21)
25
26
  refinerycms-generators (~> 1.0)
26
- refinerycms-settings (= 0.9.9.19)
27
+ refinerycms-settings (= 0.9.9.21)
27
28
  truncate_html (~> 0.5)
28
29
  will_paginate (~> 3.0.pre)
29
- refinerycms-dashboard (0.9.9.19)
30
- refinerycms-core (= 0.9.9.19)
31
- refinerycms-images (0.9.9.19)
30
+ refinerycms-dashboard (0.9.9.21)
31
+ refinerycms-core (= 0.9.9.21)
32
+ refinerycms-images (0.9.9.21)
32
33
  dragonfly (~> 0.8.4)
33
34
  rack-cache (>= 0.5.3)
34
- refinerycms-core (= 0.9.9.19)
35
- refinerycms-pages (0.9.9.19)
35
+ refinerycms-core (= 0.9.9.21)
36
+ refinerycms-pages (0.9.9.21)
36
37
  friendly_id_globalize3 (~> 3.2.1)
37
38
  globalize3 (>= 0.1.0.beta)
38
39
  moretea-awesome_nested_set (~> 1.4)
39
- refinerycms-core (= 0.9.9.19)
40
+ refinerycms-core (= 0.9.9.21)
40
41
  seo_meta (~> 1.0.5)
41
- refinerycms-resources (0.9.9.19)
42
+ refinerycms-resources (0.9.9.21)
42
43
  dragonfly (~> 0.8.4)
43
44
  rack-cache (>= 0.5.3)
44
- refinerycms-core (= 0.9.9.19)
45
- refinerycms-settings (0.9.9.19)
46
- refinerycms-base (= 0.9.9.19)
47
- refinerycms-testing (0.9.9.19)
45
+ refinerycms-core (= 0.9.9.21)
46
+ refinerycms-settings (0.9.9.21)
47
+ refinerycms-base (= 0.9.9.21)
48
+ refinerycms-testing (0.9.9.21)
48
49
  autotest
49
50
  autotest-notification
50
51
  autotest-rails
@@ -57,7 +58,7 @@ PATH
57
58
  json_pure
58
59
  launchy
59
60
  rack-test (~> 0.5.6)
60
- refinerycms-core (= 0.9.9.19)
61
+ refinerycms-core (= 0.9.9.21)
61
62
  rspec-rails (~> 2.5)
62
63
 
63
64
  GEM
@@ -126,8 +127,8 @@ GEM
126
127
  nokogiri (>= 1.4.4)
127
128
  rack-test (>= 0.5.7)
128
129
  culerity (0.2.15)
129
- database_cleaner (0.6.6)
130
- devise (1.2.1)
130
+ database_cleaner (0.6.7)
131
+ devise (1.3.4)
131
132
  bcrypt-ruby (~> 2.1.2)
132
133
  orm_adapter (~> 0.0.3)
133
134
  warden (~> 1.0.3)
@@ -141,7 +142,7 @@ GEM
141
142
  rake (>= 0.8.7)
142
143
  friendly_id_globalize3 (3.2.1.3)
143
144
  babosa (~> 0.3.0)
144
- gherkin (2.3.5)
145
+ gherkin (2.3.6)
145
146
  json (>= 1.4.6)
146
147
  globalize3 (0.1.0.beta)
147
148
  activemodel (>= 3.0.0)
@@ -152,7 +153,7 @@ GEM
152
153
  launchy (0.4.0)
153
154
  configuration (>= 0.0.5)
154
155
  rake (>= 0.8.1)
155
- mail (2.2.17)
156
+ mail (2.2.19)
156
157
  activesupport (>= 2.3.6)
157
158
  i18n (>= 0.4.0)
158
159
  mime-types (~> 1.16)
@@ -205,7 +206,7 @@ GEM
205
206
  railties (~> 3.0)
206
207
  rspec (~> 2.5.0)
207
208
  rubyzip (0.9.4)
208
- selenium-webdriver (0.1.4)
209
+ selenium-webdriver (0.2.0)
209
210
  childprocess (>= 0.1.7)
210
211
  ffi (>= 1.0.7)
211
212
  json_pure
@@ -218,11 +219,11 @@ GEM
218
219
  treetop (1.4.9)
219
220
  polyglot (>= 0.3.1)
220
221
  truncate_html (0.5.1)
221
- tzinfo (0.3.26)
222
+ tzinfo (0.3.27)
222
223
  warden (1.0.3)
223
224
  rack (>= 1.0.0)
224
225
  will_paginate (3.0.pre2)
225
- xpath (0.1.3)
226
+ xpath (0.1.4)
226
227
  nokogiri (~> 1.3)
227
228
 
228
229
  PLATFORMS
@@ -232,5 +233,5 @@ DEPENDENCIES
232
233
  mysql2 (~> 0.2.7)
233
234
  refinerycms!
234
235
  refinerycms-i18n (~> 1.0.0)
235
- refinerycms-testing (~> 0.9.9.19)
236
+ refinerycms-testing (~> 0.9.9.21)
236
237
  sqlite3
data/bin/refinerycms CHANGED
@@ -264,6 +264,14 @@ module Refinery
264
264
  app_gemfile = @app_path.join('Gemfile')
265
265
  refinery_user_defined_gems = refinery_gemfile_contents.match(/# USER DEFINED(.*)# END USER DEFINED/m)
266
266
  refinery_user_defined_gems = refinery_user_defined_gems[1] unless refinery_user_defined_gems.nil?
267
+
268
+ if @options[:database][:adapter] == 'mysql'
269
+ app_gemfile_contents = app_gemfile.read
270
+ app_gemfile.open('w') do |f|
271
+ f.write app_gemfile_contents.gsub "gem 'mysql2'", "gem 'mysql2', '~> 0.2.7'"
272
+ end
273
+ end
274
+
267
275
  app_gemfile.open('a') do |f|
268
276
  f.write "\n#{refinery_gems}\n"
269
277
  @options[:gems] = ([refinery_user_defined_gems] | [@options[:gems]]).flatten.compact
@@ -359,12 +367,13 @@ module Refinery
359
367
  # e.g. when shelling to git
360
368
  if options[:ruby]
361
369
  exe = File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['RUBY_INSTALL_NAME'])
362
- to_run << "#{exe} -S "
370
+ to_run << "\"#{exe}\" -S "
363
371
  end
364
372
 
365
373
  to_run << command
366
374
 
367
375
  if Refinery::WINDOWS
376
+ to_run = ['"'] + to_run + ['"']
368
377
  to_run = %w(cmd /c) | to_run.map{|c| c.gsub(/\//m, '\\')}
369
378
  end
370
379
 
data/changelog.md CHANGED
@@ -1,3 +1,11 @@
1
+ ## 0.9.9.21 [03 May 2011]
2
+
3
+ * Fixed issue with MySQL2 gem complaining about us being on Rails 3 by specifying `'~> 0.2.7'` in the Gemfile of a generated application. [Philip Arndt](https://github.com/parndt)
4
+ * `/registrations` is now `/users`. [Philip Arndt](https://github.com/parndt)
5
+ * Added Finnish translation. [https://github.com/veeti](Veeti Paananen)
6
+ * Allowed `data` and `data-` attributes in WYMeditor tags using HTML view. [Philip Arndt](https://github.com/parndt)
7
+ * [See full list](https://github.com/resolve/refinerycms/compare/0.9.9.20...0.9.9.21)
8
+
1
9
  ## 0.9.9.20 [28 April 2011]
2
10
 
3
11
  * Improved performance of the menu rendering. [Philip Arndt](https://github.com/parndt)
data/lib/refinerycms/all.rb CHANGED
@@ -1,3 +1,3 @@
1
- %w(base core settings authentication dashboard images pages resources).each do |engine|
1
+ %w(authentication dashboard images pages resources).each do |engine|
2
2
  require "refinerycms-#{engine}"
3
3
  end
data/lib/refinerycms.rb CHANGED
@@ -1,6 +1,8 @@
1
- require 'refinerycms-base'
2
-
3
- require File.expand_path('../refinerycms/all', __FILE__) unless defined?(REFINERYCMS_INSTALLER)
1
+ unless defined?(REFINERYCMS_INSTALLER)
2
+ require File.expand_path('../refinerycms/all', __FILE__)
3
+ else
4
+ require 'refinerycms-base'
5
+ end
4
6
 
5
7
  # Override Refinery.root
6
8
  # Must come after requiring 'refinerycms-base'
data/public/javascripts/translations.js CHANGED
@@ -1,2 +1,2 @@
1
1
  var I18n = I18n || {};
2
- I18n.translations = {"en":{"js":{"admin":{"confirm_changes":"Any changes you've made will be lost. Are you sure you want to continue without saving?"}}}};
2
+ I18n.translations = {"en":{"js":{"admin":{"confirm_changes":"Any changes you've made will be lost. Are you sure you want to continue without saving?"}}},"fi":{"js":{"admin":{"confirm_changes":"Kaikki muutoksesi menetet\u00e4\u00e4n. Oletko varma, ett\u00e4 haluat jatkaa tallentamatta?"}}}};
data/refinerycms.gemspec CHANGED
@@ -2,9 +2,9 @@
2
2
 
3
3
  Gem::Specification.new do |s|
4
4
  s.name = %q{refinerycms}
5
- s.version = %q{0.9.9.20}
5
+ s.version = %q{0.9.9.21}
6
6
  s.description = %q{A Ruby on Rails CMS that supports Rails 3. It's easy to extend and sticks to 'the Rails way' where possible.}
7
- s.date = %q{2011-04-28}
7
+ s.date = %q{2011-05-03}
8
8
  s.summary = %q{A Ruby on Rails CMS that supports Rails 3}
9
9
  s.email = %q{info@refinerycms.com}
10
10
  s.homepage = %q{http://refinerycms.com}
@@ -18,14 +18,14 @@ Gem::Specification.new do |s|
18
18
  s.add_dependency 'bundler', '~> 1.0'
19
19
 
20
20
  # Refinery CMS
21
- s.add_dependency 'refinerycms-authentication', '= 0.9.9.20'
22
- s.add_dependency 'refinerycms-base', '= 0.9.9.20'
23
- s.add_dependency 'refinerycms-core', '= 0.9.9.20'
24
- s.add_dependency 'refinerycms-dashboard', '= 0.9.9.20'
25
- s.add_dependency 'refinerycms-images', '= 0.9.9.20'
26
- s.add_dependency 'refinerycms-pages', '= 0.9.9.20'
27
- s.add_dependency 'refinerycms-resources', '= 0.9.9.20'
28
- s.add_dependency 'refinerycms-settings', '= 0.9.9.20'
21
+ s.add_dependency 'refinerycms-authentication', '= 0.9.9.21'
22
+ s.add_dependency 'refinerycms-base', '= 0.9.9.21'
23
+ s.add_dependency 'refinerycms-core', '= 0.9.9.21'
24
+ s.add_dependency 'refinerycms-dashboard', '= 0.9.9.21'
25
+ s.add_dependency 'refinerycms-images', '= 0.9.9.21'
26
+ s.add_dependency 'refinerycms-pages', '= 0.9.9.21'
27
+ s.add_dependency 'refinerycms-resources', '= 0.9.9.21'
28
+ s.add_dependency 'refinerycms-settings', '= 0.9.9.21'
29
29
 
30
30
  s.files = [
31
31
  '.gitignore',
metadata CHANGED
@@ -2,7 +2,7 @@
2
2
  name: refinerycms
3
3
  version: !ruby/object:Gem::Version
4
4
  prerelease:
5
- version: 0.9.9.20
5
+ version: 0.9.9.21
6
6
  platform: ruby
7
7
  authors:
8
8
  - Resolve Digital
@@ -13,7 +13,7 @@ autorequire:
13
13
  bindir: bin
14
14
  cert_chain: []
15
15
 
16
- date: 2011-04-28 00:00:00 Z
16
+ date: 2011-05-03 00:00:00 Z
17
17
  dependencies:
18
18
  - !ruby/object:Gem::Dependency
19
19
  name: bundler
@@ -34,7 +34,7 @@ dependencies:
34
34
  requirements:
35
35
  - - "="
36
36
  - !ruby/object:Gem::Version
37
- version: 0.9.9.20
37
+ version: 0.9.9.21
38
38
  type: :runtime
39
39
  version_requirements: *id002
40
40
  - !ruby/object:Gem::Dependency
@@ -45,7 +45,7 @@ dependencies:
45
45
  requirements:
46
46
  - - "="
47
47
  - !ruby/object:Gem::Version
48
- version: 0.9.9.20
48
+ version: 0.9.9.21
49
49
  type: :runtime
50
50
  version_requirements: *id003
51
51
  - !ruby/object:Gem::Dependency
@@ -56,7 +56,7 @@ dependencies:
56
56
  requirements:
57
57
  - - "="
58
58
  - !ruby/object:Gem::Version
59
- version: 0.9.9.20
59
+ version: 0.9.9.21
60
60
  type: :runtime
61
61
  version_requirements: *id004
62
62
  - !ruby/object:Gem::Dependency
@@ -67,7 +67,7 @@ dependencies:
67
67
  requirements:
68
68
  - - "="
69
69
  - !ruby/object:Gem::Version
70
- version: 0.9.9.20
70
+ version: 0.9.9.21
71
71
  type: :runtime
72
72
  version_requirements: *id005
73
73
  - !ruby/object:Gem::Dependency
@@ -78,7 +78,7 @@ dependencies:
78
78
  requirements:
79
79
  - - "="
80
80
  - !ruby/object:Gem::Version
81
- version: 0.9.9.20
81
+ version: 0.9.9.21
82
82
  type: :runtime
83
83
  version_requirements: *id006
84
84
  - !ruby/object:Gem::Dependency
@@ -89,7 +89,7 @@ dependencies:
89
89
  requirements:
90
90
  - - "="
91
91
  - !ruby/object:Gem::Version
92
- version: 0.9.9.20
92
+ version: 0.9.9.21
93
93
  type: :runtime
94
94
  version_requirements: *id007
95
95
  - !ruby/object:Gem::Dependency
@@ -100,7 +100,7 @@ dependencies:
100
100
  requirements:
101
101
  - - "="
102
102
  - !ruby/object:Gem::Version
103
- version: 0.9.9.20
103
+ version: 0.9.9.21
104
104
  type: :runtime
105
105
  version_requirements: *id008
106
106
  - !ruby/object:Gem::Dependency
@@ -111,7 +111,7 @@ dependencies:
111
111
  requirements:
112
112
  - - "="
113
113
  - !ruby/object:Gem::Version
114
- version: 0.9.9.20
114
+ version: 0.9.9.21
115
115
  type: :runtime
116
116
  version_requirements: *id009
117
117
  description: A Ruby on Rails CMS that supports Rails 3. It's easy to extend and sticks to 'the Rails way' where possible.