celluloid-http 0.0.5 → 0.0.6

data/.travis.yml

@@ -0,0 +1,12 @@
+rvm:
+  - 1.9.3-p194
+  - 1.9.3
+  - 2.0.0
+  - ruby-head
+  - jruby-head
+
+matrix:
+  allow_failures:
+    - rvm: 2.0.0 
+    - rvm: ruby-head
+    - rvm: jruby-head

data/README.md

@@ -1,6 +1,8 @@
 # Celluloid::Http
 
-TODO: Write a gem description
+[![Build Status](https://travis-ci.org/NOX73/celluloid-http.png?branch=master)](https://travis-ci.org/NOX73/celluloid-http)
+
+Http request implementation based on celluloid::io.
 
 ## Installation
 
@@ -18,12 +20,16 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+    Celluloid::Http.get('http://en.wikipedia.org/wiki/Http')
+
+See test/unit/http_test.rb for more examples.
 
 ## Contributing
 
 1. Fork it
 2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+3. Write code
+4. Run test (`bundle exec rake test`)
+5. Commit your changes (`git commit -am 'Add some feature'`)
+6. Push to the branch (`git push origin my-new-feature`)
+7. Create new Pull Request

data/Rakefile

@@ -1 +1,11 @@
 require "bundler/gem_tasks"
+
+require 'rake/testtask'
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'test'
+  test.test_files = FileList['test/*/*_test.rb']
+  test.verbose = true
+end
+
+desc "Run Tests"
+task :default => :test

data/celluloid-http.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency('http_parser.rb')
   gem.add_runtime_dependency('activesupport')
 
+  gem.add_development_dependency('rake')
   gem.add_development_dependency('turn')
   gem.add_development_dependency('minitest')
   gem.add_development_dependency('mocha')

data/lib/celluloid-http/body_decoder.rb

@@ -0,0 +1,31 @@
+require 'zlib'
+
+class Celluloid::Http::BodyDecoder
+
+  class<<self
+
+    def decode(headers, raw_body)
+      new(headers, raw_body).decode.body
+    end
+
+  end
+
+  attr_reader :headers, :body
+  def initialize(headers, raw_body)
+    @headers, @body = headers, raw_body
+  end
+
+  def decode
+    @body = gunzip(@body) if zip?
+    self
+  end
+
+  def gunzip(body)
+    Zlib::GzipReader.new(StringIO.new(body)).read
+  end
+
+  def zip?
+    @headers['Content-Encoding'] == 'gzip'
+  end
+
+end

data/lib/celluloid-http/builder.rb

@@ -0,0 +1,19 @@
+class Celluloid::Http::Builder
+
+  class<<self
+
+    def get(url)
+      Celluloid::Http::Request.new url
+    end
+
+    def post(url, params)
+      options = {
+          form_data: params,
+          method: :post
+      }
+      Celluloid::Http::Request.new url, options
+    end
+
+  end
+
+end

data/lib/celluloid-http/connection.rb

@@ -8,6 +8,7 @@ class Celluloid::Http::Connection
 
   def close
     socket.close
+    terminate
   end
 
   def send_request(request)
@@ -32,7 +33,7 @@ class Celluloid::Http::Connection
 
   def self.open(host, port = 80)
     connection = self.new
-    connection.open(host, 80)
+    connection.open(host, port)
     connection
   end
 

data/lib/celluloid-http/http.rb

@@ -9,8 +9,12 @@ module Celluloid::Http::Http
     response
   end
 
-  def get(url)
-    send_request Celluloid::Http::Request.new url
+  def get(*args)
+    send_request Celluloid::Http::Builder.get(*args)
+  end
+
+  def post(*args)
+    send_request Celluloid::Http::Builder.post(*args)
   end
 
 end

data/lib/celluloid-http/request.rb

@@ -5,16 +5,16 @@ class Celluloid::Http::Request
   DEFAULT_METHOD = :get
   DEFAULT_HTTP_VERSION = '1.1'
 
-  attr_accessor :method, :body
+  attr_accessor :method, :body, :form_data
 
   def_delegators :@uri, :scheme, :host, :path, :port, :query
   def_delegators :@uri, :scheme=, :host=, :path=, :port=
 
   def initialize(url, options = {})
-    @url = url
     @uri = URI.parse url
     @method = options[:method] || DEFAULT_METHOD
-    @body = options[:body]
+    @raw_body = options[:raw_body]
+    @form_data = options[:form_data]
 
     merge_query_params(options[:query_params]) if options[:query_params]
   end
@@ -24,13 +24,17 @@ class Celluloid::Http::Request
   end
 
   def to_s
-    "#{method.to_s.upcase} #{url} HTTP/#{DEFAULT_HTTP_VERSION}\nHOST: #{host}\n\n"
+    "#{method.to_s.upcase} #{uri} HTTP/#{DEFAULT_HTTP_VERSION}\nHost: #{host}\n\n#{body}"
   end
 
   def url
     @uri.to_s
   end
 
+  def uri
+    "#{ "/" if path.length.zero? }#{path}#{ "?" if query }#{query}"
+  end
+
   def query=(val)
     @uri.query = val.is_a?(Hash) ? val.to_query : val
   end
@@ -40,4 +44,10 @@ class Celluloid::Http::Request
     self.query = params
   end
 
+  def body
+    @body = @raw_body if @raw_body
+    @body = @form_data.to_query  if @form_data
+    @body
+  end
+
 end

data/lib/celluloid-http/response.rb

@@ -6,11 +6,12 @@ class Celluloid::Http::Response
   def_delegators :parser, :<<
 
   attr_writer :status
-  attr_accessor :headers, :body
+  attr_accessor :headers, :raw_body
 
-  def initialize(status = nil, headers = {}, body = "")
+  def initialize(status = nil, headers = {}, body = nil)
     @status, @headers, @body = status, headers, body
-    @finished = false
+    @raw_body = ""
+    @finished = !!@body
   end
 
   def status
@@ -18,6 +19,7 @@ class Celluloid::Http::Response
   end
 
   def on_message_complete
+    @body = decoded_body
     @finished = true
   end
 
@@ -26,7 +28,7 @@ class Celluloid::Http::Response
   end
 
   def on_body(chunk)
-    @body << chunk
+    @raw_body << chunk
   end
 
   def on_headers_complete(headers)
@@ -45,4 +47,13 @@ class Celluloid::Http::Response
     reason.downcase.gsub(/\s|-/, '_').to_sym
   end
 
+  def body
+    on_message_complete unless finished?
+    @body ||= ""
+  end
+
+  def decoded_body
+    Celluloid::Http::BodyDecoder.decode(headers, raw_body)
+  end
+
 end

data/lib/celluloid-http/version.rb

@@ -1,5 +1,5 @@
 module Celluloid
   module Http
-    VERSION = "0.0.5"
+    VERSION = "0.0.6"
   end
 end

data/lib/celluloid-http.rb

@@ -10,6 +10,8 @@ module Celluloid
     autoload :Request, 'celluloid-http/request'
     autoload :Http, 'celluloid-http/http'
     autoload :Connection, 'celluloid-http/connection'
+    autoload :Builder, 'celluloid-http/builder'
+    autoload :BodyDecoder, 'celluloid-http/body_decoder'
 
     extend Http
   end

data/test/fixtures/post.example.com

@@ -0,0 +1,8 @@
+HTTP/1.1 200 OK
+Date: Mon, 28 Jan 2013 18:56:25 GMT
+Status: 200 OK
+Connection: close
+Content-Type: application/json; charset=utf-8
+Content-Length: 133
+
+{"comment":{"id":31,"message":"My comment.","author_name":"Guest 1359395318.7592747","created_at":"Mon, 28 Jan 2013 22:56:25 +0400"}}

data/test/unit/builder_test.rb

@@ -0,0 +1,27 @@
+require 'test_helper'
+
+class BuilderTest < TestCase
+
+  def test_create_get_request
+    url = 'http://en.wikipedia.org/wiki/Http?param=value'
+
+    request = Celluloid::Http::Builder.get(url)
+
+    assert_equal "en.wikipedia.org", request.host
+    assert_equal :get, request.method
+  end
+
+  def test_create_post_request
+    url = 'http://en.wikipedia.org/wiki/Http?param=value'
+
+    params = {:param2 => "value2"}
+
+    request = Celluloid::Http::Builder.post(url, params)
+
+    assert_equal "en.wikipedia.org", request.host
+    assert_equal :post, request.method
+  end
+
+
+
+end

data/test/unit/connection_test.rb

@@ -0,0 +1,12 @@
+require 'test_helper'
+
+class ConnectionTest < TestCase
+
+  def test_static_constructor
+    connection = mock('Connection')
+    connection.expects(:open).with('host',8080)
+    Celluloid::Http::Connection.expects(:new).returns(connection)
+
+    Celluloid::Http::Connection.open('host',8080)
+  end
+end

data/test/unit/http_test.rb

@@ -15,7 +15,25 @@ class HttpTest < TestCase
     stub_connection_with_fixture("en.wikipedia.org")
 
     response = Celluloid::Http.get('http://en.wikipedia.org/wiki/Http')
+
     assert_match /Wikipedia, the free encyclopedia/, response.body
   end
 
+  def test_http_get_gzip_method
+    stub_connection_with_fixture("gzip.wikipedia.org")
+
+    response = Celluloid::Http.get('http://en.wikipedia.org/wiki/Chunked_transfer_encoding')
+
+    assert_match /Chunked transfer encoding/, response.body
+  end
+
+  def test_http_post_method
+    stub_connection_with_fixture("post.example.com")
+
+    params = { :comment => { :message => "My comment." } }
+    response = Celluloid::Http.post('http://example.com/api/comments', params)
+
+    assert_match /"message":"My comment."/, response.body
+  end
+
 end

data/test/unit/request_test.rb

@@ -45,5 +45,35 @@ class RequestTest < TestCase
     assert_equal 'value3', request.query_params['param3']
   end
 
+  def test_get_http_request_to_s
+    request = Celluloid::Http::Request.new 'http://localhost?param=value'
+
+    string_request = <<-eos
+GET /?param=value HTTP/1.1
+Host: localhost
+
+eos
+
+    assert_equal string_request, request.to_s
+  end
+
+  def test_post_http_request_to_s
+    options = {
+        method: :post,
+        form_data: {param: :value, param2: :value2 }
+    }
+    request = Celluloid::Http::Request.new 'http://localhost', options
+
+    string_request = <<-eos
+POST / HTTP/1.1
+Host: localhost
+
+param2=value2&param=value
+eos
+
+    # without \n symbol
+    assert_equal string_request[0...-1], request.to_s
+  end
+
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: celluloid-http
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-31 00:00:00.000000000 Z
+date: 2013-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -75,6 +75,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  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
@@ -131,20 +147,27 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - celluloid-http.gemspec
 - lib/celluloid-http.rb
+- lib/celluloid-http/body_decoder.rb
+- lib/celluloid-http/builder.rb
 - lib/celluloid-http/connection.rb
 - lib/celluloid-http/http.rb
 - lib/celluloid-http/request.rb
 - lib/celluloid-http/response.rb
 - lib/celluloid-http/version.rb
 - test/fixtures/en.wikipedia.org
+- test/fixtures/gzip.wikipedia.org
+- test/fixtures/post.example.com
 - test/support/tcp_socket_stub.rb
 - test/test_helper.rb
+- test/unit/builder_test.rb
+- test/unit/connection_test.rb
 - test/unit/http_test.rb
 - test/unit/request_test.rb
 - test/unit/response_test.rb
@@ -160,12 +183,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4403004894707993416
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4403004894707993416
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -174,8 +203,12 @@ specification_version: 3
 summary: Http requests for celluloid. Based on Celluloid::IO.
 test_files:
 - test/fixtures/en.wikipedia.org
+- test/fixtures/gzip.wikipedia.org
+- test/fixtures/post.example.com
 - test/support/tcp_socket_stub.rb
 - test/test_helper.rb
+- test/unit/builder_test.rb
+- test/unit/connection_test.rb
 - test/unit/http_test.rb
 - test/unit/request_test.rb
 - test/unit/response_test.rb