delorean_lang 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0116cc5a84f3c0e7c2efc68c31862529ce3172f7bc7a8f1ee61c8804de3d6da
-  data.tar.gz: d29819d73fd26cd4057b6badd1eb831c2c86c095683f14039b61d1165f13fd8b
+  metadata.gz: 4c38ab0abe7bac9f36adbc22664d1efc5a01216d032fa8b8a079ecc640a560b7
+  data.tar.gz: c990d13bfae100045288a5139614ff72e3af2a0a9e89ff87790e8b717b19f39c
 SHA512:
-  metadata.gz: c448503aec6a6929311129849be0223d5ab0dbed702c22e67ab72fd5ad6c40cb71f60b169299e57795a61731505d458b474a040995790fc948ee50ef183dd318
-  data.tar.gz: 56f0224391bc1d1401033c0301297ccb8fb993180196d827c07b5a5f986d19c5f5cf1d051f42af8206e280a6fb0840ee8c434b5fcfe21d3f0fcf26581837f555
+  metadata.gz: 64ff3320a7722c5017eb2f0a366d21a1fa5b20173e4675cd1316dae14790676442787e164ea4e01c4ce2ae7f91a06eb9716e3ddecf8c0801e5e33801d105919a
+  data.tar.gz: a020a58b04d8d067b44c977fce93927c2fed8e5bb6454c18cb01c72edbeb58321a00395d1bb258fd556023b309d0b8aedcfaeded789c43cda1cd72ea1b541138

data/README.md

@@ -199,7 +199,7 @@ Use `extend Delorean::Functions` or `include Delorean::Model` in your module or
 class Dummy < ActiveRecord::Base
   include Delorean::Model
 
-  delorean_fn(:heres_my_number, sig: [0, Float::INFINITY]) do |*a|
+  delorean_fn(:heres_my_number) do |*a|
     a.inject(0, :+)
   end
 
@@ -211,7 +211,7 @@ end
 module DummyModule
   extend Delorean::Functions
 
-  delorean_fn(:heres_my_number, sig: [0, Float::INFINITY]) do |*a|
+  delorean_fn(:heres_my_number) do |*a|
     a.inject(0, :+)
   end
 end

data/lib/delorean/base.rb

@@ -14,6 +14,8 @@ module Delorean
     size_per_class: 1000
   )
 
+  ::Delorean::Ruby.error_handler = ::Delorean::Ruby::DEFAULT_ERROR_HANDLER
+
   module BaseModule
     # _e is used by Marty promise_jobs to pass promise-related
     # information
@@ -154,8 +156,7 @@ module Delorean
       ######################################################################
 
       def self._err(*args)
-        str = args.map(&:to_s).join(', ')
-        raise str
+        ::Delorean::Ruby.error_handler.call(*args)
       end
 
       def self._node_call(node, _e, params)

data/lib/delorean/ruby.rb

@@ -4,6 +4,11 @@ require 'delorean/ruby/whitelists'
 
 module Delorean
   module Ruby
+    DEFAULT_ERROR_HANDLER = lambda do |*args|
+      str = args.map(&:to_s).join(', ')
+      raise str
+    end
+
     def self.whitelist=(new_whitelist)
       @whitelist = new_whitelist
     end
@@ -11,5 +16,13 @@ module Delorean
     def self.whitelist
       @whitelist
     end
+
+    def self.error_handler=(new_handler)
+      @error_handler = new_handler
+    end
+
+    def self.error_handler
+      @error_handler
+    end
   end
 end

data/lib/delorean/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Delorean
-  VERSION = '2.0.0'
+  VERSION = '2.1.0'
 end

data/spec/ruby/error_handling_spec.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require_relative '../spec_helper'
+
+describe 'Delorean Ruby error handling' do
+  after do
+    ::Delorean::Ruby.error_handler = ::Delorean::Ruby::DEFAULT_ERROR_HANDLER
+  end
+
+  let(:sset) do
+    TestContainer.new(
+      'AAA' =>
+      defn('X:',
+           '    a =? 123',
+           '    b = a*2',
+          )
+    )
+  end
+
+  let(:engine) do
+    Delorean::Engine.new('XXX', sset).tap do |eng|
+      eng.parse defn('A:',
+                     '    b = ERR("test", 1, 2, 3)'
+                    )
+    end
+  end
+
+  it 'raises error' do
+    expect { engine.evaluate('A', 'b') }.to raise_error(
+      RuntimeError, 'test, 1, 2, 3'
+    )
+  end
+
+  it 'allows to override handler' do
+    ::Delorean::Ruby.error_handler = lambda do |*_args|
+      raise StandardError, 'Overriden Error'
+    end
+
+    expect { engine.evaluate('A', 'b') }.to raise_error(
+      StandardError, 'Overriden Error'
+    )
+  end
+end

data/spec/spec_helper.rb

@@ -51,7 +51,7 @@ class Dummy < ActiveRecord::Base
     Dummy.new(name: 'jello', number: 456, dummy: d)
   end
 
-  delorean_fn :all_of_me, sig: 0 do
+  delorean_fn :all_of_me do
     [{ 'name' => 'hello', 'foo' => 'bar' }]
   end
 
@@ -63,20 +63,20 @@ class Dummy < ActiveRecord::Base
     "#{name}-#{number.round(4)}"
   end
 
-  delorean_fn :one_or_two, sig: [1, 2] do |a, b = nil|
+  delorean_fn :one_or_two do |a, b = nil|
     [a, b]
   end
 
   @@foo = 0
-  delorean_fn :side_effect, sig: 0 do
+  delorean_fn :side_effect do
     @@foo += 1
   end
 
-  delorean_fn :returns_openstruct, sig: 0 do
+  delorean_fn :returns_openstruct do
     OpenStruct.new('abc' => 'def')
   end
 
-  delorean_fn :returns_cached_openstruct, cache: true, sig: 2 do |first, last|
+  delorean_fn :returns_cached_openstruct, cache: true do |first, last|
     OpenStruct.new(first.to_s => last)
   end
 end
@@ -91,7 +91,7 @@ module M
   class LittleDummy
     include Delorean::Model
 
-    delorean_fn(:heres_my_number, sig: [0, Float::INFINITY]) do |*a|
+    delorean_fn(:heres_my_number) do |*a|
       a.inject(0, :+)
     end
 
@@ -113,7 +113,7 @@ end
 module DummyModule
   extend Delorean::Functions
 
-  delorean_fn(:heres_my_number, sig: [0, Float::INFINITY]) do |*a|
+  delorean_fn(:heres_my_number) do |*a|
     a.inject(0, :+)
   end
 end
@@ -125,7 +125,7 @@ end
 class DeloreanFunctionsClass
   extend Delorean::Functions
 
-  delorean_fn :test_fn, sig: 0 do
+  delorean_fn :test_fn do
     :test_fn_result
   end
 
@@ -134,7 +134,7 @@ class DeloreanFunctionsClass
 end
 
 class DeloreanFunctionsChildClass < DeloreanFunctionsClass
-  delorean_fn :test_fn2, sig: 0 do
+  delorean_fn :test_fn2 do
     :test_fn2_result
   end
 
@@ -144,11 +144,11 @@ end
 class DifferentClassSameMethod
   extend Delorean::Functions
 
-  delorean_fn :test_fn2, sig: 0 do
+  delorean_fn :test_fn2 do
     :test_fn2_result_different
   end
 
-  delorean_fn :test_fn3, sig: 0 do |a, b, c, d = :default, e = nil, *args|
+  delorean_fn :test_fn3 do |a, b, c, d = :default, e = nil, *args|
     {
       a: a,
       b: b,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: delorean_lang
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Arman Bostani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-07 00:00:00.000000000 Z
+date: 2019-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -172,6 +172,7 @@ files:
 - spec/func_spec.rb
 - spec/parse_spec.rb
 - spec/perf_spec.rb
+- spec/ruby/error_handling_spec.rb
 - spec/ruby/whitelist_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/arman000/delorean_lang
@@ -204,5 +205,6 @@ test_files:
 - spec/func_spec.rb
 - spec/parse_spec.rb
 - spec/perf_spec.rb
+- spec/ruby/error_handling_spec.rb
 - spec/ruby/whitelist_spec.rb
 - spec/spec_helper.rb