muvandy 1.1.1a1 → 1.2a1

data/README.md

@@ -6,7 +6,7 @@ Client for [Muvandy API](http://muvandy.com)
 
 Add this line to your application's Gemfile:
 
-		gem 'muvandy', '~> 1.1a1'
+		gem 'muvandy', '~> 1.1.1a1'
 
 And then execute:
 
@@ -18,12 +18,21 @@ Or install it yourself as:
 
 ## To Configure
 
-Create a file in your config/initializers folder named muvandy_setup.rb (or whichever name you prefer)
+Create a file in your `config/initializers` folder named `muvandy_setup.rb` (or whichever name you prefer)
 
  		Muvandy.configure do |c|
-			c.api_key = '<place your api key here>'
+			c.api_key = 'api_key_here'
 		end
 
+Add `include Muvandy` in your `controllers/application_controller.rb`.
+
+		class ApplicationController < ActionController::Base
+		  include Muvandy
+		
+			...
+		end
+
+
 ## Get Variations
 
 ### Controller
@@ -31,24 +40,12 @@ Create a file in your config/initializers folder named muvandy_setup.rb (or whic
 Example of using muvandy on a controller. 
 
 		class HomeController < ApplicationController
-			include Muvandy
-			before_filter :collect_muvandy_visitor_indfo, :only => [:index]
-			
 			def index
-				@muvandy = Muvandy.new('experiment-id', :visitor_key => request.remote_ip)
+				@muvandy = Muvandy.new('experiment_id', :visitor_key => request.remote_ip)
 			end
 		end
 
-A 'visitor_key' is required. By default, we recommend using the visitor's IP address but if you have other information on them their account id or email address make good unique visitor identifiers.
-
-Setting 'collect_muvandy_visitor_indfo' in your before_filter helps muvandy collect the following information from your 'request' & 'params' variables.
-* referrer
-* utm_term
-* utm_campaign
-* utm_source
-* utm_medium
-* mode
-
+A `visitor_key` is required. By default, we recommend using the visitor's IP address but if you have other information on them their account id or email address make good unique visitor identifiers.
 
 ### Views
 

data/lib/muvandy/muvandy.rb

@@ -36,7 +36,7 @@ module Muvandy
       @variable_variations = {}
       begin
         xml = get(:variable_variations)      
-        Rails.logger.debug { "DEBUG ------------ #{xml.parsed_response.inspect}" }
+        # Rails.logger.debug { "DEBUG ------------ #{xml.parsed_response.inspect}" }
         if xml.parsed_response && !xml.parsed_response["visitor"].blank?
           # self.id  = xml.parsed_response["visitor"]["id"].to_i if !xml.parsed_response["visitor"].blank? && !xml.parsed_response["visitor"]["id"].blank?
           xml.parsed_response["visitor"]["variable_variations"]["variable"].each do |v|
@@ -58,7 +58,7 @@ module Muvandy
       end
       begin
         xml = self.class.get("#{api_prefix}#{query_string}#{extra_params_to_query(add_to_query)}")
-        raise Exception.new(xml.parsed_response["error"]["message"]) if xml.response.code != 200
+        raise Exception.new(xml.parsed_response["error"]["message"]) if xml.response.code != '200'
       rescue Exception => e
         Rails.logger.debug { "Muvandy Gem Error: #{e.message}" }
       end
@@ -72,7 +72,7 @@ module Muvandy
       end
       begin
         xml = self.class.post("#{api_prefix}#{query_string}", :query => query.merge!(:visitor_key => @visitor_key)) # #{extra_params_to_query(add_to_query)}
-        raise Exception.new(xml.parsed_response["error"]["message"]) if xml.response.code != 200
+        raise Exception.new(xml.parsed_response["error"]["message"]) if xml.response.code != '200'
       rescue Exception => e
         Rails.logger.debug { "Muvandy Gem Error: #{e.message}" }
       end

data/lib/muvandy/version.rb

@@ -1,4 +1,4 @@
 require "versionomy"
 module Muvandy
-  VERSION = Versionomy.create(:major => 1, :minor => 1, :tiny => 1, :release_type => :alpha).to_s
+  VERSION = Versionomy.create(:major => 1, :minor => 2, :release_type => :alpha).to_s
 end

data/lib/muvandy.rb

@@ -3,36 +3,36 @@ require "muvandy/version"
 require "muvandy/muvandy"
 
 module Muvandy
-  
-  def self.included(base)
-    base.send(:include, ClassMethods)
-  end
-
-  module ClassMethods
+  def collect_muvandy_visitor_info
+    Muvandy.mode = params[:mode]
     
-    def collect_muvandy_visitor_info
-      Muvandy.mode = params[:mode]
-      Muvandy.utm_term = params[:utm_term]
-      Muvandy.utm_campaign = params[:utm_campaign]
-      Muvandy.utm_source = params[:utm_source]
-      Muvandy.utm_medium = params[:utm_medium]
-
-      Muvandy.referrer = request.referrer
-    end 
-
-  end
- 
-  class << self
+    cookies[:muvandy_utm_term] = params[:utm_term] if cookies[:muvandy_utm_term].blank? || (!params[:utm_term].blank? && cookies[:muvandy_utm_term] != params[:utm_term])
+    Muvandy.utm_term = cookies[:muvandy_utm_term] unless cookies[:muvandy_utm_term].blank?
     
+    cookies[:muvandy_utm_campaign] = params[:utm_campaign] if cookies[:muvandy_utm_campaign].blank? || (!params[:utm_campaign].blank? && cookies[:muvandy_utm_campaign] != params[:utm_campaign])
+    Muvandy.utm_campaign = cookies[:muvandy_utm_campaign] unless cookies[:muvandy_utm_campaign].blank?
+    
+    cookies[:muvandy_utm_source] = params[:utm_source] if cookies[:muvandy_utm_source].blank? || (!params[:utm_source].blank? && cookies[:muvandy_utm_source] != params[:utm_source])
+    Muvandy.utm_source = cookies[:muvandy_utm_source] unless cookies[:muvandy_utm_source].blank?
+    
+    cookies[:muvandy_utm_medium] = params[:utm_medium] if cookies[:muvandy_utm_medium].blank? || (!params[:utm_medium].blank? && cookies[:muvandy_utm_medium] != params[:utm_medium])
+    Muvandy.utm_medium = cookies[:muvandy_utm_medium] unless cookies[:muvandy_utm_medium].blank?
+    
+    cookies[:muvandy_referrer] = request.referrer if cookies[:muvandy_referrer].blank? || (cookies[:muvandy_referrer] != request.referrer)
+    Muvandy.referrer = cookies[:muvandy_referrer] unless cookies[:muvandy_referrer].blank?
+  end  
+ 
+  class << self    
     attr_accessor :api_key, :site
     
     def configure
-      yield self
-          
+      yield self          
       Muvandy.api_key = api_key
       Muvandy.site = (site.nil?) ? 'http://muvandy.com' : site
     end
 
+    def included(base)
+      base.before_filter :collect_muvandy_visitor_info
+    end
   end
-  
 end

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: muvandy
 version: !ruby/object:Gem::Version
-  version: 1.1.1a1
-  prerelease: 5
+  version: 1.2a1
+  prerelease: 3
 platform: ruby
 authors:
 - Aldwin Ibuna
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-25 00:00:00.000000000 Z
+date: 2012-05-08 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &70138247604880 !ruby/object:Gem::Requirement
+  requirement: &70119528830660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '0.8'
   type: :runtime
   prerelease: false
-  version_requirements: *70138247604880
+  version_requirements: *70119528830660
 - !ruby/object:Gem::Dependency
   name: versionomy
-  requirement: &70138247593860 !ruby/object:Gem::Requirement
+  requirement: &70119528827140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: 0.4.3
   type: :runtime
   prerelease: false
-  version_requirements: *70138247593860
+  version_requirements: *70119528827140
 description: Client for Muvandy API
 email:
 - aibuna@gmail.com