rbind 0.0.5 → 0.0.6

data/lib/rbind/generator_ruby.rb

@@ -34,15 +34,30 @@ module Rbind
                           normalize_type_name(parameter.default_value)
                       end
                   else
-                      if(parameter.default_value =~ /(\w*)\((.*)\)/)
+                      if(parameter.default_value =~ /([\w:]*) *\((.*)\)/)
                           t = parameter.owner.owner.type($1,false)
-                          if t
-                              "#{normalize_type_name(t.full_name)}.new(#{$2})"
-                          else
-                              ns = RBase.namespace($1)
-                              t = parameter.owner.owner.type(ns,false) if ns
-                              ops = Array(t.operation($1,false)) if t
-                              "#{normalize_method_name(ops.first.full_name)}(#{$2})" if ops && !ops.empy?
+                          ops = Array(parameter.owner.owner.operation($1,false)) if !t
+                          t,ops = if t || !ops.empty?
+                                      [t,ops]
+                                  else
+                                      ns = RBase.namespace($1)
+                                      name = RBase.basename($1)
+                                      if ns && name
+                                          t = parameter.owner.owner.type(ns,false) 
+                                          ops = Array(t.operation(name,false)) if t
+                                          [t,ops]
+                                      else
+                                          [nil,nil]
+                                      end
+                                  end
+                          if ops && !ops.empty?
+                              if t
+                                "#{normalize_type_name(t.full_name)}::#{normalize_method_name(ops.first.name)}(#{($2)})"
+                              else
+                                "#{normalize_method_name(ops.first.name)}(#{($2)})"
+                              end
+                          elsif t
+                              "#{normalize_type_name(t.full_name)}.new(#{($2)})"
                           end
                       else
                           parameter.default_value
@@ -84,21 +99,25 @@ module Rbind
             end
         end
 
-        def self.normalize_method_name(name)
-            #replaced _X with _x
-            name = name.to_s.gsub(/\A#{RBase.cprefix}/, "").gsub(/_(?<!\A)\p{Lu}/u, '\0')
+        # normalize c method to meet ruby conventions
+        # see unit tests
+        def self.normalize_method_name(orig_name)
+            #remove cprefix and replaced _X with #X
+            name = orig_name.to_s.gsub(/\A#{RBase.cprefix}/, "") .gsub(/_((?<!\A)\p{Lu})/u, '#\1')
             #replaced X with _x
-            name = name.gsub(/(?<!\A)\p{Lu}/u, '_\0').downcase
-            str = ""
-            name.split("_").each_with_index do |n,i|
-                if n.size == 1 && i > 0
-                    str += n
-                else
-                    str += "_#{n}"
-                end
-            end
-            str = str[1..-1] #remove leading "_"
-            str = if str =~/^operator(.*)/
+            name = name.gsub(/(?<!\A)[\p{Lu}\d]/u, '_\0').downcase
+            #replaced _x_ with #x#
+            name = name.to_s.gsub(/[_#]([a-zA-Z\d])[_#]/u, '#\1#')
+            #replaced _x$ with #x
+            name = name.to_s.gsub(/[_#]([a-zA-Z\d])$/u, '#\1')
+            #replaced ## with _
+            name = name.gsub(/##/, '_')
+            #replace #xx with _xx
+            name = name.gsub(/#([a-zA-Z\d]{2})/, '_\1')
+            #remove all remaining #
+            name = name.gsub(/#/, '')
+            #replace operatorX with the correct ruby operator
+            name = if name =~/^operator(.*)/
                         n = $1
                         if n =~ /\(\)/
                             raise "forbbiden method name #{name}"
@@ -120,8 +139,10 @@ module Rbind
                             n
                         end
                    else
-                       str
+                      name
                    end
+            raise "generated empty name for #{orig_name}" if name.empty?
+            name
         end
 
         class HelperBase

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

@@ -4,7 +4,10 @@ PROJECT(<%= library_name %> CXX)
 include(FindPkgConfig)
 <%= find_packages %>
 
-SET(RBIND_SRC types.cc operations.cc conversions.cc)
+SET(RBIND_SRC
+    "${CMAKE_CURRENT_SOURCE_DIR}/types.cc"
+    "${CMAKE_CURRENT_SOURCE_DIR}/operations.cc"
+    "${CMAKE_CURRENT_SOURCE_DIR}/conversions.cc")
 ADD_LIBRARY(<%= library_name %> SHARED ${RBIND_SRC})
 
 TARGET_LINK_LIBRARIES(<%= library_name %> <%= libs %>)

data/rbind.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
     s.name              = 'rbind'
-    s.version           = '0.0.5'
-    s.date              = '2013-06-20'
+    s.version           = '0.0.6'
+    s.date              = '2013-06-22'
     s.platform          = Gem::Platform::RUBY
     s.authors           = ['Alexander Duda']
     s.email             = ['Alexander.Duda@dfki.de']

data/test/test_generator_ruby.rb

@@ -0,0 +1,79 @@
+require 'minitest/spec'
+require 'rbind'
+
+MiniTest::Unit.autorun
+describe Rbind::GeneratorRuby do
+    before do
+    end
+
+    after do
+    end
+
+    describe "normalize_method_name" do
+        it "must remove the cprefix" do
+            result = Rbind::GeneratorRuby.normalize_method_name("rbind__test123")
+            assert_equal("_test123",result)
+        end
+
+        it "must change upper case letters to lower case and add a _ if there is none" do
+            result = Rbind::GeneratorRuby.normalize_method_name("rbind_Cv")
+            assert_equal("cv",result)
+            result = Rbind::GeneratorRuby.normalize_method_name("rbind_cv")
+            assert_equal("cv",result)
+            result = Rbind::GeneratorRuby.normalize_method_name("rbind_cv_FeatureDetector")
+            assert_equal("cv_feature_detector",result)
+            result = Rbind::GeneratorRuby.normalize_method_name("rbind_cv_FeatureDetector__create")
+            assert_equal("cv_feature_detector__create",result)
+        end
+
+        it "must preserve __ in a method name" do
+            result = Rbind::GeneratorRuby.normalize_method_name("rbind_cv_FeatureDetector__create")
+            assert_equal("cv_feature_detector__create",result)
+        end
+
+        it "must regard upper case letters in a sequence as block " do
+            result = Rbind::GeneratorRuby.normalize_method_name("rbind_CV_TEST")
+            assert_equal("cv_test",result)
+            result = Rbind::GeneratorRuby.normalize_method_name("rbind_CV_TEST_get_Test")
+            assert_equal("cv_test_get_test",result)
+            result = Rbind::GeneratorRuby.normalize_method_name("rbind_cv_RNG")
+            assert_equal("cv_rng",result)
+            result = Rbind::GeneratorRuby.normalize_method_name("rbind_cv_RNG_gaussian")
+            assert_equal("cv_rng_gaussian",result)
+            result = Rbind::GeneratorRuby.normalize_method_name("rbind_cv_KDTree")
+            assert_equal("cv_kd_tree",result)
+            result = Rbind::GeneratorRuby.normalize_method_name("rbind_cv_RNG2")
+            assert_equal("cv_rng2",result)
+        end
+
+        it "must regard upper case letters in a sequence as block " do
+            result = Rbind::GeneratorRuby.normalize_method_name("rbind_CV_TEST")
+            assert_equal("cv_test",result)
+        end
+    end
+
+    describe "normalize_default_value" do
+        it "must remove f from float values" do
+            p = Rbind::RParameter.new("p1",Rbind::RDataType.new("float"),"1.0f")
+            result = Rbind::GeneratorRuby.normalize_default_value(p)
+            assert_equal("1.0",result)
+        end
+
+        it "must add zero to double values if missing" do
+            p = Rbind::RParameter.new("p1",Rbind::RDataType.new("double"),"1.")
+            result = Rbind::GeneratorRuby.normalize_default_value(p)
+            assert_equal("1.0",result)
+        end
+
+        it "must add zero to double values if missing" do
+            p = Rbind::RParameter.new("p1",Rbind::RDataType.new("double"),"1.")
+            result = Rbind::GeneratorRuby.normalize_default_value(p)
+            assert_equal("1.0",result)
+        end
+    end
+end
+            #assert(@service.names.include?("Local/dummy"))
+            #assert_equal(@task,@service.get("dummy"))
+            #assert_raises(Orocos::NotFound) do
+            #    @service.get("foo")
+            #end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbind
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-20 00:00:00.000000000 Z
+date: 2013-06-22 00:00:00.000000000 Z
 dependencies: []
 description: ''
 email:
@@ -64,6 +64,7 @@ files:
 - lib/rbind/templates/ruby/rtype_constructor.rb
 - lib/rbind/tools/hdr_parser.py
 - rbind.gemspec
+- test/test_generator_ruby.rb
 homepage: http://github.com/
 licenses: []
 post_install_message: