junoser 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aad8f66767a6bbd785c15d36e318d8ba367ccb6736d3fb8059f181b3abfde8fe
-  data.tar.gz: 0e146503ef7ce0cdb38b06af0ed0a3424267a08f012523d999f74e9ff182d3fa
+  metadata.gz: d9032031b1b9337962f14983300d1f8df49b50d25fa74ee4682326e707e65d09
+  data.tar.gz: 206444746921cd0c0ee08dc51ea901ae1a31ff5ff41597949b0335b2a5cb2d24
 SHA512:
-  metadata.gz: 13654e7095a17dae55a8b93d3b3f51b8d384f2559e4e8f9261828260e3bc85a89e007b7e01bcff9e5a33850b04a0188c0d4304f4b27eb3a60d6e5b0b34490e71
-  data.tar.gz: 153e61af2f23d28918e887db0396cd1886177ff95a90ad38a01ccbdb0ebefd1b6e4f06f4d2d9dd16412363796e9a2c7e3dc6234f93f84e6a8d5c08edf4c3d0db
+  metadata.gz: 487c75c7693d9988be1205b80ef034dc3df72618c74895d531d56b94f3edfed813dba103bb2eb31d56f3f56852fcc4b7dc02c2c5daab15d5e8a479ddfa0f76db
+  data.tar.gz: 77e5906748293b917c4fdfc9f46d1db4153212109194ac827b9a76ef78158c1e6c7651004fe17dd506f20ea91f652b78abe274d6442a64cfa541f4be3d0f70e2

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## [0.3.7] - 2019-09-03
+
+### Fixed
+
+* "apply-groups" translation between "display set" and structured form
+
+### Added
+
+* Support "deactivate ... apply-groups"
+
+
 ## [0.3.6] - 2019-08-25
 
 ### Fixed

data/Gemfile.lock

@@ -1,19 +1,19 @@
 PATH
   remote: .
   specs:
-    junoser (0.3.6)
+    junoser (0.3.7)
       parslet
 
 GEM
   remote: https://rubygems.org/
   specs:
     mini_portile2 (2.4.0)
-    nokogiri (1.10.0)
+    nokogiri (1.10.4)
       mini_portile2 (~> 2.4.0)
     parslet (1.8.2)
-    power_assert (1.1.3)
+    power_assert (1.1.5)
     rake (10.5.0)
-    test-unit (3.2.9)
+    test-unit (3.3.3)
       power_assert
 
 PLATFORMS
@@ -27,4 +27,4 @@ DEPENDENCIES
   test-unit
 
 BUNDLED WITH
-   2.0.1
+   2.0.2

data/lib/junoser/display/config_store.rb

@@ -26,7 +26,7 @@ module Junoser
       alias << push
 
       def deactivate(deactivated_line)
-        statement, store = matched(deactivated_line)
+        statement, store = match(deactivated_line)
 
         if statement
           if statement == deactivated_line
@@ -35,7 +35,7 @@ module Junoser
             store.deactivate(deactivated_line.sub(/^#{statement} */, ''))
           end
         else
-          statement, store = inverse_matched(deactivated_line)
+          statement, store = inverse_match(deactivated_line)
           if statement
             store.deactivated = true
           end
@@ -75,19 +75,19 @@ module Junoser
         str
       end
 
-      def matched(str)
+      def match(str)
         each do |statement, store|
           # NOTE: return the first object
-          return [statement, store] if str =~ /^#{statement}/
+          return [statement, store] if str =~ /^#{Regexp.escape(statement)}(\b|$)/
         end
 
         []
       end
 
-      def inverse_matched(str)
+      def inverse_match(str)
         each do |statement, store|
           # NOTE: return the first object
-          return [statement, store] if statement =~ /^#{str}/
+          return [statement, store] if statement =~ /^#{str}\b/
         end
 
         []

data/lib/junoser/display/structure.rb

@@ -15,14 +15,29 @@ module Junoser
         parser = Junoser::Parser.new
         transform = Junoser::Transformer.new
 
-        config = Junoser::Input.new(@input).read.split("\n")
-        deactivated_lines = config.grep(/^deactivate /).map {|l| l.sub(/^deactivate /, '') }
+        config = Junoser::Input.new(@input).read.split("\n").map(&:strip)
+        deactivated_lines = []
 
         config.each do |line|
-          next if line =~ /^deactivate /
+          # .xsd doesn't include "apply-groups"
+          apply_groups = trim_apply_groups(line)
+          if line == 'set'
+            @config << apply_groups
+            next
+          end
+
+          if line =~ /^deactivate *(.*)/
+            deactivated_lines << "#$1 #{apply_groups}".strip
+            next
+          end
 
           transformed = transform.apply(parser.parse(line))
-          raise "ERROR: parse failed" unless transformed.is_a?(String)
+          raise "ERROR: Failed to parse \"#{line}\"" unless transformed.is_a?(String)
+
+          if apply_groups
+            transformed << "\n#{apply_groups}"
+          end
+
           @config << transformed
         end
 
@@ -30,6 +45,13 @@ module Junoser
 
         @config.to_s
       end
+
+      private
+
+      def trim_apply_groups(line)
+        line.gsub! /\s+(apply-groups\s+.*)/, ''
+        return $1
+      end
     end
   end
 end

data/lib/junoser/parser.rb

@@ -22,7 +22,8 @@ module Junoser
       end
 
       begin
-        if line =~ /(.*)\s+apply-groups\s+\S+$/
+        # .xsd doesn't include "apply-groups"
+        if line =~ /(.*)\s+apply-groups\s+(\S+|\[.*\])$/
           return $1 == 'set' ? true : parse($1)
         end
 

data/lib/junoser/ruler.rb

@@ -199,7 +199,8 @@ module Junoser
       end
 
       begin
-        if line =~ /(.*)\\s+apply-groups\\s+\\S+\$/
+        # .xsd doesn't include "apply-groups"
+        if line =~ /(.*)\\s+apply-groups\\s+(\\S+|\\[.*\\])$/
           return \$1 == 'set' ? true : parse(\$1)
         end
 

data/lib/junoser/version.rb

@@ -1,3 +1,3 @@
 module Junoser
-  VERSION = "0.3.6"
+  VERSION = "0.3.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: junoser
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Shintaro Kojima
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-24 00:00:00.000000000 Z
+date: 2019-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet