satellite 0.3.0 → 0.3.1

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/satellite/adapters/google_analytics.rb

@@ -5,7 +5,7 @@ module Satellite
       attr_accessor :debug, :user_agent, :accept_language
 
       def initialize(params, use_ssl=false)
-        self.utm_params = extend_with_default_params(params)
+        @utm_params = extend_with_default_params(params)
         self.utm_location = (use_ssl ? 'https://ssl' : 'http://www') + UTM_GIF_LOCATION
       end
 
@@ -14,47 +14,50 @@ module Satellite
 
         #if (debug == true)
           puts "--------sending request to GA-----------------------"
-          puts utm_params.inspect
+          puts @utm_params.inspect
           puts utm_url
         #end
 
         # actually send request
-        open(utm_url, { "User-Agent" => 'Satellite/0.2.1', "Accept-Language" => utm_params[:utmul] || 'de' })
+        open(utm_url, { "User-Agent" => 'Satellite/0.2.1', "Accept-Language" => self[:utmul] || 'de' })
 
-        # reset events / custom variables here
-        utm_params.delete(:utme)
+        # reset events / custom variables here so they won't be reused in later requests
+        self[:utme] = Utme.new
         true
       end
 
       def tracking_url
-        utm_location + "?" + utm_params.to_query
+        utm_location + "?" + @utm_params.to_query
       end
 
       def track_event(category, action, label=nil, value=nil)
-        utm_params[:utme].set_event(category, action, label, value)
+        self[:utme] = Utme.new if self[:utme].nil?
+        self[:utme].set_event(category, action, label, value)
         track
       end
 
       def track_page_view(path=nil)
-        self.utm_params = self.utm_params.merge({ :utmp => path }) if path
+        self[:utmp] = path if path
         track
       end
 
       def set_custom_variable(index, name, value, scope=nil)
-        utm_params[:utme].set_custom_variable(index, name, value, scope)
+        self[:utme] = Utme.new if self[:utme].nil?
+        self[:utme].set_custom_variable(index, name, value, scope)
       end
 
       def unset_custom_variable(index)
-        utm_params[:utme].unset_custom_variable(index)
+        self[:utme] = Utme.new if self[:utme].nil?
+        self[:utme].unset_custom_variable(index)
       end
 
       def []=(key, value)
         value = Utme.parse(value) if key.to_s == 'utme'
-        utm_params[key] = value
+        @utm_params[key] = value
       end
 
       def [](key)
-        utm_params[key]
+        @utm_params[key]
       end
 
       class << self
@@ -63,7 +66,7 @@ module Satellite
 
       protected
 
-      attr_accessor :utm_params, :utm_location
+      attr_accessor :utm_location
 
       private
 

data/satellite.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{satellite}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Maik Vlcek}]
-  s.date = %q{2011-08-25}
+  s.date = %q{2011-08-26}
   s.description = %q{Ruby on Rails server-side Analytics Tracker for Google and more}
   s.email = %q{maik.vlcek@mymobai.de}
   s.extra_rdoc_files = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: satellite
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Maik Vlcek
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-25 00:00:00 Z
+date: 2011-08-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement