pipe_drive_ruby_wrapper 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6194381c3e69bfd85c4f56cfe46b0a7e3dd72d807e37321c15388a6da7ba1c8
-  data.tar.gz: 60e5915a47680e389b31f335f925ae1d484203e58d01d952db9f84fe7d6d0781
+  metadata.gz: 93e0fdacc778f6cdd1a7b227d8c34187b27a29ca410f6f2abd175dff39e442c3
+  data.tar.gz: 8ed2f42c1e757de34b76017bb98f085c7ed39ad1a8241837855d5e3a07bbf92b
 SHA512:
-  metadata.gz: eeb9780ef3994337e20dbdf0167f2445958f1baac8755531987715d1949190ebfb9c1020fade871838d6e132b2f99bc0e8b391170cc0f0b8074d092eed2f8292
-  data.tar.gz: 9ab90f34a831443b5d857105b677885ab9640d7be3ee2517f02fa549df02d2e3314c12e73a76c9ee1de103cab16e406195cc5c2668d00adbe181a4e820a11869
+  metadata.gz: 6ee7df332dd515924942efe3ca8d68c2290a895968332279ace8e563576279d97f9fe3046d006afe2adaec9008908726b1697cae64a80b0fc0bcf0e05b2baea3
+  data.tar.gz: 05a9e1339fa9c285d4833ee0dd90233f24871455caf02eab460a265b542ea68b41edaf1f01ca84542aa6c3763c0dbde9f70f88b7e7897ba6b475e125af16b971

data/lib/pipe_drive/base.rb

@@ -14,7 +14,7 @@ module PipeDrive
 
     def update(opts)
       path = "/#{self.class.resource_name}s/#{id}"
-      opts.transform_keys!{|key| self.class.field_keys[key] || key}
+      opts.transform_keys!{|key| self.class.field_keys[key].present? ? self.class.field_keys[key][:key] : key}
       requester.http_put(path, opts) do |result|
         self.class.new(result)
       end
@@ -42,7 +42,7 @@ module PipeDrive
       end
 
       def create(opts)
-        opts.transform_keys!{|key| field_keys[key] || key}
+        opts.transform_keys!{|key| field_keys[key].present? ? field_keys[key][:key] : key}
         requester.http_post("/#{resource_name}s", opts) do |result|
           new(result)
         end
@@ -50,7 +50,7 @@ module PipeDrive
 
       def update(id, opts)
         path = "/#{resource_name}s/#{id}"
-        opts.transform_keys!{|key| field_keys[key] || key}
+        opts.transform_keys!{|key| field_keys[key].present? ? field_keys[key][:key] : key}
         requester.http_put(path, opts) do |result|
           new(result)
         end
@@ -77,7 +77,7 @@ module PipeDrive
       end
 
       def parameterize(target_string, separator)
-        target_string.gsub!(/[\-_\ \/]+/, separator)
+        target_string.gsub!(/[\W_]+/, separator)
         target_string.downcase
       end
 

data/lib/pipe_drive/field_base.rb

@@ -3,7 +3,7 @@ module PipeDrive
     def add_to_field_keys
       resource = self.class.correspond_resource.to_sym
       field_name = parameterize(name, '_').to_sym
-      PipeDrive.field_keys[resource][field_name] = key
+      PipeDrive.field_keys[resource][field_name] = {id: id, key: key}
     end
 
     class << self
@@ -33,7 +33,7 @@ module PipeDrive
         resource = correspond_resource.to_sym
         list.each do |field|
           field_name = parameterize(field.name, '_').to_sym
-          field_keys_map[resource][field_name] = field.key
+          field_keys_map[resource][field_name] = {id: field.id, key: field.key}
         end
         field_keys_map
       end
@@ -43,15 +43,15 @@ module PipeDrive
       end
 
       def pipedrive_key_of(field_name)
-        cache_field_name = parameterize(field_name, '_').to_sym
+        cache_field_name = field_name.is_a?(String) ? parameterize(field_name, '_').to_sym : field_name
         pipedrive_key = cache_keys[cache_field_name]
-        return pipedrive_key unless pipedrive_key.nil?
+        return pipedrive_key[:key] unless pipedrive_key.nil?
         PipeDrive.reset_field_keys!
         pipedrive_key = cache_keys[cache_field_name]
         if pipedrive_key.nil?
           raise TargetNotFound.new(self.name, :name, field_name)
         else
-          pipedrive_key
+          pipedrive_key[:key]
         end
       end
 

data/spec/lib/deal_spec.rb

@@ -8,7 +8,7 @@ RSpec.describe PipeDrive::Deal do
 
   context '.field_keys' do
     it 'should obtain person custom field' do
-      deal_custom_fields = {product: 'product key'}
+      deal_custom_fields = {product: {id: 3, key: 'product key'}}
       expect(PipeDrive::Deal.field_keys).to eq(deal_custom_fields)
     end
   end

data/spec/lib/organization_spec.rb

@@ -8,7 +8,7 @@ RSpec.describe PipeDrive::Organization do
 
   context '.field_keys' do
     it 'should obtain person custom field' do
-      org_custom_fields = {region: 'region key'}
+      org_custom_fields = {region: {id: 1, key: 'region key'}}
       expect(PipeDrive::Organization.field_keys).to eq(org_custom_fields)
     end
   end

data/spec/lib/person_spec.rb

@@ -8,7 +8,7 @@ RSpec.describe PipeDrive::Person do
 
   context '.field_keys' do
     it 'should obtain person custom field' do
-      person_custom_fields = {role: 'role key'}
+      person_custom_fields = {role: {id: 2, key: 'role key'}}
       expect(PipeDrive::Person.field_keys).to eq(person_custom_fields)
     end
   end

data/spec/pipe_drive_ruby_wrapper_spec.rb

@@ -4,7 +4,7 @@ RSpec.describe PipeDrive do
       PipeDrive.setup do |config|
         config.api_token = 'api token'
         config.field_keys = {
-          person: {test: 'test_key'}
+          person: {test: {id: 1, key: 'test_key'}}
         }
         config.stage_ids = {
           1 => {
@@ -13,7 +13,7 @@ RSpec.describe PipeDrive do
         }
       end
       expect(PipeDrive.api_token).to eq('api token')
-      expect(PipeDrive.field_keys).to eq({person: {test: 'test_key'}})
+      expect(PipeDrive.field_keys).to eq({person: {test: {id: 1, key: 'test_key'}}})
       expect(PipeDrive.stage_ids).to eq({1 => {test: 1}})
     end
   end

data/spec/spec_helper.rb

@@ -13,13 +13,13 @@ PipeDrive.setup do |config|
   config.api_token = 'api_token'
   config.field_keys = {
     organization: {
-      region: 'region key'
+      region: {id: 1, key: 'region key'}
     },
     person: {
-      role: 'role key'
+      role: {id: 2, key: 'role key'}
     },
     deal: {
-      product: 'product key'
+      product: {id: 3, key: 'product key'}
     }
   }
   config.stage_ids = {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pipe_drive_ruby_wrapper
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - JiaRou Lee