hoof 0.0.6 → 0.0.7

data/Gemfile

@@ -3,7 +3,7 @@ source "http://rubygems.org"
 gem 'daemons'
 gem 'eventmachine'
 gem 'unicorn'
-gem 'http_parser'
+gem 'eventmachine_httpserver'
 gem 'thor'
 
 group :development do

data/Gemfile.lock

@@ -3,8 +3,8 @@ GEM
   specs:
     daemons (1.1.3)
     eventmachine (0.12.10)
+    eventmachine_httpserver (0.2.1)
     git (1.2.5)
-    http_parser (0.1.3)
     jeweler (1.6.0)
       bundler (~> 1.0.0)
       git (>= 1.2.5)
@@ -26,7 +26,7 @@ DEPENDENCIES
   bundler (~> 1.0.0)
   daemons
   eventmachine
-  http_parser
+  eventmachine_httpserver
   jeweler (~> 1.6.0)
   rcov
   shoulda

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.7

data/hoof.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{hoof}
-  s.version = "0.0.6"
+  s.version = "0.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["pyromaniac"]
-  s.date = %q{2011-05-17}
+  s.date = %q{2011-06-08}
   s.default_executable = %q{hoof}
   s.description = %q{Hoof is linux variant of pow. It's based on nss, eventmachine and unicorn}
   s.email = %q{kinwizard@gmail.com}
@@ -56,7 +56,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<daemons>, [">= 0"])
       s.add_runtime_dependency(%q<eventmachine>, [">= 0"])
       s.add_runtime_dependency(%q<unicorn>, [">= 0"])
-      s.add_runtime_dependency(%q<http_parser>, [">= 0"])
+      s.add_runtime_dependency(%q<eventmachine_httpserver>, [">= 0"])
       s.add_runtime_dependency(%q<thor>, [">= 0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
@@ -66,7 +66,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<daemons>, [">= 0"])
       s.add_dependency(%q<eventmachine>, [">= 0"])
       s.add_dependency(%q<unicorn>, [">= 0"])
-      s.add_dependency(%q<http_parser>, [">= 0"])
+      s.add_dependency(%q<eventmachine_httpserver>, [">= 0"])
       s.add_dependency(%q<thor>, [">= 0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
@@ -77,7 +77,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<daemons>, [">= 0"])
     s.add_dependency(%q<eventmachine>, [">= 0"])
     s.add_dependency(%q<unicorn>, [">= 0"])
-    s.add_dependency(%q<http_parser>, [">= 0"])
+    s.add_dependency(%q<eventmachine_httpserver>, [">= 0"])
     s.add_dependency(%q<thor>, [">= 0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])

data/lib/hoof.rb

@@ -1,6 +1,6 @@
 require 'eventmachine'
 require 'unicorn/launcher'
-require 'http/parser'
+require 'evma_httpserver'
 
 require 'hoof/http_server'
 require 'hoof/https_server'

data/lib/hoof/cli.rb

@@ -32,7 +32,7 @@ module Hoof
     D
     def init name = nil
       name ||= File.basename Dir.getwd
-      create_link File.expand_path(File.join("~/.hoof", name)), '.'
+      create_link File.expand_path(File.join("~/.hoof", name)), Dir.getwd
       append_to_file 'Gemfile', "\ngem 'unicorn'"
     end
 

data/lib/hoof/http_server.rb

@@ -1,29 +1,38 @@
 module Hoof
   class HttpServer < EventMachine::Connection
+    include EventMachine::HttpServer
 
-    def receive_data data
-      begin
-        parser = Http::Parser.new
-        parser.parse data
+    def post_init
+      super
+      no_environment_strings
+      @buffer = ''
+    end
 
-        host = parser.headers["HOST"].gsub(/:\d+$/, '')
+    def receive_data data
+      @buffer << data
+      super
+    end
 
+    def process_http_request
+      p 'DATA'
+      p @buffer
+      begin
+        host = @http_headers.scan(/Host:\s*([-a-zA-z.]*)\000/)[0][0].gsub(/:\d+$/, '')
         close_connection and return unless host =~ /.dev$/
 
         name = host.gsub(/.dev$/, '')
-        path = parser.path.split('?', 2)[0]
         application = Hoof.find name
 
         if application
-          if application.static_file? path
-            puts "Serve static #{host}#{parser.path}"
-            send_data application.serve_static(path)
+          if application.static_file? @http_path_info
+            puts "Serve static #{host}#{@http_request_uri}"
+            send_data application.serve_static(@http_path_info)
             close_connection_after_writing
           else
             application.start
-            puts "Serve #{host}#{parser.path}"
+            puts "Serve #{host}#{@http_request_uri}"
             EventMachine.defer(proc {
-              application.serve data
+              application.serve @buffer
             }, proc { |result|
               send_data result
               close_connection_after_writing

data/lib/hoof/https_server.rb

@@ -2,6 +2,7 @@ module Hoof
   class HttpsServer < HttpServer
 
     def post_init
+      super
       start_tls
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hoof
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - pyromaniac
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-17 00:00:00 +04:00
+date: 2011-06-08 00:00:00 +04:00
 default_executable: hoof
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -73,7 +73,7 @@ dependencies:
   requirement: *id004
   prerelease: false
   type: :runtime
-  name: http_parser
+  name: eventmachine_httpserver
 - !ruby/object:Gem::Dependency 
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false