pollter_geist 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05f056b84468423bb3113a3bc2e844e3c3dabb7e
-  data.tar.gz: 78cc138e11dd795c7cc106c81eff536c98117175
+  metadata.gz: 03fbdbda08f63a1cf041006fc4ae9c31447e078f
+  data.tar.gz: c8b3ba475deffa7328ae24ac6702115793210aa1
 SHA512:
-  metadata.gz: 8c08c5c6b54cd65e0ab5ebff4013fae453f2cccfdb2552091475744cdc421e6f16764c7b5583784f3b5d5758116f6c2779c764783e28dac6804878cf93f7219d
-  data.tar.gz: a1184580b5972401a0e31e18a31015dd1a56c04bc38b250bd0369195963ea5486ce4443ca4c53f1c272cd21d98fabdd273eda21723a57c6341e91feb450836ff
+  metadata.gz: ebf69e6c55a0724232051b3295d60284ed078d4d7f18ae62c25da94bfecf3e4a76d4461afbaec0730bd2536aac3eb6ccf16c4729ae1b3714c54efbba79d953ed
+  data.tar.gz: c21efcbc291ac43e2e074481950e1c4a0378bb3c2dafc610df451d0b968814e1b0916f7383bc42a260c2e2f61b5d59ffc5ca9e322b5bceea25c0c680a54e8ceb

data/lib/pollter_geist.rb

@@ -6,3 +6,4 @@ end
 require_relative 'pollter_geist/imap_commands'
 require_relative 'pollter_geist/imap_idler'
 require_relative 'pollter_geist/poller'
+require_relative 'pollter_geist/change_listener'

data/lib/pollter_geist/change_listener.rb

@@ -0,0 +1,38 @@
+module PollterGeist
+  class ChangeListener
+    def initialize
+      @previous = []
+      @current  = []
+      @added    = []
+      @removed  = []
+    end
+
+    def tick current
+      @previous = @current
+      @current  = current
+
+      @added    = @current - @previous
+      @removed  = @previous - @current
+    end
+
+    def added
+      @added
+    end
+
+    def added?
+      !added.empty?
+    end
+
+    def removed?
+      !removed.empty?
+    end
+
+    def changed?
+      added? || removed?
+    end
+
+    def removed
+      @removed
+    end
+  end
+end

data/lib/pollter_geist/imap_commands.rb

@@ -15,13 +15,15 @@ module PollterGeist
     # Issues IDLE command for the imap server, it takes a list of events to listen for and returns once one of
     # events occured or if there was a timeout.
     #
-    # @param events [events] a list of events to listen for, EXPUNGE, RECENT
+    # @param events [events] a list of events to listen for, EXPUNGE, RECENT, EXISTS
     # @param timeout [Numeric] a timeout, if no event has ocoured for this time
     # @return will return an object which responds to #success?, #timeout? and #event
     def wait_for events, timeout = 29*60
       @idler.idle(events, timeout)
     end
 
+    # fetches a list of message UIDs
+    # @return [Array] of message UIDs
     def message_uids
       @logger.debug('fetching uids')
       # Searching for all messages where TO include @ is a workaround, since the imap#status method
@@ -31,11 +33,36 @@ module PollterGeist
       result.map { |r| r.attr['UID'].to_i }
     end
 
+    def remove uid
+      @logger.debug("removing #{uid}")
+      @imap.uid_store uid, "+FLAGS", [:Deleted]
+    end
+
+    def expunge
+      @logger.debug("expunge, remove all messages with Delete flag")
+      @imap.expunge
+    end
+
     def fetch uids
       logger.debug "fetching: #{uids}"
       @imap.uid_fetch(uids, ['RFC822']).map { |r| r.attr['RFC822'] }
     end
 
+    def wait_for_changes timeout = 20*60
+      logger.debug('waiting for changes in inbox')
+      change_set = ChangeListener.new
+      change_set.tick(message_uids)
+      result = wait_for(['RECENT', 'EXPUNGE'], timeout)
+      logger.debug('updating current view')
+      change_set.tick(message_uids)
+      if change_set.changed?
+        logger.debug('changes detected!')
+        yield(change_set)
+      else
+        logger.debug('no changes detected')
+      end
+    end
+
     def logger
       @logger
     end

data/lib/pollter_geist/imap_idler.rb

@@ -1,4 +1,6 @@
 require 'timeout'
+require 'thread'
+
 module PollterGeist
   class ImapIdler
     class IdleResult
@@ -26,21 +28,30 @@ module PollterGeist
     end
 
     def idle listen_for = ['RECENT'], timeout = false
-      begin
-        Timeout::timeout(timeout) do
-          loop do
-            event = do_idle
-            if listen_for.include? event
-              return IdleResult.new(true, event)
-            else
-              logger.debug "nope, we are not listening for #{event}"
+      Thread.handle_interrupt(Timeout::Error => :never, Interrupt => :never) do
+        begin
+          Timeout::timeout(timeout) do
+            loop do
+              event = nil
+              Thread.handle_interrupt(Timeout::Error => :immediate, Interrupt => :on_blocking) {
+                event = do_idle
+              }
+              if listen_for.include? event
+                logger.debug("returning event #{event} to caller")
+                return IdleResult.new(true, event)
+              else
+                logger.debug "nope, we are not listening for #{event}"
+              end
             end
           end
+        rescue Timeout::Error
+          imap.idle_done
+          logger.debug 'idle timed out'
+          return IdleResult.new(false, 'TIMEOUT')
+        rescue Interrupt => e
+          logger.debug 'idle was interrupted'
+          raise e
         end
-      rescue Timeout::Error
-        imap.idle_done
-        logger.debug 'idle timed out'
-        return IdleResult.new(false, 'TIMEOUT')
       end
     end
 
@@ -54,12 +65,15 @@ module PollterGeist
     end
 
     def do_idle
-      event = ''
+      @events ||= Queue.new
+      until @events.empty?
+        return @events.pop
+      end
       imap.idle do |message|
         case message
           when Net::IMAP::UntaggedResponse
             logger.debug "event: #{message.name}, data: #{message.data}"
-            event = message.name
+            @events.push(message.name)
             imap.idle_done
           when Net::IMAP::ContinuationRequest
             logger.debug 'IDLE accepted by the server'
@@ -67,7 +81,8 @@ module PollterGeist
             logger.warn "Unhandled IDLE response: #{message.class}, #{message.inspect}"
         end
       end
-      event
+      logger.debug 'returning from idle'
+      @events.pop
     end
   end
 end

data/lib/pollter_geist/version.rb

@@ -1,3 +1,3 @@
 module PollterGeist
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/pollter_geist.gemspec

@@ -18,6 +18,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.add_dependency('mail')
+  spec.add_dependency('virtus')
+
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "minitest", "~> 5.0.6"
   spec.add_development_dependency "rake"

data/test/unit/pollter_geist/change_listener_test.rb

@@ -0,0 +1,46 @@
+require 'test_helper'
+
+describe PollterGeist::ChangeListener do
+  describe '#new' do
+    it 'should allow empty' do
+      PollterGeist::ChangeListener.new
+    end
+  end
+
+  describe '#added' do
+    it 'should show added messages' do
+      cl = PollterGeist::ChangeListener.new
+      cl.added.must_be_kind_of Array
+      cl.added.must_be_empty
+
+      cl.tick([1, 2, 3])
+      cl.added.wont_be_empty
+      cl.added.must_include 1
+      cl.added.must_include 2
+      cl.added.must_include 3
+      cl.tick([1, 4])
+      cl.added.size.must_equal 1
+      cl.tick([])
+      cl.added.must_be_empty
+    end
+  end
+
+  describe '#removed' do
+    it 'should show removed messages' do
+      cl = PollterGeist::ChangeListener.new
+      cl.removed.must_be_kind_of Array
+      cl.removed.must_be_empty
+
+      cl.tick([1, 2, 3])
+      cl.removed.must_be_empty
+      cl.tick([1, 4])
+      cl.removed.size.must_equal 2
+      cl.removed.must_include 2
+      cl.removed.must_include 3
+      cl.tick([])
+      cl.removed.wont_be_empty
+      cl.tick([])
+      cl.removed.must_be_empty
+    end
+  end
+end

data/test/unit/pollter_geist/poller_test.rb

@@ -3,10 +3,36 @@ require 'test_helper'
 describe PollterGeist::Poller do
   describe '#session' do
     it 'should create a session' do
-      poller = PollterGeist::Poller.new(CONFIG)
+      poller  = PollterGeist::Poller.new(CONFIG)
+      changer = PollterGeist::ChangeListener.new
       poller.session do |imap|
         imap.select_mailbox('INBOX')
-        imap.wait_for('RECENT', 1)
+        uids = imap.message_uids
+        changer.tick(uids)
+        changer.tick(uids)
+
+
+=begin
+        1.times do
+          imap.wait_for('RECENT', 1)
+          changer.tick(imap.message_uids)
+          imap.logger.debug("+#{changer.added} -#{changer.removed}")
+          if changer.added?
+            puts imap.fetch(changer.added)
+          end
+        end
+=end
+
+
+        loop do
+          begin
+            imap.wait_for_changes(10 * 60) do |changes|
+              imap.logger.debug(changes)
+            end
+          rescue Interrupt => e
+            break
+          end
+        end
       end
     end
   end

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: pollter_geist
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - kwando
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-23 00:00:00.000000000 Z
+date: 2013-07-24 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: mail
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: virtus
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -65,12 +93,14 @@ files:
 - README.md
 - Rakefile
 - lib/pollter_geist.rb
+- lib/pollter_geist/change_listener.rb
 - lib/pollter_geist/imap_commands.rb
 - lib/pollter_geist/imap_idler.rb
 - lib/pollter_geist/poller.rb
 - lib/pollter_geist/version.rb
 - pollter_geist.gemspec
 - test/test_helper.rb
+- test/unit/pollter_geist/change_listener_test.rb
 - test/unit/pollter_geist/poller_test.rb
 - test/unit/pollter_geist_test.rb
 homepage: ''
@@ -99,5 +129,6 @@ specification_version: 4
 summary: A small abstraction layer for polling IMAP servers for changes.
 test_files:
 - test/test_helper.rb
+- test/unit/pollter_geist/change_listener_test.rb
 - test/unit/pollter_geist/poller_test.rb
 - test/unit/pollter_geist_test.rb