gphoto4ruby 0.3.3 → 0.3.4

data/ext/extconf.rb

@@ -2,6 +2,9 @@ require "mkmf"
 
 dir_config("gphoto4ruby", "/usr/local")
 if have_library("gphoto2")
+    if RUBY_VERSION =~ /1\.9/
+        $CPPFLAGS += " -DRUBY_19"
+    end
     $CFLAGS = '-Wall ' + $CFLAGS
     create_makefile("gphoto4ruby")
 else

data/ext/gphoto2camera.c

@@ -104,7 +104,7 @@ VALUE camera_initialize(int argc, VALUE *argv, VALUE self) {
             
             gp_result_check(gp_port_info_list_new(&portInfoList));
             gp_result_check(gp_port_info_list_load(portInfoList));
-            portIndex = gp_result_check(gp_port_info_list_lookup_path(portInfoList, RSTRING(argv[0])->ptr));
+            portIndex = gp_result_check(gp_port_info_list_lookup_path(portInfoList, RSTRING_PTR(argv[0])));
             gp_result_check(gp_port_info_list_get_info(portInfoList, portIndex, &p));
             gp_result_check(gp_camera_set_port_info(c->camera, p));
             break;
@@ -248,7 +248,7 @@ VALUE camera_capture(int argc, VALUE *argv, VALUE self) {
  *
  */
 VALUE camera_save(int argc, VALUE *argv, VALUE self) {
-    int i, count;
+    int i, count, retVal;
     int newName = 0;
     const char *fData, *key, *val, *name;
     char *fPath, *newNameStr, *pchNew, *pchSrc;
@@ -295,13 +295,13 @@ VALUE camera_save(int argc, VALUE *argv, VALUE self) {
                 return Qnil;
             }
             arr = rb_funcall(argv[0], rb_intern("keys"), 0);
-            for (i = 0; i < RARRAY(arr)->len; i++) {
-                switch(TYPE(RARRAY(arr)->ptr[i])) {
+            for (i = 0; i < RARRAY_LEN(arr); i++) {
+                switch(TYPE(RARRAY_PTR(arr)[i])) {
                     case T_STRING:
-                        key = RSTRING(RARRAY(arr)->ptr[i])->ptr;
+                        key = RSTRING_PTR(RARRAY_PTR(arr)[i]);
                         break;
                     case T_SYMBOL:
-                        key = rb_id2name(rb_to_id(RARRAY(arr)->ptr[i]));
+                        key = rb_id2name(rb_to_id(RARRAY_PTR(arr)[i]));
                         break;
                     default:
                         gp_list_free(list);
@@ -309,7 +309,7 @@ VALUE camera_save(int argc, VALUE *argv, VALUE self) {
                         return Qnil;
                 }
                 if (strcmp(key, "to_folder") == 0) {
-                    fPath = RSTRING(rb_hash_aref(argv[0], RARRAY(arr)->ptr[i]))->ptr;
+                    fPath = RSTRING_PTR(rb_hash_aref(argv[0], RARRAY_PTR(arr)[i]));
                     if (strlen(fPath) > 0) {
                         if (fPath[strlen(fPath)] == '/') {
                             strcpy(fName, fPath);
@@ -319,22 +319,22 @@ VALUE camera_save(int argc, VALUE *argv, VALUE self) {
                         }
                     } 
                 } else if (strcmp(key, "new_name") == 0) {
-                    newNameStr = RSTRING(rb_hash_aref(argv[0], RARRAY(arr)->ptr[i]))->ptr;
+                    newNameStr = RSTRING_PTR(rb_hash_aref(argv[0], RARRAY_PTR(arr)[i]));
                     if (strlen(newNameStr) > 0) {
                         newName = 1;
                     }
                 } else if (strcmp(key, "type") == 0) {
-                    hVal = rb_hash_aref(argv[0], RARRAY(arr)->ptr[i]);
+                    hVal = rb_hash_aref(argv[0], RARRAY_PTR(arr)[i]);
                     Check_Type(hVal, T_SYMBOL);
                     val = rb_id2name(rb_to_id(hVal));
                     if (strcmp(val, "preview") == 0) {
                         fileType = GP_FILE_TYPE_PREVIEW;
                     }
                 } else if (strcmp(key, "file") == 0) {
-                    hVal = rb_hash_aref(argv[0], RARRAY(arr)->ptr[i]);
+                    hVal = rb_hash_aref(argv[0], RARRAY_PTR(arr)[i]);
                     switch(TYPE(hVal)) {
                         case T_STRING:
-                            strcpy(cFileName, RSTRING(hVal)->ptr);
+                            strcpy(cFileName, RSTRING_PTR(hVal));
                             break;
                         case T_SYMBOL:
                             val = rb_id2name(rb_to_id(hVal));
@@ -374,10 +374,13 @@ VALUE camera_save(int argc, VALUE *argv, VALUE self) {
         strcat(fName, cFileName);
     }
     fd = open(fName, O_CREAT | O_WRONLY, 0644);
-    write(fd, fData, fSize);
+    retVal = write(fd, fData, fSize);
     close(fd);
     gp_file_free(file);
     gp_list_free(list);
+    if (retVal < 0) {
+      rb_raise(rb_eIOError, "Can't save into file");
+    }
     return self;
 }
 
@@ -437,13 +440,13 @@ VALUE camera_delete(int argc, VALUE *argv, VALUE self) {
             switch(TYPE(argv[0])) {
                 case T_HASH:
                     arr = rb_funcall(argv[0], rb_intern("keys"), 0);
-                    for (i = 0; i < RARRAY(arr)->len; i++) {
-                        switch(TYPE(RARRAY(arr)->ptr[i])) {
+                    for (i = 0; i < RARRAY_LEN(arr); i++) {
+                        switch(TYPE(RARRAY_PTR(arr)[i])) {
                             case T_STRING:
-                                key = RSTRING(RARRAY(arr)->ptr[i])->ptr;
+                                key = RSTRING_PTR(RARRAY_PTR(arr)[i]);
                                 break;
                             case T_SYMBOL:
-                                key = rb_id2name(rb_to_id(RARRAY(arr)->ptr[i]));
+                                key = rb_id2name(rb_to_id(RARRAY_PTR(arr)[i]));
                                 break;
                             default:
                                 gp_list_free(list);
@@ -451,7 +454,7 @@ VALUE camera_delete(int argc, VALUE *argv, VALUE self) {
                                 return Qnil;
                         }
                         if (strcmp(key, "file") == 0) {
-                            strcpy(cFileName, RSTRING(rb_hash_aref(argv[0], RARRAY(arr)->ptr[i]))->ptr);
+                            strcpy(cFileName, RSTRING_PTR(rb_hash_aref(argv[0], RARRAY_PTR(arr)[i])));
                         }
                     }
                     break;
@@ -521,25 +524,25 @@ VALUE camera_get_config(int argc, VALUE *argv, VALUE self) {
                 gp_widget_free(c->config);
                 gp_result_check(gp_camera_get_config(c->camera, &(c->config), c->context));
                 arr = rb_funcall(cfg, rb_intern("keys"), 0);
-                for (i = 0; i < RARRAY(arr)->len; i++) {
-                    key = RSTRING(RARRAY(arr)->ptr[i])->ptr;
+                for (i = 0; i < RARRAY_LEN(arr); i++) {
+                    key = RSTRING_PTR(RARRAY_PTR(arr)[i]);
                     gp_result_check(gp_widget_get_child_by_name(c->config, key, &(c->childConfig)));
                     gp_result_check(gp_widget_get_type(c->childConfig, &widgettype));
                     switch (widgettype) {
                         case GP_WIDGET_RADIO:
-                            rb_hash_aset(cfg, RARRAY(arr)->ptr[i], getRadio(c->childConfig));
+                            rb_hash_aset(cfg, RARRAY_PTR(arr)[i], getRadio(c->childConfig));
                             break;
                         case GP_WIDGET_TEXT:
-                            rb_hash_aset(cfg, RARRAY(arr)->ptr[i], getText(c->childConfig));
+                            rb_hash_aset(cfg, RARRAY_PTR(arr)[i], getText(c->childConfig));
                             break;
                         case GP_WIDGET_RANGE:
-                            rb_hash_aset(cfg, RARRAY(arr)->ptr[i], getRange(c->childConfig));
+                            rb_hash_aset(cfg, RARRAY_PTR(arr)[i], getRange(c->childConfig));
                             break;
                         case GP_WIDGET_TOGGLE:
-                            rb_hash_aset(cfg, RARRAY(arr)->ptr[i], getToggle(c->childConfig));
+                            rb_hash_aset(cfg, RARRAY_PTR(arr)[i], getToggle(c->childConfig));
                             break;
                         case GP_WIDGET_DATE:
-                            rb_hash_aset(cfg, RARRAY(arr)->ptr[i], getDate(c->childConfig));
+                            rb_hash_aset(cfg, RARRAY_PTR(arr)[i], getDate(c->childConfig));
                             break;
                         default:
                             break;
@@ -584,13 +587,13 @@ VALUE camera_config_merge(VALUE self, VALUE hash) {
     arr = rb_funcall(hash, rb_intern("keys"), 0);
     cfgs = rb_iv_get(self, "@configuration");
     cfg_changed = rb_iv_get(self, "@configs_changed");
-    for (i = 0; i < RARRAY(arr)->len; i++) {
-        switch(TYPE(RARRAY(arr)->ptr[i])) {
+    for (i = 0; i < RARRAY_LEN(arr); i++) {
+        switch(TYPE(RARRAY_PTR(arr)[i])) {
             case T_STRING:
-                key = RSTRING(RARRAY(arr)->ptr[i])->ptr;
+                key = RSTRING_PTR(RARRAY_PTR(arr)[i]);
                 break;
             case T_SYMBOL:
-                key = rb_id2name(rb_to_id(RARRAY(arr)->ptr[i]));
+                key = rb_id2name(rb_to_id(RARRAY_PTR(arr)[i]));
                 break;
             default:
                 rb_raise(rb_eTypeError, "Not valid key type");
@@ -602,23 +605,23 @@ VALUE camera_config_merge(VALUE self, VALUE hash) {
             switch (widgettype) {
                 case GP_WIDGET_RADIO:
                     rb_ary_push(cfg_changed, rb_str_new2(key));
-                    setRadio(self, c, rb_hash_aref(hash, RARRAY(arr)->ptr[i]), 0);
+                    setRadio(self, c, rb_hash_aref(hash, RARRAY_PTR(arr)[i]), 0);
                     break;
                 case GP_WIDGET_TEXT:
                     rb_ary_push(cfg_changed, rb_str_new2(key));
-                    setText(self, c, rb_hash_aref(hash, RARRAY(arr)->ptr[i]), 0);
+                    setText(self, c, rb_hash_aref(hash, RARRAY_PTR(arr)[i]), 0);
                     break;
                 case GP_WIDGET_RANGE:
                     rb_ary_push(cfg_changed, rb_str_new2(key));
-                    setRange(self, c, rb_hash_aref(hash, RARRAY(arr)->ptr[i]), 0);
+                    setRange(self, c, rb_hash_aref(hash, RARRAY_PTR(arr)[i]), 0);
                     break;
                 case GP_WIDGET_TOGGLE:
                     rb_ary_push(cfg_changed, rb_str_new2(key));
-                    setToggle(self, c, rb_hash_aref(hash, RARRAY(arr)->ptr[i]), 0);
+                    setToggle(self, c, rb_hash_aref(hash, RARRAY_PTR(arr)[i]), 0);
                     break;
                 case GP_WIDGET_DATE:
                     rb_ary_push(cfg_changed, rb_str_new2(key));
-                    setDate(self, c, rb_hash_aref(hash, RARRAY(arr)->ptr[i]), 0);
+                    setDate(self, c, rb_hash_aref(hash, RARRAY_PTR(arr)[i]), 0);
                     break;
                 default:
                     break;
@@ -666,7 +669,7 @@ VALUE camera_get_value(int argc, VALUE *argv, VALUE self) {
     
     switch (TYPE(str)) {
         case T_STRING:
-            name = RSTRING(str)->ptr;
+            name = RSTRING_PTR(str);
             break;
         case T_SYMBOL:
             name = rb_id2name(rb_to_id(str));
@@ -799,7 +802,7 @@ VALUE camera_set_value(VALUE self, VALUE str, VALUE newVal) {
     
     switch (TYPE(str)) {
         case T_STRING:
-            name = RSTRING(str)->ptr;
+            name = RSTRING_PTR(str);
             break;
         case T_SYMBOL:
             name = rb_id2name(rb_to_id(str));
@@ -1070,7 +1073,7 @@ VALUE camera_folder_down(VALUE self, VALUE folder) {
     
     gp_list_new(&list);
     
-    name = RSTRING(folder)->ptr;
+    name = RSTRING_PTR(folder);
     RESULT_CHECK_LIST(gp_camera_folder_list_folders(c->camera, c->virtFolder, list, c->context), list);
     RESULT_CHECK_LIST(gp_list_find_by_name(list, &index, name), list);
     if (strlen(c->virtFolder) > 1) {
@@ -1102,7 +1105,7 @@ VALUE camera_create_folder(VALUE self, VALUE folder) {
     
     Data_Get_Struct(self, GPhoto2Camera, c);
     
-    name = RSTRING(folder)->ptr;
+    name = RSTRING_PTR(folder);
     gp_result_check(gp_camera_folder_make_dir(c->camera, c->virtFolder, name, c->context));
     return self;
 }

data/ext/gphoto2camera.h

@@ -23,6 +23,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <fcntl.h>
+#include <unistd.h>
 #include <string.h>
 #include <gphoto2/gphoto2.h>
 #include <ruby.h>

data/ext/gphoto2camera_utilities.c

@@ -62,7 +62,7 @@ VALUE listRadio(CameraWidget *cc) {
 VALUE setRadio(VALUE self, GPhoto2Camera *c, VALUE newVal, int save) {
     const char *val;
 
-    val = RSTRING(rb_funcall(newVal, rb_intern("to_s"), 0))->ptr;
+    val = RSTRING_PTR(rb_funcall(newVal, rb_intern("to_s"), 0));
 
     gp_result_check(gp_widget_set_value(c->childConfig, val));
     if (save == 1) {
@@ -85,7 +85,7 @@ VALUE getText(CameraWidget *cc) {
 VALUE setText(VALUE self, GPhoto2Camera *c, VALUE newVal, int save) {
     const char *val;
 
-    val = RSTRING(rb_funcall(newVal, rb_intern("to_s"), 0))->ptr;
+    val = RSTRING_PTR(rb_funcall(newVal, rb_intern("to_s"), 0));
 
     gp_result_check(gp_widget_set_value(c->childConfig, val));
     if (save == 1) {
@@ -140,7 +140,7 @@ VALUE getToggle(CameraWidget *cc) {
 
 VALUE setToggle(VALUE self, GPhoto2Camera *c, VALUE newVal, int save) {
     int val = -1;
-    char *nV;
+    const char *nV;
     
     switch(TYPE(newVal)) {
         case T_TRUE:
@@ -150,7 +150,7 @@ VALUE setToggle(VALUE self, GPhoto2Camera *c, VALUE newVal, int save) {
             val = 0;
             break;
         case T_SYMBOL:
-            nV = rb_id2name(rb_to_id(newVal));
+            nV = rb_id2name(SYM2ID(newVal));
             if (strcmp(nV, "true") == 0) {
                 val = 1;
             } else if(strcmp(nV, "false") == 0) {
@@ -206,7 +206,7 @@ void saveConfigs(VALUE self, GPhoto2Camera *c) {
     cfgs = rb_iv_get(self, "@configuration");
     name = rb_ary_shift(cfg_changed);
     while (TYPE(name) != T_NIL) {
-        gp_result_check(gp_widget_get_child_by_name(c->config, RSTRING(name)->ptr, &(c->childConfig)));
+        gp_result_check(gp_widget_get_child_by_name(c->config, RSTRING_PTR(name), &(c->childConfig)));
         gp_result_check(gp_widget_get_type(c->childConfig, &widgettype));
         switch (widgettype) {
             case GP_WIDGET_RADIO:

data/ext/gphoto4ruby.c

@@ -19,12 +19,14 @@
  * along with GPhoto4Ruby. If not, see <http://www.gnu.org/licenses/>.
  *
  */
+/*
+#ifndef RUBY_19
+#define RSTRING_PTR(c) (RSTRING(c)->ptr)
+#define RARRAY_PTR(c) (RARRAY(c)->ptr)
+#define RARRAY_LEN(c) (RARRAY(c)->len)
+#endif
+*/
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <string.h>
-#include <gphoto2/gphoto2.h>
 #include <ruby.h>
 #include "gphoto2camera_event.h"
 #include "gphoto2camera_utilities.h"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gphoto4ruby
 version: !ruby/object:Gem::Version 
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors: 
 - neq4 company
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-15 00:00:00 +04:00
+date: 2009-10-14 00:00:00 +04:00
 default_executable: 
 dependencies: []