delorean_lang 0.3.16 → 0.3.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9e807e4b0e258dcb0a059957acd6f03b9056b80
-  data.tar.gz: 7b847737484ec32546b6e54d75a553e8ace2129b
+  metadata.gz: 986e58894d0d75b1d83fddd707448410456abd41
+  data.tar.gz: d35e57733be58f268bd57866bbb1fa46968cbc31
 SHA512:
-  metadata.gz: bbebebdd4c9bfb82345d1c0c9e618652e5b02d7c0e62bd1783460aebe4ee298eb3a4cd8b1e841cd34b1e540703cf94d577cd7607534e3c263177b9d2496708bd
-  data.tar.gz: 3477a50fb9f760f313b0d49ae2f869f924d25bf1837362704d4f14bc4fff5d1b8566f0057493e87096f3f73fade3aa9d8562be472c4ceaf5df26a7a00400a327
+  metadata.gz: d7e482343719b38cf5722bd3004cc9435f88240dcbabcf629348042da929ef80ae6ec85e1842d9d79bf4ec6ba1a19aba580a5c6543606608323b82d4e4b37839
+  data.tar.gz: 5391356394c6831cbc95f44de56f7739b2be879c1cb3fb8b376d48cf40f2e8df4a4a4ebe136e49718e808482dd4a9c14f5742fbc6180c67c7a678542527fd933

data/lib/delorean/base.rb

@@ -15,8 +15,11 @@ module Delorean
     max:                [Array],
     member:             "member?",
     member?:            [Enumerable, [Object]],
+    empty:              "empty?",
+    empty?:             [Enumerable],
     reverse:            [Array],
     slice:              [Array, Fixnum, Fixnum],
+    each_slice:         [Array, Fixnum],
     sort:               [Array],
     split:              [String, String],
     uniq:               [Array],
@@ -69,6 +72,8 @@ module Delorean
     to_f:               [[Numeric, String]],
     to_d:               [[Numeric, String]],
     to_s:               [Object],
+    to_a:               [Object],
+    to_json:            [Object],
     abs:                [Numeric],
     round:              [Numeric, [nil, Integer]],
     ceil:               [Numeric],
@@ -84,8 +89,25 @@ module Delorean
         engine.evaluate(node, attr, params.clone)
       end
 
+      def /(args)
+        raise "non-array/string arg to /" unless
+          args.is_a?(Array) || args.is_a?(String)
+
+        begin
+          case args
+          when Array
+            engine.eval_to_hash(node, args, params.clone)
+          when String
+            engine.evaluate(node, args, params.clone)
+          end
+        rescue => exc
+          Delorean::Engine.grok_runtime_exception(exc)
+        end
+      end
+
+      # FIXME: % should also support string as args
       def %(args)
-        raise "bad arg to %" unless args.is_a?(Array)
+        raise "non-array arg to %" unless args.is_a?(Array)
 
         # FIXME: params.clone!!!!
         engine.eval_to_hash(node, args, params.clone)
@@ -133,9 +155,9 @@ module Delorean
 
         begin
           return _instance_call(obj, attr, [], _e)
-        rescue
+        rescue => exc
           raise InvalidGetAttribute,
-          "bad attribute lookup '#{attr}' on <#{obj.class}> #{obj}"
+          "attr lookup failed: '#{attr}' on <#{obj.class}> #{obj} - #{exc}"
         end
       end
 

data/lib/delorean/version.rb

@@ -1,3 +1,3 @@
 module Delorean
-  VERSION = "0.3.16"
+  VERSION = "0.3.17"
 end

data/spec/eval_spec.rb

@@ -277,7 +277,7 @@ describe "Delorean" do
   it "should be able to get attr on ActiveRecord objects using a.b syntax" do
     engine.parse defn("A:",
                       '    b = Dummy.i_just_met_you("this is crazy", 0.404)',
-                      "    c = b.number",
+                      "    c = b.number.to_f",
                       "    d = b.name",
                       "    e = b.foo",
                       )
@@ -887,6 +887,27 @@ eof
       [1, {"x"=>123, "y"=>456}, {"a"=>1, "b"=>{"x"=>123, "y"=>456}}, -333]
   end
 
+  it "can handle exceptions with / syntax" do
+    engine.parse defn("A:",
+                      "    a = 1",
+                      "    b = {'x' : 123, 'y': 456}",
+                      "    e = ERR('hello')",
+                      "    c = A() / ['a', 'b']",
+                      "    d = A() / ['a', 'e']",
+                      "    f = A() / 'a'",
+                      )
+    r = engine.evaluate_attrs("A", ["a", "b", "c"])
+    r.should ==
+      [1, {"x"=>123, "y"=>456}, {"a"=>1, "b"=>{"x"=>123, "y"=>456}}]
+
+    r = engine.evaluate_attrs("A", ["a", "d"])
+    r.should ==
+      [1, {"error"=>"hello", "backtrace"=>[["XXX", 4, "e"], ["XXX", 6, "d"]]}]
+
+    r = engine.evaluate_attrs("A", ["f"])
+    r.should == [1]
+  end
+
   it "should properly eval overridden attrs" do
     engine.parse defn("A:",
                       "    a = 5",
@@ -940,4 +961,12 @@ eof
     engine.evaluate_attrs("A", ["a", "z", "y"], {0 => 123, 1 => 456}).should ==
       [123-456, 40, ["x", "y", nil]]
   end
+
+  it "can call 0-arity functions in list comprehension" do
+    engine.parse defn("A:",
+                      '    b = [x.name for x in Dummy.all_of_me]',
+                      )
+    r = engine.evaluate("A", "b")
+    expect(r).to eq ["hello"]
+  end
 end

data/spec/func_spec.rb

@@ -183,4 +183,18 @@ describe "Delorean" do
                       )
     engine.evaluate("A", "b").should == x.slice(0,4)
   end
+
+  it "should handle RUBY empty? function" do
+    engine.parse defn("A:",
+                      "    a0 = []",
+                      "    b0 = {}",
+                      "    c0 = {-}",
+                      "    a1 = [1,2,3]",
+                      "    b1 = {'a': 1, 'b':2}",
+                      "    c1 = {1,2,3}",
+                      "    res = [a0.empty, b0.empty(), c0.empty, a1.empty, b1.empty(), c1.empty]",
+                      )
+    engine.evaluate("A", "res").should == [true, true, true, false, false, false]
+  end
+
 end

data/spec/parse_spec.rb

@@ -314,6 +314,16 @@ describe "Delorean" do
 
     engine.reset
 
+    lambda {
+      engine.parse defn("D:",
+                        "    true_1 = false",
+                        "    false_1 = true_1",
+                        "    nil_1 = false_1",
+                        )
+    }.should_not raise_error
+
+    engine.reset
+
     lambda {
       engine.parse defn("E:",
                         "    a = 1",

data/spec/spec_helper.rb

@@ -56,6 +56,10 @@ class Dummy < ActiveRecord::Base
 
   MISS_YOU_SO_BAD_SIG = [0, 0]
 
+  delorean_fn :all_of_me, sig: 0 do
+    self.all
+  end
+
   def self.i_threw_a_hash_in_the_well
     {a: 123, "a" => 456, b: 789}
   end
@@ -63,7 +67,7 @@ class Dummy < ActiveRecord::Base
   I_THREW_A_HASH_IN_THE_WELL_SIG = [0, 0]
 
   def name2
-    "#{name}-#{number}"
+    "#{name}-#{number.round(4)}"
   end
 
   delorean_fn :one_or_two, sig: [1, 2] do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: delorean_lang
 version: !ruby/object:Gem::Version
-  version: 0.3.16
+  version: 0.3.17
 platform: ruby
 authors:
 - Arman Bostani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-11 00:00:00.000000000 Z
+date: 2015-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: treetop