emmy-http-server 0.1.0 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 640f4d91ac5b7afc7d9c187c66a632698954576a
-  data.tar.gz: c96485fca03f0ad17ce33023b8a3d0e950aa7a8d
+  metadata.gz: 0e8dcfbbb81d4ae945afaa139a4ed2c9aeeffb1c
+  data.tar.gz: 8ae0242830c10b75d3748a3525c0ba3b5a6e006f
 SHA512:
-  metadata.gz: a4ed46332b0258af15ef204ad1ed57ea872763734944e1414aee2da43e04943d91f49530383bdb784d9a5f84e1589f8e7100f92023d1f37e5c36ab537508985c
-  data.tar.gz: 61f7f595899b0a7f53b5660e67889316453885cbef5a9638bd149fecb78fea09a42e720584070614dd284f45a5f3b8332a92924ad6b86cb841825724c30350d4
+  metadata.gz: 9845db402398fe6bc42b532ae72dd134e5a91e73d336e8e5c877cb344ccb0f316cb04f5ed3416f6168e41e541d811bf991d2f777d83aa449f05b1c2193940bf6
+  data.tar.gz: a17a7577ffa40973d8cdb59739adc78d992596a0ccfd741a65ee840c3ba69ecbb6b20b2d7c3d4c2646ed2b8bc67a2cf67578cf7909c4b5bd7ee7f8bee578175a

data/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2015-2016 Maksim V. <inre.storm@gmail.com>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -13,7 +13,7 @@ end
 bind *server
 ```
 
-### Routing
+### Routing (not ready yet)
 
 ```ruby
 server do

data/emmy-http-server.gemspec

@@ -4,28 +4,33 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'emmy_http/server/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "emmy-http-server"
+  spec.name          = 'emmy-http-server'
   spec.version       = EmmyHttp::Server::VERSION
-  spec.authors       = ["inre"]
-  spec.email         = ["inre.storm@gmail.com"]
+  spec.authors       = ['Maksim V.']
+  spec.email         = ['inre.storm@gmail.com']
 
   spec.summary       = %q{Emmy HTTP Server}
-  spec.description   = %q{Emmy HTTP Server}
-  #spec.homepage      = "TODO: Put your gem's website or public repo URL here."
+  spec.description   = %q{EventMachine-based HTTP server}
+  spec.homepage      = 'https://github.com/emmygems'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = "exe"
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_dependency "http_parser.rb", "~> 0.6.0"
-  spec.add_dependency "addressable",    "~> 2.3.8"
-  spec.add_dependency "event_object",   "~> 0.9"
-  spec.add_dependency "fibre",          "~> 0.9"
-  spec.add_dependency "emmy-machine",   "~> 0.1"
-  spec.add_dependency "emmy-http",      "~> 0.2"
+  spec.required_ruby_version     = '>= 2.2.2'
+  spec.required_rubygems_version = '>= 2.3.0'
 
-  spec.add_development_dependency "bundler", "~> 1.9"
-  spec.add_development_dependency "rake",    "~> 10.0"
-  spec.add_development_dependency "rspec",   "~> 3"
+  spec.add_dependency 'http_parser.rb', '~> 0.6.0'
+  spec.add_dependency 'addressable', '~> 2.5'
+  spec.add_dependency 'event_object', '~> 1'
+  spec.add_dependency 'fibre', '~> 1'
+  spec.add_dependency 'emmy-machine', '~> 0.4'
+  spec.add_dependency 'emmy-http', '~> 0.4'
+
+  spec.add_development_dependency 'eventmachine', '~> 1'
+  spec.add_development_dependency 'bundler', '~> 1.12'
+  spec.add_development_dependency 'rake',    '~> 10'
+  spec.add_development_dependency 'rspec',   '~> 3'
 end

data/examples/Gemfile

@@ -1,5 +1,5 @@
-
+gem 'eventmachine'
 gem 'sinatra'
-gem 'emmy'
+gem 'emmy-machine', '~> 0.4'
 gem 'emmy-http-server', path: '../'
-gem 'emmy-http'
+gem 'emmy-http', '~> 0.4'

data/examples/simple.rb

@@ -1,15 +1,24 @@
 require 'bundler/setup'
-require 'emmy'
+require 'emmy_machine'
+require 'emmy_http'
 require 'emmy_http/server'
 require './app'
 using EventObject
 
+# Without emmy engine
+module Emmy
+  extend EmmyMachine::ClassMethods
+  include EventObject
+  include Fibre::Synchrony
+end
+
 Emmy.run do
-  app = EmmyHttp::Application.new do
+  app = ::Rack::Builder.app do
     run Sinatra::Application
   end
 
-  server = EmmyHttp::Server::Server.new(Emmy::Runner.instance.config, app)
+  config = EmmyHttp::Configuration.new
+  server = EmmyHttp::Server::Server.new(config, app)
 
   Emmy.bind(*server)
   puts "Bind server on #{server.config.url}"

data/lib/emmy_http/server.rb

@@ -1,13 +1,15 @@
-require "emmy_http/server/version"
-require "emmy_http/server/parser"
-require "emmy_http/server/request"
-require "emmy_http/server/response"
-require "emmy_http/server/server"
+require 'event_object'
+require 'model_pack'
+require 'emmy_http/server/version'
+require 'emmy_http/server/parser'
+require 'emmy_http/server/request'
+require 'emmy_http/server/response'
+require 'emmy_http/server/server'
 
 module EmmyHttp
   module Server
     INITIAL_BODY = ''
-    INITIAL_BODY.encode!(Encoding::ASCII_8BIT) if INITIAL_BODY.respond_to?(:encode)
+    INITIAL_BODY.encode!(::Encoding::ASCII_8BIT) if INITIAL_BODY.respond_to?(:encode)
 
     SERVER_NAME         = 'Emmy'.freeze
     RACK_VERSION_NUM    = [1, 0]

data/lib/emmy_http/server/request.rb

@@ -109,8 +109,8 @@ module EmmyHttp
       @env['REMOTE_ADDR']     = remote_address
       @env['REQUEST_METHOD']  = http_method
       @env['REQUEST_URI']     = url.to_s
-      @env['QUERY_STRING']    = url.query# || ""
-      @env['SCRIPT_NAME']     = ""
+      @env['QUERY_STRING']    = url.query || '' # string required
+      @env['SCRIPT_NAME']     = ''
       @env['REQUEST_PATH']    = url.path
       @env['PATH_INFO']       = url.path
       @env['FRAGMENT']        = url.fragment

data/lib/emmy_http/server/server.rb

@@ -64,7 +64,7 @@ module EmmyHttp
         res.keep_alive = req.keep_alive?
         res.attach(conn)
 
-        EmmyMachine.fiber_block do
+        EmmyMachine.async do
           # Process request event
           begin
             request!(req, res)

data/lib/emmy_http/server/version.rb

@@ -1,5 +1,5 @@
 module EmmyHttp
   module Server
-    VERSION = "0.1.0"
+    VERSION = "0.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: emmy-http-server
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: '0.2'
 platform: ruby
 authors:
-- inre
+- Maksim V.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-09-09 00:00:00.000000000 Z
+date: 2016-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
@@ -30,98 +30,112 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.8
+        version: '2.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.8
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: event_object
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: fibre
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: emmy-machine
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: emmy-http
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.4'
+- !ruby/object:Gem::Dependency
+  name: eventmachine
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '1.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '1.12'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '10'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -136,7 +150,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
-description: Emmy HTTP Server
+description: EventMachine-based HTTP server
 email:
 - inre.storm@gmail.com
 executables: []
@@ -147,6 +161,7 @@ files:
 - ".rspec"
 - ".travis.yml"
 - Gemfile
+- LICENSE
 - README.md
 - Rakefile
 - emmy-http-server.gemspec
@@ -159,8 +174,9 @@ files:
 - lib/emmy_http/server/response.rb
 - lib/emmy_http/server/server.rb
 - lib/emmy_http/server/version.rb
-homepage: 
-licenses: []
+homepage: https://github.com/emmygems
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -170,15 +186,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.3.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Emmy HTTP Server