muzang-plugins 1.1.5 → 1.1.6

data/lib/muzang-plugins/muzang-eval.rb

@@ -1,20 +1,18 @@
 module Muzang
   module Plugins
-    module Safe; end
-    class << Safe
+    class Safe
        def safe(code, sandbox=nil)
          error = nil
 
          begin
            $-w = nil
-           sandbox ||= Object.new.taint
-           yield(sandbox) if block_given?
+           @sandbox ||= Object.new
+           yield(@sandbox) if block_given?
 
-           $SAFE = 5
-           value = eval(code, sandbox.send(:binding))
-           result = Marshal.load(Marshal.dump(value))
+           $SAFE = 3
+           result = eval(code, @sandbox.send(:binding))
          rescue Exception => error
-           error = Marshal.load(Marshal.dump(error))
+           error = error
          end
 
          return result, error
@@ -46,7 +44,8 @@ module Muzang
 
       def safe(*args, &block)
         unless args.first =~ /EM|EventMachine/
-          Safe::safe(*args, &block)
+          @safe ||= Safe.new
+          @safe.safe(*args, &block)
         end
       end
     end

data/lib/muzang-plugins/version.rb

@@ -1,5 +1,5 @@
 module Muzang
   module Plugins
-    VERSION = "1.1.5"
+    VERSION = "1.1.6"
   end
 end

data/spec/muzang-eval_spec.rb

@@ -41,5 +41,22 @@ module Muzang::Plugins
         eventually(true) { @connection.messages.include? "Error: Exception" }
       end
     end
+
+    it "should keep state" do
+      @message.message = '% @state = {:true => true}'
+      EM.run do
+        @message_state = @message.dup
+        @message_state.message = '% "super #{@state}"'
+        @eval.call(@connection, @message)
+        EM.add_timer(0.5) do
+          @eval.call(@connection, @message_state)
+        end
+
+        eventually(true) do
+          @connection.messages.include?("{:true=>true}") &&
+          @connection.messages.include?("super {:true=>true}")
+        end
+      end
+    end
   end
 end

data/spec/support/connection_mock.rb

@@ -12,4 +12,4 @@ class ConnectionMock
     @message_count += 1
     (@messages ||= []) << message
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: muzang-plugins
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
   prerelease: 
 platform: ruby
 authors: