delorean_lang 0.3.36 → 0.3.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b956f73e3ee6d788ed5d199cd9ea7f7c9f0ff214
-  data.tar.gz: d2d0cb069ecf49e7ab8996dd6f2b1540da9ea957
+  metadata.gz: d828ae6c2a90a7279b8bc50e7ea693bf5f528aeb
+  data.tar.gz: e88e1188a4979f7e590d33bc56b360fec7ac2b87
 SHA512:
-  metadata.gz: abab0d339baa484b8c6a94e0a4f72aef5bc46dbd9d5bbd5d8c55ec0dc1f100146c11b3c5228884ba3477331c22db048d0df855d48fd93de764bb0992bf23ae85
-  data.tar.gz: a9d449549b94e672f6bc264ef65b28544a7259b606d3e3d68c14870282f6395d101a0a52e02d9ea6cbe33ee1b1cceaa3a9bfebc04e6532bb6e101949775ceecf
+  metadata.gz: 5d1b9ed7b15d2e6cb2fe340dee440661845d75fe63c2de938aef0e90db488eb45cd72d68abbd5b47e0bd6fc4f20ec99af484ff8365ba5763cd87ec299fd447f6
+  data.tar.gz: 20d16da4573467e11953252c0c5fafe530023d08a576b084a7c769e47b78b53c6b9717464d71c74f26b46ab99dd4a45a1123f591518a25303c03fdc5e3c2aee5

data/lib/delorean/base.rb

@@ -155,6 +155,8 @@ module Delorean
           return obj.send(attr.to_sym) if obj.class.reflections[attr]
         when NodeCall
           return obj.evaluate(attr)
+        when OpenStruct
+          return obj[attr.to_sym]
         when Class
           return obj.send((attr + POST).to_sym, _e) if obj < BaseClass
         end
@@ -176,7 +178,7 @@ module Delorean
           # FIXME: even Javascript which is superpermissive raises an
           # exception on null getattr.
           return nil
-        when Hash, ActiveRecord::Base, NodeCall, Class
+        when Hash, ActiveRecord::Base, NodeCall, Class, OpenStruct
           raise InvalidIndex unless args.length == 1
           _get_attr(obj, args[0], _e)
         when Array, String, MatchData
@@ -264,7 +266,7 @@ module Delorean
         # calls (e.g. the chaining modifies the relation object.  Not
         # sure what this side-effect means.  Delorean code which
         # perform queries on queries seems to work.
-        ActiveRecord::Relation === res ? res : res.freeze
+        (ActiveRecord::Relation === res || Class === res) ? res : res.freeze
       end
 
       ######################################################################

data/lib/delorean/version.rb

@@ -1,3 +1,3 @@
 module Delorean
-  VERSION = "0.3.36"
+  VERSION = "0.3.37"
 end

data/spec/eval_spec.rb

@@ -1,5 +1,4 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
 describe "Delorean" do
 
   let(:sset) {
@@ -1030,6 +1029,18 @@ eof
     expect(r).to eq 3
   end
 
+  it "understands openstructs" do
+    engine.parse defn("A:",
+                      "    os = Dummy.returns_openstruct",
+                      "    abc = os.abc",
+                      "    not_found = os.not_found"
+                     )
+    r = engine.evaluate("A", ["os", "abc", "not_found"])
+    expect(r[0].abc).to eq("def")
+    expect(r[1]).to eq("def")
+    expect(r[2]).to be_nil
+  end
+
   xit "can use nodes as continuations" do
 
     # FIME: This is actually a trivial exmaple. Ideally we should be

data/spec/spec_helper.rb

@@ -94,6 +94,10 @@ class Dummy < ActiveRecord::Base
   delorean_fn :side_effect, sig: 0 do
     @@foo += 1
   end
+
+  delorean_fn :returns_openstruct, sig: 0 do
+    OpenStruct.new({"abc"=>"def"})
+  end
 end
 
 class DummyChild < Dummy

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: delorean_lang
 version: !ruby/object:Gem::Version
-  version: 0.3.36
+  version: 0.3.37
 platform: ruby
 authors:
 - Arman Bostani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-15 00:00:00.000000000 Z
+date: 2018-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: treetop