SFDO-API 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be6528c0a458a146c3ae52b5a59b9504d81cd219
-  data.tar.gz: 28b4defea23aac1e34fb703d69b3872a9d0aff75
+  metadata.gz: babfcf40f932d8dd641788b972341bdf8b0ef602
+  data.tar.gz: 169d8dcc00a47bcb0249df2370cd294a13675a2e
 SHA512:
-  metadata.gz: f3375dd2d43439605a4ec80155323a0d88651ccf7526808d18fb0babb1c086257e8e732b4f9b6e72d1fdb57f79a1fd80135c1fc85da2d923317fa8d0adafe09f
-  data.tar.gz: f5ae2b0277f5fd587ee8a000c9fd326e76a08f9132cf8720c57fb3833dfe55fad9098642425767326c702a9a8d14522eec8355d611bf1df856831c6767775775
+  metadata.gz: 165c8a21f5e2b246e3c0b960f96d0d20cee1f454f888403451d2ec1267358e116a50f8ab01d2b9bedd145c0e3dcc9778ccdad915e7fd30b8e1ce9b91da6ff44e
+  data.tar.gz: 60ab690da0d5a07dddc8a6371d579dc2241ff65a4d27ec3397a49a3934b3d237a1a21cd4d49805e704f5cd70ae74e54541345c6bcb29d03d4bd83c61d42685b2

data/README.md

@@ -50,12 +50,16 @@ When issuing a SELECT query, use the select_api() method with your query:
   end
 ```
 
-When doing SELECT for a custom object, leave off any namespace value, SFDO-API retrieves the appropriate namespace at run time:
+When doing operations for a custom object, leave off any namespace value at the front of the object name, and leave off any custom 
+trailer values like "__c" or "__r": SFDO-API retrieves the appropriate namespace and trailer values at run time. Instead of 
+addressing "npsp__General_Accounting_Unit__c" use plain "General_Accounting_Unit" instead
+
 ```ruby
-      gaus = select_api 'select Id from General_Accounting_Unit__c'
+      gaus = select_api 'select Id from General_Accounting_Unit'
 ```      
 
 To delete a single instance of an object for which you have the Id value
+
 ```ruby
   def delete_account_via_api
    delete_one_account(@account_id)
@@ -85,22 +89,24 @@ To delete all instances of an object
 
 ### Custom Objects
 
-To create instances of custom objects do not use any namespace value, SFDO-API does that for you
+To create instances of custom objects do not use any namespace value at the front of the object name, and leave off any custom 
+trailer values like "__c" or "__r, SFDO-API handles that for you. Instead of addressing "npsp__General_Accounting_Unit__c" 
+use plain "General_Accounting_Unit" instead:
 
 ```ruby
   def create_gau_via_api(gau_name)
-    @gau_id = create 'General_Accounting_Unit__c', Name: gau_name
+    @gau_id = create 'General_Accounting_Unit', Name: gau_name
   end
 ```
 
-When using delete_one_foo or delete_all_foo do not use any namespace value, SFDO-API does that for you
+When using delete_one_foo or delete_all_foo do not use any custom namespace value, SFDO-API does that for you
 
 ```ruby
   def delete_gaus_via_api
     api_client do
-            gaus = select_api 'select Id from General_Accounting_Unit__c'
+            gaus = select_api 'select Id from General_Accounting_Unit'
 puts gaus.inspect
-      delete_all_General_Accounting_Unit__c(gaus)
+      delete_all_General_Accounting_Unit(gaus)
     end
   end
 ```

data/lib/SFDO/API.rb

@@ -73,23 +73,34 @@ module SfdoAPI
   end
 
   def true_object_name(handle) #either an ID or a string name
+    handle = (handle.end_with?("__c") || handle.end_with?("__r")) ? handle[0...-3] : handle
     from_id = prefix_to_name[handle[0..2]]
-    from_name = obj_names_without_namespace[handle]
+    from_name = obj_names_without_custom_additions[handle]
     if !from_name.nil? || !from_id.nil?
       return from_name if from_id.nil?
       return from_id if from_name.nil?
     end
-    return 'invalid'
+    return 'Unable to find object. Be sure to call SFDO-API without preceding namespace or following __c or __r'
   end
 
-  def obj_names_without_namespace
-    if @obj_names_without_namespace.nil? || !@obj_names_without_namespace.respond_to?(:contains)
-      @obj_names_without_namespace = {}
+  def obj_names_without_custom_additions
+    if @obj_names_without_custom_additions.nil? || !@obj_names_without_custom_additions.respond_to?(:contains)
+      @obj_names_without_custom_additions = {}
       org_describe.each do |z|
-        @obj_names_without_namespace.store(z.name.split("__",2).last, z.name)
+        tmp_var = z.name.split "__"
+        save = ""
+        case tmp_var.size
+          when 2
+            save = tmp_var.first
+          when 3
+            save = tmp_var[1]
+          else
+            save = tmp_var.last
+        end
+        @obj_names_without_custom_additions.store(save, z.name)
       end
     end
-    @obj_names_without_namespace
+    @obj_names_without_custom_additions
   end
 
   def get_object_describe(object_name)

data/lib/SFDO/API/version.rb

@@ -1,5 +1,5 @@
 module SFDO
   module API
-    VERSION = "0.1.6"
+    VERSION = "0.1.7"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: SFDO-API
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Chris McMahon
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-14 00:00:00.000000000 Z
+date: 2016-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler