ffi-gphoto2 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f540e98f060027da7173c2025502331090f5a24c
-  data.tar.gz: 27555b84f07e26724da18c72500e6c7483ec6916
+  metadata.gz: 3b4805a380f8f02eb6694864ac81a98762bf7b46
+  data.tar.gz: 9e902a992bfd63ea3c34cb86309d7b0856f5790f
 SHA512:
-  metadata.gz: f7fc0ad08a779b3de0b29a54b2624b367a350b4203b7ab174e1089955fd171a67645943227954fd78730a95eb4754a572bed4a788a35aba51bf654b567aff31f
-  data.tar.gz: 355b62d70d3c67322631093a1c4d32ee84bdcfbd5bd2b5ba1eafda2171e99d9e38245c799b1daed6c1e59795d0514f0d6406098c58f9cd7dd92aa3163a013e0a
+  metadata.gz: a661c2b35d4437e187d1b70841819b968c78fe4adef6a13921872c2e539c8bca320b07f1aad88ed965848d88ea746a97ff19a0162aff3ece0cea4488d2c7d67d
+  data.tar.gz: fd8d1791990063bfe0945774a61dd3d0c287ee1cfd554c24ff2b2e528ec88071013b1d7bde689d2abc0cf922866ba1ca597d1af9c9d326b60d3f84af6edd9f68

data/README.md

@@ -34,7 +34,7 @@ canonical Ruby way.
     camera = GPhoto2::Camera.first
 
     # ...or even search by model name
-    camera = GPhoto2::Camera.where(/nikon/i).first
+    camera = GPhoto2::Camera.where(model: /nikon/i).first
 
     # check camera abilities
     camera.can? :capture_image

data/lib/ffi/gphoto2.rb

@@ -46,12 +46,12 @@ module FFI
     attach_function :gp_camera_unref, [Camera.by_ref], :int
     attach_function :gp_camera_get_config, [Camera.by_ref, :pointer, GPContext.by_ref], :int
     attach_function :gp_camera_set_config, [Camera.by_ref, CameraWidget.by_ref, GPContext.by_ref], :int
-    attach_function :gp_camera_capture, [Camera.by_ref, CameraCaptureType, CameraFilePath.by_ref, GPContext.by_ref], :int
-    attach_function :gp_camera_capture_preview, [Camera.by_ref, CameraFile.by_ref, GPContext.by_ref], :int
+    attach_function :gp_camera_capture, [Camera.by_ref, CameraCaptureType, CameraFilePath.by_ref, GPContext.by_ref], :int, blocking: true
+    attach_function :gp_camera_capture_preview, [Camera.by_ref, CameraFile.by_ref, GPContext.by_ref], :int, blocking: true
     attach_function :gp_camera_wait_for_event, [Camera.by_ref, :int, :pointer, :pointer, GPContext.by_ref], :int
     attach_function :gp_camera_folder_list_files, [Camera.by_ref, :string, CameraList.by_ref, GPContext.by_ref], :int
     attach_function :gp_camera_folder_list_folders, [Camera.by_ref, :string, CameraList.by_ref, GPContext.by_ref], :int
-    attach_function :gp_camera_file_get, [Camera.by_ref, :string, :string, CameraFileType, CameraFile.by_ref, GPContext.by_ref], :int
+    attach_function :gp_camera_file_get, [Camera.by_ref, :string, :string, CameraFileType, CameraFile.by_ref, GPContext.by_ref], :int, blocking: true
     attach_function :gp_camera_file_delete, [Camera.by_ref, :string, :string, GPContext.by_ref], :int
 
     # gphoto2/gphoto2-context.h
@@ -79,6 +79,7 @@ module FFI
     attach_function :gp_widget_get_value, [CameraWidget.by_ref, :pointer], :int
     attach_function :gp_widget_get_name, [CameraWidget.by_ref, :pointer], :int
     attach_function :gp_widget_get_type, [CameraWidget.by_ref, :pointer], :int
+    attach_function :gp_widget_get_label, [CameraWidget.by_ref, :pointer], :int
     attach_function :gp_widget_get_range, [CameraWidget.by_ref, :pointer, :pointer, :pointer], :int
     attach_function :gp_widget_count_choices, [CameraWidget.by_ref], :int
     attach_function :gp_widget_get_choice, [CameraWidget.by_ref, :int, :pointer], :int

data/lib/gphoto2/camera_widgets/camera_widget.rb

@@ -21,6 +21,10 @@ module GPhoto2
     end
     alias_method :close, :finalize
 
+    def label
+      get_label
+    end
+
     def name
       get_name
     end
@@ -74,9 +78,12 @@ module GPhoto2
       str = FFI::MemoryPointer.new(:string)
       str_ptr = FFI::MemoryPointer.new(:pointer)
       str_ptr.write_pointer(str)
+
       rc = gp_widget_get_name(ptr, str_ptr)
       GPhoto2.check!(rc)
-      str_ptr.read_pointer.read_string
+
+      str_ptr = str_ptr.read_pointer
+      str_ptr.null? ? nil : str_ptr.read_string
     end
 
     def get_value
@@ -95,6 +102,17 @@ module GPhoto2
       CameraWidgetType[type.read_int]
     end
 
+    def get_label
+      str = FFI::MemoryPointer.new(:string)
+      str_ptr = FFI::MemoryPointer.new(:pointer)
+      str_ptr.write_pointer(str)
+
+      rc = gp_widget_get_type(ptr, str_ptr)
+
+      str_ptr = str_ptr.read_pointer
+      str_ptr.null? ? nil : str_ptr.read_string
+    end
+
     def count_children
       rc = gp_widget_count_children(ptr)
       GPhoto2.check!(rc)

data/lib/gphoto2/camera_widgets/radio_camera_widget.rb

@@ -10,9 +10,12 @@ module GPhoto2
       val = FFI::MemoryPointer.new(:string)
       val_ptr = FFI::MemoryPointer.new(:pointer)
       val_ptr.write_pointer(val)
+
       rc = gp_widget_get_value(ptr, val_ptr)
       GPhoto2.check!(rc)
-      val_ptr.read_pointer.read_string
+
+      val_ptr = val_ptr.read_pointer
+      val_ptr.null? ? nil : val_ptr.read_string
     end
 
     def set_value(value)
@@ -27,15 +30,18 @@ module GPhoto2
       rc = gp_widget_count_choices(ptr)
       GPhoto2.check!(rc)
       rc
-    end 
+    end
 
     def get_choice(i)
       val = FFI::MemoryPointer.new(:string)
       val_ptr = FFI::MemoryPointer.new(:pointer)
       val_ptr.write_pointer(val)
+
       rc = gp_widget_get_choice(ptr, i, val_ptr)
       GPhoto2.check!(rc)
-      val_ptr.read_pointer.read_string
+
+      val_ptr = val_ptr.read_pointer
+      val_ptr.null? ? nil : val_ptr.read_string
     end
   end
 end

data/lib/gphoto2/camera_widgets/text_camera_widget.rb

@@ -6,9 +6,12 @@ module GPhoto2
       val = FFI::MemoryPointer.new(:string)
       val_ptr = FFI::MemoryPointer.new(:pointer)
       val_ptr.write_pointer(val)
+
       rc = gp_widget_get_value(ptr, val_ptr)
       GPhoto2.check!(rc)
-      val_ptr.read_pointer.read_string
+
+      val_ptr = val_ptr.read_pointer
+      val_ptr.null? ? nil : val_ptr.read_string
     end
 
     def set_value(text)

data/lib/gphoto2/entry.rb

@@ -21,18 +21,24 @@ module GPhoto2
       name = FFI::MemoryPointer.new(:string)
       ptr = FFI::MemoryPointer.new(:pointer)
       ptr.write_pointer(name)
+
       rc = gp_list_get_name(@camera_list.ptr, @index, ptr)
       GPhoto2.check!(rc)
-      ptr.read_pointer.read_string
+
+      ptr = ptr.read_pointer
+      ptr.null? ? nil : ptr.read_string
     end
 
     def get_value
       value = FFI::MemoryPointer.new(:string)
       ptr = FFI::MemoryPointer.new(:pointer)
       ptr.write_pointer(value)
+
       rc = gp_list_get_value(@camera_list.ptr, @index, ptr)
       GPhoto2.check!(rc)
-      ptr.read_pointer.read_string
+
+      ptr = ptr.read_pointer
+      ptr.null? ? nil : ptr.read_string
     end
   end
 end

data/lib/gphoto2/port_info.rb

@@ -45,18 +45,24 @@ module GPhoto2
       name = FFI::MemoryPointer.new(:string)
       name_ptr = FFI::MemoryPointer.new(:pointer)
       name_ptr.write_pointer(name)
+
       rc = gp_port_info_get_name(ptr, name_ptr)
       GPhoto2.check!(rc)
-      name_ptr.read_pointer.read_string
+
+      name_ptr = name_ptr.read_pointer
+      name_ptr.null? ? nil : name_ptr.read_string
     end
 
     def get_path
       path = FFI::MemoryPointer.new(:string)
       path_ptr = FFI::MemoryPointer.new(:pointer)
       path_ptr.write_pointer(path)
+
       rc = gp_port_info_get_path(ptr, path_ptr)
       GPhoto2.check!(rc)
-      path_ptr.read_pointer.read_string
+
+      path_ptr = path_ptr.read_pointer
+      path_ptr.null? ? nil : path_ptr.read_string
     end
 
     def get_type

data/lib/gphoto2/version.rb

@@ -1,3 +1,3 @@
 module GPhoto2
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

data/spec/support/shared_examples/camera_widget_examples.rb

@@ -43,6 +43,15 @@ shared_examples_for GPhoto2::CameraWidget do |klass|
     end
   end
 
+  describe '#label' do
+    it 'returns the label of the widget' do
+      label = 'Beep'
+      widget = klass.new(nil)
+      widget.stub(:get_label).and_return(label)
+      expect(widget.label).to eq(label)
+    end
+  end
+
   describe '#children' do
     it 'returns an array of child widgets' do
       size = 2
@@ -50,10 +59,10 @@ shared_examples_for GPhoto2::CameraWidget do |klass|
       widget = klass.new(nil)
       widget.stub(:count_children).and_return(size)
       widget.stub(:get_child)
-      
+
       expect(widget).to receive(:get_child).exactly(size).times
 
-      expect(widget.children).to be_kind_of(Array) 
+      expect(widget.children).to be_kind_of(Array)
     end
   end
 

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: ffi-gphoto2
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Michael Macias
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-17 00:00:00.000000000 Z
+date: 2014-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.1
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.9.0
 description: 
@@ -73,8 +73,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -161,18 +161,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
 - libgphoto2 >= 2.5.0
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A Ruby FFI for common functions in libgphoto2