neufelry-twitter-sms 0.3.2 → 0.4.0

data/VERSION.yml

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

data/lib/twitter-sms.rb

@@ -4,6 +4,7 @@ require 'tlsmail'
 require 'optparse'
 require 'cgi'
 require 'net/pop'
+require 'rmail'
 
 if RUBY_VERSION < "1.9"
   raise "Version too low. Please get Ruby 1.9"
@@ -48,12 +49,6 @@ class TwitterSms
         now         = Time.now
         tweets      = twitter.timeline(:friends, :since => @last_check)
         @last_check = now
-
-        # Block own tweets if specified via settings
-        tweets.reject! {|t| t.user.screen_name == @user['name']} unless @config['own_tweets']
-        # Don't send messages from users under no_follow
-        tweets.reject! {|t| @config['no_follow'].member?(t.user.screen_name) }
-        tweets.reverse # reverse-chronological
       else
         putd "Your account has run out of API calls; call not made."
       end
@@ -62,6 +57,14 @@ class TwitterSms
     end
   end
 
+  def reduce_tweets(tweets)
+    # Block own tweets if specified via settings
+    tweets.reject! {|t| t.user.screen_name == @user['name']} unless @config['own_tweets']
+    # Don't send messages from users under no_follow
+    tweets.reject! {|t| @config['no_follow'].member?(t.user.screen_name) }
+    tweets.reverse # reverse-chronological
+  end
+
   # Email via Gmail SMTP any tweets to the desired cell phone
   def send(tweets)
     putd "Sending received tweets..."
@@ -83,6 +86,15 @@ class TwitterSms
     end
   end
 
+  def receive_messages
+    Net::POP3.enable_ssl(OpenSSL::SSL::VERIFY_NONE) # maybe verify...
+    Net::POP3.start('pop.gmail.com',995, @bot['email'], @bot['password']) do |pop|
+      pop.each_mail do |mail|
+        process_pop_message(mail.pop)
+      end
+    end
+  end
+
   private
 
   # Put Debug (prepend time) if debug printouts turned on
@@ -90,17 +102,39 @@ class TwitterSms
     puts "#{Time.now.strftime("(%b %d - %H:%M:%S)")} #{message}" if @config['debug']
   end
 
-  def collect_pop_messages
-    Net::POP3.enable_ssl(OpenSSL::SSL::VERIFY_NONE) # maybe verify...
-    Net::POP3.start('pop.gmail.com',995, @bot['email'], @bot['password']) do |pop|
-      pop.each_mail do |mail|
-        process_pop_message(mail)
+  # Verify syntax for dissecting pop message
+  def process_pop_message(msg)
+    TwitterSms::space_stripper!(msg) # Remove sometimes broken extra spaces
+    r_msg = RMail::Parser.read(msg)
+
+    #must be extracted before we reduce to plaintext
+    from = r_msg.header.from[0].address
+
+    plain = reduce_to_plaintext(r_msg)
+    body = plain.body
+
+    if from == @user['phone'] # must come from phone
+    # Extract this log later
+      if body =~ /^off\w*/i
+        @config['active'] = false
+      elsif body =~ /^on\w*/i
+        @config['active'] = true
+      else
+        body.scan(/ignore (\w+)/) {|_| @config['no_follow'] << $1 }
+        body.scan(/follow (\w+)/) {|_| @config['no_follow'] -= [$1] } # also set follow
       end
     end
   end
 
-  def process_pop_message(msg)
-    p mail.inspect
+  # Sometimes Rmail messages are multipart, we only want plaintext
+  def reduce_to_plaintext(r_msg)
+    if r_msg.multipart?
+      r_msg = r_msg.body.find do |part|
+        part.header.content_type == "text/plain"
+      end
+    else
+      r_msg
+    end
   end
 
   # Parse and store a config file (either as an initial load or as
@@ -172,6 +206,7 @@ class TwitterSms
     opts.parse!(args)
   end
 
+  # Config is stale if a newer version exists in the filesystem than last checked
   def config_stale?
     return File.mtime(@config_file['name']) > @config_file['modified_at']
   end
@@ -185,9 +220,12 @@ class TwitterSms
     "#{tweet.user.screen_name}: #{CGI.escapeHTML(tweet.text)}"
   end
 
-end
+  def self.filename(path)
+    path.split('/')[-1]
+  end
 
-def filename(path)
-  path.split('/')[-1]
+  # RMail doesn't like parsing body properly if there is a mistaken ' ' between body and header
+  def self.space_stripper!(msg)
+    msg.gsub!(/^\s+$/,'')
+  end
 end
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: neufelry-twitter-sms
 version: !ruby/object:Gem::Version 
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors: 
 - Ryan Neufeld