rhodes 2.0.0 → 2.0.2

data/platform/shared/common/StringConverter.h

@@ -104,6 +104,7 @@ CONVERT_TYPE_W( short, L"%hd" );
 CONVERT_TYPE_W( bool, L"%d" );
 CONVERT_TYPE_W( float, L"%f" );
 CONVERT_TYPE_W( double, L"%lf" );
+
 #endif
 CONVERT_TYPE_A( unsigned int, "%u" );
 CONVERT_TYPE_A( int, "%d" );
@@ -118,8 +119,8 @@ CONVERT_TYPE_A( short, "%hd" );
 CONVERT_TYPE_A( float, "%f" );
 CONVERT_TYPE_A( double, "%lf" );
 
-CONVERT_TYPE_A( uint64, "%llu" );
-CONVERT_TYPE_A( int64, "%lli" );
+CONVERT_TYPE_A( uint64, FMTU64 );
+CONVERT_TYPE_A( int64, FMTI64 );
 
 // Special case for bool
 template<> inline void convertFromStringA<bool>( const char* szValue, bool& value )

data/platform/shared/common/stat.h

@@ -1,6 +1,31 @@
-/*
-#if defined(__APPLE__) && !(defined(__DARWIN_ONLY_64_BIT_INO_T) && ___DARWIN_ONLY_64_BIT_INO_T)
-#define __DARWIN_ONLY_64_BIT_INO_T 1
+#if defined(__APPLE__) && !defined(__arm__) && !defined(__IPHONE_4_0)
+/* Simulator 3.2 or less */
+#define RHO_IPHONE_SIMULATOR_3
 #endif
-*/
+
+#ifdef RHO_IPHONE_SIMULATOR_3
+#ifdef stat
+#undef stat
+#endif
+#ifdef lstat
+#undef lstat
+#endif
+#ifdef fstat
+#undef fstat
+#endif
+#endif
+
 #include <sys/stat.h>
+
+#ifdef RHO_IPHONE_SIMULATOR_3
+/* 
+ * map stat functions and structure to theirs 64-bit analogues to be binary
+ * compatible with iPhone 4 x86/x86_64 application - in iPhone 4 SDK stat
+ * become 64-bit only so enabling such mapping we could run applications built
+ * with 3.x SDK on iPhone 4 simulator
+ * This is not required for iPhone devices - there stat was always 64-bit.
+ */
+#define stat stat64
+#define lstat lstat64
+#define fstat fstat64
+#endif

data/platform/shared/db/DBAdapter.cpp

@@ -100,6 +100,7 @@ boolean CDBAdapter::checkDbErrorEx(int rc, rho::db::CDBResult& res)
 
 void CDBAdapter::open (String strDbPath, String strVer, boolean bTemp)
 {
+    LOG(INFO) + "Open DB: " + strDbPath;
     if ( strcasecmp(strDbPath.c_str(),m_strDbPath.c_str() ) == 0 )
         return;
     close();
@@ -901,4 +902,4 @@ void CRubyMutex::Unlock()
 }
 
 }
-}
+}

data/platform/shared/db/DBAdapter.h

@@ -55,7 +55,7 @@ public:
     DEFINE_LOGCLASS;
 
     CDBAdapter(const char* szDBPartition, boolean bNoRubyLock) : m_dbHandle(0), m_strDbPath(""), m_strDbPartition(szDBPartition),
-        m_bUIWaitDB(false), m_nTransactionCounter(0), m_mxRuby(bNoRubyLock) {}
+        m_mxRuby(bNoRubyLock), m_bUIWaitDB(false), m_nTransactionCounter(0) {}
     ~CDBAdapter(void){}
 
     void open (String strDbPath, String strVer, boolean bTemp);

data/platform/shared/json/RJSONTokener.c

@@ -443,7 +443,7 @@ struct json_object* rjson_tokener_parse_ex(struct json_tokener *tok,
       } else {
 	int64 numi = 0;
 	double numd = 0;
-	if(!tok->is_double && sscanf(tok->pb->buf, "%lli", &numi) == 1) {
+	if(!tok->is_double && sscanf(tok->pb->buf, FMTI64/*"%lli"*/, &numi) == 1) {
 	  current = rjson_object_new_int(numi);
 	} else if(tok->is_double && sscanf(tok->pb->buf, "%lf", &numd) == 1) {
 	  current = rjson_object_new_double(numd);

data/platform/shared/json/json_object.c

@@ -324,7 +324,7 @@ boolean json_object_get_boolean(struct json_object *this)
 static int json_object_int_to_json_string(struct json_object* this,
 					  struct printbuf *pb)
 {
-  return sprintbuf(pb, "%lli", this->o.c_int);
+  return sprintbuf(pb, FMTI64/*"%lli"*/, this->o.c_int);
 }
 
 struct json_object* json_object_new_int(int64 i)
@@ -349,7 +349,7 @@ int64 json_object_get_int(struct json_object *this)
   case json_type_boolean:
     return this->o.c_boolean;
   case json_type_string:
-    if(sscanf(this->o.c_string, "%lli", &cint) == 1) return cint;
+    if(sscanf(this->o.c_string, FMTI64/*"%lli"*/, &cint) == 1) return cint;
   default:
     return 0;
   }

data/platform/shared/json/json_tokener.c

@@ -403,7 +403,7 @@ struct json_object* json_tokener_parse_ex(struct json_tokener *tok,
       } else {
 	int64 numi = 0;
 	double numd = 0;
-	if(!tok->is_double && sscanf(tok->pb->buf, "%lli", &numi) == 1) {
+	if(!tok->is_double && sscanf(tok->pb->buf, FMTI64/*"%lli"*/, &numi) == 1) {
 	  current = json_object_new_int(numi);
 	} else if(tok->is_double && sscanf(tok->pb->buf, "%lf", &numd) == 1) {
 	  current = json_object_new_double(numd);

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'
+  s.version = '2.0.2'
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rhomobile"]

data/spec/phone_spec/app/Spec/contacts_spec.rb

@@ -25,6 +25,7 @@ class ContactsTest
     mobile_number = '+1222333444'
 
     contacts = Rho::RhoContact.find(:all)
+    puts "contacts: #{contacts.inspect.to_s}"
     Test_not_equal( contacts, nil )
 
     contact = {}
@@ -34,6 +35,7 @@ class ContactsTest
     Rho::RhoContact.create!(contact)
 
     newcontacts = Rho::RhoContact.find(:all)
+    puts "newcontacts: #{newcontacts.inspect.to_s}"
     Test_not_equal( newcontacts, nil )
 
     diff = newcontacts.diff(contacts)
@@ -45,24 +47,28 @@ class ContactsTest
     Test_equal( c['mobile_number'], mobile_number )
 
     @id = c['id']
+    puts "id: #{@id}"
   end
 
   def update_test
+    puts "id: #{@id}"
     Rho::RhoContact.update_attributes 'id' => @id, 'first_name' => "RANDOM", 'last_name' => "NEWBIE"
 
     contact = Rho::RhoContact.find(@id)
+    puts "contacts: #{contact.inspect.to_s}"
     Test_not_equal( contact, nil )
 
     unless System.get_property('platform') == 'Blackberry'
-    #https://www.pivotaltracker.com/story/show/3983643
-        Test_equal( contact['first_name'], 'RANDOM' )
-        Test_equal( contact['last_name'], 'NEWBIE' )
+      #https://www.pivotaltracker.com/story/show/3983643
+      Test_equal( contact['first_name'], 'RANDOM' )
+      Test_equal( contact['last_name'], 'NEWBIE' )
     end
     
   end
 
   def remove_test
     contacts = Rho::RhoContact.find(:all)
+    puts "contacts: #{contacts.inspect.to_s}"
     Test_not_equal( contacts, nil )
     Test_equal( contacts.size >= 1, true )
 
@@ -71,6 +77,7 @@ class ContactsTest
     Rho::RhoContact.destroy(@id)
 
     contacts = Rho::RhoContact.find(:all)
+    puts "new contacts: #{contacts.inspect.to_s}"
     Test_not_equal( contacts, nil )
 
     Test_equal( size - contacts.size, 1 )

data/spec/phone_spec/app/Spec/controller.rb

@@ -2,11 +2,11 @@ require 'rho/rhocontroller'
 require 'Spec/spec_runner'
 
 def Test_equal(p1,p2)
-    raise "Expected '#{p1}' equal to '#{p2}'" if p1 != p2
+    raise "Expected '#{p1.inspect.to_s}' equal to '#{p2.inspect.to_s}'" if p1 != p2
 end
 
 def Test_not_equal(p1,p2)
-    raise "Expected '#{p1}' not equal to '#{p2}'" if p1 == p2
+    raise "Expected '#{p1.inspect.to_s}' not equal to '#{p2.inspect.to_s}'" if p1 == p2
 end
 
 class SpecController < Rho::RhoController
@@ -66,4 +66,4 @@ class SpecController < Rho::RhoController
     end
   end
   
-end
+end

data/spec/phone_spec/app/Spec/mapview_spec.rb

@@ -9,7 +9,9 @@ class MapViewTest
     Test_equal( state, nil )
 
     MapView.create :settings => {:map_type => 'roadmap', :region => [37, -122, 10, 10]}
-    sleep 2
+    w = 2
+    w = 5 if System::get_property('platform') == 'ANDROID'
+    sleep w
 
     state = MapView.state
     Test_not_equal( state, nil )

data/spec/phone_spec/build.yml

@@ -13,7 +13,8 @@ iphone:
   codesignidentity: ""
   configuration: Debug
 android:
-  version: 1.6
+  version: 2.0
+  mapping: enabled
   capabilities:
     - network_state
     - pim

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rhodes
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 11
   prerelease: false
   segments: 
   - 2
   - 0
-  - 0
-  version: 2.0.0
+  - 2
+  version: 2.0.2
 platform: ruby
 authors: 
 - Rhomobile
@@ -455,6 +455,9 @@ files:
 - platform/android/Rhodes/src/com/rhomobile/rhodes/NetworkConnectivityListener.java
 - platform/android/Rhodes/src/com/rhomobile/rhodes/NetworkStateTracker.java
 - platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/Contact.java
+- platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/ContactAccessor.java
+- platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/ContactAccessorNew.java
+- platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/ContactAccessorOld.java
 - platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/ContactField.java
 - platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/Phonebook.java
 - platform/android/Rhodes/src/com/rhomobile/rhodes/RhoConf.java
@@ -3663,7 +3666,6 @@ files:
 - res/generators/templates/spec/app/spec_runner.rb
 - res/generators/templates/spec/app/SpecRunner/controller.rb
 - res/generators/templates/spec/app/SpecRunner/index.erb
-- rhobuild.yml
 - rhobuild.yml.example
 - rhodes.gemspec
 - spec/framework_spec/app/Account/account.rb

data/rhobuild.yml

@@ -1,39 +0,0 @@
---- 
-excludedirs: 
-  bb: 
-  - public/js/iui
-  - public/js/jquery*
-  - public/jqtouch*
-  - public/js/prototype*
-  - public/css/iphone*
-  - public/iwebkit
-  - public/themes
-  - "**/*.db"
-  - "**/.*.swo"
-  - "**/.*.swn"
-  - "**/jquery*.js"
-  - "**/.DS_Store"
-env: 
-  app: /Users/lars/Dev/code/rhomobile/store
-  paths: 
-    android-ndk: /Users/lars/Dev/android-ndk-r4
-    android: /Users/lars/Dev/android-sdk-mac_86
-    java: /Library/Java/Home/bin
-    4.6: 
-      jde: 
-      sim: 9000
-      mds: 
-    4.2: 
-      jde: 
-      sim: 8100
-      mds: 
-    cabwiz: 
-android: 
-build: 
-  bbsignpwd: somepasswordhere
-  bb: 
-  symbianpath: platform/symbian
-  bbpath: platform/bb
-  androidpath: platform/android
-  wmpath: platform/wm
-  iphonepath: platform/iphone