satellite 0.1.1 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/lib/satellite/adapters/google_analytics.rb

@@ -2,20 +2,24 @@ module Satellite
   module Adapters
     class GoogleAnalytics
 
+      attr_accessor :debug, :user_agent, :accept_language
+
       def initialize(params, use_ssl=false)
         self.utm_params = extend_with_default_params(params)
         self.utm_location = (use_ssl ? 'https://ssl' : 'http://www') + UTM_GIF_LOCATION
       end
 
       def track
-        #puts utm_params.inspect
-
         utm_url = tracking_url
 
-        puts "--------sending request to GA-----------------------"
-        puts utm_url
+        #if (debug == true)
+          puts "--------sending request to GA-----------------------"
+          puts utm_params.inspect
+          puts utm_url
+        #end
 
-        open(utm_url, { "User-Agent" => 'Satellite/0.0.0', "Accept-Language" => 'de' })
+        # actually send request
+        open(utm_url, { "User-Agent" => 'Satellite/0.1.1', "Accept-Language" => utm_params[:utmul] || 'de' })
 
         # reset events / custom variables here
         utm_params.delete(:utme)
@@ -125,13 +129,13 @@ module Satellite
 
         @@regex_event = /5\((\w+)\*(\w+)(\*(\w+))?\)(\((\d+)\))?/
         @@regex_custom_variables = /8\(([^\)]*)\)9\(([^\)]*)\)(11\(([^\)]*)\))?/
-        @@regex_custom_variable_value = /((\d)!)?(\w+)/
+        @@regex_custom_variable_value = /((\d)!)?([^\(\*]+)/
 
         def parse(args)
           return self.new if args.nil?
           case args
             when String
-              return self.from_string(args)
+              return self.from_string(args.dup)
             when self
               return args
             else

data/lib/support/object.rb

@@ -2,10 +2,6 @@ unless Object.const_defined?("ActiveSupport")
   class Object
     def to_query(key)
       require 'cgi' unless defined?(CGI) && defined?(CGI::escape)
-
-      puts self.inspect
-      puts to_param
-
       "#{CGI.escape(key.to_s).gsub(/%(5B|5D)/n) { [$1].pack('H*') }}=#{CGI.escape(to_param.to_s)}"
     end
 

data/satellite.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{satellite}
-  s.version = "0.1.1"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Maik Vlcek}]

data/test/helper.rb

@@ -15,7 +15,7 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'satellite'
 
 # used for storing private data like google account_id
-require 'local_conf' if File.exists?('local_conf.rb')
+require 'local_conf' if File.exists?(File.dirname(__FILE__) + '/local_conf.rb')
 
 class Test::Unit::TestCase
 end

data/test/test_satellite.rb

@@ -49,10 +49,21 @@ class TestSatellite < Test::Unit::TestCase
           #:utmhid => '1655425535', auto
           :utmr => 'test.local/properly track a page view',
           :utmp => '/test/properly-track-page-view',
-          :utmac => GOOGLE_ACCOUNT_ID
+          #:utmac => nil, #set via 'Satellite::Adapters::GoogleAnalytics.account_id' in local_conf.rb
       })
-      
+
       assert_equal tracker.track_page_view, true
     end
+
+    context 'utme' do
+
+      should "properly parse given utme string" do
+        utme_string = '5(controller*action*coupon_redeem)(10)8(test*test2)9(Please_track_this*Tracking with whitepsace)11(1)'
+
+        utme = Satellite::Adapters::GoogleAnalytics::Utme.parse(utme_string)
+
+        assert_equal utme.to_s, utme_string
+      end
+    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: satellite
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Maik Vlcek