billymeltdown-twitter 0.3.8.1 → 0.4.2

data/lib/twitter/cli/helpers.rb

@@ -5,25 +5,37 @@ module Twitter
       class NoAccounts < StandardError; end
       
       def output_tweets(collection, options={})
-        options.reverse_merge!({
+        options = {
           :cache        => false,
           :since_prefix => '',
-          :empty_msg    => 'Nothing new since your last check.'
-        })
+          :empty_msg    => 'Nothing new since your last check.',
+          :reverse      => false
+        }.merge(options)
+        
         if collection.size > 0
           justify   = collection.collect { |s| s.user.screen_name }.max { |a,b| a.length <=> b.length }.length rescue 0
           indention = ' ' * (justify + 3)
           say("\n#{indention}#{collection.size} new tweet(s) found.\n\n")
+          collection.reverse! if options[:reverse]
           collection.each do |s|
             Tweet.create_from_tweet(current_account, s) if options[:cache]
+            
             occurred_at    = Time.parse(s.created_at).strftime('On %b %d at %l:%M%P')
             formatted_time = '-' * occurred_at.length + "\n#{indention}#{occurred_at}"
             formatted_name = s.user.screen_name.rjust(justify + 1)
             formatted_msg  = ''
-            s.text.split(' ').in_groups_of(6, false) { |row| formatted_msg += row.join(' ') + "\n#{indention}" }
-            say "#{CGI::unescapeHTML(formatted_name)}: #{CGI::unescapeHTML(formatted_msg)}#{formatted_time}\n\n"
+            
+            s.text.split(' ').each_with_index do |word, idx|
+              formatted_msg += "#{word} "
+              
+              sixth_word = idx != 0 && idx % 6 == 0
+              formatted_msg += "\n#{indention}" if sixth_word
+            end
+            
+            say "#{CGI::unescapeHTML(formatted_name)}: #{CGI::unescapeHTML(formatted_msg)}\n#{indention}#{formatted_time}\n\n"
           end
-          Configuration["#{options[:since_prefix]}_since_id"] = collection.first.id
+          
+          Configuration["#{options[:since_prefix]}_since_id"] = options[:reverse] ? collection.last.id : collection.first.id
         else
           say(options[:empty_msg])
         end
@@ -35,7 +47,7 @@ module Twitter
       
       def current_account
         @current_account ||= Account.active        
-        raise Account.count == 0 ? NoAccounts : NoActiveAccount if @current_account.blank?
+        raise Account.count == 0 ? NoAccounts : NoActiveAccount if @current_account.nil?
         @current_account
       end
       
@@ -44,7 +56,7 @@ module 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?
+          if !config['email'].nil? && !config['password'].nil?
             Account.add(:username => config['email'], :password => config['password'])
             say 'Account imported'
             block.call if block_given?

data/lib/twitter/search.rb

@@ -11,7 +11,7 @@ module Twitter
     
     def initialize(q=nil)
       clear
-      containing(q) unless q.blank?
+      containing(q) if q && q.strip != ''
     end
     
     def from(user)
@@ -59,6 +59,12 @@ module Twitter
       self
     end
     
+    # Which page of results to fetch
+    def page(num)
+      @query[:page] = num
+      self
+    end
+    
     # Only searches tweets since a given id. 
     # Recommended to use this when possible.
     def since(since_id)
@@ -83,7 +89,7 @@ module Twitter
     # 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})
+      SearchResultInfo.new_from_hash(self.class.get('/search.json', {:query => @query}))
     end
     
     def each
@@ -91,4 +97,5 @@ module Twitter
       @result['results'].each { |r| yield r }
     end
   end
-end
+end
+

data/lib/twitter/search_result.rb

@@ -0,0 +1,83 @@
+module Twitter
+  class SearchResult < Hash
+    
+    # Creates an easier to work with hash from
+    # one with string-based keys
+    def self.new_from_hash(hash)
+      new.merge!(hash)
+    end
+    
+    def created_at
+      self['created_at']
+    end
+    
+    def created_at=(val)
+      self['created_at'] = val
+    end
+    
+    def from_user
+      self['from_user']
+    end
+    
+    def from_user=(val)
+      self['from_user'] = val
+    end
+    
+    def from_user_id
+      self['from_user_id']
+    end
+    
+    def from_user_id=(val)
+      self['from_user_id'] = val
+    end
+    
+    def id
+      self['id']
+    end
+    
+    def id=(val)
+      self['id'] = val
+    end
+    
+    def iso_language_code
+      self['iso_language_code']
+    end
+    
+    def iso_language_code=(val)
+      self['iso_language_code'] = val
+    end
+    
+    def profile_image_url
+      self['profile_image_url']
+    end
+    
+    def profile_image_url=(val)
+      self['profile_image_url'] = val
+    end
+    
+    def text
+      self['text']
+    end
+    
+    def text=(val)
+      self['text'] = val
+    end
+    
+    def to_user
+      self['to_user']
+    end
+    
+    def to_user=(val)
+      self['to_user'] = val
+    end
+    
+    def to_user_id
+      self['to_user_id']
+    end
+    
+    def to_user_id=(val)
+      self['to_user_id'] = val
+    end
+    
+  end
+end

data/lib/twitter/search_result_info.rb

@@ -0,0 +1,82 @@
+module Twitter
+  class SearchResultInfo < Hash
+    
+    # Creates an easier to work with hash from
+    # one with string-based keys
+    def self.new_from_hash(hash)
+      i = new
+      i.merge!(hash)
+      search_results = []
+      i.results.each do |r|
+        search_results << SearchResult.new_from_hash(r)
+      end
+      i.results = search_results
+      i
+    end
+    
+    def completed_in
+      self['completed_in']
+    end
+    
+    def completed_in=(val)
+      self['completed_in'] = val
+    end
+    
+    def max_id
+      self['max_id']
+    end
+    
+    def max_id=(val)
+      self['max_id'] = val
+    end
+    
+    def next_page
+      self['next_page']
+    end
+    
+    def next_page=(val)
+      self['next_page'] = val
+    end
+    
+    def page
+      self['page']
+    end
+    
+    def page=(val)
+      self['page'] = val
+    end
+    
+    def refresh_url
+      self['refresh_url']
+    end
+    
+    def refresh_url=(val)
+      self['refresh_url'] = val
+    end
+    
+    def results_per_page
+      self['results_per_page']
+    end
+    
+    def results_per_page=(val)
+      self['results_per_page'] = val
+    end
+    
+    def since_id
+      self['since_id']
+    end
+    
+    def since_id=(val)
+      self['since_id'] = val
+    end
+    
+    def results
+      self['results']
+    end
+    
+    def results=(val)
+      self['results'] = val
+    end
+    
+  end
+end

data/lib/twitter/version.rb

@@ -1,9 +1,3 @@
 module Twitter #:nodoc:
-  module VERSION #:nodoc:
-    MAJOR = 0
-    MINOR = 3
-    TINY  = 8
-
-    STRING = [MAJOR, MINOR, TINY].join('.')
-  end
+  Version = '0.4.2'
 end

data/spec/base_spec.rb

@@ -16,7 +16,11 @@ describe "Twitter::Base" do
       lambda { @base.timeline(:fakeyoutey) }.should raise_error(Twitter::UnknownTimeline)
     end
     
-    it "should default to friends timeline"
+    it "should default to friends timeline" do
+      @base.should_receive(:call).with("friends_timeline", {:auth=>true, :args=>{}, :since=>nil})
+      @base.should_receive(:statuses)
+      @base.timeline
+    end
     
     it "should be able to retrieve friends timeline" do
       data = open(File.dirname(__FILE__) + '/fixtures/friends_timeline.xml').read
@@ -50,6 +54,12 @@ describe "Twitter::Base" do
       @base.friends(:lite => true).size.should == 15
     end
     
+    it "should be able to get friend ids" do
+      data = open(File.dirname(__FILE__) + '/fixtures/friend_ids.xml').read
+      @base.should_receive(:request).and_return(Hpricot::XML(data))
+      @base.friend_ids.size.should == 8
+    end
+    
     it "should be able to get friends for another user" do
       data = open(File.dirname(__FILE__) + '/fixtures/friends_for.xml').read
       @base.should_receive(:request).and_return(Hpricot::XML(data))
@@ -66,17 +76,25 @@ describe "Twitter::Base" do
       timeline.first.name.should == 'Blaine Cook'
     end
     
+    it "should be able to get follower ids" do
+      data = open(File.dirname(__FILE__) + '/fixtures/follower_ids.xml').read
+      @base.should_receive(:request).and_return(Hpricot::XML(data))
+      @base.follower_ids.size.should == 8
+    end
+    
     it "should be able to create a friendship" do
       data = open(File.dirname(__FILE__) + '/fixtures/friendship_created.xml').read
       @base.should_receive(:request).and_return(Hpricot::XML(data))
       user = @base.create_friendship('jnunemaker')
     end
     
-    it "should bomb if friendship already exists" #do
-    #  data = open(File.dirname(__FILE__) + '/fixtures/friendship_already_exists.xml').read
-    #  @base.should_receive(:request).and_return(Hpricot::XML(data))
-    #  lambda { @base.create_friendship('billymeltdown') }.should raise_error(Twitter::AlreadyFollowing)
-    #end
+    it "should bomb if friendship already exists" do
+      data = open(File.dirname(__FILE__) + '/fixtures/friendship_already_exists.xml').read
+      response = Net::HTTPForbidden.new("1.1", '403', '')
+      response.stub!(:body).and_return(data)
+      @base.should_receive(:response).and_return(response)
+      lambda { @base.create_friendship('billymeltdown') }.should raise_error(Twitter::AlreadyFollowing)
+    end
   end
   
   it "should be able to get single status" do
@@ -118,4 +136,4 @@ describe "Twitter::Base" do
       @base.rate_limit_status.remaining_hits.should == 5
     end
   end
-end
+end

data/spec/cli/helper_spec.rb

@@ -8,6 +8,10 @@ def say(str)
   puts str
 end
 
+class Tweet < OpenStruct
+  attr_accessor :id
+end
+
 describe Twitter::CLI::Helpers do
   include Twitter::CLI::Helpers
   
@@ -15,21 +19,31 @@ describe Twitter::CLI::Helpers do
     before do
       Configuration.stub!(:[]=).and_return(true)
       @collection = [
-        OpenStruct.new(
-          :text => 'This is my long message that I want to see formatted ooooh so pretty with a few words on each line so it is easy to scan.',
+        Tweet.new(
+          :id         => 1,
+          :text       => 'This is my long message that I want to see formatted ooooh so pretty with a few words on each line so it is easy to scan.',
           :created_at => Time.mktime(2008, 5, 1, 10, 15, 00).strftime('%Y-%m-%d %H:%M:%S'),
-          :user => OpenStruct.new(:screen_name => 'jnunemaker')
+          :user       => OpenStruct.new(:screen_name => 'jnunemaker')
         ),
-        OpenStruct.new(
-          :text => 'This is my long message that I want to see formatted ooooh so pretty with a.',
+        Tweet.new(
+          :id         => 2,
+          :text       => 'This is my long message that I want to see formatted ooooh so pretty with a.',
           :created_at => Time.mktime(2008, 4, 1, 10, 15, 00).strftime('%Y-%m-%d %H:%M:%S'),
-          :user => OpenStruct.new(:screen_name => 'danielmorrison')
+          :user       => OpenStruct.new(:screen_name => 'danielmorrison')
         )
       ]
     end
     
     specify "should properly format" do
-      output_tweets(@collection)
+      stdout_for {
+        output_tweets(@collection)
+      }.should match(/with a few words[\w\W]*with a\./)
+    end
+    
+    specify 'should format in reverse' do
+      stdout_for {
+        output_tweets(@collection, :reverse => true)
+      }.should match(/with a\.[\w\W]*with a few words/)
     end
   end
 end

data/spec/fixtures/follower_ids.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ids>
+<id>1192</id>
+<id>750823</id>
+<id>813198</id>
+<id>10718</id>
+<id>13046</id>
+<id>79543</id>
+<id>813775</id>
+<id>681473</id>
+</ids>

data/spec/fixtures/friend_ids.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ids>
+<id>1192</id>
+<id>780561</id>
+<id>10718</id>
+<id>750823</id>
+<id>643443</id>
+<id>813198</id>
+<id>13046</id>
+<id>147093</id>
+</ids>
+

data/spec/fixtures/friendship_already_exists.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<hash>
+  <request>/friendships/create/billymeltdown.xml</request>
+  <error>Could not follow user: billymeltdown is already on your list.</error>
+</hash>

data/spec/fixtures/friendship_created.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<user>
+  <id>4243</id>
+  <name>John Nunemaker</name>
+  <screen_name>jnunemaker</screen_name>
+  <location>Indiana</location>
+  <description>Loves his wife, ruby, notre dame football and iu basketball</description>
+  <profile_image_url>http://s3.amazonaws.com/twitter_production/profile_images/52619256/ruby_enterprise_shirt_normal.jpg</profile_image_url>
+  <url>http://addictedtonew.com</url>
+  <protected>false</protected>
+  <followers_count>363</followers_count>
+</user>

data/spec/fixtures/search_result_info.yml

@@ -0,0 +1,147 @@
+--- !map:Twitter::SearchResultInfo 
+results: 
+- !map:Twitter::SearchResult 
+  text: "@jqr - wow.  just really looked at httparty for first time - sweet! - have you been using that a lot?"
+  to_user_id: 176589
+  to_user: jqr
+  from_user: baldwindavid
+  id: 1073680192
+  from_user_id: 804487
+  iso_language_code: en
+  profile_image_url: http://s3.amazonaws.com/twitter_production/profile_images/67146299/before_400_normal.jpg
+  created_at: Tue, 23 Dec 2008 04:20:12 +0000
+- !map:Twitter::SearchResult 
+  text: the httparty gem rocks my socks.  no better way to consume web services in ruby.
+  to_user_id: 
+  from_user: mildmojo
+  id: 1073135700
+  from_user_id: 2090305
+  iso_language_code: en
+  profile_image_url: http://s3.amazonaws.com/twitter_production/profile_images/65215459/appicon_normal.png
+  created_at: Mon, 22 Dec 2008 22:20:43 +0000
+- !map:Twitter::SearchResult 
+  text: It's an HTTParty and everyone is invited!
+  to_user_id: 
+  from_user: mypheme
+  id: 1067975762
+  from_user_id: 3067473
+  iso_language_code: en
+  profile_image_url: http://s3.amazonaws.com/twitter_production/profile_images/67872558/Picture_3_normal.png
+  created_at: Fri, 19 Dec 2008 22:09:23 +0000
+- !map:Twitter::SearchResult 
+  text: dans la famille des clients http,vous connaissiez curb, httparty, mais connaissiez-vous httpclient ? http://dev.ctor.org/httpclient/
+  to_user_id: 
+  from_user: rubyfrance
+  id: 1064812719
+  from_user_id: 70780
+  iso_language_code: fr
+  profile_image_url: http://s3.amazonaws.com/twitter_production/profile_images/51884877/twitter_normal.png
+  created_at: Thu, 18 Dec 2008 12:46:27 +0000
+- !map:Twitter::SearchResult 
+  text: "@jnunemaker have you ever seen httparty get a Net::HTTPServerException: 411 "Length Required" back?"
+  to_user_id: 19106
+  to_user: jnunemaker
+  from_user: techpickles
+  id: 1064375973
+  from_user_id: 22902
+  iso_language_code: en
+  profile_image_url: http://s3.amazonaws.com/twitter_production/profile_images/64410494/Photo_9_normal.jpg
+  created_at: Thu, 18 Dec 2008 05:24:23 +0000
+- !map:Twitter::SearchResult 
+  text: playing with the tumblr api, httparty style
+  to_user_id: 
+  from_user: techpickles
+  id: 1064355666
+  from_user_id: 22902
+  iso_language_code: en
+  profile_image_url: http://s3.amazonaws.com/twitter_production/profile_images/64410494/Photo_9_normal.jpg
+  created_at: Thu, 18 Dec 2008 05:07:59 +0000
+- !map:Twitter::SearchResult 
+  text: Testing from HTTParty, awesome ruby gem that allows for easy access to APIs over http.
+  to_user_id: 
+  from_user: simonreed
+  id: 1063822669
+  from_user_id: 63911
+  iso_language_code: en
+  profile_image_url: http://s3.amazonaws.com/twitter_production/profile_images/53963586/fu_normal.jpg
+  created_at: Wed, 17 Dec 2008 23:21:34 +0000
+- !map:Twitter::SearchResult 
+  text: It's an HTTParty and everyone is invited!
+  to_user_id: 
+  from_user: bernsno
+  id: 1063277742
+  from_user_id: 1495935
+  iso_language_code: en
+  profile_image_url: http://s3.amazonaws.com/twitter_production/profile_images/63820805/me_normal.gif
+  created_at: Wed, 17 Dec 2008 18:25:31 +0000
+- !map:Twitter::SearchResult 
+  text: "[ruby] Using Context and Stump to HTTParty like a Wufoo"
+  to_user_id: 
+  from_user: rubymentary
+  id: 1062068801
+  from_user_id: 474717
+  iso_language_code: en
+  profile_image_url: http://static.twitter.com/images/default_profile_normal.png
+  created_at: Wed, 17 Dec 2008 03:37:00 +0000
+- !map:Twitter::SearchResult 
+  text: "net/http\xE3\x81\xAEwrapper\xE3\x81\xA0\xE3\x81\xA3\xE3\x81\x9F\xE3\x80\x82\xE3\x80\x82\xE3\x80\x82 > HTTParty re: http://ff.im/h1Dg"
+  to_user_id: 
+  from_user: nahi
+  id: 1061821371
+  from_user_id: 36221
+  iso_language_code: "no"
+  profile_image_url: http://static.twitter.com/images/default_profile_normal.png
+  created_at: Wed, 17 Dec 2008 00:58:19 +0000
+- !map:Twitter::SearchResult 
+  text: Using HTTParty to wrap the Wufoo form submit API, as we are switching the Ordered List contact form to Wufoo.
+  to_user_id: 
+  from_user: jnunemaker
+  id: 1061117717
+  from_user_id: 19106
+  iso_language_code: en
+  profile_image_url: http://s3.amazonaws.com/twitter_production/profile_images/61024905/black250_normal.jpg
+  created_at: Tue, 16 Dec 2008 18:25:28 +0000
+- !map:Twitter::SearchResult 
+  text: Playing with HTTParty. Like it already. :)
+  to_user_id: 
+  from_user: atog
+  id: 1058725999
+  from_user_id: 21795
+  iso_language_code: en
+  profile_image_url: http://s3.amazonaws.com/twitter_production/profile_images/61430136/ikke_vierkant_normal.jpg
+  created_at: Mon, 15 Dec 2008 16:06:26 +0000
+- !map:Twitter::SearchResult 
+  text: HTTParty is like sweet candy...
+  to_user_id: 
+  from_user: levicole
+  id: 1055553905
+  from_user_id: 111971
+  iso_language_code: en
+  profile_image_url: http://s3.amazonaws.com/twitter_production/profile_images/24274692/Photo_2_normal.jpg
+  created_at: Sat, 13 Dec 2008 17:52:01 +0000
+- !map:Twitter::SearchResult 
+  text: "thinking httparty needs a bit of morph class generation magic: http://tinyurl.com/6774gz"
+  to_user_id: 
+  from_user: delineator
+  id: 1054352107
+  from_user_id: 102024
+  iso_language_code: en
+  profile_image_url: http://s3.amazonaws.com/twitter_production/profile_images/63867007/rob_64_64_normal.png
+  created_at: Fri, 12 Dec 2008 22:53:41 +0000
+- !map:Twitter::SearchResult 
+  text: To use HTTParty, or just net/http? I'm going to have to change some headers, which means digging around. Hrm.
+  to_user_id: 
+  from_user: HibiscuS4
+  id: 1050622779
+  from_user_id: 8780
+  iso_language_code: en
+  profile_image_url: http://s3.amazonaws.com/twitter_production/profile_images/60311231/Photo_9_normal.jpg
+  created_at: Thu, 11 Dec 2008 04:13:06 +0000
+since_id: 0
+max_id: 1078578631
+refresh_url: ?since_id=1078578631&q=httparty
+results_per_page: 15
+next_page: ?page=2&max_id=1078578631&q=httparty
+completed_in: 0.018799
+page: 1
+query: httparty