pipe_drive_ruby_wrapper 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f24bb5abbf918344616ceabd2c5934d827b679dc3926e0a76b060556f8b0ae1
-  data.tar.gz: 187ecc5a550e53683944140ddd6d5581e8c75220986395ede513143552983d5c
+  metadata.gz: b284c3238b3325431be152a084566d4b72d37c5ff297bfb11454f5efcd30f9b1
+  data.tar.gz: f78170f0a97ec45b6a37d7e0a857c64b161ca549fb60b96c585028f90dac0a69
 SHA512:
-  metadata.gz: 144a7b8c10025bf67798ccfd139df42fd68a294d5ab34cbfc29d4ec2b78b23967db94676e3c65a4fb9b865e019257377889def5d2b7b357a03ff95357b968c9e
-  data.tar.gz: 26487cc9cc903902a46b8dcf68cc10d59963350d917f728ebbfa4995761634bce3590f1841042965c38e06b86176f7d38a5371437f0cc6592e4ee6530c89882f
+  metadata.gz: '088ea8e8b1baeb2f2cbf68bfb5b391c0095d485a5ebc1dca1de372930dd6b213366b555c0f5e501d1223ee9ca82af537d2f2f21f532f387e2ae8fc506a7641ac'
+  data.tar.gz: 7d20b3d12674a628bf73a2d1c176ac3e08e485bdbb466bfe25b06d6a11e1fdef2fe6569cf439bb915475e056afd3c8f9ea805ae9c9aa15d90e4ed32de73c4749

data/lib/pipe_drive/field_base.rb

@@ -28,12 +28,14 @@ module PipeDrive
         new_field.add_to_field_keys
       end
 
-      def custom_field_setup
+      def field_keys_map
+        field_keys_map = Hash.new{|hash, key| hash[key] = {}}
         resource = correspond_resource.to_sym
         list.each do |field|
           field_name = parameterize(field.name, '_').to_sym
-          PipeDrive.field_keys[resource][field_name] = field.key
+          field_keys_map[resource][field_name] = field.key
         end
+        field_keys_map
       end
 
       def cache_keys
@@ -44,7 +46,7 @@ module PipeDrive
         cache_field_name = parameterize(field_name, '_').to_sym
         pipedrive_key = cache_keys[cache_field_name]
         return pipedrive_key unless pipedrive_key.nil?
-        custom_field_setup
+        PipeDrive.field_keys = nil
         pipedrive_key = cache_keys[cache_field_name]
         if pipedrive_key.nil?
           raise TargetNotFound.new(self.name, :name, field_name)

data/lib/pipe_drive/stage.rb

@@ -5,12 +5,14 @@ module PipeDrive
 
     class << self
 
-      def setup_stage_ids
+      def stage_ids_map
+        stage_ids_map = Hash.new {|hash, key| hash[key] = {}}
         list.each do |stage|
           pipeline_name = parameterize(stage.pipeline_name, '_').to_sym
           stage_name = parameterize(stage.name, '_').to_sym
-          PipeDrive.stage_ids[pipeline_name][stage_name] = stage.id
+          stage_ids_map[pipeline_name][stage_name] = stage.id
         end
+        stage_ids_map
       end
 
     end

data/lib/pipe_drive_ruby_wrapper.rb

@@ -11,25 +11,27 @@ module PipeDrive
   RESOURCE_CLASSES = %w[Organization Person Deal]
   FIELD_CLASSES = %w[OrganizationField PersonField DealField]
 
-  class << self; attr_accessor :api_token, :field_keys, :stage_ids; end
+  class << self; attr_accessor :api_token; end
+  class << self; attr_writer :field_keys, :stage_ids; end
 
   class << self
     def setup
       yield self
+      self
+    end
 
-      if field_keys.nil?
-        self.field_keys = Hash.new{|hash, key| hash[key] = {}}
-        FIELD_CLASSES.each do |class_name|
-          const_get(class_name).custom_field_setup
-        end
-      end
-
-      if stage_ids.nil?
-        self.stage_ids = Hash.new{|hash, key| hash[key] = {}}
-        Stage.setup_stage_ids
+    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
+    end
 
-      self
+    def stage_ids
+      return @stage_ids unless @stage_ids.nil? || @stage_ids.empty?
+      @stage_ids = Stage.stage_ids_map
     end
 
     def host

metadata

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