rbind 0.0.15 → 0.0.16

data/lib/rbind/core/rbase.rb

@@ -19,6 +19,8 @@ module Rbind
                 name = normalize(name)
                 cn = "#{cprefix}#{name.gsub("::","_")}"
                 cn = cn.gsub("()","_fct")
+                cn = cn.gsub("<=","_smaller_equal")
+                cn = cn.gsub(">=","_greater_equal")
                 cn = cn.gsub("!=","_unequal")
                 cn = cn.gsub("==","_equal")
                 cn = cn.gsub("&=","_and_set")
@@ -30,6 +32,8 @@ module Rbind
                 cn = cn.gsub("/","_div")
                 cn = cn.gsub("!","_not")
                 cn = cn.gsub("&","_and")
+                cn = cn.gsub("<","_smaller")
+                cn = cn.gsub(">","_greater")
                 cn.gsub("[]","_array")
             end
 

data/lib/rbind/core/rstring.rb

@@ -28,14 +28,14 @@ module Rbind
 %Q$         def self.to_native(obj,context)
                 if obj.is_a? ::String
                     str = obj.to_str
-                    OpenCV::Cv::String.new(str,str.length).__obj_ptr__
+                    Std::String.new(str,str.length).__obj_ptr__
                 else
                     rbind_to_native(obj,context)
                 end
             end
             def to_s
                 c_str
-            end}$
+            end$
         end
     end
 end

data/lib/rbind/generator_ruby.rb

@@ -425,6 +425,16 @@ module Rbind
                 str
             end
 
+            def add_to_s
+                str = []
+                @root.each_operation do |o|
+                    next unless o.is_a? RGetter
+                    op = OperationHelper.new(o)
+                    str << "#{op.name}=\#{self.#{op.name}}"
+                end
+                "\"#<#{full_name} #{str.join(" ")}>\""
+            end
+
             def add_methods(root=@root)
                 # sort all method according their target name
                 ops = Hash.new do |h,k|

data/lib/rbind/templates/ruby/rmethod.rb

@@ -4,8 +4,10 @@
         Rbind::<%= cname %>( <%= wrap_parameters_call %>)
     <%- else -%>
         result = Rbind::<%= cname %>( <%= wrap_parameters_call %>)
+        if result.respond_to?(:__owner__?) && !result.__owner__?
         # store owner insight the pointer to not get garbage collected
-        result.instance_variable_get(:@__obj_ptr__).instance_variable_set(:@__owner__,self) if !result.__owner__?
+            result.instance_variable_get(:@__obj_ptr__).instance_variable_set(:@__owner__,self) 
+        end
         result
     <%- end -%>
     end

data/lib/rbind/templates/ruby/roverloaded_method_call.rb

@@ -1,21 +1,22 @@
         # wrapper for <%= signature %>
         @@<%=cname%>_defaults<%= index %> ||= <%= signature_default_values %>
         if(args.size >= <%= min_number_of_parameters %> && args.size <= <%= parameters.size %>)
-            args.size.upto(<%= parameters.size-1%>) do |i|
-                args[i] = @@<%=cname%>_defaults<%=index%>[i]
+            targs = args.clone
+            targs.size.upto(<%= parameters.size-1%>) do |i|
+                targs[i] = @@<%=cname%>_defaults<%=index%>[i]
             end
             begin
                 <%- if !return_type || return_type.basic_type? || operator? -%>
                     <%- if constructor? || !instance_method? -%>
-                return Rbind::<%= cname %>(*args)
+                return Rbind::<%= cname %>(*targs)
                     <%- else -%>
-                return Rbind::<%= cname %>(self,*args)
+                return Rbind::<%= cname %>(self,*targs)
                     <%- end -%>
                 <%- else -%>
                     <%- if instance_method? -%>
-                result = Rbind::<%= cname %>(self,*args)
+                result = Rbind::<%= cname %>(self,*targs)
                     <%- else -%>
-                result = Rbind::<%= cname %>(*args)
+                result = Rbind::<%= cname %>(*targs)
                     <%- end -%>
                 # store owner insight the pointer to not get garbage collected
                 result.instance_variable_get(:@__obj_ptr__).instance_variable_set(:@__owner__,self) if !result.__owner__?

data/lib/rbind/templates/ruby/rtype.rb

@@ -18,6 +18,16 @@ class <%= name %>
     extend FFI::DataConverter
     native_type FFI::Type::POINTER
 
+    # @api private
+    #
+    # Returns the *Struct type that Rbind uses to store additional information
+    # about the memory used by this object
+    #
+    # @return [FFI::Struct]
+    def self.rbind_struct
+        <%= name %>Struct
+    end
+
     def self.new(*args)
         if args.first.is_a?(FFI::Pointer) || args.first.is_a?(<%= name %>Struct)
             raise ArgumentError, "too many arguments for creating #{self.name} from Pointer" unless args.size == 1
@@ -42,13 +52,24 @@ class <%= name %>
     end
 
     # @api private
-    # can be overwritten by the user
+    #
+    # Performs the convertion a Ruby representation into the FFI representation
+    #
+    # @param [Object] obj the Ruby representation
+    # @param context necessary but undocumented argument from FFI
+    # @return [FFI::Pointer,FFI::AutoPointer]
     def self.to_native(obj,context)
         rbind_to_native(obj,context)
     end
 
     # @api private
-    # can be overwritten by the user
+    # 
+    # Performs the convertion from FFI into the Ruby representation that
+    # corresponds to this type
+    #
+    # @param [FFI::Pointer,FFI::AutoPointer] ptr
+    # @param [] context
+    # @return [Object]
     def self.from_native(ptr,context)
         rbind_from_native(ptr,context)
     end
@@ -72,6 +93,11 @@ class <%= name %>
         @__obj_ptr__[:bowner]
     end
 
+    # converts <%= name %> into a string by crawling through all its attributes
+    def to_s
+        <%= add_to_s %>
+    end
+
     # @!group Sepcializing
 <%= add_specializing %>
     # @!endgroup

data/lib/rbind/typelib.rb

@@ -0,0 +1,69 @@
+require 'typelib'
+module Rbind
+    module Typelib
+        class << self
+            # @return [Typelib::Registry] The typelib registry that should be used by Typelib.to_typelib
+            attr_accessor :registry
+        end
+        self.registry = ::Typelib::Registry.new
+
+        # Converts +rbind+ into a Typelib value
+        #
+        # @param [Object] rbind the Rbind-generated representation of the type.
+        #   It has to own the underlying memory
+        # @param [String] typename the Typelib type name into which this type
+        #   should be represented
+        # @return [Typelib::Type,nil] the converted value or nil if Typelib.registry
+        #   does not contain the requested type
+        def self.to_typelib(klass, rbind, typename)
+            if rbind.kind_of?(FFI::Pointer)
+                rbind = klass.rbind_struct.new(rbind)
+            end
+            if rbind.kind_of?(klass.rbind_struct)
+                if !rbind[:bowner]
+                    raise ArgumentError, "cannot convert #{rbind}: it does not own the underlying memory"
+                end
+                if registry.include?(typename)
+                    rbind[:bowner] = false
+                    typelib_t = registry.get(typename)
+                    ::Typelib.to_ruby(typelib_t.from_address(rbind[:obj_ptr].address))
+                end
+            end
+
+        end
+
+        # Converts +obj+ into the FFI::Struct that rbind uses to initialize its Ruby
+        # types (one of the XXXXStruct types generated by Rbind)
+        #
+        # @param [Class<FFI::Struct>] klass the FFI::Struct type
+        # @param [Object] obj the object to be converted
+        # @param [Array<String>] typenames the Typelib type names that are known to
+        #   be equivalents of the FFI::Struct represented by klass
+        # @return [FFI::Struct,nil] the converted struct or nil if the obj argument
+        #   is not a typelib type
+        # @raise ArgumentError if 'obj' is a typelib type, but not of one of the
+        #   expected typenames
+        def self.from_typelib(klass, obj, *typenames)
+            typelib_value = nil
+            typenames.each do |tn|
+                target_t = registry.build(tn)
+                begin
+                    typelib_value = ::Typelib.from_ruby(obj, target_t)
+                rescue ArgumentError
+                end
+            end
+            if typelib_value
+                s = klass.rbind_struct.new
+                s[:obj_ptr]  = typelib_value.to_memory_ptr.zone_address
+                s[:bowner] = false
+                s[:size] = 0 #obj.marshalling_size
+                s[:type_id] = nil
+                s[:version] = 1
+                s
+            elsif obj.kind_of?(::Typelib::Type)
+                raise ArgumentError, "#{obj} is a typelib type, but I don't know how to convert it to #{klass}. Expected one of #{typenames.sort.join(", ")}"
+            end
+        end
+    end
+end
+

data/rbind.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
     s.name              = 'rbind'
-    s.version           = '0.0.15'
-    s.date              = '2013-09-03'
+    s.version           = '0.0.16'
+    s.date              = '2013-08-13'
     s.platform          = Gem::Platform::RUBY
     s.authors           = ['Alexander Duda']
     s.email             = ['Alexander.Duda@dfki.de']
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
     s.files             = `git ls-files`.split("\n")
     s.require_path      = 'lib'
     s.required_rubygems_version = ">= 1.3.6"
+    s.add_runtime_dependency "hooks", ">= 0.3.1"
 
     #s.rubyforge_project = s.name
-    #s.add_runtime_dependency "other", "~> 1.2"
 end

metadata

@@ -1,28 +1,38 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: rbind
-version: !ruby/object:Gem::Version
-  version: 0.0.15
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 0.0.16
 platform: ruby
-authors:
+authors: 
 - Alexander Duda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-03 00:00:00.000000000 Z
-dependencies: []
-description: Rbind is developed to automatically generate ruby bindings for OpenCV
-  but is not tight to this library. It allows to import already wrapped types from
-  other gems/libraries using rbind to share the same types across multiple gems/libraries.
-  For now rbind uses a copy of the OpenCV python hdr_parser to parse c/c++ header
-  files and looks for certain defines. This gem is still under heavy development and
-  the API might change in the future.
-email:
+
+date: 2013-08-13 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: hooks
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.3.1
+  type: :runtime
+  version_requirements: *id001
+description: Rbind is developed to automatically generate ruby bindings for OpenCV but is not tight to this library. It allows to import already wrapped types from other gems/libraries using rbind to share the same types across multiple gems/libraries. For now rbind uses a copy of the OpenCV python hdr_parser to parse c/c++ header files and looks for certain defines. This gem is still under heavy development and the API might change in the future.
+email: 
 - Alexander.Duda@dfki.de
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - README.md
 - lib/rbind.rb
 - lib/rbind/core.rb
@@ -76,30 +86,36 @@ files:
 - lib/rbind/templates/ruby/rtype.rb
 - lib/rbind/templates/ruby/rtype_constructor.rb
 - lib/rbind/tools/hdr_parser.py
+- lib/rbind/typelib.rb
 - rbind.gemspec
 - test/test_generator_ruby.rb
 homepage: http://github.com/D-Alex/rbind
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
       version: 1.3.6
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Library for genereating automated ffi-bindings for c/c++ libraries
 test_files: []
+
+has_rdoc: