pipekit 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a97ca3462a69b58e56337a81273147db6d6b81ca
-  data.tar.gz: a58a9d65ecd33575e907d124a69670692843e8e1
+  metadata.gz: 981bfd42ed2e6376d3c1be868c3bdf613cc9db3c
+  data.tar.gz: 19a904f8f395f64092e0eb7d53dbf927c2c6a225
 SHA512:
-  metadata.gz: 09e9a02a4d5021799ca0cf39a96b55d7c0b5a136c8f0427428037f395034ce203c575421fbacc36559198676fce62f3c3f24ed6b07b99cb8594ad4173d3b8f0b
-  data.tar.gz: 649b62d3e62ae41873880705282876663943b8e0ce38659482814fde8db3140ba8617bdf54a9905b2888679e0be71cdeb6cf7d05d0fc9862b361a32994f3b70b
+  metadata.gz: 34a620ac856281d038cb4f24feffd15be0d06b64f64eb7475e02161f9b80f8d794712d4f5778d020e928b96379b9c19cd634c0c18ecc0ee10fd131e29541c693
+  data.tar.gz: 48809728f9edfca1c12abc4b6ec5e4bb11b7ec6a453ee607229c63d1c044da49e31c36b04e9dd865ab21ed93f99467642b6ca1bddfe976a3bf17e32153e81297

data/lib/pipekit/config.rb

@@ -69,6 +69,10 @@ module Pipekit
         config.fetch(key.to_s, default)
       end
 
+      def set(key, value)
+        config[key.to_s] = value
+      end
+
       def custom_fields(resource)
         fetch("fields", {})
           .fetch(resource.to_s, {})

data/lib/pipekit/deal_field.rb

@@ -1,6 +1,5 @@
 module Pipekit
   class DealField
-    include Repository
     include FieldRepository
   end
 end

data/lib/pipekit/field_repository.rb

@@ -1,25 +1,34 @@
 module Pipekit
   module FieldRepository
-      def get_by_key(key)
-        key = Config.field_id(parent_resource, key)
-        search_fields("key", key)
-      end
+    include Repository
+    def get_by_key(key)
+      key = Config.field_id(parent_resource, key)
+      search_fields("key", key)
+    end
 
-      def get_by_name(name)
-        search_fields("name", name)
-      end
+    def get_by_name(name)
+      search_fields("name", name)
+    end
 
-      private
+    def find_label(field:,id:)
+      find_values(field).find({}) { |value| value["id"] == id }.fetch("label")
+    end
 
-      def search_fields(field_element, value)
-        result = request.get.select { |element| element[field_element] == value }
+    def find_values(field)
+      find_by(name: field)["options"]
+    end
 
-        raise ResourceNotFoundError.new("#{parent_resource}Field searching by element #{field_element} for #{value} could not be found") if result.empty?
-        result
-      end
+    private
 
-      def parent_resource
-        resource.chomp("Field")
-      end
+    def search_fields(field_element, value)
+      result = request.get.select { |element| element[field_element] == value }
+
+      raise ResourceNotFoundError.new("#{parent_resource}Field searching by element #{field_element} for #{value} could not be found") if result.empty?
+      result
+    end
+
+    def parent_resource
+      resource.chomp("Field")
+    end
   end
 end

data/lib/pipekit/person.rb

@@ -10,9 +10,13 @@ module Pipekit
       request.get("find", term: name)
     end
 
-    def create_or_update(fields)
-      person = find_by(email: fields[:email])
+    def update_by_email(email, fields)
+      person = find_by(email: email)
       update(person["id"], fields)
+    end
+
+    def create_or_update(fields)
+      update_by_email(fields[:email], fields)
     rescue ResourceNotFoundError
       create(fields)
     end

data/lib/pipekit/person_field.rb

@@ -1,6 +1,5 @@
 module Pipekit
   class PersonField
-    include Repository
     include FieldRepository
   end
 end

data/lib/pipekit/repository.rb

@@ -5,8 +5,8 @@ module Pipekit
       @request = request || Request.new(resource)
     end
 
-    def all
-      get
+    def all(query = {})
+      request.get("", query)
     end
 
     # Public: Get all records from Pipedrive by **one** of the record's fields.
@@ -46,8 +46,8 @@ module Pipekit
     #
     # fields - fields for the record.
     #
-    # Examples
     #
+    # Examples
     #   create({name: "John Doe", deal_id: 123})
     #
     # Returns nothing.
@@ -68,16 +68,6 @@ module Pipekit
       request.put(id, fields)
     end
 
-    def self.included(base)
-      base.extend(ClassMethods)
-    end
-
-    module ClassMethods
-      def resource
-        to_s.split("::").last.tap { |name| name[0] = name[0].downcase }
-      end
-    end
-
     private
 
     attr_reader :request
@@ -103,7 +93,7 @@ module Pipekit
     end
 
     def resource
-      self.class.resource
+      self.class.to_s.split("::").last.tap { |name| name[0] = name[0].downcase }
     end
   end
 end

data/lib/pipekit/request.rb

@@ -12,7 +12,7 @@ module Pipekit
 
     def initialize(resource)
       @resource = resource
-      self.class.debug_output $stdout if Config.fetch("debug_requests")
+      self.class.debug_output $stdout if Config.fetch(:debug_requests)
     end
 
     # Public: Pipedrive /searchField API call.
@@ -31,14 +31,18 @@ module Pipekit
     #
     # Returns an array of Response objects or throws a ResourceNotFoundError if
     # it couldn't find anything.
+    #
+    # 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: value
+               term: Config.field_value_id(resource, field, value),
+               exact_match: 1
       }
 
-      response_from self.class.get("/searchResults/field", options(query: query))
+      get_request("/searchResults/field", query).response(resource)
     end
 
     # Public: Pipedrive GET API call - does a GET request to the Pipedrive API
@@ -52,8 +56,9 @@ module Pipekit
     # recursively call `#get` until all the pages of the request have been
     # fetched from pipedrive
     # Pipedrive until everything available has been received
-    def get(id = nil, query = {})
-      _get(id, query, get_request(id, query))
+    def get(id = "", query = {})
+      uri = uri(id)
+      _get(uri, query, get_request(uri, query))
     end
 
     def put(id, data)
@@ -68,13 +73,13 @@ module Pipekit
 
     attr_reader :resource
 
-    def _get(id, query, result)
+    def _get(uri, query, result)
       return result.response(resource) unless result.fetch_next_request?
-      _get(id, query, result + get_request(id, query, result.next_start))
+      _get(uri, query, result + get_request(uri, query, result.next_start))
     end
 
-    def get_request(id, query, start = 0)
-      response = self.class.get(uri(id), options(query: {limit: pagination_limit, start: start}.merge(query)))
+    def get_request(uri, query, start = 0)
+      response = self.class.get(uri, options(query: {limit: pagination_limit, start: start}.merge(query)))
       Result.new(response)
     end
 
@@ -82,13 +87,13 @@ module Pipekit
       Result.response(resource, response_data)
     end
 
-    def uri(id = nil)
+    def uri(id = "")
       "/#{resource}s/#{id}".chomp("/")
     end
 
     def options(query: {}, body: {})
       {
-        query: query.merge(api_token: Config.fetch("api_token")),
+        query: query.merge(api_token: Config.fetch(:api_token)),
         body: parse_body(body)
       }
     end
@@ -115,7 +120,7 @@ module Pipekit
     end
 
     def pagination_limit
-      Config.fetch("pagination_limit", DEFAULT_PAGINATION_LIMIT)
+      Config.fetch(:pagination_limit, DEFAULT_PAGINATION_LIMIT)
     end
 
   end

data/lib/pipekit/response.rb

@@ -1,9 +1,10 @@
 module Pipekit
   class Response
 
-    def initialize(resource, data)
+    def initialize(resource, data, field_repository: nil)
       @resource = resource
       @data = data || {}
+      @field_repository = field_repository
     end
 
     def ==(other)
@@ -84,23 +85,20 @@ module Pipekit
 
     attr_reader :data, :resource
 
+    def field_repository
+      @field_repository ||= build_field_repository
+    end
+
     def fetch_value(key, default)
       data.fetch(convert_key(key), default)
     end
 
     def value_from_pipedrive(key, value)
       return unless value && !value.empty?
-
-      option = field_repository
-        .find_by(name: key)
-        .fetch("options", [], choose_first_value: false)
-        .find { |options| options["id"] == value.to_i }
-
-      raise ResourceNotFoundError.new("Could not find field #{key}'s value '#{value}' on Pipedrive") unless option
-      option.fetch("label")
+      field_repository.find_label(field: key, id: value)
     end
 
-    def field_repository
+    def build_field_repository
       Object.const_get("Pipekit::#{resource.capitalize}Field").new
     end
 

data/lib/pipekit/result.rb

@@ -18,7 +18,7 @@ module Pipekit
     end
 
     def fetch_next_request?
-      Config.fetch("request_all_pages", true) && pagination_data["more_items_in_collection"]
+      Config.fetch(:request_all_pages, true) && pagination_data["more_items_in_collection"]
     end
 
     def next_start
@@ -66,7 +66,7 @@ module Pipekit
     end
 
     def message
-      "Resource not found: #{@response}"
+      "Resource not found, response was: #{@response}"
     end
   end
 

data/lib/pipekit/version.rb

@@ -1,3 +1,3 @@
 module Pipekit
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/pipekit.gemspec

@@ -6,8 +6,8 @@ require 'pipekit/version'
 Gem::Specification.new do |spec|
   spec.name          = "pipekit"
   spec.version       = Pipekit::VERSION
-  spec.authors       = ["jafrog", "pitchinvasion", "spike01"]
-  spec.email         = ["irina@makersacademy.com", "leo@makersacademy.com", "spike@makersacademy.com"]
+  spec.authors       = ["jafrog", "pitchinvasion", "spike01", "danldb"]
+  spec.email         = ["irina@makersacademy.com", "leo@makersacademy.com", "spike@makersacademy.com", "dan@makersacademy.com"]
 
   spec.summary       = %q{Pipedrive API client for Ruby.}
   spec.description   = %q{Pipedrive API client for Ruby.}

metadata

@@ -1,16 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: pipekit
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - jafrog
 - pitchinvasion
 - spike01
+- danldb
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-31 00:00:00.000000000 Z
+date: 2016-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -101,6 +102,7 @@ email:
 - irina@makersacademy.com
 - leo@makersacademy.com
 - spike@makersacademy.com
+- dan@makersacademy.com
 executables: []
 extensions: []
 extra_rdoc_files: []