tweetstream 1.1.1 → 1.1.2

data/examples/growl_daemon.rb

@@ -1,12 +1,9 @@
 require 'rubygems'
 require 'tweetstream'
-require 'ruby-growl'
+require 'growl'
 
-if args_start = ARGV.index('--')
-  username, password = ARGV[args_start + 1].split(':')
-  tracks = ARGV[args_start + 2 .. -1]
-  puts "Starting a GrowlTweet to track: #{tracks.inspect}"
-end
+tracks = 'yankees'
+puts "Starting a GrowlTweet to track: #{tracks}"
 
 TweetStream.configure do |config|
   config.consumer_key = 'abcdefghijklmnopqrstuvwxyz'
@@ -16,7 +13,6 @@ TweetStream.configure do |config|
   config.auth_method = :oauth
 end
 
-TweetStream::Daemon.new('tracker').track(*tracks) do |status|
-  g = Growl.new 'localhost', 'growltweet', ['tweet']
-  g.notify 'tweet', status.user.screen_name, status.text
+TweetStream::Daemon.new('tracker').track(tracks) do |status|
+  Growl.notify status.text, :title => status.user.screen_name
 end

data/lib/tweetstream/client.rb

@@ -31,6 +31,9 @@ module TweetStream
       Configuration::VALID_OPTIONS_KEYS.each do |key|
         send("#{key}=", options[key])
       end
+
+      # Ensure the json parser can be properly loaded
+      json_parser
     end
 
     # Get the JSON parser class for this client.
@@ -46,6 +49,14 @@ module TweetStream
       start('statuses/firehose', query_parameters, &block)
     end
 
+    # Returns all statuses containing http: and https:. The links stream is
+    # not a generally available resource. Few applications require this level
+    # of access. Creative use of a combination of other resources and various
+    # access levels can satisfy nearly every application use case.
+    def links(query_parameters = {}, &block)
+      start('statuses/links', query_parameters, &block)
+    end
+
     # Returns all retweets. The retweet stream is not a generally available
     # resource. Few applications require this level of access. Creative
     # use of a combination of other resources and various access levels

data/lib/tweetstream/daemon.rb

@@ -30,22 +30,23 @@ require 'daemons'
 # is posted.
 #
 class TweetStream::Daemon < TweetStream::Client
-  # Initialize a Daemon with the credentials of the
-  # Twitter account you wish to use. The daemon has
-  # an optional process name for use when querying
-  # running processes.
-  def initialize(app_name=nil)
-    @app_name = app_name
+
+  DEFAULT_NAME = 'tweetstream'.freeze
+  DEFAULT_OPTIONS = { :multiple => true }
+
+  attr_accessor :app_name, :daemon_options
+
+  # The daemon has an optional process name for use when querying
+  # running processes.  You can also pass daemon options.
+  def initialize(name = DEFAULT_NAME, options = DEFAULT_OPTIONS)
+    @app_name = name
+    @daemon_options = options
     super({})
   end
 
   def start(path, query_parameters = {}, &block) #:nodoc:
-    # Because of a change in Ruvy 1.8.7 patchlevel 249, you cannot call anymore
-    # super inside a block. So I assign to a variable the base class method before
-    # the Daemons block begins.
-    startmethod = super.start
-    Daemons.run_proc(@app_name || 'tweetstream', :multiple => true) do
-      startmethod(path, query_parameters, &block)
+    Daemons.run_proc(@app_name, @daemon_options) do
+      super(path, query_parameters, &block)
     end
   end
 end

data/lib/tweetstream/version.rb

@@ -1,3 +1,3 @@
 module TweetStream
-  VERSION = '1.1.1'
+  VERSION = '1.1.2'
 end

data/spec/tweetstream/client_spec.rb

@@ -244,8 +244,8 @@ describe TweetStream::Client do
     end
   end
 
-  describe ' API methods' do
-    %w(firehose retweet sample).each do |method|
+  describe 'API methods' do
+    %w(firehose retweet sample links).each do |method|
       it "##{method} should make a call to start with \"statuses/#{method}\"" do
         @client.should_receive(:start).once.with('statuses/' + method, {})
         @client.send(method)
@@ -337,7 +337,7 @@ describe TweetStream::Client do
     end
   end
 
-  describe 'instance .stop' do
+  describe '#stop' do
     it 'should call EventMachine::stop_event_loop' do
       EventMachine.should_receive :stop_event_loop
       TweetStream::Client.new.stop.should be_nil

data/spec/tweetstream/daemon_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe TweetStream::Daemon do
+  describe '.new' do
+    it 'initializes with no arguments' do
+      client = TweetStream::Daemon.new
+      client.should be_kind_of(TweetStream::Client)
+    end
+
+    it 'initializes with defaults' do
+      client = TweetStream::Daemon.new
+      client.app_name.should eq(TweetStream::Daemon::DEFAULT_NAME)
+      client.daemon_options.should eq(TweetStream::Daemon::DEFAULT_OPTIONS)
+    end
+
+    it 'initializes with an app_name' do
+      client = TweetStream::Daemon.new('tweet_tracker')
+      client.app_name.should eq('tweet_tracker')
+    end
+  end
+end

data/tweetstream.gemspec

@@ -17,13 +17,13 @@ Gem::Specification.new do |s|
   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.2'
+  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.4'
+  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.6.0'
+  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'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tweetstream
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-04 00:00:00.000000000Z
+date: 2011-10-21 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: twitter-stream
-  requirement: &2153681580 !ruby/object:Gem::Requirement
+  requirement: &2153351480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,21 +21,21 @@ dependencies:
         version: 0.1.14
   type: :runtime
   prerelease: false
-  version_requirements: *2153681580
+  version_requirements: *2153351480
 - !ruby/object:Gem::Dependency
   name: daemons
-  requirement: &2153681060 !ruby/object:Gem::Requirement
+  requirement: &2153351020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 1.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *2153681060
+  version_requirements: *2153351020
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &2153680500 !ruby/object:Gem::Requirement
+  requirement: &2153350560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *2153680500
+  version_requirements: *2153350560
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2153678780 !ruby/object:Gem::Requirement
+  requirement: &2153350100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,21 +54,21 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *2153678780
+  version_requirements: *2153350100
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2153677120 !ruby/object:Gem::Requirement
+  requirement: &2153349640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: 0.5.4
   type: :development
   prerelease: false
-  version_requirements: *2153677120
+  version_requirements: *2153349640
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2153670740 !ruby/object:Gem::Requirement
+  requirement: &2153349180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '0.7'
   type: :development
   prerelease: false
-  version_requirements: *2153670740
+  version_requirements: *2153349180
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &2153670260 !ruby/object:Gem::Requirement
+  requirement: &2153348720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,21 +87,21 @@ dependencies:
         version: '1.6'
   type: :development
   prerelease: false
-  version_requirements: *2153670260
+  version_requirements: *2153348720
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153669800 !ruby/object:Gem::Requirement
+  requirement: &2153348260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: '2.7'
   type: :development
   prerelease: false
-  version_requirements: *2153669800
+  version_requirements: *2153348260
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &2153669320 !ruby/object:Gem::Requirement
+  requirement: &2153347800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *2153669320
+  version_requirements: *2153347800
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2153668860 !ruby/object:Gem::Requirement
+  requirement: &2153347340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: 1.5.1
   type: :development
   prerelease: false
-  version_requirements: *2153668860
+  version_requirements: *2153347340
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &2153668400 !ruby/object:Gem::Requirement
+  requirement: &2153346840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,7 +131,7 @@ dependencies:
         version: 0.4.3
   type: :development
   prerelease: false
-  version_requirements: *2153668400
+  version_requirements: *2153346840
 description: TweetStream allows you to easily consume the Twitter Streaming API utilizing
   the YAJL Ruby gem.
 email:
@@ -168,6 +168,7 @@ files:
 - spec/data/statuses.json
 - spec/spec_helper.rb
 - spec/tweetstream/client_spec.rb
+- spec/tweetstream/daemon_spec.rb
 - spec/tweetstream/direct_message_spec.rb
 - spec/tweetstream/hash_spec.rb
 - spec/tweetstream/parser_spec.rb
@@ -203,6 +204,7 @@ test_files:
 - spec/data/statuses.json
 - spec/spec_helper.rb
 - spec/tweetstream/client_spec.rb
+- spec/tweetstream/daemon_spec.rb
 - spec/tweetstream/direct_message_spec.rb
 - spec/tweetstream/hash_spec.rb
 - spec/tweetstream/parser_spec.rb