@@ -4,9 +4,10 @@ == rufus-lua - 1.1.0 not yet released -- issue #2 : tables returned from Ruby functions were indexed at 0. (Scott) -- issue #3 : passing false from Ruby to Lua twists it to true. (Scott) -- issue #1 : Ruby function return array not OK. Fixed. (Thanks Scott Persinger) +- todo : state['a'] = [ 1, 2, 3 ] now possible +- issue #2 : tables returned from Ruby functions were indexed at 0. (Scott) +- issue #3 : passing false from Ruby to Lua twists it to true. (Scott) +- issue #1 : Ruby function return array not OK. Fixed. (Thanks Scott Persinger) == rufus-lua - 1.0.0 released 2009/03/27 CHANGELOG.txt @@ -11,7 +11,7 @@ [o] fix coroutine & co / memoization (make it better later) [o] fib.lua, use local, bench ! (2 times faster almost) -[ ] add GC control methods (Alain) +[o] add GC control methods (Alain) [X] Add method to disable GC [X] Add method to enable GC [ ] Look at parameters in Lua GC that can be tweaked @@ -21,3 +21,8 @@ [x] ruby callbacks (functions) [ ] ability to bind ruby functions (callbacks) inside of tables (modules) +[ ] state['var'] = value +[ ] state['var'] = hash + +[ ] state.load_and_eval(filepath) + TODO.txt @@ -48,6 +48,7 @@ module Rufus::Lua # (Problably a good idea if you want Lua's GC to get rid of it later). # def free + Lib.luaL_unref(@pointer, LUA_REGISTRYINDEX, @ref) @ref = nil end lib/rufus/lua/objects.rb @@ -394,6 +394,17 @@ module Rufus::Lua k.index('.') ? self.eval("return #{k}") : get_global(k) end + # Allows for setting a Lua varible immediately. + # + # state['var'] = [ 1, 2, 3 ] + # puts state['var'].to_a[0] # => 1 + # + def []= (k, v) + + #puts; puts("#{k} = #{Rufus::Lua.to_lua_s(v)}") + self.eval("#{k} = #{Rufus::Lua.to_lua_s(v)}") + end + # Binds a Ruby function (callback) in the top environment of Lua # # require 'rubygems' lib/rufus/lua/state.rb @@ -67,7 +67,7 @@ module Rufus::Lua s = if o.is_a?(Array) o.collect { |e| to_lua_s(e) } else - o.collect { |k, v| "#{to_lua_s(k)}: #{to_lua_s(v)}" } + o.collect { |k, v| "[#{to_lua_s(k)}] = #{to_lua_s(v)}" } end "{ #{s.join(', ')} }" lib/rufus/lua/utils.rb @@ -8,7 +8,7 @@ require File.dirname(__FILE__) + '/spec_base' -describe 'Rufus::Lua::State' do +describe Rufus::Lua::State do it 'should not crash closing a closed State' do @@ -18,3 +18,38 @@ describe 'Rufus::Lua::State' do should.raise(RuntimeError) { @s.close } end end + +describe Rufus::Lua::State do + + before do + @s = Rufus::Lua::State.new + end + after do + @s.close + end + + it 'should return nil for unbound variables' do + + @s['a'].should.be.nil + end + + it 'should accept setting values directly' do + + @s['a'] = 1 + @s['a'].should.equal(1) + end + + it 'should accept setting array values directly' do + + @s['a'] = [ true, false, %w[ alpha bravo charly ] ] + @s['a'].to_a[0].should.equal(true) + @s['a'].to_a[2].to_a.should.equal(%w[ alpha bravo charly ]) + end + + it 'should accept setting hash values directly' do + + @s['a'] = { 'a' => 'alpha', 'b' => 'bravo' } + @s['a'].to_h.should.equal({ 'a' => 'alpha', 'b' => 'bravo' }) + end +end + spec/state_spec.rb @@ -21,10 +21,8 @@ describe 'Rufus::Lua (utils)' do Rufus::Lua.to_lua_s( { 'a' => 'A', 'b' => 2} ).should.equal( - '{ "a": "A", "b": 2 }' + '{ ["a"] = "A", ["b"] = 2 }' ) - # TODO : ["a"] is probably better... end - end spec/utils_spec.rb 9024db4258ac7746925a9caf3f7401359d30d2ad John Mettraux jmettraux@gmail.com http://github.com/jmettraux/rufus-lua/commit/b012d681eaf81db7cf47ac9b4f76ef4848032d5a b012d681eaf81db7cf47ac9b4f76ef4848032d5a 2009-07-23T23:15:06-07:00 2009-07-23T23:15:06-07:00 todo : state['a'] = [ 1, 2, 3 ] now possible 2717bd8e3397b47042f4691434a20241bf227d6e John Mettraux jmettraux@gmail.com