gazouillis 0.1.1 → 0.1.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 5390ff6c5903785608b8b446fbc7e777df9a8cf4
+  data.tar.gz: 7c475b61dd31918401adadf3b7e26c5c2b38bedc
+SHA512:
+  metadata.gz: 9fc0ea7581c84b5e3b4dccabf16137d4256fc66109a31fccb3ce3c2add3280c3cc8ccbafe00cfdbbe9dc948525aad0e08d624155cd6d62a4cb33685a26ed097b
+  data.tar.gz: ecbc0fe02c937870e6c39b4dbf9684cdc0a1b6819e32afa678ab9f6a55efac7f7a312f8f7d4815a025bcf1cb6584abcd6df833b569b3c9b5322350d96c4d4464

data/lib/gazouillis.rb

@@ -4,4 +4,5 @@ require 'celluloid/io'
 require 'http/parser'
 require 'simple_oauth'
 require_relative 'gazouillis/stream'
+require_relative 'gazouillis/request'
 require_relative 'gazouillis/version'

data/lib/gazouillis/request.rb

@@ -0,0 +1,34 @@
+# encoding: utf-8
+module Gazouillis
+  class Request < String
+    attr_reader :host, :path, :method, :oauth
+    CRLF = "\r\n"
+
+    def initialize(path, options)
+      @host, @path, @method = options[:host], path, options[:method]
+      @oauth = options[:oauth]
+      super(request)
+    end
+
+    private
+
+    def request
+      [
+        "#{method} #{path} HTTP/1.1",
+        "Host: #{host}",
+        "User-Agent: Gazouillis #{Gazouillis::VERSION}",
+        "Authorization: #{oauth_header}",
+        CRLF
+      ].join(CRLF)
+    end
+
+    def oauth_header
+      SimpleOAuth::Header.new method, full_url, {}, oauth
+    end
+
+    def full_url
+      "https://#{host}#{path}"
+    end
+
+  end
+end

data/lib/gazouillis/stream.rb

@@ -4,34 +4,24 @@ module Gazouillis
   #
   class Stream
     include Celluloid::IO
-    attr_reader :host, :path, :method
+    attr_reader :request, :stream, :http_parser
 
     def initialize(path, opts)
-      @options = default_options.merge(opts)
-      @path = path
-      @host = opts.fetch(:host, "stream.twitter.com")
-      @method = opts.fetch(:method, "GET")
-
-      socket = TCPSocket.new "stream.twitter.com", 443
-      ssl = OpenSSL::SSL::SSLSocket.new(socket.to_io, OpenSSL::SSL::SSLContext.new)
-      ssl.sync = true
-      ssl.connect
-
-      @stream = ssl
-
+      options = default_options.merge(opts)
+      @request = Request.new(path, options)
+      @stream = set_stream(TCPSocket.new options[:host], options[:port])
       @http_parser = Http::Parser.new
-
-      @http_parser.on_body = on_message_callback
-      @http_parser.on_headers_complete = on_headers_complete
+      http_parser.on_body = on_message_callback
+      http_parser.on_headers_complete = on_headers_complete
     end
 
     def open
-      @stream.write request
+      stream.write request
       handle_connection
     end
 
     def close
-      @stream.to_io.close
+      stream.to_io.close
     end
 
     def on_message(message)
@@ -40,8 +30,16 @@ module Gazouillis
 
     private
 
+    def set_stream(socket)
+      OpenSSL::SSL::SSLSocket.new(socket.to_io,
+                                  OpenSSL::SSL::SSLContext.new).tap {|ssl|
+        ssl.sync = true
+        ssl.connect
+      }
+    end
+
     def handle_connection
-      @stream.each_line {|line| @http_parser << line } unless @stream.closed?
+      stream.each_line {|line| http_parser << line } unless stream.closed?
     end
 
     def on_message_callback
@@ -52,33 +50,15 @@ module Gazouillis
 
     def on_headers_complete
       Proc.new do
-        Actor.current.close if @http_parser.status_code != 200
+        Actor.current.close if http_parser.status_code != 200
       end
     end
 
-    # TODO : a real request object, with nice headers.
-    #
-    def request
-      request = "#{method} #{path} HTTP/1.1\r\n"
-      request << "Host: #{@options[:host]}\r\n"
-      request << "User-Agent: Gazouillis #{Gazouillis::VERSION}\r\n"
-      request << "Authorization: #{oauth}\r\n"
-      request << "\r\n"
-      request
-    end
-
-    def oauth
-      SimpleOAuth::Header.new method, full_url, {}, @options[:oauth]
-    end
-
-    def full_url
-      "https://#{host}#{path}"
-    end
-
     def default_options
       {
         host: 'stream.twitter.com',
-        port: 443
+        port: 443,
+        method: "GET"
       }
     end
   end

data/lib/gazouillis/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Gazouillis
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: gazouillis
 version: !ruby/object:Gem::Version
-  version: 0.1.1
-  prerelease: 
+  version: 0.1.2
 platform: ruby
 authors:
 - chatgris
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-23 00:00:00.000000000 Z
+date: 2013-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid-io
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simple_oauth
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -69,31 +62,30 @@ files:
 - LICENSE
 - README.md
 - lib/gazouillis.rb
+- lib/gazouillis/request.rb
 - lib/gazouillis/stream.rb
 - lib/gazouillis/version.rb
 homepage: http://chatgris.github.com/gazouillis
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.0.rc.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Twitter stream client.
 test_files: []
-has_rdoc: