ffcrm_cloudfuji 0.3.1 → 0.4.1

data/app/assets/javascripts/event_rules.js.coffee

@@ -35,7 +35,7 @@
   $(document).ready ->
     event_rules = new EventRules()
     # Initialize autocomplete for events
-    event_rules.cloudfuji_event_autocomplete()
+    event_rules.cloudfuji_event_autocomplete() if observed_cloudfuji_events?
 
     $("button.add_event_rule").live "click", ->
       event_rules.add_fields this, $(this).data("content")

data/app/assets/stylesheets/ffcrm_cloudfuji.css

@@ -1,3 +1,4 @@
 /*
  *= require event_rules
+ *= require unknown_emails
  */

data/app/assets/stylesheets/unknown_emails.css.scss

@@ -0,0 +1,10 @@
+table.unknown_emails {
+	border-collapse: collapse;
+	width: 100%;
+	th { text-align: left; }
+  td {
+		border: 1px solid #ccc;
+		padding: 3px;
+  }
+}
+

data/app/controllers/unknown_emails_controller.rb

@@ -0,0 +1,65 @@
+class UnknownEmailsController < ApplicationController
+  before_filter :set_current_tab
+
+  def index
+    # Fetch all emails that don't belong to an
+    # entity, and aren't in the 'ignored_emails' table.
+    sql = %Q{SELECT * from emails 
+      WHERE mediator_id IS NULL 
+      AND NOT EXISTS (
+        SELECT DISTINCT(email) FROM ignored_emails 
+        WHERE email = emails.sent_from 
+        OR email = emails.sent_to)} 
+    @unknown_emails = Email.paginate_by_sql(sql, :page => params[:page])
+    
+    respond_with @unknown_emails
+  end
+
+  # Delete email and ignore all emails from this address
+  def ignore
+    @email = Email.find(params[:id])
+    unless address = params[:email]
+      if @email.direction == 'received'
+        address = @email.sent_from
+      elsif @email.direction == 'sent'
+        address = @email.sent_to
+      end
+    end
+
+    if address.present? 
+      IgnoredEmail.create :email => address
+      @email.destroy
+      flash[:notice] = "All emails from #{address} will be ignored."
+    else
+      flash[:error] = "Could not determine whether this email was sent or received!"
+    end
+    redirect_to unknown_emails_path
+  end
+
+  # Create lead and attach this email to new lead
+  def convert
+    address = params[:email]
+
+    if address.present?
+      # Attach all orphaned emails that are from / to address
+      @emails = Email.all(:conditions => [%Q{
+        mediator_id IS NULL
+        AND (emails.sent_from LIKE ?
+          OR emails.sent_to LIKE ?)
+      }, "%#{address}%", "%#{address}%"])
+
+      lead = Lead.create :email      => address,
+                         :first_name => address.split("@").first,
+                         :last_name  => address.split("@").last,
+                         :user       => current_user,
+                         :emails     => @emails
+
+      link_to_lead = ActionController::Base.helpers.link_to(lead_url(lead), lead_url(lead))
+      flash[:notice] = "Created lead and attached email(s): #{link_to_lead}".html_safe
+    else
+      flash[:error] = "Must provide :email param!"
+    end
+    redirect_to unknown_emails_path
+
+  end
+end

data/app/helpers/unknown_emails_helper.rb

@@ -0,0 +1,2 @@
+module UnknownEmailsHelper
+end

data/app/models/event_rule.rb

@@ -24,7 +24,7 @@ class EventRule < ActiveRecord::Base
     # Don't apply this rule more than limit_per_lead, if set
     unless limit_per_lead.present? && count.count > limit_per_lead
       # If :match is present, only apply the rule if data matches string
-      if match.blank? || (params['data'] && event_matches?(params))
+      if match.blank? || event_matches?(params)
         if (app_id.blank? && page_name.blank?) || page_and_app_matches?(params)
           # Run the action method if defined
           if respond_to?(action)
@@ -57,7 +57,7 @@ class EventRule < ActiveRecord::Base
       when 'cloudfuji_event_received'
         "Cloudfuji event was received - '#{cloudfuji_event}'"
       when 'lead_attribute_changed'
-        "Lead \"#{lead.full_name}\" was updated - #{lead_attribute} was changed from '#{match_data[0]}' to '#{match_data[1]}'."
+        "Lead \"#{lead.full_name}\" was updated - #{lead_attribute} was changed from '#{match_data['old_value']}' to '#{match_data['new_value']}'."
       end
 
       User.all.each do |user|
@@ -109,7 +109,7 @@ class EventRule < ActiveRecord::Base
       match_string.downcase! if case_insensitive_matching
       match_string.include?(test_string)
     when 'lead_attribute_changed'
-      match_string = params[1].to_s.dup
+      match_string = params['new_value'].to_s.dup
       match_string.downcase! if case_insensitive_matching
       match_string == test_string.to_s
     end

data/app/models/ignored_email.rb

@@ -0,0 +1,2 @@
+class IgnoredEmail < ActiveRecord::Base
+end

data/app/observers/cloudfuji_lead_observer.rb

@@ -21,7 +21,8 @@ class CloudfujiLeadObserver < ActiveRecord::Observer
   def after_update(lead)
     # Find all event rules where the lead attribute is one of the changed fields
     EventRule.find_all_by_event_category_and_lead_attribute('lead_attribute_changed', lead.changes.keys).each do |rule|
-      rule.process(lead, lead.changes[rule.lead_attribute])  # Send [old, new] values as matching data
+      old, new = lead.changes[rule.lead_attribute]
+      rule.process(lead, {'old_value' => old, 'new_value' => new})  # Send [old, new] values as matching data
     end
   end
 end

data/app/views/unknown_emails/_unknown_email.html.haml

@@ -0,0 +1,14 @@
+%tr.highlight[unknown_email]
+  - addresses = (unknown_email.direction == 'received' ? unknown_email.sent_from : unknown_email.sent_to).split(";")
+  %td= unknown_email.direction.to_s.capitalize
+  %td= unknown_email.sent_from
+  %td= unknown_email.sent_to
+  %td= truncate(unknown_email.subject, :length => 150)
+  %td= truncate(unknown_email.body, :length => 150)
+  %td
+    - addresses.each do |address|
+      = address
+      %p      
+        = link_to "Convert to Lead?", convert_unknown_email_path(unknown_email, :email => address), :method => :put
+        or
+        = link_to "Ignore?", ignore_unknown_email_path(unknown_email, :email => address), :method => :delete

data/app/views/unknown_emails/index.html.haml

@@ -0,0 +1,22 @@
+= styles_for :unknown_emails
+
+.title
+  %span#unknown_emails_title Unknown Emails
+
+.list
+  - if @unknown_emails.any?
+    %table.unknown_emails
+      %thead
+        %tr
+          %th Direction
+          %th From
+          %th To
+          %th Subject
+          %th Body
+          %th Actions
+      %tbody#unknown_emails
+        = render :partial => 'unknown_email', :collection => @unknown_emails
+  - else
+    Could not find any emails for unknown leads.
+
+#paginate= render "shared/paginate"

data/app/views/unknown_emails/index.js.rjs

@@ -0,0 +1,6 @@
+if @unknown_emails.any?
+  page[:unknown_emails].replace_html render(:partial => "unknown_email", :collection => @unknown_emails)
+else
+  page[:unknown_emails].replace_html render(:text => "Could not find any emails for unknown leads.")
+end
+page[:paginate].replace_html render(:partial => "shared/paginate")

data/config/routes.rb

@@ -20,4 +20,11 @@ Rails.application.routes.draw do
       post :update, :on => :collection
     end
   end
+
+  resources :unknown_emails, :only => :index do
+    member do
+      delete :ignore
+      put    :convert
+    end
+  end
 end

data/db/migrate/20120612140812_create_ignored_emails.rb

@@ -0,0 +1,7 @@
+class CreateIgnoredEmails < ActiveRecord::Migration
+  def change
+    create_table :ignored_emails do |t|
+			t.string :email
+		end
+	end
+end

data/db/migrate/20120612200812_add_extra_email_fields.rb

@@ -0,0 +1,6 @@
+class AddExtraEmailFields < ActiveRecord::Migration
+  def change
+    add_column :emails, :direction, :string
+		add_column :emails, :imap_folder, :string
+	end
+end

data/lib/fat_free_crm/cloudfuji.rb

@@ -4,6 +4,7 @@ module FatFreeCRM
       def enable_cloudfuji!
         load_observers!
         extend_lead!
+				extend_email!
         # Prevent User class from loading if database is empty
         if (User.table_exists? rescue false)
           extend_user!
@@ -44,6 +45,24 @@ module FatFreeCRM
         end
       end
 
+			def extend_email!
+				Email.class_eval do
+					# Sent or received
+					def direction
+						attr_direction = super
+						return attr_direction if attr_direction.present? 
+						
+						# If direction not stored, try to deduce
+						# from from/to email addresses.
+						if sent_from.include?(user.email)
+							'sent'
+						elsif sent_to.include?(user.email)
+							'received'
+						end
+					end
+				end
+			end
+
       def load_observers!
         require File.expand_path("../cloudfuji/event_observers/base", __FILE__)
         Dir[File.expand_path("../cloudfuji/event_observers/*.rb", __FILE__)].each { |file| require file }

data/lib/fat_free_crm/cloudfuji/event_observers/email_observer.rb

@@ -1,3 +1,5 @@
+require 'fat_free_crm/mail_processor/base'
+
 module FatFreeCRM
   module Cloudfuji
     module EventObservers
@@ -57,6 +59,31 @@ module FatFreeCRM
           note_email_activity("#{email} subscribed to a mailing list")
         end
 
+        def email_received
+          user = find_user_by_account
+          return unless user
+          lead = Lead.find_by_email(data['from'])
+          create_email_from_data(
+            :direction => 'received',
+            :mediator  => lead,
+            :user      => user
+          )
+        end
+
+        def email_sent
+          user = find_user_by_account
+          return unless user
+          # Find first Lead from 'to' email addresses
+          lead = data['to'].to_s.split(";").detect do |email|
+            lead = Lead.find_by_email(email)
+          end
+          create_email_from_data(
+            :direction => 'sent',
+            :mediator  => lead,
+            :user      => user
+          )
+        end
+
         private
 
         def note_email_activity(message)
@@ -86,6 +113,32 @@ module FatFreeCRM
           campaign
         end
 
+        def find_user_by_account
+          user = User.find_by_email(data['account'])
+          puts "No User found by email #{data['account']}" unless user
+          user
+        end
+
+        def create_email_from_data(options)
+          mail = Mail.new(data['rfc822'])
+          text_body = FatFreeCRM::MailProcessor::Base.new.send(:plain_text_body, mail)
+           
+          # Remove ID hashes from emails (e.g. ...+23423fce32d@...)
+          # This is important so that addresses like 
+          # reply+****@reply.github.com can be ignored.
+          to_address = data['to'].gsub(/\+[^@]+/, '')
+          from_address = data['from'].gsub(/\+[^@]+/, '')
+
+          Email.create({
+            :imap_message_id => data['uid'],
+            :sent_from       => from_address,
+            :sent_to         => to_address,
+            :cc              => data['cc'],
+            :subject         => data['subject'],
+            :body            => text_body,
+            :sent_at         => data['date']
+          }.merge(options))
+        end
       end
     end
   end

data/lib/ffcrm_cloudfuji/engine.rb

@@ -13,9 +13,16 @@ module FatFreeCRM
         begin
           unless FatFreeCRM::Tabs.admin.any? {|t| t[:text] == "Event Rules" }
             FatFreeCRM::Tabs.admin << {
-            :text => "Event Rules",
-            :url => { :controller => "admin/event_rules" }
-          }
+              :text => "Event Rules",
+              :url => { :controller => "admin/event_rules" }
+            }
+          end
+
+          unless FatFreeCRM::Tabs.main.any? {|t| t[:text] == "Unknown Emails" }
+            FatFreeCRM::Tabs.main << {
+              :text => "Unknown Emails",
+              :url => { :controller => "unknown_emails" }
+            }
           end
         rescue TypeError
           puts "You must migrate your settings table."

data/lib/ffcrm_cloudfuji/version.rb

@@ -1,5 +1,5 @@
 module FatFreeCRM
   module Cloudfuji
-    VERSION = '0.3.1'
+    VERSION = '0.4.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ffcrm_cloudfuji
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-07 00:00:00.000000000 Z
+date: 2012-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
@@ -108,9 +108,13 @@ files:
 - app/assets/javascripts/ffcrm_cloudfuji.js
 - app/assets/stylesheets/event_rules.css.scss
 - app/assets/stylesheets/ffcrm_cloudfuji.css
+- app/assets/stylesheets/unknown_emails.css.scss
 - app/controllers/admin/event_rules_controller.rb
+- app/controllers/unknown_emails_controller.rb
 - app/helpers/admin/event_rules_helper.rb
+- app/helpers/unknown_emails_helper.rb
 - app/models/event_rule.rb
+- app/models/ignored_email.rb
 - app/models/lead_event_rule_count.rb
 - app/observers/cloudfuji_lead_observer.rb
 - app/views/admin/event_rules/_errors.html.haml
@@ -119,6 +123,9 @@ files:
 - app/views/leads/_lead.html.haml
 - app/views/leads/_sidebar_show_lead_scoring.html.haml
 - app/views/leads/_top_section_ido_id.html.haml
+- app/views/unknown_emails/_unknown_email.html.haml
+- app/views/unknown_emails/index.html.haml
+- app/views/unknown_emails/index.js.rjs
 - config.ru
 - config/database.yml
 - config/initializers/cloudfuji.rb
@@ -130,6 +137,8 @@ files:
 - db/migrate/20120524031157_extend_lead_scoring_as_event_rules.rb
 - db/migrate/20120525151511_add_ido_id_to_lead.rb
 - db/migrate/20120607115701_add_mailing_list_and_page_fields_to_event_rules.rb
+- db/migrate/20120612140812_create_ignored_emails.rb
+- db/migrate/20120612200812_add_extra_email_fields.rb
 - ffcrm_cloudfuji.gemspec
 - install.rb
 - lib/fat_free_crm/cloudfuji.rb
@@ -169,7 +178,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1944626669401206856
+      hash: 2361827458429134483
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -178,7 +187,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1944626669401206856
+      hash: 2361827458429134483
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24