delorean_lang 2.4.2 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2f391feb742261cf7205700f71a6455c3994b88ff33e07ec3acc8b5bba322e7
-  data.tar.gz: af2616d688fc0b18844737aaa26dd37a597ed92a8ef338a46fc27c252beab739
+  metadata.gz: b6cc25679183ee119b6f32c93032dcaf62ec212ccadf9d603db3208343ed6e9f
+  data.tar.gz: dda2d1e9b7cea95d61686b22a96ed453fe694e3179047a13b9fbaae60c719c7a
 SHA512:
-  metadata.gz: 202515ed652a577f8eb270116397254c0d46e601e4062db196f8c4dd07abd13914e74dce21ee4a086d9e7e404b823f56671573bbafc382f950b32fec9fdfdab8
-  data.tar.gz: 2fca9df1461cc20b7e5a4c0e6aa60c9c54d35ec2bbe3b954b539b5b757818cfab5d315bc8bbd48d53aa35a2beb3a8fdb3f914dfced09068299cc104da0088578
+  metadata.gz: 17a9b6906e1f95883084f08236604edbd6197121a175b707a1e91c5f9e0778c224fd526dbb66819f1a6fe8477f8ca88b6ac5e436ec6b63b73aaa7ca717d04b1d
+  data.tar.gz: 72da6952e2c7cbf92b95b36e1893f2dbbcb4b8c8715e306496e400fc48c7ecd89808fda38711e665c12a9e5fb1ce38fd7082a7c7b185f3edf78939d4651ad599

data/.rubocop_todo.yml

@@ -42,11 +42,11 @@ Metrics/AbcSize:
 # Offense count: 2
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 300
+  Max: 350
 
 # Offense count: 8
 Metrics/CyclomaticComplexity:
-  Max: 13
+  Max: 20
 
 # Offense count: 22
 # Configuration parameters: CountComments, ExcludedMethods.
@@ -55,7 +55,7 @@ Metrics/MethodLength:
 
 # Offense count: 6
 Metrics/PerceivedComplexity:
-  Max: 15
+  Max: 20
 
 # Offense count: 1
 Naming/AccessorMethodName:

data/lib/delorean/base.rb

@@ -76,7 +76,7 @@ module Delorean
 
       # add new arguments, results in a new NodeCall
       def +(args)
-        raise 'bad arg to %' unless args.is_a?(Hash)
+        raise 'bad arg to +' unless args.is_a?(Hash)
 
         NodeCall.new(_e, engine, node, params.merge(args))
       end

data/lib/delorean/engine.rb

@@ -220,6 +220,16 @@ module Delorean
       @@parser ||= DeloreanParser.new
     end
 
+    def closing_bracket?(line)
+      stripped = line.strip
+
+      return true if stripped == ']'
+      return true if stripped == ')'
+      return true if stripped == '}'
+
+      false
+    end
+
     def generate(t)
       t.check(self)
 
@@ -268,7 +278,7 @@ module Delorean
         if multi_line
           # if line starts with >4 spaces, assume it's a multline
           # continuation.
-          if /\A {5}/.match?(line)
+          if /\A {5}/.match?(line) || closing_bracket?(line)
             multi_line += line
             next
           else

data/lib/delorean/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Delorean
-  VERSION = '2.4.2'
+  VERSION = '2.5.0'
 end

data/spec/eval_spec.rb

@@ -1397,6 +1397,84 @@ eof
     expect(r).to eq 1
   end
 
+  it 'allows to close the bracket with the same spacing as variable' do
+    engine.parse defn('A:',
+                      '    a = [',
+                      '        1,',
+                      '        2,',
+                      '    ]',
+                      '    b = 2',
+                     )
+    r = engine.evaluate('A', 'a')
+    expect(r).to eq [1, 2]
+
+    r = engine.evaluate('A', 'b')
+    expect(r).to eq 2
+  end
+
+  it 'allows to close the bracket with the same spacing as variable 2' do
+    engine.parse defn('A:',
+                      '    a = [',
+                      '        {',
+                      '          "a": 1,',
+                      '          "b": 2,',
+                      '        },',
+                      '        2,',
+                      '    ]',
+                     )
+    r = engine.evaluate('A', 'a')
+    expect(r).to eq [{ 'a' => 1, 'b' => 2 }, 2]
+  end
+
+  it 'allows to close the bracket with the same spacing as variable 3' do
+    engine.parse defn('A:',
+                      '    a = {',
+                      '      "a": 1,',
+                      '      "b": 2,',
+                      '    }',
+                      '    b = 2',
+                     )
+    r = engine.evaluate('A', 'a')
+    expect(r).to eq('a' => 1, 'b' => 2)
+
+    r = engine.evaluate('A', 'b')
+    expect(r).to eq 2
+  end
+
+  it 'allows to close the bracket with the same spacing as variable 4' do
+    engine.parse defn('A:',
+                      '    a = {',
+                      '      "a": 1,',
+                      '      "b": 2,',
+                      '    }',
+                      '    b = [1, 2]',
+                      '    c = [',
+                      '      {',
+                      '        key : value + num',
+                      '        for key, value in a',
+                      '      }',
+                      '      for num in b',
+                      '    ]',
+                     )
+    r = engine.evaluate('A', 'c')
+    expect(r).to eq([{ 'a' => 2, 'b' => 3 }, { 'a' => 3, 'b' => 4 }])
+  end
+
+  it 'allows to close the bracket with the same spacing as variable 5' do
+    engine.parse defn('A:',
+                      '    a = (',
+                      '      1 +',
+                      '      2',
+                      '    )',
+                      '    b = 2',
+                     )
+    r = engine.evaluate('A', 'a')
+    expect(r).to eq(3)
+
+    r = engine.evaluate('A', 'b')
+    expect(r).to eq 2
+  end
+
   describe 'blocks' do
     let(:default_node) do
       ['A:',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: delorean_lang
 version: !ruby/object:Gem::Version
-  version: 2.4.2
+  version: 2.5.0
 platform: ruby
 authors:
 - Arman Bostani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-03 00:00:00.000000000 Z
+date: 2020-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord