soda-ruby 0.2.5 → 0.2.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 03728c85703cdcf58f02132e9e296fc4600dcf55
+  data.tar.gz: 38e6f85d3d02a3189dd6176954233a450eea6dfc
+SHA512:
+  metadata.gz: ffab275d914f469e2c6292a3c2ecba5f72aa6ac9fe525f3665e2d78bd3009ee769d11ac0f12279ea102d8a76a215f51ad2c1d57ea53b9fc566513c38595a64e9
+  data.tar.gz: d5cf160a323314a370e9da4fd9fd0243f6e346231dc017127569973d48d396ef06c5fd70ebb3a88edd7af8e2102f42cd09de0897efb9d2d9173552d408fdd9da

data/CHANGELOG.mkd

@@ -2,3 +2,4 @@
 0.2.1 - Point release to update gemspec dependencies
 ...
 0.2.4 - Point release including tests that are now mocked properly
+0.2.6 - Code cleanup from @raykao

data/lib/soda/client.rb

@@ -15,70 +15,19 @@ module SODA
     end
 
     def get(resource, params = {})
-      query = query_string(params)
-      path = resource_path(resource)
-
-      # Create our request
-      uri = URI.parse("https://#{@config[:domain]}#{path}?#{query}")
-      http = Net::HTTP.new(uri.host, uri.port)
-      http.use_ssl = true
-
-      request = Net::HTTP::Get.new(uri.request_uri)
-      request.add_field("X-App-Token", @config[:app_token])
-
-      # Authenticate if we're supposed to
-      if @config[:username]
-        request.basic_auth @config[:username], @config[:password]
-      end
-
-      # BAM!
-      return handle_response(http.request(request))
+      connection(:get, resource, nil, params)
     end
 
-    def post(resource, body = "", params = {})
-      query = query_string(params)
-      path = resource_path(resource)
-
-      # Create our request
-      uri = URI.parse("https://#{@config[:domain]}#{path}?#{query}")
-      http = Net::HTTP.new(uri.host, uri.port)
-      http.use_ssl = true
-
-      request = Net::HTTP::Post.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!
-      return handle_response(http.request(request))
+    def post(resource, body = nil, params = {})
+      connection(:post, resource, body, params)
     end
 
-    def put(resource, body = "", params = {})
-      query = query_string(params)
-      path = resource_path(resource)
-
-      # Create our request
-      uri = URI.parse("https://#{@config[:domain]}#{path}?#{query}")
-      http = Net::HTTP.new(uri.host, uri.port)
-      http.use_ssl = true
-
-      request = Net::HTTP::Put.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
+    def put(resource, body = nil, params = {})
+      connection(:put, resource, body, params)
+    end
 
-      # BAM!
-      return handle_response(http.request(request))
+    def delete(resource, body = nil, params = {})
+      connection(:delete, resource, body, params)
     end
 
     def upload_file(path, filename, params = {}, field = 'file', remote_filename = filename)
@@ -144,41 +93,6 @@ module SODA
       return handle_response(http.request(request))
     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
@@ -220,5 +134,45 @@ module SODA
           end
         end
       end
+
+      def connection(method = "Get", resource = nil, body = nil, params = {})
+        method = method.to_sym.capitalize
+
+        query = query_string(params)
+
+        path = resource_path(resource)
+
+        uri = URI.parse("https://#{@config[:domain]}#{path}?#{query}")
+
+        http = Net::HTTP.new(uri.host, uri.port)
+        http.use_ssl = true
+        request = eval("Net::HTTP::#{method.capitalize}").new(uri.request_uri)
+        request.add_field("X-App-Token", @config[:app_token])
+
+        if method === :Post || :Put || :Delete
+          request.content_type = "application/json"
+          request.body = body.to_json
+        end
+
+        # Authenticate if we're supposed to
+
+        if @config[:username]
+          request.basic_auth @config[:username], @config[:password]
+        end
+
+        if method === :Delete
+          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
+        else
+          return handle_response(http.request(request))
+        end
+      end
+
   end
 end

data/lib/soda/version.rb

@@ -1,3 +1,3 @@
 module SODA
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

metadata

@@ -1,30 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: soda-ruby
 version: !ruby/object:Gem::Version
-  version: 0.2.5
-  prerelease: 
+  version: 0.2.6
 platform: ruby
 authors:
 - Chris Metcalf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-17 00:00:00.000000000 Z
+date: 2014-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A simple wrapper for SODA 2.0
@@ -41,26 +38,25 @@ files:
 - README.mkd
 homepage: http://github.com/socrata/soda-ruby
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: soda-ruby
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby for SODA 2.0
 test_files: []