onotole 1.1.15 → 1.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6ff42ba06b4286a0f01b1bc40141b0bedad666a
-  data.tar.gz: c470f375a1dc97127b247bb944f008c3d7e228b5
+  metadata.gz: 6a8dd7dd3a3fb81888507b9e11c1bbdc75df569a
+  data.tar.gz: 96a65d4e644a0b0152d9e53961f3173462f8707e
 SHA512:
-  metadata.gz: aa5cb35fc96f5b948fd9639528ba3f15db15c8da18d91f65f97d85eb7df6c9fa42771f109bbefd48c4875eb44c2e62467998e6792348bcd0387d61c45a6d574f
-  data.tar.gz: 78efe3f6ba31f82c34adc7d468d8800fb7dd0d969d9ef2411a49c9728f01afc10c35a98a7aed63c14a71c7d6b8c45cfab981d7f8692650848060d79b620ad8d5
+  metadata.gz: 6480755542c48aee82f3ff5eed19dbca350baef01308fde0be2eee24ea1cbedcb398a72de7df1336cb5e3447d55ce1c0f6fe2b8c03cfecd3271f7bc561c195f7
+  data.tar.gz: 71e1114bc65b14ca181c539fad15e8a95bb4c04868e8d26408dc0e1c1955a3251243579a686e6dfcd53d7425a3012683aa2bb2cb78b01b4c9ee627061d3dbff4

data/README.md

@@ -318,6 +318,10 @@ selected for pretty view from the box
 * No need to add `rails_helper` or `spec_helper` in specs.
 * In `.env` just switch on `#{app_name}_COVERAGE` to true and get your test 
 coverage.
+* Added `kaminari-i18n` installation with `ActiveAdmin` or `kaminari` gem
+* Moved asset gems in assets group in Gemfile
+* Disable logging and deferred garbage collecting gives up 20% test speed 
+improvement
 
 ## Heroku
 

data/goodies/tests_speed_up_hack.md

@@ -0,0 +1,41 @@
+There are 2 tricky methods to speed up your tests in Onotole. It made up to 25%
+boost. At first you need to disable logging in tests (usually you do not read 
+it). [see](http://blog.plataformatec.com.br/2011/12/three-tips-to-improve-the-performance-of-your-test-suite/)
+
+```
+Rails.logger.level = 4
+```
+
+And the second one is to differ garbage collection, by adding `garbage.rb` file 
+
+```
+class DeferredGarbageCollection
+  DEFERRED_GC_THRESHOLD = (ENV['DEFER_GC'] || 15.0).to_f
+
+  @last_gc_run = Time.now
+
+  def self.start
+    GC.disable
+  end
+
+  def self.reconsider
+    if Time.now - @last_gc_run >= DEFERRED_GC_THRESHOLD
+      GC.enable
+      GC.start
+      GC.disable
+      @last_gc_run = Time.now
+    end
+  end
+end
+```
+
+And make it running with this snippet of code
+```
+unless ENV['DEFER_GC'] == '0' || ENV['DEFER_GC'] == 'false'
+  require 'support/deferred_garbage_collection'
+  RSpec.configure do |config|
+    config.before(:all) { DeferredGarbageCollection.start }
+    config.after(:all)  { DeferredGarbageCollection.reconsider }
+  end
+end
+```

data/lib/onotole/add_user_gems/after_install_patch.rb

@@ -290,6 +290,8 @@ end
 
     def after_install_ckeditor
       append_file(AppBuilder.js_file, "\n#= require ckeditor/init")
+      append_file('config/initializers/assets.rb',
+                  "\nRails.application.config.assets.precompile += %w( ckeditor/* )")
     end
 
     def after_install_image_optim

data/lib/onotole/add_user_gems/before_bundle_patch.rb

@@ -13,7 +13,7 @@ module Onotole
     end
 
     def add_haml_gem
-      inject_into_file('Gemfile', "\ngem 'haml-rails'", after: '# user_choice')
+      inject_into_file('Gemfile', "\ngem 'haml-rails'", after: 'group :assets do')
     end
 
     def add_dotenv_heroku_gem
@@ -23,7 +23,7 @@ module Onotole
     end
 
     def add_slim_gem
-      inject_into_file('Gemfile', "\ngem 'slim-rails'", after: '# user_choice')
+      inject_into_file('Gemfile', "\ngem 'slim-rails'", after: 'group :assets do')
       inject_into_file('Gemfile', "\n  gem 'html2slim'", after: 'group :development do')
     end
 
@@ -165,6 +165,7 @@ module Onotole
 
     def add_activeadmin_gem
       inject_into_file('Gemfile', "\ngem 'activeadmin', github: 'activeadmin'", after: '# user_choice')
+      inject_into_file('Gemfile', "\ngem 'kaminari-i18n'", after: '# user_choice')
       copy_file 'activeadmin.en.yml', 'config/locales/activeadmin.en.yml'
       copy_file 'activeadmin.ru.yml', 'config/locales/activeadmin.ru.yml'
       # it still live https://github.com/Prelang/feedback/issues/14 and this patch helps
@@ -203,6 +204,7 @@ module Onotole
 
     def add_kaminari_gem
       inject_into_file('Gemfile', "\ngem 'kaminari'", after: '# user_choice')
+      inject_into_file('Gemfile', "\ngem 'kaminari-i18n'", after: '# user_choice')
       copy_file 'kaminari.rb', 'config/initializers/kaminari.rb'
       inject_into_file('Gemfile', "\ngem 'bootstrap-kaminari-views'",
                        after: '# user_choice') if user_choose?(:bootstrap3) ||

data/lib/onotole/tests.rb

@@ -28,6 +28,7 @@ end
       remove_file 'spec/rails_helper.rb'
       remove_file 'spec/spec_helper.rb'
       copy_file 'rails_helper.rb', 'spec/rails_helper.rb'
+      copy_file 'deferred_garbage_collection.rb', 'spec/deferred_garbage_collection.rb'
       template 'spec_helper.rb.erb', 'spec/spec_helper.rb'
     end
 

data/lib/onotole/version.rb

@@ -2,5 +2,5 @@
 module Onotole
   RAILS_VERSION = '~> 4.2.0'
   RUBY_VERSION = IO.read("#{File.dirname(__FILE__)}/../../.ruby-version").strip
-  VERSION = '1.1.15'
+  VERSION = '1.1.16'
 end

data/templates/Gemfile.erb

@@ -2,8 +2,6 @@ source "https://rubygems.org"
 
 ruby "<%= Onotole::RUBY_VERSION %>"
 
-gem "autoprefixer-rails"
-gem "coffee-rails", "~> 4.1.0"
 gem "delayed_job_active_record"
 gem "flutie"
 gem "high_voltage"
@@ -13,16 +11,21 @@ gem "pg"
 gem "puma"
 gem "rack-canonical-host"
 gem "rails", "<%= Onotole::RAILS_VERSION %>"
-gem "sass-rails", "~> 5.0"
 gem "simple_form"
 gem "title"
-gem "uglifier"
 gem "therubyracer"
-gem 'rake', '~> 10.5.0'
+gem 'rake', '~> 11.1.0'
 gem "awesome_print", :require=>"ap"
 gem "dotenv-rails"
 # user_choice
 
+group :assets do
+  gem "sass-rails", "~> 5.0"
+  gem "autoprefixer-rails"
+  gem "coffee-rails", "~> 4.1.0"
+  gem "uglifier"
+end
+
 group :development do
   gem "quiet_assets"
   gem "spring"

data/templates/deferred_garbage_collection.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+class DeferredGarbageCollection
+  DEFERRED_GC_THRESHOLD = (ENV['DEFER_GC'] || 15.0).to_f
+
+  @last_gc_run = Time.zone.now
+
+  def self.start
+    GC.disable
+  end
+
+  def self.reconsider
+    if Time.zone.now - @last_gc_run >= DEFERRED_GC_THRESHOLD
+      GC.enable
+      GC.start
+      GC.disable
+      @last_gc_run = Time.zone.now
+    end
+  end
+end

data/templates/dotenv.erb

@@ -14,3 +14,4 @@ EXECJS_RUNTIME=Node
 <%= "#{app_name.upcase}_MAX_THREADS=16" %>
 <%= "#{app_name.upcase}_RAILS_SERVE_STATIC_FILES=true" %>
 <%= "#{app_name.upcase}_COVERAGE=false" %>
+DEFER_GC=1

data/templates/dotfiles/.pryrc

@@ -1,8 +1,25 @@
-require 'hirb'
+begin
+  require 'hirb'
+rescue LoadError
+  # Missing goodies, bummer
+end
+
+if defined? Hirb
+  # Slightly dirty hack to fully support in-session Hirb.disable/enable toggling
+  Hirb::View.instance_eval do
+    def enable_output_method
+      @output_method = true
+      @old_print = Pry.config.print
+      Pry.config.print = proc do |*args|
+        Hirb::View.view_or_page_output(args[1]) || @old_print.call(*args)
+      end
+    end
 
-Hirb.enable
+    def disable_output_method
+      Pry.config.print = @old_print
+      @output_method = nil
+    end
+  end
 
-old_print = Pry.config.print
-Pry.config.print = proc do |*args|
-  Hirb::View.view_or_page_output(args[1]) || old_print.call(*args)
+  Hirb.enable
 end

data/templates/postgresql_database.yml.erb

@@ -12,6 +12,8 @@ test:
   database: <%= app_name %>_test
 
 production: &deploy
+  adapter: postgresql
+  database: <%= app_name %>_production
   encoding: utf8
   min_messages: warning
   pool: <%%= [Integer(ENV.fetch("MAX_THREADS", 5)), Integer(ENV.fetch("DB_POOL", 5))].max %>

data/templates/rails_helper.rb

@@ -22,3 +22,14 @@ RSpec.configure do |config|
 end
 
 ActiveRecord::Migration.maintain_test_schema!
+
+Rails.logger.level = 4
+
+# Improves performance by forcing the garbage collector to run less often.
+unless ENV['DEFER_GC'] == '0' || ENV['DEFER_GC'] == 'false'
+  require 'support/deferred_garbage_collection'
+  RSpec.configure do |config|
+    config.before(:all) { DeferredGarbageCollection.start }
+    config.after(:all)  { DeferredGarbageCollection.reconsider }
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onotole
 version: !ruby/object:Gem::Version
-  version: 1.1.15
+  version: 1.1.16
 platform: ruby
 authors:
 - kvokka
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-09 00:00:00.000000000 Z
+date: 2016-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -84,6 +84,7 @@ files:
 - bin/setup
 - goodies/custom_404_and_others_in_1_minute.md
 - goodies/mailcatcher_loading_patch.md
+- goodies/tests_speed_up_hack.md
 - lib/onotole.rb
 - lib/onotole/actions.rb
 - lib/onotole/adapters/heroku.rb
@@ -139,6 +140,7 @@ files:
 - templates/config_locales_en.yml.erb
 - templates/config_locales_ru.yml.erb
 - templates/database_cleaner_rspec.rb
+- templates/deferred_garbage_collection.rb
 - templates/dev.rake
 - templates/devise.ru.yml
 - templates/devise_rspec.rb