tweetstream 2.6.0 → 2.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79498418145dcfe8a448cb8476d7e629800ff7d7
-  data.tar.gz: 5c247493d57cb248abf747db3a08307780674556
+  metadata.gz: cbc2436b67268c7ce263b3324dba062734680ee1
+  data.tar.gz: 1387c9fbd9814d2aea32a386e6334c4b9e4bab4b
 SHA512:
-  metadata.gz: 58b3795d2c33e1260326e4c35992e4f9310d0ec137bd14170077705bdad9b6141a086e65897a6b50567675645fd0c4d3eda074498ce3950ec4d82837726d5319
-  data.tar.gz: a85c13f5509514383e6228b2d934bb316c64a7e0ae8cb055d59bf75fed67ac01a2a2b30c09e8adc52a4dbcf6e09101bafb9dce2366cb95ffd113ac775806d2cd
+  metadata.gz: 470e52844c7593c911979213345dceeeaf8172320c8cd38d1cf6952b407e3be5fe281d72fdb5a2b6d87b1daf2a94c85c4bdcc24241ee3433db21bdc53c7ec3aa
+  data.tar.gz: 7db9613458729b5cddc90eed5ce7aac631ee6b97dd60ed311551402882c1dc6c014cfcfa68da75084d989aa51d9c6251f66c8d00b0c8a3754b0b96d5d2e08a5f

data/README.md

@@ -261,8 +261,8 @@ options when you make your method call:
 
 ```ruby
 TweetStream::Client.new.track('intridea',
-  :delete => Proc.new{ |status_id, user_id| # do something },
-  :limit => Proc.new{ |skip_count| # do something }
+  :delete => proc{ |status_id, user_id| # do something },
+  :limit  => proc{ |skip_count| # do something }
 ) do |status|
   # do something with the status like normal
 end

data/Rakefile

@@ -5,7 +5,17 @@ require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 
 task :test => :spec
-task :default => :spec
 
 require 'yard'
 YARD::Rake::YardocTask.new
+
+begin
+  require 'rubocop/rake_task'
+  Rubocop::RakeTask.new
+rescue LoadError
+  task :rubocop do
+    $stderr.puts 'Rubocop is disabled'
+  end
+end
+
+task :default => [:spec, :rubocop]

data/lib/tweetstream.rb

@@ -18,7 +18,7 @@ module TweetStream
     # Alias for TweetStream::Client.new
     #
     # @return [TweetStream::Client]
-    def new(options={})
+    def new(options = {})
       TweetStream::Client.new(options)
     end
 

data/lib/tweetstream/arguments.rb

@@ -6,6 +6,5 @@ module TweetStream
       @options = args.last.is_a?(::Hash) ? args.pop : {}
       super(args)
     end
-
   end
 end

data/lib/tweetstream/client.rb

@@ -21,7 +21,7 @@ module TweetStream
   #
   # For information about a daemonized TweetStream client,
   # view the TweetStream::Daemon class.
-  class Client
+  class Client # rubocop:disable ClassLength
     extend Forwardable
 
     OPTION_CALLBACKS = [:delete,
@@ -40,14 +40,14 @@ module TweetStream
                         :user_withheld].freeze unless defined?(OPTION_CALLBACKS)
 
     # @private
-    attr_accessor *Configuration::VALID_OPTIONS_KEYS
+    attr_accessor(*Configuration::VALID_OPTIONS_KEYS)
     attr_accessor :options
     attr_reader :control_uri, :control, :stream
 
     def_delegators :@control, :add_user, :remove_user, :info, :friends_ids
 
     # Creates a new API
-    def initialize(options={})
+    def initialize(options = {})
       self.options = options
       merged_options = TweetStream.options.merge(options)
       Configuration::VALID_OPTIONS_KEYS.each do |key|
@@ -116,8 +116,8 @@ module TweetStream
 
     # Specifies a set of bounding boxes to track. Only tweets that are both created
     # using the Geotagging API and are placed from within a tracked bounding box will
-    # be included in the stream – the user’s location field is not used to filter tweets
-    # (e.g. if a user has their location set to “San Francisco”, but the tweet was not created
+    # be included in the stream -- the user's location field is not used to filter tweets
+    # (e.g. if a user has their location set to "San Francisco", but the tweet was not created
     # using the Geotagging API and has no geo element, it will not be included in the stream).
     # Bounding boxes are specified as a comma separate list of longitude/latitude pairs, with
     # the first pair denoting the southwest corner of the box
@@ -138,19 +138,19 @@ module TweetStream
 
     # Make a call to the userstream api for currently authenticated user
     def userstream(query_params = {}, &block)
-      stream_params = { :host => "userstream.twitter.com" }
+      stream_params = {:host => 'userstream.twitter.com'}
       query_params.merge!(:extra_stream_parameters => stream_params)
       start('/1.1/user.json', query_params, &block)
     end
 
     # Make a call to the userstream api
     def sitestream(user_ids = [], query_params = {}, &block)
-      stream_params = { :host => "sitestream.twitter.com" }
-      query_params.merge!({
+      stream_params = {:host => 'sitestream.twitter.com'}
+      query_params.merge!(
         :method                  => :post,
         :follow                  => user_ids,
         :extra_stream_parameters => stream_params
-      })
+      )
       query_params.merge!(:with => 'followings') if query_params.delete(:followings)
       start('/1.1/site.json', query_params, &block)
     end
@@ -400,7 +400,7 @@ module TweetStream
         EventMachine.epoll
         EventMachine.kqueue
 
-        EventMachine::run do
+        EventMachine.run do
           connect(path, query_parameters, &block)
         end
       end
@@ -424,8 +424,6 @@ module TweetStream
           next
         end
 
-        Twitter.identity_map = false
-
         respond_to(hash, callbacks, &block)
 
         yield_message_to(callbacks['anything'], hash)
@@ -448,7 +446,7 @@ module TweetStream
       end
 
       @stream.on_max_reconnects do |timeout, retries|
-        raise TweetStream::ReconnectError.new(timeout, retries)
+        fail TweetStream::ReconnectError.new(timeout, retries)
       end
 
       @stream.on_no_data_received do
@@ -477,9 +475,9 @@ module TweetStream
       !!@control
     end
 
-    protected
+  protected
 
-    def respond_to(hash, callbacks, &block)
+    def respond_to(hash, callbacks, &block) # rubocop:disable CyclomaticComplexity
       if hash[:control] && hash[:control][:control_uri]
         @control_uri = hash[:control][:control_uri]
         require 'tweetstream/site_stream_client'
@@ -527,13 +525,13 @@ module TweetStream
 
     def auth_params
       if auth_method.to_s == 'basic'
-        { :basic => {
+        {:basic => {
             :username => username,
             :password => password
           }
         }
       else
-        { :oauth => {
+        {:oauth => {
           :consumer_key => consumer_key,
           :consumer_secret => consumer_secret,
           :token => oauth_token,
@@ -582,9 +580,9 @@ module TweetStream
       [stream_params, callbacks]
     end
 
-    def warn_if_callbacks(options={})
+    def warn_if_callbacks(options = {})
       if OPTION_CALLBACKS.select { |callback| options[callback] }.size > 0
-        Kernel.warn("Passing callbacks via the options hash is deprecated and will be removed in TweetStream 3.0")
+        Kernel.warn('Passing callbacks via the options hash is deprecated and will be removed in TweetStream 3.0')
       end
     end
   end

data/lib/tweetstream/configuration.rb

@@ -53,7 +53,7 @@ module TweetStream
     DEFAULT_OAUTH_TOKEN_SECRET = nil
 
     # @private
-    attr_accessor *VALID_OPTIONS_KEYS
+    attr_accessor(*VALID_OPTIONS_KEYS)
 
     # When this module is extended, set all configuration options to their default values
     def self.extended(base)
@@ -67,12 +67,12 @@ module TweetStream
 
     # Create a hash of options and their values
     def options
-      Hash[*VALID_OPTIONS_KEYS.map {|key| [key, send(key)] }.flatten]
+      Hash[*VALID_OPTIONS_KEYS.collect { |key| [key, send(key)] }.flatten]
     end
 
     # Create a hash of options and their values
     def oauth_options
-      Hash[*OAUTH_OPTIONS_KEYS.map {|key| [key, send(key)] }.flatten]
+      Hash[*OAUTH_OPTIONS_KEYS.collect { |key| [key, send(key)] }.flatten]
     end
 
     # Reset all configuration options to defaults

data/lib/tweetstream/daemon.rb

@@ -30,9 +30,8 @@ require 'daemons'
 # is posted.
 #
 class TweetStream::Daemon < TweetStream::Client
-
   DEFAULT_NAME = 'tweetstream'.freeze
-  DEFAULT_OPTIONS = { :multiple => true }
+  DEFAULT_OPTIONS = {:multiple => true}
 
   attr_accessor :app_name, :daemon_options
 

data/lib/tweetstream/site_stream_client.rb

@@ -4,8 +4,7 @@ require 'em-http/middleware/json_response'
 
 module TweetStream
   class SiteStreamClient
-
-    attr_accessor *Configuration::OAUTH_OPTIONS_KEYS
+    attr_accessor(*Configuration::OAUTH_OPTIONS_KEYS)
 
     def initialize(config_uri, oauth = {})
       @config_uri = config_uri
@@ -28,14 +27,14 @@ module TweetStream
     end
 
     def info(&block)
-      options = { :error_msg => 'Failed to retrieve SiteStream info.' }
+      options = {:error_msg => 'Failed to retrieve SiteStream info.'}
       request(:get, info_path, options, &block)
     end
 
     def add_user(user_id, &block)
       options = {
                   :error_msg => 'Failed to add user to SiteStream',
-                  :body => { 'user_id' => normalized_user_ids(user_id) }
+                  :body => {'user_id' => normalized_user_ids(user_id)}
                 }
 
       request(:post, add_user_path, options, &block)
@@ -44,20 +43,20 @@ module TweetStream
     def remove_user(user_id, &block)
       options = {
                   :error_msg => 'Failed to remove user from SiteStream.',
-                  :body => { 'user_id' => normalized_user_ids(user_id) }
+                  :body => {'user_id' => normalized_user_ids(user_id)}
                 }
 
       request(:post, remove_user_path, options, &block)
     end
 
     def friends_ids(user_id, &block)
-      options = { :error_msg => 'Failed to retrieve SiteStream friends ids.',
-                  :body => { 'user_id' => user_id }
+      options = {:error_msg => 'Failed to retrieve SiteStream friends ids.',
+                 :body => {'user_id' => user_id}
                 }
       request(:post, friends_ids_path, options, &block)
     end
 
-    private
+  private
 
     def connection
       return @conn if defined?(@conn)
@@ -92,18 +91,16 @@ module TweetStream
       @config_uri + '/friends/ids.json'
     end
 
-    def request(method, path, options, &block)
+    def request(method, path, options, &block) # rubocop:disable CyclomaticComplexity, ParameterLists
       error_msg = options.delete(:error_msg)
 
       http = connection.send(method, options.merge(:path => path))
       http.callback do
-        if http.response_header.status == 200
-          if block && block.kind_of?(Proc)
-            if block.arity == 1
-              block.call http.response
-            else
-              block.call
-            end
+        if http.response_header.status == 200 && block && block.kind_of?(Proc)
+          if block.arity == 1
+            block.call http.response
+          else
+            block.call
           end
         else
           @on_error.call(error_msg) if @on_error && @on_error.kind_of?(Proc)
@@ -116,11 +113,10 @@ module TweetStream
 
     def normalized_user_ids(user_id)
       if user_id.kind_of?(Array)
-        user_id.join(',') 
+        user_id.join(',')
       else
         user_id.to_s
       end
     end
-
   end
 end

data/lib/tweetstream/version.rb

@@ -1,3 +1,3 @@
 module TweetStream
-  VERSION = '2.6.0' unless defined?(TweetStream::VERSION)
+  VERSION = '2.6.1'
 end

data/spec/fixtures/delete.json

@@ -1,7 +1,7 @@
 {
   "delete": {
     "status": {
-      "id": 1234,
+      "id": 123,
       "user_id": 3
     }
   }

data/spec/fixtures/limit.json

@@ -1,5 +1,5 @@
 {
   "limit": {
-    "track": 1234
+    "track": 123
   }
 }

data/spec/fixtures/scrub_geo.json

@@ -1,8 +1,8 @@
 {
   "scrub_geo": {
-    "user_id": 1234,
-    "user_id_str": "1234",
-    "up_to_status_id":9876,
-    "up_to_status_id_string": "9876"
+    "user_id": 123,
+    "user_id_str": "123",
+    "up_to_status_id":987,
+    "up_to_status_id_string": "987"
   }
 }

data/spec/fixtures/status_withheld.json

@@ -1,7 +1,7 @@
 {
   "status_withheld":{
       "id":1234567890,
-      "user_id":123456,
+      "user_id":123,
       "withheld_in_countries":["de", "ar"]
   }
 }

data/spec/fixtures/user_withheld.json

@@ -1,6 +1,6 @@
 {
   "user_withheld":{
-    "id":123456,
+    "id":123,
     "withheld_in_countries":["de","ar"]
   }
 }

data/spec/helper.rb

@@ -6,7 +6,9 @@ SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
   Coveralls::SimpleCov::Formatter
 ]
 SimpleCov.start do
-  add_filter '.bundle'
+  add_filter '/vendor/bundle/'
+  add_filter '/spec/'
+  minimum_coverage(97.86)
 end
 
 require 'tweetstream'
@@ -46,7 +48,7 @@ def sample_direct_messages
 end
 
 def fixture_path
-  File.expand_path("../fixtures", __FILE__)
+  File.expand_path('../fixtures', __FILE__)
 end
 
 def fixture(file)
@@ -54,6 +56,9 @@ def fixture(file)
 end
 
 FakeHttp = Class.new do
-  def callback; end
-  def errback; end
+  def callback
+  end
+
+  def errback
+  end
 end

data/spec/tweetstream/client_authentication_spec.rb

@@ -2,23 +2,23 @@ require 'helper'
 
 describe TweetStream::Client do
   before do
-    @stream = double("EM::Twitter::Client",
-      :connect => true,
-      :unbind => true,
-      :each => true,
-      :on_error => true,
-      :on_max_reconnects => true,
-      :on_reconnect => true,
-      :connection_completed => true,
-      :on_no_data_received => true,
-      :on_unauthorized => true,
-      :on_enhance_your_calm => true
+    @stream = double('EM::Twitter::Client',
+                     :connect => true,
+                     :unbind => true,
+                     :each => true,
+                     :on_error => true,
+                     :on_max_reconnects => true,
+                     :on_reconnect => true,
+                     :connection_completed => true,
+                     :on_no_data_received => true,
+                     :on_unauthorized => true,
+                     :on_enhance_your_calm => true
     )
     allow(EM).to receive(:run).and_yield
     allow(EM::Twitter::Client).to receive(:connect).and_return(@stream)
   end
 
-  describe "basic auth" do
+  describe 'basic auth' do
     before do
       TweetStream.configure do |config|
         config.username = 'tweetstream'
@@ -29,7 +29,7 @@ describe TweetStream::Client do
       @client = TweetStream::Client.new
     end
 
-    it "tries to connect via a JSON stream with basic auth" do
+    it 'tries to connect via a JSON stream with basic auth' do
       expect(EM::Twitter::Client).to receive(:connect).with(
         :path => '/1.1/statuses/filter.json',
         :method => 'POST',
@@ -47,7 +47,7 @@ describe TweetStream::Client do
     end
   end
 
-  describe "oauth" do
+  describe 'oauth' do
     before do
       TweetStream.configure do |config|
         config.consumer_key = '123456789'
@@ -60,7 +60,7 @@ describe TweetStream::Client do
       @client = TweetStream::Client.new
     end
 
-    it "tries to connect via a JSON stream with oauth" do
+    it 'tries to connect via a JSON stream with oauth' do
       expect(EM::Twitter::Client).to receive(:connect).with(
         :path => '/1.1/statuses/filter.json',
         :method => 'POST',