phobos_db_checkpoint 3.1.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c361b6d8f5d6d96d2d1e4f4e71727c6fa292d6c5
-  data.tar.gz: 347523a5073e6c63dd04204f6f68d3dba692d94f
+  metadata.gz: fb0abf033362b2d16951eea469a851873acbc863
+  data.tar.gz: 6f92192149a9ee9cbf82895c6f13329b4a87b032
 SHA512:
-  metadata.gz: 409e366b4c3d1fdfba0d331cea82b017d306a3518257398dd82b6ddb1bb9ac703a4c3620432ad4acee512f434d61db44651dc5117047f626def442076be56756
-  data.tar.gz: 05bd6ec1d9c0a03c76609afc4f6c862019f3eb32b3299103887cee78af88f8938f06dc83a6cb6ac94d234cbad39e9a62203a993f30b6b72a04390dbd62830742
+  metadata.gz: 54b57b7d287df8fa95916abde5284658c2831588db59863166e8b54061067bde199e6338c251387f72434c1535924038db0a14739523904c3d2878112dc7069d
+  data.tar.gz: 4ec9fda62d8e9e2d74f7ef4db0b94c7e7d983797484d1cafd30911384bae9b1a9c9baa41de76cbe04e2704b1da1c38d201caca61e567e47684d6e765ce959f2f

data/CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## 3.2.0 (2017-10-23)
+
+- [enhancement] Make pool_size only configurable through configuration files
+
 ## 3.1.0 (2017-06-19)
 
 - [enhancement] Add support for erb syntax in database config file

data/README.md

@@ -63,8 +63,8 @@ After this, your app should have access to all db tasks.
 
 ```sh
 $ rake -T
-    rake db:create              # Creates the database from DATABASE_URL or config/database.yml for the current RAILS_ENV (use db:create:all to create all ...
-    rake db:drop                # Drops the database from DATABASE_URL or config/database.yml for the current RAILS_ENV (use db:drop:all to drop all databa...
+    rake db:create              # Creates the database from DATABASE_URL or config/database.yml for the current RACK_ENV (use db:create:all to create all ...
+    rake db:drop                # Drops the database from DATABASE_URL or config/database.yml for the current RACK_ENV (use db:drop:all to drop all databa...
     rake db:environment:set     # Set the environment value for the database
     rake db:fixtures:load       # Loads fixtures into the current environment's database
     rake db:migrate             # Migrate the database (options: VERSION=x, VERBOSE=false, SCOPE=blog)

data/lib/phobos_db_checkpoint.rb

@@ -28,28 +28,39 @@ module PhobosDBCheckpoint
       :phobos_db_checkpoint_
     end
 
-    def configure(pool_size: nil)
-      load_db_config(pool_size: pool_size)
+    def configure(options = {})
+      deprecate('options are deprecated, use configuration files instead') if options.keys.any?
+
+      load_db_config
       at_exit { PhobosDBCheckpoint.close_db_connection }
-      ActiveRecord::Base.establish_connection(db_config)
+      PhobosDBCheckpoint.establish_db_connection
     end
 
     def env
       ENV['RAILS_ENV'] ||= ENV['RACK_ENV'] ||= 'development'
     end
 
-    def load_db_config(pool_size: nil)
+    def load_db_config(options = {})
+      deprecate('options are deprecated, use configuration files instead') if options.keys.any?
+
       @db_config_path ||= ENV['DB_CONFIG'] || DEFAULT_DB_CONFIG_PATH
+
       configs = YAML.load(ERB.new(File.read(File.expand_path(@db_config_path))).result)
       @db_config = configs[env]
 
+      pool_size = @db_config['pool']
+
       if pool_size.nil? && Phobos.config
-        pool_size = Phobos.config.listeners.map { |listener| listener.max_concurrency || 1 }.inject(&:+)
+        pool_size = number_of_concurrent_listeners + DEFAULT_POOL_SIZE
       end
 
       @db_config.merge!('pool' => pool_size || DEFAULT_POOL_SIZE)
     end
 
+    def establish_db_connection
+      ActiveRecord::Base.establish_connection(db_config)
+    end
+
     def close_db_connection
       ActiveRecord::Base.connection_pool.disconnect!
     rescue ActiveRecord::ConnectionNotEstablished
@@ -58,10 +69,19 @@ module PhobosDBCheckpoint
     def load_tasks
       @db_dir ||= DEFAULT_DB_DIR
       @migration_path ||= DEFAULT_MIGRATION_PATH
+
       ActiveRecord::Tasks::DatabaseTasks.send(:define_method, :db_dir) { PhobosDBCheckpoint.db_dir }
       ActiveRecord::Tasks::DatabaseTasks.send(:define_method, :migrations_paths) { [PhobosDBCheckpoint.migration_path] }
       ActiveRecord::Tasks::DatabaseTasks.send(:define_method, :env) { PhobosDBCheckpoint.env }
       require 'phobos_db_checkpoint/tasks'
     end
+
+    def number_of_concurrent_listeners
+      Phobos.config.listeners.map { |listener| listener.max_concurrency || 1 }.inject(&:+) || 0
+    end
+
+    def deprecate(message)
+      warn "DEPRECATION WARNING: #{message} #{Kernel.caller.first}"
+    end
   end
 end

data/lib/phobos_db_checkpoint/cli.rb

@@ -44,7 +44,7 @@ module PhobosDBCheckpoint
         end
 
         unless active_connection?
-          PhobosDBCheckpoint.configure(pool_size: 1)
+          PhobosDBCheckpoint.configure
         end
 
         destination_fullpath = File.join(destination_root, options[:destination])

data/lib/phobos_db_checkpoint/middleware/database.rb

@@ -1,11 +1,10 @@
 module PhobosDBCheckpoint
   module Middleware
     class Database
-
       def initialize(app, options = {})
         @app = app
-        pool_size = options.fetch(:pool_size, PhobosDBCheckpoint::DEFAULT_POOL_SIZE)
-        PhobosDBCheckpoint.configure(pool_size: pool_size)
+        PhobosDBCheckpoint.deprecate('options are deprecated, use configuration files instead') if options.keys.any?
+        PhobosDBCheckpoint.configure
       end
 
       def call(request_env)

data/lib/phobos_db_checkpoint/tasks.rb

@@ -11,7 +11,7 @@ module PhobosDBCheckpoint
 
       task :load_config do
         PhobosDBCheckpoint.load_db_config
-        task_db_config = Hash[PhobosDBCheckpoint.env, PhobosDBCheckpoint.db_config.merge('pool' => 1)]
+        task_db_config = Hash[PhobosDBCheckpoint.env, PhobosDBCheckpoint.db_config]
         ActiveRecord::Tasks::DatabaseTasks.database_configuration = task_db_config
       end
     end

data/lib/phobos_db_checkpoint/version.rb

@@ -1,3 +1,3 @@
 module PhobosDBCheckpoint
-  VERSION = '3.1.0'
+  VERSION = '3.2.0'
 end

data/templates/config.ru

@@ -8,10 +8,6 @@ logger_config = {
   # log_file: 'log/api.log'
 }
 
-database_config = {
-  # pool_size: PhobosDBCheckpoint::DEFAULT_POOL_SIZE # 5
-}
-
 use PhobosDBCheckpoint::Middleware::Logger, logger_config
-use PhobosDBCheckpoint::Middleware::Database, database_config
+use PhobosDBCheckpoint::Middleware::Database
 run PhobosDBCheckpoint::EventsAPI

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phobos_db_checkpoint
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.0
 platform: ruby
 authors:
 - Túlio Ornelas
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-20 00:00:00.000000000 Z
+date: 2017-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler