rhodes 2.2.3 → 2.2.4.beta.1

data/platform/wm/rhodes/stdafx.h

@@ -35,6 +35,7 @@
 
 #if defined (_WIN32_WCE)
 // NOTE - this is value is not strongly correlated to the Windows CE OS version being targeted
+#undef WINVER
 #define WINVER _WIN32_WCE
 #else
 // Modify the following defines if you have to target a platform prior to the ones specified below.

data/platform/wm/rubylib/rubylib.vcproj

@@ -183,10 +183,10 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			OutputDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
+			IntermediateDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="4"
-			CharacterSet="1"
+			CharacterSet="2"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -207,6 +207,7 @@
 				Name="VCCLCompilerTool"
 				ExecutionBucket="7"
 				Optimization="0"
+				AdditionalIncludeDirectories="..\..\shared\ruby\.;..\..\shared\ruby\include;..\..\shared\ruby\wince;..\..\shared\ruby\wince\sys;..\..\shared\ruby\win32;..\..\shared\ruby\generated;..\..\shared\ruby\rhoruby;..\..\shared"
 				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;DEBUG;_LIB;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
 				MinimalRebuild="true"
 				RuntimeLibrary="1"
@@ -260,7 +261,7 @@
 			OutputDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			IntermediateDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="4"
-			CharacterSet="1"
+			CharacterSet="2"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -281,7 +282,7 @@
 				Name="VCCLCompilerTool"
 				ExecutionBucket="7"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\shared\ruby\.;..\..\shared\ruby\include;..\..\shared\ruby\wince;..\..\shared\ruby\wince\sys;..\..\shared\ruby\win32;..\..\shared\ruby\generated;..\..\shared\ruby\rhoruby;..\sqlite3"
+				AdditionalIncludeDirectories="..\..\shared\ruby\.;..\..\shared\ruby\include;..\..\shared\ruby\wince;..\..\shared\ruby\wince\sys;..\..\shared\ruby\win32;..\..\shared\ruby\generated;..\..\shared\ruby\rhoruby;..\..\shared"
 				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;DEBUG;_LIB;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
 				MinimalRebuild="true"
 				RuntimeLibrary="1"
@@ -694,10 +695,10 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			OutputDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
+			IntermediateDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="4"
-			CharacterSet="1"
+			CharacterSet="2"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -718,6 +719,7 @@
 				Name="VCCLCompilerTool"
 				ExecutionBucket="7"
 				Optimization="2"
+				AdditionalIncludeDirectories="..\..\shared\ruby\.;..\..\shared\ruby\include;..\..\shared\ruby\wince;..\..\shared\ruby\wince\sys;..\..\shared\ruby\win32;..\..\shared\ruby\generated;..\..\shared\ruby\rhoruby;..\..\shared"
 				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;_LIB;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"

data/platform/wm/sqlite3/sqlite3.vcproj

@@ -183,8 +183,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			OutputDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
+			IntermediateDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="4"
 			CharacterSet="1"
 			>
@@ -207,6 +207,7 @@
 				Name="VCCLCompilerTool"
 				ExecutionBucket="7"
 				Optimization="0"
+				AdditionalIncludeDirectories="../../shared"
 				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;DEBUG;_LIB;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
 				MinimalRebuild="true"
 				RuntimeLibrary="1"
@@ -693,8 +694,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			OutputDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
+			IntermediateDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="4"
 			CharacterSet="1"
 			>
@@ -717,6 +718,7 @@
 				Name="VCCLCompilerTool"
 				ExecutionBucket="7"
 				Optimization="2"
+				AdditionalIncludeDirectories="../../shared"
 				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;_LIB;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"

data/platform/wm/syncengine/syncengine.vcproj

@@ -183,8 +183,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			OutputDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
+			IntermediateDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="4"
 			CharacterSet="1"
 			>
@@ -207,6 +207,7 @@
 				Name="VCCLCompilerTool"
 				ExecutionBucket="7"
 				Optimization="0"
+				AdditionalIncludeDirectories="..\..\shared\ruby\wince;..\..\shared\json;..\..\shared"
 				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;DEBUG;_LIB;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
 				MinimalRebuild="true"
 				RuntimeLibrary="1"
@@ -281,7 +282,7 @@
 				Name="VCCLCompilerTool"
 				ExecutionBucket="7"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\shared\ruby\wince;..\..\shared\json;..\sqlite3"
+				AdditionalIncludeDirectories="..\..\shared\ruby\wince;..\..\shared\json;..\..\shared"
 				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;DEBUG;_LIB;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
 				MinimalRebuild="true"
 				RuntimeLibrary="1"
@@ -694,8 +695,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			OutputDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
+			IntermediateDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="4"
 			CharacterSet="1"
 			>
@@ -718,6 +719,7 @@
 				Name="VCCLCompilerTool"
 				ExecutionBucket="7"
 				Optimization="2"
+				AdditionalIncludeDirectories="..\..\shared\ruby\wince;..\..\shared\json;..\..\shared"
 				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;_LIB;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"

data/platform/wm/tcmalloc/tcmalloc.vcproj

@@ -29,8 +29,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			OutputDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
+			IntermediateDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="4"
 			CharacterSet="1"
 			>
@@ -53,6 +53,7 @@
 				Name="VCCLCompilerTool"
 				ExecutionBucket="7"
 				Optimization="0"
+				AdditionalIncludeDirectories="../../shared/tcmalloc;../../shared/tcmalloc/windows;../../shared/ruby/wince;../../shared"
 				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;DEBUG;_LIB;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
 				MinimalRebuild="true"
 				RuntimeLibrary="1"
@@ -103,8 +104,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			OutputDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
+			IntermediateDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="4"
 			CharacterSet="1"
 			>
@@ -127,6 +128,7 @@
 				Name="VCCLCompilerTool"
 				ExecutionBucket="7"
 				Optimization="0"
+				AdditionalIncludeDirectories="../../shared/tcmalloc;../../shared/tcmalloc/windows;../../shared/ruby/wince;../../shared"
 				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;DEBUG;_LIB;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
 				MinimalRebuild="true"
 				RuntimeLibrary="1"
@@ -392,8 +394,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			OutputDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
+			IntermediateDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="4"
 			CharacterSet="1"
 			>
@@ -416,6 +418,7 @@
 				Name="VCCLCompilerTool"
 				ExecutionBucket="7"
 				Optimization="2"
+				AdditionalIncludeDirectories="../../shared/tcmalloc;../../shared/tcmalloc/windows;../../shared/ruby/wince;../../shared"
 				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;_LIB;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
@@ -465,8 +468,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			OutputDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
+			IntermediateDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="4"
 			CharacterSet="1"
 			>

data/rakefile.rb

@@ -673,7 +673,7 @@ task :set_version, [:version] do |t,args|
   
     File.open(versionfile,"r") { |f| origfile = f.read }
     File.open(versionfile,"w") do |f|
-      origfile.gsub!(/^(\s*VERSION) = '(\d+\.\d+\.*\d*)'/, '\1 = \''+ verstring + "'")
+      origfile.gsub!(/^(\s*VERSION) = '(\d+\.\d+\.*\d*)'/, '\1 = \''+ verstring + "'")     
       f.write origfile
     end
   end

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

@@ -316,9 +316,17 @@
                 }
             }
 
+            var href = $el.attr("href");
+
             // User clicked an internal link, fullscreen mode
             if (target == '_webapp') {
-                window.location = $el.attr('href');
+                window.location = href;
+            }
+            // User clicked on a link that contains a protocol other than http.
+            else if (href.indexOf(":") != -1 &&
+                     href.indexOf("http:") != 0 &&
+                     href.indexOf("https:") != 0) {
+                window.location = href;
             }
             // User clicked a back button
             else if ($el.is(jQTSettings.backSelector)) {

data/rhodes.gemspec

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

data/spec/phone_spec/app/spec/bulksync_spec.rb

@@ -44,7 +44,7 @@ describe "BulkSync_test" do
   end
 
   it "should login" do
-    res = ::Rho::RhoSupport::parse_query_parameters SyncEngine.login("", "", "/app/Settings/login_callback")
+    res = ::Rho::RhoSupport::parse_query_parameters SyncEngine.login("la rs", "", "/app/Settings/login_callback")
     res['error_code'].to_i.should == ::Rho::RhoError::ERR_NONE
     
     SyncEngine.logged_in.should == 1
@@ -52,7 +52,34 @@ describe "BulkSync_test" do
 
   it "should bulk sync" do
     SyncEngine.logged_in.should == 1
+
+    res = ::Rho::RhoSupport::parse_query_parameters SyncEngine.dosync
+    res['status'].should == 'complete'
+    res['error_code'].to_i.should == ::Rho::RhoError::ERR_NONE
+    
+    Rho::RhoConfig.bulksync_state.should == '1'
+    
+    items = Product.find(:all)
+    items.should_not be_nil
+    items.length().should_not == 0
+  end
   
+  it "should bulk sync with create" do
+    SyncEngine.logged_in.should == 1
+    ::Rhom::Rhom.database_full_reset_and_logout
+    
+    res = ::Rho::RhoSupport::parse_query_parameters SyncEngine.login("la rs", "", "/app/Settings/login_callback")
+    res['error_code'].to_i.should == ::Rho::RhoError::ERR_NONE
+    SyncEngine.logged_in.should == 1
+
+    Rho::RhoConfig.bulksync_state='1'
+    res = ::Rho::RhoSupport::parse_query_parameters SyncEngine.dosync
+    res['status'].should == 'complete'
+    res['error_code'].to_i.should == ::Rho::RhoError::ERR_NONE
+
+    item1 = Product.create({'name'=>'PhoneSpec', 'sku'=>22})  
+    
+    Rho::RhoConfig.bulksync_state='0'
     res = ::Rho::RhoSupport::parse_query_parameters SyncEngine.dosync
     res['status'].should == 'complete'
     res['error_code'].to_i.should == ::Rho::RhoError::ERR_NONE
@@ -62,6 +89,49 @@ describe "BulkSync_test" do
     items = Product.find(:all)
     items.should_not be_nil
     items.length().should_not == 0
+    
+    item2 = Product.find(item1.object)
+    item2.should be_nil
+
+    items2 = Product.find(:all, :conditions=>{:name=>'PhoneSpec'} )
+    items2.should_not be_nil
+    items2.length().should_not == 0
+
+    bFound22 = false
+    items2.each do |item|
+        bFound22 = item.sku == '22' if !bFound22
+        
+        item.sku = '44'
+        item.save
+    end    
+    bFound22.should == true
+
+    Rho::RhoConfig.bulksync_state='0'
+    res = ::Rho::RhoSupport::parse_query_parameters SyncEngine.dosync
+    res['status'].should == 'complete'
+    res['error_code'].to_i.should == ::Rho::RhoError::ERR_NONE
+    Rho::RhoConfig.bulksync_state.should == '1'
+
+    items2 = Product.find(:all, :conditions=>{:name=>'PhoneSpec'} )
+    items2.should_not be_nil
+    items2.length().should_not == 0
+
+    items2.each do |item|
+        item.sku.should == '44'
+        
+        item.destroy
+    end    
+
+    Rho::RhoConfig.bulksync_state='0'
+    res = ::Rho::RhoSupport::parse_query_parameters SyncEngine.dosync
+    res['status'].should == 'complete'
+    res['error_code'].to_i.should == ::Rho::RhoError::ERR_NONE
+    Rho::RhoConfig.bulksync_state.should == '1'
+
+    items2 = Product.find(:all, :conditions=>{:name=>'PhoneSpec'} )
+    items2.should_not be_nil
+    items2.length().should == 0
+
   end
 
   it "should logout" do

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rhodes
 version: !ruby/object:Gem::Version 
-  hash: 1
-  prerelease: false
+  hash: 62196449
+  prerelease: true
   segments: 
   - 2
   - 2
-  - 3
-  version: 2.2.3
+  - 4
+  - beta
+  - 1
+  version: 2.2.4.beta.1
 platform: ruby
 authors: 
 - Rhomobile
@@ -15,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-29 00:00:00 -07:00
+date: 2010-11-08 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -112,6 +114,7 @@ extra_rdoc_files:
 - README.textile
 - LICENSE
 files: 
+- bin/c2dm.rb
 - bin/rhodes
 - bin/rhodes-setup
 - bin/rhodes-setup.bat
@@ -903,6 +906,7 @@ files:
 - platform/android/Rhodes/src/com/rhomobile/rhodes/ui/AboutDialog.java
 - platform/android/Rhodes/src/com/rhomobile/rhodes/ui/LogOptionsDialog.java
 - platform/android/Rhodes/src/com/rhomobile/rhodes/ui/LogViewDialog.java
+- platform/android/Rhodes/src/com/rhomobile/rhodes/uri/ExternalHttpHandler.java
 - platform/android/Rhodes/src/com/rhomobile/rhodes/uri/MailUriHandler.java
 - platform/android/Rhodes/src/com/rhomobile/rhodes/uri/SmsUriHandler.java
 - platform/android/Rhodes/src/com/rhomobile/rhodes/uri/TelUriHandler.java
@@ -1630,6 +1634,14 @@ files:
 - platform/iphone/Classes/SimpleMainView.m
 - platform/iphone/Classes/SplashViewController.h
 - platform/iphone/Classes/SplashViewController.m
+- platform/iphone/Classes/SplitView/LeftViewController.h
+- platform/iphone/Classes/SplitView/LeftViewController.m
+- platform/iphone/Classes/SplitView/RightViewController.h
+- platform/iphone/Classes/SplitView/RightViewController.m
+- platform/iphone/Classes/SplitView/SplittedMainView.h
+- platform/iphone/Classes/SplitView/SplittedMainView.m
+- platform/iphone/Classes/SplitView/SplitViewDelegate.h
+- platform/iphone/Classes/SplitView/SplitViewDelegate.m
 - platform/iphone/Classes/TabbedMainView.h
 - platform/iphone/Classes/TabbedMainView.m
 - platform/iphone/Classes/Utils/ParamsWrapper.h