kong 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 524f6b4db2c1d3501fcfcadf6a0a5751e42f7bab
-  data.tar.gz: edb1f1b4a4fd7eff35bd28d0b00b5aeec711b38c
+  metadata.gz: 128c39dcd5396b44c6ea3489766feb2f330ffd61
+  data.tar.gz: 06ea2dfe3e8a7f768274d72dad955fd255dd47b8
 SHA512:
-  metadata.gz: 58f8933d583373c3816625f1402a43750c9299a2264a441b790cc67bb03537dc2cd0898967d9652a4f02514af6ad66c161f6808bfdd6602ccb7642bce397854d
-  data.tar.gz: fa65eef2cc8ffd8a6ec72e9c7febd99954c97c7a4f0a194483a910fabac5a49be41384c380ba3e2fc2146da995fd813c5f78f7ba10710a7fb25b7f6d96ea3b80
+  metadata.gz: e6e526da140002b3b139eccd3fba81a9477432d584c15b9b67ab8390948aa73f9d800a452d886f4fa34c6fe6bc65dd59ff847a523aa1ef10fca3c6d2a7561857
+  data.tar.gz: 15d3f6f50314fdd9b240b656369c68706b252ea35c68ebc32c250e8a9cd706af5bc077d4f27efd5f984f4dcb11e83fc311e01b55bb8b08578b3d5d731184a757

data/.rubocop.yml

@@ -1,24 +1,24 @@
 AllCops:
   DisabledByDefault: true
 
-Style/IndentationConsistency:
+Layout/IndentationConsistency:
   Enabled: true
   AutoCorrect: true
 
-Style/CommentIndentation:
+Layout/CommentIndentation:
   Enabled: true
   AutoCorrect: true
 
 Style/NestedModifier:
   Enabled: true
 
-Style/IndentArray:
+Layout/IndentArray:
   Enabled: true
 
-Style/AlignArray:
+Layout/AlignArray:
   Enabled: true
 
-Style/AlignHash:
+Layout/AlignHash:
   Enabled: true
 
 #Lint/EmptyInterpolation:
@@ -141,7 +141,7 @@ Metrics/MethodLength:
   Max: 40
   Severity: refactor
 
-Style/Tab:
+Layout/Tab:
   StyleGuide: https://github.com/backupify/backupify_styleguides/blob/master/RubyStyleguide.md#tabs
   Enabled: true
 
@@ -152,7 +152,7 @@ Metrics/ParameterLists:
   Max: 5
   CountKeywordArgs: true
 
-Style/IndentationWidth:
+Layout/IndentationWidth:
   StyleGuide: https://github.com/backupify/backupify_styleguides/blob/master/RubyStyleguide.md#tabs
   Enabled: true
 
@@ -161,41 +161,41 @@ Metrics/LineLength:
   Max: 120
   Enabled: false
 
-Style/TrailingWhitespace:
+Layout/TrailingWhitespace:
   StyleGuide: https://github.com/backupify/backupify_styleguides/blob/master/RubyStyleguide.md#no-trailing-whitespace
   Enabled: true
 
-Style/TrailingBlankLines:
+Layout/TrailingBlankLines:
   StyleGuide: https://github.com/backupify/backupify_styleguides/blob/master/RubyStyleguide.md#end-file-newline
   EnforcedStyle: final_newline
 
-Style/SpaceAroundOperators:
+Layout/SpaceAroundOperators:
   StyleGuide: https://github.com/backupify/backupify_styleguides/blob/master/RubyStyleguide.md#spaces-around-operators
   Enabled: true
   AllowForAlignment: true
 
-Style/SpaceAroundEqualsInParameterDefault:
+Layout/SpaceAroundEqualsInParameterDefault:
   StyleGuide: https://github.com/backupify/backupify_styleguides/blob/master/RubyStyleguide.md#spaces-around-operators
   EnforcedStyle: space
 
-Style/SpaceAfterComma:
+Layout/SpaceAfterComma:
   StyleGuide: https://github.com/backupify/backupify_styleguides/blob/master/RubyStyleguide.md#spaces-around-operators
   Enabled: true
 
-Style/SpaceAfterColon:
+Layout/SpaceAfterColon:
   StyleGuide: https://github.com/backupify/backupify_styleguides/blob/master/RubyStyleguide.md#spaces-around-operators
   Enabled: true
 
-Style/SpaceAfterSemicolon:
+Layout/SpaceAfterSemicolon:
   StyleGuide: https://github.com/backupify/backupify_styleguides/blob/master/RubyStyleguide.md#spaces-around-operators
   Enabled: true
 
-Style/SpaceBeforeBlockBraces:
+Layout/SpaceBeforeBlockBraces:
   StyleGuide: https://github.com/backupify/backupify_styleguides/blob/master/RubyStyleguide.md#spaces-around-operators
   Enabled: true
   EnforcedStyle: space
 
-Style/SpaceInsideBlockBraces:
+Layout/SpaceInsideBlockBraces:
   StyleGuide: https://github.com/backupify/backupify_styleguides/blob/master/RubyStyleguide.md#spaces-around-operators
   Enabled: true
   EnforcedStyle: space
@@ -204,34 +204,34 @@ Style/SpaceInsideBlockBraces:
   # Space between { and |. Overrides EnforcedStyle if there is a conflict.
   SpaceBeforeBlockParameters: true
 
-Style/SpaceInsideHashLiteralBraces:
+Layout/SpaceInsideHashLiteralBraces:
   StyleGuide: https://github.com/backupify/backupify_styleguides/blob/master/RubyStyleguide.md#spaces-around-operators
   Enabled: true
   EnforcedStyle: space
   EnforcedStyleForEmptyBraces: no_space
 
-Style/SpaceInsideStringInterpolation:
+Layout/SpaceInsideStringInterpolation:
   StyleGuide: https://github.com/backupify/backupify_styleguides/blob/master/RubyStyleguide.md#spaces-around-operators
   Enabled: true
   EnforcedStyle: no_space
 
-Style/SpaceInsideParens:
+Layout/SpaceInsideParens:
   StyleGuide: https://github.com/backupify/backupify_styleguides/blob/master/RubyStyleguide.md#no-spaces-around-delimiters
   Enabled: true
 
-Style/SpaceInsideBrackets:
+Layout/SpaceInsideBrackets:
   StyleGuide: https://github.com/backupify/backupify_styleguides/blob/master/RubyStyleguide.md#no-spaces-around-delimiters
   Enabled: true
 
-Style/CaseIndentation:
+Layout/CaseIndentation:
   StyleGuide: https://github.com/backupify/backupify_styleguides/blob/master/RubyStyleguide.md#case-indentation
   Enabled: true
 
-Style/ElseAlignment:
+Layout/ElseAlignment:
   StyleGuide: https://github.com/backupify/backupify_styleguides/blob/master/RubyStyleguide.md#case-indentation
   Enabled: true
 
-Style/RescueEnsureAlignment:
+Layout/RescueEnsureAlignment:
   StyleGuide: https://github.com/backupify/backupify_styleguides/blob/master/RubyStyleguide.md#case-indentation
   Enabled: true
 
@@ -240,11 +240,11 @@ Lint/EndAlignment:
   Enabled: true
   AutoCorrect: true
 
-Style/SpaceAfterNot:
+Layout/SpaceAfterNot:
   StyleGuide: https://github.com/backupify/backupify_styleguides/blob/master/RubyStyleguide.md#no-space-after-not
   Enabled: true
 
-Style/EmptyLineBetweenDefs:
+Layout/EmptyLineBetweenDefs:
   StyleGuide: https://github.com/backupify/backupify_styleguides/blob/master/RubyStyleguide.md#lines-between-defs
   Enabled: true
   AllowAdjacentOneLineDefs: false
@@ -295,10 +295,6 @@ Style/RedundantReturn:
   StyleGuide: https://github.com/backupify/backupify_styleguides/blob/master/RubyStyleguide.md#avoid-return
   Enabled: true
 
-Style/SpaceAroundEqualsInParameterDefault:
-  StyleGuide: https://github.com/backupify/backupify_styleguides/blob/master/RubyStyleguide.md#space-around-param-default
-  Enabled: true
-
 Style/PerlBackrefs:
   StyleGuide: https://github.com/backupify/backupify_styleguides/blob/master/RubyStyleguide.md#no-perlisms
   Enabled: true
@@ -307,7 +303,7 @@ Style/SpecialGlobalVars:
   StyleGuide: https://github.com/backupify/backupify_styleguides/blob/master/RubyStyleguide.md#no-perlisms
   Enabled: true
 
-Style/SpaceAfterMethodName:
+Layout/SpaceAfterMethodName:
   StyleGuide: https://github.com/backupify/backupify_styleguides/blob/master/RubyStyleguide.md#no-space-after-method-name
   Enabled: true
 
@@ -325,7 +321,7 @@ Style/ClassVars:
   StyleGuide: https://github.com/backupify/backupify_styleguides/blob/master/RubyStyleguide.md#class-vars
   Enabled: true
 
-Style/AccessModifierIndentation:
+Layout/AccessModifierIndentation:
   StyleGuide: https://github.com/backupify/backupify_styleguides/blob/master/RubyStyleguide.md#access-modifier-indent
   Enabled: true
 

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 0.3.3 (2018-09-07)
+- Switch to application json content type ([#28](https://github.com/kontena/kong-client-ruby/pull/28))
+- Flatten nested plugin config items ([#27](https://github.com/kontena/kong-client-ruby/pull/27))
+
+# 0.3.2 (2018-02-05)
+- Remove Excon version dependency ([#25](https://github.com/kontena/kong-client-ruby/pull/25))
+
 # 0.3.1 (2017-10-02)
 - Use consumer id to retrieve auth keys and tokens ([#19](https://github.com/kontena/kong-client-ruby/pull/19))
 - Add methods to kong api base attributes ([#21](https://github.com/kontena/kong-client-ruby/pull/21))

data/Gemfile

@@ -1,8 +1,8 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in kontena-cli.gemspec
+# Specify your gem's dependencies in kong.gemspec
 gemspec
 group :development, :test do
   gem "rspec"
-  gem "rubocop"
+  gem "rubocop", "~> 0.49.0"
 end

data/README.md

@@ -89,9 +89,9 @@ Kong::Api.create(attributes)
 
 api = Kong::Api.new({
   name: 'Mockbin',
-  hosts: ['mockbin.com'],
+  hosts: ['example.com'],
   uris: ['/someservice'],
-  methods: ['GET']
+  methods: ['GET'],
   strip_uri: false,
   preserve_host: false,
   upstream_url: 'https://mockbin.com'

data/lib/kong/base.rb

@@ -83,7 +83,6 @@ module Kong
       Client.instance
     end
 
-
     # Get resource
     # @param [String] key
     def get(key = nil)
@@ -104,6 +103,10 @@ module Kong
       self.id.nil?
     end
 
+    def primary_key
+      self.new? ? self.name : self.id
+    end
+
     # Save resource to Kong
     def save
       create_or_update
@@ -111,8 +114,8 @@ module Kong
 
     # Create resource
     def create
-      headers = { 'Content-Type' => 'application/x-www-form-urlencoded' }
-      response = client.post(@api_end_point, nil, attributes, headers)
+      headers = { 'Content-Type' => 'application/json' }
+      response = client.post(@api_end_point, attributes, nil, headers)
       init_attributes(response)
       self
     end
@@ -121,15 +124,15 @@ module Kong
     # Data is sent to Kong in JSON format and HTTP PUT request is used
     def create_or_update
       headers = { 'Content-Type' => 'application/json' }
-      response = client.put("#{@api_end_point}", attributes, nil, headers)
+      response = client.put(@api_end_point+self.primary_key, attributes, nil, headers)
       init_attributes(response)
       self
     end
 
     # Update resource
     def update
-      headers = { 'Content-Type' => 'application/x-www-form-urlencoded' }
-      response = client.patch("#{@api_end_point}#{self.id}", nil, attributes, headers)
+      headers = { 'Content-Type' => 'application/json' }
+      response = client.patch("#{@api_end_point}#{self.id}", attributes, nil, headers)
       init_attributes(response)
       self
     end

data/lib/kong/client.rb

@@ -46,7 +46,6 @@ module Kong
       @api_url = url
     end
 
-
     # Get request
     #
     # @param [String] path
@@ -89,7 +88,7 @@ module Kong
       end
     end
 
-    # Put request
+    # Patch request
     #
     # @param [String] path
     # @param [Object] obj
@@ -113,7 +112,6 @@ module Kong
       end
     end
 
-
     # Put request
     #
     # @param [String] path

data/lib/kong/plugin.rb

@@ -1,3 +1,5 @@
+require_relative './util'
+
 module Kong
   class Plugin
     include Base
@@ -8,24 +10,22 @@ module Kong
 
     # Create resource
     def create
-      if attributes['config']
-        attributes['config'].each do |key, value|
-          attributes["config.#{key}"] = value
-        end
-        attributes.delete('config')
-      end
+      flatten_config
       super
     end
 
     # update resource
     def update
+      flatten_config
+      super
+    end
+
+    private
+
+    def flatten_config
       if attributes['config']
-        attributes['config'].each do |key, value|
-          attributes["config.#{key}"] = value
-        end
-        attributes.delete('config')
+        attributes.merge!(Util.flatten(attributes.delete('config'), 'config'))
       end
-      super
     end
   end
 end

data/lib/kong/util.rb

@@ -0,0 +1,16 @@
+module Kong
+  module Util
+    def self.flatten(cursor, parent_key = nil, memo = {})
+      memo.tap do
+        case cursor
+        when Hash
+          cursor.keys.each do |key|
+            flatten(cursor[key], [parent_key, key].compact.join('.'), memo)
+          end
+        else
+          memo["#{parent_key}"] = cursor
+        end
+      end
+    end
+  end
+end

data/lib/kong/version.rb

@@ -1,3 +1,3 @@
 module Kong
-  VERSION = '0.3.2'.freeze
+  VERSION = '0.3.3'.freeze
 end

data/lib/kong.rb

@@ -2,6 +2,8 @@ require 'kong/version'
 require_relative 'kong/base'
 require_relative 'kong/api'
 require_relative 'kong/belongs_to_api'
+require_relative 'kong/service'
+require_relative 'kong/route'
 require_relative 'kong/client'
 require_relative 'kong/consumer'
 require_relative 'kong/belongs_to_consumer'
@@ -16,3 +18,4 @@ require_relative 'kong/acl'
 require_relative 'kong/target'
 require_relative 'kong/upstream'
 require_relative 'kong/server'
+require_relative 'kong/util'

data/spec/kong/base_spec.rb

@@ -94,18 +94,18 @@ describe Kong::Base do
 
   describe '#create' do
     it 'creates POST /:resource_end_point/ request with resource attributes' do
-      headers = { 'Content-Type' => 'application/x-www-form-urlencoded' }
+      headers = { 'Content-Type' => 'application/json' }
       attributes = { 'name' => 'test object' }
-      expect(Kong::Client.instance).to receive(:post).with('/resources/', nil, attributes, headers)
+      expect(Kong::Client.instance).to receive(:post).with('/resources/', attributes, nil, headers)
         .and_return(attributes)
       subject.name = 'test object'
       subject.create
     end
 
     it 'returns resource instance' do
-      headers = { 'Content-Type' => 'application/x-www-form-urlencoded' }
+      headers = { 'Content-Type' => 'application/json' }
       attributes = { 'name' => 'test object' }
-      allow(Kong::Client.instance).to receive(:post).with('/resources/', nil, attributes, headers)
+      allow(Kong::Client.instance).to receive(:post).with('/resources/', attributes, nil, headers)
         .and_return(attributes.merge({ 'id' => '12345' }))
       subject.name = 'test object'
       expect(subject.create).to eq(subject)
@@ -134,19 +134,19 @@ describe Kong::Base do
 
     describe '#update' do
       it 'creates PATCH /:resource_end_point/:resource_id request with resource attributes' do
-        headers = { 'Content-Type' => 'application/x-www-form-urlencoded' }
+        headers = { 'Content-Type' => 'application/json' }
         subject.id = '12345'
         subject.name = 'test object'
-        expect(Kong::Client.instance).to receive(:patch).with('/resources/12345', nil, subject.attributes, headers)
+        expect(Kong::Client.instance).to receive(:patch).with('/resources/12345', subject.attributes, nil, headers)
           .and_return(subject.attributes)
         subject.update
       end
 
       it 'returns resource instance' do
-        headers = { 'Content-Type' => 'application/x-www-form-urlencoded' }
+        headers = { 'Content-Type' => 'application/json' }
         subject.id = '12345'
         subject.name = 'test object'
-        allow(Kong::Client.instance).to receive(:patch).with('/resources/12345', nil, subject.attributes, headers)
+        allow(Kong::Client.instance).to receive(:patch).with('/resources/12345', subject.attributes, nil, headers)
           .and_return(subject.attributes)
         expect(subject.update).to eq(subject)
       end

data/spec/kong/plugin_spec.rb

@@ -26,21 +26,37 @@ describe Kong::Plugin do
 
   describe '#create' do
     it 'transforms config keys to config.key format' do
-      headers = { 'Content-Type' => 'application/x-www-form-urlencoded' }
+      headers = { 'Content-Type' => 'application/json' }
       attributes = { 'api_id' => ':api_id', 'config.anonymous' => '12345' }
-      expect(Kong::Client.instance).to receive(:post).with('/apis/:api_id/plugins/', nil, attributes, headers).and_return(attributes)
+      expect(Kong::Client.instance).to receive(:post).with('/apis/:api_id/plugins/', attributes, nil, headers).and_return(attributes)
       subject = described_class.new({ api_id: ':api_id', config: { 'anonymous' => '12345' } })
       subject.create
     end
+
+    it 'transforms nested config keys to config.key format' do
+      headers = { 'Content-Type' => 'application/json' }
+      attributes = { 'api_id' => ':api_id', 'config.anonymous' => '12345', 'config.first.second' => '1' }
+      expect(Kong::Client.instance).to receive(:post).with('/apis/:api_id/plugins/', attributes, nil, headers).and_return(attributes)
+      subject = described_class.new({ api_id: ':api_id', config: { 'anonymous' => '12345', 'first' => { 'second' => '1' } } })
+      subject.create
+    end
   end
 
   describe '#update' do
     it 'transforms config keys to config.key format' do
-      headers = { 'Content-Type' => 'application/x-www-form-urlencoded' }
+      headers = { 'Content-Type' => 'application/json' }
       attributes = { 'api_id' => ':api_id', 'config.anonymous' => '12345' }
-      expect(Kong::Client.instance).to receive(:patch).with('/apis/:api_id/plugins/', nil, attributes, headers).and_return(attributes)
+      expect(Kong::Client.instance).to receive(:patch).with('/apis/:api_id/plugins/', attributes, nil, headers).and_return(attributes)
       subject = described_class.new({ api_id: ':api_id', config: { 'anonymous' => '12345' } })
       subject.update
     end
+
+    it 'transforms nested config keys to config.key format' do
+      headers = { 'Content-Type' => 'application/json' }
+      attributes = { 'api_id' => ':api_id', 'config.anonymous' => '12345', 'config.first.second' => '1' }
+      expect(Kong::Client.instance).to receive(:patch).with('/apis/:api_id/plugins/', attributes, nil, headers).and_return(attributes)
+      subject = described_class.new({ api_id: ':api_id', config: { 'anonymous' => '12345', 'first' => { 'second' => '1' } } })
+      subject.update
+    end
   end
 end

data/spec/kong/util_spec.rb

@@ -0,0 +1,29 @@
+require_relative "../spec_helper"
+
+describe Kong::Util do
+  describe '.flatten' do
+    subject { described_class.method(:flatten) }
+
+    it 'works' do
+      expect(subject[{
+        a: {
+          b: 1,
+          c: {
+            d: 3
+          }
+        },
+        b: 2
+      }]).to include({
+        "a.b" => 1,
+        "a.c.d" => 3,
+        "b" => 2,
+      })
+    end
+
+    it 'accepts a scope' do
+      expect(subject[{ a: "1" }, 'config']).to eq({
+        "config.a" => "1"
+      })
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kong
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Lauri Nevala
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-05 00:00:00.000000000 Z
+date: 2018-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -87,6 +87,7 @@ files:
 - lib/kong/server.rb
 - lib/kong/target.rb
 - lib/kong/upstream.rb
+- lib/kong/util.rb
 - lib/kong/version.rb
 - spec/kong/acl_spec.rb
 - spec/kong/api_spec.rb
@@ -101,6 +102,7 @@ files:
 - spec/kong/server_spec.rb
 - spec/kong/target_spec.rb
 - spec/kong/upstream_spec.rb
+- spec/kong/util_spec.rb
 - spec/spec_helper.rb
 - tasks/rspec.rake
 homepage: https://github.com/kontena/kong-client-ruby
@@ -123,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: A Ruby client for the Kong API
@@ -141,4 +143,5 @@ test_files:
 - spec/kong/server_spec.rb
 - spec/kong/target_spec.rb
 - spec/kong/upstream_spec.rb
+- spec/kong/util_spec.rb
 - spec/spec_helper.rb