soda-ruby 0.2.2 → 0.2.4

data/lib/soda/client.rb

@@ -21,8 +21,15 @@ module SODA
         resource = "/resource/" + resource
       end
 
+      # Check to see if we were given an output type
+      extension = ".json"
+      if matches = resource.match(/^(.+)(\.\w+)$/)
+        resource = matches.captures[0]
+        extension = matches.captures[1]
+      end
+
       # Create our request
-      uri = URI.parse("https://#{@config[:domain]}#{resource}.json?#{query}")
+      uri = URI.parse("https://#{@config[:domain]}#{resource}#{extension}?#{query}")
       http = Net::HTTP.new(uri.host, uri.port)
       http.use_ssl = true
 
@@ -41,12 +48,17 @@ module SODA
       if response.code != "200"
         raise "Error querying \"#{uri.to_s}\": #{response.body}"
       else
-        # Return a bunch of mashes
-        response = JSON::parse(response.body)
-        if response.is_a? Array
-          return response.collect { |r| Hashie::Mash.new(r) }
+        if extension == ".json"
+          # Return a bunch of mashes if we're JSON
+          response = JSON::parse(response.body)
+          if response.is_a? Array
+            return response.collect { |r| Hashie::Mash.new(r) }
+          else
+            return Hashie::Mash.new(response)
+          end
         else
-          return Hashie::Mash.new(response)
+          # We don't partically care, just return the raw body
+          return response.body
         end
       end
     end
@@ -131,6 +143,41 @@ module SODA
       end
     end
 
+    def delete(resource, body = "", params = {})
+      query = query_string(params)
+
+      # If we didn't get a full path, assume "/resource/"
+      if !resource.start_with?("/")
+        resource = "/resource/" + resource
+      end
+
+      # Create our request
+      uri = URI.parse("https://#{@config[:domain]}#{resource}.json?#{query}")
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = true
+
+      request = Net::HTTP::Delete.new(uri.request_uri)
+      request.add_field("X-App-Token", @config[:app_token])
+      request.content_type = "application/json"
+      request.body = body.to_json
+
+      # Authenticate if we're supposed to
+      if @config[:username]
+        request.basic_auth @config[:username], @config[:password]
+      end
+
+      # BAM!
+      response = http.request(request)
+
+      # Check our response code
+      if response.code != "200"
+        raise "Error querying \"#{uri.to_s}\": #{response.body}"
+      else
+        # Return a bunch of mashes
+        return response
+      end
+    end
+
     private
       def query_string(params) 
         # Create query string of escaped key, value pairs

data/lib/soda/version.rb

@@ -1,3 +1,3 @@
 module SODA
-  VERSION = "0.2.2"
+  VERSION = "0.2.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: soda-ruby
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-13 00:00:00.000000000 Z
+date: 2013-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -59,7 +59,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: soda-ruby
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Ruby for SODA 2.0