google-voice 0.2.1 → 0.2.3

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.3

data/lib/google/voice/sms.rb

@@ -1,8 +1,6 @@
 # coding: UTF-8
 require File.join(File.expand_path(File.dirname(__FILE__)), 'base')
 
-GOOGLE_VOICE_SMS_TYPE = 11
-
 module Google
   module Voice      
     class Sms < Base    
@@ -20,40 +18,27 @@ module Google
       def recent
         @curb.url = "https://www.google.com/voice/inbox/recent/"        
         @curb.http_get
-        sms = []
         doc = Nokogiri::XML::Document.parse(@curb.body_str)
         data = doc.xpath('/response/json').first.text
         html = Nokogiri::HTML::DocumentFragment.parse(doc.to_html)
         json = JSON.parse(data)        
         # Format for messages is [id, {attributes}]
-        json['messages'].each do |message|
-          if message[1]['type'].to_i != GOOGLE_VOICE_SMS_TYPE
-            next
-          else
-            messages = []            
-            html.css('div.gc-message-sms-row').each do |row|
-              if row.css('span.gc-message-sms-from').inner_html.strip! =~ /Me:/
-                next
-              elsif row.css('span.gc-message-sms-time').inner_html =~ Regexp.new(txt_obj.display_start_time)
-                messages << {
-                  :to => 'Me',
-                  :from => row.css('span.gc-message-sms-from').inner_html.strip!.gsub!(':', ''),
-                  :text => row.css('span.gc-message-sms-text').inner_html,
-                  :time => row.css('span.gc-message-sms-time').inner_html
-                }
-              end
-            end
-            # Google is using milliseconds since epoch for time
-            sms << {
-              :id => message[0],
-              :phone_number => message[1]['phoneNumber'],
-              :start_time => Time.at(message[1]['startTime'].to_i / 1000),
-              :messages => messages} 
+        json['messages'].map do |conversation|
+          next unless conversation[1]['labels'].include? "sms"
+          html.css("##{conversation[0]} div.gc-message-sms-row").map do |row|
+            next if row.css('span.gc-message-sms-from').inner_html.strip! =~ /Me:/
+            text = row.css('span.gc-message-sms-text').inner_html
+            time = row.css('span.gc-message-sms-time').inner_html
+            from = conversation[1]['phoneNumber']
+            {
+              :id => Digest::SHA1.hexdigest(conversation[0]+text+from),
+              :text => text,
+              :time => time,
+              :from => from
+            }
           end
-        end      
-        sms
+        end.flatten.compact
       end      
-      
     end
   end
-end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Jeff Rafter
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-01 00:00:00 -07:00
+date: 2010-04-02 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency