vericred 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae610f28b156fd1c08054c0797f69b7aaec226af
-  data.tar.gz: baaaffe27dc229dcbc68706318871580231609e3
+  metadata.gz: 33dc91cd863234fdc18029ae075c592013916e44
+  data.tar.gz: a2d1989b06607f9bfb26d587a1985db654022734
 SHA512:
-  metadata.gz: 27d553dde5b5ddf8a364e694baf21bdbca69c4300df72f4746eed5e011340a4a7aecc72edd8cc222c78f18607dd9d35543bf3c878c721378847fb9d12b904da0
-  data.tar.gz: f103bc7e1b19bdf694f8b8b38795bfdd99d7906ffe379a6808039ef745921713bd40639c75373fed62d56c14dd4a7193750c7ff5f3ebf5bcf219a47090768d6c
+  metadata.gz: fee62b0ece4317956b7d54cfa9745bf3a8cb0e5a4217f898360921dc386f679bae4d6900728ef96f9c6b359264b5af5b3e091acfe36a56019b65c452c84effb1
+  data.tar.gz: 34611b966590b139577978efbc6693b45c3d69441483430ac83d04efed1065cc580ec1c134c342f310e568d3f5eb3e97e7fd164a8b426213a8dbbf93a9444a7a

data/lib/vericred/api_resource.rb

@@ -53,16 +53,14 @@ module Vericred
       (data[root_name.pluralize] || []).map { |row| new(row, data) }
     end
 
-    def initialize(attributes, full_data = {})
-      parse_relationships(attributes, full_data)
-      @data = OpenStruct.new(attributes)
+    def initialize(attrs, full_data = {})
+      parse_relationships(attrs, full_data)
+      @data = OpenStruct.new(attrs)
     end
 
     private
 
-    def self.make_request(verb, uri, *args)
-      logger.info { "#{verb.to_s.upcase} #{uri} with #{args}"}
-      response = connection.send(verb, "#{BASE_URL}#{uri}", *args)
+    def self.handle_response(response)
       case response.status
       when 200..299 then JSON.parse(response.content)
       when 401 then fail Vericred::UnauthenticatedError, response
@@ -73,26 +71,41 @@ module Vericred
       end
     end
 
+    def self.make_request(verb, uri, *args)
+      logger.info { "#{verb.to_s.upcase} #{uri} with #{args}"}
+      response = nil
+      ActiveSupport::Notifications
+        .instrument "vericred.http_request", opts: [verb, uri, *args] do
+          response = connection.send(verb, "#{BASE_URL}#{uri}", *args)
+        end
+      handle_response(response)
+    end
+
     def method_missing(m, *args, &block)
       return @data.send(m, *args, &block) if @data.respond_to?(m)
       super
     end
 
-    def parse_relationships(attributes, full_data)
+    def parse_plural_relationship(relationship, attrs, full_data)
+      attrs[relationship.root_name] =
+        full_data[relationship.root_name]
+          .select { |row| attrs[relationship.foreign_key].include?(row['id'])}
+          .map { |row| OpenStruct.new(row) }
+    end
+
+    def parse_singular_relationship(relationship, attrs, full_data)
+      record = full_data[relationship.root_name]
+                 .find { |row| row['id'] == attrs[relationship.foreign_key] }
+      attrs[relationship.root_name.singularize] =
+        record ? OpenStruct.new(record) : nil
+    end
+
+    def parse_relationships(attrs, full_data)
       relationships.values.map(&:values).flatten.each do |relationship|
         next if full_data[relationship.root_name].blank?
-        if relationship.singular?
-          record = full_data[relationship.root_name].find do |row|
-                    row['id'] == attributes[relationship.foreign_key]
-                   end
-          attributes[relationship.root_name.singularize] =
-            record ? OpenStruct.new(record) : nil
-        else
-          attributes[relationship.root_name] =
-            full_data[relationship.root_name]
-              .select { |row| attributes[relationship.foreign_key].include?(row['id'])}
-              .map { |row| OpenStruct.new(row) }
-        end
+        relationship.singular? ?
+          parse_singular_relationship(relationship, attrs, full_data) :
+          parse_plural_relationship(relationship, attrs, full_data)
       end
     end
   end

data/lib/vericred/version.rb

@@ -1,3 +1,3 @@
 module Vericred
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vericred
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Dan Langevin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-18 00:00:00.000000000 Z
+date: 2015-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport