jt-rails-toolbox 2.4.2 → 2.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 231163191bbaeda9de0286cb180115b111e967e1
-  data.tar.gz: 4e37135b6cde94b4caa50702932ba3e7c5fc3218
+  metadata.gz: 8efeb85d5103a77b383af309a088ff46ba4c0f06
+  data.tar.gz: ec59f9e4bbe1e748fc538bc830ee373beb0f098b
 SHA512:
-  metadata.gz: e815892b0674f6cee84babb07dffe7f5dc961e808c7c2fe71cba5cb9ffb459dc98d2b4a1161aa66ece624f0682fc0ac2b76f71e7f9e8609d174a68885a20fafb
-  data.tar.gz: c49eff8920869ae80df033a65e81d096f58ead0b4fa0aea3f19cfa421f3df3c5273a2b205dbb05b612b64e374c3e8ac83dd095e85080c891da6166f57dc7cedc
+  metadata.gz: 2ca76fb38baeff44a943aaf7753a0654beb1f8f47f1784e476e35c6c42b687c77814ba02af8f302b80db5a4e7bc533ab3dde70e9249719e1acb2bfc8ae7942c6
+  data.tar.gz: cb71dd3f7101474347b8fc2b1edc8bd12236a6ce8a5bf93d986c44aa8c5e94767601f3f716033da132473166e6e3cd88df0050705cdb32b6146d44b633912373

data/jt-rails-toolbox.gemspec

@@ -3,7 +3,7 @@ Gem::Specification.new do |s|
 	s.summary = "Common libs used for Ruby On Rails development."
 	s.description = "JTRailsToolbox contains a list of common libs used for Ruby On Rails development."
 	s.homepage = 'https://github.com/jonathantribouharet/jt-rails-toolbox'
-	s.version = '2.4.2'
+	s.version = '2.4.3'
 	s.files = `git ls-files`.split("\n")
 	s.require_paths = ['lib']
 	s.authors = ['Jonathan TRIBOUHARET']

data/lib/generators/jt/toolbox/templates/jt-toolbox.yml

@@ -10,6 +10,10 @@
 #   sidekiq:
 #     redis_url: redis://localhost:6379/nameoftheapp
 # 
+# development:
+#   sidekiq:
+#     disable: true
+# 
 # production:
 #   exception:
 #     airbrake:

data/lib/jt-rails-toolbox.rb

@@ -1,7 +1,6 @@
 require 'dotenv/rails-now'
 require 'http_accept_language'
 require 'paperclip'
-require 'sidekiq'
 require 'validates_email_format_of'
 require 'validates_phone_format_of'
 require 'rails_i18n'
@@ -11,10 +10,6 @@ require 'jt-rails-tokenizable'
 
 require 'yaml'
 
-# Don't move this require
-require 'airbrake'
-require 'airbrake/sidekiq/error_handler'
-
 module JTRailsToolbox
 
 	class Engine < ::Rails::Engine
@@ -30,10 +25,10 @@ module JTRailsToolbox
 			end
 
 			process_params
+			configure_sidekiq(app)
 			configure_exception_notification(app)
 			configure_mail(app)
 			configure_paperclip(app)
-			configure_sidekiq(app)
 		end
 
 		def process_params
@@ -68,6 +63,7 @@ module JTRailsToolbox
 			# Should avoid namespace with Redis
 			# http://www.mikeperham.com/2015/09/24/storing-data-with-redis/
 			@params['sidekiq'] ||= {}
+			@params['sidekiq']['disable'] ||= false
 			@params['sidekiq']['redis_url'] ||= "redis://localhost:6379/0"
 			@params['sidekiq']['namespace'] ||= "#{Rails.application.class.parent_name.parameterize}#{Rails.env.production? ? '' : "-#{Rails.env.to_s}"}"
 		end
@@ -77,6 +73,9 @@ module JTRailsToolbox
 
 			if @params['exception']['airbrake']
 
+				require 'airbrake'
+				require 'airbrake/sidekiq/error_handler' unless sidekiq_disabled?
+
 				Airbrake.configure do |c|
 					if @params['exception']['airbrake']['host']
 						c.host = @params['exception']['airbrake']['host']
@@ -109,7 +108,7 @@ module JTRailsToolbox
 
 			require 'exception_notification'
 			require 'exception_notification/rails'
-			require 'exception_notification/sidekiq'
+			require 'exception_notification/sidekiq' unless sidekiq_disabled?
 
 			ExceptionNotification.configure do |config|
 				config.ignored_exceptions += %w{ActionController::InvalidCrossOriginRequest ActionController::InvalidAuthenticityToken}
@@ -142,7 +141,7 @@ module JTRailsToolbox
 			# Strip meta data from images
 			Paperclip::Attachment.default_options[:convert_options] = { all: '-strip' }
 
-			# Params in url are bad for SEO, it's better to use fingerprint for having a unique url
+			# Params in url are bad for SEO, it's better to use fingerprint for having an unique url
 			Paperclip::Attachment.default_options[:use_timestamp] = false
 
 			path = "#{@params['files']['folder']}/:class/:attachment/:id/:style/:fingerprint.:content_type_extension"
@@ -155,6 +154,10 @@ module JTRailsToolbox
 		end
 
 		def configure_sidekiq(app)
+			return if sidekiq_disabled?
+
+			require 'sidekiq'
+
 			Sidekiq.configure_server do |config|
 				config.redis = { url: @params['sidekiq']['redis_url'], namespace: @params['sidekiq']['namespace'] }
 			end
@@ -166,6 +169,10 @@ module JTRailsToolbox
 			ActiveJob::Base.queue_adapter = :sidekiq
 		end
 
+		def sidekiq_disabled?
+			@params['sidekiq']['disable'] == true
+		end
+
 	end
 		
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jt-rails-toolbox
 version: !ruby/object:Gem::Version
-  version: 2.4.2
+  version: 2.4.3
 platform: ruby
 authors:
 - Jonathan TRIBOUHARET
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-02 00:00:00.000000000 Z
+date: 2017-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails