rhodes 3.3.3.beta.3 → 3.3.3.beta.4

data/spec/phone_spec/app/Data/septest.json

@@ -1 +1 @@
-{"Manufacturer List" : [{"manufacturer" : ""},{"manufacturer" : "\u00a9 Funky Monkey Snacks"},{"manufacturer" : "www.tmebeer.com"}];"Category List" : [{"id" : "189","name" : "Crackers"},{"id" : "190","name" : "Fruit & Vegetable Juices"}]};
+{"Manufacturer List" :  [{"manufacturer" : ""},{"manufacturer" : "\u00a9 Funky Monkey Snacks"},{"manufacturer" : "www.tmebeer.com"}],"Category List" : [{"id" : "189","name" : "Crackers"},{"id" : "190","name" : "Fruit & Vegetable Juices"}]};

data/spec/phone_spec/app/spec/asynchttp_spec.rb

@@ -35,7 +35,7 @@ describe "AsyncHttp" do
         
         #TODO: post_test
     end
-
+if !defined?(RHO_WP7)
     it "should http download" do
 
         file_name = File.join(Rho::RhoApplication::get_base_app_path(), 'test.jpg')
@@ -43,12 +43,12 @@ describe "AsyncHttp" do
         File.exists?(file_name).should == false
 
         res = Rho::AsyncHttp.download_file(
-          :url => 'http://rhomobile.com/wp-content/themes/rhomobile/img/imgs_21.jpg',
+          :url => 'http://www.rhomobile.com/wp-content/themes/rhomobile_theme/images/misc/ruby_app.jpg',
           :filename => file_name )
-        #puts "res : #{res}"  
+        puts "res : #{res}"  
         
         res['status'].should == 'ok'
-        res['headers']['content-length'].to_i.should ==  8945
+        res['headers']['content-length'].to_i.should ==  14451
         res['headers']['content-type'].should == 'image/jpeg'
 
         File.exists?(file_name).should == true
@@ -57,12 +57,13 @@ describe "AsyncHttp" do
 
         #check that in case of one more download, files keeps the same        
         res = Rho::AsyncHttp.download_file(
-          :url => 'http://rhomobile.com/wp-content/themes/rhomobile/img/imgs_21.jpg',
+          :url => 'http://www.rhomobile.com/wp-content/themes/rhomobile_theme/images/misc/ruby_app.jpg',
           :filename => file_name )
-        #puts "res : #{res}"  
+        puts "res : #{res}"  
         
         res['status'].should == 'ok'
-        res['headers']['content-length'].to_i.should ==  0
+        res['headers']['content-length'].to_i.should == 12554
+        res['http_error'].should == '206'
         #res['headers']['content-type'].should == 'image/jpeg'
 
         File.exists?(file_name).should == true
@@ -70,16 +71,16 @@ describe "AsyncHttp" do
 
         #check that in case of network error, files keeps the same        
         res = Rho::AsyncHttp.download_file(
-          :url => 'http://rhomobile.com/wp-content/themes/rhomobile/img/imgs_21__BAD.jpg',
+          :url => 'http://www.rhomobile.com/wp-content/themes/rhomobile_theme/images/misc/ruby_app_BAD.jpg',
           :filename => file_name )
-        #puts "res : #{res}"  
+        puts "res : #{res}"  
         res['status'].should == 'error'
         res['http_error'].should == '404'
 
         File.exists?(file_name).should == true
         File.size(file_name).should == orig_len
     end
-
+end
     it "should http upload" do
         
         server = 'http://rhologs.heroku.com'

data/spec/phone_spec/app/spec/blobsync_spec.rb

@@ -55,56 +55,30 @@ describe "BlobSync_test" do
     Rho::RhoConfig.bulksync_state='1'    
   end
 
-  it "should sync BlobTest" do
-    SyncEngine.logged_in.should == 1
-  
-    res = ::Rho::RhoSupport::parse_query_parameters getBlobTest.sync( "/app/Settings/sync_notify")
-    res['status'].should == 'ok'
-    res['error_code'].to_i.should == ::Rho::RhoError::ERR_NONE
-  end
-
-  it "should delete all Test Blobs" do
-    SyncEngine.logged_in.should == 1
-  
-    items = getBlobTest.find(:all ) #, :conditions => {:name => 'BlobTestItem'})
-    items.should_not == nil
-    
-    items.each do |item|
-        file_name = File.join(Rho::RhoApplication::get_blob_path(item.image_uri))
-        File.exists?(file_name).should == true
-        item.destroy
-        File.exists?(file_name).should == false
-    end    
 
-    getBlobTest.sync( "/app/Settings/sync_notify")
-    sleep(2) #wait till sync server update data
-    
-    res = ::Rho::RhoSupport::parse_query_parameters getBlobTest.sync( "/app/Settings/sync_notify")
-    res['status'].should == 'ok'
-    res['error_code'].to_i.should == ::Rho::RhoError::ERR_NONE
-    
-    item2 = getBlobTest.find(:first ) #, :conditions => {:name => 'BlobTestItem'})
-    item2.should == nil
-  end
 
   def copy_file(src, dst_dir)
+if !defined?(RHO_WP7)  
     content = File.binread(src)  
+else
+    content = File.read(src)  
+end    
     File.open(File.join( dst_dir, File.basename(src) ), "wb"){|f| f.write(content) }
   end
   
-  if !defined?(RHO_WP7)
   it "should create new BlobTest" do
     SyncEngine.logged_in.should == 1
 
     file_name = File.join(Rho::RhoApplication::get_model_path('app',getBlobTest_str()), 'test.png')
     copy_file(file_name, Rho::RhoApplication::get_blob_folder() )
     file_name = File.join(Rho::RhoApplication::get_blob_folder(), 'test.png')
-    
+if !defined?(RHO_WP7)   
     file_size = File.size(file_name)
+end    
     file_content = File.read(file_name)
     
     item = getBlobTest.new
-    #item.name = 'BlobTestItem'
+    item.name = 'BlobTestItem'
     item.image_uri = file_name
     item.save
     getBlobTest.sync( "/app/Settings/sync_notify")
@@ -120,7 +94,9 @@ describe "BlobSync_test" do
     
     items[0].image_uri.should_not == file_name
     new_file_name = File.join(Rho::RhoApplication::get_blob_path(items[0].image_uri))
+if !defined?(RHO_WP7)    
     File.size(new_file_name).should == file_size
+end    
     content_new = File.read(new_file_name)
     content_new.should == file_content
     
@@ -162,7 +138,6 @@ describe "BlobSync_test" do
 #    content_new.should == file_content
     
   end
-end
 
   it "should logout" do
     SyncEngine.logout()

data/spec/phone_spec/app/spec/date_spec.rb

@@ -58,7 +58,6 @@ if !defined? RHO_ME
   end
 end
 
-if !defined?(RHO_WP7)
   it "should support operations with dates" do
     to_day = Date.civil(2010, 3, 21)
     to_day2 = Date.civil(2011, 3, 21)
@@ -68,11 +67,13 @@ if !defined?(RHO_WP7)
     puts "res : #{res.day}"
 
     res = to_day2-to_day
-    
-if !defined? RHO_ME    
-    res.to_s.should == "365/1"
+
+if defined? RHO_ME
+    res.to_s.should == "365"        
+elsif defined?(RHO_WP7) 
+    res.to_s.should == "365"           
 else
-    res.to_s.should == "365"    
+    res.to_s.should == "365/1"
 end
     
     puts "res : #{res}"
@@ -82,6 +83,5 @@ end
     puts "res : #{res.day}"
     
   end
-end
 
 end

data/spec/phone_spec/app/spec/rho_spec.rb

@@ -39,14 +39,12 @@ describe "RhoConfig" do
     Rho::RhoConfig.options_path = '/app/Settings'
   end
   
-if !defined?(RHO_WP7)
   it "should populate configuration in sources table" do
     sources = ::Rho::RHO.get_user_db().select_from_table('sources','*')
     sources.size.should == 0
     
     Rho::RhoConfig.sources().size.should > 0
   end
-end
   
   it "should have start_path" do
     Rho::RhoConfig.start_path.should == '/app'
@@ -117,7 +115,6 @@ describe "RhoError" do
 
 end
 
-if !defined?(RHO_WP7)
 describe "RhomSource" do
 
   it "should find first source" do
@@ -154,7 +151,6 @@ describe "RhomSource" do
   end
 
 end
-end
 
 describe "RhoRuby" do
 
@@ -175,7 +171,6 @@ describe "RhoRuby" do
     val[10].should == '9'
 =end          
   end
-
 if !defined?(RHO_WP7)
   it "should support encoding" do
     "Utf8 String".force_encoding( Encoding::UTF_8 )
@@ -321,7 +316,7 @@ if !defined?(RHO_WP7)
     res = (1..6).group_by {|i| i%3}
     res.should == {0=>[3, 6], 1=>[1, 4], 2=>[2, 5]}
   end
-end
+end  
 
   it "should split with regex"  do
     str = "http://www.abc.com/abc/servlet/SearchServlet?act=viewDetail&LanguageCountry=en_US&searchLang=en_US&caseLang=en_US&orgPrefix=NCMC&caseNum=1234567&seqNum=1"

data/spec/phone_spec/app/spec/rhofile_spec.rb

@@ -2,7 +2,6 @@ describe "RhoFile" do
     
     before(:all) do
         clear()
-		
 		dir_name = Rho::RhoApplication::get_app_path('DataTemp')
 		Dir.mkdir(dir_name) unless Dir.exists?(dir_name)
     end
@@ -32,7 +31,7 @@ describe "RhoFile" do
         content.should ==  write_data1 + write_data2 
         
     end
-
+if !defined?(RHO_WP7)
     it "should binary read/write" do
         file_testname = File.join(Rho::RhoApplication::get_model_path('app', 'Data'), 'test.png')
         test_content = File.binread(file_testname)
@@ -49,17 +48,20 @@ describe "RhoFile" do
         content = File.binread(file_name)
         content.should == test_content
     end
-
+end
     def create_file_in_cache(dir_name, file, ext)
 	    # get full file path
 	    f = File.join(dir_name, "#{file}"+ "#{ext}")
         #check if file exists and return to fileName action if yes.
 	    return "exist" if File.exists?(f)
-	    
+	   
+        dd = 0    
+if !defined?(RHO_WP7)     
         # if no, get number of files in saving location. call delete action if equals 14
         files = Dir.entries(dir_name)
         #puts "files: #{files}"
 	    dd = files.size - 2 #skip . and ..
+end        
 	    if  dd == 2
 	        return "limit"
 	    else
@@ -85,9 +87,10 @@ describe "RhoFile" do
         
         res = create_file_in_cache(dir_name, "cache_test", "1")
         res.should ==  "exist" 
-        
+if !defined?(RHO_WP7)         
         res = create_file_in_cache(dir_name, "cache_test", "3")
         res.should ==  "limit" 
+end        
         
     end
 
@@ -101,12 +104,14 @@ describe "RhoFile" do
             File.exist?(nil)
         rescue Exception => e
             bExc = e.is_a?(TypeError)
-        end
+        end        
         
-        bExc.should ==  true
+        bExc.should ==  true  
+    
         File.exist?("").should == false
     end
     
+   if !defined?(RHO_WP7)   
     it "should readnonexistfile" do
         file_name = Rho::RhoFSConnector::get_app_path('app') + 'lang/lang_345'
         File.exist?(file_name).should ==  false 
@@ -123,6 +128,7 @@ describe "RhoFile" do
             bExc.should ==  true
         end    
     end
+    end
     
     def clear
         (1..2).each do |n|

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

@@ -1603,7 +1603,7 @@ end
     
   end          
 #=end  
-
+if !defined?(RHO_WP7)
   it "should not add property to freezed model" do
   
     if !$spec_settings[:schema_model]  
@@ -1614,7 +1614,7 @@ end
         #props['property'].should_not be_nil
         #props['property']['description'].should_not be_nil
     end
-
+   
     lambda { obj = getCase().new( :wrong_address => 'test') }.should raise_error(ArgumentError)
     lambda { obj = getCase().create( :wrong_address => 'test') }.should raise_error(ArgumentError)
     
@@ -1635,7 +1635,8 @@ end
     end
     
   end
-
+end
+  
   it "should add property to freezed model" do
     if !$spec_settings[:schema_model]  
         props = Rho::RhoConfig.sources()[getCase_str()]

data/spec/phone_spec/app/spec/syncengine_spec.rb

@@ -59,11 +59,9 @@ def syncserver_url
                     when /apple/i      then 'iphone'
                     when /symbian/i    then 'symbian'
                     when /wp7/i    then 'wp'
-                    when /windows/i    then 'wm'
   end
   platform = 'win32' if System.get_property('device_name') == 'Win32'
 
-  puts "platform: #{platform}"
   exact_url = SYNC_SERVER_URL.gsub(/exact_platform/, platform)
   puts "going to reset server: #{exact_url}"
   exact_url
@@ -103,19 +101,19 @@ describe "SyncEngine_test" do
     Rho::RhoConfig.bulksync_state='1'    
     
   end
-
+  
 if !defined?(RHO_WP7)
   it "should database_full_reset_ex raise an exception" do  
     exc = false
     begin
-        Rhom::Rhom.database_full_reset_ex( :models => [getProduct_str], :reset_client_info => true )    
+       Rhom::Rhom.database_full_reset_ex( :models => [getProduct_str], :reset_client_info => true )    
     rescue => e
         exc = true
     end
     
     exc.should be_true
   end
-end
+end  
 
   it "should database_full_reset_ex support different parameters" do
     Rhom::Rhom.database_full_reset_ex()
@@ -260,7 +258,7 @@ end
     res['status'].should == 'complete'
     res['error_code'].to_i.should == ::Rho::RhoError::ERR_NONE
   end
-  
+
   it "should sync all" do
     SyncEngine.logged_in.should == 1
   
@@ -863,7 +861,7 @@ end
     item2 = getProduct.find(item.object)
     item2.vars.should_not be_nil
   end
-
+  
   it "should not sync non-exist properties from freezed model" do
     SyncEngine.logged_in.should == 1
   
@@ -874,7 +872,7 @@ end
     cust = getCustomer().find(:first, :conditions => {:first => 'CustTest2'} )
     cust.should_not be_nil
 
-    Rhom::Rhom.database_full_reset    
+    Rhom::Rhom.database_full_reset
     Rho::RhoConfig.bulksync_state='1'
     
     cust1 = getCustomer().find(:first)
@@ -882,11 +880,11 @@ end
 
     saved_src = Rho::RhoConfig.sources[getCustomer_str()]
     begin
-        if !$spec_settings[:schema_model]    
+        if !$spec_settings[:schema_model]
             Rho::RhoConfig.sources[getCustomer_str()]['freezed'] = true
         else
-            Rho::RhoConfig.sources[getCustomer_str()]['schema']['property'].delete('first')        
-        end    
+            Rho::RhoConfig.sources[getCustomer_str()]['schema']['property'].delete('first')
+        end
         ::Rho::RHO.init_sync_source_properties(Rho::RhoConfig::sources.values)
         
         res2 = ::Rho::RhoSupport::parse_query_parameters getCustomer.sync( "/app/Settings/sync_notify")
@@ -899,11 +897,11 @@ end
 
         cust2 = getCustomer().find(:first, :conditions => {:first => 'CustTest2'} )
         cust2.should be_nil
-    ensure    
+    ensure
         Rho::RhoConfig.sources[getCustomer_str()] = saved_src
-    end    
+    end
   end
-    
+
   it "should logout" do
     SyncEngine.logout()
   

data/spec/phone_spec/app/spec_runner.rb

@@ -15,17 +15,15 @@ class SpecRunner < MSpecScript
     config[:files] << "spec/array/pack_spec"
     
     config[:files] << "spec/rho_spec"
-    
-    
+
 if !defined?(RHO_WP7)
     config[:files] << "spec/crypt_spec"
-    config[:files] << "spec/json_spec"
-    config[:files] << "spec/xml_spec"
-    	config[:files] << "spec/rhofile_spec"
-    		
-	config[:files] << "spec/asynchttp_spec"
 end
 
+    config[:files] << "spec/json_spec"    
+    config[:files] << "spec/xml_spec"    
+    config[:files] << "spec/rhofile_spec"
+	config[:files] << "spec/asynchttp_spec"
     config[:files] << "spec/date_spec"
     config[:files] << "spec/bsearch_spec"
 
@@ -34,7 +32,7 @@ end
     config[:files] << [ "spec/rhom_object_spec",
         [ {:schema_model=>true, :sync_model=>true},  {:schema_model=>true, :sync_model=>false},
           {:schema_model=>false, :sync_model=>true} , {:schema_model=>false, :sync_model=>false} ] ]
-
+          
 if !defined?(RHO_WP7)
     config[:files] << "spec/contacts_spec" unless System.get_property('device_name') == 'Win32'
 
@@ -44,13 +42,14 @@ if !defined?(RHO_WP7)
     config[:files] << "spec/barcode_spec" unless System.get_property('platform') == 'WINDOWS'
     config[:files] << "spec/mapview_spec"  unless System.get_property('platform') == 'WINDOWS'    
 end
+
     config[:files] << "spec/nativebar_spec" if System.get_property('platform') != 'Blackberry'
     config[:files] << "spec/navbar_spec" if System.get_property('platform') == 'APPLE' || System.get_property('platform') == 'ANDROID'
 
     config[:files] << "spec/xruby_spec" if defined? RHO_ME
 
-config[:files] << [ "spec/syncengine_spec", [ {:schema_model=>true }, {:schema_model=>false } ] ]
-config[:files] << [ "spec/blobsync_spec", [ {:schema_model=>true }, {:schema_model=>false } ] ]
+    config[:files] << [ "spec/syncengine_spec", [ {:schema_model=>true }, {:schema_model=>false } ] ]
+    config[:files] << [ "spec/blobsync_spec", [ {:schema_model=>true }, {:schema_model=>false } ] ]
 
 if !defined?(RHO_WP7)
     config[:files] << "spec/bulksync_spec"