RubyGems - rhodes - Versions diffs - 3.2.3 → 3.3.0.beta.1 - Mend

rhodes 3.2.3 → 3.3.0.beta.1

Files changed (368) hide show

data/rhomobile-debug.gemspec CHANGED Viewed

@@ -2,7 +2,7 @@
 Gem::Specification.new do |s|
   s.name = "rhomobile-debug"
-  s.version = "1.0.5"
+  s.version = "1.0.6"
   s.authors = ["Rhomobile"]
   s.date    = Time.now.strftime('%Y-%m-%d')
   s.description = %q{Rhomobile debugger extension}

data/spec/framework_spec/app/layout.erb CHANGED Viewed

@@ -6,7 +6,7 @@
 		<link href="/public/css/base.css" type="text/css" rel="stylesheet"/>
 		<% if System::get_property('platform') == 'APPLE' %>
-			<meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;"/>
+			<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"/>
 			<!-- <script src="/public/js/jquery-1.2.6.min.js"></script>
 			<script src="/public/js/rho.js"></script>

data/spec/framework_spec/app/spec/core/rational/Rational_spec.rb CHANGED Viewed

@@ -1,5 +1,5 @@
 ruby_version_is "1.9" do
-  require File.expand_path('../../../shared/rational/Rational', __FILE__)
+  require File.expand_path('../../../shared/rational/rational_main', __FILE__)
   describe "Rational()" do
     describe "passed two arguments" do

data/spec/framework_spec/app/spec/library/stringio/shared/each_char.rb CHANGED Viewed

@@ -1,9 +1,13 @@
 # -*- encoding: utf-8 -*-
 describe :stringio_each_char, :shared => true do
   before(:each) do
-    old_kcode, $KCODE = "UTF-8", $KCODE
+    ruby_version_is ""..."1.9" do
+      old_kcode, $KCODE = "UTF-8", $KCODE
+    end
     @io = StringIO.new("xyz äöü")
-    $KCODE = old_kcode
+    ruby_version_is ""..."1.9" do
+      $KCODE = old_kcode
+    end
   end
   it "yields each character code in turn" do

data/spec/framework_spec/app/spec/shared/rational/{Rational.rb → rational_main.rb} RENAMED Viewed

File without changes

data/spec/framework_spec/build.yml CHANGED Viewed

@@ -14,7 +14,4 @@ iphone:
   configuration: Release
   #extensions: ["digest-sha1"]
-android:
-  version: 2.3.3
 extensions: ["mspec", "fileutils", "digest", "digest-md5", "digest-sha1", "test-libs", "set", "thread", "timeout", "uri", "net-http", "fcntl", "rexml" ]

data/spec/perfomance_spec/app/Benchmark/controller.rb CHANGED Viewed

@@ -59,7 +59,7 @@ class BenchmarkController < Rho::RhoController
   def create_test
     SyncEngine.set_threaded_mode(false)
     ::Rhom::Rhom.database_fullclient_reset_and_logout
-    SyncEngine.set_syncserver('http://rhodes-store-server.heroku.com/application')
+    SyncEngine.set_syncserver('http://rhodes-store-spec-server.heroku.com/application')
     SyncEngine.login('', '', "")
     Rho::RhoConfig.bulksync_state='1'
     SyncEngine.dosync

data/spec/perfomance_spec/app/layout.erb CHANGED Viewed

@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 	<head>
 		<title>Tasklist</title>
-		<meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;"/>
+		<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0,"/>
 		<% if System::get_property('platform') == 'APPLE' %>
             <link href="/public/css/webkit.css" type="text/css" rel="stylesheet"/>

data/spec/phone_spec/app/BlobTest_s/blob_test_s.rb ADDED Viewed

@@ -0,0 +1,13 @@
+require 'rhom'
+class BlobTest_s
+    include Rhom::FixedSchema
+    enable :sync
+    property :name, :string
+    property :filename, :string
+    property :image_uri, :blob, :overwrite
+end

data/spec/phone_spec/app/BlobTest_s/test.png ADDED Viewed

Binary file

data/spec/phone_spec/app/BlobTest_s/test2.png ADDED Viewed

Binary file

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

@@ -21,6 +21,18 @@
 require 'rho/rho'
 #require 'fileutils'
+def getBlobTest
+    return BlobTest_s if $spec_settings[:schema_model]
+    BlobTest
+end
+def getBlobTest_str
+    return 'BlobTest_s' if $spec_settings[:schema_model]
+    'BlobTest'
+end
 describe "BlobSync_test" do
   before(:all)  do
@@ -43,7 +55,7 @@ describe "BlobSync_test" do
   it "should sync BlobTest" do
     SyncEngine.logged_in.should == 1
-    res = ::Rho::RhoSupport::parse_query_parameters BlobTest.sync( "/app/Settings/sync_notify")
+    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
@@ -51,7 +63,7 @@ describe "BlobSync_test" do
   it "should delete all Test Blobs" do
     SyncEngine.logged_in.should == 1
-    items = BlobTest.find(:all ) #, :conditions => {:name => 'BlobTestItem'})
+    items = getBlobTest.find(:all ) #, :conditions => {:name => 'BlobTestItem'})
     items.should_not == nil
     items.each do |item|
@@ -61,14 +73,14 @@ describe "BlobSync_test" do
         File.exists?(file_name).should == false
     end
-    BlobTest.sync( "/app/Settings/sync_notify")
+    getBlobTest.sync( "/app/Settings/sync_notify")
     sleep(2) #wait till sync server update data
-    res = ::Rho::RhoSupport::parse_query_parameters BlobTest.sync( "/app/Settings/sync_notify")
+    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 = BlobTest.find(:first ) #, :conditions => {:name => 'BlobTestItem'})
+    item2 = getBlobTest.find(:first ) #, :conditions => {:name => 'BlobTestItem'})
     item2.should == nil
   end
@@ -80,25 +92,25 @@ describe "BlobSync_test" do
   it "should create new BlobTest" do
     SyncEngine.logged_in.should == 1
-    file_name = File.join(Rho::RhoApplication::get_model_path('app','BlobTest'), 'test.png')
+    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')
     file_size = File.size(file_name)
     file_content = File.read(file_name)
-    item = BlobTest.new
+    item = getBlobTest.new
     #item.name = 'BlobTestItem'
     item.image_uri = file_name
     item.save
-    BlobTest.sync( "/app/Settings/sync_notify")
+    getBlobTest.sync( "/app/Settings/sync_notify")
     sleep(2) #wait till sync server update data
-    res = ::Rho::RhoSupport::parse_query_parameters BlobTest.sync( "/app/Settings/sync_notify")
+    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
-    items = BlobTest.find(:all ) #, :conditions => {:name => 'BlobTestItem'})
+    items = getBlobTest.find(:all ) #, :conditions => {:name => 'BlobTestItem'})
     items.should_not == nil
     items.length.should == 1
@@ -113,11 +125,11 @@ describe "BlobSync_test" do
   it "should modify BlobTest" do
     SyncEngine.logged_in.should == 1
-    item = BlobTest.find(:first)
+    item = getBlobTest.find(:first)
     item.should_not == nil
     saved_obj = item.object
-    file_name = File.join(Rho::RhoApplication::get_model_path('app','BlobTest'), 'test2.png')
+    file_name = File.join(Rho::RhoApplication::get_model_path('app',getBlobTest_str()), 'test2.png')
     copy_file(file_name, Rho::RhoApplication::get_blob_folder() )
     file_name = File.join(Rho::RhoApplication::get_blob_folder(), 'test2.png')
@@ -129,14 +141,14 @@ describe "BlobSync_test" do
     item.save
     File.exists?(old_file).should == false
-    BlobTest.sync( "/app/Settings/sync_notify")
+    getBlobTest.sync( "/app/Settings/sync_notify")
     sleep(2) #wait till sync server update data
-    res = ::Rho::RhoSupport::parse_query_parameters BlobTest.sync( "/app/Settings/sync_notify")
+    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 = BlobTest.find(saved_obj)
+    item2 = getBlobTest.find(saved_obj)
     item2.should_not be_nil
     item2.image_uri.should == file_name

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

@@ -57,5 +57,31 @@ if !defined? RHO_ME
     res.to_s.should == "2010-08-16"
   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)
+    res = to_day - 5
+    res.day.should == 16
+    puts "res : #{res.day}"
+    res = to_day2-to_day
+if !defined? RHO_ME
+    res.to_s.should == "365/1"
+else
+    res.to_s.should == "365"
+end
+    puts "res : #{res}"
+    res = to_day+5
+    res.day.should == 26
+    puts "res : #{res.day}"
+  end
+end
 end

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

@@ -176,6 +176,12 @@ describe "RhoRuby" do
 =end
   end
+if !defined?(RHO_WP7)
+  it "should support encoding" do
+    "Utf8 String".force_encoding( Encoding::UTF_8 )
+  end
+end
   it "should create hex string" do
     val = "\x21\x43"
 =begin

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

@@ -19,6 +19,7 @@
 #require 'spec/spec_helper'
 require 'rhom'
 require 'rho/rhoutils'
+require 'json'
 USE_HSQLDB = !System.get_property('has_sqlite')
 USE_COPY_FILES = !defined? RHO_ME && !defined? RHO_WP7
@@ -885,6 +886,40 @@ end
   end
+  it "should search with NOT IN array" do
+    items = getAccount.find( :all,
+       :conditions => {
+        {:name=>'industry', :op=>'NOT IN'} => ["Technology1", "Technology2"] }
+    )
+    items.length.should == 2
+    items = getAccount.find( :all,
+       :conditions => {
+        {:name=>'industry', :op=>'NOT IN'} => ["Technology"] }
+    )
+    items.length.should == 0
+  end
+  it "should search with NOT IN string" do
+    items = getAccount.find( :all,
+       :conditions => {
+        {:name=>'industry', :op=>'NOT IN'} => "\"Technology1\", \"Technology2\"" }
+    )
+    items.length.should == 2
+    items = getAccount.find( :all,
+       :conditions => {
+        {:name=>'industry', :op=>'NOT IN'} => "\"Technology\"" }
+    )
+    items.length.should == 0
+  end
   it "should find with group of advanced conditions" do
     query = '%IND%'
     cond1 = {
@@ -1242,32 +1277,29 @@ end
 if !defined?(RHO_WP7)
   it "should support blob type" do
-    #TODO: fix blob for schema models
-    unless $spec_settings[:schema_model]
-        file_name = File.join(Rho::RhoApplication::get_blob_folder, 'MyText123.txt')
-        puts "file_name : #{file_name}"
-        File.delete(file_name) if File.exists?(file_name)
-        File.exists?(file_name).should ==  false
-        write_data  = "this is blob test"
-        f = File.new(file_name, "w")
-        f.write(write_data)
-        f.close
-        File.exists?(file_name).should == true
-        blob_name = file_name[__rhoGetCurrentDir().length(), file_name.length()-__rhoGetCurrentDir().length()]
-        puts "blob_name : #{blob_name}"
-        item = getAccount.create({'my_text'=>blob_name})
-        item.my_text.should == blob_name
-        File.exists?(file_name).should == true
-        item.destroy
-        item2 = getAccount.find(item.object)
-        item2.should be_nil
-        File.exists?(file_name).should == false
-    end
+    file_name = File.join(Rho::RhoApplication::get_blob_folder, 'MyText123.txt')
+    #puts "file_name : #{file_name}"
+    File.delete(file_name) if File.exists?(file_name)
+    File.exists?(file_name).should ==  false
+    write_data  = "this is blob test"
+    f = File.new(file_name, "w")
+    f.write(write_data)
+    f.close
+    File.exists?(file_name).should == true
+    blob_name = file_name[__rhoGetCurrentDir().length(), file_name.length()-__rhoGetCurrentDir().length()]
+    #puts "blob_name : #{blob_name}"
+    item = getAccount.create({'my_text'=>blob_name})
+    item.my_text.should == blob_name
+    File.exists?(file_name).should == true
+    item.destroy
+    item2 = getAccount.find(item.object)
+    item2.should be_nil
+    File.exists?(file_name).should == false
   end
 end
@@ -1650,6 +1682,12 @@ end
       @accts3 = getAccount.paginate(:per_page => 20, :order=> 'name', :page => 2)
       @accts3.length.should == 0
     end
+    it "should assign metadata" do
+      meta = {"foo" => "bar"}
+      getAccount.metadata = meta.to_json
+      getAccount.metadata.should == meta
+    end
 end
 #=end

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

@@ -48,17 +48,34 @@ def getTestDB
     ::Rho::RHO.get_db_partitions['user']
 end
-SYNC_SERVER_URL = 'http://rhodes-store-server.heroku.com/application'
+SYNC_SERVER_URL = "http://rhoconnect-spec-exact_platform.heroku.com/application"
+#SYNC_SERVER_URL = "http://rhodes-store-spec-server.heroku.com/application"
 #SYNC_SERVER_URL = 'http://localhost:9292/application'
+def syncserver_url
+  platform = case System.get_property('platform')
+                    when /android/i    then 'android'
+                    when /blackberry/i then 'bb'
+                    when /apple/i      then 'iphone'
+                    when /symbian/i    then 'symbian'
+                    when /windows/i    then 'wm'
+  end
+  platform = 'win32' if System.get_property('device_name') == 'Win32'
+  exact_url = SYNC_SERVER_URL.gsub(/exact_platform/, platform)
+  puts "going to reset server: #{exact_url}"
+  exact_url
+end
 describe "SyncEngine_test" do
   before(:all)  do
     SyncEngine.set_threaded_mode(false)
+    # init client
     ::Rhom::Rhom.database_fullclient_reset_and_logout
-    SyncEngine.set_syncserver(SYNC_SERVER_URL)
+    SyncEngine.set_syncserver(syncserver_url)
     Rho::RHO.load_all_sources()
@@ -76,7 +93,7 @@ describe "SyncEngine_test" do
   end
   after (:each) do
-    Rho::RhoConfig.syncserver = SYNC_SERVER_URL
+    Rho::RhoConfig.syncserver = syncserver_url
     SyncEngine.set_source_property(getProduct().get_source_id.to_i(), "rho_server_response", "" )
     ::Rho::RHO.get_user_db().delete_all_from_table('changed_values')
@@ -94,7 +111,7 @@ describe "SyncEngine_test" do
     exc.should be_true
   end
-  it "should database_full_reset_ex support different parameters" do
+  it "should database_full_reset_ex support different parameters" do
     Rhom::Rhom.database_full_reset_ex()
     Rhom::Rhom.database_full_reset_ex( :reset_client_info => true )
     Rhom::Rhom.database_full_reset_ex( :reset_local_models => true )
@@ -196,7 +213,11 @@ end
     dbRes.length.should == 1
     dbRes[0]['token_sent'].should == 0
     dbRes[0]['token'].should be_nil
-    dbRes[0]['client_id'].should be_nil
+    if $spec_settings[:schema_model]
+        dbRes[0]['client_id'].should be_nil
+    else
+        dbRes[0]['client_id'].should == ""
+    end
     res = ::Rho::RhoSupport::parse_query_parameters getProduct.sync( "/app/Settings/sync_notify")
     res['status'].should == 'ok'
@@ -312,7 +333,7 @@ if !defined?(RHO_WP7)
     records = ::Rho::RHO.get_user_db().select_from_table('changed_values','*')
     records.length.should_not == 0
-    Rho::RhoConfig.syncserver = SYNC_SERVER_URL
+    Rho::RhoConfig.syncserver = syncserver_url
     res = ::Rho::RhoSupport::parse_query_parameters getCustomer.sync
     res['status'].should == 'ok'
     res['error_code'].to_i.should == ::Rho::RhoError::ERR_NONE
@@ -631,7 +652,7 @@ end
     SyncEngine.set_source_property(getProduct().get_source_id.to_i(), "rho_server_response", err_resp )
     res = ::Rho::RhoSupport::parse_query_parameters getProduct.sync( "/app/Settings/sync_notify")
-    puts "res : #{res}"
+    #puts "res : #{res}"
     res['server_errors'].should_not be_nil
     res['server_errors']['update-error'].should_not be_nil