bridge_api 0.0.14 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4461f7ecab786b3b2ca3b1a769d0878306e29cb2
-  data.tar.gz: 165d25273ca8cebdcf14ec7c60331462d8b815e4
+  metadata.gz: 32715294cbf0a4012da38a0664923ac8a5f9560e
+  data.tar.gz: 30dc2aacd810e8387cf3d1ad5354680219772970
 SHA512:
-  metadata.gz: 0254b6676cac32f5ff64cc1c211a7059e5f91ddecac4d5cba3c4fee08585648e61257b633e5fbcf9964e7fd2decd71070122965650936561491c870ff6aaf984
-  data.tar.gz: a0668e249527635573b8b7b4afd6d17f082c1d28f52325c4c2775ee19db151ba650ba714b50764c82616d165ad58d173811c979a82d03523841409a01145b792
+  metadata.gz: 450207f9fc4039e3740540a3f1076fa3a3eb5ff4b1688aa66470e2df6b9d1154dd9af2d8231f14e778b3a830c3e3cc7104ae79b78f644de77c8d0053b813ee9d
+  data.tar.gz: 3fcba14431b03b2ec2102d9d59c35741d93c564bc0c90841bb8eab56c59a8a877c2965abdd4295b4a64e07710af245053eb31110098eb7bd0d06fce961a676d0

data/lib/bridge_api/api_array.rb

@@ -6,18 +6,29 @@ module BridgeAPI
     @next_page = nil
     @prev_page = nil
 
-    META_FIELDS = %w(meta linked).freeze
-
     attr_reader :status, :headers, :members
 
-    def self.process_response(response, api_client)
-      ApiArray.new(response, api_client)
+    def self.process_response(response, api_client, result_mapping)
+      ApiArray.new(response, api_client, result_mapping)
     end
 
-    def initialize(response, api_client)
+    def initialize(response, api_client, result_mapping)
+      @meta_fields = %w(meta linked)
       @api_client = api_client
       @linked = {}
       @meta = {}
+      @extra_meta_fields = []
+      pattern = /.*(\/api\/.*)/
+      path = response.env.url
+      matches = pattern.match(path.to_s)
+      mapping = nil
+      if matches
+        mapping_exists = result_mapping.key?(matches[1])
+        mapping = result_mapping[matches[1]] if mapping_exists
+      end
+      unless mapping.nil?
+        @extra_meta_fields.concat(mapping[:meta])
+      end
       case response.status
         when *((200..206).to_a + [302])
           apply_response_metadata(response)
@@ -101,14 +112,11 @@ module BridgeAPI
 
     def get_response_content(response)
       return [] unless response.body.is_a?(Hash)
-      content = response.body.reject{|k, v| META_FIELDS.include?(k)}
-      if content.length > 1
-        content
-      elsif content.length == 1
-        content.values[0]
-      else
-        []
+      content = response.body.reject{|k, v| @meta_fields.include?(k) || @extra_meta_fields.include?(k)}
+      if content.length > 0
+        return content.values[0]
       end
+      []
     end
 
     def apply_response_metadata(response, concat = true)
@@ -133,6 +141,9 @@ module BridgeAPI
     def init_meta(response)
       if response.body.is_a?(Hash) && response.body.key?('meta')
         @meta = @meta.merge(response.body['meta']){|key,oldval,newval| [*oldval].to_a + [*newval].to_a }
+        @extra_meta_fields.each do |field|
+          @meta[field] = response.body[field]
+        end
       end
     end
 

data/lib/bridge_api/client.rb

@@ -7,7 +7,6 @@ require 'footrest/follow_redirects'
 require 'footrest/parse_json'
 require 'base64'
 
-
 module BridgeAPI
   class Client < Footrest::Client
 
@@ -26,6 +25,7 @@ module BridgeAPI
     CUSTOM_FIELD_PATH = "/custom_fields"
     API_VERSION = 1
     API_PATH = '/api'
+    RESULT_MAPPING = {}
 
     require 'bridge_api/api_array'
 
@@ -36,7 +36,7 @@ module BridgeAPI
 
     # Override Footrest request for ApiArray support
     def request(method, &block)
-      ApiArray::process_response(connection.send(method, &block), self)
+      ApiArray::process_response(connection.send(method, &block), self, RESULT_MAPPING)
     end
 
     def set_connection(config)
@@ -68,4 +68,3 @@ module BridgeAPI
     end
   end
 end
-

data/lib/bridge_api/client/manager.rb

@@ -7,9 +7,14 @@ module BridgeAPI
       end
 
       def get_manager_direct_reports(manager_id, params = {})
-        get("#{API_PATH}#{AUTHOR_PATH}#{MANAGER_PATH}/#{manager_id}/direct_reports", params)
+        path = "#{API_PATH}#{AUTHOR_PATH}#{MANAGER_PATH}/#{manager_id}/direct_reports"
+        RESULT_MAPPING[path] = {
+          primary: 'direct_reports',
+          meta: ['manager_id', 'direct_reports_count']
+        }
+        get(path, params)
       end
 
     end
   end
-end
+end

data/lib/bridge_api/version.rb

@@ -1,3 +1,3 @@
 module BridgeAPI
-  VERSION = '0.0.14' unless defined?(BridgeAPI::VERSION)
+  VERSION = '0.1.14' unless defined?(BridgeAPI::VERSION)
 end

data/spec/bridge_api/client/manager_spec.rb

@@ -13,9 +13,10 @@ describe BridgeAPI::Client::User do
 
   it 'should get all the people who report to a manager' do
     response = @client.get_manager_direct_reports(17)
-    expect(response['direct_reports'].count).to(eq(2))
-    expect(response['direct_reports'].first['id']).to(eq("3"))
+    expect(response.members.count).to(eq(2))
+    expect(response.members.first['id']).to(eq("3"))
+    expect(response.meta['direct_reports_count']).to(eq(2))
+    expect(response.meta['manager_id']).to(eq("17"))
   end
 
 end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bridge_api
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.1.14
 platform: ruby
 authors:
 - Jay Shaffer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-18 00:00:00.000000000 Z
+date: 2017-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -250,7 +250,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Bridge API
@@ -284,3 +284,4 @@ test_files:
 - spec/fixtures/users.json
 - spec/support/fake_bridge.rb
 - spec/test_helper.rb
+has_rdoc: