pipekit 1.0.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6630a46d845c5cba3718d5205de34483f31ef26
-  data.tar.gz: d69d610fad989fde415d30eaf538d69af1edd646
+  metadata.gz: e34407109d67d8d9635733ffba1eccc11f6c6e32
+  data.tar.gz: 33ddaa1c5efbf60e1814db4c61dfd80cd39f4bbd
 SHA512:
-  metadata.gz: 311e5c001d7a53fe07935e0b39920a2b64d488aa68ae6f631ab718eff95e40ec82060c4f36ae156075a8943e52baf88f44d02314e837f26103ac9ab197367302
-  data.tar.gz: 378b45ecce2fd74a6e704f2adbdbb0f3f656b8e04e67d713359475849a51a16ac20f48184ae1d59603f47bf81860a78d5b26a3dbcc2e11527d72b2fa88560743
+  metadata.gz: d5e5629813863251130adf800fe0502651123b5ca3f387459e603f87612e3e95d79352a9ecf290057378b15a7d12b27b82a8ab2f710eb66caf109cdc57cb57e0
+  data.tar.gz: f0b7531452f1bccbb2c9d3f50862c572451c7a976cee387de3969a7eaeb254a36f53af32eb9d1d251baca151cf4ba918f1309a3569f64e6de7ca102035cc2444

data/lib/pipekit.rb

@@ -7,6 +7,7 @@ require "pipekit/response"
 require "pipekit/repository"
 require "pipekit/field_repository"
 require "pipekit/person"
+require "pipekit/organization"
 require "pipekit/deal"
 require "pipekit/person_field"
 require "pipekit/deal_field"

data/lib/pipekit/config.rb

@@ -46,7 +46,8 @@ module Pipekit
       #     # => "value_not_there"
       def field_value(resource, field, value)
         custom_field_values(resource, field)
-          .fetch(value, value)
+          .reduce({}) { |result, (k,v)| result.tap { |result| result[k.to_s] = v } }
+          .fetch(value.to_s, value)
       end
 
       # Finds the Pipedrive field value ID from the config if one exists for that

data/lib/pipekit/organization.rb

@@ -0,0 +1,5 @@
+module Pipekit
+  class Organization
+    include Repository
+  end
+end

data/lib/pipekit/request.rb

@@ -35,14 +35,9 @@ module Pipekit
     # This also uses the "request_all_pages" config option when set to do
     # multiple requests, getting around Pipedrive's pagination
     def search_by_field(field:, value:)
-      query = {field_type: "#{resource}Field",
-               field_key: Config.field_id(resource, field),
-               return_item_ids: true,
-               term: Config.field_value_id(resource, field, value),
-               exact_match: 1
-      }
+      query = search_by_field_query(field, value)
 
-      get_request("/searchResults/field", query).response(resource)
+      get_request("/searchResults/field", query).response
     end
 
     # Public: Pipedrive GET API call - does a GET request to the Pipedrive API
@@ -69,18 +64,16 @@ module Pipekit
       response_from self.class.post(uri, options(body: data))
     end
 
-    private
-
     attr_reader :resource
 
     def _get(uri, query, result)
-      return result.response(resource) unless result.fetch_next_request?
+      return result.response unless result.fetch_next_request?
       _get(uri, query, result + get_request(uri, query, result.next_start))
     end
 
     def get_request(uri, query, start = 0)
       response = self.class.get(uri, options(query: {limit: pagination_limit, start: start}.merge(query)))
-      Result.new(response)
+      Result.new(resource, response)
     end
 
     def response_from(response_data)
@@ -113,8 +106,8 @@ module Pipekit
     # meaning you don't have to worry about the custom IDs
     def parse_body(body)
       body.reduce({}) do |result, (field, value)|
-        field = Config.field_id(resource, field)
         value = Config.field_value_id(resource, field, value)
+        field = Config.field_id(resource, field)
         result.tap { |result| result[field] = value }
       end
     end
@@ -123,5 +116,15 @@ module Pipekit
       Config.fetch(:pagination_limit, DEFAULT_PAGINATION_LIMIT)
     end
 
+    def search_by_field_query(field = nil, value = nil)
+      {
+        field_type: "#{resource}Field",
+        field_key: Config.field_id(resource, field),
+        return_item_ids: true,
+        term: Config.field_value_id(resource, field, value),
+        exact_match: 1
+      }
+    end
+
   end
 end

data/lib/pipekit/result.rb

@@ -2,19 +2,20 @@
 module Pipekit
   class Result
 
-    def initialize(response_data)
+    def initialize(resource, response_data)
       @response_data = response_data
+      @resource = resource
       raise UnsuccessfulRequestError.new(response_data) unless success?
     end
 
-    def response(resource)
+    def response
       raise ResourceNotFoundError.new(response_data) unless resource_found?
       return Response.new(resource, response_body) unless response_body.is_a? Array
       response_body.map { |data| Response.new(resource, data) }
     end
 
     def +(other)
-      self.class.new(other.merged_response(response_body))
+      self.class.new(resource, other.merged_response(response_body))
     end
 
     def fetch_next_request?
@@ -26,7 +27,7 @@ module Pipekit
     end
 
     def self.response(resource, response_data)
-      new(response_data).response(resource)
+      new(resource, response_data).response
     end
 
     protected
@@ -39,7 +40,7 @@ module Pipekit
 
     private
 
-    attr_reader :response_data
+    attr_reader :response_data, :resource
 
     def pagination_data
       response_data

data/lib/pipekit/version.rb

@@ -1,3 +1,3 @@
 module Pipekit
-  VERSION = "1.0.2"
+  VERSION = "1.2.0"
 end

data/pipekit.gemspec

@@ -29,6 +29,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "httparty"
+  spec.add_dependency "rack"
 
   spec.add_development_dependency "bundler", "~> 1.12"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pipekit
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.2.0
 platform: ruby
 authors:
 - jafrog
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-06 00:00:00.000000000 Z
+date: 2016-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -27,6 +27,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -123,6 +137,7 @@ files:
 - lib/pipekit/deal_field.rb
 - lib/pipekit/field_repository.rb
 - lib/pipekit/note.rb
+- lib/pipekit/organization.rb
 - lib/pipekit/person.rb
 - lib/pipekit/person_field.rb
 - lib/pipekit/repository.rb
@@ -152,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Pipedrive API client for Ruby.