sane-ffi-denkn 0.1.2 → 0.1.3

data/lib/sane/api.rb

@@ -11,6 +11,7 @@ class Sane
     enum :unit, [:none, 0, :pixel, :bit, :mm, :dpi, :percent, :microsecond]
     enum :action, [:get_value, 0, :set_value, :set_auto]
     enum :frame, [:gray, :rgb, :red, :green, :blue]
+    ConstraintType = enum :none, 0, :range, :word_list, :string_list
 
     class Device < FFI::Struct
       layout :name, :string, :vendor, :string, :model, :string, :type, :string
@@ -26,12 +27,58 @@ class Sane
     end
 
     class OptionDescriptor < FFI::Struct
-      class ConstraintType < FFI::Union
-        layout :string_list, :pointer, :word_list, :pointer, :range, :pointer
+      class Range < Struct.new(:min, :max, :quant)
+        include Comparable
+        include Enumerable
+        def <=> x
+          (min..max) <=> x
+        end
+
+        def include? x
+          (min..max).include?( x) and 0 == (x-min) % quant
+        end
+
+        def === x
+          x.kind_of?( Numeric) and include?( x)
+        end
+
+        def each
+          min.step( max, [1,quant].max)
+        end
+      end
+
+      layout :name, :string,
+        :title, :string,
+        :desc, :string,
+        :type, :value_type,
+        :unit, :unit,
+        :size, :int,
+        :cap, :int,
+        :constraint_type, ConstraintType,
+        :constraint, :pointer
+
+      alias method_missing []
+
+      def constraint
+        c = self[:constraint]
+        case self[:constraint_type]
+        when 0, :none then nil
+        when 1, :range
+          Range.new *c.read_array_of_int( 3)
+        when 2, :word_list
+          c[FFI::Type::INT.size].read_array_of_int c.read_int
+        when 3, :string_list
+          i, r, p = 0, [], nil
+          while 0 < (p = c[i].read_pointer).address
+            STDERR.puts p.inspect
+            r << p.read_string_to_null
+            i += FFI::Type::POINTER.size
+          end
+          r
+        end
       end
-      layout :name, :string, :title, :string, :desc, :string, :type, :value_type, :unit, :unit, :size, :int, :cap, :int, :constraint_type, ConstraintType
 
-      def to_hash;
+      def to_hash
         {
           :name => self[:name],
           :title => self[:title],
@@ -39,7 +86,8 @@ class Sane
           :type => self[:type],
           :unit => self[:unit],
           :size => self[:size],
-          :cap => self[:cap]
+          :cap => self[:cap],
+          :constraint => constraint
         }
       end
     end

data/lib/sane/version.rb

@@ -1,3 +1,3 @@
 class Sane
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,27 +1,30 @@
 --- !ruby/object:Gem::Specification
 name: sane-ffi-denkn
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
+  prerelease: 
 platform: ruby
 authors:
 - Jakub Kuźma & Denis Knauf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-23 00:00:00.000000000 Z
+date: 2015-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Scanner Access now Easier
@@ -44,26 +47,26 @@ files:
 - sane-ffi.gemspec
 homepage: ''
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: SANE bindings
 test_files: []
-has_rdoc: 

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 8255a18377ffb370d20eca17c9188717a0a9d284
-  data.tar.gz: 800d4c2645f5ba6c63eb7dfb1423f772492b5ab4
-SHA512:
-  metadata.gz: 43aa89dca9001f69f5c3d4bb24f64464da68a6ac8e7eb2f748bdc0aeae8914b5f6ee937dd03b53ff28e7599d4767ef2161e0588a5b7ab4e99ea6e0891e405be2
-  data.tar.gz: df42360f9cf5f2218a93cb3ce90fc0eb732d8f25a0e12e22b0bed663944dabed0fa5bf6bfd44c1799997a741abdfeb0dd42a7b0812650f08748031c743f2203b