modl 0.3.20 → 0.3.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '00617859c13359189d14d838eb6701f4a755f3933631e7771c664751e1779651'
-  data.tar.gz: 46967560c08f4eb541553bc184e0688040e91f5e3513da6709d316dae74b7f4a
+  metadata.gz: 84fb9b34002bed8fe52e89fe76f12c611a4c8d615ba8a4e5e11267c0b6deba99
+  data.tar.gz: 05373b62d95ff9599775eb1bf8a2d8ac060ba3f61baf4569ea63de94bf4d2199
 SHA512:
-  metadata.gz: cb09f90f72233e3de2b672aca0c1d3ef04f56ced05440a6a37bd31eb029bf6e23b46e4e880b859dbce4d5ba1a162b8d3841edb5c04d7ed7fa7b67edb06db4ab2
-  data.tar.gz: 2740782db327af3741d4627fccce8d4af0875830d007171df7f9b705fab0faecd8fe3ccdb820d601a7079f78f9a838ab295b0acbc7f64f322b1eb6a2c97b4cb5
+  metadata.gz: 94d50dfcd3ea5fa3b716aacc1dd39d2f6455c0d325d6b7cc0fb91d31952aafa48fd7c040451ffeb17248ffaff9337e2d3728881223a5916581c2b1529f529afb
+  data.tar.gz: 4216880a6c17df8b73cfa9c7828da975518b1b5dfb7dac7c6b38e996338a6b987673c2e43a136ec4273ba68dad6651c14ce01e495888ab6ffa622819017d9a42

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+0.3.21
+===
+- Bugfix for `*assign` processing.
+
 0.3.20
 ===
 - Support escaping unicode escape sequences so they are not replaced by unicode characters.

data/grammar_tests/base_tests.json

@@ -3086,5 +3086,43 @@
       "escapes"
     ],
     "minimised_modl": "test=\\\\~u2019\\\\u2019~u2019\\\\u2019"
+  },
+  {
+    "id": "324",
+    "input": "test=~~u2019",
+    "expected_output": "{\n    \"test\": \"~u2019\"\n}",
+    "tested_features": [
+      "unicode",
+      "escapes"
+    ],
+    "minimised_modl": "test=~~u2019"
+  },
+  {
+    "id": "325",
+    "input": "test=\\~u2019",
+    "expected_output": "{\n    \"test\": \"~u2019\"\n}",
+    "tested_features": [
+      "unicode",
+      "escapes"
+    ],
+    "minimised_modl": "test=\\~u2019"
+  },
+  {
+    "id": "326",
+    "input": "*class(\n  *id=v;\n  *name=variants;\n  *assign=[[variant*]]\n);\n\n*class(\n  *id=variant;\n  *assign=[[key1;key2;key3]]\n);\n\nv[[one;two;three];[four;five;six]]",
+    "expected_output": "{\n  \"variants\": [\n    {\n      \"key1\": \"one\",\n      \"key2\": \"two\",\n      \"key3\": \"three\"\n    },\n    {\n      \"key1\": \"four\",\n      \"key2\": \"five\",\n      \"key3\": \"six\"\n    }\n  ]\n}",
+    "tested_features": [
+      "class"
+    ],
+    "minimised_modl": "*class(*id=v;*name=variants;*assign=[[variant*]]);*class(*id=variant;*assign=[[key1;key2;key3]]);v[[one;two;three];[four;five;six]]"
+  },
+  {
+    "id": "327",
+    "input": "*class(\n  *id=v;\n  *name=variants;\n  *assign=[[variant*]]\n);\n\n*class(\n  *id=variant;\n  *assign=[[key1;key2;key3]]\n);\n\nv[one:two:three]",
+    "expected_output": "{\n    \"variants\": [\n        {\n            \"key1\": \"one\",\n            \"key2\": \"two\",\n            \"key3\": \"three\"\n        }\n    ]\n}",
+    "tested_features": [
+      "class"
+    ],
+    "minimised_modl": "*class(*id=v;*name=variants;*assign=[[variant*]]);*class(*id=variant;*assign=[[key1;key2;key3]]);v[[one;two;three];[four;five;six]]"
   }
 ]

data/lib/modl/parser/class_processor.rb

@@ -254,6 +254,7 @@ module MODL
         result = true
         lists.each do |list|
           list.each do |item|
+            item = Sutil.head(item) if item.end_with? '*'
             global_class = global.classs(item)
             result &= (!global_class.nil? && has_assign_statement?(global_class, global))
           end
@@ -353,18 +354,24 @@ module MODL
               end
             end
           end
+          new_value.keys do |nk|
+            process_obj global, new_value[nk]
+          end
+
+          process_nested_classes(global, new_value)
+          clazz.merge_content(new_value)
         else
           keys.each_index do |i|
-            new_value[keys[i]] = lam.call(i)
+            tmp_value = {keys[i] => v[i]}
+            process_obj global, tmp_value
+            if !global.classs(keys[i]).nil? && !tmp_value[keys[i]].nil? && (tmp_value[keys[i]].is_a?(Hash) || tmp_value[keys[i]].is_a?(Array))
+              new_value[i] = tmp_value[keys[i]]
+            else
+              new_value.merge! tmp_value
+            end
           end
+          new_value
         end
-
-        new_value.keys do |nk|
-          process_obj global, new_value[nk]
-        end
-
-        process_nested_classes(global, new_value)
-        clazz.merge_content(new_value)
       end
 
       # Find a *assign key list of a specific length

data/lib/modl/parser/version.rb

@@ -24,6 +24,6 @@
 
 module MODL
   module Parser
-    VERSION = "0.3.20"
+    VERSION = "0.3.21"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: modl
 version: !ruby/object:Gem::Version
-  version: 0.3.20
+  version: 0.3.21
 platform: ruby
 authors:
 - Tony Walmsley
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-15 00:00:00.000000000 Z
+date: 2019-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake