ffcrm_cloudfuji 0.2.5 → 0.2.6

data/app/views/leads/_top_section_ido_id.html.haml

@@ -0,0 +1,4 @@
+%tr
+  %td
+    .label Ido ID:
+    = f.text_field :ido_id

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

@@ -2,11 +2,12 @@ module FatFreeCRM
   module Cloudfuji
     module EventObservers
       class AppObserver < ::Cloudfuji::EventObserver
+        include FatFreeCRM::Cloudfuji::EventObservers::Base
+
         def app_claimed
           # Be verbose in development environment
           debug = Rails.env == 'development'
 
-          data = params['data']
           ido_id = data.try(:[], 'ido_id')
 
           if user = User.find(:first, :conditions => ["email = ? OR ido_id = ?", data['email'], data['ido_id']])

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

@@ -0,0 +1,65 @@
+module FatFreeCRM
+  module Cloudfuji
+    module EventObservers
+      module Base
+        # Shared methods for observers
+
+        def find_lead_by_data
+          # Look up Lead by ido_id or email address.
+          lead = Lead.find_by_ido_id(data['customer_ido_id']) if data['customer_ido_id'].present?
+          lead ||= Lead.find_by_email(email)
+          update_ido_id_if_blank(lead)
+          lead
+        end
+
+
+        def find_or_create_activity_subject!
+          models = [Lead, Contact, Account]
+          models.each do |model|
+            has_ido_id = model.new.respond_to?(:ido_id)
+
+            if data['customer_ido_id'].present? && has_ido_id
+              asset = model.find_by_ido_id(data['customer_ido_id'])
+              return asset if asset
+            end
+
+            if asset = model.find_by_email(email)
+              update_ido_id_if_blank(asset) if has_ido_id
+              return asset if asset
+            end
+          end
+
+          puts "No pre-existing records found, creating a lead"
+          lead = Lead.create!(
+                  :email      => email,
+                  :ido_id     => data['customer_ido_id'],
+                  :first_name => email.split("@").first,
+                  :last_name  => email.split("@").last,
+                  :user       => User.first)
+          lead
+        end
+
+
+        private
+
+        def update_ido_id_if_blank(asset)
+          # If lead was found by email and has blank ido_id,
+          # but customer_ido_id is present, then update ido_id
+          if asset && asset.respond_to?(:ido_id) &&
+             asset.ido_id.blank? && data['customer_ido_id'].present?
+            asset.update_attribute :ido_id, data['customer_ido_id']
+          end
+        end
+
+        def data
+          params['data']
+        end
+
+        def email
+          data['email'] || data['recipient']
+        end
+
+      end
+    end
+  end
+end

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

@@ -2,6 +2,8 @@ module FatFreeCRM
   module Cloudfuji
     module EventObservers
       class CustomerObserver < ::Cloudfuji::EventObserver
+        include FatFreeCRM::Cloudfuji::EventObservers::Base
+
         # "customer_created"
         # :account_balance => 0
         # :object          => "customer"
@@ -30,34 +32,6 @@ module FatFreeCRM
           subject.versions.create! :event => message
         end
 
-        def data
-          params['data']
-        end
-
-        def find_or_create_activity_subject!
-          lookups = [Account, Lead, Contact]
-          lookups.each do |model|
-            puts "#{model}.find_by_email( #{data['email']} )" if @debug
-            result = model.find_by_email(data['email'])
-            return result if result
-          end
-
-          lead = if data['customer_ido_id'].present?
-            Lead.find_by_ido_id(data['customer_ido_id'])
-          else
-            Lead.find_by_email(data['email'])
-          end
-          lead ||= Lead.new
-
-          lead.email      = data['email']
-          lead.ido_id     = data['customer_ido_id']
-          lead.first_name = data['first_name'] || data['email'].split("@").first if lead.first_name.blank?
-          lead.last_name  = data['last_name']  || data['email'].split("@").last  if lead.last_name.blank?
-          lead.user       ||= User.first
-          lead.save!
-
-          lead
-        end
       end
     end
   end

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

@@ -2,7 +2,7 @@ module FatFreeCRM
   module Cloudfuji
     module EventObservers
       class EmailObserver < ::Cloudfuji::EventObserver
-        # NOTE: It'd be nice to have a before_filter.
+        include FatFreeCRM::Cloudfuji::EventObservers::Base
 
         # "email_delivered"
         # :message_headers  => "[[\"Received\", \"by luna.mailgun.net with SMTP mgrt 7313261; Tue, 20 Mar 2012 19:00:58 +0000\"], [\"Received\", \"from localhost.localdomain (ec2-23-20-14-40.compute-1.amazonaws.com [23.20.14.40]) by mxa.mailgun.org with ESMTP id 4f68d3e9.4ddcdf0-luna; Tue, 20 Mar 2012 19:00:57 -0000 (UTC)\"], [\"Date\", \"Tue, 20 Mar 2012 19:00:57 +0000\"], [\"From\", \"Sean Grove <sean@cloudfuji.com>\"], [\"Reply-To\", \"Cloudfuji Team <support@cloudfuji.com>\"], [\"Message-Id\", \"<4f68d3e9ad834_3c29377ea432615@ip-10-190-150-17.mail>\"], [\"X-Mailgun-Campaign-Id\", \"cloudfuji_buddies\"], [\"Repy-To\", \"support@cloudfuji.com\"], [\"To\", \"s+cfdemo@cloudfuji.com\"], [\"Subject\", \"Cloudfuji Beta: Thank you for your early support. Here's a gift for you.\"], [\"List-Unsubscribe\", \"<mailto:u+na6wcn3gmqzdszbsmrrdam3ghfstkzrxgbstgn3fgvtdgzjumvrgmyzgmm6tqnlkgetheplteuzeey3gmrsw23zfgqyge5ltnbus4zdpez2d2jjsietgipjrmi4a@email.cloudfuji.com>\"], [\"X-Mailgun-Sid\", \"WyI2NWQ4MSIsICJzK2NmZGVtb0BidXNoaS5kbyIsICIxYjgiXQ==\"], [\"Sender\", \"sean=cloudfuji.com@cloudfuji.com\"]]"
@@ -66,42 +66,6 @@ module FatFreeCRM
           subject.versions.create! :event => message
         end
 
-        def data
-          params['data']
-        end
-
-        def find_or_create_activity_subject!
-          lookups = [Account, Lead, Contact]
-          lookups.each do |model|
-            puts "#{model}.find_by_email( #{recipient} )"
-            result = model.find_by_email(recipient)
-            return result if result
-          end
-
-          puts "No pre-existing records found, creating a lead"
-          lead = if data['customer_ido_id'].present?
-            Lead.find_by_ido_id(data['customer_ido_id'])
-          else
-            Lead.find_by_email(recipient)
-          end
-          lead ||= Lead.new
-
-          lead.email      = recipient
-          lead.ido_id     = data['customer_ido_id']
-          lead.first_name = recipient.split("@").first if lead.first_name.blank?
-          lead.last_name  = recipient.split("@").last  if lead.last_name.blank?
-          lead.user       ||= User.first
-
-          puts "About to save:"
-          puts lead.inspect
-
-          lead.save!
-
-          puts lead.inspect
-
-          lead
-        end
-
         # Temp workarounds until umi delivers events properly
         # Good example of the necessity of deep-schema enforcement for events
         def headers
@@ -112,10 +76,6 @@ module FatFreeCRM
           end
         end
 
-        def recipient
-          data['recipient']
-        end
-
         def custom_variables
           JSON(data['custom_variables'])
         end

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

@@ -2,6 +2,7 @@ module FatFreeCRM
   module Cloudfuji
     module EventObservers
       class ErrorObserver < ::Cloudfuji::EventObserver
+        include FatFreeCRM::Cloudfuji::EventObservers::Base
         include ActionView::Helpers::TextHelper
 
         def error_caught
@@ -11,8 +12,11 @@ module FatFreeCRM
             lead = Lead.find_by_ido_id(user_attributes['ido_id']) if user_attributes['ido_id'].present?
             lead ||= Lead.find_by_email(user_attributes['email'])
             if lead
+              # Set ido_id if blank
+              user_attributes
+
               occurence = ActiveSupport::Inflector.ordinalize(data['occurrences'])
-              message = "Error occurred in <strong>#{data['app_name']}</strong> [#{data['environment_name']}] (#{occurence} time): "
+              message = "Error experienced in <strong>#{data['app_name']}</strong> [#{data['environment_name']}] (#{occurence} time): "
               message << "<em>" << truncate(data['message'], :length => 75) << "</em>"
               message << "<br />View the error at: #{data['url']}" if data['url']
               lead.versions.create! :event => message
@@ -20,12 +24,6 @@ module FatFreeCRM
           end
         end
 
-        private
-
-        def data
-          params['data']
-        end
-
       end
     end
   end

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

@@ -2,19 +2,12 @@ module FatFreeCRM
   module Cloudfuji
     module EventObservers
       class EventRulesObserver < ::Cloudfuji::EventObserver
+        include FatFreeCRM::Cloudfuji::EventObservers::Base
+
         # Fire for all events
         def catch_all
-          data  = params['data']
-          email = data['email'] || data['recipient']
-          # Look up Lead by ido_id, fall back to email address
-          lead = if data['customer_ido_id'].present?
-            Lead.find_by_ido_id(data['customer_ido_id'])
-          else
-            Lead.find_by_email(email)
-          end
-          if lead
+          if lead = find_lead_by_data
             event_name = "#{params['category']}_#{params['event']}"
-
             EventRule.find_all_by_event_category_and_cloudfuji_event('cloudfuji_event_received', event_name).each do |rule|
               rule.process(lead, params['data'])
             end

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

@@ -2,7 +2,8 @@ module FatFreeCRM
   module Cloudfuji
     module EventObservers
       class PaymentObserver < ::Cloudfuji::EventObserver
-        # NOTE: It'd be nice to have a before_filter.
+        include FatFreeCRM::Cloudfuji::EventObservers::Base
+
       end
     end
   end

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

@@ -2,6 +2,8 @@ module FatFreeCRM
   module Cloudfuji
     module EventObservers
       class UserObserver < ::Cloudfuji::EventObserver
+        include FatFreeCRM::Cloudfuji::EventObservers::Base
+
         def user_added
           data = params['data']
           ido_id = data['ido_id'].to_s

data/lib/fat_free_crm/cloudfuji/view_hooks.rb

@@ -4,7 +4,11 @@ module FatFreeCRM
 
       # Add lead scoring to summary on lead show page
       def show_lead_sidebar_bottom(view, context)
-        view.render(:partial => 'leads/sidebar_show_lead_scoring', :locals => {:lead => context[:lead]})
+        view.render(:partial => 'leads/sidebar_show_lead_scoring', :locals => context)
+      end
+
+      def lead_top_section_bottom(view, context)
+        view.render(:partial => 'leads/top_section_ido_id', :locals => context)
       end
 
     end

data/lib/fat_free_crm/cloudfuji.rb

@@ -42,6 +42,7 @@ module FatFreeCRM
       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 }
       end
 

data/lib/ffcrm_cloudfuji/version.rb

@@ -1,5 +1,5 @@
 module FatFreeCRM
   module Cloudfuji
-    VERSION = '0.2.5'
+    VERSION = '0.2.6'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ffcrm_cloudfuji
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-28 00:00:00.000000000 Z
+date: 2012-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
@@ -118,6 +118,7 @@ files:
 - app/views/admin/event_rules/index.html.haml
 - app/views/leads/_lead.html.haml
 - app/views/leads/_sidebar_show_lead_scoring.html.haml
+- app/views/leads/_top_section_ido_id.html.haml
 - config.ru
 - config/database.yml
 - config/initializers/cloudfuji.rb
@@ -132,6 +133,7 @@ files:
 - install.rb
 - lib/fat_free_crm/cloudfuji.rb
 - lib/fat_free_crm/cloudfuji/event_observers/app_observer.rb
+- lib/fat_free_crm/cloudfuji/event_observers/base.rb
 - lib/fat_free_crm/cloudfuji/event_observers/customer_observer.rb
 - lib/fat_free_crm/cloudfuji/event_observers/email_observer.rb
 - lib/fat_free_crm/cloudfuji/event_observers/error_observer.rb
@@ -166,7 +168,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1362757599666679150
+      hash: 529527583371072573
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -175,7 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1362757599666679150
+      hash: 529527583371072573
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24