rhodes 3.3.3.beta.4 → 3.3.3

data/lib/extensions/barcode/ext/barcode/platform/iphone/Classes/BarcodeCallbackHelper.mm

@@ -108,6 +108,26 @@ private:
 };
 
 
+class RhoScannersListContainer : public rho::ICallbackObject
+{
+public:
+	RhoScannersListContainer() {
+	}
+    
+	virtual ~RhoScannersListContainer() {
+	}
+    
+	virtual unsigned long getObjectValue() {
+        VALUE b_array = rho_ruby_create_array();
+        VALUE b_hash = rho_ruby_createHash();
+        rho_ruby_add_to_hash(b_hash, rho_ruby_create_string("friendlyName"), rho_ruby_create_string("RhoBarcode based on ZBar"));
+        rho_ruby_add_to_hash(b_hash, rho_ruby_create_string("deviceName"), rho_ruby_create_string("RhoBarcode"));
+        rho_ruby_add_to_array(b_array, b_hash);
+        return b_array;
+	}
+};
+
+
 
 #ifdef __cplusplus
 extern "C" {
@@ -186,6 +206,22 @@ void Barcode_executeRhoCallBackWithParams(NSString* callbackURL,
     
     
 }
+    
+void Barcode_executeEnumerateCallback(NSString* url) {
+
+    NSString* strBody = @"&status=ok&rho_callback=1&";
+    NSString* strParam = [NSString stringWithUTF8String:(RHODESAPP().addCallbackObject( new RhoScannersListContainer(), "scannerArray").c_str())]; 
+    strBody = [strBody stringByAppendingString:strParam];
+                                                                                       
+    const char* cb = [url UTF8String];
+    const char* b = [strBody UTF8String];
+    
+                                                                                       
+    char* norm_url = rho_http_normalizeurl(cb);
+    rho_net_request_with_data(norm_url, b);
+                                                                                       
+    rho_http_free(norm_url);
+}
 
 	
 #ifdef __cplusplus

data/lib/extensions/barcode/ext/barcode/platform/iphone/Classes/BarcodeViewController.m

@@ -154,11 +154,12 @@ static RhoCreateBarcodeViewTask* instance_create = nil;
     resultText.font = [resultText.font fontWithSize:22];
     
     readerView = [[ZBarReaderView alloc] initWithImageScanner:[[ZBarImageScanner alloc] init]];//initWithFrame:srect];//CGRectZero];
+    //readerView = [[ZBarReaderView alloc] initWithFrame:srect];//CGRectZero];
+	readerView.frame = srect;
     
-	readerView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
+	readerView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleRightMargin | UIViewAutoresizingFlexibleBottomMargin;
 	readerView.autoresizesSubviews = YES;
     
-	readerView.frame = srect;
 
     // the delegate receives decode results
     readerView.readerDelegate = self;
@@ -168,6 +169,9 @@ static RhoCreateBarcodeViewTask* instance_create = nil;
 	//signatureView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
 	//signatureView.autoresizesSubviews = YES;
 	//signatureView.frame = srect;
+    
+    self.view.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleRightMargin | UIViewAutoresizingFlexibleBottomMargin;
+    self.view.autoresizesSubviews = YES;
 	
 	[self.view addSubview:readerView];
 	[self.view addSubview:resultText];
@@ -256,15 +260,21 @@ static RhoCreateBarcodeViewTask* instance_create = nil;
 }
 //*/
 
+- (BOOL) shouldAutorotateToInterfaceOrientation: (UIInterfaceOrientation) orient
+{
+    // auto-rotation is supported
+    return(YES);
+}
 
-- (void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation {
+- (void) didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation {
+    //[readerView willRotateToInterfaceOrientation:self.interfaceOrientation duration:0];
 }
 
-- (void) willRotateToInterfaceOrientation: (UIInterfaceOrientation) orient
+- (void) willRotateToInterfaceOrientation: (UIInterfaceOrientation) orientation
                                  duration: (NSTimeInterval) duration
 {
     // compensate for view rotation so camera preview is not rotated
-    [readerView willRotateToInterfaceOrientation: orient
+    [readerView willRotateToInterfaceOrientation: orientation
                                         duration: duration];
 }
 

data/lib/extensions/barcode/ext/barcode/platform/iphone/Classes/barcode.m

@@ -81,4 +81,67 @@ const char* rho_barcode_barcode_recognize(const char* filename) {
     
     
     return strbuf;
-}
+}
+
+
+
+@interface RhoUIThreadCallbackRunner : NSObject {
+    
+}
+
++ (RhoUIThreadCallbackRunner*) getSharedInstance;
+
++ (void) runEnumerateCallback:(NSString*) callback_url;
+
+@end
+
+static RhoUIThreadCallbackRunner* uiThreadCallbackRunner = nil;
+
+@implementation RhoUIThreadCallbackRunner
+
++ (RhoUIThreadCallbackRunner*) getSharedInstance {
+    if (uiThreadCallbackRunner == nil) {
+        uiThreadCallbackRunner = [[RhoUIThreadCallbackRunner alloc] init];
+    }
+    return uiThreadCallbackRunner;
+}
+
+- (void) runEnumerateCallbackCommand:(NSString*) callback_url {
+    Barcode_executeEnumerateCallback(callback_url);
+}
+
+- (void) runEnumerateCallbackObj:(NSString*) callback_url {
+    [self performSelectorOnMainThread:@selector(runEnumerateCallbackCommand:) withObject:callback_url waitUntilDone:NO];
+}
+
++ (void) runEnumerateCallback:(NSString*) callback_url {
+    [[RhoUIThreadCallbackRunner getSharedInstance] runEnumerateCallbackObj:callback_url];
+}
+
+
+@end
+
+
+void rho_motobarcode_enumerate(const char* callback) {
+    [RhoUIThreadCallbackRunner runEnumerateCallback:[NSString stringWithUTF8String:callback]];
+    //Barcode_executeEnumerateCallback([NSString stringWithUTF8String:callback]);
+}
+
+void  rho_motobarcode_enable(const char* callback, rho_param* p) {
+    NSLog(@"Barcode::enable() DO NOT SUPPORT BY RHODES SW SCANNER !");    
+}
+
+void  rho_motobarcode_disable() {
+    NSLog(@"Barcode::disable() DO NOT SUPPORT BY RHODES SW SCANNER !");    
+}
+
+void  rho_motobarcode_start() {
+    NSLog(@"Barcode::start() DO NOT SUPPORT BY RHODES SW SCANNER !");    
+}
+
+void  rho_motobarcode_stop() {
+    NSLog(@"Barcode::stop() DO NOT SUPPORT BY RHODES SW SCANNER !");    
+}
+
+
+

data/lib/extensions/barcode/ext/barcode/shared/ruby/barcode.i

@@ -8,7 +8,41 @@ extern void rho_barcode_take_barcode(const char* callback, VALUE options);
 #define barcode_recognize rho_barcode_barcode_recognize 
 #define take_barcode rho_barcode_take_barcode 
 
+
+// additional methods for Moto compatibility
+
+extern void rho_scanner_enumerate(const char* callback);
+extern void  rho_motobarcode_enable(const char* callback, rho_param* p);
+extern void  rho_motobarcode_disable();
+extern void  rho_motobarcode_start();
+extern void  rho_motobarcode_stop();
+            
+#define enumerate    rho_motobarcode_enumerate
+#define enable       rho_motobarcode_enable
+#define disable      rho_motobarcode_disable
+#define start        rho_motobarcode_start
+#define stop         rho_motobarcode_stop
+
 %}
 
+%typemap(in) (rho_param *p) {
+    $1 = rho_param_fromvalue($input);
+}
+
+%typemap(freearg) (rho_param *p) {
+    rho_param_free($1);
+}
+
+%typemap(default) rho_param* p {
+ $1 = 0;
+}
+
+
 extern const char* barcode_recognize(const char* filename);
-extern void take_barcode(const char* callback, VALUE options);
+extern void take_barcode(const char* callback, VALUE options);
+
+extern void enumerate(const char* callback);
+extern void  enable(const char* callback, rho_param* p);
+extern void  disable();
+extern void  start();
+extern void  stop();

data/lib/extensions/barcode/ext/barcode/shared/ruby/barcode_wrap.c

@@ -1801,8 +1801,9 @@ int SWIG_Ruby_arity( VALUE proc, int minimal )
 /* -------- TYPES TABLE (BEGIN) -------- */
 
 #define SWIGTYPE_p_char swig_types[0]
-static swig_type_info *swig_types[2];
-static swig_module_info swig_module = {swig_types, 1, 0, 0, 0, 0};
+#define SWIGTYPE_p_rho_param swig_types[1]
+static swig_type_info *swig_types[3];
+static swig_module_info swig_module = {swig_types, 2, 0, 0, 0, 0};
 #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
 #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
 
@@ -1833,6 +1834,21 @@ extern void rho_barcode_take_barcode(const char* callback, VALUE options);
 #define take_barcode rho_barcode_take_barcode 
 
 
+// additional methods for Moto compatibility
+
+extern void rho_scanner_enumerate(const char* callback);
+extern void  rho_motobarcode_enable(const char* callback, rho_param* p);
+extern void  rho_motobarcode_disable();
+extern void  rho_motobarcode_start();
+extern void  rho_motobarcode_stop();
+            
+#define enumerate    rho_motobarcode_enumerate
+#define enable       rho_motobarcode_enable
+#define disable      rho_motobarcode_disable
+#define start        rho_motobarcode_start
+#define stop         rho_motobarcode_stop
+
+
 
 SWIGINTERN swig_type_info*
 SWIG_pchar_descriptor(void)
@@ -1964,19 +1980,122 @@ fail:
 }
 
 
+SWIGINTERN VALUE
+_wrap_enumerate(int argc, VALUE *argv, VALUE self) {
+  char *arg1 = (char *) 0 ;
+  int res1 ;
+  char *buf1 = 0 ;
+  int alloc1 = 0 ;
+  
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  }
+  res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1);
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "char const *","enumerate", 1, argv[0] ));
+  }
+  arg1 = (char *)(buf1);
+  enumerate((char const *)arg1);
+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+  return Qnil;
+fail:
+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_enable(int argc, VALUE *argv, VALUE self) {
+  char *arg1 = (char *) 0 ;
+  rho_param *arg2 = (rho_param *) 0 ;
+  int res1 ;
+  char *buf1 = 0 ;
+  int alloc1 = 0 ;
+  
+  {
+    arg2 = 0;
+  }
+  if ((argc < 1) || (argc > 2)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  }
+  res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1);
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "char const *","enable", 1, argv[0] ));
+  }
+  arg1 = (char *)(buf1);
+  if (argc > 1) {
+    {
+      arg2 = rho_param_fromvalue(argv[1]);
+    }
+  }
+  enable((char const *)arg1,arg2);
+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+  {
+    rho_param_free(arg2);
+  }
+  return Qnil;
+fail:
+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+  {
+    rho_param_free(arg2);
+  }
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_disable(int argc, VALUE *argv, VALUE self) {
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  disable();
+  return Qnil;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_start(int argc, VALUE *argv, VALUE self) {
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  start();
+  return Qnil;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_stop(int argc, VALUE *argv, VALUE self) {
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  stop();
+  return Qnil;
+fail:
+  return Qnil;
+}
+
+
 
 /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */
 
 static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_rho_param = {"_p_rho_param", "rho_param *", 0, 0, (void*)0, 0};
 
 static swig_type_info *swig_type_initial[] = {
   &_swigt__p_char,
+  &_swigt__p_rho_param,
 };
 
 static swig_cast_info _swigc__p_char[] = {  {&_swigt__p_char, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_rho_param[] = {  {&_swigt__p_rho_param, 0, 0, 0},{0, 0, 0, 0}};
 
 static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_char,
+  _swigc__p_rho_param,
 };
 
 
@@ -2272,5 +2391,10 @@ SWIGEXPORT void Init_Barcode(void) {
   SWIG_RubyInitializeTrackings();
   rb_define_module_function(mBarcode, "barcode_recognize", _wrap_barcode_recognize, -1);
   rb_define_module_function(mBarcode, "take_barcode", _wrap_take_barcode, -1);
+  rb_define_module_function(mBarcode, "enumerate", _wrap_enumerate, -1);
+  rb_define_module_function(mBarcode, "enable", _wrap_enable, -1);
+  rb_define_module_function(mBarcode, "disable", _wrap_disable, -1);
+  rb_define_module_function(mBarcode, "start", _wrap_start, -1);
+  rb_define_module_function(mBarcode, "stop", _wrap_stop, -1);
 }
 

data/lib/extensions/barcode/ext/barcode/shared/src/zbar.c

@@ -78,4 +78,21 @@ const char* rho_barcode_barcode_recognize(const char* filename) {
 	  
 
   return strbuf;
-}
+}
+
+
+void rho_motobarcode_enumerate(const char* callback) {
+}
+
+void  rho_motobarcode_enable(const char* callback, rho_param* p) {
+}
+
+void  rho_motobarcode_disable() {
+}
+
+void  rho_motobarcode_start() {
+}
+
+void  rho_motobarcode_stop() {
+}
+

data/lib/extensions/digest-md5/ext/Rakefile

@@ -6,28 +6,29 @@ def build_extension(name, arch)
 
   Dir.glob("*.c").each do |f|
     objname = File.join( $tempdir, File.basename( f.gsub(/\.c$/, '.o') ) )
-    objects << objname
+    objects << ('"'+objname+'"')
 
     args = []
     args << "-I."
-    args << "-I#{$rhoroot}/lib/extensions/digest/ext"
-    args << "-I#{$rhoroot}/platform/shared/ruby/include"
-    args << "-I#{$rhoroot}/platform/shared"
+    args << "-I\"#{$rhoroot}/lib/extensions/digest/ext\""
+    args << "-I\"#{$rhoroot}/platform/shared/ruby/include\""
+    args << "-I\"#{$rhoroot}/platform/shared\""
+    args << "-I\"#{$rhoroot}/platform/shared/common\""
 
     if ENV['RHO_PLATFORM'] == 'android'
-      args << "-I#{$rhoroot}/platform/shared/ruby/android"
-      args << "-I#{$rhoroot}/platform/shared/ruby/generated"
+      args << "-I\"#{$rhoroot}/platform/shared/ruby/android\""
+      args << "-I\"#{$rhoroot}/platform/shared/ruby/generated\""
       cc_compile f, $tempdir, args or exit 1
 
     elsif (ENV['RHO_PLATFORM'] == 'iphone') or (ENV['RHO_PLATFORM'] == 'osx')
-      args << "-I#{$rhoroot}/platform/shared/ruby/iphone"
+      args << "-I\"#{$rhoroot}/platform/shared/ruby/iphone\""
       args << "-D_XOPEN_SOURCE"
       args << "-D_DARWIN_C_SOURCE"
-      args << "-isysroot #{$sdkroot}"
+      args << "-isysroot \"#{$sdkroot}\""
       args << "-fno-common"
       args << "-arch #{arch}"
       args << "-O2"
-      args << "-o #{objname}"
+      args << "-o \"#{objname}\""
       args << "-c"
       args << f
       cmdline = $gccbin + ' ' + args.join(' ')
@@ -35,13 +36,14 @@ def build_extension(name, arch)
       puts `#{cmdline}`
       exit unless $? == 0
 
+
     end
   end
 
   mkdir_p $targetdir unless File.exist? $targetdir
 
   if ENV['RHO_PLATFORM'] == 'android'
-    cc_ar File.join( $targetdir, 'lib' + name + '.a' ), Dir.glob($tempdir + "/**/*.o") or exit 1
+    cc_ar ('"'+File.join( $targetdir, 'lib' + name + '.a' )+'"'), Dir.glob($tempdir + "/**/*.o").collect{|x| '"'+x+'"'} or exit 1
 
   elsif (ENV['RHO_PLATFORM'] == 'iphone') or (ENV['RHO_PLATFORM'] == 'osx')
     args = []