email_tracker 0.3.0 → 0.4.0

data/README.md

@@ -6,6 +6,12 @@ This engine tracks emails in your Ruby on Rails app.
 
 To use in Rails, simply add this to your Gemfile:
     gem "email_tracker"
+    
+The run the migrations:
+```
+rake email_tracker:install:migrations
+rake rake:db:migrate
+```
 
 The gem should just start running. All emails will have an embedded tracking image and all links will be tracked.
             

data/lib/email_tracker.rb

@@ -4,11 +4,11 @@ require "email_tracker/helpers"
 module EmailTracker
   
   def self.hash_email_address(email)
-    Base64.encode64(email).strip[0...-1]
+    Base64.encode64(email).strip
   end
   
   def self.retrieve_email_address_from_hash(hash)
-    Base64.decode64("#{hash}=")
+    Base64.decode64(hash)
   end
   
 end

data/lib/email_tracker/helpers.rb

@@ -9,13 +9,23 @@ module EmailTracker
     protected
     
       def check_for_email_tracker
-        if params[:et]
-          email_id, email_address_hash = params[:et].split("_")
-          EmailTracker::LinkClick.create({
-            email_id: email_id,
-            email_address_hash: email_address_hash,
-            url: request.fullpath.gsub("et=#{params[:et]}", "")[0...-1]
-          }, as: :email_tracker_internals)
+        
+        begin
+          if params[:et]
+            
+            path_without_tracking = request.fullpath.gsub("et=#{CGI.escape(params[:et])}", "").gsub(/[\&\?]$/, "")
+            
+            email_id, email_address_hash = params[:et].split("_")
+            EmailTracker::LinkClick.create({
+              email_id: email_id,
+              email_address_hash: email_address_hash,
+              url: path_without_tracking
+            }, as: :email_tracker_internals)
+            
+            redirect_to path_without_tracking
+          end
+        rescue
+          logger.info $!
         end
         true
       end

data/lib/email_tracker/version.rb

@@ -1,3 +1,3 @@
 module EmailTracker
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: email_tracker
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-30 00:00:00.000000000 Z
+date: 2013-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70160554639840 !ruby/object:Gem::Requirement
+  requirement: &70333740528680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70160554639840
+  version_requirements: *70333740528680
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70160554639200 !ruby/object:Gem::Requirement
+  requirement: &70333740528180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70160554639200
+  version_requirements: *70333740528180
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70160554638560 !ruby/object:Gem::Requirement
+  requirement: &70333740527540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70160554638560
+  version_requirements: *70333740527540
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
-  requirement: &70160554637900 !ruby/object:Gem::Requirement
+  requirement: &70333740526840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70160554637900
+  version_requirements: *70333740526840
 - !ruby/object:Gem::Dependency
-  name: webrat
-  requirement: &70160554637240 !ruby/object:Gem::Requirement
+  name: capybara
+  requirement: &70333740526400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70160554637240
+  version_requirements: *70333740526400
+- !ruby/object:Gem::Dependency
+  name: capybara-webkit
+  requirement: &70333740525980 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70333740525980
 - !ruby/object:Gem::Dependency
   name: method_profiler
-  requirement: &70160554636580 !ruby/object:Gem::Requirement
+  requirement: &70333740541920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70160554636580
+  version_requirements: *70333740541920
 description: A plugin for Rails apps that tracks email.
 email:
 - jez.walker@gmail.com