rhodes 2.0.0.beta9 → 2.0.0.beta10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (30) hide show
  1. data/lib/extensions/fileutils/fileutils.rb +1591 -0
  2. data/lib/extensions/rhoxml/rexml/document.rb +6 -3
  3. data/lib/extensions/rhoxml/rexml/element.rb +21 -4
  4. data/lib/extensions/rhoxml/rexml/parsers/xpathparser.rb +1 -0
  5. data/lib/framework/rho/rho.rb +72 -46
  6. data/lib/framework/rho/rhoapplication.rb +2 -13
  7. data/lib/framework/rhodes.rb +1 -1
  8. data/lib/framework/rhom/rhom_model.rb +14 -16
  9. data/lib/framework/rhom/rhom_object_factory.rb +2 -2
  10. data/lib/rhodes.rb +1 -1
  11. data/platform/android/Rhodes/res/layout/directory_list.xml +1 -1
  12. data/platform/android/Rhodes/src/com/rhomobile/rhodes/Rhodes.java +33 -5
  13. data/platform/android/Rhodes/src/com/rhomobile/rhodes/Utils.java +12 -0
  14. data/platform/android/Rhodes/src/com/rhomobile/rhodes/camera/Camera.java +9 -12
  15. data/platform/android/Rhodes/src/com/rhomobile/rhodes/camera/FileList.java +52 -72
  16. data/platform/android/Rhodes/src/com/rhomobile/rhodes/camera/ImageCapture.java +1 -5
  17. data/platform/android/build/androidcommon.rb +10 -11
  18. data/platform/iphone/Classes/GeoLocation/LocationController.m +13 -1
  19. data/platform/iphone/Classes/SimpleMainView.m +14 -2
  20. data/platform/shared/ruby/thread.c +2 -0
  21. data/platform/shared/rubyJVM/src/com/rho/net/AsyncHttp.java +1 -1
  22. data/platform/shared/rubyJVM/src/com/rho/sync/SyncEngine.java +2 -2
  23. data/platform/shared/rubyJVM/src/com/rho/sync/SyncSource.java +1 -0
  24. data/platform/shared/rubyJVM/src/com/xruby/runtime/builtin/ObjectFactory.java +6 -2
  25. data/platform/shared/rubyJVM/src/com/xruby/runtime/builtin/RubyMatchData.java +1 -1
  26. data/platform/shared/sync/SyncEngine.cpp +3 -2
  27. data/platform/shared/sync/SyncSource.cpp +1 -0
  28. data/res/build-tools/db/syncdb.schema +0 -1
  29. data/rhodes.gemspec +1 -1
  30. metadata +4 -3
@@ -97,7 +97,7 @@ public class RubyMatchData extends RubyBasic {
97
97
  {
98
98
  String res = "";
99
99
  int nMatchEnd = result_.endOffset(result_.groups()-1);
100
- if ( nMatchEnd >= 0 && nMatchEnd+1 < str_.length() )
100
+ if ( nMatchEnd >= 0 && nMatchEnd+1 <= str_.length() )
101
101
  res = str_.substring(nMatchEnd);
102
102
 
103
103
  if ( res == null )
@@ -361,10 +361,10 @@ void CSyncEngine::processServerSources(String strSources)
361
361
  {
362
362
  if ( strSources.length() > 0 )
363
363
  {
364
- /*NetResponse(resp,getNet().pushData( getNet().resolveUrl("/system/loadserversources"), strSources, null ));
364
+ NetResponse(resp,getNet().pushData( getNet().resolveUrl("/system/loadserversources"), strSources, null ));
365
365
  loadAllSources();
366
366
 
367
- rho_db_init_attr_manager();*/
367
+ rho_db_init_attr_manager();
368
368
  }
369
369
  }
370
370
 
@@ -624,6 +624,7 @@ void CSyncEngine::syncAllSources()
624
624
 
625
625
  void CSyncEngine::login(String name, String password, String callback)
626
626
  {
627
+ // processServerSources("{\"sources\":{ \"Product\":{}, \"Customer\":{}}}");
627
628
  /*
628
629
  processServerSources(
629
630
  "{\"sources\":{ \"ProductEx\":{ "
@@ -368,6 +368,7 @@ void CSyncSource::syncServerChanges()
368
368
  {
369
369
  getSync().stopSync();
370
370
  m_nErrCode = RhoRuby.getErrorFromResponse(resp);
371
+ m_strError = resp.getCharData();
371
372
  continue;
372
373
  }
373
374
 
@@ -33,7 +33,6 @@ CREATE TABLE sources (
33
33
  last_sync_duration BIGINT default 0,
34
34
  last_sync_success BIGINT default 0,
35
35
  backend_refresh_time BIGINT default 0,
36
- model_type varchar default NULL,
37
36
  source_attribs varchar default NULL,
38
37
  schema varchar default NULL,
39
38
  schema_version varchar default NULL,
data/rhodes.gemspec CHANGED
@@ -3,7 +3,7 @@ require "lib/rhodes.rb"
3
3
 
4
4
  Gem::Specification.new do |s|
5
5
  s.name = %q{rhodes}
6
- s.version = '2.0.0.beta9'
6
+ s.version = '2.0.0.beta10'
7
7
 
8
8
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
9
9
  s.authors = ["Rhomobile"]
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rhodes
3
3
  version: !ruby/object:Gem::Version
4
- hash: -1848230043
4
+ hash: -1967355490
5
5
  prerelease: true
6
6
  segments:
7
7
  - 2
8
8
  - 0
9
9
  - 0
10
- - beta9
11
- version: 2.0.0.beta9
10
+ - beta10
11
+ version: 2.0.0.beta10
12
12
  platform: ruby
13
13
  authors:
14
14
  - Rhomobile
@@ -169,6 +169,7 @@ files:
169
169
  - lib/extensions/fcntl/ext/fcntl.c
170
170
  - lib/extensions/fcntl/ext/Rakefile
171
171
  - lib/extensions/fcntl/ext.yml
172
+ - lib/extensions/fileutils/fileutils.rb
172
173
  - lib/extensions/json/json/common.rb
173
174
  - lib/extensions/json/json/pure/generator.rb
174
175
  - lib/extensions/json/json/pure.rb