rocket_cms 0.18.4 → 0.18.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b435b8c077a9deb76c4029437459f6897e681d4
-  data.tar.gz: 84ce9a9fe8e1d5516c64fc24c7ec9a764b191a3b
+  metadata.gz: ef7090fc22b2e721d1471f3367da8d0f884bfff0
+  data.tar.gz: ade5fa86bdbc5971e4389dec736bb410359fbb67
 SHA512:
-  metadata.gz: b11a491a9486d5a392d6003659ca837ca98347b8a12e17e74248794e6828a1e5a51b4defa94c968ed0bea21b4810ba1ebca479e75f3ba085ff14c91f00ad48c4
-  data.tar.gz: dc3abff1d1d672e7a6af833fc59f4b1fd3127ab02a46993f91b57f8814a67348e7e9da42d42427022900f4e16b562dbd1dc01093dee25e5248e47ffae3a2859b
+  metadata.gz: d4e88e3c84ccb991e7d0a0e929dd9f82fcee863087b7f372135e6b744d1600e8cb0b148d643a684bb2273921321cfe84e413e7c17d80ade9841b9bd824864305
+  data.tar.gz: '09d2d2dbf3d6150a92c5d9189e0a84f54d550da70d337d413b8c8e4cff4ed7dc12a73d38a1b77c05cd061787fbdd51347e76c7a9a57494bdf47c646d9c3a7bbe'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rocket_cms (0.18.4)
+    rocket_cms (0.18.5)
       addressable
       coffee-rails
       jquery-rails
@@ -16,46 +16,46 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.0.2)
-      actionpack (= 5.0.2)
-      nio4r (>= 1.2, < 3.0)
+    actioncable (5.1.0)
+      actionpack (= 5.1.0)
+      nio4r (~> 2.0)
       websocket-driver (~> 0.6.1)
-    actionmailer (5.0.2)
-      actionpack (= 5.0.2)
-      actionview (= 5.0.2)
-      activejob (= 5.0.2)
+    actionmailer (5.1.0)
+      actionpack (= 5.1.0)
+      actionview (= 5.1.0)
+      activejob (= 5.1.0)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.0.2)
-      actionview (= 5.0.2)
-      activesupport (= 5.0.2)
+    actionpack (5.1.0)
+      actionview (= 5.1.0)
+      activesupport (= 5.1.0)
       rack (~> 2.0)
       rack-test (~> 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.0.2)
-      activesupport (= 5.0.2)
+    actionview (5.1.0)
+      activesupport (= 5.1.0)
       builder (~> 3.1)
-      erubis (~> 2.7.0)
+      erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.0.2)
-      activesupport (= 5.0.2)
+    activejob (5.1.0)
+      activesupport (= 5.1.0)
       globalid (>= 0.3.6)
-    activemodel (5.0.2)
-      activesupport (= 5.0.2)
-    activerecord (5.0.2)
-      activemodel (= 5.0.2)
-      activesupport (= 5.0.2)
-      arel (~> 7.0)
-    activesupport (5.0.2)
+    activemodel (5.1.0)
+      activesupport (= 5.1.0)
+    activerecord (5.1.0)
+      activemodel (= 5.1.0)
+      activesupport (= 5.1.0)
+      arel (~> 8.0)
+    activesupport (5.1.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     addressable (2.5.1)
       public_suffix (~> 2.0, >= 2.0.2)
-    arel (7.1.4)
+    arel (8.0.0)
     builder (3.2.3)
     coffee-rails (4.2.1)
       coffee-script (>= 2.2.0)
@@ -65,7 +65,7 @@ GEM
       execjs
     coffee-script-source (1.12.2)
     concurrent-ruby (1.0.5)
-    erubis (2.7.0)
+    erubi (1.6.0)
     execjs (2.7.0)
     globalid (0.4.0)
       activesupport (>= 4.2.0)
@@ -89,41 +89,41 @@ GEM
     kaminari-core (1.0.1)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
-    mail (2.6.4)
+    mail (2.6.5)
       mime-types (>= 1.16, < 4)
     method_source (0.8.2)
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     mini_portile2 (2.1.0)
-    minitest (5.10.1)
+    minitest (5.10.2)
     nio4r (2.0.0)
-    nokogiri (1.7.1)
+    nokogiri (1.7.2)
       mini_portile2 (~> 2.1.0)
     public_suffix (2.0.5)
-    rack (2.0.1)
+    rack (2.0.2)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (5.0.2)
-      actioncable (= 5.0.2)
-      actionmailer (= 5.0.2)
-      actionpack (= 5.0.2)
-      actionview (= 5.0.2)
-      activejob (= 5.0.2)
-      activemodel (= 5.0.2)
-      activerecord (= 5.0.2)
-      activesupport (= 5.0.2)
+    rails (5.1.0)
+      actioncable (= 5.1.0)
+      actionmailer (= 5.1.0)
+      actionpack (= 5.1.0)
+      actionview (= 5.1.0)
+      activejob (= 5.1.0)
+      activemodel (= 5.1.0)
+      activerecord (= 5.1.0)
+      activesupport (= 5.1.0)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 5.0.2)
+      railties (= 5.1.0)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.2)
       activesupport (>= 4.2.0, < 6.0)
       nokogiri (~> 1.6)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (5.0.2)
-      actionpack (= 5.0.2)
-      activesupport (= 5.0.2)
+    railties (5.1.0)
+      actionpack (= 5.1.0)
+      activesupport (= 5.1.0)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
@@ -143,7 +143,7 @@ GEM
     thread_safe (0.3.6)
     turbolinks (5.0.1)
       turbolinks-source (~> 5)
-    turbolinks-source (5.0.0)
+    turbolinks-source (5.0.3)
     tzinfo (1.2.3)
       thread_safe (~> 0.1)
     validates_email_format_of (1.6.3)

data/README.md

@@ -10,7 +10,7 @@ What's in the box when you generate a new app:
 - JS packages via package.json
 - Capistrano deploy (including puma and webpack)
 - Puma in production and in development
-- Windows support
+- Basic windows support (development env only)
 - Basic CMS models and controllers (Pages + SEO, News, Contact form with mailer, menu)
 - Menu via SimpleNavigation
 - Ckeditor with image upload support
@@ -62,11 +62,11 @@ If not, uninstall rails and install again
 
 Then, for mongoid:
 
-    rails new my_app -T -O -m https://raw.githubusercontent.com/rs-pro/rocket_cms/master/template.rb --yarn --skip-spring
+    rails new my_app -T -O -m https://raw.githubusercontent.com/rs-pro/rocket_cms/master/template.rb --skip-spring
 
 for ActiveRecord:
 
-    rails new my_app -T --database=postgresql -m https://raw.githubusercontent.com/rs-pro/rocket_cms/master/template.rb --yarn --skip-spring
+    rails new my_app -T --database=postgresql -m https://raw.githubusercontent.com/rs-pro/rocket_cms/master/template.rb --skip-spring
 
 generator creates a new RVM gemset, so after cd'ing to app dir, you should run `bundle install` again if you use rvm.
 

data/app/views/blocks/_footer.slim

@@ -1,2 +1,2 @@
 footer
-  | (c) 2014 etc
+  | (c) #{Date.year}

data/lib/generators/rocket_cms/templates/webpack.config.js

@@ -25,8 +25,6 @@ const extractSass = new ExtractTextPlugin({
 var sassExtractor = () => {
   return extractSass.extract({
     use: [{
-      loader: "style-loader"
-    }, {
       loader: "css-loader",
       options: {
         sourceMap: true

data/lib/rocket_cms/version.rb

@@ -1,3 +1,3 @@
 module RocketCMS
-  VERSION = "0.18.4"
+  VERSION = "0.18.5"
 end

data/template.rb

@@ -2,7 +2,8 @@ rails_spec = (Gem.loaded_specs["railties"] || Gem.loaded_specs["rails"])
 version = rails_spec.version.to_s
 
 mongoid = options[:skip_active_record]
-yarn = options[:yarn]
+yarn = !options[:skip_yarn]
+spring = !options[:skip_spring]
 
 if Gem::Version.new(version) < Gem::Version.new('5.0.0')
   puts "You are using an old version of Rails (#{version})"
@@ -17,7 +18,7 @@ remove_file 'Gemfile'
 create_file 'Gemfile' do <<-TEXT
 source 'https://rubygems.org'
 
-gem 'rails', '5.1.0.rc1'
+gem 'rails', '5.1.0.rc2'
 #{if mongoid then "gem 'mongoid', '~> 6.1.0'" else "gem 'pg'" end}
 
 gem 'sass'
@@ -27,6 +28,8 @@ gem 'rails_admin', github: 'crowdtask/rails_admin'
 
 gem 'slim', github: 'slim-template/slim'
 gem 'haml', github: 'haml/haml'
+#{"gem 'friendly_id', github: 'glebtv/friendly_id'" if !mongoid}
+
 gem 'sass-rails'
 gem 'webpack-rails'
 
@@ -43,7 +46,7 @@ gem 'sentry-raven'
 gem 'uglifier'
 
 # windows
-gem 'tzinfo-data'
+gem 'tzinfo-data' if Gem.win_platform?
 gem 'wdm', '>= 0.1.0' if Gem.win_platform?
 
 group :development do
@@ -51,6 +54,7 @@ group :development do
   gem 'binding_of_caller'
   gem 'pry-rails'
   gem 'listen'
+  #{"gem 'spring'" if spring}
 
   gem 'capistrano', require: false
   gem 'capistrano-bundler', require: false
@@ -380,7 +384,7 @@ rails_env = ENV['RACK_ENV'] || ENV['RAILS_ENV'] || "development"
 environment rails_env
 
 if rails_env == 'development'
-  workers 1
+  Puma.windows? { workers 1 }
   bind 'tcp://0.0.0.0:#{port}'
 else
   # https://github.com/seuros/capistrano-puma/blob/642d141ee502546bd5a43a76cd9f6766dc0fcc7a/lib/capistrano/templates/puma.rb.erb#L25
@@ -485,7 +489,8 @@ end
 FileUtils.cp(Pathname.new(destination_root).join('config', 'secrets.yml').to_s, Pathname.new(destination_root).join('config', 'secrets.yml.example').to_s)
 
 unless mongoid
-  generate "paper_trail:install", "--with-associations"
+  #generate "paper_trail:install", "--with-associations"
+  generate "paper_trail:install"
   generate "friendly_id"
   rake "db:migrate"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rocket_cms
 version: !ruby/object:Gem::Version
-  version: 0.18.4
+  version: 0.18.5
 platform: ruby
 authors:
 - glebtv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-25 00:00:00.000000000 Z
+date: 2017-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler