rmobio 1.1.9 → 1.1.10

data/lib/rmobio/ads/ad_mobs.rb

@@ -26,9 +26,9 @@ module Rmobio
   module Ads
     module AdMobs
       
-      def getAd(keywords)
-        puts "AdMobs"
-        admob_params = {:admob_site_id => "a147c0944fbb5e8", # REQUIRED - get from admob.com
+      def getAd(keywords,adClient)
+        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"
           :admob_dob => "",      # OPTIONAL - Date of Birth formatted like YYYYMMDD, e.g. "19800229"
           :admob_gender => "",   # OPTIONAL - Gender, m[ale] or f[emale]
@@ -72,8 +72,8 @@ module Rmobio
       
       # the keyword search version also evaluates the supplied page so 
       # for admobs they are the same
-      def getAdByPage
-        getAd("")
+      def getAdByPage(adClient)
+        getAd("",adClient)
       end
       
     end

data/lib/rmobio/ads/ad_sense.rb

@@ -28,11 +28,10 @@ module Rmobio
     module AdSense  
       
       @@adServer="http://pagead2.googlesyndication.com/pagead/ads"
-      @@adClient="ca-mb-pub-0061196910475770"
       @@mobioUseragent="Mobio" # we should probably come up with a better string    
       
       def getAdParms
-        getAd(params[:keywords])
+        getAd(params[:keywords],params[:adClient])
       end
       
       
@@ -50,7 +49,7 @@ module Rmobio
       #$GLOBALS['google']['url']=$_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
       #$GLOBALS['google']['useragent']=$_SERVER['HTTP_USER_AGENT'];
       
-      def getAdByPage
+      def getAdByPage(adClient)
 
         @@userId=request.env['HTTP_USERID'] 
         if (@@userId.nil?)
@@ -60,7 +59,7 @@ module Rmobio
         adArgs= SequencedHash.new
         adArgs["ad_type"]="text"
         adArgs["channel"]="8618723264"
-        adArgs["client"]="pub-0061196910475770" 
+        adArgs["client"]=adClient
         adArgs["format"]="mobile_single"
         adArgs["host"]=request.host
         adArgs["ip"]=request.remote_ip
@@ -87,8 +86,10 @@ module Rmobio
      
       end
       
-      # this returns an adfrom Google's mobile AdSense, given a supplied set of keywords
-      def getAd(keywords)
+      # 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)
         doTinyUrl=true
 
         @@userId=request.env['HTTP_USERID'] 
@@ -98,14 +99,15 @@ module Rmobio
         # build up the various arguments in the adArgs hash
         adArgs= SequencedHash.new
         adArgs["ad_type"]="text"
-        adArgs["client"]=@@adClient # get it from gateway instead!
+        adArgs["client"]=adClient 
         adArgs["format"]="mobile_single"
         adArgs["ip"]=request.remote_ip
         adArgs["markup"]="xhtml"
         adArgs["output"]="wml"
         adArgs["oe"]="utf-8"
         adArgs["url"]="http:%3A%2Fwww.getmobio.com"  # mobio's home site
-        adArgs["useragent"]=@@mobioUseragent # user agent for our browser.  
+        # 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
         if (keywords)
           adArgs["kw"]=CGI::escape(keywords) 
@@ -149,6 +151,7 @@ module Rmobio
       
       private
       
+      # need to use tinyURL since the URLs that come back from AdSense are just too long for our client
       def tinyUrl(url)
         shrinker="http://tinyurl.com/create.php?url="+url
         result=open(shrinker).read

data/lib/rmobio/ads/m_khoj.rb

@@ -26,11 +26,13 @@ module Rmobio
     module MKhoj
       
       
-      def getAd(keywords)
-        getAdByPage # keywords have no effect in mKhoj 
+      def getAd(keywords,adClient)
+        getAdByPage(adClient) # keywords have no effect in mKhoj 
       end
       
-      def getAdByPage
+      def getAdByPage(adClient)
+        # 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)

data/lib/rmobio/ads/no_network.rb

@@ -0,0 +1,18 @@
+# handle lack of any network
+# dont do anything, just dont let the calls to getAd fail
+# 
+module Rmobio
+  module Ads
+    module NoNetwork
+    
+      def getAd(keywords,adClient)
+      end
+      
+      def getAdByPage(adClient)
+ 
+      end
+      
+
+    end
+  end
+end

data/lib/rmobio/ads/smaato.rb

@@ -22,12 +22,12 @@ module Rmobio
     module Smaato
       @@adServer="http://dev.soma.smaato.com:8080/wap/reqAd.jsp"
   
-      def getAdByPage
-        getAd(nil)    
+      def getAdByPage(adClient)
+        getAd(nil,adClient)    
       end
   
       # this returns an adfrom Google's mobile AdSense, given a supplied set of keywords
-      def getAd(keywords)
+      def getAd(keywords,adClient)
         logger.info "Smaato ad retrieval"
 =begin
 Example:
@@ -42,8 +42,8 @@ http://dev.soma.smaato.com:8080/wap/reqAd.jsp?pub=3517&adspace=137
         end
         # build up the various arguments in the adArgs hash
         adArgs= SequencedHash.new
-        adArgs["pub"]="3517" # replace with real publisher ID
-        adArgs["adspace"]="137" # what is the ad space and published ID taht we need
+        adArgs["pub"]=adClient # replace with real publisher ID
+        adArgs["adspace"]="137" # what is the ad space ID that we need here?!
         adArgs["format"]="JPG"
         adArgs["numads"]="1"
         adArgs["offline"]="true"

data/lib/rmobio/ads.rb

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

data/lib/rmobio/utils.rb

@@ -89,7 +89,7 @@ module Rmobio
       if name=~ /.png$/
         # for now hardcode the image directory
         filePath = File::join RAILS_ROOT, 'public/images/', name 
-        file = File.new(filePath,"r")
+        file = File.new(filePath,"rb")
         filecontents = file.read(File.size(filePath))
         file.close()
 
@@ -196,6 +196,29 @@ module Rmobio
       logger.debug('back url ' + key + ': ' + url)
       "<burl>" + url  + "</burl>"
     end # end backurl_xml
+    
+    # set_request_context
+    # This filter checks for the existence of a "mobio-context" header.
+    # If the header exists, then it is prepended to the request's uri. The flow
+    # is the following:
+    # 
+    # 
+    # A request is made to the server which contains a mobio-context header with
+    # a value of "mycustomcontext" to "/news"
+    # 
+    # After applying the filter, the request uri would become
+    # 
+    # "/mycustomcontext/news"
+    # 
+    # If no header exists, the filter acts as a pass-through.
+    # 
+    def set_request_context
+      if request.env['HTTP_MOBIO-CONTEXT'] and not request.env['HTTP_MOBIO-CONTEXT'] == ''
+        request.request_uri = '/' + request.env['HTTP_MOBIO-CONTEXT'] + request.request_uri
+        RAILS_DEFAULT_LOGGER.debug 'Utils: Setting the uri to: "' + 
+          request.request_uri + '" for the current request.' unless not defined? RAILS_DEFAULT_LOGGER
+      end      
+    end
       
     def logHeaders
       logger.debug( "Logging Headers...")