handcrafted-twitter 0.4.0 → 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/direct_message.rb

@@ -8,13 +8,13 @@ module Twitter
       # Creates a new status from a piece of xml
       def new_from_xml(xml)
         DirectMessage.new do |d|
-          d.id                    = (xml).at('id').text
-          d.text                  = (xml).get_elements_by_tag_name('text').text
-          d.sender_id             = (xml).at('sender_id').text
-          d.recipient_id          = (xml).at('recipient_id').text
-          d.created_at            = (xml).at('created_at').text
-          d.sender_screen_name    = (xml).at('sender_screen_name').text
-          d.recipient_screen_name = (xml).at('recipient_screen_name').text
+          d.id                    = (xml).at('id').innerHTML
+          d.text                  = (xml).get_elements_by_tag_name('text').innerHTML
+          d.sender_id             = (xml).at('sender_id').innerHTML
+          d.recipient_id          = (xml).at('recipient_id').innerHTML
+          d.created_at            = (xml).at('created_at').innerHTML
+          d.sender_screen_name    = (xml).at('sender_screen_name').innerHTML
+          d.recipient_screen_name = (xml).at('recipient_screen_name').innerHTML
         end
       end
     end

data/lib/twitter/rate_limit_status.rb

@@ -8,10 +8,10 @@ module Twitter
       # Creates a new rate limi status from a piece of xml
       def new_from_xml(xml)
         RateLimitStatus.new do |s|
-          s.reset_time_in_seconds = xml.at('reset-time-in-seconds').text.to_i
-          s.reset_time            = Time.parse xml.at('reset-time').text
-          s.remaining_hits        = xml.at('remaining-hits').text.to_i
-          s.hourly_limit          = xml.at('hourly-limit').text.to_i
+          s.reset_time_in_seconds = xml.at('reset-time-in-seconds').inner_html.to_i
+          s.reset_time            = Time.parse xml.at('reset-time').inner_html
+          s.remaining_hits        = xml.at('remaining-hits').inner_html.to_i
+          s.hourly_limit          = xml.at('hourly-limit').inner_html.to_i
         end
       end
     end

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/status.rb

@@ -7,14 +7,14 @@ module Twitter
     # Creates a new status from a piece of xml
     def self.new_from_xml(xml)
       s = new
-      s.id                    = (xml).at('id').text
-      s.created_at            = (xml).at('created_at').text
-      s.text                  = (xml).get_elements_by_tag_name('text').text
-      s.source                = (xml).at('source').text
-      s.truncated             = (xml).at('truncated').text == 'false' ? false : true
-      s.favorited             = (xml).at('favorited').text == 'false' ? false : true
-      s.in_reply_to_status_id = (xml).at('in_reply_to_status_id').text
-      s.in_reply_to_user_id   = (xml).at('in_reply_to_user_id').text
+      s.id                    = (xml).at('id').innerHTML
+      s.created_at            = (xml).at('created_at').innerHTML
+      s.text                  = (xml).get_elements_by_tag_name('text').innerHTML
+      s.source                = (xml).at('source').innerHTML
+      s.truncated             = (xml).at('truncated').innerHTML == 'false' ? false : true
+      s.favorited             = (xml).at('favorited').innerHTML == 'false' ? false : true
+      s.in_reply_to_status_id = (xml).at('in_reply_to_status_id').innerHTML
+      s.in_reply_to_user_id   = (xml).at('in_reply_to_user_id').innerHTML
       s.user                  = User.new_from_xml(xml.at('user')) if (xml).at('user')
       s
     end

data/lib/twitter/user.rb

@@ -10,26 +10,26 @@ module Twitter
     # Creates a new user from a piece of xml
     def self.new_from_xml(xml)
       u = new
-      u.id                           = (xml).at('id').text
-      u.name                         = (xml).at('name').text
-      u.screen_name                  = (xml).at('screen_name').text
-      u.location                     = (xml).at('location').text
-      u.description                  = (xml).at('description').text
-      u.url                          = (xml).at('url').text
-      u.profile_image_url            = (xml).at('profile_image_url').text          
+      u.id                           = (xml).at('id').innerHTML
+      u.name                         = (xml).at('name').innerHTML
+      u.screen_name                  = (xml).at('screen_name').innerHTML
+      u.location                     = (xml).at('location').innerHTML
+      u.description                  = (xml).at('description').innerHTML
+      u.url                          = (xml).at('url').innerHTML
+      u.profile_image_url            = (xml).at('profile_image_url').innerHTML          
       
       # optional, not always present
-      u.profile_background_color     = (xml).at('profile_background_color').text if (xml).at('profile_background_color')
-      u.profile_text_color           = (xml).at('profile_text_color').text if (xml).at('profile_text_color')
-      u.profile_link_color           = (xml).at('profile_link_color').text if (xml).at('profile_link_color')
-      u.profile_sidebar_fill_color   = (xml).at('profile_sidebar_fill_color').text if (xml).at('profile_sidebar_fill_color')
-      u.profile_sidebar_border_color = (xml).at('profile_sidebar_border_color').text if (xml).at('profile_sidebar_border_color')
-      u.friends_count                = (xml).at('friends_count').text if (xml).at('friends_count')
-      u.followers_count              = (xml).at('followers_count').text if (xml).at('followers_count')
-      u.favourites_count             = (xml).at('favourites_count').text if (xml).at('favourites_count')
-      u.statuses_count               = (xml).at('statuses_count').text if (xml).at('statuses_count')
-      u.utc_offset                   = (xml).at('utc_offset').text if (xml).at('utc_offset')
-      u.protected                    = (xml).at('protected').text == 'false' ? false : true if (xml).at('protected')
+      u.profile_background_color     = (xml).at('profile_background_color').innerHTML if (xml).at('profile_background_color')
+      u.profile_text_color           = (xml).at('profile_text_color').innerHTML if (xml).at('profile_text_color')
+      u.profile_link_color           = (xml).at('profile_link_color').innerHTML if (xml).at('profile_link_color')
+      u.profile_sidebar_fill_color   = (xml).at('profile_sidebar_fill_color').innerHTML if (xml).at('profile_sidebar_fill_color')
+      u.profile_sidebar_border_color = (xml).at('profile_sidebar_border_color').innerHTML if (xml).at('profile_sidebar_border_color')
+      u.friends_count                = (xml).at('friends_count').innerHTML if (xml).at('friends_count')
+      u.followers_count              = (xml).at('followers_count').innerHTML if (xml).at('followers_count')
+      u.favourites_count             = (xml).at('favourites_count').innerHTML if (xml).at('favourites_count')
+      u.statuses_count               = (xml).at('statuses_count').innerHTML if (xml).at('statuses_count')
+      u.utc_offset                   = (xml).at('utc_offset').innerHTML if (xml).at('utc_offset')
+      u.protected                    = (xml).at('protected').innerHTML == 'false' ? false : true if (xml).at('protected')
       u.status                       = Status.new_from_xml(xml.at('status')) if (xml).at('status')
       u
     end

data/lib/twitter/version.rb

@@ -1,9 +1,3 @@
 module Twitter #:nodoc:
-  module VERSION #:nodoc:
-    MAJOR = 0
-    MINOR = 3
-    TINY  = 7
-
-    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))
@@ -65,6 +75,26 @@ describe "Twitter::Base" do
       timeline.size.should == 29
       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
+      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
@@ -106,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