tit 2.0.4 → 2.1.0

data/ChangeLog.markdown

@@ -1,3 +1,9 @@
+# tit 2.1.0 2011-09-10
+
+* got direct messaging working -- requires reauthorization
+* notifies user of need to reauthorize the app for dm permissions
+* can now handle missing tweet, whereas it was just throwing a Ruby error before
+
 # tit 2.0.4 2011-09-09
 
 * fixes issue with replacing t.co urls, where the ridiculous set of chars at the end remained

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 2
-:minor: 0
-:patch: 4
+:minor: 1
+:patch: 0

data/bin/tit

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 
 require 'tit'
-
 require 'optparse'
 
 def main
@@ -35,33 +34,34 @@ def main
       options[:action] = :mentions
       unchanged = false
     end
-    opts.on("-u", "--user [USERNAME]",
+    opts.on("-u", "--user USERNAME",
             "Show a particular user's timeline") do |user|
       unchanged = false
       options[:action] = :user_timeline
       options[:payload] ||= {}
       options[:payload]["user"] = user
     end
-    opts.on("-t", "--tweet [STATUS]", "Update status (required when using -G)") do |status|
-      unchanged = false
-      options[:action] = :update
-      options[:payload] ||= {}
-      options[:payload]["status"] = status
-    end
-    opts.on("-d", "--dm [USERNAME] [MESSAGE]", "Read direct messages. Send a direct message if USERNAME and MESSAGE are set") do |user, message|
-      "Tit does not presently have access to Twitter's Direct Messaging functionality. This will be rectified soon.".wrapped(@cols-2).each do |l|
-        puts " #{l}"
-      end
+    opts.on("-d", "--dm [USERNAME]", "Read direct messages. Send a direct message if USERNAME is set and -t or --tweet accompanies it") do |user|
       unchanged = false
-      if not user.nil? and not message.nil?
+      if not user.nil?
         options[:action] = :new_direct_message
         options[:payload] ||= {}
         options[:payload]["screen_name"] = user
-        options[:payload]["text"] = message
       else
+        puts "Displaying dms."
         options[:action] = :direct_messages
       end
     end
+    opts.on("-t", "--tweet [STATUS]", "Update status (required when using -G)") do |status|
+      unchanged = false
+      if not options[:action].nil? and options[:action].eql?(:new_direct_message)
+        options[:payload]["text"] = status
+      else
+        options[:action] = :update
+        options[:payload] ||= {}
+        options[:payload]["status"] = status
+      end
+    end
     opts.on("--pin PIN", ("Set auth pin if this is your first time playing " +
                           "with this tit")) do |pin|
       unchanged = false
@@ -156,7 +156,7 @@ def main
                                                   not options[:notify].nil?)
   end
   if options[:action] == :update
-    tit.abort("need status message") unless options[:payload].include? "status"
+    tit.abort("need status message") unless options[:payload].include? "status" and not options[:payload]["status"].nil?
     tit.abort("can't repeatedly update status") unless options[:wait].nil?
     tit.abort("can't notify when updating status") unless options[:notify].nil?
   end

data/lib/tit.rb

@@ -26,7 +26,7 @@ class String
     replace(replace_with_expanded_url(expanded))
   end
   def replace_with_expanded_url(expanded)
-    replace_uris(/http:\/\/t.co\/[a-zA-Z0-9]{0,7}$/i, expanded)
+    replace_uris(/http:\/\/t.co\/[a-zA-Z0-9]{1,8}$/i, expanded)
   end
   def replace_uris(old, newt)
     split(URI_REGEX).collect do |s|
@@ -91,7 +91,7 @@ end
 Why are you reading the documentation, you cunt?
 =end
 class Tit
-  VERSION = [2, 0, 4]
+  VERSION = [2, 1, 0]
   
   RCFILE = File.join(ENV["HOME"], ".titrc")
   RTFILE = File.join(ENV["HOME"], ".titrt")
@@ -136,7 +136,7 @@ class Tit
         YAML.dump(request_token.params, rt)
       end
       File.open(RCFILE, "w") do |rc|
-        YAML.dump({count: 10}, rc)
+        YAML.dump({:count => 10}, rc)
       end
       tuts "Please visit '#{request_token.authorize_url}'."
       tuts "When you finish, provide your pin with `tit --pin PIN'"
@@ -171,6 +171,7 @@ class Tit
   end
 
   def get_tits(action, payload)
+    # Build the API Endpoint
     api_endpoint = URLS[action]
     if(action == :user_timeline and not payload.nil?)
       api_endpoint.concat("?screen_name=".concat(payload['user'])).concat("&count=#{@prefs[:count]}")
@@ -178,30 +179,53 @@ class Tit
       api_endpoint.concat("?count=#{@prefs[:count]}")
     end
     api_endpoint.concat("&include_entities=true")
+    
     coder = HTMLEntities.new
-    #puts @access_token.get(api_endpoint).body
-    Nokogiri.XML(@access_token.get(api_endpoint).body).xpath("//status").map do |xml|
-      {
-        :username => xml.at_xpath("./user/name").content,
-        :userid => xml.at_xpath("./user/screen_name").content,
-        :text => xml.xpath("./text").map do |n|
-          txt = coder.decode(n.content)
-          if not xml.xpath("./entities/urls").nil?
-            xml.xpath("./entities/urls/url").map do |url| 
-              txt.replace_with_expanded_url! (url.xpath("./expanded_url").map { |expurl| expurl.content })
+    
+    # Parse XML
+    xmlbody = @access_token.get(api_endpoint).body
+    # Errors
+    Nokogiri.XML(xmlbody).xpath("//errors").map do |xml|
+      if xml.at_xpath("./error").content == "This application is not allowed to access or delete your direct messages"
+        abort("Your OAuth key is not authorized for direct messaging.\nDelete #{TITAT} and run tit without arguments to reauthorize.")
+      end
+    end
+    # no errors - get tits
+    if action != :direct_messages
+      Nokogiri.XML(xmlbody).xpath("//status").map do |xml|
+        {
+          :username => xml.at_xpath("./user/name").content,
+          :userid => xml.at_xpath("./user/screen_name").content,
+          :text => xml.xpath("./text").map do |n|
+            txt = coder.decode(n.content)
+            if not xml.xpath("./entities/urls").nil?
+              xml.xpath("./entities/urls/url").map do |url| 
+                txt.replace_with_expanded_url!(url.xpath("./expanded_url").map { |expurl| expurl.content })
+              end
+            end
+            txt
+          end,
+          :timestamp => Time.parse(xml.at_xpath("./created_at").content),
+          :id => xml.at_xpath("./id").content.to_i,
+          :geo => xml.at_xpath("./geo").instance_eval do
+            unless children.empty?
+              n, e = children[1].content.split.map { |s| s.to_f }
+              "#{n.abs}#{n >= 0 ? 'N' : 'S'} #{e.abs}#{e >= 0 ? 'E' : 'W'}"
             end
           end
-          txt
-        end,
-        :timestamp => Time.parse(xml.at_xpath("./created_at").content),
-        :id => xml.at_xpath("./id").content.to_i,
-        :geo => xml.at_xpath("./geo").instance_eval do
-          unless children.empty?
-            n, e = children[1].content.split.map { |s| s.to_f }
-            "#{n.abs}#{n >= 0 ? 'N' : 'S'} #{e.abs}#{e >= 0 ? 'E' : 'W'}"
-          end
-        end
-      }
+        }
+      end
+    else
+      # get the dms
+      Nokogiri.XML(xmlbody).xpath("//direct_message").map do |xml|
+        {
+          :username => xml.at_xpath("./sender/name").content,
+          :userid => xml.at_xpath("./sender_screen_name").content,
+          :text => xml.xpath("./text").map {|n| coder.decode(n.content)},
+          :timestamp => Time.parse(xml.at_xpath("./created_at").content),
+          :id => xml.at_xpath("./id").content.to_i,
+        }
+      end
     end
   end
 
@@ -231,7 +255,14 @@ class Tit
       exit(-1)
     end
     
-    @access_token.post(URLS[:new_direct_message], payload)
+    response = @access_token.post(URLS[:new_direct_message], payload)
+    
+    # Check the response for errors
+    Nokogiri.XML(response).xpath("//hash").map do |xml|
+        if not xml.at_xpath("./error").content.eql?("")
+          abort("you cannot send a dm to someone who doesn't follow you")
+        end
+    end
   end
 
   def show_tit(status)

data/tit.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tit}
-  s.version = "2.0.4"
+  s.version = "2.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Leif Walsh", "Parker Moore"]

metadata

@@ -2,7 +2,7 @@
 name: tit
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.0.4
+  version: 2.1.0
 platform: ruby
 authors: 
 - Leif Walsh