pipedrive_jetrockets 0.0.54 → 0.0.55

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8be07ade0babaff812cca99ea18f840b7bbd8a491300e2ca88b2a52a2b8ec124
-  data.tar.gz: 81245098213950af6bbe1732c833bfc144636b07fbccc77adbc3c4d2600bf053
+  metadata.gz: e872b160dc14ea553d1a7a11c40e927d496e9a05bc90683c7ec78ed089bc6c5a
+  data.tar.gz: 6e860c042f2feb5abb992c6a13a0a8243dd5e338079becf8b086a2905d6060ed
 SHA512:
-  metadata.gz: 969bddfd34547499ff06218b2b77c4019df6d63275dd327dc9dee4734339c2cdfb3acb8d6ec4cf7515eaaaab086519a38e04cd816655cad98bf1e4f8f7d54068
-  data.tar.gz: b13054531dce420583355312c5eebe18dac7ae095bc72d2812232572f28521deacac012d406c196b42de87abb6b53afb3362532c8322d4d8a5b250c6a7a5d1c4
+  metadata.gz: f4e496807253c7a407c8c25d667504c56c81b93d71375eb3a4c83769b7fa1f86fa93248d01a3db8f5d740645f2daebfe23558a973f1c74274d7070a0192f5bb0
+  data.tar.gz: 4770210888593712da635721dbea71476e7947984bd8f302f51a05f0f588f1af3212271c256db08392729930f9120dbfc7555883d095fc55591e3aa0ccb69423

data/lib/pipedrive_jetrockets.rb

@@ -1,6 +1,9 @@
 require 'net/http'
+require 'pipedrive_jetrockets/entity'
 require 'pipedrive_jetrockets/engine'
 require 'pipedrive_jetrockets/service'
+require 'pipedrive_jetrockets/person_service'
+require 'pipedrive_jetrockets/field_service'
 
 class Pipedrive
 
@@ -8,6 +11,10 @@ class Pipedrive
     @@deals_service ||= PipedriveJetrockets::Service.new('deal')
   end
 
+  def self.deal_fields
+    @@deal_fields_service ||= PipedriveJetrockets::FieldService.new('dealField')
+  end
+
   def self.notes
     @@notes_service ||= PipedriveJetrockets::Service.new('note')
   end
@@ -17,7 +24,7 @@ class Pipedrive
   end
 
   def self.persons
-    @@persons_service ||= PipedriveJetrockets::Service.new('person')
+    @@persons_service ||= PipedriveJetrockets::PersonService.new('person')
   end
 
   def self.pipelines

data/lib/pipedrive_jetrockets/deal.rb

@@ -1,4 +1,3 @@
-require 'pipedrive_jetrockets/entity'
 require 'pipedrive_jetrockets/organization'
 require 'pipedrive_jetrockets/person'
 
@@ -7,10 +6,18 @@ module PipedriveJetrockets
     attr_accessor :id, :organization, :title, :value, :currency, :status,
     :stage_id, :person, :add_time, :update_time
     def initialize(hash)
-      super
+      @@key_name_hash ||= Pipedrive.deal_fields.key_name_hash
+      super(hash.except(*@@key_name_hash.keys))
+
       org_id = hash['org_id']
       person_id = hash['person_id']
 
+      @@key_name_hash.each do |key, name|
+        name = name.underscore.gsub(' ','_')
+        instance_variable_set("@#{name}", hash[key])
+        Deal.class_eval {attr_accessor name}
+      end
+
       if org_id
         if org_id.kind_of? Integer
           @organization = Pipedrive.organizations.find(org_id)

data/lib/pipedrive_jetrockets/deal_field.rb

@@ -0,0 +1,5 @@
+module PipedriveJetrockets
+  class DealField < Entity
+    attr_accessor :id, :key, :name
+  end
+end

data/lib/pipedrive_jetrockets/field_service.rb

@@ -0,0 +1,17 @@
+module PipedriveJetrockets
+  class FieldService < Service
+    HOST = 'https://api.pipedrive.com/v1'
+
+    def initialize(resource_name)
+      @resource_name = resource_name
+    end
+
+    def key_name_hash
+      Pipedrive.deal_fields.all.map{|field|{field.key => field.name}}.inject(:merge)
+    end
+
+    def name_key_hash
+      Pipedrive.deal_fields.all.map{|field|{field.name => field.key}}.inject(:merge)
+    end
+  end
+end

data/lib/pipedrive_jetrockets/note.rb

@@ -1,5 +1,3 @@
-require 'pipedrive_jetrockets/entity'
-
 module PipedriveJetrockets
   class Note < Entity
     attr_accessor :id, :deal_id, :person_id, :org_id, :content, :add_time, :update_time

data/lib/pipedrive_jetrockets/organization.rb

@@ -1,5 +1,3 @@
-require 'pipedrive_jetrockets/entity'
-
 module PipedriveJetrockets
   class Organization < Entity
     attr_accessor :id, :name, :owner_id, :address, :cc_email, :add_time, :update_time

data/lib/pipedrive_jetrockets/person.rb

@@ -1,5 +1,3 @@
-require 'pipedrive_jetrockets/entity'
-
 module PipedriveJetrockets
   class Person < Entity
     attr_accessor :id, :name, :email, :phone, :open_deals_count, :closed_deals_count,

data/lib/pipedrive_jetrockets/person_service.rb

@@ -0,0 +1,26 @@
+module PipedriveJetrockets
+  class PersonService < Service
+    HOST = 'https://api.pipedrive.com/v1'
+
+    def initialize(resource_name)
+      @resource_name = resource_name
+    end
+
+    def find_by_email(email)
+      uri = build_uri({term: email, search_by_email: true }, 'find')
+      response = HTTP.get(uri)
+
+      case response.code
+      when 200
+        json_array = ::JSON.parse(response)['data']
+        return [] unless json_array
+        json_array.map{|raw|build_entity(raw)}
+      else
+        raise PipedriveJetrockets::Error.new(response.code)
+      end
+    rescue HTTP::ConnectionError
+      raise PipedriveJetrockets::Error.new(408)
+    end
+
+  end
+end

data/lib/pipedrive_jetrockets/pipeline.rb

@@ -1,5 +1,3 @@
-require 'pipedrive_jetrockets/entity'
-
 module PipedriveJetrockets
   class Pipeline < Entity
     attr_accessor :id, :name, :add_time, :update_time

data/lib/pipedrive_jetrockets/service.rb

@@ -1,5 +1,6 @@
 require 'http'
 require 'pipedrive_jetrockets/deal'
+require 'pipedrive_jetrockets/deal_field'
 require 'pipedrive_jetrockets/note'
 require 'pipedrive_jetrockets/organization'
 require 'pipedrive_jetrockets/person'
@@ -11,13 +12,15 @@ require 'pipedrive_jetrockets/error'
 module PipedriveJetrockets
   class Service
     HOST = 'https://api.pipedrive.com/v1'
+    RESOURCES_WITH_CUSTOM_FIELDS = %w(deal organization person)
 
     def initialize(resource_name)
       @resource_name = resource_name
+      @has_custom_fields = RESOURCES_WITH_CUSTOM_FIELDS.include?(@resource_name)
     end
 
     def build_entity(raw)
-      "PipedriveJetrockets::#{@resource_name.titleize}".constantize.new(raw)
+      "PipedriveJetrockets::#{@resource_name.titleize.delete(' ')}".constantize.new(raw)
     end
 
     def build_uri(params = {}, specificator = nil)
@@ -71,30 +74,13 @@ module PipedriveJetrockets
       raise PipedriveJetrockets::Error.new(408)
     end
 
-    def find_by_email(email)
-      raise NoMethodError if @resource_name != 'person'
-      uri = build_uri({term: email, search_by_email: true }, 'find')
-      response = HTTP.get(uri)
-      
-      case response.code
-      when 200
-        json_array = ::JSON.parse(response)['data']
-        return [] unless json_array
-        json_array.map{|raw|build_entity(raw)}
-      else
-        raise PipedriveJetrockets::Error.new(response.code)
-      end
-    rescue HTTP::ConnectionError
-      raise PipedriveJetrockets::Error.new(408)
-    end
-
     def first
       self.all.first
     end
 
     def update(id, params)
       uri = build_uri({}, id)
-      response = HTTP.put(uri, form: params)
+      response = HTTP.put(uri, form: transform_custom_fields(params))
 
       case response.code
       when 200
@@ -105,5 +91,24 @@ module PipedriveJetrockets
     rescue HTTP::ConnectionError
       raise PipedriveJetrockets::Error.new(408)
     end
+
+    protected
+
+    def transform_custom_fields(params)
+      return params unless @has_custom_fields
+
+      @@name_key_hash = Pipedrive.send("#{@resource_name}_fields").name_key_hash
+      keys = @@name_key_hash.keys
+      res = {}
+      params.each do |name, value|
+        if keys.include?(name.to_s) #Custom Field
+          res[@@name_key_hash[name.to_s]] = value
+        else
+          res[name] = value
+        end
+      end
+      res
+    end
+
   end
 end

data/lib/pipedrive_jetrockets/stage.rb

@@ -1,5 +1,3 @@
-require 'pipedrive_jetrockets/entity'
-
 module PipedriveJetrockets
   class Stage < Entity
     attr_accessor :id, :name, :pipeline_id, :add_time, :update_time

data/lib/pipedrive_jetrockets/user.rb

@@ -1,5 +1,3 @@
-require 'pipedrive_jetrockets/entity'
-
 module PipedriveJetrockets
   class User < Entity
     attr_accessor :id, :name, :email, :phone

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pipedrive_jetrockets
 version: !ruby/object:Gem::Version
-  version: 0.0.54
+  version: 0.0.55
 platform: ruby
 authors:
 - Agafonov Maksim
@@ -34,12 +34,15 @@ files:
 - config/routes.rb
 - lib/pipedrive_jetrockets.rb
 - lib/pipedrive_jetrockets/deal.rb
+- lib/pipedrive_jetrockets/deal_field.rb
 - lib/pipedrive_jetrockets/engine.rb
 - lib/pipedrive_jetrockets/entity.rb
 - lib/pipedrive_jetrockets/error.rb
+- lib/pipedrive_jetrockets/field_service.rb
 - lib/pipedrive_jetrockets/note.rb
 - lib/pipedrive_jetrockets/organization.rb
 - lib/pipedrive_jetrockets/person.rb
+- lib/pipedrive_jetrockets/person_service.rb
 - lib/pipedrive_jetrockets/pipeline.rb
 - lib/pipedrive_jetrockets/service.rb
 - lib/pipedrive_jetrockets/stage.rb