rocket_cms 0.8.12 → 0.8.13

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +50 -49
  3. data/app/controllers/concerns/rs_menu.rb +3 -3
  4. data/lib/rocket_cms/version.rb +1 -1
  5. data/template.rb +9 -9
  6. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 1fd8732f4dca229aa75b4f558e0a7297ffc30781
4
- data.tar.gz: f4e0f081a5a3f0f167fcdb6116542a94a8c6f45d
3
+ metadata.gz: a1f9d690e30d2e7ba5ab77ad1cfb99a2c4dac2f4
4
+ data.tar.gz: 7f6e995e863663d4819c7e6fca56ad7057350fc3
5
5
  SHA512:
6
- metadata.gz: 2efbd88cf8074c11838c243ba5fe9296f9147b4301bbb10df5672b5f6f8b640895de686ff41f1ff7ddd3bb5c9ecb90a1894791353be8256588608920e9936a78
7
- data.tar.gz: d8cbcd918a9209975f56a92551863d13c975fcc5cf7958d6dd1fe3f8d3916a38f4e0d8d701cb84e333470c27bf0c9e368d443b3c6a0a631858ec8dcc71e0f36d
6
+ metadata.gz: ea64a367b534278784bcf3b643ea65d3cee21a8e8765a2fd248f48b3c5f4bf1a0cad81bb021e39668909f092a238c1ad3082fbc6a7747553f9fc1f7fa9db63d3
7
+ data.tar.gz: 93a96a9a57b49ffd6b6475e4123c8a109158187a578a267abe0598cb91309b81211196cf9d3b4d9a5d491370d4060f205d914f90a300ec8c05465db8b8a12a57
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- rocket_cms (0.8.12)
4
+ rocket_cms (0.8.13)
5
5
  addressable
6
6
  coffee-rails
7
7
  devise
@@ -27,36 +27,36 @@ PATH
27
27
  GEM
28
28
  remote: https://rubygems.org/
29
29
  specs:
30
- actionmailer (4.2.3)
31
- actionpack (= 4.2.3)
32
- actionview (= 4.2.3)
33
- activejob (= 4.2.3)
30
+ actionmailer (4.2.4)
31
+ actionpack (= 4.2.4)
32
+ actionview (= 4.2.4)
33
+ activejob (= 4.2.4)
34
34
  mail (~> 2.5, >= 2.5.4)
35
35
  rails-dom-testing (~> 1.0, >= 1.0.5)
36
- actionpack (4.2.3)
37
- actionview (= 4.2.3)
38
- activesupport (= 4.2.3)
36
+ actionpack (4.2.4)
37
+ actionview (= 4.2.4)
38
+ activesupport (= 4.2.4)
39
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.2)
43
- actionview (4.2.3)
44
- activesupport (= 4.2.3)
43
+ actionview (4.2.4)
44
+ activesupport (= 4.2.4)
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.2)
49
- activejob (4.2.3)
50
- activesupport (= 4.2.3)
49
+ activejob (4.2.4)
50
+ activesupport (= 4.2.4)
51
51
  globalid (>= 0.3.0)
52
- activemodel (4.2.3)
53
- activesupport (= 4.2.3)
52
+ activemodel (4.2.4)
53
+ activesupport (= 4.2.4)
54
54
  builder (~> 3.1)
55
- activerecord (4.2.3)
56
- activemodel (= 4.2.3)
57
- activesupport (= 4.2.3)
55
+ activerecord (4.2.4)
56
+ activemodel (= 4.2.4)
57
+ activesupport (= 4.2.4)
58
58
  arel (~> 6.0)
59
- activesupport (4.2.3)
59
+ activesupport (4.2.4)
60
60
  i18n (~> 0.7)
61
61
  json (~> 1.7, >= 1.7.7)
62
62
  minitest (~> 5.1)
@@ -73,7 +73,7 @@ GEM
73
73
  coffee-script-source
74
74
  execjs
75
75
  coffee-script-source (1.9.1.1)
76
- devise (3.5.1)
76
+ devise (3.5.2)
77
77
  bcrypt (~> 3.0)
78
78
  orm_adapter (~> 0.1)
79
79
  railties (>= 3.2.6, < 5)
@@ -81,23 +81,24 @@ GEM
81
81
  thread_safe (~> 0.1)
82
82
  warden (~> 1.2.3)
83
83
  erubis (2.7.0)
84
- execjs (2.5.2)
84
+ execjs (2.6.0)
85
85
  font-awesome-rails (4.4.0.0)
86
86
  railties (>= 3.2, < 5.0)
87
- geocoder (1.2.9)
88
- glebtv-ckeditor (4.4.7.3)
87
+ geocoder (1.2.11)
88
+ glebtv-ckeditor (4.4.7.4)
89
89
  mime-types
90
90
  mini_magick
91
91
  orm_adapter (~> 0.5.0)
92
92
  rails (~> 4.0)
93
+ sprockets (~> 3.0)
93
94
  glebtv-simple_captcha (0.6.7)
94
95
  globalid (0.3.6)
95
96
  activesupport (>= 4.1.0)
96
- haml (4.0.6)
97
+ haml (4.0.7)
97
98
  tilt
98
99
  htmlentities (4.3.4)
99
100
  i18n (0.7.0)
100
- jquery-rails (4.0.4)
101
+ jquery-rails (4.0.5)
101
102
  rails-dom-testing (~> 1.0)
102
103
  railties (>= 4.2.0)
103
104
  thor (>= 0.14, < 2.0)
@@ -107,14 +108,14 @@ GEM
107
108
  kaminari (0.16.3)
108
109
  actionpack (>= 3.0.0)
109
110
  activesupport (>= 3.0.0)
110
- loofah (2.0.2)
111
+ loofah (2.0.3)
111
112
  nokogiri (>= 1.5.9)
112
113
  mail (2.6.3)
113
114
  mime-types (>= 1.16, < 3)
114
- mime-types (2.6.1)
115
- mini_magick (4.2.9)
115
+ mime-types (2.6.2)
116
+ mini_magick (4.3.3)
116
117
  mini_portile (0.6.2)
117
- minitest (5.7.0)
118
+ minitest (5.8.1)
118
119
  nested_form (0.3.2)
119
120
  nokogiri (1.6.6.2)
120
121
  mini_portile (~> 0.6.0)
@@ -125,26 +126,26 @@ GEM
125
126
  rack (~> 1.1)
126
127
  rack-test (0.6.3)
127
128
  rack (>= 1.0)
128
- rails (4.2.3)
129
- actionmailer (= 4.2.3)
130
- actionpack (= 4.2.3)
131
- actionview (= 4.2.3)
132
- activejob (= 4.2.3)
133
- activemodel (= 4.2.3)
134
- activerecord (= 4.2.3)
135
- activesupport (= 4.2.3)
129
+ rails (4.2.4)
130
+ actionmailer (= 4.2.4)
131
+ actionpack (= 4.2.4)
132
+ actionview (= 4.2.4)
133
+ activejob (= 4.2.4)
134
+ activemodel (= 4.2.4)
135
+ activerecord (= 4.2.4)
136
+ activesupport (= 4.2.4)
136
137
  bundler (>= 1.3.0, < 2.0)
137
- railties (= 4.2.3)
138
+ railties (= 4.2.4)
138
139
  sprockets-rails
139
140
  rails-deprecated_sanitizer (1.0.3)
140
141
  activesupport (>= 4.2.0.alpha)
141
- rails-dom-testing (1.0.6)
142
+ rails-dom-testing (1.0.7)
142
143
  activesupport (>= 4.2.0.beta, < 5.0)
143
144
  nokogiri (~> 1.6.0)
144
145
  rails-deprecated_sanitizer (>= 1.0.1)
145
146
  rails-html-sanitizer (1.0.2)
146
147
  loofah (~> 2.0)
147
- rails_admin (0.6.8)
148
+ rails_admin (0.7.0)
148
149
  builder (~> 3.1)
149
150
  coffee-rails (~> 4.0)
150
151
  font-awesome-rails (>= 3.0, < 5)
@@ -163,9 +164,9 @@ GEM
163
164
  rails_admin_settings (1.0.1)
164
165
  rails_admin_toggleable (0.5.1)
165
166
  rails_admin
166
- railties (4.2.3)
167
- actionpack (= 4.2.3)
168
- activesupport (= 4.2.3)
167
+ railties (4.2.4)
168
+ actionpack (= 4.2.4)
169
+ activesupport (= 4.2.4)
169
170
  rake (>= 0.8.7)
170
171
  thor (>= 0.18.1, < 2.0)
171
172
  rake (10.4.2)
@@ -173,16 +174,16 @@ GEM
173
174
  responders (2.1.0)
174
175
  railties (>= 4.2.0, < 5)
175
176
  safe_yaml (1.0.4)
176
- sass (3.4.16)
177
- sass-rails (5.0.3)
177
+ sass (3.4.18)
178
+ sass-rails (5.0.4)
178
179
  railties (>= 4.0.0, < 5.0)
179
180
  sass (~> 3.1)
180
181
  sprockets (>= 2.8, < 4.0)
181
182
  sprockets-rails (>= 2.0, < 4.0)
182
- tilt (~> 1.1)
183
+ tilt (>= 1.1, < 3)
183
184
  simple-navigation (4.0.3)
184
185
  activesupport (>= 2.3.2)
185
- simple_form (3.1.0)
186
+ simple_form (3.2.0)
186
187
  actionpack (~> 4.0)
187
188
  activemodel (~> 4.0)
188
189
  sitemap_generator (5.1.0)
@@ -190,16 +191,16 @@ GEM
190
191
  smart_excerpt (0.1.5)
191
192
  activesupport
192
193
  htmlentities
193
- sprockets (3.2.0)
194
+ sprockets (3.3.4)
194
195
  rack (~> 1.0)
195
- sprockets-rails (2.3.2)
196
+ sprockets-rails (2.3.3)
196
197
  actionpack (>= 3.0)
197
198
  activesupport (>= 3.0)
198
199
  sprockets (>= 2.8, < 4.0)
199
200
  stringex (2.5.2)
200
201
  thor (0.19.1)
201
202
  thread_safe (0.3.5)
202
- tilt (1.4.1)
203
+ tilt (2.0.1)
203
204
  turbolinks (2.5.3)
204
205
  coffee-rails
205
206
  tzinfo (1.2.2)
data/app/controllers/concerns/rs_menu.rb CHANGED
@@ -32,9 +32,9 @@ module RsMenu
32
32
  SimpleNavigation.config.autogenerate_item_ids = false
33
33
  begin
34
34
  nav_extra_data_before(type, primary)
35
- items = nav_get_menu_items(type)
36
- items = items.select { |i| i.parent_id.nil? && !i.name.blank? && i.enabled }
37
- items.each do |item|
35
+ items = nav_get_menu_items(type).select { |i| !i.name.blank? && i.enabled }
36
+ roots = items.select { |i| i.parent_id.nil? }
37
+ roots.each do |item|
38
38
  render_with_subs(items, primary, item)
39
39
  end
40
40
  nav_extra_data_after(type, primary)
data/lib/rocket_cms/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module RocketCMS
2
- VERSION = "0.8.12"
2
+ VERSION = "0.8.13"
3
3
  end
data/template.rb CHANGED
@@ -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.1'
18
- #{if mongoid then "gem 'mongoid', '~> 4.0.0'" else "gem 'pg'" end}
17
+ gem 'rails', '4.2.4'
18
+ #{if mongoid then "gem 'mongoid', '~> 5.0.0'" else "gem 'pg'" end}
19
19
 
20
- gem 'sass', '~> 3.4.4'
20
+ gem 'sass', '~> 3.4.0'
21
21
 
22
- #{if mongoid then "gem 'rocket_cms_mongoid'" else "gem 'rocket_cms_activerecord'" end}, '~> 0.8.0.pre.1'
22
+ #{if mongoid then "gem 'rocket_cms_mongoid'" else "gem 'rocket_cms_activerecord'" end}, '~> 0.8.12'
23
23
 
24
24
  gem 'sass-rails'
25
25
  gem 'compass-rails', '~> 2.0.0'
@@ -48,8 +48,8 @@ group :development do
48
48
  gem 'capistrano-rails', require: false
49
49
 
50
50
  gem 'hipchat'
51
- gem 'coffee-rails-source-maps'
52
- gem 'compass-rails-source-maps'
51
+ #gem 'coffee-rails-source-maps'
52
+ #gem 'compass-rails-source-maps'
53
53
  end
54
54
 
55
55
  group :test do
@@ -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.1\n"
116
+ create_file '.ruby-version', "2.2.3\n"
117
117
  create_file '.ruby-gemset', "#{app_name}\n"
118
118
 
119
119
  run 'bundle install --without production'
@@ -121,13 +121,13 @@ run 'bundle install --without production'
121
121
  if mongoid
122
122
  create_file 'config/mongoid.yml' do <<-TEXT
123
123
  development:
124
- sessions:
124
+ clients:
125
125
  default:
126
126
  database: #{app_name.downcase}_development
127
127
  hosts:
128
128
  - localhost:27017
129
129
  test:
130
- sessions:
130
+ clients:
131
131
  default:
132
132
  database: #{app_name.downcase}_test
133
133
  hosts:
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.8.12
4
+ version: 0.8.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-08-05 00:00:00.000000000 Z
11
+ date: 2015-09-24 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler