rhodes 2.0.0.beta9 → 2.0.0.beta10

data/platform/shared/rubyJVM/src/com/xruby/runtime/builtin/RubyMatchData.java

@@ -97,7 +97,7 @@ public class RubyMatchData extends RubyBasic {
     {
     	String res = "";
     	int nMatchEnd = result_.endOffset(result_.groups()-1);
-    	if ( nMatchEnd >= 0 && nMatchEnd+1 < str_.length() )
+    	if ( nMatchEnd >= 0 && nMatchEnd+1 <= str_.length() )
     		res = str_.substring(nMatchEnd); 
 
         if ( res == null )

data/platform/shared/sync/SyncEngine.cpp

@@ -361,10 +361,10 @@ void CSyncEngine::processServerSources(String strSources)
 {
     if ( strSources.length() > 0 )
     {
-        /*NetResponse(resp,getNet().pushData( getNet().resolveUrl("/system/loadserversources"), strSources, null ));
+        NetResponse(resp,getNet().pushData( getNet().resolveUrl("/system/loadserversources"), strSources, null ));
         loadAllSources();
 
-        rho_db_init_attr_manager();*/
+        rho_db_init_attr_manager();
     }
 }
 
@@ -624,6 +624,7 @@ void CSyncEngine::syncAllSources()
 
 void CSyncEngine::login(String name, String password, String callback)
 {
+//    processServerSources("{\"sources\":{ \"Product\":{}, \"Customer\":{}}}");
 /*
     processServerSources(
         "{\"sources\":{ \"ProductEx\":{ "

data/platform/shared/sync/SyncSource.cpp

@@ -368,6 +368,7 @@ void CSyncSource::syncServerChanges()
         {
             getSync().stopSync();
 			m_nErrCode = RhoRuby.getErrorFromResponse(resp);
+            m_strError = resp.getCharData();
             continue;
         }
 

data/res/build-tools/db/syncdb.schema

@@ -33,7 +33,6 @@ CREATE TABLE sources (
  last_sync_duration BIGINT default 0,
  last_sync_success BIGINT default 0,
  backend_refresh_time BIGINT default 0,
- model_type varchar default NULL,
  source_attribs varchar default NULL,
  schema varchar default NULL,
  schema_version varchar default NULL,

data/rhodes.gemspec

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: rhodes
 version: !ruby/object:Gem::Version 
-  hash: -1848230043
+  hash: -1967355490
   prerelease: true
   segments: 
   - 2
   - 0
   - 0
-  - beta9
-  version: 2.0.0.beta9
+  - beta10
+  version: 2.0.0.beta10
 platform: ruby
 authors: 
 - Rhomobile
@@ -169,6 +169,7 @@ files:
 - lib/extensions/fcntl/ext/fcntl.c
 - lib/extensions/fcntl/ext/Rakefile
 - lib/extensions/fcntl/ext.yml
+- lib/extensions/fileutils/fileutils.rb
 - lib/extensions/json/json/common.rb
 - lib/extensions/json/json/pure/generator.rb
 - lib/extensions/json/json/pure.rb