kong_schema 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce66ed2926b783ba19d2eee0e5e85d2606ead664
-  data.tar.gz: f040ed071ff55f64c1ea86906403b3f093c4e4b6
+  metadata.gz: 8ccf080d9311fc62088bf690a8d86af06fae4a97
+  data.tar.gz: fcba834c6e444a18c805e08487504a42186abe67
 SHA512:
-  metadata.gz: b2ff0756f8345d767ac68f28a57b07b05336252360906cf901386f247dbd12320fe8e501b2c736a45051e0a8878a969ba3ae315e9bd945f9aa9d158fb25c4975
-  data.tar.gz: 75e4876cd89fcb9ab5dd1538427f79d0a52f5670ae4bb4429d95b60859be221b6140b4d6be98bc469d750bfa9abc9a75904fb2973c458b9d0172567e5256eee5
+  metadata.gz: 932e679e8c807a03e75e73ebdfe510a4374442ba6fcec7b43c7312532ef38d189c14005ad26cdbc7f2222faf12f75e21d53543ab3700e125f67dbeb8bd7270e3
+  data.tar.gz: dc34b51e197f958ab0708cd5a1bc6be8607fa7769780324a5f7b4e7f6ce5724da45593cfcd3e645d185e6f379a9ee2dcc52135f8e7c38bf5f04dc46c46790704

data/.gitignore

@@ -1,3 +1,4 @@
 /.bundle
 /coverage
-/bin
+/bin
+/*.gem

data/CHANGELOG.md

@@ -1,11 +1,23 @@
-# 1.0.1
+## 1.1.1
+
+- Fixed an issue assigning the "methods" attribute of Kong::Api objects
+- Empty array values (like "hosts" and "methods") will no longer display
+  as having changed if their API value is "null"
+- CLI command `kong_schema up` will now print an error message if the required
+  argument was not passed
+
+## 1.1.0
+
+- Added a CLI binary: `kong_schema`
+
+## 1.0.1
 
 - Fixed a bug where an empty array of "hosts", "uris", or "methods" in "apis"
   would raise an exception.
 - An error will now be raised if `admin_host` is not defined in config (and a
   connection to Kong admin can not be established)
 
-# 1.0.0
+## 1.0.0
 
 Initial release with support for the following Kong objects:
 

data/lib/kong_schema/adapter.rb

@@ -14,15 +14,15 @@ module KongSchema
       @model.create(params)
     end
 
-    def changed?(record, directive)
-      directive.keys.any? do |key|
-        !record.send(key).eql?(directive[key])
+    def changed?(current_attributes, next_attributes)
+      next_attributes.keys.any? do |key|
+        !current_attributes[key].eql?(next_attributes[key])
       end
     end
 
     def update(record, params)
       params.keys.each do |key|
-        record.send "#{key}=", params[key]
+        record.attributes[key] = params[key]
       end
 
       record.save

data/lib/kong_schema/cli.rb

@@ -38,6 +38,8 @@ module KongSchema
         })
 
         c.action do |global_options, options, args|
+          help_now! "Missing path to .yml or .json config file" if args.first.nil?
+
           up(filepath: args.first, options: options)
         end
       end

data/lib/kong_schema/functional.rb

@@ -0,0 +1,7 @@
+module KongSchema
+  module Functional
+    def blank?(object)
+      object.nil? || object.empty?
+    end
+  end
+end

data/lib/kong_schema/resource/api.rb

@@ -2,11 +2,13 @@
 
 require 'kong'
 require_relative '../adapter'
+require_relative '../functional'
 
 module KongSchema
   module Resource
     module Api
       extend self
+      extend Functional
 
       def identify(record)
         case record
@@ -26,7 +28,20 @@ module KongSchema
       end
 
       def changed?(record, attributes)
-        Adapter.for(Kong::Api).changed?(record, attributes)
+        current = record.attributes.keys.reduce({}) do |map, key|
+          value = record.attributes[key]
+
+          case key
+          when 'hosts', 'methods', 'uris'
+            map[key] = blank?(value) ? nil : Array(value)
+          else
+            map[key] = value
+          end
+
+          map
+        end
+
+        Adapter.for(Kong::Api).changed?(current, attributes)
       end
 
       def update(record, partial_attributes)
@@ -43,7 +58,7 @@ module KongSchema
       def serialize_outbound(attributes)
         attributes.keys.reduce({}) do |map, key|
           case key
-          when 'hosts', 'uris', 'methods'
+          when 'hosts', 'methods', 'uris'
             map[key] = Array(attributes[key]).join(',')
           else
             map[key] = attributes[key]

data/lib/kong_schema/resource/upstream.rb

@@ -27,7 +27,7 @@ module KongSchema
       end
 
       def changed?(record, attributes)
-        Adapter.for(Kong::Upstream).changed?(record, attributes)
+        Adapter.for(Kong::Upstream).changed?(record.attributes, attributes)
       end
 
       def update(record, partial_attributes)

data/lib/kong_schema/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module KongSchema
-  VERSION = "1.1.0"
+  VERSION = "1.1.1".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kong_schema
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Ahmad Amireh
@@ -161,6 +161,7 @@ files:
 - lib/kong_schema/adapter.rb
 - lib/kong_schema/cli.rb
 - lib/kong_schema/client.rb
+- lib/kong_schema/functional.rb
 - lib/kong_schema/reporter.rb
 - lib/kong_schema/resource.rb
 - lib/kong_schema/resource/api.rb