Merge 42b5f82 into d7e7ee2

celluloid · May 28, 2013 · 4a70a68 · 4a70a68
2 parents d7e7ee2 + 42b5f82
commit 4a70a68
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/lib/reel/mixins.rb b/lib/reel/mixins.rb
@@ -48,11 +48,11 @@ def uri
     end
 
     def path
-      @http_parser.request_path
+      @path ||= uri.path
     end
 
     def query_string
-      @http_parser.query_string
+      @query ||= uri.query
     end
 
   end

diff --git a/lib/reel/request_parser.rb b/lib/reel/request_parser.rb
@@ -9,12 +9,6 @@ def initialize
         reset
       end
 
-      [:request_path, :query_string].each do |m|
-        define_method m do
-          @parser.send m
-        end
-      end
-
       def add(data)
         @parser << data
       end

diff --git a/reel.gemspec b/reel.gemspec
@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
 
   gem.add_runtime_dependency 'celluloid-io',     '>= 0.8.0'
   gem.add_runtime_dependency 'http',             '>= 0.2.0'
-  gem.add_runtime_dependency 'http_parser.rb',   '>= 0.5.3'
+  gem.add_runtime_dependency 'http_parser.rb',   '>= 0.6.0.beta.2'
   gem.add_runtime_dependency 'websocket_parser', '>= 0.1.4'
   gem.add_runtime_dependency 'rack',             '>= 1.4.0'