rhodes 2.2.5 → 2.2.6.beta.1

data/bin/rhodes

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
 
 # First iteration, just alias rhogen
-system("#{File.expand_path(File.dirname(__FILE__))}/rhogen #{ARGV.join(' ')}")
+system("rhogen #{ARGV.join(' ')}")

data/bin/rhodes.bat

@@ -1 +1 @@
-@ruby %~dp0rhogen %*
+@ruby %~dp0rhodes %*

data/lib/framework/rho/rho.rb

@@ -447,7 +447,12 @@ module Rho
             start_id = src_id if src_id > start_id
         end        
         
-        start_id = Rho::RhoConfig.max_config_srcid()+2 if start_id < Rho::RhoConfig.max_config_srcid
+        if start_id < Rho::RhoConfig.max_config_srcid        
+            start_id = Rho::RhoConfig.max_config_srcid()+2 
+        else
+            start_id += 1
+        end
+            
         puts "start_id: #{start_id}"
         start_id
     end

data/lib/framework/rhodes.rb

@@ -1,6 +1,6 @@
 module Rhodes
   unless defined? Rhodes::VERSION
-    VERSION = '2.2.5'
+    VERSION = '2.2.6'
   end
   unless defined? Rhodes::DBVERSION
     DBVERSION = '2.2.0'

data/lib/framework/version.rb

@@ -1,6 +1,6 @@
 module RhodesFramework
   unless defined? RhodesFramework::VERSION
-    VERSION = '2.2.5'
+    VERSION = '2.2.6'
   end
   unless defined? RhodesFramework::DBVERSION
     DBVERSION = '2.2.2'

data/lib/rhodes.rb

@@ -1,6 +1,6 @@
 module Rhodes
   unless defined? Rhodes::VERSION
-    VERSION = '2.2.5'
+    VERSION = '2.2.6'
   end
   unless defined? Rhodes::DBVERSION
     DBVERSION = '2.2.0'

data/platform/android/Rhodes/AndroidManifest.xml

@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="com.rhomobile.rhodes"
       android:installLocation="auto"
-      android:versionCode="26"
-      android:versionName="2.2.5">
+      android:versionCode="27"
+      android:versionName="2.2.6">
     <uses-sdk android:minSdkVersion="3" />
     <application android:icon="@drawable/icon"
           android:multiprocess="true"

data/platform/iphone/Info.plist

@@ -38,7 +38,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.5</string>
+	<string>2.2.6</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UILaunchImageFile</key>

data/platform/shared/json/RJSONTokener.c

@@ -389,6 +389,7 @@ struct json_object* rjson_tokener_parse_ex(struct json_tokener *tok,
       break;
 
     case json_tokener_state_escape_unicode:
+      c = tolower(c);
       if(strchr(json_hex_chars, c)) {
 	tok->ucs_char += ((unsigned int)hexdigit(c) << ((3-tok->st_pos++)*4));
 	if(tok->st_pos == 4) {

data/platform/shared/json/json_tokener.c

@@ -346,6 +346,7 @@ struct json_object* json_tokener_parse_ex(struct json_tokener *tok,
       break;
 
     case json_tokener_state_escape_unicode:
+      c = tolower(c);
       if(strchr(json_hex_chars, c)) {
 	tok->ucs_char += ((unsigned int)hexdigit(c) << ((3-tok->st_pos++)*4));
 	if(tok->st_pos == 4) {

data/rhodes.gemspec

@@ -3,7 +3,7 @@ require "lib/rhodes.rb"
 
 Gem::Specification.new do |s|
   s.name = %q{rhodes}
-  s.version = Rhodes::VERSION
+  s.version = '2.2.6.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/Data/test_unicode.json

@@ -0,0 +1 @@
+{"source":"\u003Ca href=\"http:\/\/www.hootsuite.com\" rel=\"nofollow \"\u003EHootSuite\u003C\/a\u003E", "zendesk" : "Hello, Anglais =\u003E", "zendesk2" : "Hello, Anglais =\u003e"}

data/spec/phone_spec/app/spec/json_spec.rb

@@ -1,4 +1,16 @@
 describe "Json" do
+    it "should parse unicode chars" do
+        file_name = File.join(Rho::RhoApplication::get_model_path('app','Data'), 'test_unicode.json')
+        content = File.read(file_name)
+        parsed = Rho::JSON.parse(content)
+        
+        parsed.is_a?(Hash).should == true        
+        parsed.length().should == 3
+        parsed['source'].should_not be_nil         
+        parsed['zendesk'].should_not be_nil         
+        parsed['zendesk2'].should_not be_nil         
+    end
+
     it "should parse" do
         file_name = File.join(Rho::RhoApplication::get_model_path('app','Data'), 'test.json')
         content = File.read(file_name)
@@ -102,7 +114,7 @@ describe "Json" do
         gen_content.should == "{\"source_id\":#{prod.source_id},\"object\":\"#{prod.object}\",\"test\":\"123\"}"
         
     end    
-    
+
 =begin
     def webservice2_test
         return unless $is_network_available

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rhodes
 version: !ruby/object:Gem::Version 
-  hash: 13
-  prerelease: false
+  hash: 62196465
+  prerelease: true
   segments: 
   - 2
   - 2
-  - 5
-  version: 2.2.5
+  - 6
+  - beta
+  - 1
+  version: 2.2.6.beta.1
 platform: ruby
 authors: 
 - Rhomobile
@@ -15,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-09 00:00:00 -08:00
+date: 2010-12-15 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -750,6 +752,7 @@ files:
 - lib/test/rho_stubs.rb
 - lib/test/syncdb.sqlite
 - LICENSE
+- Manifest.txt
 - platform/android/build/android.rake
 - platform/android/build/androidcommon.rb
 - platform/android/build/libcurl_build.files
@@ -5755,6 +5758,7 @@ files:
 - spec/phone_spec/app/Data/test.xml
 - spec/phone_spec/app/Data/test1.xml
 - spec/phone_spec/app/Data/test_log.txt
+- spec/phone_spec/app/Data/test_unicode.json
 - spec/phone_spec/app/Data/testCDATA.xml
 - spec/phone_spec/app/index.erb
 - spec/phone_spec/app/loading.html