delorean_lang 0.2.3 → 0.2.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    N2JmZWI1ZDg4M2ZlMTViMjAxNWFiODhmYzkyOTJjZGZkZTRiODM5NQ==
+    MThkOGViN2U0NDc5MjEyMmVhM2Y0NGIyN2QwNTRhZjFhY2M1NTMyMA==
   data.tar.gz: !binary |-
-    OTZlYjcxNGFhMmE4MjhlZmM4NDE3NGQ5ODBhNzc0ODk1ZWFkMWE2Mw==
+    ODhlNDc3ODRkZGI4OWMwNzRiNzM1ODA4ZWI3MzY2OWYzNTdhZGRiOA==
 SHA512:
   metadata.gz: !binary |-
-    Nzg2NjUyZTc4NmExOTI3MDUxNTBlZjg4NTEwMGFkNTIxZGM5ZDY5YjI0MWM1
-    ZjlmMmNiYjU5ODM3NzFlM2NmOGUxOTUyMzZiYjk3OWYxODI0ZmM3NDY3ZWEw
-    MjFkZTJlZTk3ODQwZjAyOWU2MzgyNzAyZGVkNmZjYmFkOTAwNzQ=
+    NjY0MzZiZTZmNDUzMmM2YmYyYjAxZjNiY2QxODY1OTQzNmZiNjJkOWM3NTMz
+    ZDhjYTFjZWRjYzE4ZmFmYWYyMmQ5NzY3OTFiODg5MDdlZGM5YWMwZjRiZWFh
+    MGNkYTczZGJmOTY1Zjg2MTM0ZjlhNDcyZTQzNjUzYzdmMDBiODM=
   data.tar.gz: !binary |-
-    NmM1NWFiMTAzNjczNmYxOGNhZjQ3Y2Y5YThhN2M4ZDY3YmE4NGFjODc3NWQz
-    ZjdkZDBlNWEzOWJiMTk3NjQxZjBkNDMxMWVmNGY1NDFiNmQ2MDhkNDBmZTE4
-    ODI2MjA4NDZmYmFjYjU3NDdkYjI2MjI1NjBhZTVmZjZiMzg1NTg=
+    YjFiN2E5YjdiYmE1NjA3OTY5OTYyZDE5N2MzZGUyMjk1YjdmMTYzNmExNjRm
+    ZDhmMWE2OTFlMGYyZGRmNzMxZTIwMTliNjAyNDljNWRiN2MxYTdkMjg0OTcz
+    NGUwYjhmYTIzNDE3MDgzODE0YTdhMGNmNzM3NWEzN2VhYmRiNzk=

data/lib/delorean/base.rb

@@ -91,6 +91,8 @@ module Delorean
 
     class BaseClass
       def self._get_attr(obj, attr, _e)
+        # FIXME: even Javascript which is superpermissive raises an
+        # exception on null getattr.
         return nil if obj.nil?
 
         # NOTE: should keep this function consistent with _index
@@ -104,7 +106,13 @@ module Delorean
           return obj.send(attr.to_sym) if
             klass.reflect_on_all_associations.map(&:name).member? attr.to_sym
 
-          raise InvalidGetAttribute, "ActiveRecord lookup '#{attr}' on #{obj}"
+          # FIXME: should call _instance_call for other types as well.
+          # Too lazy to implement this now.
+          begin
+            return _instance_call(obj, attr, [])
+          rescue
+            raise InvalidGetAttribute, "ActiveRecord lookup '#{attr}' on #{obj}"
+          end
         elsif obj.instance_of?(NodeCall)
           return obj.evaluate(attr)
         elsif obj.instance_of?(Hash)
@@ -113,7 +121,6 @@ module Delorean
         elsif obj.instance_of?(Class) && (obj < BaseClass)
           return obj.send((attr + POST).to_sym, _e)
         end
-
         raise InvalidGetAttribute,
         "bad attribute lookup '#{attr}' on <#{obj.class}> #{obj}"
       end

data/lib/delorean/version.rb

@@ -1,3 +1,3 @@
 module Delorean
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

data/spec/eval_spec.rb

@@ -252,6 +252,14 @@ describe "Delorean" do
     r.should == "CRJ"
   end
 
+  it "should be able to access ActiveRecord whitelisted fns using .attr syntax" do
+    engine.parse defn("A:",
+                      '    b = Dummy.i_just_met_you("CRJ", 1.234).name2',
+                      )
+    r = engine.evaluate("A", "b")
+    r.should == "CRJ-1.234"
+  end
+
   it "should be able to get attr on Hash objects using a.b syntax" do
     engine.parse defn("A:",
                       '    b = Dummy.i_threw_a_hash_in_the_well()',

data/spec/spec_helper.rb

@@ -60,6 +60,10 @@ class Dummy < ActiveRecord::Base
   end
 
   I_THREW_A_HASH_IN_THE_WELL_SIG = [0, 0]
+
+  def name2
+    "#{name}-#{number}"
+  end
 end
 
 module M
@@ -73,6 +77,11 @@ module M
   end
 end
 
+Delorean::RUBY_WHITELIST.
+  merge!({
+           name2: [Dummy],
+         })
+
 ######################################################################
 
 class TestContainer < Delorean::AbstractContainer

metadata

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