puma-heroku 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 283944cd07f62a4882eb07c711d06ccc9b611e0e
-  data.tar.gz: 01bac0bcaf41efac22a9a4fe8c0f6924fac22a1a
+SHA256:
+  metadata.gz: 216d3ac5271277c9fd8fdbd5609a1821bf1ca092310bfbeda0c93ceed20747ef
+  data.tar.gz: 1f87bd9dadc93c0f27dce7c2a235d9c2d4eeca405739ed0952401e3eda43440e
 SHA512:
-  metadata.gz: 37d8b04544d39146b3269e5cdd42ec73bb28ac9a5d75cda610ddaf72640b04f1c10723b90546106edbb6016a288e5b266e167bb08c032a85bbe64d9a528da489
-  data.tar.gz: ee513de4d0e120f7f1c5af3a1b2433afa87e3e8d4c4b3f9cc6379d29259897b6d2c7c23712738d19cb193f5f4b3557b20a845938b6727e64d266e5266bcf854e
+  metadata.gz: eba79fb8ca09ddc005480a21a277308b31368f54fada4459c247fe5dbe6140e6610efa4fe8aa13753be8e2c8ddc4ff1ed7f635e53581b88c48f8bdaf52e0cebf
+  data.tar.gz: 5500a25ba768c628cd85b6548d9003e6f2dda68174f9761779b2170a0eff0e77d36c0a27dad8a6eb80c9ddb51160b02fe417eed56ab1441be80c2ee8c31d720f

data/README.md

@@ -1,8 +1,9 @@
-# Puma::Heroku
+# puma-heroku
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/puma/heroku`. To experiment with that code, run `bin/console` for an interactive prompt.
+A Puma plugin with best-practices configuration and handy configuration
+variables for Heroku deployments.
 
-TODO: Delete this and the text above, and describe your gem
+You can read Heroku's documentation on the topic [here](https://devcenter.heroku.com/articles/deploying-rails-applications-with-the-puma-web-server). Most of the ideas there apply to all ruby apps running on Puma. Important Note: In that article, Heroku uses a different (rails-specific) environment variable for configuring threads. This plugin uses the generic `MAX_THREADS`, but will use `RAILS_MAX_THREADS` if available.
 
 ## Installation
 
@@ -19,23 +20,22 @@ And then execute:
 Or install it yourself as:
 
     $ gem install puma-heroku
+    
+Then add to your puma config.rb:
 
-## Usage
-
-TODO: Write usage instructions here
-
-## Development
+    # config/puma.rb
+    plugin 'heroku'
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+## Usage
 
-## Contributing
+Read about how to configure puma to use this plugin here: https://github.com/puma/puma#plugins
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/puma-heroku.
+There are two variables this plugin reads from the environment which control its behavior.
 
+* `WEB_CONCURRENCY` — How many workers to run. This will be ignored on JRuby and Windows, where only 1 worker will be run.
+* `MAX_THREADS` — The number of threads to run per worker. Note that this also sets the minimum number of threads to the same value, which is a recommended approach, especially in a single-app environment such as Heroku. If you are using Rails, you may want to use `RAILS_MAX_THREADS` instead, which is also supported.
 
 ## License
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
-

data/Rakefile

@@ -1,10 +1 @@
 require "bundler/gem_tasks"
-require "rake/testtask"
-
-Rake::TestTask.new(:test) do |t|
-  t.libs << "test"
-  t.libs << "lib"
-  t.test_files = FileList['test/**/*_test.rb']
-end
-
-task :default => :spec

data/lib/puma/plugin/heroku.rb

@@ -1,26 +1,23 @@
 Puma::Plugin.create do
   def config(c)
-
-    threads_count = Integer(ENV['MAX_THREADS'] || 5)
+    workers_count = Integer(ENV['WEB_CONCURRENCY'] || 1)
+    threads_count = Integer(ENV['RAILS_MAX_THREADS'] || ENV['MAX_THREADS'] || 5)
     c.threads threads_count, threads_count
 
-    c.preload_app!
-
     c.port        ENV['PORT']     || 3000
-    c.environment ENV['RACK_ENV'] || 'development'
+    c.environment ENV['RACK_ENV'] || ENV['RAILS_ENV'] || 'development'
 
-    if workers_supported?
-      c.workers Integer(ENV['WEB_CONCURRENCY'] || 2)
+    if workers_supported? && workers_count > 1
+      c.preload_app!
+      c.workers workers_count
 
-      c.on_worker_boot do
-        if defined?(::ActiveRecord) && defined?(::ActiveRecord::Base)
-          # Worker specific setup for Rails 4.1+
-          # See: https://devcenter.heroku.com/articles/deploying-rails-applications-with-the-puma-web-server#on-worker-boot
-          ActiveRecord::Base.establish_connection
-        end
+      # Not necessary in Rails 5.2+, see https://github.com/rails/rails/pull/29807
+      if defined?(::ActiveRecord) && defined?(::ActiveRecord::Base) && Gem::Version.new(Rails.version) < Gem::Version.new('5.2.0')
+        c.before_fork { ActiveRecord::Base.connection_pool.disconnect! }
+        c.on_worker_boot { ActiveRecord::Base.establish_connection }
       end
     end
   end
 
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/puma-heroku.gemspec

@@ -21,8 +21,8 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "puma", "~> 3.0"
+  spec.add_runtime_dependency "puma", ">= 3.0", "< 5.0"
 
-  spec.add_development_dependency "bundler", "~> 1.11"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
 end

metadata

@@ -1,57 +1,63 @@
 --- !ruby/object:Gem::Specification
 name: puma-heroku
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Evan Phoenix
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-25 00:00:00.000000000 Z
+date: 2019-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 description: A Puma plugin that contains the default Heroku config
 email:
 - evan@phx.io
@@ -60,7 +66,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -86,10 +91,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Puma integration for Heroku
 test_files: []
-has_rdoc: 

data/.travis.yml

@@ -1,4 +0,0 @@
-language: ruby
-rvm:
-  - 2.3.0
-before_install: gem install bundler -v 1.11.2