bukelatta 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b50de0c0c67f10bc5082ca6067ff3eff797513c1
-  data.tar.gz: c70c29abe958f30b1e82efd15ccd5b6243567b23
+  metadata.gz: 9fb8bcac53c63acb5f5491d39b28c1d93ee10eea
+  data.tar.gz: '091d4d01503edddbe8e08f614ab9da2ceec072cd'
 SHA512:
-  metadata.gz: c6a47769bdd9834b842c52e597138dcfabfe35bc1cbbb77cfc32f745fff0d82e166aef5bb5971bc4d1a8d0d22c0e75e023eff2b5dc5932bc5e2c6578f0f2646f
-  data.tar.gz: e0b64fa05ad223e5178960a943f5da930b6e46bb8dfba7e7f7c72d55408c1cf88eb6047257acf4d77c77dcc4bb0654190a65e319d094ac8e58c14b49d30d4cc8
+  metadata.gz: 708cd0f32a905314076fe5480b4d2fb6d34890e8f60c6614758d0a1248731b4cae49486ab4921504857ac07465fa4625c52e2953b01967d3ce162b3ad8458c9a
+  data.tar.gz: 50b3b219fb39501e2df9850cd6f79283f7026ab8088f3bfbafd948a4f96a7b85e37abbf03f5944cb9df7694f2b747cd068a4940ca33bbf990329a1542f5e86d1

data/lib/bukelatta/dsl/context.rb

@@ -8,6 +8,7 @@ class Bukelatta::DSL::Context
   end
 
   def result
+    expand_leaf_array!
     @result.sort_array!
   end
 
@@ -52,4 +53,31 @@ class Bukelatta::DSL::Context
 
     @result[name] = yield
   end
+
+  def expand_leaf_array!
+    @result = expand_leaf_array(@result)
+  end
+
+  def expand_leaf_array(obj)
+    case obj
+    when Array
+      if obj[0].instance_of?(Array) || obj[0].instance_of?(Hash)
+        return obj.map do |o|
+          expand_leaf_array(o)
+        end
+      end
+      # Leaf
+      if obj.length == 1
+        return obj[0]
+      end
+      return obj
+    when Hash
+      h = {}
+      obj.each do |k, v|
+        h[k] = expand_leaf_array(v)
+      end
+      return h
+    end
+    return obj
+  end
 end

data/lib/bukelatta/version.rb

@@ -1,3 +1,3 @@
 module Bukelatta
-  VERSION = '0.1.7'
+  VERSION = '0.1.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bukelatta
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - winebarrel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-08 00:00:00.000000000 Z
+date: 2017-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -189,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Bukelatta is a tool to manage S3 Bucket Policy.