rhodes 3.0.1.beta.4 → 3.0.1.beta.5

data/platform/android/build/android.rake

@@ -253,6 +253,11 @@ namespace "config" do
 
   task :android => [:set_android_platform, "config:common"] do
 
+    $ext_android_rhodes_activity_listener = []
+    $ext_android_manifest_changes= []
+    $ext_android_resources_addons = []
+    $ext_android_additional_sources_list = []
+
     $gapikey = $app_config["android"]["apikey"] unless $app_config["android"].nil?
     $gapikey = $config["android"]["apikey"] if $gapikey.nil? and not $config["android"].nil?
     $gapikey = '' unless $gapikey.is_a? String
@@ -713,6 +718,39 @@ namespace "build" do
       $app_config["extensions"].each do |ext|
         $app_config["extpaths"].each do |p|
           extpath = File.join(p, ext, 'ext')
+
+          extyml = File.join(p, ext,"ext.yml")
+          if File.file? extyml
+            extconf = Jake.config(File.open(extyml))
+
+            android_listener = extconf["android_rhodes_activity_listener"]
+            $ext_android_rhodes_activity_listener << android_listener unless android_listener.nil?
+
+            android_manifest_changes = extconf["android_manifest_changes"]
+            if android_manifest_changes != nil
+              android_manifest_changes = File.join(p, ext, android_manifest_changes)
+              $ext_android_manifest_changes << android_manifest_changes
+            end
+
+            android_resources_addons = extconf["android_resources_addons"]
+            if android_resources_addons != nil
+              android_resources_addons = File.join(p, ext, android_resources_addons)
+              $ext_android_resources_addons << android_resources_addons
+            end
+
+            android_additional_sources_list = extconf["android_additional_sources_list"]
+            if android_additional_sources_list != nil
+              android_additional_sources_list = File.join(p, ext, android_additional_sources_list)
+
+              File.open(android_additional_sources_list, "r") do |f|
+                  while line = f.gets
+                    $ext_android_additional_sources_list << File.join(p, ext, line)
+                  end
+              end
+
+            end
+          end
+
           if RUBY_PLATFORM =~ /(win|w)32$/
             next unless File.exists? File.join(extpath, 'build.bat')
           else
@@ -1112,10 +1150,131 @@ namespace "build" do
     task :rhodes => :rhobundle do
       javac = $config["env"]["paths"]["java"] + "/javac" + $exe_ext
 
+
+      set_app_name_android($appname)
+
+
       rm_rf $tmpdir + "/Rhodes"
       mkdir_p $tmpdir + "/Rhodes"
 
-      set_app_name_android($appname)
+      $ext_android_manifest_changes << File.join($extensionsdir, "AndroidManifest.xml")
+
+      app_f = File.new($appmanifest)
+      manifest_orig_doc = REXML::Document.new(app_f)
+      app_f.close
+      dst_manifest =  manifest_orig_doc.elements["manifest"]
+      dst_application =  manifest_orig_doc.elements["manifest/application"]
+      dst_main_activity = nil
+      puts '$$$$$$$$$$$$$$ try to found MainActivity'
+      dst_application.elements.each("activity") do |a|
+        puts '$$$$$$$$ activity with attr = '+a.attribute('name','android').to_s
+        if a.attribute('name','android').to_s == 'com.rhomobile.rhodes.RhodesActivity'
+            puts '          $$$ FOUND !'
+            dst_main_activity = a
+        end
+      end
+
+      $ext_android_manifest_changes.each do |m|
+
+        ext_manifest = m
+        if File.exists? ext_manifest
+          puts 'AndroidManifest.xml['+ext_manifest+'] from native extension found !'
+
+          manifest_ext_doc = REXML::Document.new(File.new(ext_manifest))
+
+          src_manifest =  manifest_ext_doc.elements["manifest"]
+
+          src_application =  manifest_ext_doc.elements["manifest/application"]
+
+          if src_application != nil
+              puts 'Extension Manifest process application item :'
+              src_application.elements.each do |e|
+                  puts '$$$$$$$$ process element with attr = '+e.attribute('name','android').to_s
+                  if e.attribute('name','android').to_s == 'com.rhomobile.rhodes.RhodesActivity'
+                    e.elements.each do |sube|
+                      puts '         add item to MainActivity['+sube.xpath+']'
+                      dst_main_activity.add sube
+                    end
+                  else
+                    puts '         add item ['+e.xpath+']'
+                    dst_application.add e
+                  end
+              end
+          end
+
+          puts 'Extension Manifest process root <manifest> item :'
+          src_manifest.elements.each do |e|
+              p = e.xpath
+              if p != '/manifest/application'
+                    dst_e = manifest_orig_doc.elements[p]
+                    if dst_e != nil
+                          if p == '/manifest/uses-sdk'
+                              puts '         found and delete original item ['+p+']'
+                              manifest_orig_doc.elements.delete p
+                          end
+                    end
+                    puts '         and new item ['+p+']'
+                    dst_manifest.add e
+              end
+          end
+
+        else
+          puts 'AndroidManifest change file ['+m+'] from native extension not found !'
+        end
+
+      end
+
+      #puts 'Result Manifest :'
+      #manifest_orig_doc.elements['manifest'].elements.each do |e|
+      #   puts '     + '+e.xpath
+      #   if e.xpath == '/manifest/application'
+      #       manifest_orig_doc.elements['manifest/application'].elements.each do |t|
+      #             puts '              + '+t.xpath
+      #       end
+      #   end
+      #end
+
+      puts 'delete original manifest'
+      File.delete($appmanifest)
+
+      updated_f = File.open($appmanifest, "w")
+      manifest_orig_doc.write updated_f, 2
+      updated_f.close
+
+      #rm tappmanifest
+      puts 'Manifest updated by extension saved!'
+
+
+      # RhodesActivity Listeners
+      f = StringIO.new("", "w+")
+      f.puts '// WARNING! THIS FILE IS GENERATED AUTOMATICALLY! DO NOT EDIT IT MANUALLY!'
+      f.puts 'package com.rhomobile.rhodes;'
+      f.puts ''
+      f.puts 'import com.rhomobile.rhodes.phonebook.ContactAccessor;'
+      f.puts ''
+      f.puts 'class RhodesActivityStartupListeners {'
+      f.puts ''
+      f.puts '	public static final String[] ourRunnableList = { ""'
+      $ext_android_rhodes_activity_listener.each do |a|
+         f.puts '       ,"'+a+'"'
+      end
+      f.puts '	};'
+      f.puts ''
+      f.puts '}'
+      Jake.modify_file_if_content_changed(File.join($startdir, "platform","android","Rhodes","src","com","rhomobile","rhodes","RhodesActivityStartupListeners.java"), f)
+
+
+      puts 'EXT:  add additional files to project before build'
+      $ext_android_resources_addons.each do |r|
+         puts 'add resources from extension copy ['+r+'] to ['+$tmpdir+']'
+          Dir.foreach(r) do |f|
+             cp = File.join(r, f)
+             if ((File.directory?(cp)) || (File.file?(cp))) && ((f != '.') && ( f != '..'))
+                cp_r cp,$tmpdir
+             end
+          end
+      end
+
       generate_rjava
 
       srclist = File.join($builddir, "RhodesSRC_build.files")
@@ -1126,10 +1285,10 @@ namespace "build" do
           line.chomp!
           next if line =~ /\/AndroidR\.java\s*$/
 
-		  if !$use_geomapping
-			next if line == "platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/GoogleMapView.java"
-			next if line == "platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/AnnotationsOverlay.java"
-		  end
+		      if !$use_geomapping
+			        next if line == "platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/GoogleMapView.java"
+			        next if line == "platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/AnnotationsOverlay.java"
+		      end
 
           #next if !$use_geomapping and line =~ /\/GoogleMapView\//
           #next if !$use_geomapping and line =~ /\/AnnotationsOverlay\//
@@ -1155,74 +1314,12 @@ namespace "build" do
         puts 'ext_build.files not found - no additional java files for compilation'
       end
 
-      ext_manifest = File.join($extensionsdir, "AndroidManifest.xml")
-      if File.exists? ext_manifest
-        puts 'AndroidManifest.xml from native extension found !'
-
-        #tappmanifest = $appmanifest + '_tmp'
-        
-        #cp_r $appmanifest,tappmanifest
-
-        app_f = File.new($appmanifest)
-        manifest_orig_doc = REXML::Document.new(app_f)
-        app_f.close
-
-        manifest_ext_doc = REXML::Document.new(File.new(ext_manifest))
-        
-        src_manifest =  manifest_ext_doc.elements["manifest"]
-        dst_manifest =  manifest_orig_doc.elements["manifest"]
-        
-
-        src_application =  manifest_ext_doc.elements["manifest/application"]              
-        dst_application =  manifest_orig_doc.elements["manifest/application"]
-
-        if src_application != nil
-            puts 'Extension Manifest process application item :'
-            src_application.elements.each do |e|
-                  puts '         add item ['+e.xpath+']' 
-                  dst_application.add e
-            end
-        end
-
-        puts 'Extension Manifest process root <manifest> item :'
-        src_manifest.elements.each do |e|
-            p = e.xpath
-            if p != '/manifest/application'
-                  dst_e = manifest_orig_doc.elements[p]
-                  if dst_e != nil
-                        if p == '/manifest/uses-sdk' 
-                            puts '         found and delete original item ['+p+']' 
-                            manifest_orig_doc.elements.delete p
-                        end
-                  end
-                  puts '         and new item ['+p+']' 
-                  dst_manifest.add e
-            end
-        end  
-
-        #puts 'Result Manifest :'
-        #manifest_orig_doc.elements['manifest'].elements.each do |e|
-        #   puts '     + '+e.xpath
-        #   if e.xpath == '/manifest/application'
-        #       manifest_orig_doc.elements['manifest/application'].elements.each do |t|
-        #             puts '              + '+t.xpath
-        #       end
-        #   end
-        #end
-
-        puts 'delete original manifest'
-        File.delete($appmanifest)
-
-        updated_f = File.open($appmanifest, "w") 
-        manifest_orig_doc.write updated_f, 2
-        updated_f.close
-
-        #rm tappmanifest
-        puts 'Manifest updated by extension saved!'
-        
-
-      else
-        puts 'AndroidManifest.xml from native extension not found - no any changes in main AndroidManifest.xml'
+      # process collected ext src files
+      puts 'process additional java files for build from extensions :'
+      $ext_android_additional_sources_list.each do |s|
+        s.chomp!
+        puts 'java file : ' + s
+        lines << "\""+s+"\""
       end
 
       File.open(newsrclist, "w") { |f| f.write lines.join("\n") }
@@ -1555,10 +1652,22 @@ def logcat(device_flag = '-e', log_path = $applog_path)
   end
 end
 
+def logcat_process(device_flag = '-e', log_path = $applog_path)
+  if !log_path.nil?
+    Thread.new { system("\"#{$adb}\" #{device_flag} logcat >> \"#{log_path}\" ") }  
+  end
+end
+
 def logclear(device_flag = '-e')
   Jake.run($adb, [device_flag, 'logcat', '-c'], nil, true) 
 end
 
+namespace "android" do
+    task :get_log => "config:android" do
+		puts "log_file=" + $applog_path
+	end
+end
+
 namespace "run" do
   namespace "android" do
     
@@ -1711,9 +1820,10 @@ namespace "run" do
       puts 'Sleep for 5 sec. waiting for "adb start-server"'
       sleep 5
 
-      if !$applog_file.nil?
-        Thread.new { Jake.run($adb, ['logcat', '>>', $applog_path], nil, true) }
-      end
+      #if !$applog_file.nil?
+      #  Thread.new { Jake.run($adb, ['logcat', '>>', $applog_path], nil, true) }
+      #end
+      logcat_process()
 
       if $appavdname != nil
         $avdname = $appavdname
@@ -1765,9 +1875,10 @@ namespace "run" do
               Jake.run($adb, ['start-server'], nil, true)
               adbRestarts += 1
 
-              if !$applog_file.nil?
-                Thread.new { Jake.run($adb, ['logcat', '>>', $applog_path], nil, true) }
-              end
+              #if !$applog_file.nil?
+              #  Thread.new { Jake.run($adb, ['logcat', '>>', $applog_path], nil, true) }
+              #end
+              logcat_process()
             else
               puts "Still waiting..."
             end
@@ -1824,6 +1935,8 @@ namespace "run" do
     task :device => "device:android:install" do
       puts "Starting application..."
       run_application("-d")
+      
+      logcat_process("-d")
     end
   end
 

data/platform/bb/build/bb.rake

@@ -81,7 +81,7 @@ def startsim(hidden=false)
     args << "/no-guibacklight"
   end
         
-  args << "/app-param=JvmDebugFile:"+Jake.get_absolute($app_config["applog"]) if $app_config["applog"] && $app_config["applog"].length() > 0
+  args << "/app-param=JvmDebugFile:"+Jake.get_absolute_ex($app_config["applog"], $app_path) if $app_config["applog"] && $app_config["applog"].length() > 0
 
   Jake.run2 command, args, {:directory => jde + "/simulator", :nowait => true}
 end

data/platform/shared/db/DBAdapter.cpp

@@ -175,6 +175,9 @@ void CDBAdapter::open (String strDbPath, String strVer, boolean bTemp)
                 executeSQL( "UPDATE client_info SET reset=1" );
             }
         }
+
+//        db.updateAllAttribChanges();
+//        db.copyTable("changed_values", db, *this );
         db.close();
 
         CRhoFile::deleteFile( (m_strDbPath+"_oldver").c_str());

data/platform/shared/net/HttpServer.cpp

@@ -1036,18 +1036,27 @@ bool CHttpServer::call_ruby_method(String const &uri, String const &body, String
     return true;
 }
 
-bool CHttpServer::decide(String const &method, String const &uri, String const &query,
+bool CHttpServer::decide(String const &method, String const &arg_uri, String const &query,
                          HeaderList const &headers, String const &body)
 {
-    RAWTRACE1("Decide what to do with uri %s", uri.c_str());
-    callback_t callback = registered(uri);
+    RAWTRACE1("Decide what to do with uri %s", arg_uri.c_str());
+    callback_t callback = registered(arg_uri);
     if (callback) {
-        RAWTRACE1("Uri %s is registered callback, so handle it appropriately", uri.c_str());
+        RAWTRACE1("Uri %s is registered callback, so handle it appropriately", arg_uri.c_str());
         callback(this, query.length() ? query : body);
         return true;
     }
-    
-    String fullPath = CFilePath::join(m_root,uri);
+
+    String uri = arg_uri;
+
+#ifdef OS_ANDROID
+    //Work around malformed Android WebView URLs
+    if ((uri.find("/app") != 0) && (uri.find("/public") != 0) && (uri.find("/rhodata/apps/") == String::npos)) {
+        uri = CFilePath::join("/app", uri);
+    }
+#endif
+
+    String fullPath = CFilePath::join(m_root, uri);
     
     Route route;
     if (dispatch(uri, route)) {
@@ -1071,6 +1080,7 @@ bool CHttpServer::decide(String const &method, String const &uri, String const &
         return true;
     }
     
+#ifndef OS_ANDROID
     if (isdir(fullPath)) {
         RAWTRACE1("Uri %s is directory, redirecting to index", uri.c_str());
         String q = query.empty() ? "" : "?" + query;
@@ -1081,7 +1091,14 @@ bool CHttpServer::decide(String const &method, String const &uri, String const &
         send_response(create_response("301 Moved Permanently", headers));
         return false;
     }
-    
+#else
+    //Work around this Android redirect bug:
+    //http://code.google.com/p/android/issues/detail?can=2&q=11583&id=11583
+    if (isdir(fullPath)) {
+        RAWTRACE1("Uri %s is directory, override with index", uri.c_str());
+        return decide(method, CFilePath::join( uri, "index"RHO_ERB_EXT), query, headers, body);
+    }
+#endif
     if (isindex(uri)) {
         if (!isfile(fullPath)) {
             RAWLOG_ERROR1("The file %s was not found", fullPath.c_str());
@@ -1107,7 +1124,6 @@ bool CHttpServer::decide(String const &method, String const &uri, String const &
 
         return true;
     }
-    //RAWLOG_INFO("Sending File");
     
     // Try to send requested file
     RAWTRACE1("Uri %s should be regular file, trying to send it", uri.c_str());

data/platform/shared/ruby/ext/rho/rhoruby.c

@@ -569,7 +569,15 @@ int getStringLenFromValue(VALUE val){
 rho_param *rho_param_fromvalue(VALUE v)
 {
     int i, size;
+/*
+    if (v == NULL) {
+         return NULL;
+    }
 
+    if (rho_ruby_is_NIL(v)) {
+         return NULL;
+    }
+*/
     switch(TYPE(v)) {
     case T_ARRAY:
         {

data/platform/wp7/RhoAppRunner/Program.cs

@@ -23,9 +23,9 @@ namespace RhoAppRunner
                 useEmulator = false;
 
             if (useEmulator)
-                WP7Device = WP7SDK.GetDevices().First(d => d.Name.StartsWith("Windows Phone 7 Emulator"));
+                WP7Device = WP7SDK.GetDevices().First(d => d.Name.StartsWith("Windows Phone Emulator"));
             else
-                WP7Device = WP7SDK.GetDevices().First(d => d.Name.StartsWith("Windows Phone 7 Device"));
+                WP7Device = WP7SDK.GetDevices().First(d => d.Name.StartsWith("Windows Phone Device"));
 
             Console.WriteLine("Connecting to Windows Phone 7 Emulator/Device...");
             WP7Device.Connect();

data/platform/wp7/build/wp.rake

@@ -1,6 +1,6 @@
 namespace "config" do
 	task :set_wp_platform do
-		$current_platform = "wm" unless $current_platform
+		$current_platform = "wp" unless $current_platform
 	end
 
 	task :wp => [:set_wp_platform, "config:common"] do
@@ -177,14 +177,14 @@ end
 			#doc = REXML::Document.new(File.open(out_dir + "XapCacheFile.xml"))
 			#chdir $srcdir
 			#Dir.glob(File.join("**", '*.*')).each do |f|
-		#		doc.root[1,0] = REXML::Element.new "file lastWriteTime='" + File.mtime(f).strftime("%m/%d/%Y %I:%M:%S %p") + "' source='" + $srcdir.gsub("/", "\\") + "\\" + f.gsub("/", "\\") + "' archivePath='" + f.gsub("/", "\\") + "'" 
-		#	end
-	#		File.open(out_dir + "XapCacheFile.xml", "w") { |f| doc.write f, 2; f.close }
+			#	doc.root[1,0] = REXML::Element.new "file lastWriteTime='" + File.mtime(f).strftime("%m/%d/%Y %I:%M:%S %p") + "' source='" + $srcdir.gsub("/", "\\") + "\\" + f.gsub("/", "\\") + "' archivePath='" + f.gsub("/", "\\") + "'" 
+			#end
+			#File.open(out_dir + "XapCacheFile.xml", "w") { |f| doc.write f, 2; f.close }
 			
-	#		chdir $startdir
+			#chdir $startdir
 
-	#		mkdir_p $config["build"]["wppath"] + "/rhodes/obj/Release" if not File.exists? $config["build"]["wppath"] + "/rhodes/obj/Release"
-	#		cp out_dir + "XapCacheFile.xml", $config["build"]["wppath"] + "/rhodes/obj/Release"
+			#mkdir_p $config["build"]["wppath"] + "/rhodes/obj/Release" if not File.exists? $config["build"]["wppath"] + "/rhodes/obj/Release"
+			#cp out_dir + "XapCacheFile.xml", $config["build"]["wppath"] + "/rhodes/obj/Release"
 		end
 
 		task :devrhobundleDebug => [:rhobundle, :rhobundlemap, "device:wp:addbundletoxapDebug"] do

data/rakefile.rb

@@ -207,7 +207,7 @@ namespace "config" do
     extpaths << $app_config["paths"]["extensions"] if $app_config["paths"] and $app_config["paths"]["extensions"]
     extpaths << $config["env"]["paths"]["extensions"] if $config["env"]["paths"]["extensions"]
     extpaths << File.join($app_path, "extensions")
-    extpaths << "lib/extensions"
+    extpaths << File.join($startdir, "lib","extensions")
     $app_config["extpaths"] = extpaths
 
     if $app_config["build"] and $app_config["build"] == "release"

data/res/generators/templates/application/app/helpers/application_helper.rb

@@ -109,9 +109,12 @@ module ApplicationHelper
   def render_transition(params)
     @params["rho_callback"] = nil
     params[:layout] = false
+    tab_index = params[:tab_index]
+    tab_index = -1 if tab_index == nil
     # TODO: escape carriage returns instead of removing them altoegether
     content = render(params).split('\'').join('\\\'').split(/[\r\n]/).join('')
-    WebView.execute_js("Rho.insertAsyncPage('<div>#{content}</div>')")
+    content = content.unpack("U*").collect {|s| (s > 127 ? "&##{s};" : s.chr) }.join("")
+    WebView.execute_js("Rho.insertAsyncPage('<div>#{content}</div>')", tab_index)
   end
 
   def caller_request_hash_to_query

data/res/generators/templates/application/public/jqtouch/jqtouch.js

@@ -256,7 +256,7 @@
             }
         }
 
-        function goTo(toPage, animation) {
+        function goTo(toPage, animation, is_history) {
             var fromPage = hist[0].page;
 
             if (typeof(toPage) === 'string') {
@@ -272,7 +272,11 @@
                 }
             }
             if (animatePages(fromPage, toPage, animation)) {
-                addPageToHistory(toPage, animation);
+                if (is_history)
+                {
+                    addPageToHistory(toPage, animation);
+                }
+                
                 return publicObj;
             }
             else
@@ -342,7 +346,7 @@
             // Branch on internal or external href
             else if (hash && hash != '#') {
                 $el.addClass('active');
-                goTo($(hash).data('referrer', $el), animation);
+                goTo($(hash).data('referrer', $el), animation, true);
             } else {
                 $el.addClass('loading active');
                 showPageByHref($el.attr('href'), {
@@ -469,7 +473,8 @@
             }, 100);
         }
 
-        function insertPages(nodes, animation) {
+        function insertPages(nodes, animation, is_history) {
+            
             var targetPage = null;
             $(nodes).each(function(index, node) {
                 var $node = $(this);
@@ -482,7 +487,7 @@
                 }
             });
             if (targetPage !== null) {
-                goTo(targetPage, animation);
+                goTo(targetPage, animation, is_history);
                 return targetPage;
             }
             else
@@ -492,9 +497,11 @@
         }
 
         function insertAsyncPage(data) {
-            $('.waiting').remove();
+            //$('.waiting').remove();
+            setTimeout(function(){ $('.waiting').remove(); },450);
+            
             var settings = asyncRequestSettings;
-            var firstPage = insertPages(data, settings.animation);
+            var firstPage = insertPages(data, settings.animation,true);
             if (firstPage)
             {
                 if (settings.method == 'GET' && jQTSettings.cacheGetRequests && settings.$referrer)
@@ -541,11 +548,16 @@
                                     $referrer: settings.$referrer,
                                     callback: settings.callback
                                 };
-                                $(data).addClass("waiting").appendTo($body);
+                                data = $(data).addClass("waiting");
+								if(data[0] && data[0].childElementCount == 0) {
+									data.appendTo($body);
+								} else {
+	                                insertPages(data, settings.animation,false);
+								}
                             } else {
 
                                 // success
-                                var firstPage = insertPages(data, settings.animation);
+                                var firstPage = insertPages(data, settings.animation,true);
                                 if (firstPage)
                                 {
                                     if (settings.method == 'GET' && jQTSettings.cacheGetRequests && settings.$referrer)

data/rhodes.gemspec

@@ -3,7 +3,7 @@ require "lib/rhodes.rb"
 
 Gem::Specification.new do |s|
   s.name = %q{rhodes}
-  s.version = "3.0.1.beta.4"
+  s.version = "3.0.1.beta.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rhomobile"]

data/spec/phone_spec/app/spec/rhom_object_spec.rb

@@ -1454,7 +1454,41 @@ end
         item2.time_test.is_a?(Integer).should == true    
     end        
   end
-        
+
+  it "should find by object" do
+    accts = getAccount.find(:all,:conditions=>
+        { 
+            { :name => "object", :op =>"IN" } => ['44e804f2-4933-4e20-271c-48fcecd9450d','63cf13da-cff4-99e7-f946-48fcec93f1cc'] 
+        }
+    )
+    accts.length.should == 2  
+    
+    accts = getAccount.find(:all,:conditions=>
+        { 
+            { :name => "object", :op =>"IN" } => ['1','2','3'] 
+        }
+    )
+    accts.length.should == 0
+    
+  end          
+  
+  it "should complex find by object" do
+    accts = getAccount.find(:all,:conditions=> { 
+            { :name => "object", :op =>"IN" } => ['44e804f2-4933-4e20-271c-48fcecd9450d','63cf13da-cff4-99e7-f946-48fcec93f1cc'],
+            { :name => "name" } => 'Mobio India' 
+        }
+    )
+    accts.length.should == 1
+    
+    accts = getAccount.find(:all,:conditions=>{ 
+            { :name => "object", :op =>"IN" } => ['1','2','3'],
+            { :name => "name" } => 'Mobio India' 
+        }
+    )
+    accts.length.should == 0
+    
+  end          
+  
 end
 #=begin
 describe "Rhom#paginate" do