ffcrm_cloudfuji 0.2.2 → 0.2.3

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

@@ -7,18 +7,18 @@
       regexp = new RegExp('new_event_rule', 'g')
       $('ul#event_rules').append(content.replace(regexp, new_id))
       # Setup event autocomplete for new field
-      this.cloudfuji_event_autocomplete('input#event_rules_'+new_id+'_cloudfuji_event')
+      this.cloudfuji_event_autocomplete("input#event_rules_#{new_id}_cloudfuji_event")
 
     remove_fields: (button) ->
       container = $(button).closest('li.event_rule')
       index = container.data('index')
       # If rule has no id, just remove
-      if $("#event_rules_"+index+"_id").length == 0
+      if $("#event_rules_#{index}_id").length == 0
         container.remove()
       else
         # If rule has an id, mark container as hidden and add _destroy field
         container.hide()
-        container.append($('<input type="text" name="event_rules['+index+'][_destroy]" value="yes">'))
+        container.append($("<input type='text' name='event_rules[#{index}][_destroy]' value='yes'>"))
 
     cloudfuji_event_autocomplete: (selector = 'input.cloudfuji_event') ->
       $(selector).autocomplete({source: observed_cloudfuji_events, minLength: 0})
@@ -29,8 +29,8 @@
     show_field_group: (select, group_name, key) ->
       # Hide all fields, then show the selected field group
       container = $(select).closest('li.event_rule')
-      container.find('.'+group_name+'_fields').hide()
-      container.find('.'+group_name+'_'+key).show()
+      container.find(".#{group_name}_fields").hide()
+      container.find(".#{group_name}_#{key}").show()
 
   $(document).ready ->
     event_rules = new EventRules()

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

@@ -42,8 +42,11 @@ module FatFreeCRM
             return result if result
           end
 
-          lead   = Lead.find_by_ido_id(data['customer_ido_id'])
-          lead ||= Lead.find_by_email(data['email'])
+          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']

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

@@ -79,8 +79,11 @@ module FatFreeCRM
           end
 
           puts "No pre-existing records found, creating a lead"
-          lead   = Lead.find_by_ido_id(data['customer_ido_id'])
-          lead ||= Lead.find_by_email(recipient)
+          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

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

@@ -7,8 +7,12 @@ module FatFreeCRM
           data  = params['data']
           email = data['email'] || data['recipient']
           # Look up Lead by ido_id, fall back to email address
-          lead = Lead.find_by_ido_id(data['customer_ido_id'])
-          if lead ||= Lead.find_by_email(email)
+          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
             event_name = "#{params['category']}_#{params['event']}"
 
             EventRule.find_all_by_event_category_and_cloudfuji_event('cloudfuji_event_received', event_name).each do |rule|
@@ -16,7 +20,7 @@ module FatFreeCRM
             end
           end
         end
-        
+
       end
     end
   end

data/lib/ffcrm_cloudfuji/version.rb

@@ -1,5 +1,5 @@
 module FatFreeCRM
   module Cloudfuji
-    VERSION = '0.2.2'
+    VERSION = '0.2.3'
   end
 end

metadata

@@ -1,82 +1,103 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ffcrm_cloudfuji
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.2.3
   prerelease: 
-  version: 0.2.2
 platform: ruby
-authors: 
+authors:
 - Sean Grove
 - Nathan Broadbent
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-05-25 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-05-28 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "2.6"
+      - !ruby/object:Gem::Version
+        version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.6'
+- !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: combustion
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: cloudfuji
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.0.42
   type: :runtime
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.42
+- !ruby/object:Gem::Dependency
   name: authlogic_cloudfuji
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "0.9"
+      - !ruby/object:Gem::Version
+        version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *id005
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
 description: Integrates Fat Free CRM with the Cloudfuji hosting platform.
 email: s@cloudfuji.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .travis.yml
 - Gemfile
@@ -132,36 +153,32 @@ files:
 - uninstall.rb
 homepage: http://cloudfuji.com
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: -827916366021811991
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -3963537201467931072
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: -827916366021811991
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: -3963537201467931072
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Fat Free CRM - Cloudfuji Integration
 test_files: []
-