rocket_cms 0.21.0 → 0.21.1

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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
- SHA1:
3
- metadata.gz: 36414a274985b0420be90b4f1791d8701f161a33
4
- data.tar.gz: c8c6610c1f29f99c1001acda27ec147e57b2b76c
2
+ SHA256:
3
+ metadata.gz: aaae88b028f655cecc252edb085ea7bebf902eef349374360709122c15c412c4
4
+ data.tar.gz: 1fffb30e0bac56722b9cb054702788555bdb265c65d6a22ac0e13c66a1900d63
5
5
  SHA512:
6
- metadata.gz: 4f98bfe238b812aa92761ea22aca6eed514279ea293302ea66ae7af44d51d310e6c36c6072c2295ed32bdae2b1d9550c6daeb5ebf99ec4ca928f15ca447b13f0
7
- data.tar.gz: 51f0426bf3f444881c559ae37caa2b443000767e51542932cd0d82c98ef51287975eda1b71b3d1f8879608d4892befd6673cacafef9688258195777ec31ad2e3
6
+ metadata.gz: bbd03e1c412e576fd9e41ec4ef020c0bca1b01abf76f4aaec4f4bc563b90980ed7d8fe4ea64c4f3303168954e3262a2d326b6997a9ef1757e55e3c7ff0f2d5d8
7
+ data.tar.gz: 34c89d215f69fc05505594cb143b02e9bedc0fd654ff1b304d37f25940e531295ce7d86587b6010941ce916e2ab48555b8a860cc05ae06b97b72d322b29923ce
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- rocket_cms (0.21.0)
4
+ rocket_cms (0.21.1)
5
5
  addressable
6
6
  coffee-rails
7
7
  jquery-rails
@@ -15,39 +15,39 @@ PATH
15
15
  GEM
16
16
  remote: https://rubygems.org/
17
17
  specs:
18
- actioncable (5.1.3)
19
- actionpack (= 5.1.3)
18
+ actioncable (5.1.4)
19
+ actionpack (= 5.1.4)
20
20
  nio4r (~> 2.0)
21
21
  websocket-driver (~> 0.6.1)
22
- actionmailer (5.1.3)
23
- actionpack (= 5.1.3)
24
- actionview (= 5.1.3)
25
- activejob (= 5.1.3)
22
+ actionmailer (5.1.4)
23
+ actionpack (= 5.1.4)
24
+ actionview (= 5.1.4)
25
+ activejob (= 5.1.4)
26
26
  mail (~> 2.5, >= 2.5.4)
27
27
  rails-dom-testing (~> 2.0)
28
- actionpack (5.1.3)
29
- actionview (= 5.1.3)
30
- activesupport (= 5.1.3)
28
+ actionpack (5.1.4)
29
+ actionview (= 5.1.4)
30
+ activesupport (= 5.1.4)
31
31
  rack (~> 2.0)
32
- rack-test (~> 0.6.3)
32
+ rack-test (>= 0.6.3)
33
33
  rails-dom-testing (~> 2.0)
34
34
  rails-html-sanitizer (~> 1.0, >= 1.0.2)
35
- actionview (5.1.3)
36
- activesupport (= 5.1.3)
35
+ actionview (5.1.4)
36
+ activesupport (= 5.1.4)
37
37
  builder (~> 3.1)
38
38
  erubi (~> 1.4)
39
39
  rails-dom-testing (~> 2.0)
40
40
  rails-html-sanitizer (~> 1.0, >= 1.0.3)
41
- activejob (5.1.3)
42
- activesupport (= 5.1.3)
41
+ activejob (5.1.4)
42
+ activesupport (= 5.1.4)
43
43
  globalid (>= 0.3.6)
44
- activemodel (5.1.3)
45
- activesupport (= 5.1.3)
46
- activerecord (5.1.3)
47
- activemodel (= 5.1.3)
48
- activesupport (= 5.1.3)
44
+ activemodel (5.1.4)
45
+ activesupport (= 5.1.4)
46
+ activerecord (5.1.4)
47
+ activemodel (= 5.1.4)
48
+ activesupport (= 5.1.4)
49
49
  arel (~> 8.0)
50
- activesupport (5.1.3)
50
+ activesupport (5.1.4)
51
51
  concurrent-ruby (~> 1.0, >= 1.0.2)
52
52
  i18n (~> 0.7)
53
53
  minitest (~> 5.1)
@@ -64,89 +64,90 @@ GEM
64
64
  execjs
65
65
  coffee-script-source (1.12.2)
66
66
  concurrent-ruby (1.0.5)
67
- erubi (1.6.1)
67
+ crass (1.0.3)
68
+ erubi (1.7.0)
68
69
  execjs (2.7.0)
69
- globalid (0.4.0)
70
+ globalid (0.4.1)
70
71
  activesupport (>= 4.2.0)
71
72
  htmlentities (4.3.4)
72
- i18n (0.8.6)
73
+ i18n (0.9.3)
74
+ concurrent-ruby (~> 1.0)
73
75
  jquery-rails (4.3.1)
74
76
  rails-dom-testing (>= 1, < 3)
75
77
  railties (>= 4.2.0)
76
78
  thor (>= 0.14, < 2.0)
77
- kaminari (1.0.1)
79
+ kaminari (1.1.1)
78
80
  activesupport (>= 4.1.0)
79
- kaminari-actionview (= 1.0.1)
80
- kaminari-activerecord (= 1.0.1)
81
- kaminari-core (= 1.0.1)
82
- kaminari-actionview (1.0.1)
81
+ kaminari-actionview (= 1.1.1)
82
+ kaminari-activerecord (= 1.1.1)
83
+ kaminari-core (= 1.1.1)
84
+ kaminari-actionview (1.1.1)
83
85
  actionview
84
- kaminari-core (= 1.0.1)
85
- kaminari-activerecord (1.0.1)
86
+ kaminari-core (= 1.1.1)
87
+ kaminari-activerecord (1.1.1)
86
88
  activerecord
87
- kaminari-core (= 1.0.1)
88
- kaminari-core (1.0.1)
89
- loofah (2.0.3)
89
+ kaminari-core (= 1.1.1)
90
+ kaminari-core (1.1.1)
91
+ loofah (2.1.1)
92
+ crass (~> 1.0.2)
90
93
  nokogiri (>= 1.5.9)
91
- mail (2.6.6)
92
- mime-types (>= 1.16, < 4)
93
- method_source (0.8.2)
94
- mime-types (3.1)
95
- mime-types-data (~> 3.2015)
96
- mime-types-data (3.2016.0521)
97
- mini_portile2 (2.2.0)
98
- minitest (5.10.3)
99
- nio4r (2.1.0)
100
- nokogiri (1.8.0)
101
- mini_portile2 (~> 2.2.0)
102
- public_suffix (3.0.0)
94
+ mail (2.7.0)
95
+ mini_mime (>= 0.1.1)
96
+ method_source (0.9.0)
97
+ mini_mime (1.0.0)
98
+ mini_portile2 (2.3.0)
99
+ minitest (5.11.1)
100
+ nio4r (2.2.0)
101
+ nokogiri (1.8.1)
102
+ mini_portile2 (~> 2.3.0)
103
+ public_suffix (3.0.1)
103
104
  rack (2.0.3)
104
- rack-test (0.6.3)
105
- rack (>= 1.0)
106
- rails (5.1.3)
107
- actioncable (= 5.1.3)
108
- actionmailer (= 5.1.3)
109
- actionpack (= 5.1.3)
110
- actionview (= 5.1.3)
111
- activejob (= 5.1.3)
112
- activemodel (= 5.1.3)
113
- activerecord (= 5.1.3)
114
- activesupport (= 5.1.3)
105
+ rack-test (0.8.2)
106
+ rack (>= 1.0, < 3)
107
+ rails (5.1.4)
108
+ actioncable (= 5.1.4)
109
+ actionmailer (= 5.1.4)
110
+ actionpack (= 5.1.4)
111
+ actionview (= 5.1.4)
112
+ activejob (= 5.1.4)
113
+ activemodel (= 5.1.4)
114
+ activerecord (= 5.1.4)
115
+ activesupport (= 5.1.4)
115
116
  bundler (>= 1.3.0)
116
- railties (= 5.1.3)
117
+ railties (= 5.1.4)
117
118
  sprockets-rails (>= 2.0.0)
118
119
  rails-dom-testing (2.0.3)
119
120
  activesupport (>= 4.2.0)
120
121
  nokogiri (>= 1.6)
121
122
  rails-html-sanitizer (1.0.3)
122
123
  loofah (~> 2.0)
123
- railties (5.1.3)
124
- actionpack (= 5.1.3)
125
- activesupport (= 5.1.3)
124
+ railties (5.1.4)
125
+ actionpack (= 5.1.4)
126
+ activesupport (= 5.1.4)
126
127
  method_source
127
128
  rake (>= 0.8.7)
128
129
  thor (>= 0.18.1, < 2.0)
129
- rake (12.0.0)
130
+ rake (12.3.0)
130
131
  smart_excerpt (0.1.5)
131
132
  activesupport
132
133
  htmlentities
133
134
  sprockets (3.7.1)
134
135
  concurrent-ruby (~> 1.0)
135
136
  rack (> 1, < 3)
136
- sprockets-rails (3.2.0)
137
+ sprockets-rails (3.2.1)
137
138
  actionpack (>= 4.0)
138
139
  activesupport (>= 4.0)
139
140
  sprockets (>= 3.0.0)
140
- stringex (2.7.1)
141
+ stringex (2.8.2)
141
142
  thor (0.20.0)
142
143
  thread_safe (0.3.6)
143
- tzinfo (1.2.3)
144
+ tzinfo (1.2.4)
144
145
  thread_safe (~> 0.1)
145
146
  validates_email_format_of (1.6.3)
146
147
  i18n
147
148
  websocket-driver (0.6.5)
148
149
  websocket-extensions (>= 0.1.0)
149
- websocket-extensions (0.1.2)
150
+ websocket-extensions (0.1.3)
150
151
 
151
152
  PLATFORMS
152
153
  ruby
@@ -157,4 +158,4 @@ DEPENDENCIES
157
158
  rocket_cms!
158
159
 
159
160
  BUNDLED WITH
160
- 1.15.4
161
+ 1.16.1
@@ -7,10 +7,14 @@ html lang="ru"
7
7
  = yield :meta
8
8
  = csrf_meta_tags
9
9
  = favicon_link_tag '/favicon.ico'
10
- = stylesheet_link_tag *webpack_asset_paths('vendor', extension: 'css')
11
- = stylesheet_link_tag *webpack_asset_paths('application', extension: 'css')
12
- = javascript_include_tag *webpack_asset_paths('vendor', extension: 'js')
13
- = javascript_include_tag *webpack_asset_paths('application', extension: 'js')
10
+ - if !ENV["WEBPACK_HOST"].blank? && Rails.env.development?
11
+ script src="http://#{ENV["WEBPACK_HOST"]}/webpack/vendor.js"
12
+ script src="http://#{ENV["WEBPACK_HOST"]}/webpack/application.js"
13
+ - else
14
+ = stylesheet_link_tag *webpack_asset_paths('vendor', extension: 'css')
15
+ = stylesheet_link_tag *webpack_asset_paths('application', extension: 'css')
16
+ = javascript_include_tag *webpack_asset_paths('vendor', extension: 'js')
17
+ = javascript_include_tag *webpack_asset_paths('application', extension: 'js')
14
18
 
15
19
  body.no-js
16
20
  = render 'blocks/header'
@@ -22,6 +26,7 @@ html lang="ru"
22
26
  a class="btn-transparent" target="_blank" href="https://yandex.ru/support/common/browsers-settings/browsers-java-js-settings.xml" Включить JavaScript
23
27
 
24
28
  .container
29
+ = render 'shared/messages'
25
30
  = yield
26
31
  #footer
27
32
  = render 'blocks/footer'
@@ -4,40 +4,43 @@
4
4
  "license": "UNLICENSED",
5
5
  "private": true,
6
6
  "repository": "git@rscz.ru:rocket-science/<%= app_name.downcase %>.git",
7
+ "scripts": {
8
+ "start": "./node_modules/.bin/webpack-dev-server --config config/webpack.config.js --hot --inline"
9
+ },
7
10
  "dependencies": {
8
- "autoprefixer": "^7.1.1",
9
- "axios": "^0.16.1",
10
- "babel-cli": "^6.18.0",
11
- "babel-core": "^6.18.2",
12
- "babel-loader": "^7.0.0",
13
- "babel-plugin-lodash": "^3.2.9",
14
- "babel-plugin-transform-runtime": "^6.15.0",
15
- "babel-preset-es2015": "^6.18.0",
16
- "babel-preset-stage-0": "^6.16.0",
17
- "babel-runtime": "^6.20.0",
18
- "bootstrap": "4.0.0-alpha.6",
19
- "compression-webpack-plugin": "^0.4.0",
20
- "css-loader": "^0.28.0",
21
- "extract-text-webpack-plugin": "^2.0.0-rc.3",
22
- "file-loader": "^0.11.1",
11
+ "autoprefixer": "^7.2.5",
12
+ "axios": "^0.17.1",
13
+ "babel-cli": "^6.26.0",
14
+ "babel-core": "^6.26.0",
15
+ "babel-loader": "^7.1.2",
16
+ "babel-plugin-lodash": "^3.3.2",
17
+ "babel-plugin-transform-runtime": "^6.23.0",
18
+ "babel-preset-es2015": "^6.24.1",
19
+ "babel-preset-stage-0": "^6.24.1",
20
+ "babel-runtime": "^6.26.0",
21
+ "bootstrap": "^4.0.0",
22
+ "compression-webpack-plugin": "^1.1.3",
23
+ "css-hot-loader": "^1.3.6",
24
+ "css-loader": "^0.28.9",
25
+ "extract-text-webpack-plugin": "^3.0.2",
26
+ "file-loader": "^1.1.6",
23
27
  "font-awesome": "^4.7.0",
24
- "handlebars": "^4.0.6",
25
- "handlebars-loader": "^1.4.0",
26
- "html-loader": "^0.4.4",
27
- "jquery": "^3.1.1",
28
- "rails-ujs": "^5.1.1",
29
- "js-cookie": "^2.1.3",
30
- "node-sass": "^4.0.0",
31
- "postcss-functions": "^2.1.0",
32
- "postcss-loader": "^2.0.5",
33
- "sass-loader": "^6.0.0",
34
- "stats-webpack-plugin": "^0.6.0",
35
- "style-loader": "^0.18.2",
36
- "turbolinks": "^5.0.0",
37
- "url-loader": "^0.5.7",
38
- "webpack": "^3.0.0",
39
- "webpack-dev-server": "^2.3.0",
40
- "webpack-hot-middleware": "^2.7.1"
28
+ "handlebars": "^4.0.11",
29
+ "handlebars-loader": "^1.6.0",
30
+ "html-loader": "^0.5.5",
31
+ "jquery": "^3.3.1",
32
+ "js-cookie": "^2.2.0",
33
+ "node-sass": "^4.7.2",
34
+ "postcss-functions": "^3.0.0",
35
+ "postcss-loader": "^2.0.10",
36
+ "rails-ujs": "^5.1.4",
37
+ "sass-loader": "^6.0.6",
38
+ "stats-webpack-plugin": "^0.6.2",
39
+ "style-loader": "^0.19.1",
40
+ "turbolinks": "^5.1.1",
41
+ "url-loader": "^0.6.2",
42
+ "webpack": "^3.10.0",
43
+ "webpack-dev-server": "^2.11.1",
44
+ "webpack-hot-middleware": "^2.21.0"
41
45
  }
42
46
  }
43
-
@@ -16,14 +16,13 @@ var devServerPort = 3808;
16
16
  var production = process.env.NODE_ENV === 'production';
17
17
 
18
18
  const extractSass = new ExtractTextPlugin({
19
- filename: "[name].[contenthash].css",
20
- disable: !production
19
+ filename: production ? "[name].[contenthash].css" : "[name].css",
21
20
  });
22
21
 
23
22
  //console.log("dir:", __dirname)
24
23
 
25
24
  var sassExtractor = () => {
26
- return extractSass.extract({
25
+ return ['css-hot-loader'].concat(extractSass.extract({
27
26
  use: [{
28
27
  loader: "css-loader",
29
28
  options: {
@@ -36,7 +35,7 @@ var sassExtractor = () => {
36
35
  }
37
36
  }],
38
37
  fallback: "style-loader"
39
- })
38
+ }));
40
39
  }
41
40
 
42
41
  var config = {
@@ -132,6 +131,7 @@ if (production) {
132
131
 
133
132
  config.devServer = {
134
133
  port: devServerPort,
134
+ disableHostCheck: true,
135
135
  headers: { 'Access-Control-Allow-Origin': '*' },
136
136
  };
137
137
  config.output.publicPath = 'http://' + host + ':' + devServerPort + '/webpack/';
@@ -1,3 +1,3 @@
1
1
  module RocketCMS
2
- VERSION = "0.21.0"
2
+ VERSION = "0.21.1"
3
3
  end
data/template.rb CHANGED
@@ -18,13 +18,14 @@ remove_file 'Gemfile'
18
18
  create_file 'Gemfile' do <<-TEXT
19
19
  source 'https://rubygems.org'
20
20
 
21
- gem 'rails', '5.1.1'
22
- #{if mongoid then "gem 'mongoid', '~> 6.1.0'" else "gem 'pg'" end}
21
+ gem 'rails', '5.1.4'
22
+ #{if mongoid then "gem 'mongoid', '~> 6.1.0'" else "gem 'pg', '~> 0.21.0'" end}
23
23
 
24
24
  gem 'sass'
25
25
 
26
26
  #{if mongoid then "gem 'rocket_cms_mongoid'" else "gem 'rocket_cms_activerecord'" end}
27
27
  gem 'rails_admin', github: 'crowdtask/rails_admin'
28
+ #{"gem 'friendly_id', github: 'norman/friendly_id'" unless mongoid}
28
29
 
29
30
  gem 'slim'
30
31
  gem 'haml'
@@ -45,6 +46,8 @@ gem 'sentry-raven'
45
46
 
46
47
  gem 'uglifier'
47
48
 
49
+ gem 'rs_russian'
50
+
48
51
  # windows
49
52
  gem 'tzinfo-data' if Gem.win_platform?
50
53
  gem 'wdm', '>= 0.1.0' if Gem.win_platform?
@@ -84,6 +87,7 @@ create_file '.gitignore' do <<-TEXT
84
87
 
85
88
  /.bundle
86
89
  /log/*.log
90
+ *.swp
87
91
  /tmp
88
92
  /public/system
89
93
  /public/ckeditor_assets
@@ -111,6 +115,8 @@ create_file 'config/navigation.rb' do <<-TEXT
111
115
  TEXT
112
116
  end
113
117
 
118
+ port = rand(100..999) * 10
119
+
114
120
  remove_file 'README.md'
115
121
  create_file 'README.md', "## #{app_name}
116
122
  Project generated by RocketCMS
@@ -129,6 +135,34 @@ To run (nix/mac):
129
135
  ./node_modules/.bin/webpack-dev-server --config config/webpack.config.js --hot --inline
130
136
  puma
131
137
  ```
138
+
139
+ ## ngrok
140
+ В одном терминале запускаем ngrok на `webpack`
141
+ ```
142
+ ngrok http -host-header=rewrite 0.0.0.0:3808
143
+ ```
144
+ В ответе ищем строку, похожую на
145
+ ```
146
+ Forwarding http://7c68e072.ngrok.io -> 0.0.0.0:3808
147
+ ```
148
+ Достаём из неё хост. В данном примере это ``7c68e072.ngrok.io``
149
+
150
+ Запускаем webpack
151
+ ```
152
+ HOST=0.0.0.0 ./node_modules/.bin/webpack-dev-server --config config/webpack.config.js --hot --inline
153
+ ```
154
+
155
+ Запускаем пуму (меняем ``7c68e072.ngrok.io`` на тот хост, который дал `ngrok`)
156
+ ```
157
+ WEBPACK_HOST=7c68e072.ngrok.io puma
158
+ ```
159
+
160
+ И запускаем `ngrok` второй раз уже для `puma`
161
+ ```
162
+ ngrok http #{port}
163
+ ```
164
+
165
+ Сайт будет доступен по хосту из последнего запущенного `ngrok`
132
166
  "
133
167
 
134
168
  #create_file '.ruby-version', "2.4.0\n"
@@ -364,7 +398,7 @@ Disallow: /
364
398
  TEXT
365
399
  end
366
400
 
367
- port = rand(100..999) * 10
401
+
368
402
 
369
403
  remove_file 'config/puma.rb'
370
404
  create_file 'config/puma.rb' do <<-TEXT
@@ -393,6 +427,8 @@ else
393
427
  #{'shared_dir = "#{base_dir}/shared"'}
394
428
  # Set up socket location
395
429
  #bind 'tcp://0.0.0.0:4000'
430
+ #{'socket_dir = "#{shared_dir}/tmp/puma/"'}
431
+ #{'Dir.mkdir socket_dir unless File.directory? socket_dir'}
396
432
  #{'bind "unix://#{shared_dir}/tmp/puma/socket"'}
397
433
  # Logging
398
434
  #{'stdout_redirect "#{shared_dir}/log/puma.stdout.log", "#{shared_dir}/log/puma.stderr.log", true'}
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.21.0
4
+ version: 0.21.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - glebtv
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-08-30 00:00:00.000000000 Z
11
+ date: 2018-01-25 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -341,7 +341,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
341
341
  version: '0'
342
342
  requirements: []
343
343
  rubyforge_project:
344
- rubygems_version: 2.6.11
344
+ rubygems_version: 2.7.3
345
345
  signing_key:
346
346
  specification_version: 4
347
347
  summary: Please DO NOT use this gem directly, use rocket_cms_mongoid or rocket_cms_activerecord