kong 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16715f84192ef0b86892c41bd5a64233f14bd1f9
-  data.tar.gz: 140668cf943e425c3ddc7d68bd8b498eba655805
+  metadata.gz: 2eb96feeae50f935d3faf48b18bffde840ad3ca0
+  data.tar.gz: bc4e0aa0c3125d227135ff82db8168a154b773cf
 SHA512:
-  metadata.gz: 071e6c144db8b6b556e03c49eb5f1e5747d289284164cacafd9802ebcde59f4d66927eb1460877a6fb54d851beb47a0411d3d5f7c68d580da3e693c40a6402b5
-  data.tar.gz: 0a0bb5ee564595b160910c2d325fe4ae0c67d67bf65dd5c6be60804b2874047060ccc69f23badae923f5e24ac940dc56643335f401607242fd66abcd3d66c97a
+  metadata.gz: 20914d65262adc1f8592ed02eb689aeba49b5b9b3aca132bf7cd4b9e5bdd1899e0556b1463fea60d3e7ad8dcab16ea8456876086ab94a54d8cf80952c92ff5c0
+  data.tar.gz: 5be4a32b52ec29a31a5fcda2d40784881fc9f0ac009bb68eeaf132e1831062822eb76e6554b1d1317326e800f2e8ff25fe2b90770ef6806d1993808daf87d1d2

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 0.2.0 (2017-04-20)
+- Add Server information support ([#14](https://github.com/kontena/kong-client-ruby/pull/14))
+- Add optional attributes to Api
+ ([#13](https://github.com/kontena/kong-client-ruby/pull/13))
+- Fix Plugin#create and #update to save config properly
+([#12](https://github.com/kontena/kong-client-ruby/pull/12))
+
 # 0.1.2 (2017-01-12)
 - Add JWT support ([#2](https://github.com/kontena/kong-client-ruby/pull/2))
 - Allow to properly set a custom api_url ([#4](https://github.com/kontena/kong-client-ruby/pull/4))

data/README.md

@@ -4,6 +4,7 @@
 
 [![Build Status](https://travis-ci.org/kontena/kong-client-ruby.svg?branch=master)](https://travis-ci.org/kontena/kong-client-ruby)
 [![Gem Version](https://badge.fury.io/rb/kong.svg)](https://badge.fury.io/rb/kong)
+
 ## Installation
 Add this line to your application's Gemfile:
 
@@ -27,7 +28,7 @@ require 'kong'
 Kong::Client.api_url = 'http://your-kong-url:8001'
 ```
 
-### Desing
+### Design
 
 Kong client follows a design of resoures as Plain Old Ruby objects(tm). For examples to create a new Consumer resource you can do it like this:
 
@@ -203,6 +204,25 @@ token.delete
 token.oauth_app
 ```
 
+#### JWT
+
+```ruby
+
+jwt = Kong::JWT.new({  
+  consumer_id: 'a3dX2dh2-1adb-40a5-c042-63b19dbx83hF4',
+  key: 'a36c3049b36249a3c9f8891cb127243c',
+  secret: 'e71829c351aa4242c2719cbfbe671c09'
+})
+
+jwt.create
+jwt.update
+jwt.save # requests create_or_update action
+jwt.delete
+
+consumer = Kong::Consumer.find_by_username('testuser')
+consumer.jwts
+```
+
 #### ACL
 
 ```ruby
@@ -221,6 +241,16 @@ consumer = Kong::Consumer.find_by_username('testuser')
 consumer.acls
 ```
 
+#### Server Information
+
+```ruby
+Kong::Server.info
+Kong::Server.version
+Kong::Server.status
+Kong::Server.cluster
+Kong::Server.remove_node(node_name)
+```
+
 ## Contributing
 
 1. Fork it ( https://github.com/kontena/kong-client-ruby/fork )

data/lib/kong.rb

@@ -13,3 +13,4 @@ require_relative 'kong/basic_auth'
 require_relative 'kong/key_auth'
 require_relative 'kong/jwt'
 require_relative 'kong/acl'
+require_relative 'kong/server'

data/lib/kong/api.rb

@@ -2,7 +2,12 @@ module Kong
   class Api
     include Base
 
-    ATTRIBUTE_NAMES = %w(id name request_host request_path strip_request_path preserve_host upstream_url).freeze
+    ATTRIBUTE_NAMES = %w(
+      id name request_host request_path strip_request_path
+      hosts uris strip_uri preserve_host upstream_url retries
+      upstream_connect_timeout upstream_send_timeout upstream_read_timeout
+      https_only http_if_terminated
+    ).freeze
     API_END_POINT = '/apis/'.freeze
 
     ##

data/lib/kong/plugin.rb

@@ -5,5 +5,27 @@ module Kong
 
     ATTRIBUTE_NAMES = %w(id api_id name config enabled consumer_id).freeze
     API_END_POINT = '/plugins/'.freeze
+
+    # Create resource
+    def create
+      if attributes['config']
+        attributes['config'].each do |key, value|
+          attributes["config.#{key}"] = value
+        end
+        attributes.delete('config')
+      end
+      super
+    end
+
+    # update resource
+    def update
+      if attributes['config']
+        attributes['config'].each do |key, value|
+          attributes["config.#{key}"] = value
+        end
+        attributes.delete('config')
+      end
+      super
+    end
   end
 end

data/lib/kong/server.rb

@@ -0,0 +1,23 @@
+module Kong
+  class Server
+    def self.version
+      self.info['version'] rescue nil
+    end
+
+    def self.info
+      Client.instance.get('/')
+    end
+
+    def self.status
+      Client.instance.get('/status')
+    end
+
+    def self.cluster
+      Client.instance.get('/cluster')
+    end
+
+    def self.remove_node(name)
+      Client.instance.delete("/cluster/nodes/#{name}")
+    end
+  end
+end

data/lib/kong/version.rb

@@ -1,3 +1,3 @@
 module Kong
-  VERSION = '0.1.2'.freeze
+  VERSION = '0.2.0'.freeze
 end

data/spec/kong/api_spec.rb

@@ -2,7 +2,12 @@ require_relative "../spec_helper"
 
 describe Kong::Api do
   let(:valid_attribute_names) do
-    %w(id name request_host request_path strip_request_path preserve_host upstream_url)
+    %w(
+      id name request_host request_path strip_request_path
+      hosts uris strip_uri preserve_host upstream_url retries
+      upstream_connect_timeout upstream_send_timeout upstream_read_timeout
+      https_only http_if_terminated
+    )
   end
 
   describe 'ATTRIBUTE_NAMES' do

data/spec/kong/plugin_spec.rb

@@ -23,4 +23,24 @@ describe Kong::Plugin do
       expect(subject.api_end_point).to eq('/apis/:api_id/plugins/')
     end
   end
+
+  describe '#create' do
+    it 'transforms config keys to config.key format' do
+      headers = { 'Content-Type' => 'application/x-www-form-urlencoded' }
+      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)
+      subject = described_class.new({ api_id: ':api_id', config: { 'anonymous' => '12345' } })
+      subject.create
+    end
+  end
+
+  describe '#update' do
+    it 'transforms config keys to config.key format' do
+      headers = { 'Content-Type' => 'application/x-www-form-urlencoded' }
+      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)
+      subject = described_class.new({ api_id: ':api_id', config: { 'anonymous' => '12345' } })
+      subject.update
+    end
+  end
 end

data/spec/kong/server_spec.rb

@@ -0,0 +1,39 @@
+require_relative "../spec_helper"
+
+describe Kong::Server do
+  describe '.info' do
+    it 'makes GET / request' do
+      expect(Kong::Client.instance).to receive(:get).with('/')
+      described_class.info
+    end
+  end
+
+  describe '.version' do
+    it 'returns version information' do
+      allow(Kong::Client.instance).to receive(:get).with('/')
+        .and_return({ 'version' => '0.10.0' })
+      expect(described_class.version).to eq('0.10.0')
+    end
+  end
+
+  describe '.status' do
+    it 'makes GET /status request' do
+      expect(Kong::Client.instance).to receive(:get).with('/status')
+      described_class.status
+    end
+  end
+
+  describe '.cluster' do
+    it 'makes GET /cluster request' do
+      expect(Kong::Client.instance).to receive(:get).with('/cluster')
+      described_class.cluster
+    end
+  end
+
+  describe '.remove_node' do
+    it 'makes DELETE /cluster/nodes/:name request' do
+      expect(Kong::Client.instance).to receive(:delete).with('/cluster/nodes/:name')
+      described_class.remove_node(':name')
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kong
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Lauri Nevala
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-12 00:00:00.000000000 Z
+date: 2017-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -84,6 +84,7 @@ files:
 - lib/kong/oauth2_token.rb
 - lib/kong/oauth_app.rb
 - lib/kong/plugin.rb
+- lib/kong/server.rb
 - lib/kong/version.rb
 - spec/kong/acl_spec.rb
 - spec/kong/api_spec.rb
@@ -95,6 +96,7 @@ files:
 - spec/kong/oauth2_token_spec.rb
 - spec/kong/oauth_app_spec.rb
 - spec/kong/plugin_spec.rb
+- spec/kong/server_spec.rb
 - spec/spec_helper.rb
 - tasks/rspec.rake
 homepage: https://github.com/kontena/kong-client-ruby
@@ -117,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: A Ruby client for the Kong API
@@ -132,4 +134,5 @@ test_files:
 - spec/kong/oauth2_token_spec.rb
 - spec/kong/oauth_app_spec.rb
 - spec/kong/plugin_spec.rb
+- spec/kong/server_spec.rb
 - spec/spec_helper.rb