arbor_peakflow_ruby 1.1.1 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95d78faf3486e6b9402aade09389e5ba43dae490
-  data.tar.gz: 8b7dee7062ac1e31ab864e5051dd12e8f617d976
+  metadata.gz: a542c1be96b9dac049ae6efa4ed8b33fbf8f9a21
+  data.tar.gz: 6c84cd1841381d0398b5a39ac99b9a6c0ab38c20
 SHA512:
-  metadata.gz: e496314be863cb2ff20966765a87eec616971520a426da6ca3bf077c607e186eb7189a1abddb22df172dd2ce51869770a18d1ec81182b877633b2f074e1de735
-  data.tar.gz: fb981ad00ddd924c1e75315cffdc933bfb7b8fa72aaa3957c0ca4575be663e30c5ac0b381fd7a1d2aa51f66766d72d846b793275e33b499fb2783e989c37d41c
+  metadata.gz: cf88c2e684241804d2fc4a9adced818de54703e997558056933d9d305e4929fdaa2ac61e51b6402e92ef3a474712d68bab3c2f96d5060e44aeba1f2f1c852551
+  data.tar.gz: d9e3e3a017f2d9a8bccdeaf067073676df8e6cb2c8b85822bdc9f147b0cf6202d5fff97590d56264f974052faf442e3f9c3c81634c2d93effd6888a1f666952e

data/.travis.yml

@@ -4,6 +4,7 @@ rvm:
   - 2.1.0
   - 2.1.5
   - 2.2.0
+  - 2.2.1
 
 before_install:
   - gem update --system

data/Gemfile

@@ -5,5 +5,5 @@ gemspec
 gem 'rake', group: :test, require: nil
 gem 'minitest', group: :test, require: nil
 gem 'bundler', group: :test, require: nil
-gem "codeclimate-test-reporter", group: :test, require: nil
-gem 'faraday'
+gem 'codeclimate-test-reporter', group: :test, require: nil
+gem 'hurley'

data/lib/arbor_peakflow_ruby/actions/managed_object.rb

@@ -10,11 +10,13 @@ module Arbor
       #
       #    response = client.managed_object 'dorms'
       def managed_object(filter = nil)
-        response = @conn.get do |req|
-          req.url 'arborws/admin/managed_object'
-          req.params['api_key'] = @api_key
-          req.params['filter'] = filter unless filter.nil?
-        end
+        response = @client.get('arborws/admin/managed_object',
+                               {}.tap do |hash|
+                                 hash[:api_key] = @api_key
+                                 hash[:filter] = filter unless filter.nil?
+                               end)
+
+        response.body = JSON.parse(response.body)
 
         response
       end

data/lib/arbor_peakflow_ruby/actions/mitigations.rb

@@ -12,8 +12,8 @@ module Arbor
       #
       #    response = client.mitigations 'auto-mitigation', 10, 'json'
       def mitigations(filter = nil, limit = nil, format = 'json')
-        url_filter_limit_format_request('arborws/mitigations/status', filter,
-                                        limit, format)
+        url_filter_limit_format_request('arborws/mitigations/status',
+                                        filter, limit, format)
       end
     end
   end

data/lib/arbor_peakflow_ruby/actions/reports.rb

@@ -32,11 +32,8 @@ module Arbor
       #
       #    response = client.queue_report 'example_report'
       def queue_report(name)
-        response = @conn.get do |req|
-          req.url 'arborws/reports/queue'
-          req.params['api_key'] = @api_key
-          req.params['name'] = name
-        end
+        response = @client.get('arborws/reports/queue', api_key: @api_key,
+                                                        name: name)
 
         response
       end
@@ -78,13 +75,9 @@ module Arbor
       #
       #    response = client.download_report 'myReport', 'last', 'PDF'
       def download_report(name, request_time, format)
-        response = @conn.get do |req|
-          req.url 'arborws/reports/configured'
-          req.params['api_key'] = @api_key
-          req.params['name'] = name
-          req.params['request_time'] = request_time
-          req.params['format'] = format
-        end
+        response = @client.get('arborws/reports/configured',
+                               api_key: @api_key, name: name,
+                               request_time: request_time, format: format)
 
         response
       end

data/lib/arbor_peakflow_ruby/actions/tms_ports.rb

@@ -8,10 +8,9 @@ module Arbor
       #
       #    response = client.tms_ports
       def tms_ports
-        response = @conn.get do |req|
-          req.url 'arborws/admin/tms_ports'
-          req.params['api_key'] = @api_key
-        end
+        response = @client.get('arborws/admin/tms_ports', api_key: @api_key)
+
+        response.body = JSON.parse(response.body)
 
         response
       end

data/lib/arbor_peakflow_ruby/actions/traffic.rb

@@ -22,12 +22,15 @@ module Arbor
       #    query = File.read('path/to/file.xml')
       #    response = client.traffic query
       def traffic(query, graph = nil)
-        response = @conn.get do |req|
-          req.url 'arborws/traffic'
-          req.params['api_key'] = @api_key
-          req.params['query'] = remove_returns_and_spaces(query)
-          req.params['graph'] = remove_returns_and_spaces(graph) unless graph.nil?
-        end
+        query = remove_returns_and_spaces(query) unless query.nil?
+        graph = remove_returns_and_spaces(graph) unless graph.nil?
+
+        response = @client.get('arborws/traffic',
+                               {}.tap do |hash|
+                                 hash[:api_key] = @api_key
+                                 hash[:query] =  query unless query.nil?
+                                 hash[:graph] = graph unless graph.nil?
+                               end)
 
         response
       end

data/lib/arbor_peakflow_ruby/client.rb

@@ -7,13 +7,13 @@ require 'arbor_peakflow_ruby/actions/routers'
 require 'arbor_peakflow_ruby/actions/tms_appliance'
 require 'arbor_peakflow_ruby/actions/tms_ports'
 require 'arbor_peakflow_ruby/actions/traffic'
-require 'faraday'
+require 'hurley'
 require 'json'
 
 module Arbor
   module Peakflow
     # == Client
-    # The Arbor Peakflow client in charge of using Faraday to communicate with
+    # The Arbor Peakflow client in charge of using Hurley to communicate with
     # the Arbor devices.
     #
     # == Parameters
@@ -41,8 +41,22 @@ module Arbor
       include Arbor::Peakflow::TMS_Ports
       include Arbor::Peakflow::Traffic
 
-      attr_reader :hosts, :api_key, :conn
+      attr_accessor :client
+      attr_reader :hosts, :api_key
       def initialize(arguments = {})
+        @hosts = arguments[:hosts] || \
+                 arguments[:host]  || \
+                 arguments[:url]   || \
+                 arguments[:urls]  || \
+                 ENV.fetch('PEAKFLOW_URL')
+
+        @api_key ||= arguments[:api_key]
+
+        @client = Hurley::Client.new @hosts
+        ssl(arguments)
+      end
+
+      def ssl(arguments)
         @ssl_verify = arguments[:ssl_verify] || \
                       false
 
@@ -52,44 +66,32 @@ module Arbor
         @ssl_version = arguments[:ssl_version]  || \
                        'SSLv23'
 
-        @hosts = arguments[:hosts] || \
-                 arguments[:host]  || \
-                 arguments[:url]   || \
-                 arguments[:urls]  || \
-                 ENV.fetch('PEAKFLOW_URL')
-
-        @api_key ||= arguments[:api_key]
-
-        @conn = Faraday.new(@hosts, ssl:
-          { verify: @ssl_verify,
-            version: @ssl_version,
-            ca_path: @ca_path
-          }) do |faraday|
-          faraday.request :url_encoded
-          # faraday.response :logger
-          faraday.adapter Faraday.default_adapter
-        end
+        @client.ssl_options.skip_verification = !@ssl_verify
+        @client.ssl_options.ca_path = @ca_path
+        @client.ssl_options.version = @ssl_version
       end
 
       def url_filter_limit_format_request(url, filter, limit, format)
-        response = @conn.get do |req|
-          req.url url
-          req.params['api_key'] = @api_key
-          req.params['format'] = format
-          req.params['limit'] = limit unless limit.nil?
-          req.params['filter'] = filter unless filter.nil?
-        end
+        response = @client.get(url,
+                               {}.tap do |hash|
+                                 hash[:api_key] = @api_key
+                                 hash[:format] = format unless format.nil?
+                                 hash[:limit] = limit unless limit.nil?
+                                 hash[:filter] = filter unless filter.nil?
+                               end)
+
+        response.body = JSON.parse(response.body) if format == 'json'
 
         response
       end
 
       def url_action_filter_request(url, action, filter)
-        response = @conn.get do |req|
-          req.url url
-          req.params['api_key'] = @api_key
-          req.params['action'] = action
-          req.params['filter'] = filter unless filter.nil?
-        end
+        response = @client.get(url,
+                               {}.tap do |hash|
+                                 hash[:api_key] = @api_key
+                                 hash[:action] = action unless action.nil?
+                                 hash[:filter] = filter unless filter.nil?
+                               end)
 
         response
       end

data/lib/arbor_peakflow_ruby/version.rb

@@ -1,5 +1,5 @@
 module Arbor
   module Peakflow
-    VERSION = '1.1.1'
+    VERSION = '1.2.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arbor_peakflow_ruby
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.1
 platform: ruby
 authors:
 - Kevin Kirsche