celluloid-http 0.0.2 → 0.0.3

data/celluloid-http.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency('rack')
   gem.add_runtime_dependency('celluloid-io')
   gem.add_runtime_dependency('http_parser.rb')
+  gem.add_runtime_dependency('activesupport')
 
   gem.add_development_dependency('turn')
   gem.add_development_dependency('minitest')

data/lib/celluloid-http/request.rb

@@ -1,22 +1,42 @@
+require 'active_support/core_ext/object/to_query'
+
 class Celluloid::Http::Request
   extend Forwardable
   DEFAULT_METHOD = :get
   DEFAULT_HTTP_VERSION = '1.1'
 
-  attr_reader :url
-  attr_accessor :method
+  attr_accessor :method, :body
 
-  def_delegators :@uri, :scheme, :host, :port, :path, :query
+  def_delegators :@uri, :scheme, :host, :path, :port, :query
 
   def initialize(url, options = {})
     @url = url
     @uri = URI.parse url
     @method = options[:method] || DEFAULT_METHOD
+    @body = options[:body]
+
+    merge_query_params(options[:query_params]) if options[:query_params]
+  end
+
+  def query_params
+    @query_params ||= Rack::Utils.parse_nested_query @uri.query
   end
 
   def to_s
-    path = self.path.length.zero? ? "/" : self.path
-    "#{method.to_s.upcase} #{path} HTTP/#{DEFAULT_HTTP_VERSION}\nHOST: #{host}\n\n"
+    "#{method.to_s.upcase} #{url} HTTP/#{DEFAULT_HTTP_VERSION}\nHOST: #{host}\n\n"
+  end
+
+  def url
+    @uri.to_s
+  end
+
+  def query=(val)
+    @uri.query = val.is_a?(Hash) ? val.to_query : val
+  end
+
+  def merge_query_params(params)
+    query_params.merge! params
+    self.query = query_params
   end
 
 end

data/lib/celluloid-http/version.rb

@@ -1,5 +1,5 @@
 module Celluloid
   module Http
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/test/unit/request_test.rb

@@ -16,4 +16,34 @@ class RequestTest < TestCase
     assert_equal "param=value", request.query
   end
 
+  def test_parse_query_params
+    request = Celluloid::Http::Request.new 'http://127.0.0.1?param1=value1&param2=value2'
+
+    assert_equal 'value1', request.query_params['param1']
+    assert_equal 'value2', request.query_params['param2']
+  end
+
+  def test_merge_query_params
+    request = Celluloid::Http::Request.new 'http://127.0.0.1?param1=value1&param2=value2', {
+        query_params: {'param3' => 'value3'}
+    }
+
+    assert_equal 'value1', request.query_params['param1']
+    assert_equal 'value2', request.query_params['param2']
+    assert_equal 'value3', request.query_params['param3']
+
+    assert_equal 'http://127.0.0.1?param1=value1&param2=value2&param3=value3', request.url
+  end
+
+  def test_change_query_params
+    request = Celluloid::Http::Request.new 'http://127.0.0.1?param1=value1&param2=value2'
+
+    request.query = request.query_params.merge 'param3' => 'value3'
+
+    assert_equal 'value1', request.query_params['param1']
+    assert_equal 'value2', request.query_params['param2']
+    assert_equal 'value3', request.query_params['param3']
+  end
+
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: celluloid-http
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -59,6 +59,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: turn
   requirement: !ruby/object:Gem::Requirement