admob 1.1.0 → 1.1.1

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.1.1 / 2009-01-06
+* Added ability to override default cookie domain in AdMob::set_cookie()
+* Added ability to specify cookie path in AdMob::set_cookie()
+
 === 1.1.0 / 2008-10-05
 * Added support for AdMob cookies (see README.TXT)
 

data/README.txt

@@ -20,7 +20,8 @@ Enables easy integration of AdMob services (ads and/or analytics) into a RoR mob
       c.timeout = 1
       c.encoding = 'UTF-8'
       c.raise_exceptions = false
-      c.cookie_domain = 'example.com'
+      c.cookie_domain = 'example.com' # you can override this setting in AdMob::set_cookie()
+      c.cookie_path = '/' # you can override this setting in AdMob::set_cookie()
     end
 * In a view, where you want an ad, place an ad request.
 * Note: You must provide your publisher_id and/or analytics_id in the default setting, or when you make the ad request (see below).

data/lib/admob.rb

@@ -8,10 +8,10 @@ $:.unshift(File.dirname(__FILE__)) unless $:.include?(File.dirname(__FILE__)) ||
 # This module encapsulates functionality (ad requests, analytics requests) provided by AdMob. See README.txt for usage.
 module AdMob
   
-  GEM_VERSION = '1.1.0'
+  GEM_VERSION = '1.1.1'
 
   ENDPOINT = URI.parse('http://r.admob.com/ad_source.php')
-  PUBCODE_VERSION = '20081105-RUBY-70e4a867449121c5'
+  PUBCODE_VERSION = '20090106-RUBY-8708a7ab5f2b70b6'
   DEFAULT_TIMEOUT = 1.0
 
   # Make an AdMob ad/analytics request. The first param is the request variable from Rails; the second is a unique session
@@ -41,6 +41,14 @@ module AdMob
   def self.request(request, session_id, params = {})
     raise_exceptions = params[:raise_exceptions].nil? ? AdMob::Defaults.raise_exceptions : params[:raise_exceptions]
     
+    if raise_exceptions and !params[:cookie_domain].nil?
+      raise AdMob::Error.new("Cannot set cookie_domain in AdMob::request(), set the cookie_domain in the call to AdMob::set_cookie()")
+    end
+    
+    if raise_exceptions and !params[:cookie_path].nil?
+      raise AdMob::Error.new("Cannot set cookie_path in AdMob::request(), set the cookie_path in the call to AdMob::set_cookie()")
+    end
+    
     # Build the post request
     post_data = self.build_post_data(request, session_id, params)
     if post_data.nil?
@@ -86,6 +94,9 @@ module AdMob
   end
 
   # This function should be called from an ActionController to set a cookie on behalf of AdMob.
+  # If you need to override the default cookie domain or cookie path, pass these as optional parameters to AdMob::set_cookie(). 
+  #   AdMob::set_cookie(request, cookies, :cookie_domain => 'example.com', :cookie_path => '/videos')
+  # You can NOT pass cookie_domain or cookie_path as optional parameters to AdMob::request()
   # AdMob recommends using a before_filter in your ActionController::Base class (usually in app/controllers/application.rb) to call set_cookie on each request.
   # Here is a sample application.rb.
   #   require 'admob'
@@ -99,7 +110,7 @@ module AdMob
   #       AdMob::set_cookie(request, cookies)
   #     end
   #   end
-  def self.set_cookie(request, cookies)
+  def self.set_cookie(request, cookies, params = {})
     # don't make a new cookie if one already exists
     return if request.env['admobuu'] or cookies[:admobuu]
     
@@ -107,10 +118,10 @@ module AdMob
     value = MD5.hexdigest(rand().to_s + request.user_agent + request.remote_ip + Time.now.to_f.to_s)
     new_cookie = { :value    => value,
                    :expires  => Time.at(0x7fffffff), # end of 32 bit time
-                   :path     => "/" }
+                   :path     => params[:cookie_path] || AdMob::Defaults.cookie_path || "/" }
     
-    if AdMob::Defaults.cookie_domain
-      domain = AdMob::Defaults.cookie_domain
+    domain = params[:cookie_domain] || AdMob::Defaults.cookie_domain
+    if domain
       domain = '.' + domain if domain[0].chr != '.'
       new_cookie[:domain] = domain
     end
@@ -121,7 +132,7 @@ module AdMob
   end
   
   # Provides access to AdMob config, used for setting default request info.
-  # Currently, can be used to set defaults for: publisher_id, analytics_id, ad encoding, request timeout, cookie_domain,
+  # Currently, can be used to set defaults for: publisher_id, analytics_id, ad encoding, request timeout, cookie_domain, cookie_path
   # and whether exceptions are raised when something goes wrong.
   # For example, in environment.rb:
   #  require 'admob'
@@ -131,7 +142,8 @@ module AdMob
   #    c.encoding = 'SJIS'
   #    c.timeout = 3
   #    c.raise_exceptions = true
-  #    c.cookie_domain = 'example.com'
+  #    c.cookie_domain = 'example.com' # this can also be passed to AdMob::set_cookie() but not AdMob::request()
+  #    c.cookie_path = '/' # this can also be passed to AdMob::set_cookie() but not AdMob:request()
   #  end
   def self.config
     yield AdMob::Defaults
@@ -148,7 +160,7 @@ private
   # Stores default values for AdMob requests. Set these defaults via AdMob::config.
   class Defaults
     class << self
-      attr_accessor :publisher_id, :analytics_id, :encoding, :timeout, :raise_exceptions, :cookie_domain
+      attr_accessor :publisher_id, :analytics_id, :encoding, :timeout, :raise_exceptions, :cookie_domain, :cookie_path
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: admob
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors: 
 - AdMobAdMob
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-05 00:00:00 -08:00
+date: 2009-01-06 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency