rubel 0.0.2 → 0.0.3

data/lib/rubel/core.rb

@@ -1,15 +1,14 @@
 module Rubel
   module Core
-    # query - The String or Proc to be executed
-    def execute(query = nil)
-
-      if query.is_a?(::String)
-        query = sanitized_proc(query)
+    # q - The String or Proc to be executed
+    def execute(q = nil)
+      if q.is_a?(::String)
+        q = sanitized_proc(q)
       end
       
-      instance_exec(&query)
-    #rescue => e
-    #  ::Rubel::ErrorReporter.new(e, query)
+      instance_exec(&q)
+    rescue => e
+      ::Rubel::ErrorReporter.new(e, q)
     end
     alias query execute
 
@@ -18,20 +17,22 @@ module Rubel
     # It removes "::"  from the string to prevent people to access 
     # classes outside Runtime::Sandbox
     #  
-    #
     def sanitize!(string)
       string.gsub!('::', '')
     end
 
-    # Sanitize a string from Ruby injection.
-    # 
-    # It removes "::"  from the string to prevent people to access 
-    # classes outside Runtime::Sandbox
-    #  
+    # Sanitizes a string from Ruby injection and *instance_eval*s it into a lambda.
+    # This is used internally by #execute
+    #
+    # If you execute lots of queries it is recommended to memoize the
+    # results somewhere in your application. 
+    #
+    # The sanitation removes "::"  from the string to prevent people to access 
+    # classes outside Runtime::Sandbox. This has no effect in other runtimes.
     #
     def sanitized_proc(string)
       sanitize!(string)
-      eval("lambda { #{string} }")
+      instance_eval("lambda { #{string} }")
     end
 
     # Returns method name as a Symbol if args are empty 

data/lib/rubel/version.rb

@@ -1,3 +1,3 @@
 module Rubel
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/integration/rubel_spec.rb

@@ -54,18 +54,19 @@ describe do
       execute("MAP([5.124], round(SUM(1)))").should == 5.1
     end
 
-    # Disabled block support. looks cool, but does not work
-    # with method_missing, etc. So rather confusing.
-    #
-    # it "should execute as do SUM(1,2,3) end" do
-    #   execute do 
-    #     SUM(1,2,3)
-    #   end.should == 6
-    # end
-    #
-    # it "should execute as { SUM(1,2,3) }" do
-    #   execute{SUM(1,2,3)}.should == 6
-    # end
+    pending do
+      # Disabled block support. looks cool, but does not work
+      # with method_missing, etc. So rather confusing.
+      it "should execute as do SUM(1,2,3) end" do
+        execute do 
+          SUM(1,2,3)
+        end.should == 6
+      end
+      
+      it "should execute as { SUM(1,2,3) }" do
+        execute{SUM(1,2,3)}.should == 6
+      end
+    end
   end
 
   context "sandbox" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubel
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-28 00:00:00.000000000 Z
+date: 2012-04-30 00:00:00.000000000 Z
 dependencies: []
 description: ruby enterprise language. Run excel-like formulas ruby code. E.g. SUM(MAP(KEY_ACCOUNTS(),
   revenue))
@@ -65,3 +65,4 @@ summary: A dsl for excel-like formulas to run as regular rubycode. E.g. SUM(MAP(
 test_files:
 - spec/integration/rubel_spec.rb
 - spec/spec_helper.rb
+has_rdoc: