replyr 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6c41bcadd8c68ea3ea35081427e8c5a8efe6a86
-  data.tar.gz: 3d92a5ba1279b30887d2e9c1aebc90b1be5b127b
+  metadata.gz: f87aae31a3317413213744f8bd2f0696d919298b
+  data.tar.gz: f87f27905023ca6456df8517cc220587ebf0044a
 SHA512:
-  metadata.gz: 8c1bff8dbcdadcd1795f10cda3ef8443af24c25a1a9c76eb53d09941cc6319be2f2f86e83c71050e44ff041ce295f3a3a61768d08cfb2c2359b3d90b03c7556e
-  data.tar.gz: c6c4c8a0bbc73da85bf3a6569083c580878992571833bf4916fffdf729792a492ac74087e3a63c2ccfc166b90646774cb9aa5b3939e1479647b7f2ddc5b2f1ea
+  metadata.gz: 64322ae65ccf1db378b2aa814a7e47ca5d68ca03f7c260595a0e1c19871ad314aaad0558dd816f435af5254fb8dd718aed130cb632657dc7e498d0d2a2550e21
+  data.tar.gz: 1de09c12bb51d5003b1cad581a75c37bc9faa884bd31a230da7929c69ed84a56d87dd023a1ee928fd26eec14bf8c788fd6ef9fa92d81da6becacecb2922b09d2

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## v0.0.4
+
+- Monkeypatch mailman, because of invalid dependency (listen gem)
+- Fix bug concerning decoding body of a message
+
 ## v0.0.3
 
 Fix outdated mailman dependency (gem listen, "< 2.0.0")

data/lib/mailman_monkey_patch.rb

@@ -0,0 +1,152 @@
+require 'rbconfig'
+
+module Mailman
+  IS_WINDOWS = (RbConfig::CONFIG['target_os'] =~ /mswin|mingw|cygwin/i)
+
+  # The main application class. Pass a block to {#new} to create a new app.
+  class Application
+
+    def self.run(config=nil, &block)
+      if config
+        app = new(config, &block)
+      else
+        app = new(&block)
+      end
+      app.run
+      app
+    end
+
+    # @return [Router] the app's router
+    attr_reader :router
+
+    # @return [MessageProcessor] the app's message processor
+    attr_reader :processor
+
+    # @return [Config] the apps's configuration
+    attr_reader :config
+
+    # Creates a new router, and sets up any routes passed in the block.
+    # @param [Hash] options the application options
+    # @option options [true,false] :graceful_death catch interrupt signal and don't die until end of poll
+    # @param [Proc] block a block with routes
+
+    def initialize(config=:default, &block)
+      @router = Mailman::Router.new
+      @config = select_config(config)
+      @processor = MessageProcessor.new(:router => @router, :config => @config)
+
+      if self.config.maildir
+        require 'maildir'
+        @maildir = Maildir.new(self.config.maildir)
+      end
+
+      instance_eval(&block) if block_given?
+    end
+
+    def polling?
+      config.poll_interval > 0 && !@polling_interrupt
+    end
+
+    # Sets the block to run if no routes match a message.
+    def default(&block)
+      @router.default_block = block
+    end
+
+    # Runs the application.
+    def run
+      Mailman.logger.info "Mailman v#{Mailman::VERSION} started"
+
+      if config.rails_root
+        rails_env = File.join(config.rails_root, 'config', 'environment.rb')
+        if File.exist?(rails_env) && !(defined?(Rails) && Rails.env)
+          Mailman.logger.info "Rails root found in #{config.rails_root}, requiring environment..."
+          require rails_env
+        end
+      end
+
+      if config.graceful_death
+        # When user presses CTRL-C, finish processing current message before exiting
+        Signal.trap("INT") { @polling_interrupt = true }
+      end
+
+      # STDIN
+      if !IS_WINDOWS && !config.ignore_stdin && $stdin.fcntl(Fcntl::F_GETFL, 0) == 0
+        Mailman.logger.debug "Processing message from STDIN."
+        @processor.process($stdin.read)
+
+      # IMAP
+      elsif config.imap
+        options = {:processor => @processor}.merge(config.imap)
+        Mailman.logger.info "IMAP receiver enabled (#{options[:username]}@#{options[:server]})."
+        polling_loop Receiver::IMAP.new(options)
+
+      # POP3
+      elsif config.pop3
+        options = {:processor => @processor}.merge(config.pop3)
+        Mailman.logger.info "POP3 receiver enabled (#{options[:username]}@#{options[:server]})."
+        polling_loop Receiver::POP3.new(options)
+
+      # Maildir
+      elsif config.maildir
+
+        Mailman.logger.info "Maildir receiver enabled (#{config.maildir})."
+
+        Mailman.logger.debug "Processing new message queue..."
+        @maildir.list(:new).each do |message|
+          @processor.process_maildir_message(message)
+        end
+
+        if config.watch_maildir
+          require 'listen'
+          Mailman.logger.debug "Monitoring the Maildir for new messages..."
+          base = Pathname.new(@maildir.path)
+
+          callback = Proc.new do |modified, added, removed|
+            added.each do |new_file|
+              message = Maildir::Message.new(@maildir, Pathname.new(new_file).relative_path_from(base).to_s)
+              @processor.process_maildir_message(message)
+            end
+          end
+
+          @listener = Listen::Listener.new(File.join(@maildir.path, 'new'), &callback)
+          @listener.start
+          sleep
+        end
+      end
+    end
+
+    private
+
+    def select_config(new_config)
+      return Mailman.config if new_config == :default
+      return new_config if new_config.is_a?(Configuration)
+      return Configuration.from_hash(new_config) if new_config.is_a?(Hash)
+      return Configuration.new
+    end
+
+    # Run the polling loop for the email inbox connection
+    def polling_loop(connection)
+      if polling?
+        polling_msg = "Polling enabled. Checking every #{config.poll_interval} seconds."
+      else
+        polling_msg = "Polling disabled. Checking for messages once."
+      end
+      Mailman.logger.info(polling_msg)
+
+      loop do
+        begin
+          connection.connect
+          connection.get_messages
+        rescue SystemCallError => e
+          Mailman.logger.error e.message
+        ensure
+          connection.disconnect
+        end
+
+        break unless polling?
+        sleep config.poll_interval
+      end
+    end
+
+  end
+end

data/lib/replyr/reply_email.rb

@@ -6,7 +6,7 @@ module Replyr
       self.to = mail.to.first
       self.from = mail.from.first
       self.subject = mail.subject
-      self.body = mail.decoded # Returns the decoded text from the mail in UTF-8 format
+      self.body = mail.multipart? ? mail.text_part.decoded : mail.decoded
 
       # Extract Attachments and store as StringIO in attached_files
       # can later be processed by e.g. carrierwave

data/lib/replyr/version.rb

@@ -1,3 +1,3 @@
 module Replyr
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/replyr.rb

@@ -6,6 +6,9 @@ require "replyr/reply_address"
 require "replyr/handle_reply"
 require 'replyr/engine'
 
+# Monkey Patch broken listen dependency in mailman v0.7.0
+require 'mailman_monkey_patch' if Mailman::VERSION == "0.7.0"
+
 module Replyr
   class << self
     attr_accessor :config, :logger