junoser 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31acb1e8abc3e39683666d17d250fb3be8872ec2
-  data.tar.gz: 578af0518c95aeaf82f3e59ff2ec0b946b6a5a2e
+  metadata.gz: 72e2cd307c5161e27121a912e61ebe546a61452a
+  data.tar.gz: b98bb546574beb5f71f28b45ce6756ec438a16be
 SHA512:
-  metadata.gz: e8fa45ce896e5c1ef6c0ddae5069a1bcc54d5b81e8c640802478e6e97e864e3404c2cd14d504a5b00ffb6a09e6844452bc81cc8a304a053f2808a61da451b2b9
-  data.tar.gz: e64e18d06b8539668e3214f9bba8720f13bfb499f64abe1a004df87e4606e818512936d2424f4e02ff0d049ec7d200896bb0f387fb8410432e67be1e035cc90c
+  metadata.gz: 744fa2b2cc6c716cf55146a9a09ce2ded270821621bd42cd8d08ecc5fc3b758ed78a1fdaa4abee1e85b1c8e2430559aa888922426d83d258f794770c56e267ec
+  data.tar.gz: 08e47a6fa0bd8dcd7753a478636157148630cc6c1caab6a949485f206942341dede2efe9dcadaa678cf1231c8f0e1d95cdcb44f0c8a03a4746f9571872b3080c

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.1.6 / 2015-10-31
+
+* Bug fix
+  * route-filter statement should be translated into one-line
+
 ## 0.1.5 / 2015-09-11
 
 * Bug fix

data/lib/junoser/parser.rb

@@ -18792,12 +18792,12 @@ module Junoser
                                     b(str("policy"),
                                       policy_algebra
                                     ),
-                                    b(str("route-filter"),
+                                    b(a(str("route-filter"), arg),
                                       control_route_filter_type
-                                    ),
-                                    b(str("source-address-filter"),
+                                    ).as(:oneline),
+                                    b(a(str("source-adress-filter"), arg),
                                       control_source_address_filter_type
-                                    ),
+                                    ).as(:oneline),
                                     b(str("prefix-list"),
                                       control_prefix_list_type
                                     ),
@@ -19153,12 +19153,12 @@ module Junoser
                             b(str("policy"),
                               policy_algebra
                             ),
-                            b(str("route-filter"),
+                            b(a(str("route-filter"), arg),
                               control_route_filter_type
-                            ),
-                            b(str("source-address-filter"),
+                            ).as(:oneline),
+                            b(a(str("source-adress-filter"), arg),
                               control_source_address_filter_type
-                            ),
+                            ).as(:oneline),
                             b(str("prefix-list"),
                               control_prefix_list_type
                             ),
@@ -19813,8 +19813,7 @@ module Junoser
     end
 
     rule(:control_route_filter_type) do
-        s(
-          arg,
+        b(
           c(
             b(str("exact"),
                 arg
@@ -20079,8 +20078,7 @@ module Junoser
     end
 
     rule(:control_source_address_filter_type) do
-        s(
-          arg,
+        b(
           c(
             b(str("exact"),
                 arg

data/lib/junoser/ruler.rb

@@ -108,6 +108,13 @@ end"
       str.gsub!(/"http"(.*)"https"/) { %["https"#$1"http"] }
       str.gsub!(/"snmp"(.*)"snmptrap"/) { %["snmptrap"#$1"snmp"] }
 
+      str.gsub!(/(rule\(:juniper_policy_options\) do\s*)sc\(/) { "#{$1}c(" }
+
+      str.gsub!(/"route-filter" (\(\s*control_route_filter_type\s*\))/) { %["route-filter" arg #{$1}.as(:oneline)] }
+      str.gsub!(/(rule\(:control_route_filter_type\) do\s*)s\(\s*arg,/) { "#{$1}b(" }
+      str.gsub!(/"source-address-filter" (\(\s*control_source_address_filter_type\s*\))/) { %["source-adress-filter" arg #{$1}.as(:oneline)] }
+      str.gsub!(/(rule\(:control_source_address_filter_type\) do\s*)s\(\s*arg,/) { "#{$1}b(" }
+
       str
     end
 

data/lib/junoser/version.rb

@@ -1,3 +1,3 @@
 module Junoser
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: junoser
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Shintaro Kojima
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-09-10 00:00:00.000000000 Z
+date: 2015-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet