PerfectlyNormal-Twitorious 0.2.7 → 0.2.8

data/TODO

@@ -13,5 +13,4 @@
 * Let the app run in a loop where it constantly prompts for new tweets
   * Make more of a CLI
     * Update the timeline and get text-tweets in the app
-* Add a user-agent string
 * Open profile pages if there's a username in the tweet

data/lib/twitorious.rb

@@ -1,7 +1,40 @@
 module Twitorious
-  VERSION = '0.2.7'
+  VERSION = '0.2.8'
   
   class TooLongUpdate < StandardError; end
+
+  # Shamelessly stolen from Rails and stripped of its localization-code.
+  # Hard-coded strings in english!
+  def self.time_ago_in_words(from, to, include_seconds = false, options = {})
+    from_time           = Time.mktime(from.year, from.month, from.day, from.hour, from.min, from.sec)
+    to_time             = Time.mktime(to.year, to.month, to.day, to.hour, to.min, to.sec)
+    distance_in_minutes = (((to_time - from_time).abs)/60).round
+    distance_in_seconds = ((to_time  - from_time).abs).round
+
+    case distance_in_minutes
+    when 0..1
+      return distance_in_minutes == 0 ? "less than a minute ago" : "#{distance_in_minutes} minutes ago" unless include_seconds
+
+      case distance_in_seconds
+      when 0..4   then "less than five seconds ago"
+      when 5..9   then "less than ten seconds ago"
+      when 10..19 then "less than twenty seconds ago"
+      when 20..39 then "half a minute ago"
+      when 40..59 then "less than a minute ago"
+      else             "one minute ago"
+      end
+
+    when 2..44           then "#{distance_in_minutes} minutes ago"
+    when 45..89          then "about one hour ago"
+    when 90..1439        then "about #{(distance_in_minutes.to_f / 60.0).round} hours ago"
+    when 1440..2879      then "about a day ago"
+    when 2880..43199     then "#{(distance_in_minutes / 1440).round} days ago"
+    when 43200..86399    then "about a month ago"
+    when 86400..525599   then "about #{(distance_in_minutes / 43200).round} months ago"
+    when 525600..1051199 then "about a year ago"
+    else                      "#{(distance_in_minutes / 525600).round} years ago"
+    end
+  end
 end
 
 require 'twitorious/config'

data/lib/twitorious/api/twitter.rb

@@ -14,29 +14,32 @@ module Twitorious
       
       def update(status)
       	puts "Updating #{@site[:name]}"
-      	req = Net::HTTP::Post.new(@site[:url].path + "/statuses/update.json")
+      	req = Net::HTTP::Post.new(@site[:url].path + "/statuses/update.json", { "User-Agent" => "Twitorious/#{Twitorious::VERSION}"})
       	req.basic_auth @site[:user], @site[:pass]
       	req.set_form_data({'status' => status}, ';')
       	res = Net::HTTP.new(@site[:url].host, @site[:url].port).start { |http| http.request(req) }
       end
       
       def fetch_timeline
+        puts "Fetching timeline from #{@site[:name]}"
         res = nil
         Net::HTTP.start(@site[:url].host, @site[:url].port) do |http|
           path  = @site[:url].path + "/statuses/friends_timeline.json"
           path += "?count=200&since_id=#{@site[:since_id]}" if @site[:since_id]
-          req = Net::HTTP::Get.new(path)
+          req = Net::HTTP::Get.new(path, { "User-Agent" => "Twitorious/#{Twitorious::VERSION}"})
           req.basic_auth @site[:user], @site[:pass]
           res = http.request(req)
         end
 
         updates = JSON.parse(res.body)
+        puts "  No updates" if updates.empty?
         return if updates.empty?
 
+        puts "  Got #{updates.size} update#{"s" if updates.size > 1}"
         updates.reverse.each do |update|
           image    = Twitorious::Image.from_url(update["user"]["profile_image_url"], @config.image_store)
           filename = image ? image.filename : @site[:icon] 
-          @notifier.notify(update["user"]["screen_name"], update["text"], filename)
+          @notifier.notify(update["user"]["screen_name"], update["text"], update["created_at"], filename)
           sleep @config.sleep_between_notifications.to_i
         end
 

data/lib/twitorious/image.rb

@@ -1,5 +1,6 @@
 require 'uri'
 require 'net/http'
+require 'net/https'
 require 'digest/md5'
 
 module Twitorious
@@ -19,10 +20,10 @@ module Twitorious
       return Image.new(file) if File.exists?(file)
       
       site = URI.parse(url)
-      res  = Net::HTTP.start(site.host, site.port) do |http|
-        http.get(site.path)
-      end
-      puts res.class
+      http = Net::HTTP.new(site.host, site.port)
+      http.use_ssl = (site.scheme == 'https')
+      req  = Net::HTTP::Get.new(site.path, { "User-Agent" => "Twitorious/#{Twitorious::VERSION}"})
+      res  = http.request(req)
       
       return nil unless res.class == Net::HTTPOK
       File.mkdirs(path) if !File.exists?(path)

data/lib/twitorious/notifier.rb

@@ -8,11 +8,14 @@ module Twitorious
       @meow   = Meow.new("Twitorious")
     end
     
-    def notify(sender, message, icon = nil)
+    def notify(sender, message, created, icon = nil)
+      created = DateTime.parse(created)
+      now     = DateTime.parse(Time.now.to_s).new_offset(created.offset)
+      time_ago = Twitorious.time_ago_in_words(created, now, true)
       opts = {}
       opts[:icon] = icon if icon
       
-      @meow.notify("Update from #{sender}", message, opts) do
+      @meow.notify("#{sender} (#{time_ago})", message, opts) do
         urls = URI.extract(message, ['http', 'https'])
         urls.each do |url|
           %x{open #{url}}

data/lib/twitorious/timeline.rb

@@ -5,6 +5,7 @@ module Twitorious
     end
     
     def fetch_timeline
+      puts "Starting update at #{Time.now.to_s}"
       @config.sites.each do |site|
         case site[:api]
           when "Twitter": 

data/twitorious.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name         = "Twitorious"
-  s.version      = "0.2.7"
-	s.date         = "2009-03-26"
+  s.version      = "0.2.8"
+	s.date         = "2009-04-01"
   s.author       = "Per Christian B. Viken"
   s.email        = "perchr@northblue.org"
   s.homepage     = "http://eastblue.org/projects/twitorious/"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: PerfectlyNormal-Twitorious
 version: !ruby/object:Gem::Version 
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors: 
 - Per Christian B. Viken
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-26 00:00:00 -07:00
+date: 2009-04-01 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency