jnunemaker-twitter 0.3.1 → 0.3.4

data/History.txt

@@ -1,3 +1,17 @@
+0.3.4 - August 3, 2008
+			* Added search support
+			
+0.3.3 - August 3, 2008
+			* Now has option for host when initializing to support identi.ca (Dustin Sallings)
+			* Twitter changed a bunch of methods to POST only so I updated those to now work
+			
+0.3.2 - July 26, 2008
+			* added the CLI gems as dependencies for now until I separate out the CLI from the API wrapper
+			* cleaner CLI errors for no active account or no accounts at all
+			* remove sets a new active account if there are none
+			* added username and password optional arguments to add
+			* added import attempt on install and on anything that uses #current_account helper
+			
 0.3.1 - July 23, 2008
 			* added open to CLI twitter open jnunemaker would open default browser to http://twitter.com/jnunemaker
 			* added -f to timeline and replies which ignores the since_id and shows all results

data/Manifest.txt

@@ -3,7 +3,6 @@ License.txt
 Manifest.txt
 README.txt
 Rakefile
-TODO.txt
 bin/twitter
 config/hoe.rb
 config/requirements.rb
@@ -12,8 +11,10 @@ examples/direct_messages.rb
 examples/favorites.rb
 examples/friends_followers.rb
 examples/friendships.rb
+examples/identica_timeline.rb
 examples/location.rb
 examples/replies.rb
+examples/search.rb
 examples/sent_messages.rb
 examples/timeline.rb
 examples/twitter.rb
@@ -33,6 +34,7 @@ lib/twitter/cli/models/tweet.rb
 lib/twitter/direct_message.rb
 lib/twitter/easy_class_maker.rb
 lib/twitter/rate_limit_status.rb
+lib/twitter/search.rb
 lib/twitter/status.rb
 lib/twitter/user.rb
 lib/twitter/version.rb
@@ -50,9 +52,11 @@ spec/fixtures/friends_lite.xml
 spec/fixtures/friends_timeline.xml
 spec/fixtures/public_timeline.xml
 spec/fixtures/rate_limit_status.xml
+spec/fixtures/search_results.json
 spec/fixtures/status.xml
 spec/fixtures/user.xml
 spec/fixtures/user_timeline.xml
+spec/search_spec.rb
 spec/spec.opts
 spec/spec_helper.rb
 spec/status_spec.rb
@@ -62,4 +66,5 @@ tasks/environment.rake
 tasks/website.rake
 twitter.gemspec
 website/css/common.css
+website/images/terminal_output.png
 website/index.html

data/README.txt

@@ -36,6 +36,13 @@ sudo gem install twitter will work just fine. For command line use, you'll need
 	  puts u.name, u.status.text
 	  puts
 	end
+	
+== Search Examples
+
+	Twitter::Search.new('httparty').each { |r| puts r.inspect }
+	Twitter::Search.new('httparty').from('jnunemaker').each { |r| puts r.inspect }
+	Twitter::Search.new.from('jnunemaker').to('oaknd1').each { |r| puts r.inspect }
+	
 
 == Command Line Use
 	

data/Rakefile

@@ -1,11 +1,4 @@
 require 'config/requirements'
 require 'config/hoe' # setup Hoe + all gem configuration
 
-Dir['tasks/**/*.rake'].each { |rake| load rake }
-
-task :build_gemspec_filelist do
-  files = File.read(File.join(File.dirname(__FILE__), 'Manifest.txt')).split("\n")
-  puts
-  puts files.inspect
-  puts
-end
+Dir['tasks/**/*.rake'].each { |rake| load rake }

data/config/hoe.rb

@@ -61,8 +61,10 @@ hoe = Hoe.new(GEM_NAME, VERS) do |p|
   # == Optional
   p.changes = p.paragraphs_of("History.txt", 0..1).join("\n\n")
   #p.extra_deps = []     # An array of rubygem dependencies [name, version], e.g. [ ['active_support', '>= 1.3.1'] ]
-  p.extra_deps << %w[ hpricot ]
-  p.extra_deps << %w[ activesupport ]
+  p.extra_deps = [['hpricot', '>= 0.6'], ['activesupport', '>= 2.1'], 
+                  ['main', '>= 2.8.2'], ['highline', '>= 1.4.0'], 
+                  ['activerecord', '>= 2.1'], ['sqlite3-ruby', '>= 1.2.2'], 
+                  ['httparty', '>= 0.1.0']]
   #p.spec_extras = {}    # A hash of extra values to set in the gemspec.
   
 end

data/examples/identica_timeline.rb

@@ -0,0 +1,7 @@
+require 'rubygems'
+require File.join(File.dirname(__FILE__), '..', 'lib', 'twitter')
+config = YAML::load(open(ENV['HOME'] + '/.twitter'))
+
+identica = Twitter::Base.new(config['email'], config['password'], :api_host => 'identi.ca/api')
+
+identica.timeline(:public).each { |s| puts s.text, s.user.name, '' }

data/examples/search.rb

@@ -0,0 +1,17 @@
+require 'rubygems'
+require File.join(File.dirname(__FILE__), '..', 'lib', 'twitter')
+
+Twitter::Search.new('httparty').each { |r| puts r.inspect,'' }
+
+# search = Twitter::Search.new
+# search.from('jnunemaker').to('oaknd1').each { |r| puts r.inspect, '' }
+# pp search.result
+# search.clear
+
+# search.from('jnunemaker').to('oaknd1').since(814529437).containing('milk').each { |r| puts r.inspect, '' }
+# search.clear
+# 
+# search.geocode('40.757929', '-73.985506', '50mi').containing('holland').each { |r| puts r.inspect, '' }
+# search.clear
+
+# pp search.from('jnunemaker').fetch()

data/lib/twitter.rb

@@ -5,6 +5,7 @@ require 'twitter/version'
 require 'twitter/easy_class_maker'
 require 'twitter/base'
 require 'twitter/user'
+require 'twitter/search'
 require 'twitter/status'
 require 'twitter/direct_message'
 require 'twitter/rate_limit_status'

data/lib/twitter/base.rb

@@ -5,12 +5,15 @@
 #   http://groups.google.com/group/twitter-development-talk/web/api-documentation
 module Twitter
   class Base
-    # Twitter's url, duh!
-    @@api_url   = 'twitter.com'
-    
     # Initializes the configuration for making requests to twitter
-    def initialize(email, password)
+    # Twitter example:
+    #   Twitter.new('email/username', 'password')
+    #
+    # Identi.ca example:
+    #   Twitter.new('email/username', 'password', :api_host => 'identi.ca/api')
+    def initialize(email, password, options={})
       @config, @config[:email], @config[:password] = {}, email, password
+      @api_host = options.delete(:api_host) || 'twitter.com'
     end
     
     # Returns an array of statuses for a timeline; Defaults to your friends timeline.
@@ -88,7 +91,7 @@ module Twitter
     
     # Sends a direct message <code>text</code> to <code>user</code>
     def d(user, text)
-      url = URI.parse("http://#{@@api_url}/direct_messages/new.xml")
+      url = URI.parse("http://#{@api_host}/direct_messages/new.xml")
       req = Net::HTTP::Post.new(url.path)
       req.basic_auth(@config[:email], @config[:password])
       req.set_form_data({'text' => text, 'user' => user})
@@ -98,12 +101,12 @@ module Twitter
     
     # Befriends id_or_screenname for the auth user
     def create_friendship(id_or_screenname)
-      users(request("friendships/create/#{id_or_screenname}.xml", :auth => true)).first
+      users(request("friendships/create/#{id_or_screenname}.xml", :auth => true, :method => :post)).first
     end
     
     # Defriends id_or_screenname for the auth user
     def destroy_friendship(id_or_screenname)
-      users(request("friendships/destroy/#{id_or_screenname}.xml", :auth => true)).first
+      users(request("friendships/destroy/#{id_or_screenname}.xml", :auth => true, :method => :post)).first
     end
     
     # Returns true if friendship exists, false if it doesn't.
@@ -114,22 +117,22 @@ module Twitter
     
     # Updates your location and returns Twitter::User object
     def update_location(location)
-      users(request(build_path('account/update_location.xml', {'location' => location}), :auth => true)).first
+      users(request(build_path('account/update_location.xml', {'location' => location}), :auth => true, :method => :post)).first
     end
     
     # Updates your deliver device and returns Twitter::User object
     def update_delivery_device(device)
-      users(request(build_path('account/update_delivery_device.xml', {'device' => device}), :auth => true)).first
+      users(request(build_path('account/update_delivery_device.xml', {'device' => device}), :auth => true, :method => :post)).first
     end
     
     # Turns notifications by id_or_screenname on for auth user.
     def follow(id_or_screenname)
-      users(request("notifications/follow/#{id_or_screenname}.xml", :auth => true)).first
+      users(request("notifications/follow/#{id_or_screenname}.xml", :auth => true, :method => :post)).first
     end
 
     # Turns notifications by id_or_screenname off for auth user.    
     def leave(id_or_screenname)
-      users(request("notifications/leave/#{id_or_screenname}.xml", :auth => true)).first
+      users(request("notifications/leave/#{id_or_screenname}.xml", :auth => true, :method => :post)).first
     end
     
     # Returns the most recent favorite statuses for the autenticating user
@@ -139,29 +142,29 @@ module Twitter
     
     # Favorites the status specified by id for the auth user
     def create_favorite(id)
-      statuses(request("favorites/create/#{id}.xml", :auth => true)).first
+      statuses(request("favorites/create/#{id}.xml", :auth => true, :method => :post)).first
     end
 
     # Un-favorites the status specified by id for the auth user
     def destroy_favorite(id)
-      statuses(request("favorites/destroy/#{id}.xml", :auth => true)).first
+      statuses(request("favorites/destroy/#{id}.xml", :auth => true, :method => :post)).first
     end
     
     # Blocks the user specified by id for the auth user
     def block(id)
-      users(request("blocks/create/#{id}.xml", :auth => true)).first
+      users(request("blocks/create/#{id}.xml", :auth => true, :method => :post)).first
     end
     
     # Unblocks the user specified by id for the auth user
     def unblock(id)
-      users(request("blocks/destroy/#{id}.xml", :auth => true)).first
+      users(request("blocks/destroy/#{id}.xml", :auth => true, :method => :post)).first
     end
     
     # Posts a new update to twitter for auth user.
     def post(status, options={})
       form_data = {'status' => status}
       form_data.merge({'source' => options[:source]}) if options[:source]
-      url = URI.parse("http://#{@@api_url}/statuses/update.xml")
+      url = URI.parse("http://#{@api_host}/statuses/update.xml")
       req = Net::HTTP::Post.new(url.path)
       req.basic_auth(@config[:email], @config[:password])
       req.set_form_data(form_data)
@@ -200,15 +203,21 @@ module Twitter
       
       # Makes a request to twitter.
       def request(path, options={})
-        options.reverse_merge!({:headers => { "User-Agent" => @config[:email] }})
+        options.reverse_merge!({
+          :headers => { "User-Agent" => @config[:email] },
+          :method => :get
+        })
         unless options[:since].blank?
           since = options[:since].kind_of?(Date) ? options[:since].strftime('%a, %d-%b-%y %T GMT') : options[:since].to_s  
           options[:headers]["If-Modified-Since"] = since
         end
         
+        uri = URI.parse("http://#{@api_host}")
+        
         begin
-          response = Net::HTTP.start(@@api_url, 80) do |http|
-            req = Net::HTTP::Get.new('/' + path, options[:headers])
+          response = Net::HTTP.start(uri.host, 80) do |http|
+            klass = Net::HTTP.const_get options[:method].to_s.downcase.capitalize
+            req = klass.new("#{uri.path}/#{path}", options[:headers])
             req.basic_auth(@config[:email], @config[:password]) if options[:auth]
             http.request(req)
           end

data/lib/twitter/cli.rb

@@ -1,7 +1,7 @@
 require 'rubygems'
 gem 'main', '>= 2.8.2'
 gem 'highline', '>= 1.4.0'
-gem 'activerecord', '>= 2.1.0'
+gem 'activerecord', '>= 2.1'
 gem 'sqlite3-ruby', '>= 1.2.2'
 require 'main'
 require 'highline/import'
@@ -26,6 +26,7 @@ Main {
     description 'Creates the sqlite3 database and runs the migrations.'
     def run
       migrate
+      attempt_import
       say 'Twitter installed.'
     end
   end
@@ -33,30 +34,48 @@ Main {
   mode 'uninstall' do
     description 'Removes the sqlite3 database. There is no undo for this.'
     def run
-      FileUtils.rm(Twitter::CLI::Config[:database])
+      FileUtils.rm(Twitter::CLI::Config[:database]) if File.exists?(Twitter::CLI::Config[:database])
       say 'Twitter gem uninstalled.'
     end
   end
   
   mode 'add' do
     description 'Adds a new twitter account to the database. Prompts for username and password.'
+    argument('username', 'u') {
+      optional
+      description 'optional username'
+    }
+    argument('password', 'p') {
+      optional
+      description 'optional password'
+    }
+    
     def run
       account = Hash.new
       say "Add New Account:"
-
-      account[:username] = ask('Username: ') do |q|
-        q.validate = /\S+/
+      
+      # allows optional username arg
+      if params['username'].given?
+        account[:username] = params['username'].value
+      else
+        account[:username] = ask('Username: ') do |q|
+          q.validate = /\S+/
+        end
       end
-
-      account[:password] = ask("Password (won't be displayed): ") do |q|
-        q.echo = false
-        q.validate = /\S+/
+      
+      # allows optional password arg
+      if params['password'].given?
+        account[:password] = params['password'].value
+      else
+        account[:password] = ask("Password (won't be displayed): ") do |q|
+          q.echo = false
+          q.validate = /\S+/
+        end
       end
       
       do_work do
         base(account[:username], account[:password]).verify_credentials
-        account[:current] = Account.current.count > 0 ? false : true
-        Account.create(account)
+        Account.add(account)
         say 'Account added.'
       end
     end
@@ -86,11 +105,11 @@ Main {
           account = account_id ? Account.find(account_id) : account
           account_name = account.username
           account.destroy
+          Account.set_current(Account.first) if Account.new_active_needed?
           say "#{account_name} has been removed.\n"
         rescue ActiveRecord::RecordNotFound
           say "ERROR: Account could not be found. Try again. \n"
         end
-        
       end
     end
   end

data/lib/twitter/cli/helpers.rb

@@ -1,6 +1,9 @@
 module Twitter
   module CLI
     module Helpers
+      class NoActiveAccount < StandardError; end
+      class NoAccounts < StandardError; end
+      
       def output_tweets(collection, options={})
         options.reverse_merge!({
           :cache        => false,
@@ -31,10 +34,27 @@ module Twitter
       end
       
       def current_account
-        @current_account ||= Account.active
-        exit('No current account.') if @current_account.blank?
+        @current_account ||= Account.active        
+        raise Account.count == 0 ? NoAccounts : NoActiveAccount if @current_account.blank?
         @current_account
       end
+      
+      def attempt_import(&block)
+        tweet_file = File.join(ENV['HOME'], '.twitter')
+        if File.exists?(tweet_file)
+          say '.twitter file found, attempting import...'
+          config = YAML::load(File.read(tweet_file))
+          if !config['email'].blank? && !config['password'].blank?
+            Account.add(:username => config['email'], :password => config['password'])
+            say 'Account imported'
+            block.call if block_given?
+            true
+          else
+            say "Either your username or password were blank in your .twitter file so I could not import. Use 'twitter add' to add an account."
+            false
+          end
+        end
+      end
                   
       def do_work(&block)
         connect
@@ -46,6 +66,12 @@ module Twitter
           say("Twitter is unavailable right now. Try again later.")
         rescue Twitter::CantConnect => msg
           say("Can't connect to twitter because: #{msg}")
+        rescue Twitter::CLI::Helpers::NoActiveAccount
+          say("You have not set an active account. Use 'twitter change' to set one now.")
+        rescue Twitter::CLI::Helpers::NoAccounts
+          unless attempt_import { block.call }
+            say("You have not created any accounts. Use 'twitter add' to create one now.")
+          end
         end
       end
       

data/lib/twitter/cli/models/account.rb

@@ -3,6 +3,14 @@ class Account < ActiveRecord::Base
   
   has_many :tweets, :dependent => :destroy
   
+  def self.add(hash)
+    username = hash.delete(:username)
+    account = find_or_initialize_by_username(username)
+    account.attributes = hash
+    account.save
+    set_current(account) if new_active_needed?
+  end
+  
   def self.active
     current.first
   end
@@ -14,6 +22,10 @@ class Account < ActiveRecord::Base
     account
   end
   
+  def self.new_active_needed?
+    self.current.count == 0 && self.count > 0
+  end
+  
   def to_s
     "#{current? ? '*' : ' '} #{username}"
   end

data/lib/twitter/search.rb

@@ -0,0 +1,94 @@
+gem 'httparty'
+require 'httparty'
+
+module Twitter
+  class Search
+    include HTTParty
+    include Enumerable
+    base_uri 'search.twitter.com'
+    
+    attr_reader :result, :query
+    
+    def initialize(q=nil)
+      clear
+      containing(q) unless q.blank?
+    end
+    
+    def from(user)
+      @query[:q] << "from:#{user}"
+      self
+    end
+    
+    def to(user)
+      @query[:q] << "to:#{user}"
+      self
+    end
+    
+    def referencing(user)
+      @query[:q] << "@#{user}"
+      self
+    end
+    alias :references :referencing
+    alias :ref :referencing
+    
+    def containing(word)
+      @query[:q] << "#{word}"
+      self
+    end
+    alias :contains :containing
+    
+    # adds filtering based on hash tag ie: #twitter
+    def hashed(tag)
+      @query[:q] << "##{tag}"
+      self
+    end
+    
+    # lang must be ISO 639-1 code ie: en, fr, de, ja, etc.
+    #
+    # when I tried en it limited my results a lot and took 
+    # out several tweets that were english so i'd avoid 
+    # this unless you really want it
+    def lang(lang)
+      @query[:lang] = lang
+      self
+    end
+    
+    # Limits the number of results per page
+    def per_page(num)
+      @query[:rpp] = num
+      self
+    end
+    
+    # Only searches tweets since a given id. 
+    # Recommended to use this when possible.
+    def since(since_id)
+      @query[:since_id] = since_id
+      self
+    end
+    
+    # Search tweets by longitude, latitude and a given range.
+    # Ranges like 25km and 50mi work.
+    def geocode(long, lat, range)
+      @query[:geocode] = [long, lat, range].join(',')
+      self
+    end
+    
+    # Clears all the query filters to make a new search
+    def clear
+      @query = {}
+      @query[:q] = []
+      self
+    end
+    
+    # If you want to get results do something other than iterate over them.
+    def fetch
+      @query[:q] = @query[:q].join(' ')
+      self.class.get('/search.json', {:query => @query})
+    end
+    
+    def each
+      @result = fetch()
+      @result['results'].each { |r| yield r }
+    end
+  end
+end

data/lib/twitter/version.rb

@@ -2,7 +2,7 @@ module Twitter #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 3
-    TINY  = 1
+    TINY  = 4
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/spec/fixtures/search_results.json

@@ -0,0 +1 @@
+{"max_id"=>876733347, "since_id"=>0, "results"=>[{"text"=>"post using httparty.", "from_user"=>"yuweijun", "to_user_id"=>nil, "id"=>876203197, "iso_language_code"=>"en", "from_user_id"=>1170048, "created_at"=>"Sun, 03 Aug 2008 06:40:42 +0000", "profile_image_url"=>"http://static.twitter.com/images/default_profile_normal.png"}, {"text"=>"HTTParty: Quick Web Service Consumption From Any Ruby Class: HTTParty is a new Ruby library by Joh.. http://tinyurl.com/5cb8e8", "from_user"=>"delicious_prog", "to_user_id"=>nil, "id"=>875881978, "iso_language_code"=>"en", "from_user_id"=>468104, "created_at"=>"Sat, 02 Aug 2008 20:47:02 +0000", "profile_image_url"=>"http://s3.amazonaws.com/twitter_production/profile_images/54388004/delicious.42px_normal.gif"}, {"text"=>"[4Rails] HTTParty: Quick Web Service Consumption From Any Ruby Class: HTTParty: Quick Web Serv.. http://tinyurl.com/5uemxj", "from_user"=>"bumperbody", "to_user_id"=>nil, "id"=>875828918, "iso_language_code"=>"en", "from_user_id"=>476491, "created_at"=>"Sat, 02 Aug 2008 19:16:19 +0000", "profile_image_url"=>"http://static.twitter.com/images/default_profile_normal.png"}, {"text"=>"[ruby] HTTParty: Quick Web Service Consumption From Any Ruby Class", "from_user"=>"rubymentary", "to_user_id"=>nil, "id"=>875761343, "iso_language_code"=>"en", "from_user_id"=>474717, "created_at"=>"Sat, 02 Aug 2008 17:26:19 +0000", "profile_image_url"=>"http://static.twitter.com/images/default_profile_normal.png"}, {"text"=>"[ruby: RubyInside] HTTParty: Quick Web Service Consumption From Any Ruby Class http://tinyurl.com/5gryre", "from_user"=>"devfunnel", "to_user_id"=>nil, "id"=>875732752, "iso_language_code"=>"en", "from_user_id"=>465190, "created_at"=>"Sat, 02 Aug 2008 16:44:21 +0000", "profile_image_url"=>"http://s3.amazonaws.com/twitter_production/profile_images/53748400/dev-funnel-logo-shiny-50x50_normal.png"}, {"text"=>"using the excellent OpenLibrary API, via HTTParty - i do like it that people have thought i'd want to do this in advance!", "from_user"=>"degsy", "to_user_id"=>nil, "id"=>875690354, "iso_language_code"=>"en", "from_user_id"=>164367, "created_at"=>"Sat, 02 Aug 2008 15:43:58 +0000", "profile_image_url"=>"http://s3.amazonaws.com/twitter_production/profile_images/56185617/degsy_normal.jpg"}, {"text"=>"httparty gem rocks", "from_user"=>"shenie", "to_user_id"=>nil, "id"=>874139770, "iso_language_code"=>"en", "from_user_id"=>271831, "created_at"=>"Thu, 31 Jul 2008 22:58:19 +0000", "profile_image_url"=>"http://s3.amazonaws.com/twitter_production/profile_images/42362902/Photo_28_normal.jpg"}, {"text"=>"httparty  yup.  that is what i was missing", "from_user"=>"bryanl", "to_user_id"=>nil, "id"=>873839285, "iso_language_code"=>"en", "from_user_id"=>5167, "created_at"=>"Thu, 31 Jul 2008 17:15:51 +0000", "profile_image_url"=>"http://s3.amazonaws.com/twitter_production/profile_images/57603306/Photo_26_normal.jpg"}, {"text"=>"@timhaines thanks for the link to HTTParty, Xero api consumer for contacts (at least the get part) now only takes 18 lines of code.", "from_user"=>"buildmaster", "to_user"=>"timhaines", "to_user_id"=>159881, "id"=>873222820, "iso_language_code"=>"en", "from_user_id"=>26548, "created_at"=>"Thu, 31 Jul 2008 02:29:02 +0000", "profile_image_url"=>"http://s3.amazonaws.com/twitter_production/profile_images/51894576/gold_o_normal.jpg"}, {"text"=>"refactoring code from yesterdays example to use HTTParty", "from_user"=>"buildmaster", "to_user_id"=>nil, "id"=>873020059, "iso_language_code"=>"en", "from_user_id"=>26548, "created_at"=>"Wed, 30 Jul 2008 21:55:19 +0000", "profile_image_url"=>"http://s3.amazonaws.com/twitter_production/profile_images/51894576/gold_o_normal.jpg"}, {"text"=>"delicious: It's an HTTParty and Everyone Is Invited! // RailsTips.org by John Nunemaker http://tinyurl.com/6774gz", "from_user"=>"top_web", "to_user_id"=>nil, "id"=>872810034, "iso_language_code"=>"en", "from_user_id"=>780201, "created_at"=>"Wed, 30 Jul 2008 17:48:25 +0000", "profile_image_url"=>"http://s3.amazonaws.com/twitter_production/profile_images/55853305/web_normal.jpg"}, {"text"=>"d: It's an HTTParty and Everyone Is Invited! // RailsTips.org by John Nunemaker http://tinyurl.com/6774gz", "from_user"=>"top_dedist", "to_user_id"=>nil, "id"=>872809988, "iso_language_code"=>"en", "from_user_id"=>760334, "created_at"=>"Wed, 30 Jul 2008 17:48:20 +0000", "profile_image_url"=>"http://s3.amazonaws.com/twitter_production/profile_images/55845227/dedist_normal.jpg"}, {"text"=>"[4Rails] It's an HTTParty and Everyone Is Invited! // RailsTips.org by John Nunemaker: It's an.. http://tinyurl.com/57wjn4", "from_user"=>"bumperbody", "to_user_id"=>nil, "id"=>872549387, "iso_language_code"=>"en", "from_user_id"=>476491, "created_at"=>"Wed, 30 Jul 2008 13:16:57 +0000", "profile_image_url"=>"http://static.twitter.com/images/default_profile_normal.png"}, {"text"=>"New blog post: Sinatra, Passenger, HTTParty: Small, Fast, Now http://ruby.tie-rack.org/?p=70", "from_user"=>"tierack", "to_user_id"=>nil, "id"=>872275405, "iso_language_code"=>"no", "from_user_id"=>98800, "created_at"=>"Wed, 30 Jul 2008 04:55:40 +0000", "profile_image_url"=>"http://s3.amazonaws.com/twitter_production/profile_images/52166714/mvb200_normal.jpg"}, {"text"=>"Tonight we're gonna HTTParty like it's 1999! - Time to boogie on down and consume some webservices! http://httparty.rubyforge.org/", "from_user"=>"hunternield", "to_user_id"=>nil, "id"=>872086627, "iso_language_code"=>"en", "from_user_id"=>47386, "created_at"=>"Wed, 30 Jul 2008 00:12:47 +0000", "profile_image_url"=>"http://s3.amazonaws.com/twitter_production/profile_images/52133648/Photo_59_normal.jpg"}], "results_per_page"=>15, "next_page"=>"?page=2&max_id=876733347&q=httparty+", "query"=>"httparty ", "page"=>1}

data/spec/search_spec.rb

@@ -0,0 +1,89 @@
+require File.dirname(__FILE__) + '/spec_helper.rb'
+
+describe Twitter::Search do
+  before do
+    @search = Twitter::Search.new
+  end
+  
+  it "should be able to initialize with a search term" do
+    Twitter::Search.new('httparty').query[:q].should include('httparty')
+  end
+  
+  it "should be able to specify from" do
+    @search.from('jnunemaker').query[:q].should include('from:jnunemaker')
+  end
+  
+  it "should be able to specify to" do
+    @search.to('jnunemaker').query[:q].should include('to:jnunemaker')
+  end
+  
+  it "should be able to specify referencing" do
+    @search.referencing('jnunemaker').query[:q].should include('@jnunemaker')
+  end
+  
+  it "should alias references to referencing" do
+    @search.references('jnunemaker').query[:q].should include('@jnunemaker')
+  end
+  
+  it "should alias ref to referencing" do
+    @search.ref('jnunemaker').query[:q].should include('@jnunemaker')
+  end
+  
+  it "should be able to specify containing" do
+    @search.containing('milk').query[:q].should include('milk')
+  end
+  
+  it "should alias contains to containing" do
+    @search.contains('milk').query[:q].should include('milk')
+  end  
+  
+  it "should be able to specify hashed" do
+    @search.hashed('twitter').query[:q].should include('#twitter')
+  end
+  
+  it "should be able to specify the language" do
+    @search.lang('en').query[:lang].should == 'en'
+  end
+  
+  it "should be able to specify the number of results per page" do
+    @search.per_page(25).query[:rpp].should == 25
+  end
+  
+  it "should be able to specify only returning results greater than an id" do
+    @search.since(1234).query[:since_id].should == 1234
+  end
+  
+  it "should be able to specify geo coordinates" do
+    @search.geocode('40.757929', '-73.985506', '25mi').query[:geocode].should == '40.757929,-73.985506,25mi'
+  end
+  
+  it "should be able to clear the filters set" do
+    @search.from('jnunemaker').to('oaknd1')
+    @search.clear.query.should == {:q => []}
+  end
+  
+  it "should be able to chain methods together" do
+    @search.from('jnunemaker').to('oaknd1').referencing('orderedlist').containing('milk').hashed('twitter').lang('en').per_page(20).since(1234).geocode('40.757929', '-73.985506', '25mi')
+    @search.query[:q].should == ['from:jnunemaker', 'to:oaknd1', '@orderedlist', 'milk', '#twitter']
+    @search.query[:lang].should == 'en'
+    @search.query[:rpp].should == 20
+    @search.query[:since_id].should == 1234
+    @search.query[:geocode].should == '40.757929,-73.985506,25mi'
+  end
+  
+  describe "fetching" do
+    before do
+      @response = open(File.dirname(__FILE__) + '/fixtures/friends_timeline.xml').read
+      @search.class.stub!(:get).and_return(@response)
+    end
+    
+    it "should return results" do
+      @search.class.should_receive(:get).and_return(@response)
+      @search.from('jnunemaker').fetch().should == @response
+    end
+  end
+  
+  it "should be able to iterate over results" do
+    @search.respond_to?(:each).should == true
+  end
+end

data/spec/spec_helper.rb

@@ -1,6 +1,10 @@
-require 'rubygems'
-gem 'rspec'
-require 'spec'
+begin
+  require 'spec'
+rescue LoadError
+  require 'rubygems'
+  gem 'rspec'
+  require 'spec'
+end
 
 dir = File.dirname(__FILE__)
 

data/tasks/deployment.rake

@@ -31,4 +31,11 @@ namespace :manifest do
   task :refresh do
     `rake check_manifest | patch -p0 > Manifest.txt`
   end
+end
+
+namespace :files do
+  task :copy do
+    files = File.read(File.join(File.dirname(__FILE__), '..', 'Manifest.txt')).split("\n")
+    %x[echo '#{files.inspect}' | pbcopy]
+  end
 end

data/tasks/website.rake

@@ -14,4 +14,4 @@ task :website_upload do
 end
 
 desc 'Generate and upload website files'
-task :website => [:website_generate, :website_upload, :publish_docs]
+task :website => [:website_upload, :publish_docs]

data/twitter.gemspec

@@ -1,23 +1,52 @@
 Gem::Specification.new do |s|
   s.name = %q{twitter}
-  s.version = "0.3.1"
-  s.specification_version = 2 if s.respond_to? :specification_version=
+  s.version = "0.3.4"
+
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Nunemaker"]
-  s.date = %q{2008-07-23}
+  s.date = %q{2008-08-03}
   s.default_executable = %q{twitter}
   s.description = %q{a command line interface for twitter, also a library which wraps the twitter api}
   s.email = %q{nunemaker@gmail.com}
   s.executables = ["twitter"]
   s.extra_rdoc_files = ["History.txt", "License.txt", "Manifest.txt", "README.txt"]
-  s.files = ["History.txt", "License.txt", "Manifest.txt", "README.txt", "Rakefile", "TODO.txt", "bin/twitter", "config/hoe.rb", "config/requirements.rb", "examples/blocks.rb", "examples/direct_messages.rb", "examples/favorites.rb", "examples/friends_followers.rb", "examples/friendships.rb", "examples/location.rb", "examples/replies.rb", "examples/sent_messages.rb", "examples/timeline.rb", "examples/twitter.rb", "examples/verify_credentials.rb", "lib/twitter.rb", "lib/twitter/base.rb", "lib/twitter/cli.rb", "lib/twitter/cli/config.rb", "lib/twitter/cli/helpers.rb", "lib/twitter/cli/migrations/20080722194500_create_accounts.rb", "lib/twitter/cli/migrations/20080722194508_create_tweets.rb", "lib/twitter/cli/migrations/20080722214605_add_account_id_to_tweets.rb", "lib/twitter/cli/migrations/20080722214606_create_configurations.rb", "lib/twitter/cli/models/account.rb", "lib/twitter/cli/models/configuration.rb", "lib/twitter/cli/models/tweet.rb", "lib/twitter/direct_message.rb", "lib/twitter/easy_class_maker.rb", "lib/twitter/rate_limit_status.rb", "lib/twitter/status.rb", "lib/twitter/user.rb", "lib/twitter/version.rb", "script/destroy", "script/generate", "script/txt2html", "setup.rb", "spec/base_spec.rb", "spec/cli/helper_spec.rb", "spec/direct_message_spec.rb", "spec/fixtures/followers.xml", "spec/fixtures/friends.xml", "spec/fixtures/friends_for.xml", "spec/fixtures/friends_lite.xml", "spec/fixtures/friends_timeline.xml", "spec/fixtures/public_timeline.xml", "spec/fixtures/rate_limit_status.xml", "spec/fixtures/status.xml", "spec/fixtures/user.xml", "spec/fixtures/user_timeline.xml", "spec/spec.opts", "spec/spec_helper.rb", "spec/status_spec.rb", "spec/user_spec.rb", "tasks/deployment.rake", "tasks/environment.rake", "tasks/website.rake", "twitter.gemspec", "website/css/common.css", "website/index.html"]
+  s.files = ["History.txt", "License.txt", "Manifest.txt", "README.txt", "Rakefile", "bin/twitter", "config/hoe.rb", "config/requirements.rb", "examples/blocks.rb", "examples/direct_messages.rb", "examples/favorites.rb", "examples/friends_followers.rb", "examples/friendships.rb", "examples/identica_timeline.rb", "examples/location.rb", "examples/replies.rb", "examples/search.rb", "examples/sent_messages.rb", "examples/timeline.rb", "examples/twitter.rb", "examples/verify_credentials.rb", "lib/twitter.rb", "lib/twitter/base.rb", "lib/twitter/cli.rb", "lib/twitter/cli/config.rb", "lib/twitter/cli/helpers.rb", "lib/twitter/cli/migrations/20080722194500_create_accounts.rb", "lib/twitter/cli/migrations/20080722194508_create_tweets.rb", "lib/twitter/cli/migrations/20080722214605_add_account_id_to_tweets.rb", "lib/twitter/cli/migrations/20080722214606_create_configurations.rb", "lib/twitter/cli/models/account.rb", "lib/twitter/cli/models/configuration.rb", "lib/twitter/cli/models/tweet.rb", "lib/twitter/direct_message.rb", "lib/twitter/easy_class_maker.rb", "lib/twitter/rate_limit_status.rb", "lib/twitter/search.rb", "lib/twitter/status.rb", "lib/twitter/user.rb", "lib/twitter/version.rb", "script/destroy", "script/generate", "script/txt2html", "setup.rb", "spec/base_spec.rb", "spec/cli/helper_spec.rb", "spec/direct_message_spec.rb", "spec/fixtures/followers.xml", "spec/fixtures/friends.xml", "spec/fixtures/friends_for.xml", "spec/fixtures/friends_lite.xml", "spec/fixtures/friends_timeline.xml", "spec/fixtures/public_timeline.xml", "spec/fixtures/rate_limit_status.xml", "spec/fixtures/search_results.json", "spec/fixtures/status.xml", "spec/fixtures/user.xml", "spec/fixtures/user_timeline.xml", "spec/search_spec.rb", "spec/spec.opts", "spec/spec_helper.rb", "spec/status_spec.rb", "spec/user_spec.rb", "tasks/deployment.rake", "tasks/environment.rake", "tasks/website.rake", "twitter.gemspec", "website/css/common.css", "website/images/terminal_output.png", "website/index.html"]
   s.has_rdoc = true
   s.homepage = %q{http://twitter.rubyforge.org}
   s.rdoc_options = ["--main", "README.txt"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{twitter}
-  s.rubygems_version = %q{1.1.1}
+  s.rubygems_version = %q{1.2.0}
   s.summary = %q{a command line interface for twitter, also a library which wraps the twitter api}
-  s.add_dependency(%q<hpricot>, [">= 0"])
-  s.add_dependency(%q<activesupport>, [">= 0"])
-end
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 2
+
+    if current_version >= 3 then
+      s.add_runtime_dependency(%q<hpricot>, [">= 0.6"])
+      s.add_runtime_dependency(%q<activesupport>, [">= 2.1"])
+      s.add_runtime_dependency(%q<main>, [">= 2.8.2"])
+      s.add_runtime_dependency(%q<highline>, [">= 1.4.0"])
+      s.add_runtime_dependency(%q<activerecord>, [">= 2.1"])
+      s.add_runtime_dependency(%q<sqlite3-ruby>, [">= 1.2.2"])
+      s.add_runtime_dependency(%q<httparty>, [">= 0.1.0"])
+    else
+      s.add_dependency(%q<hpricot>, [">= 0.6"])
+      s.add_dependency(%q<activesupport>, [">= 2.1"])
+      s.add_dependency(%q<main>, [">= 2.8.2"])
+      s.add_dependency(%q<highline>, [">= 1.4.0"])
+      s.add_dependency(%q<activerecord>, [">= 2.1"])
+      s.add_dependency(%q<sqlite3-ruby>, [">= 1.2.2"])
+      s.add_dependency(%q<httparty>, [">= 0.1.0"])
+    end
+  else
+    s.add_dependency(%q<hpricot>, [">= 0.6"])
+    s.add_dependency(%q<activesupport>, [">= 2.1"])
+    s.add_dependency(%q<main>, [">= 2.8.2"])
+    s.add_dependency(%q<highline>, [">= 1.4.0"])
+    s.add_dependency(%q<activerecord>, [">= 2.1"])
+    s.add_dependency(%q<sqlite3-ruby>, [">= 1.2.2"])
+    s.add_dependency(%q<httparty>, [">= 0.1.0"])
+  end
+end

data/website/index.html

@@ -10,11 +10,12 @@
 <div id="wrapper"> 
 	<div id="header"> 
 		<h1>Twitter</h1> 
-		<p>command line twits and an api wrapper</p> 
+		<p>command line tweets and an api wrapper</p> 
 		
 		<ul id="nav">
 			<li><a href="rdoc/">Docs</a></li> 
 			<li><a href="http://github.com/jnunemaker/twitter">Github</a></li>
+			<li><a href="http://jnunemaker.lighthouseapp.com/projects/14843-twitter-gem/overview">Lighthouse</a></li>
 			<li><a href="http://rubyforge.org/projects/twitter/">Rubyforge</a></li> 
 		</ul> 
 	</div> 
@@ -67,7 +68,25 @@ twit.followers.each do |u|
 end
 		</code></pre>
 		
-		<h2>Command Line</h2> 
+		<h2>Search API Examples</h2>
+		
+<pre><code>#searches all tweets for httparty
+Twitter::Search.new('httparty').each { |r| puts r.inspect }
+
+# searches all of jnunemaker's tweets for httparty
+Twitter::Search.new('httparty').from('jnunemaker').each { |r| puts r.inspect }
+
+# searches all tweets from jnunemaker to oaknd1
+Twitter::Search.new.from('jnunemaker').to('oaknd1').each { |r| puts r.inspect }
+
+# you can also use fetch to actually just get the parsed response
+Twitter::Search.new.from('jnunemaker').to('oaknd1').fetch()
+</code></pre>
+		
+		<h2>Command Line</h2>
+
+		<p><img src="images/terminal_output.png" alt="Terminal Output" style="width:560px;" /></p>
+		
 	<p>The first thing you'll want to do is install the database so your account(s) can be stored.</p> 
 
 		<pre><code>$ twitter install</code></pre>
@@ -105,7 +124,7 @@ Account List
 		
 		
 		<h2>Support</h2> 
-		<p>Please leave all support requests and suggestions at the <a href="http://groups.google.com/group/ruby-twitter-gem">google group</a>.</p> 
+		<p>Conversations welcome in the <a href="http://groups.google.com/group/ruby-twitter-gem">google group</a> and bugs/features over at <a href="http://jnunemaker.lighthouseapp.com/projects/14843-twitter-gem/overview">lighthouse</a></p>
 		
 		<h2>Uses</h2> 
 		<ul> 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jnunemaker-twitter
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.3.4
 platform: ruby
 authors: 
 - John Nunemaker
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-23 00:00:00 -07:00
+date: 2008-08-03 00:00:00 -07:00
 default_executable: twitter
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -19,7 +19,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: "0.6"
     version: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -28,7 +28,52 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: "2.1"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: main
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.8.2
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: highline
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.4.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: activerecord
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "2.1"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: sqlite3-ruby
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.2.2
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: httparty
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.1.0
     version: 
 description: a command line interface for twitter, also a library which wraps the twitter api
 email: nunemaker@gmail.com
@@ -47,7 +92,6 @@ files:
 - Manifest.txt
 - README.txt
 - Rakefile
-- TODO.txt
 - bin/twitter
 - config/hoe.rb
 - config/requirements.rb
@@ -56,8 +100,10 @@ files:
 - examples/favorites.rb
 - examples/friends_followers.rb
 - examples/friendships.rb
+- examples/identica_timeline.rb
 - examples/location.rb
 - examples/replies.rb
+- examples/search.rb
 - examples/sent_messages.rb
 - examples/timeline.rb
 - examples/twitter.rb
@@ -77,6 +123,7 @@ files:
 - lib/twitter/direct_message.rb
 - lib/twitter/easy_class_maker.rb
 - lib/twitter/rate_limit_status.rb
+- lib/twitter/search.rb
 - lib/twitter/status.rb
 - lib/twitter/user.rb
 - lib/twitter/version.rb
@@ -94,9 +141,11 @@ files:
 - spec/fixtures/friends_timeline.xml
 - spec/fixtures/public_timeline.xml
 - spec/fixtures/rate_limit_status.xml
+- spec/fixtures/search_results.json
 - spec/fixtures/status.xml
 - spec/fixtures/user.xml
 - spec/fixtures/user_timeline.xml
+- spec/search_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/status_spec.rb
@@ -106,6 +155,7 @@ files:
 - tasks/website.rake
 - twitter.gemspec
 - website/css/common.css
+- website/images/terminal_output.png
 - website/index.html
 has_rdoc: true
 homepage: http://twitter.rubyforge.org

data/TODO.txt

@@ -1,3 +0,0 @@
-* format the tweets in a more readable fashion (limit words per line so more scannable)
-* add timeout so it doesn't hang forever like it does now if twitter is down
-* add progress indicator for timeline and replies as posting has for more visual indication that work is happening