rocket_cms 0.17.2 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8141984ad138d50e88321bb68ce48ac53ff664b
-  data.tar.gz: 3df0676222b5e746f361771294e4ded9c92e5e48
+  metadata.gz: e1ab7d984edb267c64290200e1cfac357ac83755
+  data.tar.gz: 442812da272f60b2b8b43ef2684bf651ea1f82cf
 SHA512:
-  metadata.gz: fe5ae60c38315c345aa0f1865afa090ade9a8b45eeac5b01ecd078b6d1a782e1213f798d6cc5e3b7562bbb106bdfc7c793f3892beb461cddfb9a4fce6c61048f
-  data.tar.gz: c0bd9409276327bedda529167f2b981f73f1f39ff7c83681a6d86dda610112c8cd097549c272f5354f6ff1d310bc9c8202b148d4b4f8e9e9215d67b824268918
+  metadata.gz: 016c3c3ae20e6a98c069dc0f263938d054507d06f0ce0c7513f9c48d43ae288000efd54edabf4faace0b5b404852287c2afdbf47089368157a68851331ccd786
+  data.tar.gz: 372b8609dadce95ef5b42b7bf7db4db2210ace9626e2f78c7f6e443de96f9d3035476e634b446bf9d20672096e0e0b7ee61b2eca0498e4f27671ae84f9853bbd

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rocket_cms (0.17.2)
+    rocket_cms (0.18.0)
       addressable
       coffee-rails
       jquery-rails
@@ -53,7 +53,7 @@ GEM
       i18n (~> 0.7)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.5.0)
+    addressable (2.5.1)
       public_suffix (~> 2.0, >= 2.0.2)
     arel (7.1.4)
     builder (3.2.3)
@@ -67,8 +67,8 @@ GEM
     concurrent-ruby (1.0.5)
     erubis (2.7.0)
     execjs (2.7.0)
-    globalid (0.3.7)
-      activesupport (>= 4.1.0)
+    globalid (0.4.0)
+      activesupport (>= 4.2.0)
     htmlentities (4.3.4)
     i18n (0.8.1)
     jquery-rails (4.3.1)
@@ -144,7 +144,7 @@ GEM
     turbolinks (5.0.1)
       turbolinks-source (~> 5)
     turbolinks-source (5.0.0)
-    tzinfo (1.2.2)
+    tzinfo (1.2.3)
       thread_safe (~> 0.1)
     validates_email_format_of (1.6.3)
       i18n

data/app/views/layouts/application.html.haml

@@ -8,8 +8,6 @@
     = favicon_link_tag '/favicon.ico'
     = stylesheet_link_tag "application", media: "all"
     = javascript_include_tag "application"
-    /[if lt IE 9]
-      = javascript_include_tag "//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.2/html5shiv.min.js"
   %body
     #root
       = render 'shared/messages'

data/app/views/layouts/application.html.slim

@@ -9,8 +9,6 @@ html lang="ru"
     = favicon_link_tag '/favicon.ico'
     = stylesheet_link_tag "application", media: "all"
     = javascript_include_tag "application"
-    /[if lt IE 9]
-      = javascript_include_tag "//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.2/html5shiv.min.js"
   body
     #root
       = render 'shared/messages'

data/lib/generators/rocket_cms/templates/migration_contact_messages.rb

@@ -1,4 +1,4 @@
-class RocketCmsCreateContactMessages < ActiveRecord::Migration
+class RocketCmsCreateContactMessages < ActiveRecord::Migration[5.0]
   def change
     create_table :contact_messages do |t|
       t.string :name

data/lib/generators/rocket_cms/templates/migration_news.rb

@@ -1,4 +1,4 @@
-class RocketCmsCreateNews < ActiveRecord::Migration
+class RocketCmsCreateNews < ActiveRecord::Migration[5.0]
   def change
     create_table :news do |t|
       t.boolean :enabled, default: true, null: false

data/lib/generators/rocket_cms/templates/migration_pages.rb

@@ -1,4 +1,4 @@
-class RocketCmsCreatePages < ActiveRecord::Migration
+class RocketCmsCreatePages < ActiveRecord::Migration[5.0]
   def change
     create_table :menus do |t|
 
@@ -17,7 +17,7 @@ class RocketCmsCreatePages < ActiveRecord::Migration
       t.integer :parent_id
       t.integer :lft
       t.integer :rgt
-      t.integer :depth 
+      t.integer :depth
 
       if RocketCMS.config.localize
         t.column :name_translations, 'hstore', default: {}

data/lib/generators/rocket_cms/templates/migration_seos.rb

@@ -1,4 +1,4 @@
-class RocketCmsCreateSeos < ActiveRecord::Migration
+class RocketCmsCreateSeos < ActiveRecord::Migration[5.0]
   def change
     create_table :seos do |t|
       t.boolean :enabled, default: true, null: false

data/lib/rocket_cms/version.rb

@@ -1,3 +1,3 @@
 module RocketCMS
-  VERSION = "0.17.2"
+  VERSION = "0.18.0"
 end

data/template.rb

@@ -3,18 +3,20 @@ version = rails_spec.version.to_s
 
 mongoid = options[:skip_active_record]
 
-if Gem::Version.new(version) < Gem::Version.new('4.2.1')
+if Gem::Version.new(version) < Gem::Version.new('5.0.0')
   puts "You are using an old version of Rails (#{version})"
   puts "Please update"
   puts "Stopping"
   exit 1
 end
 
+git :init
+
 remove_file 'Gemfile'
 create_file 'Gemfile' do <<-TEXT
 source 'https://rubygems.org'
 
-gem 'rails', '5.0.1'
+gem 'rails', '5.1.0.rc1'
 #{if mongoid then "gem 'mongoid', '~> 6.1.0'" else "gem 'pg'" end}
 
 gem 'sass'
@@ -22,8 +24,6 @@ gem 'sass'
 #{if mongoid then "gem 'rocket_cms_mongoid'" else "gem 'rocket_cms_activerecord'" end}
 
 gem 'sass-rails'
-gem 'compass-rails'
-
 gem 'slim-rails'
 
 gem 'devise'
@@ -352,24 +352,21 @@ else
   #{'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])
+  on_restart do
+    puts 'Refreshing Gemfile'
+    #{'ENV["BUNDLE_GEMFILE"] = "#{current_dir}/Gemfile" unless rails_env == \'development\''}
+  end
+  #{"#mongoid reconnects by itself" if mongoid}
+  #{'on_worker_boot do
+    require "active_record"
+    ActiveRecord::Base.connection.disconnect! rescue ActiveRecord::ConnectionNotEstablished
+    ActiveRecord::Base.establish_connection(YAML.load_file("#{base_dir}/current/config/database.yml")[rails_env])
+  end' if !mongoid}
 end
 
+TEXT
 end
 
-
 remove_file 'app/views/layouts/application.html.erb'
 
 
@@ -383,6 +380,7 @@ require "active_model/railtie"
 require "action_controller/railtie"
 require "action_mailer/railtie"
 require "action_view/railtie"
+require "action_cable/engine"
 require "sprockets/railtie"
 # require "rails/test_unit/railtie"
 
@@ -423,7 +421,6 @@ end
 
 remove_file 'app/assets/stylesheets/application.css'
 create_file 'app/assets/stylesheets/application.css.sass' do <<-TEXT
-@import 'compass'
 @import 'rocket_cms'
 
 #wrapper
@@ -436,8 +433,6 @@ create_file 'app/assets/stylesheets/application.css.sass' do <<-TEXT
     float: right
     width: 750px
 
-@import "compass/layout/sticky-footer"
-+sticky-footer(50px)
 TEXT
 end
 

metadata

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