tweetstream 1.1.3 → 1.1.4

data/.simplecov

@@ -0,0 +1,4 @@
+SimpleCov.start do
+  add_group 'Tweetstream', 'lib/tweetstream'
+  add_group 'Specs', 'spec'
+end

data/{RELEASE_NOTES.md → CHANGELOG.md}

@@ -1,3 +1,21 @@
+Version 1.1.4
+=============
+
+* Added Client#connect to start streaming inside an EM reactor (pelle)
+* Added shutdown_stream to cleanly stop the stream (lud)
+* Loosened multi_json dependency for Rails 3.2 compatibiltiy
+
+Version 1.1.3
+=============
+
+* Added on_reconnect callback method
+
+Version 1.1.2
+=============
+
+* Added support for statuses/links
+* Client now checks that specified json_parser can be loaded during initialization
+
 Version 1.1.1
 =============
 

data/README.md

@@ -1,17 +1,12 @@
-TweetStream
-===========
+# TweetStream
 
 TweetStream provides simple Ruby access to [Twitter's Streaming API](https://dev.twitter.com/docs/streaming-api).
 
-Installation
-------------
-
-To install:
+## Installation
 
     gem install tweetstream
 
-Usage
------
+## Usage
 
 Using TweetStream is quite simple:
 
@@ -55,8 +50,7 @@ end
 The methods available to TweetStream::Client will be kept in parity
 with the methods available on the Streaming API wiki page.
 
-Using the Twitter Userstream
-----------------------------
+## Using the Twitter Userstream
 
 Using the Twitter userstream works similarly to the regular streaming, except you use the userstream method.
 
@@ -85,8 +79,7 @@ end
 client.userstream
 ```
 
-Configuration and Changes in 1.1.0
-----------------------------------
+## Configuration and Changes in 1.1.0
 
 As of version 1.1.0.rc1 TweetStream supports OAuth.  Please note that in order
 to support OAuth, the `TweetStream::Client` initializer no longer accepts a
@@ -124,8 +117,7 @@ TweetStream assumes OAuth by default.  If you are using Basic Auth, it is recomm
 that you update your code to use OAuth as Twitter is likely to phase out Basic Auth
 support.
 
-Swappable JSON Parsing
-----------------------
+## Swappable JSON Parsing
 
 As of version 1.1, TweetStream supports swappable JSON backends via MultiJson. You can
 specify a parser during configuration:
@@ -139,8 +131,7 @@ end
 
 Available options are `:yajl`, `:json_gem`, `:json_pure`, and `:ok_json`.
 
-Handling Deletes and Rate Limitations
--------------------------------------
+## Handling Deletes and Rate Limitations
 
 Sometimes the Streaming API will send messages other than statuses.
 Specifically, it does so when a status is deleted or rate limitations
@@ -189,8 +180,7 @@ Twitter recommends honoring deletions as quickly as possible, and
 you would likely be wise to integrate this functionality into your
 application.
 
-Errors and Reconnecting
------------------------
+## Errors and Reconnecting
 
 TweetStream uses EventMachine to connect to the Twitter Streaming
 API, and attempts to honor Twitter's guidelines in terms of automatic
@@ -221,8 +211,7 @@ end.track('term') do |status|
 end
 ```
 
-Terminating a TweetStream
--------------------------
+## Terminating a TweetStream
 
 It is often the case that you will need to change the parameters of your
 track or follow tweet streams. In the case that you need to terminate
@@ -242,8 +231,7 @@ When `stop` is called, TweetStream will return from the block
 the last successfully yielded status, allowing you to make note of
 it in your application as necessary.
 
-Daemonizing
------------
+## Daemonizing
 
 It is also possible to create a daemonized script quite easily
 using the TweetStream library:
@@ -258,13 +246,16 @@ end
 If you put the above into a script and run the script with `ruby scriptname.rb`,
 you will see a list of daemonization commands such as start, stop, and run.
 
-TODO
-----
+## TODO
 
 * SiteStream support
 
-Note on Patches/Pull Requests
------------------------------
+## <a name="dependencies"></a>Dependency Status
+[![Dependency Status](https://gemnasium.com/intridea/tweetstream.png?travis)][gemnasium]
+
+[gemnasium]: https://gemnasium.com/intridea/tweetstream
+
+## Contributing
 
 * Fork the project.
 * Make your feature addition or bug fix.
@@ -272,13 +263,11 @@ Note on Patches/Pull Requests
 * Commit, do not mess with rakefile, version, or history. (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
 * Send me a pull request. Bonus points for topic branches.
 
-Contributors
-------------
+## Contributors
 
 * Michael Bleigh (initial gem)
 * Steve Agalloco (current maintainer)
 
-Copyright
----------
+## Copyright
 
 Copyright (c) 2011 Intridea, Inc. (http://www.intridea.com/). See [LICENSE](https://github.com/intridea/tweetstream/blob/master/LICENSE.md) for details.

data/examples/oauth.rb

@@ -16,6 +16,6 @@ client.on_error do |message|
   puts message
 end
 
-client.track("yankees")  do |status|
+client.track("yankees") do |status|
   puts "#{status.text}"
 end

data/lib/tweetstream/client.rb

@@ -305,7 +305,22 @@ module TweetStream
       end
     end
 
-    def start(path, query_parameters = {}, &block) #:nodoc:
+    # connect to twitter while starting a new EventMachine run loop
+    def start(path, query_parameters = {}, &block)
+      if EventMachine.reactor_running?
+        connect(path, query_parameters, &block)
+      else
+        EventMachine.epoll
+        EventMachine.kqueue
+
+        EventMachine::run do
+          connect(path, query_parameters, &block)
+        end
+      end
+    end
+
+    # connect to twitter without starting a new EventMachine run loop
+    def connect(path, query_parameters = {}, &block)
       method = query_parameters.delete(:method) || :get
       delete_proc = query_parameters.delete(:delete) || self.on_delete
       limit_proc = query_parameters.delete(:limit) || self.on_limit
@@ -332,81 +347,87 @@ module TweetStream
         :ssl        => true
       }.merge(auth_params).merge(extra_stream_parameters)
 
-      EventMachine.epoll
-      EventMachine.kqueue
-
-      EventMachine::run {
-        if @on_interval_proc.is_a?(Proc)
-          interval = @on_interval_time || Configuration::DEFAULT_TIMER_INTERVAL
-          @timer = EventMachine.add_periodic_timer(interval) do
-            EventMachine.defer do
-              @on_interval_proc.call
-            end
+      if @on_interval_proc.is_a?(Proc)
+        interval = @on_interval_time || Configuration::DEFAULT_TIMER_INTERVAL
+        @timer = EventMachine.add_periodic_timer(interval) do
+          EventMachine.defer do
+            @on_interval_proc.call
           end
         end
+      end
 
-        @stream = Twitter::JSONStream.connect(stream_params)
-        @stream.each_item do |item|
-          begin
-            raw_hash = json_parser.decode(item)
-          rescue MultiJson::DecodeError
-            error_proc.call("MultiJson::DecodeError occured in stream: #{item}") if error_proc.is_a?(Proc)
-            next
-          end
+      @stream = Twitter::JSONStream.connect(stream_params)
+      @stream.each_item do |item|
+        begin
+          raw_hash = json_parser.decode(item)
+        rescue MultiJson::DecodeError
+          error_proc.call("MultiJson::DecodeError occured in stream: #{item}") if error_proc.is_a?(Proc)
+          next
+        end
 
-          unless raw_hash.is_a?(::Hash)
-            error_proc.call("Unexpected JSON object in stream: #{item}") if error_proc.is_a?(Proc)
-            next
-          end
+        unless raw_hash.is_a?(::Hash)
+          error_proc.call("Unexpected JSON object in stream: #{item}") if error_proc.is_a?(Proc)
+          next
+        end
 
-          hash = TweetStream::Hash.new(raw_hash)
-          if hash[:delete] && hash[:delete][:status]
-            delete_proc.call(hash[:delete][:status][:id], hash[:delete][:status][:user_id]) if delete_proc.is_a?(Proc)
-          elsif hash[:limit] && hash[:limit][:track]
-            limit_proc.call(hash[:limit][:track]) if limit_proc.is_a?(Proc)
-
-          elsif hash[:direct_message]
-            yield_message_to direct_message_proc, TweetStream::DirectMessage.new(hash[:direct_message])
-
-          elsif hash[:text] && hash[:user]
-            @last_status = TweetStream::Status.new(hash)
-            yield_message_to timeline_status_proc, @last_status
-
-            if block_given?
-              # Give the block the option to receive either one
-              # or two arguments, depending on its arity.
-              case block.arity
-                when 1
-                  yield @last_status
-                when 2
-                  yield @last_status, self
-              end
+        hash = TweetStream::Hash.new(raw_hash)
+        if hash[:delete] && hash[:delete][:status]
+          delete_proc.call(hash[:delete][:status][:id], hash[:delete][:status][:user_id]) if delete_proc.is_a?(Proc)
+        elsif hash[:limit] && hash[:limit][:track]
+          limit_proc.call(hash[:limit][:track]) if limit_proc.is_a?(Proc)
+
+        elsif hash[:direct_message]
+          yield_message_to direct_message_proc, TweetStream::DirectMessage.new(hash[:direct_message])
+
+        elsif hash[:text] && hash[:user]
+          @last_status = TweetStream::Status.new(hash)
+          yield_message_to timeline_status_proc, @last_status
+
+          if block_given?
+            # Give the block the option to receive either one
+            # or two arguments, depending on its arity.
+            case block.arity
+              when 1
+                yield @last_status
+              when 2
+                yield @last_status, self
             end
           end
-
-          yield_message_to anything_proc, hash
         end
 
-        @stream.on_error do |message|
-          error_proc.call(message) if error_proc.is_a?(Proc)
-        end
+        yield_message_to anything_proc, hash
+      end
 
-        @stream.on_reconnect do |timeout, retries|
-          reconnect_proc.call(timeout, retries) if reconnect_proc.is_a?(Proc)
-        end
+      @stream.on_error do |message|
+        error_proc.call(message) if error_proc.is_a?(Proc)
+      end
 
-        @stream.on_max_reconnects do |timeout, retries|
-          raise TweetStream::ReconnectError.new(timeout, retries)
-        end
-      }
+      @stream.on_reconnect do |timeout, retries|
+        reconnect_proc.call(timeout, retries) if reconnect_proc.is_a?(Proc)
+      end
+
+      @stream.on_max_reconnects do |timeout, retries|
+        raise TweetStream::ReconnectError.new(timeout, retries)
+      end
+
+      @stream
     end
 
-    # Terminate the currently running TweetStream.
+    # Terminate the currently running TweetStream and close EventMachine loop
     def stop
       EventMachine.stop_event_loop
       @last_status
     end
 
+    # Close the connection to twitter without closing the eventmachine loop
+    def close_connection
+      @stream.close_connection if @stream
+    end
+
+    def stop_stream
+      @stream.stop if @stream
+    end
+
     protected
 
     def parser_from(parser)

data/lib/tweetstream/version.rb

@@ -1,3 +1,3 @@
 module TweetStream
-  VERSION = '1.1.3'
+  VERSION = '1.1.4'
 end

data/spec/spec_helper.rb

@@ -1,28 +1,17 @@
 require 'simplecov'
-SimpleCov.start do
-  add_group 'Tweetstream', 'lib/tweetstream'
-  add_group 'Specs', 'spec'
-end
-
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-
 require 'tweetstream'
 require 'rspec'
-require 'rspec/autorun'
 require 'yajl'
 require 'json'
 
 def sample_tweets
-  if @tweets
-    @tweets
-  else
-    @tweets = []
-    Yajl::Parser.parse(File.open(File.dirname(__FILE__) + '/data/statuses.json', 'r'), :symbolize_keys => true) do |hash|
-      @tweets << hash
-    end
-    @tweets
+  return @tweets if @tweets
+
+  @tweets = []
+  Yajl::Parser.parse(File.open(File.dirname(__FILE__) + '/data/statuses.json', 'r'), :symbolize_keys => true) do |hash|
+    @tweets << hash
   end
+  @tweets
 end
 
 def sample_direct_messages

data/spec/tweetstream/client_spec.rb

@@ -253,38 +253,61 @@ describe TweetStream::Client do
       end
     end
 
-    it '#track should make a call to start with "statuses/filter" and a track query parameter' do
-      @client.should_receive(:start).once.with('statuses/filter', :track => ['test'], :method => :post)
-      @client.track('test')
+    describe '#filter' do
+      it 'makes a call to "statuses/filter" with the query params provided' do
+        @client.should_receive(:start).once.with('statuses/filter', :follow => 123, :method => :post)
+        @client.filter(:follow => 123)
+      end
+      it 'makes a call to "statuses/filter" with the query params provided longitude/latitude pairs, separated by commas ' do
+        @client.should_receive(:start).once.with('statuses/filter', :locations => '-122.75,36.8,-121.75,37.8,-74,40,-73,41', :method => :post)
+        @client.filter(:locations => '-122.75,36.8,-121.75,37.8,-74,40,-73,41')
+      end
     end
 
-    it '#track should comma-join multiple arguments' do
-      @client.should_receive(:start).once.with('statuses/filter', :track => ['foo', 'bar', 'baz'], :method => :post)
-      @client.track('foo', 'bar', 'baz')
-    end
+    describe '#follow' do
+      it 'makes a call to start with "statuses/filter" and a follow query parameter' do
+        @client.should_receive(:start).once.with('statuses/filter', :follow => [123], :method => :post)
+        @client.follow(123)
+      end
 
-    it '#track should comma-join an array of arguments' do
-      @client.should_receive(:start).once.with('statuses/filter', :track => [['foo','bar','baz']], :method => :post)
-      @client.track(['foo','bar','baz'])
+      it 'comma-joins multiple arguments' do
+        @client.should_receive(:start).once.with('statuses/filter', :follow => [123,456], :method => :post)
+        @client.follow(123, 456)
+      end
     end
 
-    it '#follow should make a call to start with "statuses/filter" and a follow query parameter' do
-      @client.should_receive(:start).once.with('statuses/filter', :follow => [123], :method => :post)
-      @client.follow(123)
-    end
+    describe '#locations' do
+      it 'should call #start with "statuses/filter" with the query params provided longitude/latitude pairs' do
+        @client.should_receive(:start).once.with('statuses/filter', :locations => ['-122.75,36.8,-121.75,37.8,-74,40,-73,41'], :method => :post)
+        @client.locations('-122.75,36.8,-121.75,37.8,-74,40,-73,41')
+      end
 
-    it '#follow should comma-join multiple arguments' do
-      @client.should_receive(:start).once.with('statuses/filter', :follow => [123,456], :method => :post)
-      @client.follow(123, 456)
+      it 'should call #start with "statuses/filter" with the query params provided longitude/latitude pairs and additional filter' do
+        @client.should_receive(:start).once.with('statuses/filter', :locations => ['-122.75,36.8,-121.75,37.8,-74,40,-73,41'], :track => 'rock', :method => :post)
+        @client.locations('-122.75,36.8,-121.75,37.8,-74,40,-73,41', :track => 'rock')
+      end
     end
 
-    it '#filter should make a call to "statuses/filter" with the query params provided' do
-      @client.should_receive(:start).once.with('statuses/filter', :follow => 123, :method => :post)
-      @client.filter(:follow => 123)
-    end
-    it '#filter should make a call to "statuses/filter" with the query params provided longitude/latitude pairs, separated by commas ' do
-      @client.should_receive(:start).once.with('statuses/filter', :locations => '-122.75,36.8,-121.75,37.8,-74,40,-73,41', :method => :post)
-      @client.filter(:locations => '-122.75,36.8,-121.75,37.8,-74,40,-73,41')
+    describe '#track' do
+      it 'makes a call to start with "statuses/filter" and a track query parameter' do
+        @client.should_receive(:start).once.with('statuses/filter', :track => ['test'], :method => :post)
+        @client.track('test')
+      end
+
+      it 'comma-joins multiple arguments' do
+        @client.should_receive(:start).once.with('statuses/filter', :track => ['foo', 'bar', 'baz'], :method => :post)
+        @client.track('foo', 'bar', 'baz')
+      end
+
+      it 'comma-joins an array of arguments' do
+        @client.should_receive(:start).once.with('statuses/filter', :track => [['foo','bar','baz']], :method => :post)
+        @client.track(['foo','bar','baz'])
+      end
+
+      it 'should call #start with "statuses/filter" and the provided queries' do
+        @client.should_receive(:start).once.with('statuses/filter', :track => ['rock'], :method => :post)
+        @client.track('rock')
+      end
     end
   end
 
@@ -319,25 +342,6 @@ describe TweetStream::Client do
     end
   end
 
-  describe '#track' do
-    it 'should call #start with "statuses/filter" and the provided queries' do
-      @client.should_receive(:start).once.with('statuses/filter', :track => ['rock'], :method => :post)
-      @client.track('rock')
-    end
-  end
-
-  describe '#locations' do
-    it 'should call #start with "statuses/filter" with the query params provided longitude/latitude pairs' do
-      @client.should_receive(:start).once.with('statuses/filter', :locations => ['-122.75,36.8,-121.75,37.8,-74,40,-73,41'], :method => :post)
-      @client.locations('-122.75,36.8,-121.75,37.8,-74,40,-73,41')
-    end
-
-    it 'should call #start with "statuses/filter" with the query params provided longitude/latitude pairs and additional filter' do
-      @client.should_receive(:start).once.with('statuses/filter', :locations => ['-122.75,36.8,-121.75,37.8,-74,40,-73,41'], :track => 'rock', :method => :post)
-      @client.locations('-122.75,36.8,-121.75,37.8,-74,40,-73,41', :track => 'rock')
-    end
-  end
-
   describe '#stop' do
     it 'should call EventMachine::stop_event_loop' do
       EventMachine.should_receive :stop_event_loop
@@ -352,6 +356,41 @@ describe TweetStream::Client do
     end
   end
 
+  describe '#close_connection' do
+    it 'should not call EventMachine::stop_event_loop' do
+      EventMachine.should_not_receive :stop_event_loop
+      TweetStream::Client.new.close_connection.should be_nil
+    end
+  end
+
+  describe '#stop_stream' do
+    before(:each) do
+      @stream = stub("Twitter::JSONStream",
+        :connect => true,
+        :unbind => true,
+        :each_item => true,
+        :on_error => true,
+        :on_max_reconnects => true,
+        :on_reconnect => true,
+        :connection_completed => true,
+        :stop => true
+      )
+      Twitter::JSONStream.stub!(:connect).and_return(@stream)
+      @client = TweetStream::Client.new
+      @client.connect('/')
+    end
+
+    it "should call stream.stop to cleanly stop the current stream" do
+      @stream.should_receive(:stop)
+      @client.stop_stream
+    end
+
+    it 'should not stop eventmachine' do
+      EventMachine.should_not_receive :stop_event_loop
+      @client.stop_stream
+    end
+  end
+
   describe "oauth" do
     describe '#start' do
       before do

data/tweetstream.gemspec

@@ -1,32 +1,28 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "tweetstream/version"
+require File.expand_path('../lib/tweetstream/version', __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = 'tweetstream'
   s.version     = TweetStream::VERSION
 
-  s.authors     = ['Michael Bleigh']
-  s.email       = ['michael@intridea.com']
+  s.authors     = ['Michael Bleigh', 'Steve Agalloco']
+  s.email       = ['michael@intridea.com', 'steve.agalloco@gmail.com']
   s.description = %q{TweetStream allows you to easily consume the Twitter Streaming API utilizing the YAJL Ruby gem.}
   s.summary     = %q{TweetStream is a simple wrapper for consuming the Twitter Streaming API.}
   s.homepage    = 'http://github.com/intridea/tweetstream'
 
-  s.platform                  = Gem::Platform::RUBY
-  s.rubygems_version          = %q{1.3.6}
-  s.required_rubygems_version = Gem::Requirement.new(">= 1.3.6") if s.respond_to? :required_rubygems_version=
+  s.add_dependency 'twitter-stream', '= 0.1.14'
+  s.add_dependency 'daemons', '~> 1.1'
+  s.add_dependency 'multi_json', '>= 1.0'
 
-  s.add_dependency 'twitter-stream', '~> 0.1.14'
-  s.add_dependency 'daemons', '~> 1.1.4'
-  s.add_dependency 'multi_json', '~> 1.0.3'
   s.add_development_dependency 'rake', '~> 0.9'
   s.add_development_dependency 'simplecov', '~> 0.5.4'
   s.add_development_dependency 'yard', '~> 0.7'
   s.add_development_dependency 'rdiscount', '~> 1.6'
   s.add_development_dependency 'rspec', '~> 2.7'
   s.add_development_dependency 'yajl-ruby', '~> 1.0'
-  s.add_development_dependency 'json', '~> 1.5.1'
-  s.add_development_dependency 'guard-rspec', '~> 0.4.3'
+  s.add_development_dependency 'json', '~> 1.6'
+  s.add_development_dependency 'guard-rspec', '~> 0.5'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

metadata

@@ -1,52 +1,53 @@
 --- !ruby/object:Gem::Specification
 name: tweetstream
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
   prerelease: 
 platform: ruby
 authors:
 - Michael Bleigh
+- Steve Agalloco
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-12 00:00:00.000000000Z
+date: 2012-02-28 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: twitter-stream
-  requirement: &2156592560 !ruby/object:Gem::Requirement
+  requirement: &2152607200 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - =
       - !ruby/object:Gem::Version
         version: 0.1.14
   type: :runtime
   prerelease: false
-  version_requirements: *2156592560
+  version_requirements: *2152607200
 - !ruby/object:Gem::Dependency
   name: daemons
-  requirement: &2156592100 !ruby/object:Gem::Requirement
+  requirement: &2152606040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.4
+        version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *2156592100
+  version_requirements: *2152606040
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &2156591640 !ruby/object:Gem::Requirement
+  requirement: &2152605380 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156591640
+  version_requirements: *2152605380
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2156591180 !ruby/object:Gem::Requirement
+  requirement: &2152604700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +55,10 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *2156591180
+  version_requirements: *2152604700
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2156579120 !ruby/object:Gem::Requirement
+  requirement: &2152603860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +66,10 @@ dependencies:
         version: 0.5.4
   type: :development
   prerelease: false
-  version_requirements: *2156579120
+  version_requirements: *2152603860
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2156578620 !ruby/object:Gem::Requirement
+  requirement: &2152603300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +77,10 @@ dependencies:
         version: '0.7'
   type: :development
   prerelease: false
-  version_requirements: *2156578620
+  version_requirements: *2152603300
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &2156578160 !ruby/object:Gem::Requirement
+  requirement: &2152602660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +88,10 @@ dependencies:
         version: '1.6'
   type: :development
   prerelease: false
-  version_requirements: *2156578160
+  version_requirements: *2152602660
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156577520 !ruby/object:Gem::Requirement
+  requirement: &2152601880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +99,10 @@ dependencies:
         version: '2.7'
   type: :development
   prerelease: false
-  version_requirements: *2156577520
+  version_requirements: *2152601880
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &2156576840 !ruby/object:Gem::Requirement
+  requirement: &2152601160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,33 +110,34 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *2156576840
+  version_requirements: *2152601160
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2156576120 !ruby/object:Gem::Requirement
+  requirement: &2152600600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: '1.6'
   type: :development
   prerelease: false
-  version_requirements: *2156576120
+  version_requirements: *2152600600
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &2156575520 !ruby/object:Gem::Requirement
+  requirement: &2152599980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: '0.5'
   type: :development
   prerelease: false
-  version_requirements: *2156575520
+  version_requirements: *2152599980
 description: TweetStream allows you to easily consume the Twitter Streaming API utilizing
   the YAJL Ruby gem.
 email:
 - michael@intridea.com
+- steve.agalloco@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -144,12 +146,13 @@ files:
 - .gemtest
 - .gitignore
 - .rspec
+- .simplecov
 - .yardopts
+- CHANGELOG.md
 - Gemfile
 - Guardfile
 - LICENSE.md
 - README.md
-- RELEASE_NOTES.md
 - Rakefile
 - examples/growl_daemon.rb
 - examples/oauth.rb
@@ -192,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.6
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10
@@ -210,3 +213,4 @@ test_files:
 - spec/tweetstream/parser_spec.rb
 - spec/tweetstream/status_spec.rb
 - spec/tweetstream_spec.rb
+has_rdoc: