bimbly 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3e11a328ed271b7f1c97eef441d9c7b50c6952e
-  data.tar.gz: c64b8e7607dab495c1af4417f8659d4e1ad44cc8
+  metadata.gz: e7c36f37dd2d247f733bbeb4d380ee12c42b4d37
+  data.tar.gz: 7987d33554de4e38667705ceef45e407a1689518
 SHA512:
-  metadata.gz: 91700face2b8c4d46599420e760087a616488b661522d4c58e8245f861e196bf97268ee98c1d8bd29f9c2a6ef2f94efad2c29a2d8b55ecc2cc3ce6b88099b731
-  data.tar.gz: 65c2d30304aa5b3943474623f7429f477ddcd781bbd15e4c6cedea8c4c60bb7d386b7c287abc111864425651c26ade0cc9c0182065574066e3f9d8729f869532
+  metadata.gz: ed68f34c77cdfeccb9dc7fd2d6ed89c5f320a40972a8977ae712739852b7af8cf773aa54daaccff099c05c1d346b4b607b86e19abb4cf2bfd0f0908351595fa5
+  data.tar.gz: 94d7be01a4f9868eb6b69f7dc3121812aa4c71de076bcbb151890328c3480ace31ee7e52078ea24806202360af0dacbdd39219b61b86e2e48f05d8b0844e09c9

data/lib/bimbly.rb

@@ -11,13 +11,17 @@ class Bimbly
 
   def initialize(opts = {})
     # Read in setup files
-    #@error_codes = YAML.load(File.read("#{File.dirname(__FILE__)}/errors_by_code.yml"))
-    #@error_names = YAML.load(File.read("#{File.dirname(__FILE__)}/errors_by_name.yml"))
-    @error_codes = YAML.load(File.read("#{File.dirname(__FILE__)}/error_codes.yml"))
-    #@obj_sets = YAML.load(File.read("#{File.dirname(__FILE__)}/object_sets.yml"))
-    @obj_sets = YAML.load(File.read("#{File.dirname(__FILE__)}/object_sets_v2.yml"))
-    @data_type = YAML.load(File.read("#{File.dirname(__FILE__)}/data_types.yml"))
-
+    if opts[:version] == "3"
+      opts.delete(:version)
+      @error_codes = YAML.load(File.read("#{File.dirname(__FILE__)}/error_codes_v3.yml"))
+      @obj_sets = YAML.load(File.read("#{File.dirname(__FILE__)}/object_sets_v3.yml"))
+      @data_type = YAML.load(File.read("#{File.dirname(__FILE__)}/data_types_v3.yml"))
+    else
+      @error_codes = YAML.load(File.read("#{File.dirname(__FILE__)}/error_codes_v4.yml"))
+      @obj_sets = YAML.load(File.read("#{File.dirname(__FILE__)}/object_sets_v4.yml"))
+      @data_type = YAML.load(File.read("#{File.dirname(__FILE__)}/data_types_v4.yml"))
+    end
+    
     @meth_name = nil
     
     @base_url = "NotConnected"
@@ -43,6 +47,13 @@ class Bimbly
     # Check if url is valid
     raise ArgumentError, "Invalid URL: #{uri}" unless uri =~ /\A#{URI::regexp}\z/
 
+    # Do some payload stuff to wrap with 'data' and make sure it's usable
+    if not payload.nil?
+#      payload = payload["data"] if payload.keys.size == 1 and payload.keys.include?("data")
+
+      payload = { data: payload }
+    end
+    
     payload = payload.to_json if payload.class == Hash
     
     begin
@@ -93,8 +104,6 @@ class Bimbly
     
     if @file
       conn_data = YAML.load(File.read(File.expand_path(@file)))
-      puts File.expand_path(@file)
-      puts conn_data
       conn_data = conn_data[@file_select] if @file_select
       @array = conn_data["array"]
       @cert = conn_data["cert"]
@@ -259,9 +268,16 @@ class Bimbly
         uri = gen_uri(url_suffix: url_suffix,
                       params: opts[:params])
 
+        payload = opts[:payload]
+        # Unwrap the payload data if it is json or wrapped in 'data' so we can inspect the attrs
+        if not payload.nil?
+          payload = JSON.parse(payload) if payload.class == String
+          payload = payload["data"] if payload.keys.include?("data")
+        end
+        
         @uri = uri
         @verb = hash[:verb]
-        @payload = opts[:payload]        
+        @payload = payload
         
         if not opts[:params].nil?
           opts[:params].each { |key, value|
@@ -281,16 +297,16 @@ class Bimbly
 
         raise ArgumentError,
               "Must supply :payload with attributes #{mando_array} on #{method_name}" if
-          not mando_array.empty? and opts[:payload].nil?
+          not mando_array.empty? and payload.nil?
         
         mando_array.each { |ele|
           raise ArgumentError,
                 "\'#{ele}\' is a mandatory attribute in the payload for #{method_name}: Please supply these attributes #{mando_array}" unless
-            opts[:payload].keys.to_s.include?(ele)
+            payload.keys.to_s.include?(ele)
         }
 
-        if not opts[:payload].nil?
-          opts[:payload].keys.each { |key|
+        if not payload.nil?
+          payload.keys.each { |key|
             raise ArgumentError,
                   "The attribute \'#{key}\' is not an available attribute for #{method_name}" unless
               hash[:request].keys.include?(key.to_s)