delorean_lang 0.3.17 → 0.3.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 986e58894d0d75b1d83fddd707448410456abd41
-  data.tar.gz: d35e57733be58f268bd57866bbb1fa46968cbc31
+  metadata.gz: 64ec010131114928fd9951e07d2cce771d282e78
+  data.tar.gz: b0bd5b2d897bc11db6f1716e8597a17f07102d26
 SHA512:
-  metadata.gz: d7e482343719b38cf5722bd3004cc9435f88240dcbabcf629348042da929ef80ae6ec85e1842d9d79bf4ec6ba1a19aba580a5c6543606608323b82d4e4b37839
-  data.tar.gz: 5391356394c6831cbc95f44de56f7739b2be879c1cb3fb8b376d48cf40f2e8df4a4a4ebe136e49718e808482dd4a9c14f5742fbc6180c67c7a678542527fd933
+  metadata.gz: 7ae4acf562ffc9fb7786229ffd1b83c2a5c02fa745dacb9112bd39b1b2095f3ab895e4a90d9693408d2b5f698624e490996f0d67541e0e3cd80a842d82830949
+  data.tar.gz: 81c1481f224a236eeba19c0f2f431e48d5990093809233ad5d1ba73fc63bc86f960565d213bf209d93ad2fafd5f9bebed19bd4b21a07de02ddfde7f3a630fddd

data/.rubocop.yml

@@ -0,0 +1,8 @@
+Style/StringLiterals:
+  Enabled: false
+
+Metrics/LineLength:
+  Max: 80
+
+Style/TrailingComma:
+  Enabled: false

data/delorean.gemspec

@@ -19,5 +19,5 @@ Gem::Specification.new do |gem|
   gem.add_dependency "treetop", "~> 1.5"
   gem.add_dependency "activerecord", ">= 3.2"
   gem.add_development_dependency "rspec", '~> 2.1'
-  gem.add_development_dependency "sqlite3", '~> 1.3'
+  gem.add_development_dependency "sqlite3", '~> 1.3.10'
 end

data/lib/delorean/base.rb

@@ -8,6 +8,8 @@ module Delorean
   # hash.  The whole whitelist mechanism should be eventually
   # rethought.
   RUBY_WHITELIST = {
+    between?:           [[Numeric, String],[Numeric, String],[Numeric, String]],
+    between:            "between?",
     compact:            [Array],
     to_set:             [Array],
     flatten:            [Array, [Fixnum, nil]],
@@ -227,7 +229,13 @@ module Delorean
           return obj.send(msg, *args)
         end
 
-        sig = RUBY_WHITELIST[msg]
+        sig = begin
+          obj.class.delorean_instance_methods[msg]
+        rescue NoMethodError
+          nil
+        end
+
+        sig = RUBY_WHITELIST[msg] unless sig
 
         raise "no such method #{method}" unless sig
 

data/lib/delorean/model.rb

@@ -22,6 +22,14 @@ module Delorean
           self.const_set(name.to_s.upcase+Delorean::SIG, sig)
         end
       end
+
+      def delorean_instance_method(name, sig = nil)
+        delorean_instance_methods[name.to_sym] = [self, *sig].compact
+      end
+
+      def delorean_instance_methods
+        @@delorean_instance_methods ||= {}
+      end
     end
   end
 end

data/lib/delorean/version.rb

@@ -1,3 +1,3 @@
 module Delorean
-  VERSION = "0.3.17"
+  VERSION = "0.3.19"
 end

data/spec/eval_spec.rb

@@ -308,6 +308,14 @@ describe "Delorean" do
     r.should == "CRJ-1.234"
   end
 
+  it "should be able to access delorean_instance_method fns using .x syntax" do
+    engine.parse defn("A:",
+                      '    b = Dummy.i_just_met_you("I Really Like You", 1.234).name3("Run Away with Me")',
+                      )
+    r = engine.evaluate("A", "b")
+    r.should == "I Really Like You-1.234-Run Away with Me"
+  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()',
@@ -592,6 +600,14 @@ eof
     engine.evaluate("A", "b").should == [-1, 10]
   end
 
+  it "should handle list comprehension with conditions using loop var" do
+    skip "need to fix"
+    engine.parse defn("A:",
+                      "    b = [n for n in {'pt' : 1} if n[1]+1]",
+                      )
+    engine.evaluate("A", "b").should == [['pt', 1]]
+  end
+
   it "should eval hashes" do
     engine.parse defn("A:",
                       "    b = {}",

data/spec/func_spec.rb

@@ -197,4 +197,13 @@ describe "Delorean" do
     engine.evaluate("A", "res").should == [true, true, true, false, false, false]
   end
 
+  it "should handle BETWEEN" do
+    engine.parse defn("A:",
+                      "    a = 1.23",
+                      "    b = [a.between(10,20), a.between(1,3)]",
+                      )
+
+    expect(engine.evaluate("A", "b")).to eq([false, true])
+  end
+
 end

data/spec/parse_spec.rb

@@ -1,15 +1,14 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "Delorean" do
-
   let(:sset) {
-    TestContainer.new({
-                        "AAA" =>
-                        defn("X:",
-                             "    a = 123",
-                             "    b = a",
-                             )
-                      })
+    TestContainer.new(
+                      "AAA" =>
+                      defn("X:",
+                           "    a = 123",
+                           "    b = a",
+                           )
+                      )
   }
 
   let(:engine) {
@@ -315,21 +314,25 @@ describe "Delorean" do
     engine.reset
 
     lambda {
-      engine.parse defn("D:",
-                        "    true_1 = false",
-                        "    false_1 = true_1",
-                        "    nil_1 = false_1",
+      engine.parse defn("E:",
+                        "    a = 1",
+                        "    return=a",
                         )
     }.should_not raise_error
 
     engine.reset
 
+    skip "need to fix"
+
     lambda {
-      engine.parse defn("E:",
-                        "    a = 1",
-                        "    return=a",
+      engine.parse defn("D:",
+                        "    true_1 = false",
+                        "    false_1 = true_1",
+                        "    nil_1 = false_1",
                         )
     }.should_not raise_error
+
+    engine.reset
   end
 
   it "should parse calls followed by getattr" do
@@ -732,7 +735,7 @@ describe "Delorean" do
                         "         3];",
                         "    b = 456",
                         )
-      raise "fail"
+      fail
     rescue Delorean::ParseError => exc
       exc.line.should == 2
     end
@@ -745,7 +748,7 @@ describe "Delorean" do
                         "    a = 1 +",
                         "         2 +",
                         )
-      raise "fail"
+      fail
     rescue Delorean::ParseError => exc
       exc.line.should == 3
     end
@@ -759,7 +762,7 @@ describe "Delorean" do
                         "        for a in [1,2,3]",
                         "B:",
                         )
-      raise "fail"
+      fail
     rescue Delorean::ParseError => exc
       exc.line.should == 3
     end
@@ -772,7 +775,7 @@ describe "Delorean" do
                         "    2]",
                         "    b = 456",
                         )
-      raise "fail"
+      fail
     rescue Delorean::ParseError => exc
       exc.line.should == 2
     end
@@ -784,7 +787,7 @@ describe "Delorean" do
       engine.parse defn("A:",
                         '    d = "#{this is a test}"',
                         )
-      raise "fail"
+      fail
     rescue Delorean::ParseError => exc
       exc.line.should == 2
     end
@@ -800,16 +803,15 @@ describe "Delorean" do
 
   it "should disallow import loops" do
     skip 'not implemented yet'
-    sset.merge({
-                 "BBB" =>
-                 defn("import AAA",
-                      "import CCC",
-                      ),
-                 "CCC" =>
-                 defn("import BBB",
-                      ),
-               })
+    sset.merge(
+               "BBB" =>
+               defn("import AAA",
+                    "import CCC",
+                    ),
+               "CCC" =>
+               defn("import BBB",
+                    ),
+               )
     sset.get_engine("CCC")
   end
-
 end

data/spec/spec_helper.rb

@@ -77,6 +77,12 @@ class Dummy < ActiveRecord::Base
 
     [a, b]
   end
+
+  def name3 other_name
+    "#{name}-#{number.round(4)}-#{other_name}"
+  end
+
+  delorean_instance_method :name3, String
 end
 
 module M
@@ -91,9 +97,9 @@ module M
 end
 
 Delorean::RUBY_WHITELIST.
-  merge!({
-           name2: [Dummy],
-         })
+  merge!(
+         name2: [Dummy],
+         )
 
 ######################################################################
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: delorean_lang
 version: !ruby/object:Gem::Version
-  version: 0.3.17
+  version: 0.3.19
 platform: ruby
 authors:
 - Arman Bostani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-27 00:00:00.000000000 Z
+date: 2015-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: treetop
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.3.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.3.10
 description: A "compiler" for the Delorean programming language
 email:
 - arman.bostani@pnmac.com
@@ -75,6 +75,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -116,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Delorean compiler
@@ -126,4 +127,3 @@ test_files:
 - spec/func_spec.rb
 - spec/parse_spec.rb
 - spec/spec_helper.rb
-has_rdoc: