ffi-gphoto2 0.5.1 → 0.8.0

data/lib/gphoto2/camera_file_info/file_camera_file_info.rb

@@ -0,0 +1,30 @@
+module GPhoto2
+  class FileCameraFileInfo < CameraFileInfo
+    # @return [Integer, nil]
+    def width
+      fetch(:width)
+    end
+
+    # @return [Integer, nil]
+    def height
+      fetch(:height)
+    end
+
+    # @return [Boolean, nil]
+    def readable?
+      permissions = fetch(:permissions)
+      (permissions & CameraFilePermissions[:read]) != 0 if permissions
+    end
+
+    # @return [Boolean, nil]
+    def deletable?
+      permissions = fetch(:permissions)
+      (permissions & CameraFilePermissions[:delete]) != 0 if permissions
+    end
+
+    # @return [Time, nil] the last modification time
+    def mtime
+      Time.at(ptr[:mtime]) if has_field?(:mtime)
+    end
+  end
+end

data/lib/gphoto2/camera_list.rb

@@ -21,7 +21,7 @@ module GPhoto2
     private
 
     def new
-      ptr = FFI::MemoryPointer.new(FFI::GPhoto2::CameraList)
+      ptr = FFI::MemoryPointer.new(:pointer)
       rc = gp_list_new(ptr)
       GPhoto2.check!(rc)
       @ptr = FFI::GPhoto2::CameraList.new(ptr.read_pointer)

data/lib/gphoto2/camera_widgets/camera_widget.rb

@@ -70,7 +70,7 @@ module GPhoto2
       map
     end
 
-    # @param [String]
+    # @return [String]
     def to_s
       value.to_s
     end
@@ -93,9 +93,7 @@ module GPhoto2
     end
 
     def get_name
-      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)
@@ -113,11 +111,9 @@ module GPhoto2
     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)
+      rc = gp_widget_get_label(ptr, str_ptr)
       GPhoto2.check!(rc)
 
       str_ptr = str_ptr.read_pointer
@@ -131,7 +127,7 @@ module GPhoto2
     end
 
     def get_child(index)
-      widget_ptr = FFI::MemoryPointer.new(FFI::GPhoto2::CameraWidget)
+      widget_ptr = FFI::MemoryPointer.new(:pointer)
       rc = gp_widget_get_child(ptr, index, widget_ptr)
       GPhoto2.check!(rc)
       widget = FFI::GPhoto2::CameraWidget.new(widget_ptr.read_pointer)

data/lib/gphoto2/camera_widgets/radio_camera_widget.rb

@@ -8,9 +8,7 @@ module GPhoto2
     protected
 
     def get_value
-      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)
@@ -34,9 +32,7 @@ module GPhoto2
     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)

data/lib/gphoto2/camera_widgets/text_camera_widget.rb

@@ -3,9 +3,7 @@ module GPhoto2
     protected
 
     def get_value
-      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)
@@ -15,7 +13,7 @@ module GPhoto2
     end
 
     def set_value(text)
-      val = FFI::MemoryPointer.from_string(text)
+      val = FFI::MemoryPointer.from_string(text.to_s)
       rc = gp_widget_set_value(ptr, val)
       GPhoto2.check!(rc)
     end

data/lib/gphoto2/entry.rb

@@ -20,9 +20,7 @@ module GPhoto2
     private
 
     def get_name
-      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)
@@ -32,9 +30,7 @@ module GPhoto2
     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)

data/lib/gphoto2/port.rb

@@ -0,0 +1,61 @@
+module GPhoto2
+  class Port
+    include FFI::GPhoto2Port
+    include GPhoto2::Struct
+
+    def initialize
+      @ptr = new
+    end
+
+    # @param [PortInfo] info
+    # @return [PortInfo]
+    def info=(info)
+      set_info(info)
+      info
+    end
+
+    # @return [void]
+    def open
+      _open
+    end
+
+    # @return [void]
+    def close
+      _close
+    end
+
+    # @return [void]
+    def reset
+      _reset
+    end
+
+    private
+
+    def new
+      ptr = FFI::MemoryPointer.new(:pointer)
+      rc = gp_port_new(ptr)
+      GPhoto2.check!(rc)
+      FFI::GPhoto2Port::GPPort.new(ptr.read_pointer)
+    end
+
+    def _open
+      rc = gp_port_open(ptr)
+      GPhoto2.check!(rc)
+    end
+
+    def _close
+      rc = gp_port_close(ptr)
+      GPhoto2.check!(rc)
+    end
+
+    def _reset
+      rc = gp_port_reset(ptr)
+      GPhoto2.check!(rc)
+    end
+
+    def set_info(port_info)
+      rc = gp_port_set_info(ptr, port_info.ptr)
+      GPhoto2.check!(rc)
+    end
+  end
+end

data/lib/gphoto2/port_info.rb

@@ -44,9 +44,7 @@ module GPhoto2
     end
 
     def get_name
-      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)
@@ -56,9 +54,7 @@ module GPhoto2
     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)

data/lib/gphoto2/port_info_list.rb

@@ -25,7 +25,7 @@ module GPhoto2
     private
 
     def new
-      ptr = FFI::MemoryPointer.new(GPPortInfoList)
+      ptr = FFI::MemoryPointer.new(:pointer)
       rc = gp_port_info_list_new(ptr)
       GPhoto2.check!(rc)
       @ptr = GPPortInfoList.new(ptr.read_pointer)

data/lib/gphoto2/version.rb

@@ -1,3 +1,3 @@
 module GPhoto2
-  VERSION = '0.5.1'
+  VERSION = '0.8.0'
 end

data/spec/gphoto2/camera_abilities_spec.rb

@@ -34,5 +34,28 @@ module GPhoto2
         expect(abilities[key]).to eq(value)
       end
     end
+
+    describe '#operations' do
+      context 'when no or one operation is supported' do
+        it 'returns a bit field of supported operations' do
+          abilities = CameraAbilities.new(camera_abilities_list, index)
+          allow(abilities).to receive(:[]).and_return(:none)
+          expect(abilities.operations).to eq(0)
+        end
+      end
+
+      context 'when multiple operations are supported' do
+        it 'returns a bit field of supported operations' do
+          abilities = CameraAbilities.new(camera_abilities_list, index)
+
+          capture_image = FFI::GPhoto2::CameraOperation[:capture_image]
+          config = FFI::GPhoto2::CameraOperation[:config]
+          operations = capture_image | config
+
+          allow(abilities).to receive(:[]).and_return(operations)
+          expect(abilities.operations).to eq(0x11)
+        end
+      end
+    end
   end
 end

data/spec/gphoto2/camera_file_info/file_camera_file_info_spec.rb

@@ -0,0 +1,56 @@
+require 'spec_helper'
+require 'ostruct'
+
+module GPhoto2
+  describe FileCameraFileInfo do
+    it_behaves_like CameraFileInfo
+
+    let(:camera_file_info_file) do
+      OpenStruct.new(
+        fields: 0xff,
+        status: :not_downloaded,
+        size: 7355608,
+        type: 'image/jpeg',
+        width: 4928,
+        height: 3264,
+        permissions: 0xff,
+        mtime: Time.at(1467863342)
+      )
+    end
+
+    describe '#width' do
+      it 'returns the width of the file' do
+        info = FileCameraFileInfo.new(camera_file_info_file)
+        expect(info.width).to eq(4928)
+      end
+    end
+
+    describe '#height' do
+      it 'returns the height of the file' do
+        info = FileCameraFileInfo.new(camera_file_info_file)
+        expect(info.height).to eq(3264)
+      end
+    end
+
+    describe '#readable?' do
+      it 'returns whether the file is readable' do
+        info = FileCameraFileInfo.new(camera_file_info_file)
+        expect(info.readable?).to be(true)
+      end
+    end
+
+    describe '#deletable?' do
+      it 'returns whether the file is deletable' do
+        info = FileCameraFileInfo.new(camera_file_info_file)
+        expect(info.deletable?).to be(true)
+      end
+    end
+
+    describe '#mtime' do
+      it 'returns the last modification time of the file' do
+        info = FileCameraFileInfo.new(camera_file_info_file)
+        expect(info.mtime).to eq(Time.at(1467863342))
+      end
+    end
+  end
+end

data/spec/gphoto2/camera_file_spec.rb

@@ -75,5 +75,22 @@ module GPhoto2
         expect(file.size).to eq(data_and_size.last)
       end
     end
+
+    describe '#info' do
+      context 'the file is a preview' do
+        it 'returns nil' do
+          file = CameraFile.new(camera)
+          expect(file.info).to be(nil)
+        end
+      end
+
+      context 'the file is a file' do
+        it 'it returns an instance of FileCameraFileInfo' do
+          file = CameraFile.new(camera, folder, name)
+          allow(file).to receive(:get_info).and_return(FileCameraFileInfo.new(nil))
+          expect(file.info).to be_kind_of(FileCameraFileInfo)
+        end
+      end
+    end
   end
 end

data/spec/gphoto2/camera_spec.rb

@@ -126,18 +126,24 @@ module GPhoto2
       let(:operations) { FFI::GPhoto2::CameraOperation[:capture_image] }
 
       before do
-        allow(camera).to receive_message_chain(:abilities, :[]).and_return(operations)
+        allow(camera).to receive_message_chain(:abilities, :operations).and_return(operations)
+      end
+
+      context 'when the camera has the ability to perform an operation' do
+        it 'returns true' do
+          expect(camera.can?(:capture_image)).to be(true)
+        end
       end
 
       context 'when the camera does not have the ability perform an operation' do
-        it 'return false' do
+        it 'returns false' do
           expect(camera.can?(:capture_audio)).to be(false)
         end
       end
 
-      context 'when the camera does have the ability to perform an operation' do
-        it 'returns true' do
-          expect(camera.can?(:capture_image)).to be(true)
+      context 'an invalid operation is given' do
+        it 'returns false' do
+          expect(camera.can?(:dance)).to be(false)
         end
       end
     end

data/spec/gphoto2/port_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+module GPhoto2
+  describe Port do
+    before do
+      allow_any_instance_of(Port).to receive(:new)
+    end
+
+    describe '#info=' do
+      let(:port) { Port.new }
+
+      before do
+        allow(port).to receive(:set_info)
+      end
+
+      it 'returns the input value' do
+        info = double(:port_info)
+        expect(port.info = info).to eq(info)
+      end
+    end
+  end
+end

data/spec/gphoto2_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe GPhoto2 do
+  describe '.check!' do
+    context 'the return code is not GP_OK' do
+      it 'raises GPhoto2::Error with a message and error code' do
+        code = -1
+        message = "Unspecified error (#{code})"
+
+        expect { GPhoto2.check!(code) }.to raise_error do |e|
+          expect(e).to be_kind_of(GPhoto2::Error)
+          expect(e.message).to eq(message)
+          expect(e.code).to eq(code)
+        end
+      end
+    end
+  end
+end

data/spec/support/shared_examples/camera/capture_examples.rb

@@ -19,6 +19,19 @@ module GPhoto2
       end
     end
 
+    describe '#trigger' do
+      let(:camera) { Camera.new(model, port) }
+
+      before do
+        allow(camera).to receive(:trigger_capture)
+      end
+
+      it 'saves the camera configuration' do
+        expect(camera).to receive(:save)
+        camera.trigger
+      end
+    end
+
     describe '#preview' do
       let(:camera) { Camera.new(model, port) }
       let(:file) { double('camera_file') }

data/spec/support/shared_examples/camera/configuration_examples.rb

@@ -65,29 +65,37 @@ module GPhoto2
     end
 
     describe '#[]=' do
-      let(:window) do
-        window = double('camera_widget')
-        expect(window).to receive(:value=).with(400)
-        window
-      end
+      let(:camera) { Camera.new(model, port) }
 
-      let(:camera) do
-        camera = Camera.new(model, port)
-        allow(camera).to receive(:[]).and_return(window)
-        camera
-      end
+      context 'when the specified key is valid' do
+        let(:window) { double('camera_widget', :value= => 400) }
 
-      it "sets a widget's value" do
-        camera['iso'] = 400
-      end
+        before do
+          allow(camera).to receive(:[]).and_return(window)
+        end
+
+        it "sets a widget's value" do
+          camera['iso'] = 400
+        end
+
+        it 'marks the camera as dirty' do
+          camera['iso'] = 400
+          expect(camera).to be_dirty
+        end
 
-      it 'marks the camera as dirty' do
-        camera['iso'] = 400
-        expect(camera).to be_dirty
+        it 'returns the passed value' do
+          expect(camera['iso'] = 400).to eq(400)
+        end
       end
 
-      it 'returns the passed value' do
-        expect(camera['iso'] = 400).to eq(400)
+      context 'when the specified key is invalid' do
+        before do
+          allow(camera).to receive(:[]).and_return(nil)
+        end
+
+        it 'raises an ArgumentError' do
+          expect { camera['flavor'] = 'strawberry' }.to raise_error(ArgumentError)
+        end
       end
     end