rocket_cms 0.6.12 → 0.6.13

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 8bfd7f173982a33ce1f8710d4510b47dd9a3a450
4
- data.tar.gz: 6aeb612b8738043a0040d4bd6bf988195aaf88b2
3
+ metadata.gz: f17e842fec7447bd78e0d79e48712f8cd56b051b
4
+ data.tar.gz: 7d839342194806ff51441ae9e7460289fc043203
5
5
  SHA512:
6
- metadata.gz: fe92838d94cd76149ac1fd21897ca8a40411b9c5b074dbe02ee30be819bfda282549dd41ce147bff5455f47f201540f6a93d3a8540f4dc4917713d3f1eea8c32
7
- data.tar.gz: da6b8921e62a215eced41bf704977bd6b72b5984ada72fd4abe3e39340e0ddb88bd50ede1962649286e8f1585d32e335c1d0711cde7f971ed793676c9362ffbf
6
+ metadata.gz: 12f12f157780a207061ea5c5c6b9f80a5403cda7846dae31d00491ca172ccfa51fb79e042cae2498e1ef20f8a10d7dd7a94b0d042e13d0ab5a96aa4bcc598206
7
+ data.tar.gz: 8590f005dfcb81d4aa50480dd4a6a08d4ab8a18eb55b8f35b8a1d59a0f6dba0822c685e8a6af18120a4f7c5277e797197659f532001b21df79f10be84a5e2b93
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- rocket_cms (0.6.12)
4
+ rocket_cms (0.6.13)
5
5
  addressable
6
6
  coffee-rails
7
7
  devise
@@ -27,42 +27,42 @@ PATH
27
27
  GEM
28
28
  remote: https://rubygems.org/
29
29
  specs:
30
- actionmailer (4.2.0)
31
- actionpack (= 4.2.0)
32
- actionview (= 4.2.0)
33
- activejob (= 4.2.0)
30
+ actionmailer (4.2.1)
31
+ actionpack (= 4.2.1)
32
+ actionview (= 4.2.1)
33
+ activejob (= 4.2.1)
34
34
  mail (~> 2.5, >= 2.5.4)
35
35
  rails-dom-testing (~> 1.0, >= 1.0.5)
36
- actionpack (4.2.0)
37
- actionview (= 4.2.0)
38
- activesupport (= 4.2.0)
39
- rack (~> 1.6.0)
36
+ actionpack (4.2.1)
37
+ actionview (= 4.2.1)
38
+ activesupport (= 4.2.1)
39
+ rack (~> 1.6)
40
40
  rack-test (~> 0.6.2)
41
41
  rails-dom-testing (~> 1.0, >= 1.0.5)
42
42
  rails-html-sanitizer (~> 1.0, >= 1.0.1)
43
- actionview (4.2.0)
44
- activesupport (= 4.2.0)
43
+ actionview (4.2.1)
44
+ activesupport (= 4.2.1)
45
45
  builder (~> 3.1)
46
46
  erubis (~> 2.7.0)
47
47
  rails-dom-testing (~> 1.0, >= 1.0.5)
48
48
  rails-html-sanitizer (~> 1.0, >= 1.0.1)
49
- activejob (4.2.0)
50
- activesupport (= 4.2.0)
49
+ activejob (4.2.1)
50
+ activesupport (= 4.2.1)
51
51
  globalid (>= 0.3.0)
52
- activemodel (4.2.0)
53
- activesupport (= 4.2.0)
52
+ activemodel (4.2.1)
53
+ activesupport (= 4.2.1)
54
54
  builder (~> 3.1)
55
- activerecord (4.2.0)
56
- activemodel (= 4.2.0)
57
- activesupport (= 4.2.0)
55
+ activerecord (4.2.1)
56
+ activemodel (= 4.2.1)
57
+ activesupport (= 4.2.1)
58
58
  arel (~> 6.0)
59
- activesupport (4.2.0)
59
+ activesupport (4.2.1)
60
60
  i18n (~> 0.7)
61
61
  json (~> 1.7, >= 1.7.7)
62
62
  minitest (~> 5.1)
63
63
  thread_safe (~> 0.3, >= 0.3.4)
64
64
  tzinfo (~> 1.1)
65
- addressable (2.3.7)
65
+ addressable (2.3.8)
66
66
  arel (6.0.0)
67
67
  bcrypt (3.1.10)
68
68
  builder (3.2.2)
@@ -84,7 +84,7 @@ GEM
84
84
  execjs (2.4.0)
85
85
  font-awesome-rails (4.3.0.0)
86
86
  railties (>= 3.2, < 5.0)
87
- geocoder (1.2.7)
87
+ geocoder (1.2.8)
88
88
  glebtv-ckeditor (4.4.7.3)
89
89
  mime-types
90
90
  mini_magick
@@ -113,7 +113,7 @@ GEM
113
113
  mail (2.6.3)
114
114
  mime-types (>= 1.16, < 3)
115
115
  mime-types (2.4.3)
116
- mini_magick (4.1.0)
116
+ mini_magick (4.2.0)
117
117
  mini_portile (0.6.2)
118
118
  minitest (5.5.1)
119
119
  multi_json (1.11.0)
@@ -127,16 +127,16 @@ GEM
127
127
  rack (~> 1.1)
128
128
  rack-test (0.6.3)
129
129
  rack (>= 1.0)
130
- rails (4.2.0)
131
- actionmailer (= 4.2.0)
132
- actionpack (= 4.2.0)
133
- actionview (= 4.2.0)
134
- activejob (= 4.2.0)
135
- activemodel (= 4.2.0)
136
- activerecord (= 4.2.0)
137
- activesupport (= 4.2.0)
130
+ rails (4.2.1)
131
+ actionmailer (= 4.2.1)
132
+ actionpack (= 4.2.1)
133
+ actionview (= 4.2.1)
134
+ activejob (= 4.2.1)
135
+ activemodel (= 4.2.1)
136
+ activerecord (= 4.2.1)
137
+ activesupport (= 4.2.1)
138
138
  bundler (>= 1.3.0, < 2.0)
139
- railties (= 4.2.0)
139
+ railties (= 4.2.1)
140
140
  sprockets-rails
141
141
  rails-deprecated_sanitizer (1.0.3)
142
142
  activesupport (>= 4.2.0.alpha)
@@ -165,9 +165,9 @@ GEM
165
165
  rails_admin_settings (0.9.1)
166
166
  rails_admin_toggleable (0.5.0)
167
167
  rails_admin (~> 0.6.6)
168
- railties (4.2.0)
169
- actionpack (= 4.2.0)
170
- activesupport (= 4.2.0)
168
+ railties (4.2.1)
169
+ actionpack (= 4.2.1)
170
+ activesupport (= 4.2.1)
171
171
  rake (>= 0.8.7)
172
172
  thor (>= 0.18.1, < 2.0)
173
173
  rake (10.4.2)
@@ -176,7 +176,7 @@ GEM
176
176
  railties (>= 4.2.0, < 5)
177
177
  safe_yaml (1.0.4)
178
178
  sass (3.4.13)
179
- sass-rails (5.0.1)
179
+ sass-rails (5.0.2)
180
180
  railties (>= 4.0.0, < 5.0)
181
181
  sass (~> 3.1)
182
182
  sprockets (>= 2.8, < 4.0)
data/README.md CHANGED
@@ -50,11 +50,11 @@ If not, uninstall rails and install again
50
50
 
51
51
  Then, for mongoid:
52
52
 
53
- rails new my_app -T -O -m https://rscz.ru/glebtv/rocket_cms/raw/master/template.rb
53
+ rails new my_app -T -O -m https://raw.githubusercontent.com/rs-pro/rocket_cms/master/template.rb
54
54
 
55
55
  for ActiveRecord:
56
56
 
57
- rails new my_app -T --database=postgresql -m https://rscz.ru/glebtv/rocket_cms/raw/master/template.rb
57
+ rails new my_app -T --database=postgresql -m https://raw.githubusercontent.com/rs-pro/rocket_cms/master/template.rb
58
58
 
59
59
  generator creates a new RVM gemset, so after cd'ing to app dir, you should run `bundle install` again if you use rvm.
60
60
 
@@ -4,15 +4,6 @@ module RocketCMS
4
4
  require File.expand_path('../tasks', __FILE__)
5
5
  end
6
6
 
7
- initializer "rocket_cms.email_defaults" do
8
- # Write default email settings to DB so they can be changed.
9
- if Settings.table_exists?
10
- Settings.default_email_from(default: 'noreply@rscx.ru')
11
- Settings.form_email(default: 'glebtv@ya.ru')
12
- Settings.email_topic(default: 'с сайта')
13
- end
14
- end
15
-
16
7
  initializer 'rocket_cms.paperclip' do
17
8
  require 'paperclip/style'
18
9
  module ::Paperclip
@@ -28,6 +19,13 @@ module RocketCMS
28
19
  config.after_initialize do
29
20
  # trigger autoload so models are registered in Mongoid::Elasticearch
30
21
  RocketCMS.configuration.search_models.map(&:constantize)
22
+
23
+ # Write default email settings to DB so they can be changed.
24
+ if Settings.table_exists?
25
+ Settings.default_email_from(default: 'noreply@rscx.ru')
26
+ Settings.form_email(default: 'glebtv@ya.ru')
27
+ Settings.email_topic(default: 'с сайта')
28
+ end
31
29
  end
32
30
  end
33
31
  end
@@ -1,3 +1,3 @@
1
1
  module RocketCMS
2
- VERSION = "0.6.12"
2
+ VERSION = "0.6.13"
3
3
  end
data/template.rb CHANGED
@@ -3,7 +3,7 @@ version = rails_spec.version.to_s
3
3
 
4
4
  mongoid = options[:skip_active_record]
5
5
 
6
- if Gem::Version.new(version) < Gem::Version.new('4.1.0')
6
+ if Gem::Version.new(version) < Gem::Version.new('4.2.1')
7
7
  puts "You are using an old version of Rails (#{version})"
8
8
  puts "Please update"
9
9
  puts "Stopping"
@@ -14,12 +14,12 @@ remove_file 'Gemfile'
14
14
  create_file 'Gemfile' do <<-TEXT
15
15
  source 'https://rubygems.org'
16
16
 
17
- gem 'rails', '4.2.0'
17
+ gem 'rails', '4.2.1'
18
18
  #{if mongoid then "gem 'mongoid', '~> 4.0.0'" else "gem 'pg'" end}
19
19
 
20
20
  gem 'sass', '~> 3.4.4'
21
21
 
22
- #{if mongoid then "gem 'rocket_cms_mongoid'" else "gem 'rocket_cms_activerecord'" end}, '~> 0.6.8'
22
+ #{if mongoid then "gem 'rocket_cms_mongoid'" else "gem 'rocket_cms_activerecord'" end}, '~> 0.6.12'
23
23
 
24
24
  gem 'sass-rails'
25
25
  gem 'compass-rails', '~> 2.0.0'
@@ -41,7 +41,7 @@ group :development do
41
41
  gem 'pry-rails'
42
42
  gem 'spring'
43
43
 
44
- gem 'capistrano', '~> 3.2.0', require: false
44
+ gem 'capistrano', '~> 3.4.0', require: false
45
45
  gem 'rvm1-capistrano3', require: false
46
46
  gem 'glebtv-capistrano-unicorn', require: false
47
47
  gem 'capistrano-bundler', require: false
@@ -56,7 +56,7 @@ group :test do
56
56
  gem 'rspec-rails'
57
57
  gem 'database_cleaner'
58
58
  gem 'email_spec'
59
- #{if mongoid then "gem 'glebtv-mongoid-rspec'" else "" end}
59
+ #{if mongoid then "gem 'mongoid-rspec'" else "" end}
60
60
  gem 'ffaker'
61
61
  gem 'factory_girl_rails'
62
62
  end
@@ -113,7 +113,7 @@ end
113
113
 
114
114
  create_file 'README.md', "## #{app_name}\nProject generated by RocketCMS\nORM: #{if mongoid then 'Mongoid' else 'ActiveRecord' end}\n\n"
115
115
 
116
- create_file '.ruby-version', "2.2.0\n"
116
+ create_file '.ruby-version', "2.2.1\n"
117
117
  create_file '.ruby-gemset', "#{app_name}\n"
118
118
 
119
119
  run 'bundle install --without production'
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rocket_cms
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.6.12
4
+ version: 0.6.13
5
5
  platform: ruby
6
6
  authors:
7
7
  - glebtv
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-03-18 00:00:00.000000000 Z
11
+ date: 2015-03-31 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler