modl 0.3.25 → 0.3.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6dea81884e2aa76c3e7131afd53ab68641622035cf63f21b687b4b2d5003e090
-  data.tar.gz: 9bfa08742c36d41ca903abe5bd66220e099ad32ef2ebfa12c18a092141dca340
+  metadata.gz: edaf87097f3f827795fdeff49c22f3acb3e25ec92acf2bf177ab1af9f881ae9e
+  data.tar.gz: da67d0d410dbad33b336daf1bbf424912e6cbca52d5ef939b42908af445d1fad
 SHA512:
-  metadata.gz: f039c1b05655c54b66fb635f71b3a7a7a89d2d989e3f196744be3d90077a54b785771ac755120bdadb9849654b2f0c8a7d57195e3716bc09543ea50f804497ad
-  data.tar.gz: 62306fdd0ecb9bee034d7dd9f3bbb522d33f9a309aab51e976089ba1ea3b6d30be8453edc8d73d16d33d03d9b85627764609a46d9930aa927350791c915d90b0
+  metadata.gz: dd2e39df266e049f744a927ef12ffe63dbc2e1aa3af60e82b3c964104c6c85cc1c7822318ef855b7c7cd494d1eea1d04fa628111b2d3506cf5590d906e1f14e2
+  data.tar.gz: 7f1c74734687b3d9ab94b9e6757d4fcf435721366b1267d2b2ae4857f8a1636f6f4f9b7e8333aedb46614691a5f8c50a1871470795fba670a366f7d6c0c186fc

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+0.3.26
+===
+- Remove `*expect`
+- Fix problem with references in classes.
+
+0.3.25
+===
+- Update Rake due to security advisory.
+
 0.3.24
 ===
 - Use base_tests from the grammar repo.

data/lib/modl/parser/instruction_processor.rb

@@ -75,8 +75,6 @@ module MODL
           return global.transform_list
         when '%*allow'
           return global.allow_list
-        when '%*expect'
-          return global.allow_list
         end
       end
     end

data/lib/modl/parser/modl_class.rb

@@ -59,7 +59,7 @@ module MODL
 
       def merge_content(new_value)
         @content.each do |k, v|
-          new_value[k] = v.extract_hash
+          new_value[k] = v.extract_hash unless new_value[k]
         end
         new_value
       end

data/lib/modl/parser/parsed.rb

@@ -481,7 +481,6 @@ module MODL
           @type = 'index' if @key == '?'
           @type = 'hidden' if @key.start_with? '_'
           @type = 'allow' if @key.downcase == '*allow'
-          @type = 'expect' if @key.downcase == '*expect'
         end
       end
 

data/lib/modl/parser/version.rb

@@ -24,6 +24,6 @@
 
 module MODL
   module Parser
-    VERSION = "0.3.25"
+    VERSION = "0.3.26"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: modl
 version: !ruby/object:Gem::Version
-  version: 0.3.25
+  version: 0.3.26
 platform: ruby
 authors:
 - Tony Walmsley
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-03 00:00:00.000000000 Z
+date: 2020-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake