pipedrive_jetrockets 0.0.68 → 0.0.69

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b960c1164a47c256c53017e6ab343a2471ab8c41248aa933b0f4657b1ca87165
-  data.tar.gz: 87ea6bb5d26da4d6b282063d87a2176ee54aeb824ec30dce5be0a5509dfebe0f
+  metadata.gz: dff17bb1ab5a4d627d53222fec2511cb508691994723076ce63a18d1235f8da8
+  data.tar.gz: 21678c725aa915630193af75f6bcb5fa2c42bef845aec6547a0dd00eb0277bb4
 SHA512:
-  metadata.gz: 6a1e4ed44cb37a0a46d736e410ac1466760b38207a01c2ee5af0d7dc63f5e85382a921357e43409c990fa72e87eb9fb15fa3576d35c785854a93065cafdb5ae8
-  data.tar.gz: 7c7a6171c3314d661d3089a3d1f0cb5a146aaa09bf090a152ca991e7c5b2827b31739656ee49da841a074e682fa8d34bdc118e82a221c43bd81ff5c8816e2843
+  metadata.gz: 5719dea759b152fd605da1353b5876eabdf520bad53a3516c629e5fe540240d13411b24df507117a8a098a7182767d6f7e3198ce9be5d3ad86cad0a5760ab876
+  data.tar.gz: fc40a7b0da214fd13cabf3b80a58e3ed4d79a3e187ef77475469a60ee5e6247e4e0e3a54761bca49b15c54d254b171082ea9bdafc3ed43ac0956d99b213009c1

data/lib/pipedrive_jetrockets/deal.rb

@@ -5,19 +5,13 @@ module PipedriveJetrockets
   class Deal < Entity
     attr_accessor :organization, :person
     def initialize(hash)
-      @@key_name_hash ||= Pipedrive.deal_fields.key_name_hash
+      @@key_name_hash ||= Pipedrive.deal_fields.key_field_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(' ','_')
-        name = name.gsub('%','percent').gsub(/[^a-zA-Z0-9_]/,'')
-        name = transform_field_name(key, name)
-        instance_variable_set("@#{name}", hash[key])
-        Deal.class_eval {attr_accessor name}
-      end
+      assign_custom_fields(@@key_name_hash, hash)
 
       if org_id
         if org_id.kind_of? Integer

data/lib/pipedrive_jetrockets/entity.rb

@@ -7,6 +7,22 @@ module PipedriveJetrockets
       end
     end
 
+    def assign_custom_fields(key_name_hash, entity_hash)
+      key_name_hash.each do |key, field|
+        name = field.name
+        name = name.underscore.gsub(' ','_')
+        name = name.gsub('%','percent').gsub(/[^a-zA-Z0-9_]/,'')
+        name = transform_field_name(key, name)
+        if field.field_type == 'enum'
+          option_id = entity_hash[key]
+          instance_variable_set("@#{name}", field.options_hash[option_id])
+        else
+          instance_variable_set("@#{name}", entity_hash[key])
+        end
+        self.class.class_eval {attr_accessor name}
+      end
+    end
+
     def transform_field_name(key, name)
       hash = ::CUSTOM_FIELD_NAMES
       class_name = self.class.name.demodulize.underscore.to_sym

data/lib/pipedrive_jetrockets/field.rb

@@ -5,5 +5,10 @@ module PipedriveJetrockets
       super
       @is_subfield ||= false
     end
+
+    def options_hash
+      return {} unless @options
+      @options.map{|option|{option['id'].to_s => option['label']}}.inject(:merge)
+    end
   end
 end

data/lib/pipedrive_jetrockets/field_service.rb

@@ -6,6 +6,10 @@ module PipedriveJetrockets
       @resource_name = resource_name
     end
 
+    def key_field_hash
+      Pipedrive.send("#{@resource_name.split(/(?=[A-Z])/).first}_fields").all.select{|field|field.edit_flag || field.is_subfield}.map{|field|{field.key => field}}.inject(:merge) || {}
+    end
+
     def key_name_hash
       Pipedrive.send("#{@resource_name.split(/(?=[A-Z])/).first}_fields").all.select{|field|field.edit_flag || field.is_subfield}.map{|field|{field.key => field.name}}.inject(:merge) || {}
     end

data/lib/pipedrive_jetrockets/organization.rb

@@ -1,16 +1,11 @@
 module PipedriveJetrockets
   class Organization < Entity
     def initialize(hash)
-      @@key_name_hash ||= Pipedrive.organization_fields.key_name_hash
+      @@key_name_hash ||= Pipedrive.organization_fields.key_field_hash
       super(hash.except(*@@key_name_hash.keys))
       @id = hash['value'] if hash['value'].present?
 
-      @@key_name_hash.each do |key, name|
-        name = name.underscore.gsub(' ','_')
-        name = name.gsub('%','percent').gsub(/[^a-zA-Z0-9_]/,'')
-        instance_variable_set("@#{name}", hash[key])
-        Organization.class_eval {attr_accessor name}
-      end
+      assign_custom_fields(@@key_name_hash, hash)
     end
   end
 end

data/lib/pipedrive_jetrockets/person.rb

@@ -2,7 +2,7 @@ module PipedriveJetrockets
   class Person < Entity
     attr_accessor :email, :phone, :organization, :id
     def initialize(hash)
-      @@key_name_hash ||= Pipedrive.person_fields.key_name_hash
+      @@key_name_hash ||= Pipedrive.person_fields.key_field_hash
       super(hash.except(*@@key_name_hash.keys))
       @email = hash['email'].first['value'] if hash['email']
       @phone = hash['phone'].first['value'] if hash['phone']
@@ -18,12 +18,7 @@ module PipedriveJetrockets
 
       @id = hash['value'] if hash['value'].present?
 
-      @@key_name_hash.each do |key, name|
-        name = name.underscore.gsub(' ','_')
-        name = name.gsub('%','percent').gsub(/[^a-zA-Z0-9_]/,'')
-        instance_variable_set("@#{name}", hash[key])
-        Person.class_eval {attr_accessor name}
-      end
+      assign_custom_fields(@@key_name_hash, hash)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pipedrive_jetrockets
 version: !ruby/object:Gem::Version
-  version: 0.0.68
+  version: 0.0.69
 platform: ruby
 authors:
 - Agafonov Maksim