soda-ruby 0.2.18 → 0.2.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b31234fb24d9b3e2a6e895c687f8c5036b8c2f9
-  data.tar.gz: 4b60658e6a62db5cf3c42a74819c0018b32059a5
+  metadata.gz: 02d3559111d07cf16cb51d2e2ed9324cb45679ac
+  data.tar.gz: 13ea33266e56d7c05761ff0b978e7c076859b44c
 SHA512:
-  metadata.gz: 4e27a9b90898ec21331984a8ac4b7d79db6516ceb7d047e8a8c3fac9f3dc6383ffa65e1e48a1ebb205d22b2573d357fb10fe3890d775df84d858590973863e36
-  data.tar.gz: 69117b56f9280ffeea188b074c0409f7835e36f3f250e6be302c20830675b627b899687c21bf83ce9fac62feb6125206ee9b9ea8d08ddac770eca12429c3e40c
+  metadata.gz: 1c447fd8cf0ffd2a7ebfd73c112e4cd17c47c5874f90312386bcc0afa371914d7fd60e55c1d9d2ffbd9477a17221747d2cea743c075daa9dbdc4c23111a0aaaa
+  data.tar.gz: 500e60cdd207ca6ee117cab2b6790789f12d9115d14a5c990d27f06f0315398f25477eaf8f0e27365611c7c516514a46e9ddd66850af2670f28ac4757fef4af2

data/README.mkd

@@ -42,6 +42,13 @@ datetime_response = client.get("4tka-6guv", {"$where" => "datetime > '2012-09-14
 #=> [#<Hashie::Mash datetime="2012-09-14T10:10:19" depth="8.2" earthquake_id="00388609" location=#<Hashie::Mash latitude="36.9447" longitude="-117.6778" needs_recoding=false> magnitude="1.7" number_of_stations="29" region="Northern California" source="nn" version="9">, #<Hashie::Mash datetime="2012-09-14T10:06:11" depth="6.4" earthquake_id="00388607" location=#<Hashie::Mash latitude="36.9417" longitude="-117.6903" needs_recoding=false> magnitude="1.7" number_of_stations="29" region="Central California" source="nn" version="9">, ... ]
 ```
 
+You can also provide a full URI to an API endpoint instead of specifying the ID. Just copy and paste the dataset URI from the API documentation!
+
+```ruby
+client = SODA::Client.new({:domain => "soda.demo.socrata.com"})
+magnitude_response = client.get("https://soda.demo.socrata.com/resource/4tka-6guv.json", {"$where" => "magnitude > '3.0'"})
+```
+
 All the field names have built in getter methods since the objects are Hashie::Mashes.
 
 ```ruby

data/lib/soda/client.rb

@@ -132,9 +132,15 @@ module SODA
     end
 
     def post_form(resource, body = {}, params = {})
-      query = query_string(params)
-      path = resource_path(resource)
-      uri = URI.parse("https://#{@config[:domain]}#{path}?#{query}")
+      # We'll combine any params we got from our base resource with
+      # those passed in
+      base = URI.parse(parse_resource(resource))
+      query = [
+        base.query,
+        query_string(params)
+      ].reject { |s| s.nil? || s.empty? }.join "&"
+
+      uri = URI.parse("https://#{base.host}#{base.path}?#{query}")
 
       request = Net::HTTP::Post.new(uri.request_uri)
       add_default_headers_to_request(request)
@@ -155,7 +161,10 @@ module SODA
       params.map { |key, val| "#{key}=#{CGI.escape(val.to_s)}" }.join('&')
     end
 
-    def resource_path(resource)
+    def parse_resource(resource)
+      # If our resource starts with HTTPS, assume they've passed in a full URI
+      return resource if resource.start_with?("https://")
+
       # If we didn't get a full path, assume "/resource/"
       resource = '/resource/' + resource unless resource.start_with?('/')
 
@@ -166,7 +175,8 @@ module SODA
         extension = matches.captures[1]
       end
 
-      resource + extension
+      raise "No base domain specified!" unless @config[:domain]
+      return "https://#{@config[:domain]}#{resource}#{extension}"
     end
 
     def handle_response(response)
@@ -204,9 +214,15 @@ module SODA
     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}")
+      # We'll combine any params we got from our base resource with
+      # those passed in
+      base = URI.parse(parse_resource(resource))
+      query = [
+        base.query,
+        query_string(params)
+      ].reject { |s| s.nil? || s.empty? }.join "&"
+
+      uri = URI.parse("https://#{base.host}#{base.path}?#{query}")
 
       request = eval("Net::HTTP::#{method}").new(uri.request_uri)
       add_default_headers_to_request(request)

data/lib/soda/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: soda-ruby
 version: !ruby/object:Gem::Version
-  version: 0.2.18
+  version: 0.2.19
 platform: ruby
 authors:
 - Chris Metcalf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-04 00:00:00.000000000 Z
+date: 2016-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -164,6 +164,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A simple wrapper for SODA 2.0. Includes an OmniAuth provider for OAuth
   2.0
 email: chris.metcalf@socrata.com