tweetstream 1.1.4 → 1.1.5

data/.rspec

@@ -1,2 +1 @@
---colour
---format doc
+--color

data/.travis.yml

@@ -0,0 +1,10 @@
+language: ruby
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+rvm:
+  - rbx-19mode
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - ruby-head

data/CHANGELOG.md

@@ -40,4 +40,4 @@ Version 1.0.0
 
 * Swappable JSON backend support
 * Switches to use EventMachine instead of Yajl for the HTTP Stream
-* Support reconnect and on_error
+* Support reconnect and on_error

data/Gemfile

@@ -1,2 +1,3 @@
-source :rubygems
-gemspec
+source 'https://rubygems.org'
+
+gemspec

data/README.md

@@ -1,7 +1,9 @@
-# TweetStream
-
+# TweetStream [![Build Status](https://secure.travis-ci.org/intridea/tweetstream.png?branch=master)][travis] [![Dependency Status](https://gemnasium.com/intridea/tweetstream.png?travis)][gemnasium]
 TweetStream provides simple Ruby access to [Twitter's Streaming API](https://dev.twitter.com/docs/streaming-api).
 
+[travis]: http://travis-ci.org/intridea/tweetstream
+[gemnasium]: https://gemnasium.com/intridea/tweetstream
+
 ## Installation
 
     gem install tweetstream
@@ -11,7 +13,6 @@ TweetStream provides simple Ruby access to [Twitter's Streaming API](https://dev
 Using TweetStream is quite simple:
 
 ```ruby
-require 'rubygems'
 require 'tweetstream'
 
 TweetStream.configure do |config|
@@ -129,7 +130,8 @@ TweetStream.configure do |config|
 end
 ```
 
-Available options are `:yajl`, `:json_gem`, `:json_pure`, and `:ok_json`.
+Available options are `:oj`, `:yajl`, `:json_gem`, `:json_pure`, and
+`:ok_json`.
 
 ## Handling Deletes and Rate Limitations
 
@@ -250,11 +252,6 @@ you will see a list of daemonization commands such as start, stop, and run.
 
 * SiteStream support
 
-## <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.

data/examples/oauth.rb

@@ -18,4 +18,4 @@ end
 
 client.track("yankees") do |status|
   puts "#{status.text}"
-end
+end

data/lib/tweetstream/client.rb

@@ -108,9 +108,9 @@ module TweetStream
     # the first pair denoting the southwest corner of the box
     # longitude/latitude pairs, separated by commas. The first pair specifies the southwest corner of the box.
     def locations(*locations_map, &block)
-        query_params = locations_map.pop if locations_map.last.is_a?(::Hash)
-        query_params ||= {}
-        filter(query_params.merge(:locations => locations_map), &block)
+      query_params = locations_map.pop if locations_map.last.is_a?(::Hash)
+      query_params ||= {}
+      filter(query_params.merge(:locations => locations_map), &block)
     end
 
     # Make a call to the statuses/filter method of the Streaming API,
@@ -148,6 +148,27 @@ module TweetStream
       end
     end
 
+    # Set a Proc to be run when a scrub_geo notice is received
+    # from the Twitter stream. For example:
+    #
+    #     @client = TweetStream::Client.new
+    #     @client.on_scrub_geo do |up_to_status_id, user_id|
+    #       Tweet.where(:status_id <= up_to_status_id)
+    #     end
+    #
+    # Block must take two arguments: the upper status id and the user id.
+    # If no block is given, it will return the currently set
+    # scrub_geo proc. When a block is given, the TweetStream::Client
+    # object is returned to allow for chaining.
+    def on_scrub_geo(&block)
+      if block_given?
+        @on_scrub_geo = block
+        self
+      else
+        @on_scrub_geo
+      end
+    end
+
     # Set a Proc to be run when a rate limit notice is received
     # from the Twitter stream. For example:
     #
@@ -323,6 +344,7 @@ module TweetStream
     def connect(path, query_parameters = {}, &block)
       method = query_parameters.delete(:method) || :get
       delete_proc = query_parameters.delete(:delete) || self.on_delete
+      scrub_geo_proc = query_parameters.delete(:scrub_geo) || self.on_scrub_geo
       limit_proc = query_parameters.delete(:limit) || self.on_limit
       error_proc = query_parameters.delete(:error) || self.on_error
       reconnect_proc = query_parameters.delete(:reconnect) || self.on_reconnect
@@ -338,13 +360,13 @@ module TweetStream
       uri = method == :get ? build_uri(path, params) : build_uri(path)
 
       stream_params = {
-        :path       => uri,
-        :method     => method.to_s.upcase,
-        :user_agent => user_agent,
-        :on_inited  => inited_proc,
-        :filters    => params.delete(:track),
-        :params     => params,
-        :ssl        => true
+          :path => uri,
+          :method => method.to_s.upcase,
+          :user_agent => user_agent,
+          :on_inited => inited_proc,
+          :filters => params.delete(:track),
+          :params => params,
+          :ssl => true
       }.merge(auth_params).merge(extra_stream_parameters)
 
       if @on_interval_proc.is_a?(Proc)
@@ -373,6 +395,8 @@ module TweetStream
         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[:scrub_geo] && hash[:scrub_geo][:up_to_status_id]
+          scrub_geo_proc.call(hash[:scrub_geo][:up_to_status_id], hash[:scrub_geo][:user_id]) if scrub_geo_proc.is_a?(Proc)
         elsif hash[:limit] && hash[:limit][:track]
           limit_proc.call(hash[:limit][:track]) if limit_proc.is_a?(Proc)
 
@@ -431,7 +455,7 @@ module TweetStream
     protected
 
     def parser_from(parser)
-      MultiJson.engine = parser
+      MultiJson.adapter = parser
       MultiJson
     end
 
@@ -455,7 +479,7 @@ module TweetStream
     def normalize_filter_parameters(query_parameters = {})
       [:follow, :track, :locations].each do |param|
         if query_parameters[param].kind_of?(Array)
-          query_parameters[param] = query_parameters[param].flatten.collect{|q| q.to_s}.join(',')
+          query_parameters[param] = query_parameters[param].flatten.collect { |q| q.to_s }.join(',')
         elsif query_parameters[param]
           query_parameters[param] = query_parameters[param].to_s
         end
@@ -465,25 +489,25 @@ module TweetStream
 
     def auth_params
       case auth_method
-      when :basic
-        return :auth => "#{username}:#{password}"
-      when :oauth
-        return :oauth => {
-          :consumer_key => consumer_key,
-          :consumer_secret => consumer_secret,
-          :access_key => oauth_token,
-          :access_secret => oauth_token_secret
-        }
+        when :basic
+          return :auth => "#{username}:#{password}"
+        when :oauth
+          return :oauth => {
+              :consumer_key => consumer_key,
+              :consumer_secret => consumer_secret,
+              :access_key => oauth_token,
+              :access_secret => oauth_token_secret
+          }
       end
     end
 
     def yield_message_to(procedure, message)
       if procedure.is_a?(Proc)
         case procedure.arity
-        when 1
-          procedure.call(message)
-        when 2
-          procedure.call(message, self)
+          when 1
+            procedure.call(message)
+          when 2
+            procedure.call(message, self)
         end
       end
     end

data/lib/tweetstream/configuration.rb

@@ -17,7 +17,7 @@ module TweetStream
       :oauth_token_secret].freeze
 
     # The parser that will be used to connect if none is set
-    DEFAULT_PARSER = MultiJson.default_engine
+    DEFAULT_PARSER = MultiJson.default_adapter
 
     # By default, don't set a username
     DEFAULT_USERNAME = nil

data/lib/tweetstream/error.rb

@@ -12,4 +12,4 @@ module TweetStream
       super("Failed to reconnect after #{retries} tries.")
     end
   end
-end
+end

data/lib/tweetstream/hash.rb

@@ -6,7 +6,17 @@ class TweetStream::Hash < ::Hash #:nodoc: all
       self[key.to_sym] = value
     end
   end
-    
+
+  # This shim is necessary since method_missing won't be invoked for #id on
+  # Ruby < 1.9
+  def id
+    if key?(:id)
+      self[:id]
+    else
+      super
+    end
+  end
+
   def method_missing(method_name, *args)
     if key?(method_name.to_sym)
       self[method_name.to_sym]
@@ -14,4 +24,4 @@ class TweetStream::Hash < ::Hash #:nodoc: all
       super
     end
   end
-end
+end

data/lib/tweetstream/version.rb

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

data/spec/spec_helper.rb

@@ -1,4 +1,11 @@
-require 'simplecov'
+unless ENV['CI']
+  require 'simplecov'
+  SimpleCov.start do
+    add_group 'Tweetstream', 'lib/tweetstream'
+    add_group 'Specs', 'spec'
+  end
+end
+
 require 'tweetstream'
 require 'rspec'
 require 'yajl'

data/spec/tweetstream/client_spec.rb

@@ -107,7 +107,16 @@ describe TweetStream::Client do
         end
       end
 
-      it 'should call the on_delete if specified' do
+      it 'should call the on_scrub_geo if specified' do
+        scrub_geo = '{ "scrub_geo": { "user_id": 1234, "user_id_str": "1234", "up_to_status_id":9876, "up_to_status_id_string": "9876" } }'
+        @stream.should_receive(:each_item).and_yield(scrub_geo)
+        @client.on_scrub_geo do |up_to_status_id, user_id|
+          up_to_status_id.should == 9876
+          user_id.should == 1234
+        end.track('abc')
+      end
+
+      it 'should call the delete if specified' do
         delete = '{ "delete": { "status": { "id": 1234, "user_id": 3 } } }'
         @stream.should_receive(:each_item).and_yield(delete)
         @client.on_delete do |id, user_id|

data/spec/tweetstream/hash_spec.rb

@@ -16,4 +16,4 @@ describe TweetStream::Hash do
   it 'should still throw NoMethod for non-existent keys' do
     lambda{TweetStream::Hash.new({}).akabi}.should raise_error(NoMethodError)
   end
-end
+end

data/spec/tweetstream/parser_spec.rb

@@ -6,7 +6,7 @@ describe 'TweetStream MultiJson Support' do
   end
 
   it "should default to the MultiJson default's paser" do
-    TweetStream::Client.new.json_parser.engine.to_s.should == MultiJson.engine.to_s
+    TweetStream::Client.new.json_parser.engine.to_s.should == MultiJson.adapter.to_s
   end
 
   [:json_gem, :yajl, :json_pure].each do |engine|
@@ -18,7 +18,7 @@ describe 'TweetStream MultiJson Support' do
           config.parser   = engine
         end
         @client = TweetStream::Client.new
-        @class_name = "MultiJson::Engines::#{engine.to_s.split('_').map{|s| s.capitalize}.join('')}"
+        @class_name = "MultiJson::Adapters::#{engine.to_s.split('_').map{|s| s.capitalize}.join('')}"
       end
 
       it 'should set the parser to the appropriate class' do
@@ -39,4 +39,4 @@ describe 'TweetStream MultiJson Support' do
     @client.parser = FakeParser
     @client.json_parser.engine.should == FakeParser
   end
-end
+end

data/tweetstream.gemspec

@@ -11,18 +11,18 @@ Gem::Specification.new do |s|
   s.summary     = %q{TweetStream is a simple wrapper for consuming the Twitter Streaming API.}
   s.homepage    = 'http://github.com/intridea/tweetstream'
 
-  s.add_dependency 'twitter-stream', '= 0.1.14'
+  s.add_dependency 'twitter-stream', ['>= 0.1.14', '< 1']
   s.add_dependency 'daemons', '~> 1.1'
-  s.add_dependency 'multi_json', '>= 1.0'
+  s.add_dependency 'multi_json', '~> 1.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.6'
-  s.add_development_dependency 'guard-rspec', '~> 0.5'
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'simplecov'
+  s.add_development_dependency 'yard'
+  s.add_development_dependency 'rdiscount'
+  s.add_development_dependency 'rspec'
+  s.add_development_dependency 'yajl-ruby'
+  s.add_development_dependency 'json'
+  s.add_development_dependency 'guard-rspec'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tweetstream
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,22 +10,33 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-28 00:00:00.000000000Z
+date: 2012-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: twitter-stream
-  requirement: &2152607200 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.1.14
+    - - <
+      - !ruby/object:Gem::Version
+        version: '1'
   type: :runtime
   prerelease: false
-  version_requirements: *2152607200
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.14
+    - - <
+      - !ruby/object:Gem::Version
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: daemons
-  requirement: &2152606040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,106 +44,156 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *2152606040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &2152605380 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *2152605380
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2152604700 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152604700
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2152603860 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152603860
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2152603300 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152603300
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &2152602660 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152602660
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152601880 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152601880
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &2152601160 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152601160
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2152600600 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152600600
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &2152599980 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152599980
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: TweetStream allows you to easily consume the Twitter Streaming API utilizing
   the YAJL Ruby gem.
 email:
@@ -146,7 +207,7 @@ files:
 - .gemtest
 - .gitignore
 - .rspec
-- .simplecov
+- .travis.yml
 - .yardopts
 - CHANGELOG.md
 - Gemfile
@@ -198,7 +259,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: TweetStream is a simple wrapper for consuming the Twitter Streaming API.

data/.simplecov

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