leap_salesforce 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1bc5400e3a22260ee15346243caca18a4e839d5a32237a236cedb4488e8a073d
-  data.tar.gz: be7c25e87d9dfd868ae7e7347b64ef61bb520a9f017c031e4ec5c0e5b8b27832
+  metadata.gz: dad7a996366ea8a7e9dc3b7acfee0bd5a3c028b9cbbfcb900436af73a6974e80
+  data.tar.gz: 0a1b977c80d03b62d6e2e963e2a37ae1bd9e3185b4ac25f6eed68804a0291cd5
 SHA512:
-  metadata.gz: 48685d0acfa0a8b0b9ae08b94bdf64d41636df9982d45636a3d9e526ff9bef3d32cea0389767a4a2b31b6f6b5b45273c16bb221fc50d0121b96ddaa799b1769d
-  data.tar.gz: e62daf28879015af67c9eda73b495cd106450c962562c72556a4af97492511b238db493f3c21094d81fa2eba362dc05babae9f554b8b873584a1aa7002f59732
+  metadata.gz: 1fcb10612c2c13acd12ca01d67a2bb3a92739cb5ac88c321df5775a9c6d11e75640e74bfd5e00b0322988c0a096867c53661540fd009f6b5e85d676588b3cec5
+  data.tar.gz: daaad233034d817aa45bb7d5afe489cd61eb8a951d509437d8bba470ed84f37335f6f5893c15eeea2e6b6387a61f7c095123382957e57a711ce152fcecd2f7f2

data/ChangeLog

@@ -1,3 +1,7 @@
+Version 0.1.7
+* Bug Fix
+  * Enumeration handle where duplicates are created when converting to ruby style method by adding a '_1', '_2'
+
 Version 0.1.6
 * Bug Fix
   * Fix 'create_all' rake task

data/lib/leap_salesforce/ext/string.rb

@@ -28,6 +28,21 @@ class String
     to_ruby_friendly.snakecase.gsub(/__+/, '_')
   end
 
+  # @return [String] Return a key name that is unique to the hash
+  def to_key_name_for(hash)
+    key_name = to_key_name
+    index = 0
+    while hash[key_name]
+      if ('1'..'9').cover? key_name[-1]
+        key_name[-1] = (key_name[-1].to_i + 1).to_s
+      else
+        key_name += '_1'
+      end
+      break if (index += 1) >= 9
+    end
+    key_name
+  end
+
   # Convert string starting with number to a human string
   def humanize_numbered_string
     self[0] = ('0'..'9').cover?(self[0]) ? self[0].to_i.humanize : self[0]

data/lib/leap_salesforce/generator/soql_enums.rb

@@ -35,7 +35,9 @@ module LeapSalesforce
             picklist_name = picklist.to_key_name
             values = entity.picklist_for(picklist)
             @enum_values = {}
-            values.each { |value| @enum_values[value.to_key_name] = value }
+            values.each do |value|
+              @enum_values[value.to_key_name_for(@enum_values)] = value
+            end
             content = read_template 'picklist.rb.erb', binding
             file = File.join(ENUM_FOLDER, entity.to_s.snakecase, "#{picklist_name}.rb")
             generate_file file, content

data/lib/leap_salesforce/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LeapSalesforce
-  VERSION = '0.1.6'
+  VERSION = '0.1.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: leap_salesforce
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - IQA
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-24 00:00:00.000000000 Z
+date: 2019-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler