rhodes 2.1.0 → 2.2.0.beta.1

data/platform/wm/rhodes/rhodes.vcproj

@@ -86,7 +86,7 @@
 				IgnoreImportLibrary="true"
 				UseUnicodeResponseFiles="false"
 				AdditionalOptions=" /subsystem:windowsce,5.01 /machine:THUMB"
-				AdditionalDependencies="aygshell.lib Ws2.lib Ceshell.lib wininet.lib Cellcore.lib Gpsapi.lib  comsuppwd.lib pimstore.lib"
+				AdditionalDependencies="aygshell.lib Ws2.lib Ceshell.lib wininet.lib Cellcore.lib Gpsapi.lib  comsuppwd.lib pimstore.lib bthutil.lib"
 				OutputFile="$(OutDir)/rhodes.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
@@ -186,9 +186,9 @@
 				AdditionalDependencies="wininet.lib comsuppwd.lib ws2_32.lib"
 				OutputFile="$(OutDir)/rhodes.exe"
 				LinkIncremental="2"
+				AdditionalLibraryDirectories="$(OutDir)"
 				GenerateDebugInformation="true"
 				SubSystem="0"
-				AdditionalLibraryDirectories="$(OutDir)"
 				StackReserveSize="196608"
 				StackCommitSize="4096"
 				ImportLibrary="$(OutDir)/Rhodes.lib"
@@ -469,7 +469,7 @@
 				IgnoreImportLibrary="true"
 				UseUnicodeResponseFiles="false"
 				AdditionalOptions=" /subsystem:windowsce,5.01 /machine:THUMB"
-				AdditionalDependencies="Ws2.lib Ceshell.lib wininet.lib Cellcore.lib Gpsapi.lib  comsuppw.lib pimstore.lib"
+				AdditionalDependencies="Ws2.lib Ceshell.lib wininet.lib Cellcore.lib Gpsapi.lib  comsuppw.lib pimstore.lib bthutil.lib"
 				OutputFile="$(OutDir)/rhodes.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
@@ -567,8 +567,8 @@
 				AdditionalDependencies="wininet.lib comsuppwd.lib ws2_32.lib"
 				OutputFile="$(OutDir)/rhodes.exe"
 				LinkIncremental="1"
-				GenerateDebugInformation="false"
 				AdditionalLibraryDirectories="$(OutDir)"
+				GenerateDebugInformation="false"
 				SubSystem="0"
 				StackReserveSize="196608"
 				StackCommitSize="4096"
@@ -830,6 +830,10 @@
 				RelativePath=".\menubar.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\OutlookApp.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\Rhodes.cpp"
 				>
@@ -956,6 +960,10 @@
 				RelativePath=".\OkCancelModalDialog.h"
 				>
 			</File>
+			<File
+				RelativePath=".\OutlookApp.h"
+				>
+			</File>
 			<File
 				RelativePath=".\resource.h"
 				>
@@ -1042,6 +1050,10 @@
 			<Filter
 				Name="rubyext"
 				>
+				<File
+					RelativePath=".\rho\rubyext\calendar.cpp"
+					>
+				</File>
 				<File
 					RelativePath=".\rho\rubyext\GeoLocationImpl.cpp"
 					>
@@ -1141,13 +1153,18 @@
 			<File
 				RelativePath=".\signature\Signature.h"
 				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="bluetooth"
+			>
+			<File
+				RelativePath=".\bluetooth\Bluetooth.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\bluetooth\Bluetooth.h"
+				>
 			</File>
 		</Filter>
 	</Files>

data/platform/wm/rhodes/stdafx.h

@@ -157,6 +157,7 @@ using namespace ATL;
 
 #include "tcmalloc/rhomem.h"
 #include "logging/RhoLog.h"
+//#include <afxwin.h>
 
 #if defined(OS_WINDOWS)
 #include <atlapp.h>

data/platform/wm/rubylib/rubylib.vcproj

@@ -1576,6 +1576,14 @@
 						>
 					</File>
 				</Filter>
+				<Filter
+					Name="bluetooth"
+					>
+					<File
+						RelativePath="..\..\shared\ruby\ext\bluetooth\bluetooth_wrap.c"
+						>
+					</File>
+				</Filter>
 				<Filter
 					Name="stringio"
 					>
@@ -1660,6 +1668,30 @@
 						>
 					</File>
 				</Filter>
+				<Filter
+					Name="calendar"
+					>
+					<File
+						RelativePath="..\..\shared\ruby\ext\calendar\calendar.i"
+						>
+					</File>
+					<File
+						RelativePath="..\..\shared\ruby\ext\calendar\calendar_wrap.c"
+						>
+					</File>
+					<File
+						RelativePath="..\..\shared\ruby\ext\calendar\event.h"
+						>
+					</File>
+					<File
+						RelativePath="..\..\shared\ruby\ext\calendar\event.i"
+						>
+					</File>
+					<File
+						RelativePath="..\..\shared\ruby\ext\calendar\event_wrap.c"
+						>
+					</File>
+				</Filter>
 			</Filter>
 			<Filter
 				Name="generated"

data/rakefile.rb

@@ -63,9 +63,16 @@ namespace "config" do
     
     if RUBY_PLATFORM =~ /(win|w)32$/
       $all_files_mask = "*.*"
+      $rubypath = "res/build-tools/RhoRuby.exe"
     else
       $all_files_mask = "*"
+      if RUBY_PLATFORM =~ /darwin/
+        $rubypath = "res/build-tools/RubyMac"
+      else
+        $rubypath = "res/build-tools/rubylinux"
+      end
     end
+	
     if $app_path.nil? #if we are called from the rakefile directly, this wont be set
       #load the apps path and config
 
@@ -768,7 +775,7 @@ namespace "build" do
     #    desc "Build rhosync-client package"
     task :rhosync_client do
 
-        ver = File.read("rhosync-client/version") #.gsub(".", "_")
+        ver = File.read("rhosync-client/version").chomp #.gsub(".", "_")
         zip_name = "rhosync-client-"+ver+".zip"
 
         bin_dir = "rhosync-client-bin"

data/res/generators/templates/application/Rakefile

@@ -16,7 +16,7 @@ else
 end
 
 unless File.exists? rakefilepath
-  puts "\nCannot find your Rhodes gem or source path."
+  puts "\nCannot find your Rhodes gem or source path: #{rakefilepath}"
   puts "\nIf you have the sdk on your path or have installed the gem this"
   puts "can be resolved by running 'set-rhodes-sdk'"
   puts "\nYou can also set this manually by modifying your build.yml or"

data/res/generators/templates/application/app/layout.erb

@@ -11,6 +11,9 @@
         <script src="/public/jqtouch/jquery.1.3.2.min.js" type="text/javascript"></script>
         <script src="/public/jqtouch/jqtouch.js" type="text/javascript"></script>
         <link href="/public/jqtouch/jqtouch.css" type="text/css" rel="stylesheet"/>
+        <%% if System::get_property('platform') == 'APPLE' %>
+            <link href="/public/jqtouch/jqtouch-iphone.css" type="text/css" rel="stylesheet"/>
+        <%% end %>
         <script>$.jQTouch();</script>
     <%% end %>
 
@@ -39,4 +42,4 @@
     <%%= @content %>
 </body>
 
-</html>
+</html>

data/res/generators/templates/application/build.yml

@@ -10,7 +10,6 @@ applog: rholog.txt
 iphone:
   configuration: Debug
   sdk: iphonesimulator4.0
-  emulator: 4.0.1
   provisionprofile:
   codesignidentity:
   entitlements:

data/res/generators/templates/application/public/css/iphone.css

@@ -203,7 +203,7 @@ h1 {
     padding: 15px 0 15px 0;
 }
 
-.content ul li a:hover {
+.content ul li a:active {
     background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(rgb(5, 140, 245)), to(rgb(1, 95, 230)));
 }
 
@@ -407,4 +407,4 @@ h1 {
     margin: 0;
     margin: 0 8px;
     color: #565E70;
-}
+}

data/res/generators/templates/application/public/jqtouch/jqtouch-iphone.css

@@ -0,0 +1,9 @@
+body {
+   -webkit-perspective: 800;
+   -webkit-transform-style: preserve-3d;
+}
+
+body > * {
+   -webkit-backface-visibility: hidden;
+   -webkit-transform: translate3d(0,0,0) rotate(0) scale(1);
+}

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

@@ -11,20 +11,16 @@ body {
     -webkit-user-select: none;
     -webkit-text-size-adjust: none;
     font-family: Helvetica;
-   -webkit-perspective: 800;
-   -webkit-transform-style: preserve-3d;
 }
 .selectable, input, textarea {
     -webkit-user-select: auto;
 }
 body > * {
-   -webkit-backface-visibility: hidden;
     -webkit-box-sizing: border-box;
     display: none;
     position: absolute;
     left: 0;
     width: 100%;
-   -webkit-transform: translate3d(0,0,0) rotate(0) scale(1);
     min-height: 420px !important;
 }
 body.fullscreen > * {
@@ -375,4 +371,4 @@ body > .current {
 .waiting {
     display: block !important;
     background: rgba(0,0,0,0.5);
-}
+}

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

@@ -375,7 +375,8 @@
                 {
                     if (animation.name == "slide") {
                         var css = {webkitTransitionDuration: null,
-                            webkitTransitionTimingFunction: null};
+                            webkitTransitionTimingFunction: null,
+                            webkitTransform: null};
                         toPage.css(css);
                         fromPage.css(css);
                     }
@@ -738,4 +739,4 @@
         $.jQTouch.prototype.extensions.push(extension);
     }
 
-})(jQuery);
+})(jQuery);

data/rhodes.gemspec

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

data/spec/perfomance_spec/app/Benchmark/benchmark.rb

@@ -0,0 +1,4 @@
+class Benchmark
+  include Rhom::PropertyBag
+  
+end

data/spec/perfomance_spec/app/Benchmark/bulk_results.erb

@@ -0,0 +1,13 @@
+<div class="toolbar">
+	<h1 id="pageTitle">
+		Benchmark
+	</h1>
+</div>
+
+<%@color = "#00ff00"%>
+
+    <ul id="perftest" title="PerfomanceTests" selected="true">
+        <li style="color:"
+            <%=@color%>">Controller Time (ms): <%=@time%>
+        </li>
+    </ul>

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

@@ -0,0 +1,178 @@
+require 'rho/rhocontroller'
+require 'helpers/browser_helper'
+
+class BenchmarkController < Rho::RhoController
+  include BrowserHelper
+  
+  #GET /Benchmark
+  def index
+    render
+  end
+  
+  def create_test_data
+	db = Rho::RHO.get_src_db('Product')
+	db.start_transaction
+  
+	(0..100).each do |i|
+	    attrs = {'brand'=>"HTC#{i}", 'name'=>"Name#{i}"}
+		
+	    (0..100).each do |j|		
+	        attrs['price'] = j.to_s
+    		Product.create( attrs )
+	    end
+	end
+	
+	db.commit	
+  end
+  
+  def search_test
+    SyncEngine.set_threaded_mode(false)
+    ::Rhom::Rhom.database_fullclient_reset_and_logout
+    SyncEngine.set_syncserver('http://localhost:9292/application')
+    SyncEngine.login('', '', "")	
+    Rho::RhoConfig.bulksync_state='1'
+    $bench_results = "" unless $bench_results
+    
+    time = Time.now.to_f
+	#create_test_data
+    Customer.sync
+
+	$bench_results << "   Sync data(10,000) (ms): #{((Time.now.to_f - time) * 10**3 ).to_i}\n"
+	
+	time = Time.now.to_f
+	
+	@customers = Customer.find(:all, :conditions => {'JobTitle' => 'PerfManager'})
+	
+	$bench_results << "   Search (ms): #{((Time.now.to_f - time) * 10**3 ).to_i}\n"
+
+	time = Time.now.to_f
+	
+    render :action => :customers
+    
+	$bench_results << "   Render (ms): #{((Time.now.to_f - time) * 10**3 ).to_i}\n"
+	
+	puts "BENCH results: \n#{$bench_results }"
+	render :action => :index
+	
+  end
+
+  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.login('', '', "")	
+    Rho::RhoConfig.bulksync_state='1'
+    SyncEngine.dosync
+    
+    $bench_results = "" unless $bench_results
+    time = Time.now.to_f
+	
+	Product.create( {'brand'=>"HTC", 'name'=>"NameTest", "price"=>'1'} )
+	$bench_results << "   Create 1 item (ms): #{((Time.now.to_f - time) * 10**3 ).to_i}\n"
+
+    time = Time.now.to_f
+	Product.sync
+	$bench_results << "   Sync 1 item (ms): #{((Time.now.to_f - time) * 10**3 ).to_i}\n"
+
+    time = Time.now.to_f
+	@products = Product.find(:all, :conditions => {'name' => 'NameTest'})
+	
+	$bench_results << "   Search (ms): #{((Time.now.to_f - time) * 10**3 ).to_i}\n"
+
+	time = Time.now.to_f
+	
+    render :action => :products
+    
+	$bench_results << "   Render (ms): #{((Time.now.to_f - time) * 10**3 ).to_i}\n"
+
+	puts "BENCH results: \n#{$bench_results }"
+	render :action => :index
+	
+  end
+
+  def bulk_test
+    $bench_results = "" unless $bench_results  
+    time = Time.now.to_f
+  
+    SyncEngine.set_threaded_mode(false)
+    ::Rhom::Rhom.database_fullclient_reset_and_logout
+    #SyncEngine.set_syncserver('http://store-bulk.rhohub.com/application')
+    #SyncEngine.login('lars', 'larspass', "/app/Settings/login_callback")	
+    SyncEngine.set_syncserver('http://192.168.0.62:9292/application')
+    SyncEngine.login('', '', "")	
+    
+    Rho::RhoConfig.bulksync_state='0'    
+	$bench_results << "   Reset and login(ms): #{((Time.now.to_f - time) * 10**3 ).to_i}\n"
+
+    time = Time.now.to_f
+    
+    SyncEngine.dosync
+    
+	$bench_results << "   Bulk sync(ms): #{((Time.now.to_f - time) * 10**3 ).to_i}\n"
+
+	time = Time.now.to_f
+	
+	@customers = Customer.find(:all, :conditions => {'JobTitle' => 'PerfManager'})
+	
+	$bench_results << "   Search (ms): #{((Time.now.to_f - time) * 10**3 ).to_i}\n"
+
+	time = Time.now.to_f
+	
+    render :action => :customers
+    
+	$bench_results << "   Render (ms): #{((Time.now.to_f - time) * 10**3 ).to_i}\n"
+
+	puts "BENCH results: \n#{$bench_results }"
+	render :action => :index
+	
+  end
+  
+  def asynchttp_test
+    $bench_results = "" unless $bench_results  
+    
+    ::Rhom::Rhom.database_fullclient_reset_and_logout
+      
+	time = Time.now.to_f
+  
+    res = Rho::AsyncHttp.get( :url => 'http://rhodes-perftest-json.heroku.com/test' )
+	$bench_results << "   Download (ms): #{((Time.now.to_f - time) * 10**3 ).to_i}\n"
+	
+	time = Time.now.to_f
+    
+    #parsed = res['body']
+    parsed = Rho::JSON.parse(res['body'])
+
+	$bench_results << "   Parse JSON(ms): #{((Time.now.to_f - time) * 10**3 ).to_i}\n"
+
+	time = Time.now.to_f
+
+	db = Rho::RHO.get_src_db('Benchmark')
+	db.start_transaction
+    
+    parsed.each do |id, values|
+        #values = srcHash['customer']    
+        values['object'] = id
+        Benchmark.create(values)
+    end
+	db.commit
+	    
+	$bench_results << "   Insert to DB (ms): #{((Time.now.to_f - time) * 10**3 ).to_i}\n"
+
+	time = Time.now.to_f
+	
+	@customers = Benchmark.find(:all, :conditions => {'JobTitle' => 'PerfManager'})
+	
+	$bench_results << "   Search (ms): #{((Time.now.to_f - time) * 10**3 ).to_i}\n"
+
+	time = Time.now.to_f
+	
+    render :action => :customers
+    
+	$bench_results << "   Render (ms): #{((Time.now.to_f - time) * 10**3 ).to_i}\n"
+
+	puts "BENCH results: \n#{$bench_results }"
+	render :action => :index
+    
+  end
+  
+end