skull_island 1.2.10 → 1.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc28c229371cd2d9f0cfef962e87ac95f27da4bd38d4a1990d2ba43ff0b9c275
-  data.tar.gz: 2d61dbedf12cca6c6d05c4b587a842dd0251d04182db207b14767f6b1aa34f1d
+  metadata.gz: 9041d8426e20bd746ce9efe08b5b16a30e6b3ce4f176246c207e45e450321262
+  data.tar.gz: a31475d45dc6cf1716bd8512fd0e1e7014dfa63c080f0197ae533bdfbcdc9ef5
 SHA512:
-  metadata.gz: 100978336f6bbb9b8c7ef129c84ce98cf32139564e44818024ba4026118bbd5e75895a03e1ecd66bea299ef7bc0d9d3f7c424340d1676850e11b6af44bba5a1d
-  data.tar.gz: f1b508505ac2dbbfaab2e1091cc4c59f9b7be19337b44ee38de9132bc6ef05c3db5306563d0fe40c7350e3bf3041c93316759f51cacb470812e5163d8c35204b
+  metadata.gz: 9907185af7eb04498fe9cc1ea2842aee6694edf017be0f52c94fc4a6dfc4dd4562893da829b7a1c6e90ca5c620564e1ecbcd2ee0853ec7857c2bd77384c18b53
+  data.tar.gz: 8ba0a61980000f26c2a60408c8afd9eed717c1da3fd73ce29f70e8237fde403389f50be3f14c2fcbed0edd8d3674b07b4f36cd0e269729e78fd9ca4ab91d8bea

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    skull_island (1.2.10)
+    skull_island (1.2.11)
       deepsort (~> 0.4)
       erubi (~> 1.8)
       json (~> 2.1)
@@ -27,7 +27,7 @@ GEM
     docile (1.3.2)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    erubi (1.8.0)
+    erubi (1.9.0)
     ethon (0.12.0)
       ffi (>= 1.3.0)
     faraday (0.15.4)
@@ -61,8 +61,8 @@ GEM
     net-http-persistent (2.9.4)
     net-http-pipeline (1.0.1)
     netrc (0.11.0)
-    parallel (1.17.0)
-    parser (2.6.4.0)
+    parallel (1.18.0)
+    parser (2.6.5.0)
       ast (~> 2.4.0)
     pusher-client (0.6.2)
       json
@@ -74,20 +74,20 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.2)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.4)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.0)
+      rspec-support (~> 3.9.0)
+    rspec-expectations (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.1)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.2)
-    rubocop (0.74.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.0)
+    rubocop (0.75.1)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.6)
@@ -95,7 +95,7 @@ GEM
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.7)
     ruby-progressbar (1.10.1)
-    simplecov (0.17.0)
+    simplecov (0.17.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
@@ -120,7 +120,7 @@ GEM
     unf_ext (0.0.7.6)
     unicode-display_width (1.6.0)
     websocket (1.2.8)
-    will_paginate (3.1.8)
+    will_paginate (3.2.1)
     yard (0.9.20)
 
 PLATFORMS

data/lib/skull_island/helpers/resource.rb

@@ -15,17 +15,29 @@ module SkullIsland
       end
 
       # rubocop:disable Style/GuardClause
+      # rubocop:disable Security/Eval
       def delayed_set(property, data, key)
-        # rubocop:disable Security/Eval
         if data[key]
-          value = data[key].is_a?(String) ? eval(Erubi::Engine.new(data[key]).src) : data[key]
+          value = recursive_erubi(data[key])
           send(
             "#{property}=".to_sym,
             value.is_a?(String) && value.start_with?('{"') ? eval(value) : value
           )
         end
-        # rubocop:enable Security/Eval
       end
+
+      def recursive_erubi(data)
+        if data.is_a?(String)
+          eval(Erubi::Engine.new(data).src)
+        elsif data.is_a?(Array)
+          data.map { |item| recursive_erubi(item) }
+        elsif data.is_a?(Hash)
+          data.map { |k, v| [k, recursive_erubi(v)] }.to_h
+        else
+          data
+        end
+      end
+      # rubocop:enable Security/Eval
       # rubocop:enable Style/GuardClause
 
       def digest

data/lib/skull_island/resources/plugin.rb

@@ -31,7 +31,7 @@ module SkullIsland
           resource.name = resource_data['name']
           resource.enabled = resource_data['enabled']
           resource.run_on = resource_data['run_on'] if resource_data['run_on']
-          resource.config = resource_data['config'].deep_sort if resource_data['config']
+          resource.delayed_set(:config, resource_data, 'config') if resource_data['config']
           resource.tags = resource_data['tags'] if resource_data['tags']
           resource.project = project if project
           resource.import_time = (time || Time.now.utc.to_i) if project

data/lib/skull_island/resources/route.rb

@@ -39,11 +39,11 @@ module SkullIsland
           resource.methods = rdata['methods'] if rdata['methods']
           resource.paths = rdata['paths'] if rdata['paths']
           resource.protocols = rdata['protocols'] if rdata['protocols']
-          resource.hosts = rdata['hosts'] if rdata['hosts']
+          resource.delayed_set(:hosts, rdata, 'hosts') if rdata['hosts']
           resource.regex_priority = rdata['regex_priority'] if rdata['regex_priority']
           resource.strip_path = rdata['strip_path'] unless rdata['strip_path'].nil?
           resource.preserve_host = rdata['preserve_host'] unless rdata['preserve_host'].nil?
-          resource.snis = rdata['snis'] if rdata['snis']
+          resource.delayed_set(:snis, rdata, 'snis') if rdata['snis']
           resource.tags = rdata['tags'] if rdata['tags']
           resource.project = project if project
           resource.import_time = (time || Time.now.utc.to_i) if project

data/lib/skull_island/rspec/fake_api_client.rb

@@ -3,13 +3,7 @@
 module SkullIsland
   module RSpec
     # A Fake API Client for RSpec testing
-    class FakeAPIClient
-      attr_reader :server, :base_uri
-      attr_accessor :username, :password
-
-      include Validations::APIClient
-      include Helpers::APIClient
-
+    class FakeAPIClient < APIClientBase
       def initialize(opts = {})
         # validations
         validate_opts(opts)
@@ -22,39 +16,12 @@ module SkullIsland
         @configured = true
       end
 
-      def hash(data)
-        if data
-          Digest::MD5.hexdigest(data.sort.to_s)
-        else
-          ''
-        end
-      end
-
       def response_for(type, uri, data: nil, response: {})
-        @responses ||= {}
-        @responses[type.to_s] ||= {}
-        key = data ? uri.to_s + hash(data) : uri.to_s
-        @responses[type.to_s][key] = response
-      end
-
-      def get(uri, _data = nil)
-        @responses ||= {}
-        @responses.dig('get', uri.to_s)
-      end
-
-      def post(uri, data = nil)
-        @responses ||= {}
-        @responses.dig('post', uri.to_s + hash(data))
-      end
-
-      def patch(uri, data)
-        @responses ||= {}
-        @responses.dig('patch', uri.to_s + hash(data))
+        connection.response_for(type, uri, data: data, response: response)
       end
 
-      def put(uri, data)
-        @responses ||= {}
-        @responses.dig('put', uri.to_s + hash(data))
+      def connection
+        @connection ||= FakeRestClient.new
       end
     end
   end

data/lib/skull_island/rspec/fake_client/request.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module SkullIsland
+  module RSpec
+    module FakeClient
+      # A Fake Rest Client Request for RSpec testing
+      class Request
+        attr_reader :uri
+
+        def initialize(rest_client, uri)
+          @rest_client = rest_client
+          @uri = uri
+        end
+
+        def hash(data)
+          @rest_client.hash(JSON.parse(data))
+        end
+
+        def responses
+          @rest_client.responses
+        end
+
+        def get(_data = nil, _opts = nil)
+          responses.dig('get', uri.to_s)
+        end
+
+        def post(data = nil, _opts = nil)
+          responses.dig('post', uri.to_s + hash(data))
+        end
+
+        def patch(data, _opts = nil)
+          responses.dig('patch', uri.to_s + hash(data))
+        end
+
+        def put(data, _opts = nil)
+          responses.dig('put', uri.to_s + hash(data))
+        end
+      end
+    end
+  end
+end

data/lib/skull_island/rspec/fake_rest_client.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module SkullIsland
+  module RSpec
+    # A Fake Rest Client for RSpec testing
+    class FakeRestClient
+      attr_reader :responses
+
+      def initialize
+        @responses = {}
+      end
+
+      def hash(data)
+        if data
+          Digest::MD5.hexdigest(data.sort.to_s)
+        else
+          ''
+        end
+      end
+
+      def response_for(type, uri, data: nil, response: {})
+        @responses[type.to_s] ||= {}
+        key = data ? uri.to_s + hash(data) : uri.to_s
+        @responses[type.to_s][key] = JSON.dump(response)
+      end
+
+      def [](uri)
+        FakeClient::Request.new(self, uri)
+      end
+    end
+  end
+end

data/lib/skull_island/rspec.rb

@@ -1,3 +1,5 @@
 # frozen_string_literal: true
 
+require 'skull_island/rspec/fake_client/request'
+require 'skull_island/rspec/fake_rest_client'
 require 'skull_island/rspec/fake_api_client'

data/lib/skull_island/version.rb

@@ -4,6 +4,6 @@ module SkullIsland
   VERSION = [
     1, # Major
     2, # Minor
-    10 # Patch
+    11 # Patch
   ].join('.')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skull_island
 version: !ruby/object:Gem::Version
-  version: 1.2.10
+  version: 1.2.11
 platform: ruby
 authors:
 - Jonathan Gnagy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-12 00:00:00.000000000 Z
+date: 2019-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deepsort
@@ -277,6 +277,8 @@ files:
 - lib/skull_island/resources/upstream_target.rb
 - lib/skull_island/rspec.rb
 - lib/skull_island/rspec/fake_api_client.rb
+- lib/skull_island/rspec/fake_client/request.rb
+- lib/skull_island/rspec/fake_rest_client.rb
 - lib/skull_island/simple_api_client.rb
 - lib/skull_island/validations/api_client.rb
 - lib/skull_island/validations/resource.rb