pipe_drive_ruby_wrapper 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a0306cb9643370e9c2bdc925d0b0b9d0457d0a397e918f64d007e33d96db583
-  data.tar.gz: 995f2307d138885030d5f0b2bfaacfc2c69680cd4817a4e34cef60ffd0a36364
+  metadata.gz: af042bbd75c486a6402e783b422e6a7bc8f6144c2efb7bd2c050c149e59290e0
+  data.tar.gz: f0eca92a11ca625dc15005ab56fb2f22b8c0020bfff88cee99c7abcfc0ef8262
 SHA512:
-  metadata.gz: 8f13c5c3cf4ca52b0d8d2418d1d2e7cf2770ab203679fb1efcf8153b9d0b1c59c4c34d587af15557942c37c92cc5972bc18c4484f95390897d6cf4309ba7ca34
-  data.tar.gz: beec160b8ab90d67935ec626cef412e28a0d06a44ab7081b21a6e56fe0e29d3b404f39d5127fd340b43765f687201ae15fc99bd140bf8a2c7b29b74d87812d72
+  metadata.gz: 81c4ef35bd3ade27bb52d0bf58bad303f5104628ed2bd261a1d39cf50045e904dcf643f42441b4dd560203d08954f7d9b155a4f18b36a5601ee1b4d52439d49d
+  data.tar.gz: dd2de0dbf8c30ae95d58ab6897fb22884029f5eea173f73246438e14ab5a91382f35027fdb5c4026ad4743144f36093440680ab2d2dae401a0d108d445d47af4

data/lib/pipe_drive/deal.rb

@@ -2,5 +2,13 @@ module PipeDrive
   class Deal < ResourceBase
     ALLOW_FOR_SEARCH_TERMS = %i[title]
     ALLOW_FOR_ADDITION_SEARCH_OPTS = %i[org_id person_id]
+
+    def organization
+      Organization.find_by_id(org_id)
+    end
+
+    def person
+      Person.find_by_id(person_id)
+    end
   end
 end

data/lib/pipe_drive/field_base.rb

@@ -1,9 +1,10 @@
 module PipeDrive
   class FieldBase < Base
-    def add_to_field_keys
+    def add_to_field_infos
       resource = self.class.correspond_resource.to_sym
-      field_name = parameterize(name, '_').to_sym
-      PipeDrive.field_keys[resource][field_name] = {id: id, key: key}
+      field_name = parameterize(name, '_')
+      PipeDrive.field_keys[resource][field_name.to_sym] = {id: id, key: key}
+      PipeDrive.field_names[resource][key] = {id: id, name: field_name}
     end
 
     class << self
@@ -33,36 +34,54 @@ module PipeDrive
 
       def create(opts)
         new_field = super(opts)
-        new_field.add_to_field_keys
+        new_field.add_to_field_infos
       end
 
-      def field_keys_map
+      def field_infos_map
         field_keys_map = Hash.new{|hash, key| hash[key] = {}}
+        field_names_map = Hash.new{|hash, key| hash[key] = {}}
         resource = correspond_resource.to_sym
         list.each do |field|
-          field_name = parameterize(field.name, '_').to_sym
-          field_keys_map[resource][field_name] = {id: field.id, key: field.key}
+          field_name = parameterize(field.name, '_')
+          field_keys_map[resource][field_name.to_sym] = {id: field.id, key: field.key}
+          field_names_map[resource][field.key] = {id: field.id, name: field_name}
         end
-        field_keys_map
+        {key_map: field_keys_map, name_map: field_names_map}
       end
 
       def cache_keys
         PipeDrive.field_keys[correspond_resource.to_sym]
       end
 
+      def cache_names
+        PipeDrive.field_names[correspond_resource.to_sym]
+      end
+
       def pipedrive_key_of(field_name)
         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[:key] unless pipedrive_key.nil?
-        PipeDrive.reset_field_keys!
+        PipeDrive.reset_field_infos!
         pipedrive_key = cache_keys[cache_field_name]
         if pipedrive_key.nil?
-          raise TargetNotFound.new(self.name, :name, field_name)
+          raise TargetNotFound.new(self.name, :field_name, field_name)
         else
           pipedrive_key[:key]
         end
       end
 
+      def pipedrive_name_of(field_key)
+        pipedrive_name = cache_names[field_key]
+        return pipedrive_name[:name] unless pipedrive_name.nil?
+        PipeDrive.reset_field_infos!
+        pipedrive_name = cache_names[field_key]
+        if pipedrive_name.nil?
+          raise TargetNotFound.new(self.name, :field_key, field_key)
+        else
+          pipedrive_name[:name]
+        end
+      end
+
     end
   end
 end

data/lib/pipe_drive/resource_base.rb

@@ -1,6 +1,19 @@
 module PipeDrive
   class ResourceBase < Base
 
+    def initialize(attrs)
+      data = attrs[:data] || PipeDrive.hash_except(attrs, [:additional_data])
+      processed_data = {}
+      data.each_pair do |key, value|
+        field_name_map = self.class.field_names[key.to_s]
+        field_name = field_name_map.nil? ? key : field_name_map[:name]
+        processed_data[field_name] = value
+      end
+      attrs[:data] = processed_data
+
+      super(attrs)
+    end
+
     protected
 
     def pagination(path, params, &block)
@@ -17,6 +30,10 @@ module PipeDrive
         PipeDrive.field_keys[resource_name.to_sym]
       end
 
+      def field_names
+        PipeDrive.field_names[resource_name.to_sym]
+      end
+
       def resource_class
         self
       end

data/lib/pipe_drive_ruby_wrapper.rb

@@ -11,7 +11,7 @@ module PipeDrive
   FIELD_CLASSES = %w[OrganizationField PersonField DealField]
 
   class << self; attr_accessor :api_token; end
-  class << self; attr_writer :field_keys, :stage_ids; end
+  class << self; attr_writer :field_keys, :field_names, :stage_ids; end
 
   class << self
     def setup
@@ -19,21 +19,21 @@ module PipeDrive
       self
     end
 
+    def field_infos
+      return @field_infos unless @field_infos.nil? || @field_infos.empty?
+      @field_infos = obtain_field_infos
+    end
+
+    def reset_field_infos!
+      @field_infos = obtain_field_infos
+    end
+
     def field_keys
-      return @field_keys unless @field_keys.nil? || @field_keys.empty?
-      @field_keys = {}
-      FIELD_CLASSES.each do |class_name|
-        @field_keys.merge!(const_get(class_name).field_keys_map)
-      end
-      @field_keys
+      @fields_keys = field_infos[:key_map]
     end
 
-    def reset_field_keys!
-      @field_keys = {}
-      FIELD_CLASSES.each do |class_name|
-        @field_keys.merge!(const_get(class_name).field_keys_map)
-      end
-      @field_keys
+    def field_names
+      @field_names = field_infos[:name_map]
     end
 
     def stage_ids
@@ -58,6 +58,18 @@ module PipeDrive
       remain_keys = all_keys - except_keys
       hash.slice(*remain_keys)
     end
+
+    private
+
+    def obtain_field_infos
+      field_infos = {key_map: {}, name_map: {}}
+      FIELD_CLASSES.each do |class_name|
+        infos = const_get(class_name).field_infos_map
+        field_infos[:key_map].merge!(infos[:key_map])
+        field_infos[:name_map].merge!(infos[:name_map])
+      end
+      field_infos
+    end
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pipe_drive_ruby_wrapper
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - JiaRou Lee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-19 00:00:00.000000000 Z
+date: 2018-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec