emmy-extends 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b9ea4d3a1fcacff55960ab9a41e129980ad6e66
-  data.tar.gz: cf1aee06b24799a6cdb0a6bc4c57df017aa36073
+  metadata.gz: b6834d99bea0ede303f500cefa0cfd33aaaec3a7
+  data.tar.gz: 1c7dd7e81edc627af5b85240af7a4feab18883bb
 SHA512:
-  metadata.gz: 8f741508afbc3ffccd6ff986e380cbbe15877280cd390401a9076e3cc06cf8bc7d1443d177ce7d7bbd648e7ce3ebad0dfd98214a9ed70f3fec33084113ebeb91
-  data.tar.gz: 57a31dfbfb877b48ed77d2e002e054b0683b4f8bcd89ab870f20f189c3eb77519f384c4a086c3e226850ee830af53adc9046cce17a4ccb4b76a98ddbaf2cf51d
+  metadata.gz: 6bcd3f60a22e7ad3ece60d3b8a924da5dea2c589fd392634e4274cc631fbc703347c72ed15849ceb2f58807b9f32ec0de2c1d1f148a10bec905fae889e379830
+  data.tar.gz: 7d1541afb4814caf976c056d7c54de602f30eee2ccc24cb6c0497ec4cd0aed54addbbefd1926d2a755222223fbc61da27c6ba62b1cf3f79424c7cf13ec714890

data/lib/emmy_extends/thin.rb

@@ -2,7 +2,7 @@ require 'thin'
 
 module EmmyExtends
   module Thin
-    EMMY_BACKEND = File.expand_path('../thin/rackup.rb', __FILE__)
+    EMMY_BACKEND = File.expand_path('../thin/rackup.em', __FILE__)
   end
 end
 

data/lib/emmy_extends/thin/controller.rb

@@ -10,12 +10,24 @@ module EmmyExtends
       @app = app
       @config = config.is_a?(Hash) ? EmmyHttp::Configuration.new(config) : config
       options = {
-        environment: config.environment,
-        address:   config.url.host,
-        port:      config.url.port,
-        pid:       config.pid,
-        log:       config.log || File.join(Dir.pwd, "log/#{config.backend}.log")
+        environment:    config.environment,
+        address:        config.url.host,
+        port:           config.url.port,
+        pid:            config.pid,
+        user:           config.user,
+        group:          config.group,
+        log:            config.log || File.join(Dir.pwd, "log/#{config.backend}.log")
       }
+
+      if config.ssl
+        options.merge(
+          ssl_key_file:       config.ssl_key_file,
+          ssl_cert_file:      config.ssl_cert_file,
+          ssl_disable_verify: !config.verify_peer,
+          ssl_version:        config.ssl_version
+        )
+      end
+
       super(option_defaults.merge(options.merge(opts)))
       setup
     end
@@ -47,7 +59,8 @@ module EmmyExtends
         server.ssl_options = {
           private_key_file: @options[:ssl_key_file],
           cert_chain_file: @options[:ssl_cert_file],
-          verify_peer: !@options[:ssl_disable_verify]
+          verify_peer: !@options[:ssl_disable_verify],
+          ssl_version: @options[:ssl_disable_verify]
         }
       end
 

data/lib/emmy_extends/thin/{rackup.rb → rackup.em}

@@ -12,9 +12,7 @@ app = eval("Rack::Builder.new { use Fibre::Rack::FiberPool; ( #{rackup_code}\n )
 
 require 'thin'
 
-Emmy.run do
-  puts "Thin web server"
-  puts "Application starting in #{config.environment}"
-  puts "Listening on #{config.url}"
-  Emmy.bind *EmmyExtends::Thin::Controller.new(config, app)
-end
+puts "Thin web server"
+puts "Application starting in #{config.environment}"
+puts "Listening on #{config.url}"
+Emmy.bind *EmmyExtends::Thin::Controller.new(config, app)

data/lib/emmy_extends/version.rb

@@ -1,3 +1,3 @@
 module EmmyExtends
-  VERSION = "0.1.10"
+  VERSION = "0.1.11"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: emmy-extends
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - inre
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-11 00:00:00.000000000 Z
+date: 2015-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: emmy-machine
@@ -131,7 +131,7 @@ files:
 - lib/emmy_extends/thin/backend.rb
 - lib/emmy_extends/thin/connection.rb
 - lib/emmy_extends/thin/controller.rb
-- lib/emmy_extends/thin/rackup.rb
+- lib/emmy_extends/thin/rackup.em
 - lib/emmy_extends/version.rb
 - spec/ConvertTemperature.asmx.xml
 - spec/em_http_request_spec.rb