brocade_vrouter 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27e8f859934fb6b76803b2ccd907db3143b1fc36
-  data.tar.gz: bb175b3a07aeba1cfd184004bb5d5df3dec191cc
+  metadata.gz: 38c6398c118b317355cc126df7abc55baaa2fc4e
+  data.tar.gz: da70358dbe46e3d4a69d2798a985f567fe61356c
 SHA512:
-  metadata.gz: 64f99f9a1bc26f324b064b23060d2cb0001cb4166ea8b3e9058ea1453673f0b9e1ccf38775781e52dc3f5d4b2175cb2fa220b0263827d08771aa9aebae5f1289
-  data.tar.gz: c1997ae826cd49da9e8c05e294e0892e2a042296285f26a04768223b72d654cb27e5a7b4ea9ba368dfb7d93c502fe57daa0eed80d24b0f3473088567758fa0ef
+  metadata.gz: a96c676c261fe7031712002d68d204604d8e66e217a347bf7f175a7845eadd58c68418fc2ee4c0c9d7706b2ac4c9f3b6c5be3ffd32d18c0ad6d52d8d86401490
+  data.tar.gz: 60d601157bde88018b5391f8743a666a48e50a8fee3994b0a557fc807f271b505fa90924a189c697c2bac76e6a41107760bdcddd8ecf9071f53799fabe42b4df

data/lib/brocade_vrouter/path_builder.rb

@@ -1,7 +1,8 @@
 module BrocadeVRouter
   class PathBuilder
     SEPARATOR = '/'.freeze
-    SNAKE_TRANSFORM = ['_', '-'].map(&:freeze).freeze
+    SNAKE_TRANSFORM = ['_'.freeze, '-'.freeze].freeze
+    WHTSP_TRANSFORM = [' '.freeze, SEPARATOR].freeze
 
     attr_reader :base_path
 
@@ -16,7 +17,7 @@ module BrocadeVRouter
 
     def to_a
       return @paths.flatten if !base_path || base_path.empty?
-      @paths.flatten.map { |p| "#{base_path}/#{p}" }
+      @paths.flatten.map { |p| [base_path, p].join(SEPARATOR) }
     end
 
     private
@@ -46,25 +47,24 @@ module BrocadeVRouter
       value_is_path = @paths.pop if @paths.last == value
       @paths << "#{path}/#{value_is_path ? value : to_path(value)}" if exec
 
-      if value.is_a?(Array)
-        value.map { |v| "#{path}/#{v}" }
-      else
-        path = "#{path}/#{value_is_path ? value : to_path(value)}" if value
-        block_given? ? PathBuilder.new(@context, path, &blk).to_a : path
-      end
+      return value.map { |v| [path, v].join(SEPARATOR) } if value.is_a?(Array)
+
+      path = [path, value_is_path ? value : to_path(value)].join(SEPARATOR) if value
+      block_given? ? PathBuilder.new(@context, path, &blk).to_a : path
     end
 
     def to_path(value)
-      val = value.is_a?(Hash) ? hash_to_ary(value) : value
-      Array(val).flatten.map { |e| URI.escape e.to_s }.join SEPARATOR
+      (value.is_a?(Hash) ? hash_to_ary(value) : escape(value)).join(SEPARATOR)
+    end
+
+    def escape(value)
+      Array(value).map { |v| URI.escape(v.to_s.gsub(*WHTSP_TRANSFORM)) }
     end
 
     def hash_to_ary(hash)
-      hash.reduce([]) do |m, (k, v)|
-        m << k.to_s.gsub(*SNAKE_TRANSFORM)
-        m << v
+      hash.map do |k, v|
+        respond_to?(k, true) ? send(k, v) && @paths.pop : generate_paths!(k, to_path(v))
       end
     end
-
   end
 end

data/lib/brocade_vrouter/version.rb

@@ -1,3 +1,3 @@
 module BrocadeVRouter
-  VERSION = '0.3.1'.freeze
+  VERSION = '0.4.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brocade_vrouter
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Konstantin Kosmatov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-20 00:00:00.000000000 Z
+date: 2017-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday