pipe_fitter 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7fb6064d720bceb50a5f67593a34d8ab88e0265
-  data.tar.gz: 42ad10d0a56aa467273b792ba3e96d0940a2e6a6
+  metadata.gz: 6ca34c72ead67585ab3933c20339c6024dba555d
+  data.tar.gz: 434c953698fb018b6babfbdcde83e1f4d770ab2c
 SHA512:
-  metadata.gz: 80191b605a9a17ae25820fbf1a0ab4baa5908e009d8fb96e11b9ad8a1e5bb85d9873e221cd01ebde4ec4b5d912b918df106b1eb9db6fbe5f0b37e7a13c329633
-  data.tar.gz: a4a95adea95583151321ef7eef80f773f0052573f25a7c66abb06e6b1574c07ada735d9b50243876cd9f8a1374b0ee08e5dfd6d97d028f9e7a99a60279b71e3d
+  metadata.gz: a4ffd2b3e959cda33c02760755be11f05460c144a8700915f20a4f04fac44d74b825b29e25fbd03f4646fcb24333ca8afeb8b5e24640f09a3dac30af44b114c3
+  data.tar.gz: 0fe0ec48c13e2bcc260d9dbe7cae396a265e8f7f555fedb669c112874f48f6f2ec1d50939aca8a7496473374eac4f500e16cd36cb54f5f4654a4aad974f5026e

data/lib/pipe_fitter/pipeline.rb

@@ -98,14 +98,40 @@ module PipeFitter
         end
         h
       end
+
+      private_class_method def self.update_hash(base, key, value)
+        if base.key?(key)
+          base[key] = [base[key]] unless base[key].is_a?(Array)
+          base[key] << value
+          base[key].sort!
+        else
+          base[key] = value
+        end
+        base
+      end
+
+      def split_object(obj, skip_keys)
+        res = []
+        obj.each do |k, v|
+          next if skip_keys.include?(k)
+          (v.is_a?(Array) ? v : [v]).each do |vv|
+            if vv.is_a?(Hash) && vv.key?(:ref)
+              res << { key: k, ref_value: vv[:ref] }
+            else
+              res << { key: k, string_value: vv }
+            end
+          end
+        end
+        res
+      end
     end
 
     class PipelineObjects < PipelineBaseObjects
       def self.create(api_res)
-        objs = api_res.map(&:to_h).sort_by { |obj| obj[:id] }.map do |obj|
+        objs = (api_res || []).map(&:to_h).sort_by { |obj| obj[:id] }.map do |obj|
           base = { id: obj[:id], name: obj[:name] }
           obj[:fields].sort_by { |f| f[:key] }.inject(base) do |a, e|
-            a.update(e[:key].to_sym => (e[:string_value] || { ref: e[:ref_value] } ))
+            update_hash(a, e[:key].to_sym, e[:string_value] || { ref: e[:ref_value] })
           end
         end
         new(objs)
@@ -113,26 +139,17 @@ module PipeFitter
 
       def to_api_opts
         @objs.map do |obj|
-          base = { id: obj[:id], name: obj[:name], fields: [] }
-          obj.each do |k, v|
-            next if k == :id || k == :name
-            if v.is_a?(Hash) && v.key?(:ref)
-              base[:fields] << { key: k, ref_value: v[:ref] }
-            else
-              base[:fields] << { key: k, string_value: v }
-            end
-          end
-          base
+          { id: obj[:id], name: obj[:name], fields: split_object(obj, %i(id name)) }
         end
       end
     end
 
     class ParameterObjects < PipelineBaseObjects
       def self.create(api_res)
-        objs = api_res.map(&:to_h).sort_by { |obj| obj[:id] }.map do |obj|
+        objs = (api_res || []).map(&:to_h).sort_by { |obj| obj[:id] }.map do |obj|
           base = { id: obj[:id] }
           obj[:attributes].sort_by { |a| a[:key] }.inject(base) do |a, e|
-            a.update(e[:key].to_sym => e[:string_value])
+            update_hash(a, e[:key].to_sym, e[:string_value])
           end
         end
         new(objs)
@@ -140,12 +157,7 @@ module PipeFitter
 
       def to_api_opts
         @objs.map do |obj|
-          base = { id: obj[:id], attributes: [] }
-          obj.each do |k, v|
-            next if k == :id
-            base[:attributes] << { key: k, string_value: v }
-          end
-          base
+          { id: obj[:id], attributes: split_object(obj, %i(id)) }
         end
       end
     end
@@ -174,8 +186,8 @@ module PipeFitter
           name: api_res[:name],
           description: api_res[:description],
         }
-        objs[:tags] = api_res[:tags].map { |e| { e[:key].to_sym => e[:value] } }
-        api_res[:fields].inject(objs) do |a, e|
+        objs[:tags] = (api_res[:tags] || []).map { |e| { e[:key].to_sym => e[:value] } }
+        (api_res[:fields] || []).inject(objs) do |a, e|
           a.update(e[:key].to_sym => (e[:string_value] || { ref: e[:ref_value] } ))
         end
         new(objs)

data/lib/pipe_fitter/version.rb

@@ -1,3 +1,3 @@
 module PipeFitter
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pipe_fitter
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - masa21kik
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-12 00:00:00.000000000 Z
+date: 2016-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk