zassets 0.2.11 → 0.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 323d8d4e0b559e1f3914ff27117143f15a17d24d
-  data.tar.gz: b2dfb8c562c3e615403b58a329289d15d373e061
+  metadata.gz: c3891c8b6732591c840db3d0f0122a788d460a06
+  data.tar.gz: c3471f791af54d26ef93d9ecd3fc92513a315cff
 SHA512:
-  metadata.gz: d7899d48b1de3c145349c3c06d529284458948279e88815b23cef0a83974aed41968ed8a0f86bc37a73956577787cfc5b4e4f90904ab00472502986aa6f40798
-  data.tar.gz: cce98925320625cf2fc87fdb478f2cb42f7db99d04d108cbe519e40f598d59598f55a45f13a11c5d62c4e37a8a7fa2b5b40de929e87423c9562c689f2943dca9
+  metadata.gz: 5a1ffb51298692e566b6de7b736774b3a3a4372e3c9842f29e93276db18c8b96ca81beea411e7fdd2926c468f8d021ece399394d8128011ca7f892a631a955d5
+  data.tar.gz: cc4fab73ad6bff445024534a91d8aee1503a1ce06d099c2d3319aae5640b6c5c8984994f6cfcd2b95c93acec5b102899869d0a1e8f9ea8804c3ba85546297638

data/README.md

@@ -147,7 +147,8 @@ plugins:
 host: localhost
 port: 8000
 
-# Change rack handler (HTTP server) to unicorn (default is puma).
+# Change rack handler (HTTP server) to unicorn (default behavior is to
+# try the following handlers in order: puma, unicorn, thin, webrick).
 server: unicorn
 
 # List of directories where assets will be searched for (load

data/lib/rack/handler/unicorn.rb

@@ -0,0 +1,33 @@
+require 'unicorn'
+require 'rack/handler'
+
+module Rack
+  module Handler
+    class Unicorn
+      UNICORN_CONFIG_PATH = 'config/unicorn.rb'.freeze
+
+      class << self
+        def run app, **options
+          unicorn_options = {
+            listeners:        [options[:Host], options[:Port]].join(':'),
+            worker_processes: 2
+          }
+
+          if ::File.exist?(UNICORN_CONFIG_PATH)
+            unicorn_options[:config_file] = UNICORN_CONFIG_PATH
+          end
+
+          if unicorn_options[:config_file]
+            if ::File.read(unicorn_options[:config_file]) =~ /^(\s+)listen\s/
+              unicorn_options.delete :listeners
+            end
+          end
+
+          ::Unicorn::HttpServer.new(app, unicorn_options).start.join
+        end
+      end
+    end
+
+    register 'unicorn', 'Rack::Handler::Unicorn'
+  end
+end

data/lib/zassets/config.rb

@@ -8,7 +8,6 @@ module ZAssets
       verbose:      false,
       host:         '::1',
       port:         9292,
-      server:       :puma,
       plugins:      [],
       engines:      {},
       base_url:     '/assets',

data/lib/zassets/server.rb

@@ -2,6 +2,8 @@ require 'rack'
 
 module ZAssets
   class Server
+    HANDLERS = %w[puma unicorn thin webrick].freeze
+
     def initialize config
       @config = config
     end
@@ -15,7 +17,7 @@ module ZAssets
     end
 
     def handler
-      Rack::Handler.get(@config[:server]) || Rack::Handler.default
+      Rack::Handler.get(@config[:server]) || Rack::Handler.pick(HANDLERS)
     end
 
     def options

data/lib/zassets/version.rb

@@ -1,3 +1,3 @@
 module ZAssets
-  VERSION = '0.2.11'
+  VERSION = '0.2.12'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zassets
 version: !ruby/object:Gem::Version
-  version: 0.2.11
+  version: 0.2.12
 platform: ruby
 authors:
 - Thibault Jouan
@@ -38,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: puma
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.6'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +136,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: unicorn
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.9'
 description: Assets server and builder
 email: tj@a13.fr
 executables:
@@ -160,6 +160,7 @@ extra_rdoc_files:
 files:
 - README.md
 - bin/zassets
+- lib/rack/handler/unicorn.rb
 - lib/zassets.rb
 - lib/zassets/builder.rb
 - lib/zassets/cli.rb
@@ -201,6 +202,6 @@ rubyforge_project:
 rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
-summary: zassets-0.2.11
+summary: zassets-0.2.12
 test_files: []
 has_rdoc: