soda-ruby 0.2.25 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0782e1d64dc63adc16fc79be8821241dcf405dea
-  data.tar.gz: 5bba425efd018c2fc2581944a7968fae39d25a71
+  metadata.gz: d00d361a87bdc5ee192553bf474274690713f9b7
+  data.tar.gz: 7890da574470685b487450f491bb69941fcaaf36
 SHA512:
-  metadata.gz: 7c602e578abe213d3084579f335810f8a50df04d3a5036076c8fff04e0d0a4ca723d32f4d10d5b80886eb7f30ab41ac58f351678fbab75842aba3d4aad20d104
-  data.tar.gz: b8de2f1fba73987836ea4089e4f15c8491f8241296d99621b6579d35aab1ea7091aa9151229320cd161bced8bad79fbbf3704a3a8c866b996ddde3718be8b85e
+  metadata.gz: ee00eac803e3caf668d78cfcffcba1ebc3c1b72500d72a185f8863529b5d25ba70e396a4f8b860958cbbd9d72e43b362d518f0444b7cf15cee38d544e13ff42f
+  data.tar.gz: be7e11c9fce1c786a456db2fdd70f3c6bb7627a7dc82d57ea5a6a7765615c4f661ff3f03e98901931d6ebc4d3f291f17aef884fa3fe420c3f9209d3b92420f65

data/README.mkd

@@ -26,7 +26,19 @@ Create a new client. Register for an application token at <http://dev.socrata.co
 client = SODA::Client.new({:domain => "explore.data.gov", :app_token => "CGxadgoQlgQSev4zyUh5aR5J3"})
 ```
 
-Issue a filter query. `644b-gaut` is the identifier for the dataset we want to access. The return object is an array of [Hashie::Mash](https://github.com/intridea/hashie) objects:
+Issue a filter query. `644b-gaut` is the identifier for the dataset we want to access. 
+
+### As of version 1.0.0+
+
+The return object is the complete response object with a pre parsed body. The response.body object is an array of [Hashie::Mash].
+
+If you are upgrading from a version < 1.0.0 The previous object returned is now the response.body object.
+
+### Prior to version 1 (<1.0.0)
+
+The return object is an array of [Hashie::Mash] that represents the body of the response.
+
+(https://github.com/intridea/hashie) objects:
 
 ```ruby
 response = client.get("644b-gaut", {"$limit" => 1, :namelast => "WINFREY", :namefirst => "OPRAH"})

data/lib/soda/client.rb

@@ -182,22 +182,24 @@ module SODA
       "https://#{@config[:domain]}#{resource}#{extension}"
     end
 
+    # Returns a response with a parsed body
     def handle_response(response)
       # Check our response code
       check_response_fail(response)
-      if blank?(response.body)
-        return nil
-      elsif response['Content-Type'].include?('application/json')
-        # Return a bunch of mashes if we're JSON
-        response = JSON.parse(response.body, :max_nesting => false)
-        if response.is_a? Array
-          return response.map { |r| Hashie::Mash.new(r) }
-        else
-          return Hashie::Mash.new(response)
-        end
-      else
-        # We don't partically care, just return the raw body
-        return response.body
+      return nil if blank?(response.body)
+
+      # Return a bunch of mashes as the body if we're JSON
+      begin
+        response.body = JSON.parse(response.body, max_nesting: false)
+        response.body = if response.body.is_a? Array
+                        response.body.map { |r| Hashie::Mash.new(r) }
+                      else
+                        Hashie::Mash.new(response.body)
+                      end
+      rescue => exception
+        raise "JSON parsing failed. Error details: #{exception}"
+      ensure
+        return response
       end
     end
 
@@ -265,6 +267,7 @@ module SODA
       http = Net::HTTP.new(host, port)
       http.use_ssl = true
       http.verify_mode = OpenSSL::SSL::VERIFY_NONE if @config[:ignore_ssl]
+      http.open_timeout = @config[:timeout] if @config[:timeout]
       http.read_timeout = @config[:timeout] if @config[:timeout]
       http.set_debug_output(@config[:debug_stream]) if @config[:debug_stream]
       http

data/lib/soda/version.rb

@@ -1,3 +1,3 @@
 module SODA
-  VERSION = '0.2.25'
+  VERSION = '1.0.0'
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: soda-ruby
 version: !ruby/object:Gem::Version
-  version: 0.2.25
+  version: 1.0.0
 platform: ruby
 authors:
 - Chris Metcalf
+- Dominic Cicilio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-22 00:00:00.000000000 Z
+date: 2019-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -180,7 +181,7 @@ dependencies:
         version: '0'
 description: A simple wrapper for SODA 2.0. Includes an OmniAuth provider for OAuth
   2.0
-email: chris.metcalf@socrata.com
+email: dominic.cicilio@tylertech.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -211,7 +212,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: soda-ruby
-rubygems_version: 2.4.5
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: Ruby for SODA 2.0