kelbim 0.3.1.beta → 0.3.1.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d964cff74b7a7661fe57e564bbb2b60e830aabca
-  data.tar.gz: 387fc568f51bedbeb3ba9db15f26aa42f0813b67
+  metadata.gz: 22165f5f97872d15363922b62b96e54f456df68e
+  data.tar.gz: 802e0593b150f7c251a21e9f6e39094c93fd4853
 SHA512:
-  metadata.gz: adefa6a423dd0bbfef4dce41e94d963ba5160034abe997d802574c8466c0338b5f379f1d8cf9d2b38d6bbe8e52c80e0d7f86fea05864137760544567e3402598
-  data.tar.gz: 1d3a869720b30d4b3f0e6702d46a6fa16286101d66d40932e6481d842ca9cd905b491adaf8cf76fc91301158a465fba75f73f4fb516fe88a5f555bc530cd082c
+  metadata.gz: 44286e575763ce0906581e16ce88c1432313dc5d135412ba7472fe67827ab192dd2efb28b75429464c0443fbb6d5e647787c5683e15dc5562dc03b960bc208e5
+  data.tar.gz: 95f1231e72915d67a10272446005a1585101f24fed8868af854774d9e6fb91bc67da3560ec3fefa1d44733b529a540adc477b776e6b0a850e74bef77ae7554ed

data/bin/kelbim

@@ -162,7 +162,7 @@ begin
     end
 
     RSpec.configure do |config|
-      config.color_enabled = options[:color]
+      config.color = options[:color]
       config.output_stream = $stdout # formatterをセットする前に設定…
       config.formatter = Kelbim::RSpecFormatter
     end

data/lib/kelbim/policy-types.rb

@@ -11,9 +11,13 @@ module Kelbim
 
     EXPANDERS = {
       :ssl_negotiation => proc {|attrs|
-        attrs.select {|name, value|
-          value[0] =~ /\Atrue\Z/i
-        }.map {|n, v| n }
+        if attrs.key?('Reference-Security-Policy')
+          { reference: attrs['Reference-Security-Policy'] }
+        else
+          attrs.select {|name, value|
+            value[0] =~ /\Atrue\Z/i
+          }.map {|n, v| n }
+        end
       },
       :app_cookie_stickiness => proc {|attrs| h = {}; attrs.map {|k, v| h[k] = [v].flatten[0] }; h },
       :lb_cookie_stickiness => proc {|attrs| h = {}; attrs.map {|k, v| h[k] = [v].flatten[0] }; h },
@@ -21,13 +25,20 @@ module Kelbim
 
     UNEXPANDERS = {
       :ssl_negotiation => proc {|attrs|
-        unexpanded = {}
+        if attrs.kind_of?(Hash)
+          if attrs.key?(:reference)
+            reference = attrs[:reference].is_a?(Array) ? attrs[:reference] : [attrs[:reference]]
+            { 'Reference-Security-Policy' => reference }
+          end
+        else
+          unexpanded = {}
 
-        attrs.each do |name|
-          unexpanded[name] = ['true']
-        end
+          attrs.each do |name|
+            unexpanded[name] = ['true']
+          end
 
-        unexpanded
+          unexpanded
+        end
       },
       :app_cookie_stickiness => proc {|attrs| h = {}; attrs.map {|k, v| h[k] = [v].flatten }; h },
       :lb_cookie_stickiness => proc {|attrs| h = {}; attrs.map {|k, v| h[k] = [v].flatten }; h },

data/lib/kelbim/version.rb

@@ -1,5 +1,5 @@
 module Kelbim
-  VERSION = "0.3.1.beta"
+  VERSION = "0.3.1.beta2"
 end
 
 Version = Kelbim::VERSION

data/lib/kelbim/wrapper/policy.rb

@@ -26,6 +26,10 @@ module Kelbim
                     @policy.name == dsl_name_or_attrs
                   else
                     aws_attrs = PolicyTypes.expand(@policy.type, @policy.attributes)
+                    aws_attrs.each do |name, value|
+                      value = value[0] if value.length < 2
+                      aws_attrs[name] = value
+                    end
                     aws_attrs.sort == dsl_name_or_attrs.sort
                   end
                 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kelbim
 version: !ruby/object:Gem::Version
-  version: 0.3.1.beta
+  version: 0.3.1.beta2
 platform: ruby
 authors:
 - winebarrel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-01 00:00:00.000000000 Z
+date: 2017-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-v1