emmy-extends 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68666d4e032eda76f5bb20fd82848655ed7b5a2b
-  data.tar.gz: 8ffa2d98b0e91916b40c0d5a0c55ca1f98620fce
+  metadata.gz: 5b9ea4d3a1fcacff55960ab9a41e129980ad6e66
+  data.tar.gz: cf1aee06b24799a6cdb0a6bc4c57df017aa36073
 SHA512:
-  metadata.gz: 9cba9ac93732d51ad587ea0a6f2e2030bd044e1c58eaf2b5b2484055822837eef696e65d0e4802af0153820460550ea020bd9ba48b37d893995bf57708435a87
-  data.tar.gz: cf59f236c6ee0f263f125a754e3f9e22a379f7083e66e5565287f5952d270540ff1c6e97c93641d622e8c3c30388455bb2c528e9301c29ab129510b01d8f919a
+  metadata.gz: 8f741508afbc3ffccd6ff986e380cbbe15877280cd390401a9076e3cc06cf8bc7d1443d177ce7d7bbd648e7ce3ebad0dfd98214a9ed70f3fec33084113ebeb91
+  data.tar.gz: 57a31dfbfb877b48ed77d2e002e054b0683b4f8bcd89ab870f20f189c3eb77519f384c4a086c3e226850ee830af53adc9046cce17a4ccb4b76a98ddbaf2cf51d

data/README.md

@@ -90,7 +90,10 @@ EmmyMachine.run do
     run Application
   end
 
-  EmmyMachine.bind(*EmmyExtends::Thin.server("tcp://localhost:65535", app, options))
+  thin = EmmyExtends::Thin::Controller.new({
+    url: "tcp://localhost:65535"
+  }, app)
+  EmmyMachine.bind(*thin)
 end
 ```
 

data/bin/emmy-thin

@@ -0,0 +1,9 @@
+#!/usr/bin/env ruby
+require 'emmy'
+require 'emmy_extends/thin'
+
+runner = Emmy::Runner.instance
+
+unless runner.execute_bin_emmy
+  runner.run_action
+end

data/emmy-extends.gemspec

@@ -14,14 +14,13 @@ Gem::Specification.new do |spec|
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.executables   = ["emmy-thin"]
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
   spec.add_dependency "emmy-machine", "~> 0.1"
   spec.add_dependency "emmy-http", "~> 0.1"
 
-
   spec.add_development_dependency "eventmachine", "~> 1.0.3"
   spec.add_development_dependency "rspec", "~> 3"
   spec.add_development_dependency "bundler", "~> 1.7"

data/lib/emmy_extends/thin/backend.rb

@@ -1,5 +1,3 @@
-require 'thin'
-
 module EmmyExtends
   class Thin::Backend < ::Thin::Backends::Base
     attr_accessor :url

data/lib/emmy_extends/thin/controller.rb

@@ -1,23 +1,35 @@
-require 'uri'
-
 module EmmyExtends
   class Thin::Controller < ::Thin::Controllers::Controller
 
-    attr_accessor :app, :url
+    attr_accessor :app
+    attr_accessor :config
+    attr_accessor :server
+    attr_accessor :backend
 
-    def initialize(url, app, options={})
-      @url = URI(url.to_s)
+    def initialize(config, app, opts={})
       @app = app
-      super(options_with_defaults(options))
+      @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")
+      }
+      super(option_defaults.merge(options.merge(opts)))
+      setup
     end
 
     def start
+    end
+
+    def setup
       if @options[:socket]
-        server = ::Thin::Server.new(@options[:socket], @options)
+        @server = ::Thin::Server.new(@options[:socket], @options)
       else
-        server = ::Thin::Server.new(url.host, url.port, @options)
+        @server = ::Thin::Server.new(config.url.host, config.url.port, @options)
       end
-      server.backend.url = url
+      server.backend.url = config.url
 
       # Set options
       server.pid_file                       = @options[:pid]
@@ -52,29 +64,33 @@ module EmmyExtends
       #server.on_restart { Thin::Command.run(:start, @options) }
 
       # just return thin-backend
-      server.backend
+      @backend = server.backend
+    end
+
+    def to_a
+      @backend.to_a
     end
 
     private
 
-      def options_with_defaults(opt)
-        {
-          backend:              EmmyExtends::Thin::Backend,
-          threaded:             false,
-          no_epoll:             false,
-          chdir:                Dir.pwd,
-          environment:          'development',
-          address:              '0.0.0.0',
-          port:                 3434,
-          timeout:              30, #sec
-          pid:                  "tmp/pids/server.pid",
-          log:                  File.join(Dir.pwd, "log/server.log"),
-          max_conns:            1024,
-          max_persistent_conns: 100,
-          require:              [],
-          wait:                 30, #sec
-          daemonize:            false
-        }.update(opt)
-      end
+    def option_defaults
+      {
+        backend:              EmmyExtends::Thin::Backend,
+        threaded:             false,
+        no_epoll:             false,
+        chdir:                Dir.pwd,
+        #environment:          'development',
+        #address:              '0.0.0.0',
+        #port:                 3434,
+        timeout:              0, #sec
+        #pid:                  "tmp/pids/thin.pid",
+        #log:                  File.join(Dir.pwd, "log/server.log"),
+        max_conns:            1024,
+        max_persistent_conns: 100,
+        require:              [],
+        wait:                 30, #sec
+        #daemonize:            false
+      }
+    end
   end
 end

data/lib/emmy_extends/thin/rackup.rb

@@ -0,0 +1,20 @@
+config = Emmy::Runner.instance.config
+config_ru = File.join(Dir.getwd, "config.ru")
+
+unless File.readable_real?(config_ru)
+  puts "Missing #{config_ru} file."
+  exit
+end
+
+rackup_code = File.read(config_ru)
+# can run bundler in rackup.ru
+app = eval("Rack::Builder.new { use Fibre::Rack::FiberPool; ( #{rackup_code}\n )}.to_app", TOPLEVEL_BINDING, config_ru)
+
+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

data/lib/emmy_extends/thin.rb

@@ -1,10 +1,11 @@
+require 'thin'
+
 module EmmyExtends
   module Thin
-    autoload :Connection,   "emmy_extends/thin/connection"
-    autoload :Backend,      "emmy_extends/thin/backend"
-    autoload :Controller,   "emmy_extends/thin/controller"
-    autoload :ClassMethods, "emmy_extends/thin/class_methods"
-
-    extend ClassMethods
+    EMMY_BACKEND = File.expand_path('../thin/rackup.rb', __FILE__)
   end
 end
+
+require "emmy_extends/thin/connection"
+require "emmy_extends/thin/backend"
+require "emmy_extends/thin/controller"

data/lib/emmy_extends/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: emmy-extends
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - inre
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-08 00:00:00.000000000 Z
+date: 2015-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: emmy-machine
@@ -97,7 +97,8 @@ dependencies:
 description: 
 email:
 - inre.storm@gmail.com
-executables: []
+executables:
+- emmy-thin
 extensions: []
 extra_rdoc_files: []
 files:
@@ -106,6 +107,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/emmy-thin
 - emmy-extends.gemspec
 - lib/emmy_extends/activerecord/adapter.rb
 - lib/emmy_extends/activerecord/connection_handling.rb
@@ -127,9 +129,9 @@ files:
 - lib/emmy_extends/savon/operation.rb
 - lib/emmy_extends/thin.rb
 - lib/emmy_extends/thin/backend.rb
-- lib/emmy_extends/thin/class_methods.rb
 - lib/emmy_extends/thin/connection.rb
 - lib/emmy_extends/thin/controller.rb
+- lib/emmy_extends/thin/rackup.rb
 - lib/emmy_extends/version.rb
 - spec/ConvertTemperature.asmx.xml
 - spec/em_http_request_spec.rb

data/lib/emmy_extends/thin/class_methods.rb

@@ -1,11 +0,0 @@
-require "emmy_extends/core_ext"
-
-module EmmyExtends
-  module Thin::ClassMethods
-    using CoreExt
-
-    def server(url, app, opt={})
-      Thin::Controller.new(url, app, opt.to_options).start
-    end
-  end
-end