rmobio 1.1.21 → 1.1.22

data/lib/rmobio/ads/ad_mobs.rb

@@ -26,7 +26,7 @@ module Rmobio
   module Ads
     module AdMobs
       
-      def getAd(keywords,adClient)
+      def getAd(keywords,adClient,ip=request.remote_ip,url=request.request_uri,useragent=request.user_agent)
         logger.info("Retrieving AdMobs ad")
         admob_params = {:admob_site_id => adClient, # REQUIRED - get from admob.com, value is generally set in rmobio.yml
           :admob_pc => "",       # OPTIONAL - Postal Code, e.g. "90210"
@@ -43,9 +43,9 @@ module Rmobio
         # build url
         admob_post = {} 
         admob_post["s"] = admob_params[:admob_site_id]
-        admob_post["u"] = request.user_agent
-        admob_post["i"] = request.remote_ip
-        admob_post["p"] = request.request_uri
+        admob_post["u"] = useragent if useragent
+        admob_post["i"] = ip if ip
+        admob_post["p"] = url if url
         admob_post["t"] = MD5.hexdigest(session.session_id)
         admob_post["v"] = admob_version
         admob_post["d[pc]"] = admob_params[:admob_pc]

data/lib/rmobio/ads/ad_sense.rb

@@ -22,53 +22,40 @@ and released "page scraping version"
 =end
 require 'digest/sha1'
 require 'collections/sequenced_hash'
+require 'open-uri'
 
 module Rmobio
   module Ads
     module AdSense  
       
       @@adServer="http://pagead2.googlesyndication.com/pagead/ads"
-      @@mobioUseragent="Mobio" # we should probably come up with a better string    
+      @@mobio_useragent="Mobio" # we should probably come up with a better string  
+      @@default_ip="127.0.0.1"      
       
       def getAdParms
         getAd(params[:keywords],params[:adClient])
       end
-      
-      
-      #$GLOBALS['google']['ad_type']='text';
-      #$GLOBALS['google']['channel']='8618723264';
-      #$GLOBALS['google']['client']='pub-0061196910475770';
-      #$GLOBALS['google']['format']='mobile_single';
-      #$GLOBALS['google']['https']=$_SERVER['HTTPS'];
-      #$GLOBALS['google']['host']=$_SERVER['HTTP_HOST'];
-      #$GLOBALS['google']['ip']=$_SERVER['REMOTE_ADDR'];
-      #$GLOBALS['google']['markup']='xhtml';
-      #$GLOBALS['google']['oe']='utf8';
-      #$GLOBALS['google']['output']='xhtml';
-      #$GLOBALS['google']['ref']=$_SERVER['HTTP_REFERER'];
-      #$GLOBALS['google']['url']=$_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
-      #$GLOBALS['google']['useragent']=$_SERVER['HTTP_USER_AGENT'];
-      
-      def getAdByPage(adClient)
 
+      # this returns an ad from Google's mobile AdSense, given the current page
+      # * ad_client - your Google adsense ID
+      # * ip - optional, the IP you want to tell Google its coming from
+      # * url - optional, the page you want to put an ad on. Defaults to what is detected  
+      # * useragent - the useragent of the mobile browser. Defaults to what is detected.
+      def getAdByPage(adClient,ip=request.remote_ip,url=request.request_uri,useragent=request.user_agent)
         @@userId=request.env['HTTP_USERID'] 
-        if (@@userId.nil?)
-          @@userId="101"
-        end
-
         adArgs= SequencedHash.new
         adArgs["ad_type"]="text"
         adArgs["channel"]="8618723264"
         adArgs["client"]=adClient
         adArgs["format"]="mobile_single"
-        adArgs["host"]=request.host
-        adArgs["ip"]=request.remote_ip
+        adArgs["host"]=request.host if request.host
+        adArgs["ip"]=URI.escape(ip) if ip
         adArgs["markup"]="xhtml"
         adArgs["output"]="xhtml"
         adArgs["oe"]="utf8"
-        adArgs["ref"]=request.referer
-        adArgs["url"]="http://"+request.env["HTTP_HOST"]+request.env["REQUEST_URI"]
-        #adArgs["useragent"]=request.user_agent  
+        #adArgs["ref"]=referer
+        adArgs["url"]=url if url
+        adArgs["useragent"]=URI.escape(useragent) if useragent 
         adArgs["eip"]=Digest::SHA1.hexdigest(@@userId)[0..20]  # oneway hashed userid  
 
         # now built the URL to call out to based upon the base URL and ad hash
@@ -82,33 +69,33 @@ module Rmobio
           end
         end
         # ok, now call google's mobile adSense service and get back the full ad 
-        @pagead=open(adURL).read   
+        @pagead=open(adURL,"User-Agent"=>useragent).read   
      
       end
       
       # this returns an ad from Google's mobile AdSense, given a supplied set of keywords
       # * keywords - keywords to use for search
-      # * ad Client - your Google adsense ID
-      def getAd(keywords,adClient)
+      # * ad_client - your Google adsense ID
+      # * ip - optional, the IP you want to say the request is coming from
+      # * url - optional, the page you want to put an ad on
+      # * useragent - the browser this is for. Defaults to the one detected
+      def getAd(keywords,ad_client,ip=request.remote_ip,url=request.request_uri,useragent=request.user_agent)
         doTinyUrl=true
+         
+        @user_id=request.env['HTTP_USERID'] if request.env['HTTP_USERID']
 
-        @@userId=request.env['HTTP_USERID'] 
-        if (@@userId.nil?)
-          @@userId="101"
-        end
         # build up the various arguments in the adArgs hash
         adArgs= SequencedHash.new
-        adArgs["ad_type"]="text"
-        adArgs["client"]=adClient 
-        adArgs["format"]="mobile_single"
-        adArgs["ip"]=request.remote_ip
+        adArgs["ad_type"]="text_image"
+        adArgs["client"]=ad_client 
+        adArgs["format"]="mobile_single" 
+        adArgs["ip"]=URI.escape(ip) if ip
         adArgs["markup"]="xhtml"
-        adArgs["output"]="wml"
+        adArgs["output"]="xhtml"
         adArgs["oe"]="utf-8"
-        adArgs["url"]="http:%3A%2Fwww.getmobio.com"  # mobio's home site
-        # adArgs["useragent"]=request.user_agent - doesn't actually work with the supplied useragent from the browser!
-        adArgs["useragent"]||=@@mobioUseragent # its our runner so default to our useragent if no other one is available
-        adArgs["eip"]=Digest::SHA1.hexdigest(@@userId)[0..20]  # oneway hashed userid
+        adArgs["url"]=url if url
+        adArgs["useragent"]=URI.escape(useragent) if useragent
+        adArgs["eip"]=Digest::SHA1.hexdigest(@user_id)[0..20]  # oneway hashed userid
         if (keywords)
           adArgs["kw"]=CGI::escape(keywords) 
           adArgs["kw_type"]="broad"
@@ -123,8 +110,9 @@ module Rmobio
             adURL = adURL + x + "=" + adArgs[x]   
           end
         end
+        
         # ok, now call google's mobile adSense service and get back the full ad 
-        @ad=open(adURL).read
+        @ad=open(adURL,"User-Agent"=>CGI::escape(useragent)).read
         if @ad
           logger.info "Returned ad" + @ad 
           adDoc = REXML::Document.new @ad

data/lib/rmobio/ads/m_khoj.rb

@@ -26,22 +26,17 @@ module Rmobio
     module MKhoj
       
       
-      def getAd(keywords,adClient)
-        getAdByPage(adClient) # keywords have no effect in mKhoj 
+      def getAd(keywords,adClient,ip=request.remote_ip,url=request.request_uri,useragent=request.user_agent)
+        getAdByPage(adClient,ip,url,useragent) # keywords have no effect in mKhoj 
       end
       
-      def getAdByPage(adClient)
+      def getAdByPage(adClient,ip=request.remote_ip,url=request.request_uri,useragent=request.user_agent)
         # mKhoj just detects your URL, so you don't really need an adClient variable for this particular network!
-        # but we have it here for consistency
-        handset = request.user_agent if request.user_agent
-        # handset="nokia6030/"
-        handset = URI.escape(handset)
-        #carrier = URI.escape(request.remote_ip)
-        carrier="59.181.113.59" # only works with India carriers!!
+        #carrier="59.181.113.59" # only works with India carriers!!
         
-        adUrl="http://www.mkhoj.com/view/Traffic/ShowAd.aspx?siteId=330ed28f-0de9-4c4f-b0a8-1f2118358c80&handset=nokia6030/&carrier=59.181.113.59"
+        adUrl = "http://www.mkhoj.com/view/Traffic/ShowAd.aspx?siteId=330ed28f-0de9-4c4f-b0a8-1f2118358c80&handset="+URI.escape(useragent)+"&carrier="+ip   
+        #adUrl="http://www.mkhoj.com/view/Traffic/ShowAd.aspx?siteId=330ed28f-0de9-4c4f-b0a8-1f2118358c80&handset=nokia6030/&carrier=59.181.113.59"
         logger.info "Calling: " + adUrl
-        #adUrl = "http://www.mkhoj.com/view/Traffic/ShowAd.aspx?siteId=330ed28f-0de9-4c4f-b0a8-1f2118358c80&handset="+handset+"&carrier="+carrier   
         begin
           @ad = open(adUrl).read   
           logger.info "Returned ad: " + @ad

data/lib/rmobio/ads/no_network.rb

@@ -5,10 +5,10 @@ module Rmobio
   module Ads
     module NoNetwork
     
-      def getAd(keywords,adClient)
+      def getAd(keywords,adClient,ip,url,useragent)
       end
       
-      def getAdByPage(adClient)
+      def getAdByPage(adClient,ip,url,useragent)
  
       end
       

data/lib/rmobio/ads/smaato.rb

@@ -22,12 +22,13 @@ module Rmobio
     module Smaato
       @@adServer="http://dev.soma.smaato.com:8080/wap/reqAd.jsp"
   
-      def getAdByPage(adClient)
-        getAd(nil,adClient)    
+      def getAdByPage(adClient,ip=request.remote_ip,url=request.request_uri,useragent=request.user_agent)
+        getAd(nil,adClient,ip,url,useragent)    
       end
   
       # this returns an adfrom Google's mobile AdSense, given a supplied set of keywords
-      def getAd(keywords,adClient)
+      # Smaato doesn't seem to use the IP, the URL or the useragent
+      def getAd(keywords,adClient,ip=request.remote_ip,url=request.request_uri,useragent=request.user_agent)
         logger.info "Smaato ad retrieval"
 =begin
 Example:
@@ -37,9 +38,7 @@ http://dev.soma.smaato.com:8080/wap/reqAd.jsp?pub=3517&adspace=137
 &lang=de
 =end
         @@userId=request.env['HTTP_USERID'] 
-        if (@@userId.nil?)
-          @@userId="101"
-        end
+
         # build up the various arguments in the adArgs hash
         adArgs= SequencedHash.new
         adArgs["pub"]=adClient # replace with real publisher ID
@@ -50,7 +49,7 @@ http://dev.soma.smaato.com:8080/wap/reqAd.jsp?pub=3517&adspace=137
         adArgs["width"]="176"  # get these from device capabilities service instead!
         adArgs["height"]="208"  # get these from device capabilities service instead
         adArgs["response"]="XML"
-        adArgs["user"]=@@userId # user agent for our browser.  
+        adArgs["user"]=@@userId   
         if (keywords)
           adArgs["kws"]=CGI::escape(keywords) 
         end

data/lib/rmobio/ads.rb

@@ -23,10 +23,8 @@ and documented at http://opssrv01/wiki/index.php/Mobio_Rails_Application_Framewo
 if MOBIO_CONFIG['ad_network']
   adlib="rmobio/ads/" + MOBIO_CONFIG['ad_network']
 else
-  puts "Not using ad network"
   adlib='rmobio/ads/' + 'no_network'
 end
 require adlib
-puts "Including " + adlib.camelize
 eval("include " + adlib.camelize)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rmobio
 version: !ruby/object:Gem::Version 
-  version: 1.1.21
+  version: 1.1.22
 platform: ruby
 authors: 
 - Mobio Networks
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-22 00:00:00 -07:00
+date: 2008-05-30 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -83,7 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.1.1
+rubygems_version: 1.0.1
 signing_key: 
 specification_version: 2
 summary: Rmobio API