RubyGems - rmobio - Versions diffs - 1.1.2 → 1.1.3 - Mend

rmobio 1.1.2 → 1.1.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

data/lib/rmobio/ads/ad_sense.rb +87 -105
data/lib/rmobio/ads/m_khoj.rb +0 -1
data/lib/rmobio/ads.rb +5 -3
metadata +8 -8

data/lib/rmobio/ads/ad_sense.rb CHANGED Viewed

@@ -25,28 +25,11 @@ require 'collections/sequenced_hash'
 module Rmobio
   module Ads
-    module AdSense
+    module AdSense
-      @@adsense=$ADSENSE
       @@adServer="http://pagead2.googlesyndication.com/pagead/ads"
       @@adClient="ca-mb-pub-0061196910475770"
-      @@mobioUseragent="Mobio" # we should probably come up with a better string
-      # Determines whether this request should involve adSense.
-      def doAdSense()
-        # is adsense enabled for the project?
-        if (@@adsense != 1)
-          return false
-        end
-        # returns true of false depending on what client is making this request.
-        if (@client == 'facebook')
-          return false
-        else
-          return true
-        end
-      end
+      @@mobioUseragent="Mobio" # we should probably come up with a better string
       def getAdParms
         getAd(params[:keywords])
@@ -68,101 +51,100 @@ module Rmobio
       #$GLOBALS['google']['useragent']=$_SERVER['HTTP_USER_AGENT'];
       def getAdByPage
-        if (doAdSense())
-          @@userId=request.env['HTTP_USERID']
-          if (@@userId.nil?)
-            @@userId="101"
-          end
-          adArgs= SequencedHash.new
-          adArgs["ad_type"]="text"
-          adArgs["channel"]="8618723264"
-          adArgs["client"]="pub-0061196910475770"
-          adArgs["format"]="mobile_single"
-          adArgs["host"]=request.host
-          adArgs["ip"]=request.remote_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["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
-          adURL=@@adServer + "?"
-          first=1 # dont put ampersand on first one
-          adArgs.each_key do |x|
-            if adArgs[x]
-              (adURL=adURL+"&") unless first
-              first=nil # start putting in &s
-              adURL = adURL + x + "=" + adArgs[x]
-            end
+        @@userId=request.env['HTTP_USERID']
+        if (@@userId.nil?)
+          @@userId="101"
+        end
+        adArgs= SequencedHash.new
+        adArgs["ad_type"]="text"
+        adArgs["channel"]="8618723264"
+        adArgs["client"]="pub-0061196910475770"
+        adArgs["format"]="mobile_single"
+        adArgs["host"]=request.host
+        adArgs["ip"]=request.remote_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["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
+        adURL=@@adServer + "?"
+        first=1 # dont put ampersand on first one
+        adArgs.each_key do |x|
+          if adArgs[x]
+            (adURL=adURL+"&") unless first
+            first=nil # start putting in &s
+            adURL = adURL + x + "=" + adArgs[x]
           end
-          # ok, now call google's mobile adSense service and get back the full ad
-          @pagead=open(adURL).read
-        end
+        end
+        # ok, now call google's mobile adSense service and get back the full ad
+        @pagead=open(adURL).read
       end
       # this returns an adfrom Google's mobile AdSense, given a supplied set of keywords
       def getAd(keywords)
-        puts "Adsense"
         doTinyUrl=true
-        if (doAdSense())
-          @@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 # get it from gateway instead!
-          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["eip"]=Digest::SHA1.hexdigest(@@userId)[0..20]  # oneway hashed userid
-          if (keywords)
-            adArgs["kw"]=CGI::escape(keywords)
-            adArgs["kw_type"]="broad"
+        @@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 # get it from gateway instead!
+        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["eip"]=Digest::SHA1.hexdigest(@@userId)[0..20]  # oneway hashed userid
+        if (keywords)
+          adArgs["kw"]=CGI::escape(keywords)
+          adArgs["kw_type"]="broad"
+        end
+        # now built the URL to call out to based upon the base URL and ad hash
+        adURL=@@adServer + "?"
+        first=1 # dont put ampersand on first one
+        adArgs.each_key do |x|
+          if adArgs[x]
+            (adURL=adURL+"&") unless first
+            first=nil # start putting in &s
+            adURL = adURL + x + "=" + adArgs[x]
           end
-          # now built the URL to call out to based upon the base URL and ad hash
-          adURL=@@adServer + "?"
-          first=1 # dont put ampersand on first one
-          adArgs.each_key do |x|
-            if adArgs[x]
-              (adURL=adURL+"&") unless first
-              first=nil # start putting in &s
-              adURL = adURL + x + "=" + adArgs[x]
+        end
+        # ok, now call google's mobile adSense service and get back the full ad
+        @ad=open(adURL).read
+        if @ad
+          logger.info "Returned ad" + @ad
+          adDoc = REXML::Document.new @ad
+          @text = adDoc.elements['//p']
+          if @text  # do we have a <p> element
+            # ok, now text has the full ad display content including links
+            # grab @url, @urltext (link text for url), @phone, @phonetext (link text for call)
+            if defined? @text[1].attributes['href'] and @text[1].attributes['href']
+              @adurl = doTinyUrl ? tinyUrl(@text[1].attributes['href']) : @text[1].attributes['href']
+            else
+              @adurl = "nolink.rwap"
             end
-          end
-          # ok, now call google's mobile adSense service and get back the full ad
-          @ad=open(adURL).read
-          if @ad
-            logger.info "Returned ad" + @ad
-            adDoc = REXML::Document.new @ad
-            @text = adDoc.elements['//p']
-            if @text  # do we have a <p> element
-              # ok, now text has the full ad display content including links
-              # grab @url, @urltext (link text for url), @phone, @phonetext (link text for call)
-              if defined? @text[1].attributes['href'] and @text[1].attributes['href']
-                @adurl = doTinyUrl ? tinyUrl(@text[1].attributes['href']) : @text[1].attributes['href']
-              else
-                @adurl = "nolink.rwap"
-              end
-              @urltext=@text[1].text
-              @extratext=@text[2].to_s if @text[2] # this should have everything else that is not a child element
-              if (@text.size>3 and @text[3]) # only process @text[3] for phone stuff if it exists
-                @phone = (doTinyUrl ? tinyUrl(@text[3].attributes['href']) : @text[3].attributes['href']) if defined? @text[3].attributes['href'] and @text[3].attributes['href']
-                @phonetext=@text[3].text if defined? @text[3].text and @text[3].text
-              end
+            @urltext=@text[1].text
+            @extratext=@text[2].to_s if @text[2] # this should have everything else that is not a child element
+            if (@text.size>3 and @text[3]) # only process @text[3] for phone stuff if it exists
+              @phone = (doTinyUrl ? tinyUrl(@text[3].attributes['href']) : @text[3].attributes['href']) if defined? @text[3].attributes['href'] and @text[3].attributes['href']
+              @phonetext=@text[3].text if defined? @text[3].text and @text[3].text
             end
-          end # if we get an ad back from adsense
-          @ad # return the full ad text
-        end
+          end
+        end # if we get an ad back from adsense
+        @ad # return the full ad text
       end
       private

data/lib/rmobio/ads/m_khoj.rb CHANGED Viewed

@@ -31,7 +31,6 @@ module Rmobio
       end
       def getAdByPage
-        puts "mKhoj getAd"
         handset = request.user_agent if request.user_agent
         # handset="nokia6030/"
         handset = URI.escape(handset)

data/lib/rmobio/ads.rb CHANGED Viewed

@@ -19,6 +19,8 @@
 note that we require use of the new Mobio config yml schema created by Lars
 and documented at http://opssrv01/wiki/index.php/Mobio_Rails_Application_Framework_2.0#Use_Config_Manager
 =end
-adlib="rmobio/ads/" + MOBIO_CONFIG['ad_network']
-require adlib
-eval("include " + adlib.camelize)
+if not defined? MOBIO_CONFIG['ad_network'] and MOBIO_CONFIG['ad_network'].nil?
+  adlib="rmobio/ads/" + MOBIO_CONFIG['ad_network']
+  require adlib
+  eval("include " + adlib.camelize)
+end

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rmobio
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Mobio Networks
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2008-03-24 00:00:00 -07:00
+date: 2008-03-25 00:00:00 -07:00
 default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
@@ -31,8 +31,11 @@ extra_rdoc_files: []
 files:
 - lib/rmobio
-- lib/rmobio.rb
 - lib/rmobio/ads
+- lib/rmobio/ads/ad_mobs.rb
+- lib/rmobio/ads/ad_sense.rb
+- lib/rmobio/ads/m_khoj.rb
+- lib/rmobio/ads/smaato.rb
 - lib/rmobio/ads.rb
 - lib/rmobio/auth.rb
 - lib/rmobio/cas.rb
@@ -41,11 +44,6 @@ files:
 - lib/rmobio/raketasks.rb
 - lib/rmobio/utils.rb
 - lib/rmobio/webservices
-- lib/rmobio/webservices.rb
-- lib/rmobio/ads/ad_mobs.rb
-- lib/rmobio/ads/ad_sense.rb
-- lib/rmobio/ads/m_khoj.rb
-- lib/rmobio/ads/smaato.rb
 - lib/rmobio/webservices/rest
 - lib/rmobio/webservices/soap
 - lib/rmobio/webservices/soap/drivers.rb
@@ -54,6 +52,8 @@ files:
 - lib/rmobio/webservices/soap/platform.rb
 - lib/rmobio/webservices/soap/registration.rb
 - lib/rmobio/webservices/soap/rss.rb
+- lib/rmobio/webservices.rb
+- lib/rmobio.rb
 has_rdoc: false
 homepage: http://rmobio.rubyforge.org/
 post_install_message: