delorean_lang 0.3.38 → 0.4.00

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a5f702fe096b89e006bace5c2888cd8b633ba67
-  data.tar.gz: 575c2763efdc211da6ef0654b811fdc09365e0c1
+  metadata.gz: bb9bc757d323ed7d4388c688b739e9db16b4bf5c
+  data.tar.gz: 00d96513a6ad9a715b6b10e049bab9d3c7bb810e
 SHA512:
-  metadata.gz: 78d3b036ec732feba442288134e262ed937f3d9920c0ca69fdb965926ba819932fdcc0e7f0cf303016623f61164172a8cd5fd6a53d415afeca7c10034cf44705
-  data.tar.gz: 73e497c697afc9597e404801909e5ec8843b2decaa00e79bf4ac54b0aff49b80b479ec4c1c191bee0091a0d13748c93b21168d2017c3ef42cf2b13976f94f292
+  metadata.gz: '068413a5efef120c6351a8cfeb8cdda51c671cde3bb7b0fb5cde0303b7dbb989d33d214505d31b47557a32a60e6ceff0e33c526c9d68d51b51d150109c0a96ff'
+  data.tar.gz: 46cdcda1e1c2af6019f33b498fd3acd7f9257b79969f2e74706283cfa93b560d54c520194ad8a888c10e844379e9d6c63f02037c3b0e3abd4dbe8171166d8577

data/lib/delorean/base.rb

@@ -14,7 +14,8 @@ module Delorean
   # hash.  The whole whitelist mechanism should be eventually
   # rethought.
   RUBY_WHITELIST = {
-    attributes:         [ActiveRecord::Base],
+    # FIXME: hack -- Relation.attributes currently implemented in marty
+    attributes:         [[ActiveRecord::Base, ActiveRecord::Relation]],
     between?:           [NUM_OR_STR, NUM_OR_STR, NUM_OR_STR],
     between:            "between?",
     compact:            [[Array, Hash]],
@@ -151,9 +152,6 @@ module Delorean
           # FIXME: even Javascript which is superpermissive raises an
           # exception on null getattr.
           return nil
-        when ActiveRecord::Base
-          return obj.read_attribute(attr) if obj.has_attribute?(attr)
-          return obj.send(attr.to_sym) if obj.class.reflections[attr]
         when NodeCall
           return obj.evaluate(attr)
         when OpenStruct
@@ -179,7 +177,7 @@ module Delorean
           # FIXME: even Javascript which is superpermissive raises an
           # exception on null getattr.
           return nil
-        when Hash, ActiveRecord::Base, NodeCall, Class, OpenStruct
+        when Hash, NodeCall, Class, OpenStruct
           raise InvalidIndex unless args.length == 1
           _get_attr(obj, args[0], _e)
         when Array, String, MatchData

data/lib/delorean/engine.rb

@@ -348,7 +348,7 @@ module Delorean
 
     def evaluate(node, attrs, params={})
       raise "bad params" unless params.is_a?(Hash)
-      
+
       if node.is_a?(Class)
         klass = node
       else
@@ -365,7 +365,7 @@ module Delorean
 
       type_arr = attrs.is_a?(Array)
       attrs = [attrs] unless type_arr
-      
+
       res = attrs.map { |attr|
         raise "bad attribute '#{attr}'" unless attr =~ /^[a-z][A-Za-z0-9_]*$/
         klass.send("#{attr}#{POST}".to_sym, params)

data/lib/delorean/version.rb

@@ -1,3 +1,3 @@
 module Delorean
-  VERSION = "0.3.38"
+  VERSION = "0.4.00"
 end

data/spec/eval_spec.rb

@@ -276,32 +276,6 @@ describe "Delorean" do
     r.should == [10, 0, 15]
   end
 
-  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.to_f",
-                      "    d = b.name",
-                      "    e = b.foo",
-                      )
-    r = engine.evaluate("A", "c")
-    r.should == 0.404
-
-    r = engine.evaluate("A", "d")
-    r.should == "this is crazy"
-
-    lambda {
-      r = engine.evaluate("A", "e")
-    }.should raise_error(Delorean::InvalidGetAttribute)
-  end
-
-  it "should be able to get attr on AR objs using Class.method().attr syntax" do
-    engine.parse defn("A:",
-                      '    b = Dummy.i_just_met_you("CRJ", 1.234).name',
-                      )
-    r = engine.evaluate("A", "b")
-    r.should == "CRJ"
-  end
-
   it "should be able to access ActiveRecord whitelisted fns using .x syntax" do
     engine.parse defn("A:",
                       '    b = Dummy.i_just_met_you("CRJ", 1.234).name2',
@@ -361,7 +335,7 @@ describe "Delorean" do
 
   it "get attr on nil should return nil" do
     engine.parse defn("A:",
-                      '    b = Dummy.i_just_met_you("CRJ", 1.234).dummy',
+                      '    b = nil',
                       '    c = b.gaga',
                       '    d = b.gaga || 55',
                       )
@@ -369,15 +343,6 @@ describe "Delorean" do
     r.should == [nil, nil, 55]
   end
 
-  it "should be able to get assoc attr on ActiveRecord objects" do
-    engine.parse defn("A:",
-                      '    b = Dummy.miss_you_so_bad()',
-                      '    c = b.dummy',
-                      )
-    r = engine.evaluate("A", "c")
-    r.name.should == "hello"
-  end
-
   it "should be able to get attr on node" do
     engine.parse defn("A:",
                       "    a = 123",

data/spec/parse_spec.rb

@@ -663,6 +663,13 @@ describe "Delorean" do
 
   end
 
+  xit "should parse cross list comprehension" do
+    engine.parse defn("A:",
+                      "    b = [a+c for c in [4,5] for a in [1,2,3]]",
+                      )
+
+  end
+
   it "should accept list comprehension variable override" do
     engine.parse defn("A:",
                       "    b = [b+1 for b in [1,2,3]]",

metadata

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