active_campaign 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71cc0d05d22a72685dd8fe8a97d36277fad291f3
-  data.tar.gz: a13ed393bbc6d29ca068f54998aff7d4bb5ab103
+  metadata.gz: cb45bc281708e6be460d3e33379cd2c74c26d737
+  data.tar.gz: 12b0835d724fd3e093e1ffd0cf78db46cbc03a8f
 SHA512:
-  metadata.gz: 85f9631f348f3b8b976c15e17526c784846b89a49ac241f15d7a6977b46fc6be5033f86e45c5c43fd6be8fd008a989346c7fdfb743401382d9ebfc2bb3b78f52
-  data.tar.gz: eec62992ab70374e3ae5db4d6c5d1ec759efbbe51ba96f8726042c8c4fbfdf56342f2ae5b15262a38d333ea65835c583b73e13e70973e25b9470e0b50504a465
+  metadata.gz: e5f30055cd574ede7437056b3dde2cca94043a45a06033e13af3f478e91bd42e47629be65bc62d298c4ceb42eaec1837f985e423e9a1f095bf2e4edc0f018517
+  data.tar.gz: 77b9c9106c0fd0bba33cb1eb626a293cf131d5d54d82be44d42a2ad7bcde54316222cc6aa48bb29c8cae4899852ed342a0960bd8bf504889f09eab4ac7e470e6

data/lib/active_campaign/connection.rb

@@ -1,6 +1,7 @@
 require 'faraday_middleware'
 require 'faraday/response/raise_active_campaign_error'
 require 'faraday/response/body_logger'
+require 'faraday/response/json_normalizer'
 
 module ActiveCampaign
 
@@ -32,6 +33,7 @@ module ActiveCampaign
         conn.use FaradayMiddleware::FollowRedirects
         if api_output == 'json'
           conn.response :mashify, content_type: /\bjson$/
+          conn.response :json_normalizer
           conn.response :json, content_type: /\bjson$/
         end
         faraday_config_block.call(conn) if faraday_config_block

data/lib/active_campaign/version.rb

@@ -1,3 +1,3 @@
 module ActiveCampaign
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/active_campaign.rb

@@ -24,14 +24,7 @@ module ActiveCampaign
     # Delegate to ActiveCampaign::Client.new
     def method_missing(method, *args, &block)
       return super unless new.respond_to?(method)
-      response = new.send(method, *args, &block)
-      results = response.reject{|k,v| %w(result_code result_message result_output).include?(k) }
-      response.results = results.values
-      results.keys.each do |key|
-        response.delete(key)
-      end
-
-      response
+      new.send(method, *args, &block)
     end
 
     def respond_to?(method, include_private=false)

data/lib/faraday/response/json_normalizer.rb

@@ -0,0 +1,39 @@
+require 'faraday'
+require 'faraday/response'
+
+module Faraday
+  class Response::JsonNormalizer < Response::Middleware
+    def initialize(app, logger = nil)
+      super(app)
+    end
+
+    def call(environment)
+      @app.call(environment).on_complete do |env|
+        if env[:body].is_a?(Hash)
+          env[:body] = normalize(env[:body])
+        end
+      end
+    end
+
+    private
+
+      def normalize(response)
+        keys, values = keys_values(response)
+        response[:results] = values
+        keys.each do |key|
+          response.delete(key)
+        end
+        response
+      end
+
+      def keys_values(response)
+        results = results(response)
+        [results.keys, results.values]
+      end
+
+      def results(response)
+        response.reject{|k,v| %w(result_code result_message result_output).include?(k) }
+      end
+  end
+end
+Faraday.register_middleware :response, json_normalizer: lambda { Faraday::Response::JsonNormalizer }

data/spec/client/lists_spec.rb

@@ -40,9 +40,9 @@ describe ActiveCampaign::Client::Lists do
       # stub_get("list_view", name: "Swedish Players").
       #   to_return json_response("list_view.json")
 
-      list = @client.list_list "ids" => 'all'
+      lists = @client.list_list "ids" => 'all'
       binding.pry
-      expect(list["0"].name).to eq "Swedish Players"
+      expect(lists.results[0].name).to eq "Swedish Players"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_campaign
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Mikael Henriksson
@@ -123,6 +123,7 @@ files:
 - lib/active_campaign/request.rb
 - lib/active_campaign/version.rb
 - lib/faraday/response/body_logger.rb
+- lib/faraday/response/json_normalizer.rb
 - lib/faraday/response/raise_active_campaign_error.rb
 - spec/active_campaign_spec.rb
 - spec/client/contacts_spec.rb