acts_as_referred 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 481bcd3da9754aa9e8e3741a62f08201c89f876c
-  data.tar.gz: 4000e1c620372393ebc2faf8fdfe8f3cfee49109
+  metadata.gz: c6bed06a6226dae6e1b9989ec7eb1fce1fb1b8ab
+  data.tar.gz: 6e58e958c011401c0053b43b8ca027b90cce3187
 SHA512:
-  metadata.gz: f16a73eded0bccdaf79addce8b20eae7da5d00782d5b1a61b01f2d79817ac99077f75f856b15e54698245b806833edd351c6eceab63f8166c05af9efe045f97c
-  data.tar.gz: 3d67fa6456dc53472edabea688b39f3df523b9c88f9e89c925b60a40a3902a5ad2c68fb8e847ec32cb542133ad77754d428233035b617e131b4dcb94b4bfa984
+  metadata.gz: e5a13e45ca49b89810f65f546ca848a22979e4025dfe1cd29358c81d3cb12b60c0072f56fd5f32940ddd774b34a04d5f683b5db904269d62db9bdb1f42a5990b
+  data.tar.gz: 6a5e5ce3d6284cc0d5a10c78fc3f22a6d917473b003c765c0d88c5dc35ef4ac8bb2d9515bf438cce56fb3b2e70af30e0362dda7bc18f2872d47d3db2f549cfa7

data/README.rdoc

@@ -1,5 +1,5 @@
 
-{<img src="https://badge.fury.io/rb/acts_as_referred.png" alt="Gem Version" />}[http://badge.fury.io/rb/acts_as_referred]
+{<img src="https://badge.fury.io/rb/acts_as_referred.png" alt="Gem Version" />}[http://badge.fury.io/rb/acts_as_referred] {<img src="https://travis-ci.org/erpe/acts_as_referred.png" />}[https://travis-ci.org/erpe/acts_as_referred] {<img src="https://codeclimate.com/repos/524d89e2f3ea00328a0fbb91/badges/b4046748a27bfa99b07b/gpa.png" />}[https://codeclimate.com/repos/524d89e2f3ea00328a0fbb91/feed]
 
 = ActsAsReferred
 
@@ -15,14 +15,13 @@ The action then makes this data available to your model. When supplied with +act
 
 == Status 
 
-not yet production ready
+staging...
 
 == Install 
 
-at this stage only by github:
-so add to your Gemfile  
+Add to your Gemfile  
 
-  gem 'acts_as_referred', :git => 'git://github.com/erpe/acts_as_referred.git'
+  gem 'acts_as_referred'
 
 afterwards run the rake task to create necessary database table
 

data/lib/acts_as_referred/model.rb

@@ -26,6 +26,12 @@ module ActsAsReferred
       # campaign-based request
       scope :campaigns, -> { where('is_campaign=?', true) }
 
+      # tags as used by google or piwik in campaign-tracking
+      TAGS = {  
+                campaign: %w{ pk_campaign utm_campaign gclid },
+                keyword: %w{ pk_kwd utm_term}
+              }
+
       # returns referrer as instance of URI
       def origin_uri
         has_referrer? ? URI.parse(origin) : nil
@@ -70,70 +76,34 @@ module ActsAsReferred
 
       def process_request
         if self.request_query
-          if self.request_query.match(/utm_campaign/) || self.request_query.match(/utm_term/)
-            return process_google_tagged(self.request_query)
-          end
-          if self.request_query.match(/pk_campaign/) || self.request_query.match(/pk_kwd/)
-            return process_piwik_tagged(self.request_query)
-          end
-          if self.request_query.match(/gclid/)
-            return process_google_auto_tagged(self.request_query)
+          TAGS.values.flatten.each do |word| 
+            if self.request_query.match(word)
+              return process_tagged
+            end
           end
         end
       end
 
-      
+
       # a.t.m. only care about campaign name and keywords
-      def process_google_tagged(string)
-        hash = Hash[* string.split('&').collect { |i| i.split('=') }.flatten]
+      def process_tagged
+        hash = Hash[*(self.request_query.split('&').collect { |i| i.split('=') }.flatten)]
         retval = nil
-        hash.keys.each do |key|
-          case key
-          #when 'utm_source'
-          #  source = hash[key]
-          when 'utm_campaign'
-            self.campaign = hash[key]
-            retval = true
-          #when 'utm_medium'
-          #  medium = hash[key]
-          when 'utm_term'
-            self.keywords = hash[key]
+
+        TAGS[:campaign].each do |t|
+          if hash[t]
+            self.campaign = hash[t] if self.campaign.nil? || self.campaign.empty?
             retval = true
           end
         end
-        retval
-      end
-      
-      # standard piwik campaign-tracking
-      def process_piwik_tagged(string)
-        hash = Hash[*(string.split('&').collect { |i| i.split('=') }.flatten)]
-        retval = nil
-        hash.keys.each do |key|
-          case key
-          when 'pk_campaign'
-            self.campaign = hash[key]
-            retval = true
-          when 'pk_kwd'
-            self.keywords = hash[key]
-            retval = true
+        TAGS[:keyword].each do |k|
+          if hash[k]
+            self.keywords = hash[k] if self.keywords.nil? || self.keywords.empty?
+            retval = true 
           end
         end
         retval
       end
-
-      # adwords set to autotagging
-      # no chance to get campaign info by url
-      # would have to do cookie parsing - what would suck
-      def process_google_auto_tagged(string)
-        hash = Hash[* string.split('|').collect { |i| i.split('=') }.flatten]
-        retval = nil
-        if hash['gclid']
-          self.campaign = "Adwords - autotagged: #{hash['gclid']}"
-          self.is_campaign = true
-          retval = true
-        end
-        retval
-      end
       
       def process_origin
         self.origin_host = URI.parse(origin).host

data/lib/acts_as_referred/version.rb

@@ -1,3 +1,3 @@
 module ActsAsReferred
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/test/acts_as_referred_test.rb

@@ -34,7 +34,7 @@ class ActsAsReferredTest < ActiveSupport::TestCase
   end
 
   test 'test_a_booking_query' do
-    assert_equal 'pk_campaign=Explosives&pk_term=dynamite', prepare_booking(piwik_params).referee.request_query
+    assert_equal 'pk_campaign=Explosives&pk_kwd=dynamite', prepare_booking(piwik_params).referee.request_query
   end
 
   test 'test_a_order_with_no_referrer_should_return_nil' do
@@ -60,7 +60,7 @@ class ActsAsReferredTest < ActiveSupport::TestCase
 
   def no_referer_params
     { 
-      request: "http://domain.com/foo?pk_campaign=Explosives&pk_term=dynamite"
+      request: "http://domain.com/foo?pk_campaign=Explosives&pk_kwd=dynamite"
     }
 
   end
@@ -75,7 +75,7 @@ class ActsAsReferredTest < ActiveSupport::TestCase
   def piwik_params
     { 
       referrer: 'http://www.nsa.gov/about/values/index.shtml?attr=terror&reason=politics',
-      request: "http://domain.com/foo?pk_campaign=Explosives&pk_term=dynamite"
+      request: "http://domain.com/foo?pk_campaign=Explosives&pk_kwd=dynamite"
     }
   end
 

data/test/dummy/log/development.log

@@ -2690,3 +2690,6 @@ Migrating to CreateReferee (20131002113238)
   SQL (0.3ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20131002113238"]]
    (172.0ms)  commit transaction
   ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  Referee Load (0.3ms)  SELECT "referees".* FROM "referees" ORDER BY "referees"."id" ASC LIMIT 1