rmobio 1.1.5 → 1.1.6

data/lib/rmobio/ads.rb

@@ -19,8 +19,14 @@
 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
-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
+module Rmobio
+  module Ads
+
+    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
+
+  end
+end

data/lib/rmobio/client_info.rb

@@ -59,12 +59,14 @@ module Rmobio
        
       if request.env['HTTP_MOBIO_AGENT'] or request.env['HTTP_ACCEPT']=~/application\/pxml/
         @client="xf"  
+      elsif (request.env['HTTP_ACCEPT']=~/application\/xhtml/) 
+        headers['Content-Type']="text/html"
+        @client = "xhtml" 
       elsif ((request.env['HTTP_ACCEPT']=~/wml/) || 
             (request.env['HTTP_ACCEPT']=~/wap/)  )
         @client="wap"  
-      elsif (request.env['HTTP_ACCEPT']=~/application\/xhtml/) 
-        @client = "xhtml" 
       else
+        headers['Content-Type']="text/html"
         @client="html" 
       end
       # Get the rxml transformer for the client type

data/lib/rmobio/rxml/xforms_transformer.rb

@@ -218,9 +218,9 @@ A rails icon and some text will be displayed on Mobio runner when you load the r
       # 
       def textarea(doc, txt="", options={})
         # If there's id but no xpath, we will create a default instance data for 
-        # the textoutput.
+        # the textoutput. 
         if options[:id] and options[:xpath].nil?
-          @model_buffer << "\n" << '<xf:instance id="' << options[:id] << '"><data xmlns=""><text>' << txt << "</txt></data></xf:instance>\n"
+          @model_buffer << "\n" << '<xf:instance id="' << options[:id] << '"><data xmlns=""><text>' << txt << "</text></data></xf:instance>\n"
         end
      
         @view_buffer << "\n<m:textoutput #{options[:xstyle]}"