rbind 0.0.12 → 0.0.13

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/generator_extern.rb

@@ -2,10 +2,11 @@ require 'yaml'
 
 module Rbind
     class GeneratorExtern
-        Config = Struct.new(:ruby_module_name)
+        Config = Struct.new(:ruby_module_name,:file_prefix)
 
         attr_accessor :output_path
         attr_accessor :ruby_module_name
+        attr_accessor :file_prefix
         def self.normalize_type_name(name)
             name.gsub('::','.')
         end
@@ -14,9 +15,10 @@ module Rbind
             @root = root
         end
 
-        def generate(path = @output_path,ruby_module_name = @ruby_module_name)
+        def generate(path = @output_path,ruby_module_name = @ruby_module_name,file_prefix = @file_prefix)
             @output_path = path
             @ruby_module_name = ruby_module_name
+            @file_prefix = file_prefix
             FileUtils.mkdir_p(path) if path && !File.directory?(path)
             file_extern = File.new(File.join(path,"extern.rbind"),"w")
             file_config = File.new(File.join(path,"config.rbind"),"w")
@@ -33,7 +35,7 @@ module Rbind
                 file_extern.write "const #{GeneratorExtern.normalize_type_name(c.full_name)} /Extern\n"
             end
             file_extern.write("\n")
-            file_config.write Config.new(ruby_module_name).to_yaml
+            file_config.write Config.new(ruby_module_name,file_prefix).to_yaml
         end
     end
 end

data/lib/rbind/generator_ruby.rb

@@ -516,7 +516,7 @@ module Rbind
             @rbind_wrapper = ERB.new(File.open(File.join(File.dirname(__FILE__),"templates","ruby","rbind.rb")).read)
             @module_name = module_name
             @library_name = library_name
-            @compact_namespace = false
+            @compact_namespace = true
         end
 
         def generate(path=@output_path)

data/lib/rbind/rbind.rb

@@ -150,7 +150,7 @@ module Rbind
             paths = Rbind.rbind_pkg_paths(@pkg_config)
             modules = paths.map do |pkg|
                 config = YAML.load(File.open(File.join(pkg,"config.rbind")).read)
-                config.ruby_module_name
+                config.file_prefix
             end
             @generator_ruby.required_module_names = modules + gems
             @generator_ruby.generate(path)
@@ -165,7 +165,7 @@ module Rbind
         end
 
         def generate_extern(path)
-            @generator_extern.generate(path,@generator_ruby.module_name)
+            @generator_extern.generate(path,@generator_ruby.module_name,@generator_ruby.file_prefix)
         end
 
         def use_namespace(name)

data/lib/rbind/templates/c/CMakeLists.txt

@@ -17,9 +17,8 @@ ADD_LIBRARY(<%= library_name %> SHARED ${RBIND_SRC})
 TARGET_LINK_LIBRARIES(<%= library_name %> <%= libs %> ${GEM_LIBRARIES})
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/rbind.pc.in ${CMAKE_CURRENT_BINARY_DIR}/<%= library_name %>.pc @ONLY)
-set(ROOT_FOLDER ${CMAKE_CURRENT_SOURCE_DIR}/..)
 
-# global install
+set(ROOT_FOLDER ${CMAKE_CURRENT_SOURCE_DIR}/..)
 if(GEM_INSTALL)
     # local install
     install(TARGETS <%= library_name %> LIBRARY DESTINATION ${ROOT_FOLDER}/lib/lib)
@@ -39,7 +38,7 @@ else()
         MESSAGE(STATUS "Ruby library not found. Cannot install ruby extensions")
     ELSEIF(NOT RUBY_EXTENSIONS_AVAILABLE)
         STRING(REGEX REPLACE ".*lib(32|64)?/?" "lib/" RUBY_LIBRARY_INSTALL_DIR ${RUBY_RUBY_LIB_PATH})
-        INSTALL(DIRECTORY ${ROOT_FOLDER}/lib/ruby DESTINATION ${RUBY_LIBRARY_INSTALL_DIR}
+        INSTALL(DIRECTORY ${ROOT_FOLDER}/lib/ruby/ DESTINATION ${RUBY_LIBRARY_INSTALL_DIR}
             FILES_MATCHING PATTERN "*.rb")
     ENDIF(NOT RUBY_INCLUDE_PATH)
 endif()

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

@@ -8,10 +8,13 @@ module <%= name %>
         extend FFI::Library
 
         #load library <%= library_name %>
-        path = Dir.chdir(File.join(File.dirname(__FILE__),"..","..","lib")) do
-            path = Dir.glob("lib<%= library_name %>.*").first
-            File.absolute_path(path) if path
-        end
+        path = File.join(File.dirname(__FILE__),"..","..","lib")
+        path = if Dir.exist?(path)
+                   Dir.chdir(path) do
+                       path = Dir.glob("lib<%= library_name %>.*").first
+                       File.absolute_path(path) if path
+                   end
+               end
         ffi_lib ["<%= library_name %>", path]
 
         #add error checking

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

@@ -1,6 +1,9 @@
 # wrapper for <%= full_name %>
 module <%= name %>
+    # @!group Constants
 <%= add_consts%>
+    # @!endgroup
+#
 <%= add_methods %>
 <%= add_types %>
 end

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

@@ -1,3 +1,4 @@
+# @api private
 # object wrapping <%= full_name %>
 class <%= name %>Struct < FFI::Struct
     layout :version,:uchar,
@@ -26,6 +27,7 @@ class <%= name %>
         raise ArgumentError, "no constructor for #{self}(#{args.inspect})"
     end
 
+    # @api private
     def self.rbind_to_native(obj,context)
         if obj.is_a? <%= name %>
             obj.__obj_ptr__
@@ -34,21 +36,27 @@ class <%= name %>
         end
     end
 
+    # @api private
     def self.rbind_from_native(ptr,context)
         <%= name %>.new(ptr)
     end
 
+    # @api private
     # can be overwritten by the user
     def self.to_native(obj,context)
         rbind_to_native(obj,context)
     end
 
+    # @api private
     # can be overwritten by the user
     def self.from_native(ptr,context)
         rbind_from_native(ptr,context)
     end
 
+    # @api private
     attr_reader :__obj_ptr__
+
+    # @api private
     def initialize(ptr)
         @__obj_ptr__ = if ptr.is_a? <%= name %>Struct
                            ptr
@@ -57,20 +65,24 @@ class <%= name %>
                        end
     end
 
+    # @api private
     # returns true if the underlying pointer is owner of
     # the real object
     def __owner__?
         @__obj_ptr__[:bowner]
     end
 
-    # custom specializing
+    # @!group Sepcializing
 <%= add_specializing %>
+    # @!endgroup
 
-    # consts
+    # @!group Constants
 <%= add_consts %>
+    # @!endgroup
 
     # methods
 <%= add_methods %>
+
     # types
 <%= add_types %>
 end

data/rbind.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
     s.name              = 'rbind'
-    s.version           = '0.0.12'
+    s.version           = '0.0.13'
     s.date              = '2013-07-03'
     s.platform          = Gem::Platform::RUBY
     s.authors           = ['Alexander Duda']

metadata

@@ -2,7 +2,7 @@
 name: rbind
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors: 
 - Alexander Duda
@@ -106,3 +106,4 @@ specification_version: 3
 summary: Library for genereating automated ffi-bindings for c/c++ libraries
 test_files: []
 
+has_rdoc: