delorean_lang 0.3.33 → 0.3.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6f8891a8771615853e2c27e6a990885dadb65f9
-  data.tar.gz: 7025ffd4e2f0ca45ed5f0f8c5cb7c966fb34eac8
+  metadata.gz: f665bb92a67fd0769a477d7ef174267535c75b6b
+  data.tar.gz: afa0d72489613c49cf37785cdcbf90c95fa62074
 SHA512:
-  metadata.gz: 78942629bdf7d297a2eda5e7ba808f0f88da8cdfb9d7bad0f03841fa17094e2d185218aaa748865771d06fc8383bf986a4697acd05df7f753da8cb8324f9df0e
-  data.tar.gz: ccb53908b8c1924f090ad263289057339847702b3111ab9f96b3facf02fc4bf6d21767d9d6101b4cf0f8734f7af1d29df7355f951b7ce6645211016d11abc1a3
+  metadata.gz: cdb713258835e5dbbbd94deaadec930fbc5585f6cba6cb87b6dbf06cb1d4ed737e68b37205aa6b70928ef8fa23764834c7f91c680c6a4fb2fc2c2e8fac55f863
+  data.tar.gz: 84f522bdc77047a4e74f22e25b028842cb9a30068bd9e7f9a43113451d22b89c03893ef4055c2163e2c7e803f1f4fe6d885e30030ef41417f7811ea9d5d4527a

data/Gemfile

@@ -5,4 +5,5 @@ gemspec
 
 group :development, :test do
   gem 'rspec-instafail', require: false
+  gem 'pry'
 end

data/lib/delorean/base.rb

@@ -234,8 +234,10 @@ module Delorean
         end
 
         cls = obj.class
-        sig = (cls < Delorean::Model && cls.delorean_instance_methods[msg]) ||
-              RUBY_WHITELIST[msg]
+        sig = cls < Delorean::Model &&
+              cls.ancestors.lazy.map do |an|
+          cls.delorean_instance_methods[[an, msg]]
+        end.find{|i|i} || RUBY_WHITELIST[msg]
 
         raise "no such method #{method}" unless sig
 

data/lib/delorean/model.rb

@@ -24,7 +24,7 @@ module Delorean
       end
 
       def delorean_instance_method(name, sig = nil)
-        delorean_instance_methods[name.to_sym] = [self, *sig].compact
+        delorean_instance_methods[[self, name.to_sym]] = [self, *sig].compact
       end
 
       def delorean_instance_methods

data/lib/delorean/version.rb

@@ -1,3 +1,3 @@
 module Delorean
-  VERSION = "0.3.33"
+  VERSION = "0.3.34"
 end

data/spec/eval_spec.rb

@@ -319,6 +319,37 @@ describe "Delorean" do
     r.should == "I Really Like You-1.234-Run Away with Me"
   end
 
+  it "delorean_instance_fn inheritance test 1" do
+    engine.parse defn("A:",
+                   '    b = DummyChild.hello.name3("child calling parent\'s dim")',
+                      )
+    r = engine.evaluate("A", "b")
+    r.should == "child-99999.0-child calling parent's dim"
+  end
+  it "delorean_instance_fn inheritance test 2" do
+    engine.parse defn("A:",
+                   '    b = DummyChild.hello.name4("child calling own dim")',
+                      )
+    r = engine.evaluate("A", "b")
+    r.should == "#4 child-99999.0-child calling own dim"
+  end
+  it "delorean_instance_fn inheritance test 3" do
+    # calling unrelated dim
+    engine.parse defn("A:",
+                      "    b = M::LittleDummy.sup.foob",
+                      )
+    r = engine.evaluate("A", "b")
+    r.should == "bar"
+  end
+  it "delorean_instance_fn inheritance test 4" do
+    # parent calling its own dim (that a child also has)
+    engine.parse defn("A:",
+                   '    b = Dummy.i_just_met_you("Foo",321).name4("Bar")',
+                      )
+    r = engine.evaluate("A", "b")
+    r.should == "Four Foo-321.0-Bar"
+  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

@@ -84,12 +84,30 @@ class Dummy < ActiveRecord::Base
 
   delorean_instance_method :name3, String
 
+  def name4 other_name
+    "Four #{name}-#{number.round(4)}-#{other_name}"
+  end
+
+  delorean_instance_method :name4, String
+
   @@foo = 0
   delorean_fn :side_effect, sig: 0 do
     @@foo += 1
   end
 end
 
+class DummyChild < Dummy
+  def self.hello
+    DummyChild.new(name: "child", number: 99999)
+  end
+  HELLO_SIG = [0, 0]
+  def name4 other_name
+    "#4 #{name}-#{number.round(4)}-#{other_name}"
+  end
+
+  delorean_instance_method :name4, String
+end
+
 module M
   class LittleDummy
     include Delorean::Model
@@ -98,7 +116,16 @@ module M
       |*a|
       a.inject(0, :+)
     end
+    def self.sup
+      LittleDummy.new
+    end
+    SUP_SIG = [0, 0]
+    def foob
+      "bar"
+    end
+    delorean_instance_method :foob
   end
+
 end
 
 Delorean::RUBY_WHITELIST.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: delorean_lang
 version: !ruby/object:Gem::Version
-  version: 0.3.33
+  version: 0.3.34
 platform: ruby
 authors:
 - Arman Bostani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-28 00:00:00.000000000 Z
+date: 2018-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: treetop
@@ -118,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Delorean compiler