delorean_lang 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f883290f82867edc3d1c7d8fa4414bb5dccbc9561619a1af1ab99348518828cd
-  data.tar.gz: b7f0128847fbb2ac7ff0f1364f549e3911a981a64ed07a2b0de8005ae2e7abb7
+  metadata.gz: c5f384dcfb07455b430f7e5cc39832349e90102061dd4938ae1c91b87705cd01
+  data.tar.gz: 53cc908c85b3ee1a22254aadc4e20994fd41d49b9dc1997de49faba053348b53
 SHA512:
-  metadata.gz: 27541d90b44f21b3dcc24055c548059282c4a857ef32aec58b97a20c0ded8f752aa1bc1be763e207e7222914711935baa9f3d1295132a6719ab5a3b664c1f836
-  data.tar.gz: 516c7f76522351367deb20ed771dc87b239cee2665dc05ddcebd2b0fcba106396db9a9d0e12e3f7b9729470a530739e6f756298b1c46780dc7d27407fc3566c2
+  metadata.gz: af272886e5cfff2facfec56ec8a7b4e4b49453752740b07b45aff6ab1d2e47359707a04d7451e89bc7f58bd9752a4cdc88a859ed4299fee4de23eab96dc98774
+  data.tar.gz: ce15844ba019fa48b70ec47ed9fbe6f22956309375dd297a0cdab0ae289d5d663d0ad037cc82cb61f59de9014c570ad322d96240723aa17b94d1b63184c50d57

data/lib/delorean/nodes.rb

@@ -132,6 +132,10 @@ eos
       @text = text
     end
 
+    def +(other)
+      self.to_s + other
+    end
+
     def to_s
       text
     end
@@ -375,11 +379,10 @@ eos
     end
 
     def rewrite(context)
-      [
-        arg0.rewrite(context),
-        (", " + args_rest.args.rewrite(context) if
-          defined?(args_rest.args) && !args_rest.args.text_value.empty?),
-      ].compact.sum
+      rest = ", " + args_rest.args.rewrite(context) if
+        defined?(args_rest.args) && !args_rest.args.text_value.empty?
+
+      [arg0.rewrite(context), rest].compact.sum
     end
 
     def arg_count

data/lib/delorean/version.rb

@@ -1,3 +1,3 @@
 module Delorean
-  VERSION = "0.4.5"
+  VERSION = "0.4.6"
 end

data/spec/eval_spec.rb

@@ -656,6 +656,19 @@ eof
     engine.evaluate("A", ["d", "f"]).should == [26, 2]
   end
 
+  it "allows node calls from attrs" do
+    engine.parse defn("A:",
+                      "    a =?",
+                      "    c =?",
+                      "    b = a**2",
+                      "    e = A(a=13)",
+                      "    d = e(a=4, **{'c': 5})",
+                      "    f = d.b + d.c + e().a",
+                      )
+
+    engine.evaluate("A", ["f"]).should == [16+5+13]
+  end
+
   it "should eval multi-var hash comprehension" do
     engine.parse defn("A:",
                       "    b = {k*5 : v+1 for k, v in {1:2, 7:-30}}",

data/spec/parse_spec.rb

@@ -379,6 +379,14 @@ describe "Delorean" do
     }.should_not raise_error
   end
 
+  it "should be able to pass model class to model functions" do
+    lambda {
+      engine.parse defn("A:",
+                        "    b = Dummy.i_just_met_you(Dummy, 1)"
+                        )
+    }.should_not raise_error
+  end
+
   it "should be able to call class methods on ActiveRecord classes" do
     engine.parse defn("A:",
                       "    b = Dummy.call_me_maybe()",
@@ -388,7 +396,7 @@ describe "Delorean" do
   it "should get exception on arg count to class method call" do
     lambda {
       engine.parse defn("A:",
-                        '    b = Dummy.i_just_met_you("CRJ")',
+                        '    b = Dummy.i_just_met_you(1, 2, 3)',
                         )
     }.should raise_error(Delorean::BadCallError)
   end
@@ -753,6 +761,14 @@ describe "Delorean" do
                       )
   end
 
+  it "should allow node calls to attrs" do
+    engine.parse defn("A:",
+                      "    x=?",
+                      "    a = A(x=123)",
+                      "    d = a(x=456).x",
+                      )
+  end
+
   it "allow conditional args to node calls" do
     engine.parse defn("A:",
                       "    d = A(a=1, b=4 if true, c=4 if false)",

data/spec/spec_helper.rb

@@ -38,7 +38,7 @@ class Dummy < ActiveRecord::Base
     Dummy.new(name: name, number: number)
   end
 
-  I_JUST_MET_YOU_SIG = [2, 2]
+  I_JUST_MET_YOU_SIG = [1, 2]
 
   def self.call_me_maybe(*a)
     a.inject(0, :+)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: delorean_lang
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - Arman Bostani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-20 00:00:00.000000000 Z
+date: 2018-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: treetop