twitterstream 0.1.1 → 0.2.0

data/History.txt

@@ -1,3 +1,6 @@
+=== 0.2.0 2011-01-08
+* Support Production UserStreams
+
 === 0.1.1 2010-01-01
 * Fixed require 'twitter_stream' => 'twitterstream'
 * Fixed couldn't get deletion/limitation notice

data/lib/twitterstream.rb

@@ -5,102 +5,122 @@ require 'net/http'
 require 'uri'
 require 'rubygems'
 require 'json'
+require 'oauth'
 
 module Net
-    class HTTPResponse
-        def each_line(rs = "\n")
-            stream_check
-            while line = @socket.readuntil(rs)
-                yield line
-            end
-            self
-        end
+  class HTTPResponse
+    def each_line(rs = "\n")
+      stream_check
+      while line = @socket.readuntil(rs)
+        yield line
+      end
+      self
     end
+  end
 end
 
 class TwitterStream
-    VERSION = '0.1.1'
-    @@urls = {
-        'sample' => URI.parse("http://stream.twitter.com/1/statuses/sample.json"),
-        'filter' => URI.parse("http://stream.twitter.com/1/statuses/filter.json")
-    }
-
-    def initialize(username, password)
-        @username = username
-        @password = password
-        self
+  VERSION = '0.2.0'
+  @@urls = {
+    'sample' => URI.parse("http://stream.twitter.com/1/statuses/sample.json"),
+    'filter' => URI.parse("http://stream.twitter.com/1/statuses/filter.json"),
+    'userstreams' => URI.parse('https://userstream.twitter.com/2/user.json?replies=all'),
+  }
+  
+  def initialize(params={ })
+    if params[:username] && params[:password]
+      @username = params[:username]
+      @password = params[:password]
+    else
+      @consumer = OAuth::Consumer.new(params[:consumer_token], params[:consumer_secret])
+      @access = OAuth::Token.new(params[:access_token], params[:access_secret])
     end
-
-    def sample(params=nil)
-        raise ArgumentError, "params is not hash" unless params.nil? || params.kind_of?(Hash)
-        start_stream('sample', params) do |status|
-            yield status
-        end
+    self
+  end
+  
+  def sample(params=nil)
+    raise ArgumentError, "params is not hash" unless params.nil? || params.kind_of?(Hash)
+    start_stream('sample', params) do |status|
+      yield status
     end
-
-    def filter(params=nil)
-        raise ArgumentError, "params is not hash" unless params.nil? || params.kind_of?(Hash)
-        start_stream('filter', params) do |status|
-            yield status
-        end
+  end
+  
+  def filter(params=nil)
+    raise ArgumentError, "params is not hash" unless params.nil? || params.kind_of?(Hash)
+    start_stream('filter', params) do |status|
+      yield status
     end
-
-    def track(track, params=nil)
-        raise ArgumentError, "track is not array or string" unless track.kind_of?(Array) || track.kind_of?(String)
-        raise ArgumentError, "params is not hash" unless params.nil? || params.kind_of?(Hash)
-
-        p = { 'track' => track.kind_of?(Array) ? track.map{|x| raise ArgumentError, "track item is not string or integer!" unless x.kind_of?(String) || x.kind_of?(Integer); x.kind_of?(Integer) ? x.to_s : x }.join(",") : track }
-
-        p.merge!('filter',params) if params
-        start_stream('filter', p) do |status|
-            yield status
-        end
+  end
+  
+  def track(track, params=nil)
+    raise ArgumentError, "track is not array or string" unless track.kind_of?(Array) || track.kind_of?(String)
+    raise ArgumentError, "params is not hash" unless params.nil? || params.kind_of?(Hash)
+    
+    p = { 'track' => track.kind_of?(Array) ? track.map{|x| raise ArgumentError, "track item is not string or integer!" unless x.kind_of?(String) || x.kind_of?(Integer); x.kind_of?(Integer) ? x.to_s : x }.join(",") : track }
+    
+    p.merge!('filter',params) if params
+    start_stream('filter', p) do |status|
+      yield status
     end
-
-    def follow(follow, params=nil)
-        raise ArgumentError, "follow is not array or string" unless follow.kind_of?(Array) || follow.kind_of?(String)
-        raise ArgumentError, "params is not hash" unless params.nil? || params.kind_of?(Hash)
-
-        p = { 'follow' => follow.kind_of?(Array) ? follow.join(",") : follow }
-        p.merge!(params) if params
-
-        start_stream('filter', p) do |status|
-            yield status
-        end
+  end
+  
+  def follow(follow, params=nil)
+    raise ArgumentError, "follow is not array or string" unless follow.kind_of?(Array) || follow.kind_of?(String)
+    raise ArgumentError, "params is not hash" unless params.nil? || params.kind_of?(Hash)
+    
+    p = { 'follow' => follow.kind_of?(Array) ? follow.join(",") : follow }
+    p.merge!(params) if params
+    
+    start_stream('filter', p) do |status|
+      yield status
+    end
+  end
+  
+  def userstreams(params=nil)
+    raise ArgumentError, "params is not hash" unless params.nil? || params.kind_of?(Hash)
+    start_stream('userstreams', params) do |status|
+      yield status
+    end
+  end
+  
+  private
+  
+  def start_stream(url, params=nil)
+    raise ArgumentError, "params is not hash" unless params.nil? || params.kind_of?(Hash)
+    raise ArgumentError, "url is not String or URI!" unless url.kind_of?(URI) || url.kind_of?(String)
+    
+    if url.kind_of?(URI)
+      uri = url
+    elsif url.kind_of?(String)
+      if @@urls[url]
+        uri = @@urls[url]
+      elsif /^https?:/ =~ url
+        uri = URI.parse(url)
+      else
+        raise ArgumentError, "@@urls['#{url}'] not found"
+      end
+    end
+    
+    http = Net::HTTP.new(uri.host, uri.port)
+    http.use_ssl = true if uri.host == "userstream.twitter.com"
+    http.start
+    request = Net::HTTP::Post.new(uri.request_uri)
+    request.set_form_data(params) if params
+    if @username && @password
+      request.basic_auth(@username, @password)
+    else
+      request.oauth!(http, @consumer, @access)
     end
 
-    private
-
-    def start_stream(url, params=nil)
-        raise ArgumentError, "params is not hash" unless params.nil? || params.kind_of?(Hash)
-        raise ArgumentError, "url is not String or URI!" unless url.kind_of?(URI) || url.kind_of?(String)
-
-        if url.kind_of?(URI)
-            uri = url
-        elsif url.kind_of?(String)
-            if @@urls[url]
-                uri = @@urls[url]
-            elsif /^https?:/ =~ url
-                uri = URI.parse(url)
-            else
-                raise ArgumentError, "@@urls['#{url}'] not found"
-            end
-        end
-
-        http = Net::HTTP.start(uri.host, uri.port)
-        request = Net::HTTP::Post.new(uri.request_uri)
-        request.set_form_data(params) if params
-        request.basic_auth(@username, @password)
-
-        begin
-            http.request(request) do |response|
-                response.each_line("\r\n") do |line|
-                    j = JSON.parse(line) rescue next
-                    yield j
-                end
-            end
-        ensure
-            http.finish
+    begin
+      http.request(request) do |response|
+        response.each_line("\r\n") do |line|
+          j = JSON.parse(line) rescue next
+          yield j
         end
+      end
+    ensure
+      http.finish
     end
+  end
 end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: twitterstream
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  hash: 23
+  prerelease: 
+  segments: 
+  - 0
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - yayugu
@@ -9,29 +15,41 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-01 00:00:00 +09:00
+date: 2011-01-08 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 1
+        - 2
+        - 0
         version: 1.2.0
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.4.0
-    version: 
+        hash: 47
+        segments: 
+        - 2
+        - 8
+        - 0
+        version: 2.8.0
+  type: :development
+  version_requirements: *id002
 description: It is the simple library to access the Twitter Streaming API( http://apiwiki.twitter.com/Streaming-API-Documentation ). It works with pure-ruby(don't need C compiler) and rubygems.
 email: 
 - yayugu@gmail.com
@@ -65,24 +83,30 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: twitterstream
-rubygems_version: 1.3.5
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: It is the simple library to access the Twitter Streaming API( http://apiwiki.twitter.com/Streaming-API-Documentation )
 test_files: 
-- test/test_twitterstream.rb
 - test/test_helper.rb
+- test/test_twitterstream.rb