rocket_cms 0.16.1 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33b57265a86d22a454ec70273d2746aa35c4b358
-  data.tar.gz: 52360fdeda0dd31f17b195b9a94a4d522102742b
+  metadata.gz: d937c7f2a458dd89a09bfa8663fd7b835d649cf9
+  data.tar.gz: e823e1a647d966fc94f528408ea536f6d1037c96
 SHA512:
-  metadata.gz: 9ba2047778da9bee9eea30a6a73b9f0dc4ee8e3dd4e0ab681e785bd5e40dbd89f4a80bbf9c1407ef473a95cc0bc80f398eac35e7d7978deec099e224febc2b87
-  data.tar.gz: 0c39e887470f713744899b1dada03d96f93b0c84a757fc8c75d0b82e84f41523efaa023e3631b441c06cb246ef4950e909af182d6ea93e9f0e6f3bf2653feb51
+  metadata.gz: 726066e6df80efc7da76c83a5f4043fd4ed8874dd8e0af5d46ad07edc99f24c8ee8489bcda7a2d771ba3d32cee826169567e221e2744dee58f9d0a98fed5f273
+  data.tar.gz: 46c6961ca2a4dbd677a8094058a311e6ace96d86afc25591824d4952b98b4335dfa9144e2b015d10a2577c684a865cc61e70307cbfb8b32aeaf41e0f7ef1e1af

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    rocket_cms (0.16.1)
+    rocket_cms (0.17.0)
       addressable
       coffee-rails
       jquery-rails
       kaminari
-      rails (>= 4.1.0, < 5.1)
+      rails (>= 4.1.0, < 6.0)
       smart_excerpt
       stringex
       thor
@@ -16,67 +16,77 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.0.0.1)
-      actionpack (= 5.0.0.1)
-      nio4r (~> 1.2)
+    actioncable (5.0.2)
+      actionpack (= 5.0.2)
+      nio4r (>= 1.2, < 3.0)
       websocket-driver (~> 0.6.1)
-    actionmailer (5.0.0.1)
-      actionpack (= 5.0.0.1)
-      actionview (= 5.0.0.1)
-      activejob (= 5.0.0.1)
+    actionmailer (5.0.2)
+      actionpack (= 5.0.2)
+      actionview (= 5.0.2)
+      activejob (= 5.0.2)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.0.0.1)
-      actionview (= 5.0.0.1)
-      activesupport (= 5.0.0.1)
+    actionpack (5.0.2)
+      actionview (= 5.0.2)
+      activesupport (= 5.0.2)
       rack (~> 2.0)
       rack-test (~> 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.0.0.1)
-      activesupport (= 5.0.0.1)
+    actionview (5.0.2)
+      activesupport (= 5.0.2)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activejob (5.0.0.1)
-      activesupport (= 5.0.0.1)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (5.0.2)
+      activesupport (= 5.0.2)
       globalid (>= 0.3.6)
-    activemodel (5.0.0.1)
-      activesupport (= 5.0.0.1)
-    activerecord (5.0.0.1)
-      activemodel (= 5.0.0.1)
-      activesupport (= 5.0.0.1)
+    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.0.1)
+    activesupport (5.0.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.4.0)
-    arel (7.1.2)
-    builder (3.2.2)
+    addressable (2.5.0)
+      public_suffix (~> 2.0, >= 2.0.2)
+    arel (7.1.4)
+    builder (3.2.3)
     coffee-rails (4.2.1)
       coffee-script (>= 2.2.0)
       railties (>= 4.0.0, < 5.2.x)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.10.0)
-    concurrent-ruby (1.0.2)
+    coffee-script-source (1.12.2)
+    concurrent-ruby (1.0.5)
     erubis (2.7.0)
     execjs (2.7.0)
     globalid (0.3.7)
       activesupport (>= 4.1.0)
     htmlentities (4.3.4)
-    i18n (0.7.0)
-    jquery-rails (4.2.1)
+    i18n (0.8.1)
+    jquery-rails (4.2.2)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    kaminari (0.17.0)
-      actionpack (>= 3.0.0)
-      activesupport (>= 3.0.0)
+    kaminari (1.0.1)
+      activesupport (>= 4.1.0)
+      kaminari-actionview (= 1.0.1)
+      kaminari-activerecord (= 1.0.1)
+      kaminari-core (= 1.0.1)
+    kaminari-actionview (1.0.1)
+      actionview
+      kaminari-core (= 1.0.1)
+    kaminari-activerecord (1.0.1)
+      activerecord
+      kaminari-core (= 1.0.1)
+    kaminari-core (1.0.1)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
     mail (2.6.4)
@@ -86,50 +96,51 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     mini_portile2 (2.1.0)
-    minitest (5.9.1)
-    nio4r (1.2.1)
-    nokogiri (1.6.8.1)
+    minitest (5.10.1)
+    nio4r (2.0.0)
+    nokogiri (1.7.1)
       mini_portile2 (~> 2.1.0)
+    public_suffix (2.0.5)
     rack (2.0.1)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (5.0.0.1)
-      actioncable (= 5.0.0.1)
-      actionmailer (= 5.0.0.1)
-      actionpack (= 5.0.0.1)
-      actionview (= 5.0.0.1)
-      activejob (= 5.0.0.1)
-      activemodel (= 5.0.0.1)
-      activerecord (= 5.0.0.1)
-      activesupport (= 5.0.0.1)
+    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)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 5.0.0.1)
+      railties (= 5.0.2)
       sprockets-rails (>= 2.0.0)
-    rails-dom-testing (2.0.1)
+    rails-dom-testing (2.0.2)
       activesupport (>= 4.2.0, < 6.0)
-      nokogiri (~> 1.6.0)
+      nokogiri (~> 1.6)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (5.0.0.1)
-      actionpack (= 5.0.0.1)
-      activesupport (= 5.0.0.1)
+    railties (5.0.2)
+      actionpack (= 5.0.2)
+      activesupport (= 5.0.2)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (11.3.0)
+    rake (12.0.0)
     smart_excerpt (0.1.5)
       activesupport
       htmlentities
-    sprockets (3.7.0)
+    sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.2.0)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    stringex (2.6.1)
-    thor (0.19.1)
-    thread_safe (0.3.5)
+    stringex (2.7.1)
+    thor (0.19.4)
+    thread_safe (0.3.6)
     turbolinks (5.0.1)
       turbolinks-source (~> 5)
     turbolinks-source (5.0.0)
@@ -137,7 +148,7 @@ GEM
       thread_safe (~> 0.1)
     validates_email_format_of (1.6.3)
       i18n
-    websocket-driver (0.6.4)
+    websocket-driver (0.6.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)
 
@@ -150,4 +161,4 @@ DEPENDENCIES
   rocket_cms!
 
 BUNDLED WITH
-   1.13.1
+   1.14.6

data/app/controllers/concerns/rs_errors.rb

@@ -46,7 +46,7 @@ module RsErrors
     unless exception.nil?
       Rails.logger.error exception.message
       Rails.logger.error exception.backtrace.join("\n")
-      capture_exception(exception) if defined?(Raven)
+      capture_error(exception)
     end
     render_error(404)
   end
@@ -55,7 +55,7 @@ module RsErrors
     Rails.logger.error "500: #{request.url}"
     Rails.logger.error exception.message
     Rails.logger.error exception.backtrace.join("\n")
-    capture_exception(exception) if defined?(Raven)
+    capture_error(exception)
     begin
       if rails_admin?
         render text: t('rs.errors.internal_error_full', klass: exception.class.name, message: SmartExcerpt.h.strip_tags(exception.message)), status: 500
@@ -70,6 +70,12 @@ module RsErrors
     render_error(500)
   end
 
+  def capture_error(exception)
+    return unless defined?(Raven)
+    # Raven's capture_exception helper method is not defined in rails_admin
+    Raven.capture_exception(exception)
+  end
+
   def render_error(code = 500)
     render template: "errors/error_#{code}", formats: [:html], handlers: [:haml, :slim], layout: RocketCMS.config.error_layout, status: code
   end

data/lib/rocket_cms/version.rb

@@ -1,3 +1,3 @@
 module RocketCMS
-  VERSION = "0.16.1"
+  VERSION = "0.17.0"
 end

data/rocket_cms.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
 
-  spec.add_dependency 'rails', '>= 4.1.0', '< 5.1'
+  spec.add_dependency 'rails', '>= 4.1.0', '< 6.0'
 
   spec.add_dependency 'jquery-rails'
   spec.add_dependency 'coffee-rails'

data/template.rb

@@ -14,8 +14,8 @@ remove_file 'Gemfile'
 create_file 'Gemfile' do <<-TEXT
 source 'https://rubygems.org'
 
-gem 'rails', '4.2.6'
-#{if mongoid then "gem 'mongoid', '~> 5.1.0'" else "gem 'pg'" end}
+gem 'rails', '5.0.1'
+#{if mongoid then "gem 'mongoid', '~> 6.1.0'" else "gem 'pg'" end}
 
 gem 'sass'
 
@@ -25,11 +25,13 @@ gem 'sass-rails'
 gem 'compass-rails'
 
 gem 'slim-rails'
-gem 'rs_russian'
+
+gem 'devise'
+gem 'devise-i18n'
 gem 'cancancan'
 
 gem 'cloner'
-gem 'unicorn'
+gem 'puma'
 gem 'x-real-ip'
 gem 'sentry-raven'
 
@@ -37,11 +39,12 @@ group :development do
   gem 'better_errors'
   gem 'binding_of_caller'
   gem 'pry-rails'
+  gem 'listen'
   gem 'spring'
 
   gem 'capistrano', require: false
-  gem 'glebtv-capistrano-unicorn', require: false
   gem 'capistrano-bundler', require: false
+  gem 'capistrano3-puma', require: false
   gem 'capistrano-rails', require: false
 
   gem 'hipchat'
@@ -73,6 +76,8 @@ create_file '.gitignore' do <<-TEXT
 /public/system
 /public/ckeditor_assets
 /public/assets
+/node_modules
+/public/webpack
 #{if mongoid then '/config/mongoid.yml' else '/config/database.yml' end}
 /config/secrets.yml
 TEXT
@@ -80,18 +85,6 @@ end
 
 create_file 'extra/.gitkeep', ''
 
-if mongoid
-remove_file 'config/initializers/cookies_serializer.rb'
-create_file 'config/initializers/cookies_serializer.rb' do  <<-TEXT
-# Be sure to restart your server when you modify this file.
-# json serializer breaks Devise + Mongoid. DO NOT ENABLE
-# See https://github.com/plataformatec/devise/pull/2882
-# Rails.application.config.action_dispatch.cookies_serializer = :json
-Rails.application.config.action_dispatch.cookies_serializer = :marshal
-TEXT
-end
-end
-
 remove_file 'app/controllers/application_controller.rb'
 create_file 'app/controllers/application_controller.rb' do <<-TEXT
 class ApplicationController < ActionController::Base
@@ -109,7 +102,7 @@ end
 remove_file 'README.md'
 create_file 'README.md', "## #{app_name}\nProject generated by RocketCMS\n\nORM: #{if mongoid then 'Mongoid' else 'ActiveRecord' end}\n\n"
 
-create_file '.ruby-version', "2.3.1\n"
+create_file '.ruby-version', "2.4.0\n"
 create_file '.ruby-gemset', "#{app_name}\n"
 
 run 'bundle install --without production'
@@ -145,7 +138,7 @@ development:
 TEXT
 end
 say "Please create a PostgreSQL user #{app_name.downcase} with password #{app_name.downcase} and a database #{app_name.downcase}_development owned by him for development NOW.", :red
-ask("Press <enter> when done.", true)
+ask("Press <enter> when done.")
 end
 
 unless mongoid
@@ -325,13 +318,57 @@ end
 
 port = rand(100..999) * 10
 
-create_file 'unicorn.conf' do <<-TEXT
-listen #{port}
-worker_processes 1
-timeout 120
+remove_file 'config/puma.rb'
+create_file 'config/puma.rb' do <<-TEXT
+# Min and Max threads per worker
+threads 1, 3
+
+current_dir = File.expand_path("../..", __FILE__)
+base_dir = File.expand_path("../../..", __FILE__)
+
+
+# rackup DefaultRackup
+
+# Default to production
+rails_env = ENV['RACK_ENV'] || ENV['RAILS_ENV'] || "development"
+environment rails_env
+
+if rails_env == 'development'
+  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
+  prune_bundler
+  preload_app!
+  # Change to match your CPU core count
+  workers 1
+  #{'shared_dir = "#{base_dir}/shared"'}
+  # Set up socket location
+  #bind 'tcp://0.0.0.0:4000'
+  #{'bind "unix://#{shared_dir}/tmp/puma/socket"'}
+  # Logging
+  #{'stdout_redirect "#{shared_dir}/log/puma.stdout.log", "#{shared_dir}/log/puma.stderr.log", true'}
+  # Set master PID and state locations
+  #{'pidfile "#{shared_dir}/tmp/puma/pid"'}
+  #{'state_path "#{shared_dir}/tmp/puma/state"'}
+  activate_control_app
 TEXT
 end
 
+on_restart do
+  puts 'Refreshing Gemfile'
+  ENV["BUNDLE_GEMFILE"] = "#{current_dir}/Gemfile" unless rails_env == 'development'
+end
+
+# mongoid reconnects by itself
+on_worker_boot do
+  require "active_record"
+  ActiveRecord::Base.connection.disconnect! rescue ActiveRecord::ConnectionNotEstablished
+  ActiveRecord::Base.establish_connection(YAML.load_file("#{current_dir}/config/database.yml")[rails_env])
+end
+
+end
+
 
 remove_file 'app/views/layouts/application.html.erb'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rocket_cms
 version: !ruby/object:Gem::Version
-  version: 0.16.1
+  version: 0.17.0
 platform: ruby
 authors:
 - glebtv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-05 00:00:00.000000000 Z
+date: 2017-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -47,7 +47,7 @@ dependencies:
         version: 4.1.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -57,7 +57,7 @@ dependencies:
         version: 4.1.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -349,7 +349,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Please DO NOT use this gem directly, use rocket_cms_mongoid or rocket_cms_activerecord