emmy-extends 0.1.10 → 0.1.11

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 5b9ea4d3a1fcacff55960ab9a41e129980ad6e66
4
- data.tar.gz: cf1aee06b24799a6cdb0a6bc4c57df017aa36073
3
+ metadata.gz: b6834d99bea0ede303f500cefa0cfd33aaaec3a7
4
+ data.tar.gz: 1c7dd7e81edc627af5b85240af7a4feab18883bb
5
5
  SHA512:
6
- metadata.gz: 8f741508afbc3ffccd6ff986e380cbbe15877280cd390401a9076e3cc06cf8bc7d1443d177ce7d7bbd648e7ce3ebad0dfd98214a9ed70f3fec33084113ebeb91
7
- data.tar.gz: 57a31dfbfb877b48ed77d2e002e054b0683b4f8bcd89ab870f20f189c3eb77519f384c4a086c3e226850ee830af53adc9046cce17a4ccb4b76a98ddbaf2cf51d
6
+ metadata.gz: 6bcd3f60a22e7ad3ece60d3b8a924da5dea2c589fd392634e4274cc631fbc703347c72ed15849ceb2f58807b9f32ec0de2c1d1f148a10bec905fae889e379830
7
+ data.tar.gz: 7d1541afb4814caf976c056d7c54de602f30eee2ccc24cb6c0497ec4cd0aed54addbbefd1926d2a755222223fbc61da27c6ba62b1cf3f79424c7cf13ec714890
@@ -2,7 +2,7 @@ require 'thin'
2
2
 
3
3
  module EmmyExtends
4
4
  module Thin
5
- EMMY_BACKEND = File.expand_path('../thin/rackup.rb', __FILE__)
5
+ EMMY_BACKEND = File.expand_path('../thin/rackup.em', __FILE__)
6
6
  end
7
7
  end
8
8
 
@@ -10,12 +10,24 @@ module EmmyExtends
10
10
  @app = app
11
11
  @config = config.is_a?(Hash) ? EmmyHttp::Configuration.new(config) : config
12
12
  options = {
13
- environment: config.environment,
14
- address: config.url.host,
15
- port: config.url.port,
16
- pid: config.pid,
17
- log: config.log || File.join(Dir.pwd, "log/#{config.backend}.log")
13
+ environment: config.environment,
14
+ address: config.url.host,
15
+ port: config.url.port,
16
+ pid: config.pid,
17
+ user: config.user,
18
+ group: config.group,
19
+ log: config.log || File.join(Dir.pwd, "log/#{config.backend}.log")
18
20
  }
21
+
22
+ if config.ssl
23
+ options.merge(
24
+ ssl_key_file: config.ssl_key_file,
25
+ ssl_cert_file: config.ssl_cert_file,
26
+ ssl_disable_verify: !config.verify_peer,
27
+ ssl_version: config.ssl_version
28
+ )
29
+ end
30
+
19
31
  super(option_defaults.merge(options.merge(opts)))
20
32
  setup
21
33
  end
@@ -47,7 +59,8 @@ module EmmyExtends
47
59
  server.ssl_options = {
48
60
  private_key_file: @options[:ssl_key_file],
49
61
  cert_chain_file: @options[:ssl_cert_file],
50
- verify_peer: !@options[:ssl_disable_verify]
62
+ verify_peer: !@options[:ssl_disable_verify],
63
+ ssl_version: @options[:ssl_disable_verify]
51
64
  }
52
65
  end
53
66
 
@@ -12,9 +12,7 @@ app = eval("Rack::Builder.new { use Fibre::Rack::FiberPool; ( #{rackup_code}\n )
12
12
 
13
13
  require 'thin'
14
14
 
15
- Emmy.run do
16
- puts "Thin web server"
17
- puts "Application starting in #{config.environment}"
18
- puts "Listening on #{config.url}"
19
- Emmy.bind *EmmyExtends::Thin::Controller.new(config, app)
20
- end
15
+ puts "Thin web server"
16
+ puts "Application starting in #{config.environment}"
17
+ puts "Listening on #{config.url}"
18
+ Emmy.bind *EmmyExtends::Thin::Controller.new(config, app)
@@ -1,3 +1,3 @@
1
1
  module EmmyExtends
2
- VERSION = "0.1.10"
2
+ VERSION = "0.1.11"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: emmy-extends
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.10
4
+ version: 0.1.11
5
5
  platform: ruby
6
6
  authors:
7
7
  - inre
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-05-11 00:00:00.000000000 Z
11
+ date: 2015-05-25 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: emmy-machine
@@ -131,7 +131,7 @@ files:
131
131
  - lib/emmy_extends/thin/backend.rb
132
132
  - lib/emmy_extends/thin/connection.rb
133
133
  - lib/emmy_extends/thin/controller.rb
134
- - lib/emmy_extends/thin/rackup.rb
134
+ - lib/emmy_extends/thin/rackup.em
135
135
  - lib/emmy_extends/version.rb
136
136
  - spec/ConvertTemperature.asmx.xml
137
137
  - spec/em_http_request_spec.rb