tincan-api 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f64e7a7649965aeac3ef3832c939a414e02dc74
-  data.tar.gz: e67d61aef060c0a2cfbc50da62fb09a98cf0fcac
+  metadata.gz: 9fc6f3001af185fdce2a88b1c3abbb07067b7c8c
+  data.tar.gz: 61d654441022c1c9a4f5e17fdf925ad6b2fd4799
 SHA512:
-  metadata.gz: ae59859e7eb558c56eac36f91dc417d4f867af4b5feaca04273a9d00adb7432e8fa8bff0672058ecdf73c203a5b0f329db605234dd37cfa112c05991b7ae2924
-  data.tar.gz: 211ef49e12844a42b505acdae60afcba8e477dc505996cdc91c603d087bec94ebce4e5e8d7fb9a09092950130f113109d07ae59f8d9093b47f5a0d517326893f
+  metadata.gz: 371f62ac06857b64d0575b4d152b1525c2693c0fcce932697610c0ca6f4b3145d08e0da36fac0db17dc98cf0251a40f6350cda4a28c2f04625aeffb49fbc0cc2
+  data.tar.gz: 9895e8f1e13cc422c0f6de4b49b86d60f42a9c6d36e3406bc29b3a644ebdfc2b0a043bc478ded39a17f4b58102c70e18bcc0c2bbe8e793bada4dc2cd2c52a716

data/lib/tincan.rb

@@ -17,9 +17,13 @@ class TinCan
                 when Hash
                     return read_response(req(method, query.to_json))
                 when String
-                    return read_response(req(method, query)) # Assume it's JSON
+                	if is_json?(query)
+                		return read_response(req(method, query))
+            		else
+            			raise ArgumentError, "Query must be valid JSON if it is a String"
+        			end
                 else
-                    raise "Query needs to either be a hash or a JSON string"
+                    raise ArgumentError, "Query argument must be a string or hash"
             end
         end
     end
@@ -46,4 +50,14 @@ class TinCan
             res = JSON.parse(res)
             return res["data"] || res["success"] || res["error"]
         end
+
+        def is_json?(json)
+        	return false unless json.is_a?(String)
+        	begin
+        		JSON.parse(json)
+        		return true
+        	rescue JSON::ParserError
+        		return false
+        	end
+        end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tincan-api
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Charles Hollenbeck
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-08 00:00:00.000000000 Z
+date: 2014-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty