soda-ruby 0.2.17 → 0.2.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb57c12f85945c0ba10302b788dc842132144222
-  data.tar.gz: 1695289f0ffa9b4bcd1f40e7393edb1ecd0409cf
+  metadata.gz: 8b31234fb24d9b3e2a6e895c687f8c5036b8c2f9
+  data.tar.gz: 4b60658e6a62db5cf3c42a74819c0018b32059a5
 SHA512:
-  metadata.gz: b79d9a2617dc802c7669ec27e02042c75c7cdcff13eda556171010d0b8eb10f85dfd360ede73ef7a2cebfc17dec38f6cfaca0b7fb7073094661ea203a17601ae
-  data.tar.gz: 8a5d329098bafa0f38c417b2fa750a1fa2065440562b8454d184e3c0abb522f739e1b4d4c4583c42e7df80ea3f1056eb0621190227688986055e1950535624c4
+  metadata.gz: 4e27a9b90898ec21331984a8ac4b7d79db6516ceb7d047e8a8c3fac9f3dc6383ffa65e1e48a1ebb205d22b2573d357fb10fe3890d775df84d858590973863e36
+  data.tar.gz: 69117b56f9280ffeea188b074c0409f7835e36f3f250e6be302c20830675b627b899687c21bf83ce9fac62feb6125206ee9b9ea8d08ddac770eca12429c3e40c

data/README.mkd

@@ -1,3 +1,6 @@
+[![Build status](https://ci.appveyor.com/api/projects/status/4uaa2irr26deoffv?svg=true)](https://ci.appveyor.com/project/chrismetcalf/soda-ruby)
+[![Build Status](https://travis-ci.org/socrata/soda-ruby.svg?branch=master)](https://travis-ci.org/socrata/soda-ruby)
+
 For more details and for documentation, check out <http://socrata.github.io/soda-ruby> or our [developer portal](http://dev.socrata.com).
 
 ## Installation

data/lib/omniauth-socrata.rb

@@ -3,20 +3,19 @@ require 'omniauth-oauth2'
 module OmniAuth
   module Strategies
     class Socrata < OmniAuth::Strategies::OAuth2
-      option :name, "socrata"
+      option :name, 'socrata'
 
-      option :client_options, {
-        :site => "https://opendata.socrata.com",
-        :authorize_url => "http://opendata.socrata.com/oauth/authorize",
+      option :client_options,
+        :site                   => 'https://opendata.socrata.com',
+        :authorize_url          => 'http://opendata.socrata.com/oauth/authorize',
         :provider_ignores_state => true
-      }
 
       # Sets the UID from the user's info
-      uid{ raw_info['id'] }
+      uid { raw_info['id'] }
 
       info do
         {
-          :name => raw_info['name'],
+          :name  => raw_info['name'],
           :email => raw_info['email']
         }
       end

data/lib/soda/client.rb

@@ -40,7 +40,8 @@ module SODA
     # * +:password+ - Your Socrata password (optional, only necessary for modifying data)
     # * +:app_token+ - Your Socrata application token (register at http://dev.socrata.com/register)
     # * +:access_token+ - Your Socrata OAuth token (optional, https://dev.socrata.com/docs/authentication.html)
-    # * +:ignore_ssl+ - Ignore ssl errors (defaults to false)
+    # * +:ignore_ssl+ - Ignore SSL errors, which is very unsafe and only should be done in desperate circumstances (defaults to false)
+    # * +:debug_stream+ - Set an output stream for debugging
     #
     # Returns a SODA::Client instance.
     #
@@ -246,6 +247,7 @@ module SODA
       http.use_ssl = true
       http.verify_mode = OpenSSL::SSL::VERIFY_NONE if @config[:ignore_ssl]
       http.read_timeout = @config[:timeout] if @config[:timeout]
+      http.set_debug_output(@config[:debug_stream]) if @config[:debug_stream]
       http
     end
 

data/lib/soda/exceptions.rb

@@ -1,70 +1,70 @@
 # Adapted (lifted) from RestClient: https://github.com/rest-client/rest-client/blob/master/lib/restclient/exceptions.rb
 module SODA
-
-  STATUSES = {100 => 'Continue',
-              101 => 'Switching Protocols',
-              102 => 'Processing', #WebDAV
-
-              200 => 'OK',
-              201 => 'Created',
-              202 => 'Accepted',
-              203 => 'Non-Authoritative Information', # http/1.1
-              204 => 'No Content',
-              205 => 'Reset Content',
-              206 => 'Partial Content',
-              207 => 'Multi-Status', #WebDAV
-
-              300 => 'Multiple Choices',
-              301 => 'Moved Permanently',
-              302 => 'Found',
-              303 => 'See Other', # http/1.1
-              304 => 'Not Modified',
-              305 => 'Use Proxy', # http/1.1
-              306 => 'Switch Proxy', # no longer used
-              307 => 'Temporary Redirect', # http/1.1
-
-              400 => 'Bad Request',
-              401 => 'Unauthorized',
-              402 => 'Payment Required',
-              403 => 'Forbidden',
-              404 => 'Not Found',
-              405 => 'Method Not Allowed',
-              406 => 'Not Acceptable',
-              407 => 'Proxy Authentication Required',
-              408 => 'Request Timeout',
-              409 => 'Conflict',
-              410 => 'Gone',
-              411 => 'Length Required',
-              412 => 'Precondition Failed',
-              413 => 'Request Entity Too Large',
-              414 => 'Request-URI Too Long',
-              415 => 'Unsupported Media Type',
-              416 => 'Requested Range Not Satisfiable',
-              417 => 'Expectation Failed',
-              418 => 'I\'m A Teapot', #RFC2324
-              421 => 'Too Many Connections From This IP',
-              422 => 'Unprocessable Entity', #WebDAV
-              423 => 'Locked', #WebDAV
-              424 => 'Failed Dependency', #WebDAV
-              425 => 'Unordered Collection', #WebDAV
-              426 => 'Upgrade Required',
-              428 => 'Precondition Required', #RFC6585
-              429 => 'Too Many Requests', #RFC6585
-              431 => 'Request Header Fields Too Large', #RFC6585
-              449 => 'Retry With', #Microsoft
-              450 => 'Blocked By Windows Parental Controls', #Microsoft
-
-              500 => 'Internal Server Error',
-              501 => 'Not Implemented',
-              502 => 'Bad Gateway',
-              503 => 'Service Unavailable',
-              504 => 'Gateway Timeout',
-              505 => 'HTTP Version Not Supported',
-              506 => 'Variant Also Negotiates',
-              507 => 'Insufficient Storage', #WebDAV
-              509 => 'Bandwidth Limit Exceeded', #Apache
-              510 => 'Not Extended',
-              511 => 'Network Authentication Required', # RFC6585
+  STATUSES = {
+    100 => 'Continue',
+    101 => 'Switching Protocols',
+    102 => 'Processing', # WebDAV
+
+    200 => 'OK',
+    201 => 'Created',
+    202 => 'Accepted',
+    203 => 'Non-Authoritative Information', # http/1.1
+    204 => 'No Content',
+    205 => 'Reset Content',
+    206 => 'Partial Content',
+    207 => 'Multi-Status', # WebDAV
+
+    300 => 'Multiple Choices',
+    301 => 'Moved Permanently',
+    302 => 'Found',
+    303 => 'See Other', # http/1.1
+    304 => 'Not Modified',
+    305 => 'Use Proxy', # http/1.1
+    306 => 'Switch Proxy', # no longer used
+    307 => 'Temporary Redirect', # http/1.1
+
+    400 => 'Bad Request',
+    401 => 'Unauthorized',
+    402 => 'Payment Required',
+    403 => 'Forbidden',
+    404 => 'Not Found',
+    405 => 'Method Not Allowed',
+    406 => 'Not Acceptable',
+    407 => 'Proxy Authentication Required',
+    408 => 'Request Timeout',
+    409 => 'Conflict',
+    410 => 'Gone',
+    411 => 'Length Required',
+    412 => 'Precondition Failed',
+    413 => 'Request Entity Too Large',
+    414 => 'Request-URI Too Long',
+    415 => 'Unsupported Media Type',
+    416 => 'Requested Range Not Satisfiable',
+    417 => 'Expectation Failed',
+    418 => 'I\'m A Teapot', # RFC2324
+    421 => 'Too Many Connections From This IP',
+    422 => 'Unprocessable Entity', # WebDAV
+    423 => 'Locked', # WebDAV
+    424 => 'Failed Dependency', # WebDAV
+    425 => 'Unordered Collection', # WebDAV
+    426 => 'Upgrade Required',
+    428 => 'Precondition Required', # RFC6585
+    429 => 'Too Many Requests', # RFC6585
+    431 => 'Request Header Fields Too Large', # RFC6585
+    449 => 'Retry With', # Microsoft
+    450 => 'Blocked By Windows Parental Controls', # Microsoft
+
+    500 => 'Internal Server Error',
+    501 => 'Not Implemented',
+    502 => 'Bad Gateway',
+    503 => 'Service Unavailable',
+    504 => 'Gateway Timeout',
+    505 => 'HTTP Version Not Supported',
+    506 => 'Variant Also Negotiates',
+    507 => 'Insufficient Storage', # WebDAV
+    509 => 'Bandwidth Limit Exceeded', # Apache
+    510 => 'Not Extended',
+    511 => 'Network Authentication Required', # RFC6585
   }
 
   # This is the base exception class. Rescue it if you want to
@@ -79,7 +79,7 @@ module SODA
     attr_accessor :data
     attr_writer :message
 
-    def initialize response = nil, initial_response_code = nil
+    def initialize(response = nil, initial_response_code = nil)
       @response = response
       @message = nil
       @initial_response_code = initial_response_code
@@ -121,7 +121,6 @@ module SODA
 
   # The request failed with an error code not managed by the code
   class RequestFailed < ExceptionWithResponse
-
     def default_message
       "HTTP status code #{http_code}"
     end
@@ -144,7 +143,7 @@ module SODA
   # Create HTTP status exception classes
   STATUSES.each_pair do |code, message|
     klass = Class.new(RequestFailed) do
-      send(:define_method, :default_message) {"#{http_code ? "#{http_code} " : ''}#{message}"}
+      send(:define_method, :default_message) { "#{http_code ? "#{http_code} " : ''}#{message}" }
     end
     klass_constant = const_set(message.delete(' \-\''), klass)
     Exceptions::EXCEPTIONS_MAP[code] = klass_constant
@@ -163,7 +162,7 @@ module SODA
     # NB: Previous releases of rest-client would raise RequestTimeout both for
     # HTTP 408 responses and for actual connection timeouts.
     class Timeout < SODA::RequestTimeout
-      def initialize(message=nil, original_exception=nil)
+      def initialize(message = nil, original_exception = nil)
         super(nil, nil)
         self.message = message if message
         self.original_exception = original_exception if original_exception
@@ -187,7 +186,6 @@ module SODA
     end
   end
 
-
   # The server broke the connection prior to the request completing.  Usually
   # this means it crashed, or sometimes that your network connection was
   # severed before it could complete.

data/lib/soda/version.rb

@@ -1,3 +1,3 @@
 module SODA
-  VERSION = '0.2.17'
+  VERSION = '0.2.18'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: soda-ruby
 version: !ruby/object:Gem::Version
-  version: 0.2.17
+  version: 0.2.18
 platform: ruby
 authors:
 - Chris Metcalf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-29 00:00:00.000000000 Z
+date: 2016-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -177,7 +177,6 @@ files:
 - lib/soda.rb
 - lib/soda/client.rb
 - lib/soda/exceptions.rb
-- lib/soda/smartupdate.rb
 - lib/soda/version.rb
 homepage: http://github.com/socrata/soda-ruby
 licenses: []
@@ -198,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: soda-ruby
-rubygems_version: 2.2.3
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Ruby for SODA 2.0

data/lib/soda/smartupdate.rb

@@ -1,63 +0,0 @@
-#!/usr/bin/env ruby
-#
-# A Ruby client to the Socrata SmartUpdate API
-#
-# For more details, check out http://socrata.github.io/soda-ruby
-#
-
-require 'soda/client'
-
-module SODA
-  class SmartUpdate
-    ##
-    #
-    # Creates a new SmartUpdate client.
-    #
-    # * +config+ - A hash of the options to initialize the client with. The options are the same as SODA::Client
-    #
-    # == Config Options
-    #
-    # * +:domain+ - The domain you want to access
-    # * +:username+ - Your Socrata username (optional, only necessary for modifying data)
-    # * +:password+ - Your Socrata password (optional, only necessary for modifying data)
-    # * +:app_token+ - Your Socrata application token (register at http://dev.socrata.com/register)
-    # * +:ignore_ssl+ - Ignore ssl errors (defaults to false)
-    #
-    # Returns a SODA::Client instance.
-    #
-    # == Example
-    #
-    #   client = SODA::Client.new({ :domain => "data.agency.gov", :app_token => "CGxarwoQlgQSev4zyUh5aR5J3" })
-    #
-    def initialize(config = {})
-      @config = config.inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo}
-      @client = SODA::Client.new(@config)
-
-      # Fetch version and blocksize information from the service
-      @blocksize = @client.get("/datasync/version.json")["max-block-size"]
-    end
-
-    # Chunks a file for smart-updating and uploads it
-    def upload(uid, filename, options = {})
-      options = DEFAULT_OPTIONS.merge(options)
-
-      # Determine the file size, and ideal chunk size
-      filesize = File.size(filename)
-      blocks = (0..filesize).step(@blocksize).collect do |offset|
-        @client.post("/datasync/id/#{uid}", 
-                     IO.read(filename, @blocksize, offset)).blobId
-      end
-      return blocks
-    end
-
-    # Commits a set of chunks to be written
-    def commit(uid, filename, chunks)
-      @client.post("/datasync/id/#{uid}/commit", {:filename => filename, :chunks => chunks}).jobId
-    end
-
-    # Check on the status of a job
-    def check(uid, job_id)
-      @client.get("/datasync/id/#{uid}/status/#{job_id}", nil, nil)
-    end
-  end
-end