ruby-lua 0.3.0 → 0.4.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 90979ca5da80b6a4c4f271d82635e741270824fc
+  data.tar.gz: a8b68ebcfa8d8303ff4d31fa02d34be07dc27213
+SHA512:
+  metadata.gz: ef5523c5f19f020f54cbada929185839c82a092d1c3e86aefe119350aeb0c857699aa894eb9502ac7691274560b7f3e9382984b7736e6ea3d241aaf8c0d1ef09
+  data.tar.gz: d475870087b3db055e8fea91037b4bef14981ef4310b765653df1767c4c5e3d56a970d26b3a8628a284f48a6452c611244513698bc1b4545df907ba541cff874

data/.gitignore

@@ -0,0 +1,29 @@
+# rcov generated
+coverage
+
+# rdoc generated
+rdoc
+
+# yard generated
+doc
+.yardoc
+
+# bundler
+.bundle
+
+# jeweler generated
+pkg
+
+# For MacOS:
+.DS_Store
+.rake_tasks
+
+# For ext
+Makefile
+ext/config.h
+*.bundle
+*.so
+*.dll
+*.swp
+*.log
+*.o

data/Gemfile

@@ -1,14 +1,2 @@
-source "http://rubygems.org"
-# Add dependencies required to use your gem here.
-# Example:
-#   gem "activesupport", ">= 2.3.5"
-
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
-group :development do
-  gem "shoulda", ">= 0"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.5.1"
-  gem "rcov", ">= 0"
-  gem "rdoc", ">=0"
-end
+source "https://rubygems.org"
+gemspec

data/Gemfile.lock

@@ -1,24 +1,39 @@
+PATH
+  remote: .
+  specs:
+    ruby-lua (0.4.0)
+
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    git (1.2.5)
-    jeweler (1.5.2)
-      bundler (~> 1.0.0)
-      git (>= 1.2.5)
-      rake
-    json (1.6.3)
-    rake (0.9.2.2)
-    rcov (0.9.11)
-    rdoc (3.11)
+    activesupport (3.2.13)
+      i18n (= 0.6.1)
+      multi_json (~> 1.0)
+    bourne (1.4.0)
+      mocha (~> 0.13.2)
+    i18n (0.6.1)
+    json (1.7.7)
+    metaclass (0.0.1)
+    mocha (0.13.3)
+      metaclass (~> 0.0.1)
+    multi_json (1.7.2)
+    rake (10.0.4)
+    rdoc (4.0.1)
       json (~> 1.4)
-    shoulda (2.11.3)
+    shoulda (3.4.0)
+      shoulda-context (~> 1.0, >= 1.0.1)
+      shoulda-matchers (~> 1.0, >= 1.4.1)
+    shoulda-context (1.1.1)
+    shoulda-matchers (1.5.6)
+      activesupport (>= 3.0.0)
+      bourne (~> 1.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0.0)
-  jeweler (~> 1.5.1)
-  rcov
+  bundler
+  rake
   rdoc
+  ruby-lua!
   shoulda

data/README.rdoc

@@ -33,7 +33,7 @@ Load a Lua Script
 Call the Lua function named <lua_function>
 This is equivalent to 
 
-	Language::Lua.call( false, "<lua_function>", ... )
+  Language::Lua.call( false, "<lua_function>", ... )
 
 === Language::Lua.call( [true|false], "<lua_function>", ... )
 
@@ -69,6 +69,6 @@ In your Lua code, call <ruby_function>.
 
 == Copyright
 
-Copyright (c) 2010 Gregoire Lejeune. See LICENSE.txt for
+Copyright (c) 2010-2013 Gregoire Lejeune. See LICENSE.txt for
 further details.
 

data/Rakefile

@@ -1,49 +1,19 @@
 require 'rubygems'
 require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
 require 'rake'
-
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "ruby-lua"
-  gem.homepage = "http://github.com/glejeune/ruby-lua"
-  gem.license = "MIT"
-  gem.summary = %Q{Call Lua from Ruby (and Ruby from Lua in Ruby)}
-  gem.description = %Q{Call Lua from Ruby (and Ruby from Lua in Ruby)}
-  gem.email = "gregoire.lejeune@free.fr"
-  gem.authors = ["Gregoire Lejeune"]
-  gem.extensions = FileList["ext/**/extconf.rb"].to_a
-  # Include your dependencies below. Runtime dependencies are required when using your gem,
-  # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
-  #  gem.add_runtime_dependency 'jabber4r', '> 0.1'
-  #  gem.add_development_dependency 'rspec', '> 1.2.3'
-end
-Jeweler::RubygemsDotOrgTasks.new
-
 require 'rake/testtask'
+require 'rubygems/package_task'
+require 'rdoc/task'
+
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
   test.pattern = 'test/**/test_*.rb'
   test.verbose = true
 end
-
-require 'rcov/rcovtask'
-Rcov::RcovTask.new do |test|
-  test.libs << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
+task :test => :compile
 
 task :default => :test
 
-require 'rdoc/task'
 RDoc::Task.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 
@@ -52,3 +22,18 @@ RDoc::Task.new do |rdoc|
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
+
+task :compile do
+  chdir 'ext' do
+    ruby 'extconf.rb'
+    sh   'make'
+  end
+end
+
+task :clean do
+  chdir 'ext' do
+    sh 'rm -f *.bundle *.dll *.so *.o *.obj Makefile config.h mkmf.log'
+  end
+end
+
+Bundler::GemHelper.install_tasks

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/examples/test.lua

@@ -1,5 +1,5 @@
 -- defines a factorial function
-function fact (n)
+function fact(n)
   if n == 0 then
     return 1
   else
@@ -8,7 +8,7 @@ function fact (n)
 end
 
 -- define a stupid function
-function hello( )
+function hello()
   return "world"
 end
 
@@ -18,4 +18,4 @@ str = "blah blah blah"
 -- define a number variable
 num = 123
 
-fact( 3 )
+fact(3)

data/ext/extconf.rb

@@ -2,48 +2,65 @@
 # See the LICENSE file for copyright and distribution information
 
 require "mkmf"
+init_mkmf
 
-$LIBPATH.push(Config::CONFIG['libdir'])
+$LIBPATH.push(RbConfig::CONFIG['libdir'])
 
 def crash(str)
   printf(" extconf failure: %s\n", str)
   exit 1
 end
 
-lib = ""
-
-#unless have_library( 'm', 'atan' )
-#  crash( 'need libm' )
-#end
 if /^1.8/.match RUBY_VERSION
-    $CFLAGS << " -DRUBY_1_8"
+  $CFLAGS << " -DRUBY_1_8"
 end
 
 if dir_config( "lua50" ) != [nil, nil]
-   inc, lib = dir_config( 'lua50' ) 
-   $LDFLAGS << " -L#{lib} -llualib50 -llua50"
-   $CFLAGS << " -I#{inc}"
+  inc, lib = dir_config( 'lua50' ) 
+  $LDFLAGS << " -L#{lib} -llualib50 -llua50"
+  $CFLAGS << " -I#{inc}"
 elsif dir_config( "lua" ) != [nil, nil]
-   inc, lib = dir_config( 'lua' ) 
-   $LDFLAGS << " -L#{lib} -llualib -llua"
-   $CFLAGS << " -I#{inc}"
+  inc, lib = dir_config( 'lua' ) 
+  $LDFLAGS << " -L#{lib} -llualib -llua"
+  $CFLAGS << " -I#{inc}"
+elsif dir_config( "lua51" ) != [nil, nil]
+  inc, lib = dir_config( 'lua51' ) 
+  $LDFLAGS << " -L#{lib} -llua5.1"
+  $CFLAGS << " -I#{inc}"
+elsif dir_config( "lua52" ) != [nil, nil]
+  inc, lib = dir_config( 'lua52' ) 
+  $LDFLAGS << " -L#{lib} -llua5.2"
+  $CFLAGS << " -I#{inc}"
 elsif ex = find_executable( "lua-config" )
-   $LDFLAGS << ' ' + `#{ex} --libs`.chomp
-   $CFLAGS << ' ' + `#{ex} --include`.chomp
+  $LDFLAGS << ' ' + `#{ex} --libs`.chomp
+  $CFLAGS << ' ' + `#{ex} --include`.chomp
 elsif ex = find_executable( "pkg-config" )
-   $LDFLAGS << ' ' + `#{ex} --libs lua`.chomp
-   $CFLAGS << ' ' + `#{ex} --cflags lua`.chomp
+  ["lua", "lua5.1", "lua5.2"].any? do |l|
+    ldf = `#{ex} --libs #{l}`.chomp
+    cf = `#{ex} --cflags #{l}`.chomp
+    next false if ldf.empty? or cf.empty?
+
+    $LDFLAGS << " #{ldf}"
+    $CFLAGS  << " #{cf}"
+    true
+  end
 else
   crash(<<EOL)
-need liblua50.
+need lua
 
         Install the library or try one of the following options to extconf.rb:
 
         --with-lua-lib=/path/to/liblua/lib
         --with-lua-include=/path/to/liblua/include
-		or
+    or
         --with-lua50-lib=/path/to/liblua/lib
         --with-lua50-include=/path/to/liblua/include
+    or
+        --with-lua51-lib=/path/to/liblua/lib
+        --with-lua51-include=/path/to/liblua/include
+    or
+        --with-lua52-lib=/path/to/liblua/lib
+        --with-lua52-include=/path/to/liblua/include
 EOL
 end
 
@@ -55,7 +72,7 @@ need liblua50 (headers not found)
 
         --with-lua-lib=/path/to/liblua/lib
         --with-lua-include=/path/to/liblua/include
-		or
+    or
         --with-lua50-lib=/path/to/liblua/lib
         --with-lua50-include=/path/to/liblua/include
 EOL
@@ -66,7 +83,16 @@ puts "  CFLAGS = #{$CFLAGS}"
 puts "  LDFLAGS = #{$LDFLAGS}"
 puts
 
-$CFLAGS = '-g -Wall ' + $CFLAGS
+#$CFLAGS = '-g -Wall ' + $CFLAGS
+HAVE_LUA_GLOBALSINDEX = have_macro("LUA_GLOBALSINDEX", "lua.h")
+RUBY_LUA_VERSION = open(File.join(File.dirname(__FILE__), "..", "VERSION")).read.chomp
+open("config.h", 'w') { |f|
+  f.puts "#ifndef RUBY_LUA_CONFIG"
+  f.puts "#define RUBY_LUA_CONFIG"
+  f.puts "#define RUBY_LUA_VERSION \"#{RUBY_LUA_VERSION}\""
+  f.puts "#define HAVE_LUA_GLOBALSINDEX 1" if HAVE_LUA_GLOBALSINDEX
+  f.puts "#endif"
+}
 
-create_header()
+#create_header()
 create_makefile("language/lua")

data/ext/rlua.c

@@ -18,6 +18,12 @@
 
 #include "rlua.h"
 
+VALUE mLanguage;
+VALUE cLua;
+
+VALUE ruby_lua_stack_size(VALUE self);
+VALUE ruby_lua_stack_dump(VALUE self);
+
 #define _W_STACK(L) {\
     int i;\
     int iStackSize = lua_gettop( L );\
@@ -129,9 +135,21 @@ static void lua_SetVarToStack( lua_State *L, VALUE vVarValue ) {
  * Desc: Positionne une valeur nomm�e Ruby dans l'index global Lua
  */
 static void lua_SetNamedVarFromRuby( lua_State *L, VALUE vVarName, VALUE vVarValue ) {
+#ifdef HAVE_LUA_GLOBALSINDEX
   lua_pushlstring( L, RSTRING_PTR(vVarName), RSTRING_LEN(vVarName) );
-  lua_SetVarToStack( L, vVarValue );
-  lua_settable( L, LUA_GLOBALSINDEX );
+#else
+  char * var_name = (char*)malloc(sizeof(char)*(RSTRING_LEN(vVarName)+1));
+  memset(var_name, 0, RSTRING_LEN(vVarName)+1);
+  memcpy(var_name, RSTRING_PTR(vVarName), RSTRING_LEN(vVarName));
+  lua_pushstring(L, var_name);
+#endif
+  lua_SetVarToStack(L, vVarValue);
+#ifdef HAVE_LUA_GLOBALSINDEX
+  lua_settable(L, LUA_GLOBALSINDEX);
+#else
+  lua_setglobal(L, var_name);
+  free(var_name);
+#endif
   return;
 }
 
@@ -140,12 +158,14 @@ static void lua_SetNamedVarFromRuby( lua_State *L, VALUE vVarName, VALUE vVarVal
  *
  * Desc: R�cup�re la valeur au sommet de la pile Lua
  */
-static VALUE lua_GetVarFromStack( lua_State *L ) {
+static VALUE lua_GetVarFromStack(lua_State *L) {
   int iStackSize = 0;
   VALUE vTableKey = Qnil;
   VALUE vTableValue = Qnil;
   VALUE RCod = Qnil;
 
+  rb_require("language/lua/function");
+
   switch(lua_type(L,-1)){
     case LUA_TNONE:
       break;
@@ -171,16 +191,60 @@ static VALUE lua_GetVarFromStack( lua_State *L ) {
         vTableValue = lua_GetVarFromStack(L);
         lua_pop(L,1);
         vTableKey = lua_GetVarFromStack(L);
+
         rb_hash_aset(RCod,vTableKey,vTableValue);
       }
       lua_settop(L,iStackSize);
       break;
     case LUA_TFUNCTION:
+      RCod = rb_class_new_instance(0, NULL, rb_const_get(cLua, rb_intern("Function")));
       break;
   }
   return(RCod);
 }
 
+typedef struct populate {
+  VALUE lua;
+  char *parent;
+} populate;
+void lua_populate_fun(VALUE table, VALUE lua, char *parent);
+
+int do_populate_lua(VALUE key, VALUE val, VALUE in) {
+  if(T_STRING == TYPE(key)) {
+    char *fn = concatenate(3, ((populate*)in)->parent, ".", StringValuePtr(key));
+
+    switch(TYPE(val)) {
+      case T_OBJECT:
+        if(0 == strcmp("Language::Lua::Function", rb_obj_classname(val))) {
+          rb_ivar_set(val, rb_intern("@lua"), ((populate*)in)->lua);
+          rb_ivar_set(val, rb_intern("@fname"), rb_str_new2(fn));
+        }
+        break;
+      case T_HASH:
+        lua_populate_fun(val, ((populate*)in)->lua, fn);
+        break;
+      default:
+        break;
+    }
+
+    free(fn);
+  }
+  return ST_CONTINUE;
+}
+
+void lua_populate_fun(VALUE table, VALUE lua, char *parent) {
+  populate *p = (populate*)malloc(sizeof(populate));
+  p->lua = lua;
+  p->parent = parent;
+
+  if(T_HASH != TYPE(table)) {
+    return;
+  }
+  rb_hash_foreach(table, do_populate_lua, (VALUE)p);
+
+  free(p);
+}
+
 static int lua_CallRubyFunction( lua_State *L ) {
   int iNbArgs = lua_gettop(L);
   VALUE self;
@@ -209,7 +273,7 @@ static int lua_CallRubyFunction( lua_State *L ) {
 
   vFuncArgs = malloc(sizeof(VALUE) * iNbFuncArgs );
   for( iCpt = 0; iCpt < iNbFuncArgs; iCpt++ ) {
-	  vFuncArgs[iNbFuncArgs - iCpt - 1] = lua_GetVarFromStack( L );
+	  vFuncArgs[iNbFuncArgs - iCpt - 1] = lua_GetVarFromStack(L);
 	  lua_remove( L, -1 );
   }
 
@@ -230,20 +294,47 @@ static int lua_CallRubyFunction( lua_State *L ) {
 static VALUE ruby_CallLuaFunction( char *xFunctionName, int iNbArgs, VALUE *vArgs, VALUE self ) {
   RbTlua *pRbTlua;
   int iCpt;
+  int stack_size, final_stack_size, final_pop;
+  char *point_in_fun;
   VALUE RCod = Qnil;
 
   Data_Get_Struct( self, RbTlua, pRbTlua );
 
+  stack_size = lua_gettop(pRbTlua->L);
+
   lua_getglobal( pRbTlua->L, xFunctionName );  /* get function */
+  if(!lua_isfunction(pRbTlua->L,lua_gettop(pRbTlua->L)) || NULL == strchr(xFunctionName, '.')){
+    lua_pop(pRbTlua->L, 1);
+
+    point_in_fun = strtok(xFunctionName, ".");
+    if(NULL == point_in_fun) {
+      rb_raise(rb_eSystemCallError, "error running lua function `%s': table does not exist", xFunctionName);
+    } else {
+      lua_getglobal(pRbTlua->L, point_in_fun);
+    }
+    point_in_fun = strtok(NULL, ".");
+    while(NULL != point_in_fun) {
+      lua_getfield(pRbTlua->L, -1, point_in_fun);
+      point_in_fun = strtok(NULL, ".");
+    }
+  } else {
+    rb_raise(rb_eSystemCallError, "error running lua function `%s': does not exist", xFunctionName);
+  }
 
   for( iCpt = 0; iCpt < iNbArgs; iCpt++ ) {
     lua_SetVarToStack( pRbTlua->L, vArgs[iCpt] );
   }
 
-  if( lua_pcall( pRbTlua->L, iNbArgs, 1, 0 ) != 0 )  /* do the call */
+  if( lua_pcall( pRbTlua->L, iNbArgs, 1, 0 ) != 0 )  /* do the call */ {
     rb_raise( rb_eSystemCallError, "error running lua function `%s': %s", xFunctionName, lua_tostring(pRbTlua->L, -1) );
+  }
 
-  RCod = lua_GetVarFromStack( pRbTlua->L );
+  RCod = lua_GetVarFromStack(pRbTlua->L);
+
+  final_stack_size = lua_gettop(pRbTlua->L);
+  final_pop = final_stack_size - stack_size;
+  lua_pop(pRbTlua->L, final_pop);
+  lua_SetVarToStack(pRbTlua->L, RCod);
   
   return( RCod );
 }
@@ -284,9 +375,8 @@ VALUE ruby_lua_new( VALUE class ) {
     rb_raise( rb_eNoMemError, "No memory left for Lua struct" );
       
   pRbTlua->L = lua_newstate(l_alloc, pRbTlua->ud);
-	luaL_openlibs(pRbTlua->L);
-
   lua_register( pRbTlua->L, "ruby", lua_CallRubyFunction );
+	luaL_openlibs(pRbTlua->L);
   
   self = Data_Wrap_Struct( class, ruby_lua_mark, ruby_lua_free, pRbTlua );
   
@@ -386,7 +476,8 @@ VALUE ruby_lua_var( int iNbArgs, VALUE *vArgs, VALUE self ) {
       if( iNbArgs == 2 ) {
         /** Act: Recup�re la valeur */
         lua_getglobal( pRbTlua->L, StringValuePtr(vArgs[1]) );
-        RCod = lua_GetVarFromStack( pRbTlua->L );
+        RCod = lua_GetVarFromStack(pRbTlua->L);
+        lua_populate_fun(RCod, self, StringValuePtr(vArgs[1]));
       } else if( iNbArgs == 3 ) {
         /** Positionne la valeur */
         lua_SetNamedVarFromRuby( pRbTlua->L, vArgs[1], vArgs[2] );
@@ -399,7 +490,8 @@ VALUE ruby_lua_var( int iNbArgs, VALUE *vArgs, VALUE self ) {
       if( iNbArgs == 2 ) {
         /** Act: Recup�re la valeur */
         lua_getglobal( pRbTlua->L, StringValuePtr(vArgs[1]) );
-        RCod = lua_GetVarFromStack( pRbTlua->L );
+        RCod = lua_GetVarFromStack(pRbTlua->L);
+        lua_populate_fun(RCod, self, StringValuePtr(vArgs[1]));
         lua_pop( pRbTlua->L, 1 );
       } else if( iNbArgs == 3 ) {
         /** Positionne la valeur */
@@ -413,7 +505,8 @@ VALUE ruby_lua_var( int iNbArgs, VALUE *vArgs, VALUE self ) {
       if( iNbArgs == 1 ) {
         /** Act: Recup�re la valeur */
         lua_getglobal( pRbTlua->L, StringValuePtr(vArgs[0]) );
-        RCod = lua_GetVarFromStack( pRbTlua->L );
+        RCod = lua_GetVarFromStack(pRbTlua->L);
+        lua_populate_fun(RCod, self, StringValuePtr(vArgs[0]));
         lua_pop( pRbTlua->L, 1 );
       } else if( iNbArgs == 2 ) {
         /** Positionne la valeur */
@@ -499,9 +592,6 @@ VALUE ruby_lua_stack_dump( VALUE self ) {
 
 /** ------------------------------------------------------------------------ */
 
-VALUE mLanguage;
-VALUE cLua;
-
 void Init_lua( void ) {
   mLanguage  = rb_define_module( "Language" );
   cLua = rb_define_class_under( mLanguage, "Lua", rb_cObject );
@@ -520,3 +610,4 @@ void Init_lua( void ) {
   rb_define_method( cLua, "stack_size",      ruby_lua_stack_size,      0 );
   rb_define_method( cLua, "stack_dump",      ruby_lua_stack_dump,      0 );
 }
+

data/ext/rlua.h

@@ -26,6 +26,7 @@
 #include <rubyio.h>
 #else
 #include <ruby/io.h>
+#include <ruby/st.h>
 #endif
 
 #include <stdlib.h>
@@ -37,8 +38,8 @@
 #include <lauxlib.h>
 #include <lualib.h>
 
-#define RUBY_LUA_VERSION  "0.2.0"
-#define RUBY_LUA_VERNUM   020
+#include "config.h"
+#include "util.h"
 
 typedef struct RbTlua {
   lua_State *L;

data/ext/util.c

@@ -0,0 +1,30 @@
+#include <stdio.h>
+#include <stdarg.h>
+#include <string.h>
+#include <stdlib.h>
+
+char* concatenate(int n, ...) {
+  int i;
+  const char* v;
+  va_list vl;
+  va_start(vl, n);
+  char *result = NULL;
+  for(i=0; i<n; i++) {
+    v = va_arg(vl, const char*);
+
+    if(result) {
+      char *tmp = strdup(result);  
+      free(result);
+      result = (char*)malloc(sizeof(char)*(strlen(tmp)+strlen(v)+1));
+      memset(result, 0, strlen(tmp)+strlen(v)+1);
+      sprintf(result, "%s%s", tmp, v);
+      free(tmp);
+    } else {
+      result = (char*)malloc(sizeof(char)*(strlen(v)+1));
+      memset(result, 0, strlen(v)+1);
+      memcpy(result, v, strlen(v));
+    }
+  }
+  return result;
+}
+

data/ext/util.h

@@ -0,0 +1,7 @@
+#ifndef __UTIL_H
+#define __UTIL_H
+
+char* concatenate(int n, ...);
+
+#endif // __UTIL_H
+

data/lib/language/lua/function.rb

@@ -0,0 +1,11 @@
+module Language
+  class Lua
+    class Function
+      attr_accessor :lua, :fname
+
+      def call(*args)
+        @lua.call(fname, *args)
+      end
+    end
+  end
+end

data/lib/ruby-lua.rb

@@ -0,0 +1 @@
+require 'language/lua'

data/ruby-lua.gemspec

@@ -0,0 +1,27 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name     = "ruby-lua"
+  s.description = "Call Lua from Ruby (and Ruby from Lua in Ruby)"
+  s.summary  = "Call Lua from Ruby (and Ruby from Lua in Ruby)"
+
+  s.version  = open(File.join(File.dirname(__FILE__), "VERSION")).read
+  s.platform = Gem::Platform::RUBY
+
+  s.authors  = ["Gregoire Lejeune"]
+  s.email    = "gregoire.lejeune@free.fr"
+  s.homepage = "http://github.com/glejeune/ruby-lua"
+  s.license  = "MIT"
+
+  s.files      = `git ls-files`.split("\n")
+  s.test_files = `git ls-files -- test/*`.split("\n")
+  s.extra_rdoc_files = ["LICENSE.txt","README.rdoc"]
+  s.extensions       = ["ext/extconf.rb"]
+  s.require_paths    = ["lib"]
+
+  s.add_development_dependency("shoulda")
+  s.add_development_dependency("bundler")
+  s.add_development_dependency("rdoc")
+  s.add_development_dependency("rake")
+end
+

data/test/helper.rb

@@ -1,18 +1,17 @@
 require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
+require 'bundler/setup'
 require 'test/unit'
 require 'shoulda'
+require 'pathname'
 
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'ruby-lua'
+cur = Pathname.new(File.expand_path("..", __FILE__))
+lib = cur.join('..', 'lib')
+ext = cur.join('..', 'ext')
 
-class Test::Unit::TestCase
+unless ext.join("lua.so").exist? or ext.join("lua.bundle").exist? or ext.join("lua.dll").exist?
+ abort " ! Unable to run tests. Please run `rake build` first"
 end
+
+$LOAD_PATH.unshift(lib.to_s, ext.to_s, cur.to_s)
+require 'lua'
+

data/test/test_lua_from_ruby.rb

@@ -0,0 +1,34 @@
+require 'helper'
+
+class TestCallLuaFromRuby < Test::Unit::TestCase
+  context "a lua jit" do
+    setup do
+      @lua = Language::Lua.new()
+      @lua.eval <<-LUA
+      function one()
+        return 1
+      end
+
+      function two()
+        return 2, 3
+      end
+
+      function data(x)
+        return x
+      end
+      LUA
+    end
+
+    should "return 1.0" do
+      assert_equal 1.0, @lua.call(true, "one")
+    end
+
+    should "return 2.0" do
+      assert_equal 2.0, @lua.call(true, "two")
+    end
+
+    should "return the given value" do
+      assert_equal "hello", @lua.call(true, "data", "hello")
+    end
+  end
+end

data/test/test_lua_function.rb

@@ -0,0 +1,25 @@
+require 'helper'
+
+class TestCallLuaFromRuby < Test::Unit::TestCase
+  context "a lua jit" do
+    setup do
+      @lua = Language::Lua.new()
+    end
+
+    should "return 5.0" do
+      assert_equal 5.0, @lua.call("string.len", "hello")
+    end
+
+    should "return 65.0" do
+      assert_equal 65.0, @lua.call("string.byte", "ABCDE")
+    end
+
+    should "return 12.0" do
+      assert_equal 12.0, @lua.call("string.find", "Hello from Lua", "Lua")
+    end
+
+    should "return 8.0" do
+      assert_equal 8.0, @lua.var('string')["len"].call("ruby-lua")
+    end
+  end
+end

data/test/test_ruby_from_lua.rb

@@ -0,0 +1,22 @@
+require 'helper'
+
+def my_ruby_function(str, num)
+  "str = #{str}, num = #{num}"
+end
+
+class TestRubyFromLua < Test::Unit::TestCase
+  context "a lua jit" do
+    setup do
+      @lua = Language::Lua.new()
+      @lua.eval <<-LUA
+        function call_ruby()
+          return ruby("my_ruby_function", "string", 3)
+        end
+      LUA
+    end
+
+    should "return the result of my_ruby_function" do
+      assert_equal "str = string, num = 3.0", @lua.call(true, "call_ruby")
+    end
+  end
+end

data/test/test_vars.rb

@@ -0,0 +1,48 @@
+require 'helper'
+
+class TestVars < Test::Unit::TestCase
+  context "a lua jit" do
+    setup do
+      @lua = Language::Lua.new()
+    end
+
+    should "create a string variable" do
+      @lua.var("str", "This is a string")
+      assert_equal "This is a string", @lua.var("str")
+    end
+
+    should "create a number variable" do
+      @lua.var("num", 123)
+      assert_equal 123.0, @lua.var("num")
+    end
+
+    should "create a boolean variable" do
+      @lua.var("yes", true)
+      @lua.var("no", false)
+
+      assert_equal true, @lua.var("yes")
+      assert_equal false, @lua.var("no")
+    end
+
+    should "create a nil variable" do
+      @lua.var("null", NIL)
+      assert_equal NIL, @lua.var("null")
+    end
+
+    should "create a table" do
+      @lua.var("table", ["string", 123, true, NIL])
+      table = @lua.var("table")
+      assert_equal 4, table.size()
+      assert_equal "string", table[1.0]
+      assert_equal 123.0, table[2.0]
+      assert_equal true, table[3.0]
+      assert_equal NIL, table[4.0]
+    end
+
+    should "create a hash" do
+      @lua.var("hash", {"string" => 123})
+      hash = @lua.var("hash")
+      assert_equal 123.0, hash["string"]
+    end
+  end
+end

metadata

@@ -1,106 +1,81 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ruby-lua
-version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: 
-  segments: 
-  - 0
-  - 3
-  - 0
-  version: 0.3.0
+version: !ruby/object:Gem::Version
+  version: 0.4.0
 platform: ruby
-authors: 
+authors:
 - Gregoire Lejeune
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-04-14 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+date: 2013-04-22 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: shoulda
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
-  name: bundler
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 1
-        - 5
-        - 1
-        version: 1.5.1
-  name: jeweler
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: rcov
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: rdoc
   prerelease: false
-  type: :development
-  requirement: *id005
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Call Lua from Ruby (and Ruby from Lua in Ruby)
 email: gregoire.lejeune@free.fr
 executables: []
-
-extensions: 
+extensions:
 - ext/extconf.rb
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
-files: 
+files:
+- .gitignore
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -117,45 +92,43 @@ files:
 - ext/extconf.rb
 - ext/rlua.c
 - ext/rlua.h
+- ext/util.c
+- ext/util.h
+- lib/language/lua/function.rb
+- lib/ruby-lua.rb
+- ruby-lua.gemspec
 - test/helper.rb
-- test/test_ruby-lua.rb
+- test/test_lua_from_ruby.rb
+- test/test_lua_function.rb
+- test/test_ruby_from_lua.rb
+- test/test_vars.rb
 homepage: http://github.com/glejeune/ruby-lua
-licenses: 
+licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Call Lua from Ruby (and Ruby from Lua in Ruby)
-test_files: 
-- examples/func.rb
-- examples/rli.rb
-- examples/test.rb
-- examples/tt.rb
+test_files:
 - test/helper.rb
-- test/test_ruby-lua.rb
+- test/test_lua_from_ruby.rb
+- test/test_lua_function.rb
+- test/test_ruby_from_lua.rb
+- test/test_vars.rb

data/test/test_ruby-lua.rb

@@ -1,7 +0,0 @@
-require 'helper'
-
-class TestRubyLua < Test::Unit::TestCase
-  should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
-  end
-end