drill-sergeant 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5cdb7282b775f1c7230459d0a2479c1e555f951d
-  data.tar.gz: 1233bc819be136fccf7a3016cd703dc7b84835d1
+  metadata.gz: 80d003315bf5824c3353dd3ebd29e9ece7cd2bcd
+  data.tar.gz: 93b0259479a5e8dfa5c71ad5b44729f53ce5d9a7
 SHA512:
-  metadata.gz: e3f4a2c584488f9cdd57d99d847d735bd705422c912abdf8c6be59e5c363d8b814b6d9497f99b3d29c407207065062bd6f7941a3fe5cd3a21992f621c5f78831
-  data.tar.gz: a34d46fd69ceb73ebcc876a8bb9dc24c8f2df2e62513c597d5ab9804dc6fc35e65cb8e4158e3bb12370f42471565d2d936f9f790f1cb699a6dba459e27ad4262
+  metadata.gz: 693314e6cdddd0341a58fa51cd18c2e3fdce9e493889a5fc76383af6f8deee14c11abf5ffe0f6c85e3d5c4c75c0c5e135356076c92c316b53898ebb66c59d866
+  data.tar.gz: 92eea0291ab3c39ea6bc7dde2e7c1c92395a2d1a76f5324fececd35d4bed2c7ebc4b1c709a94a314c579388693227fec08bec0c4d0fc8ecb91cd6c84ad73f654

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.1.1
+
+- Return columns in correct order
+
 ## 0.1.0
 
 - First release

data/README.md

@@ -18,8 +18,15 @@ gem 'drill-sergeant'
 
 ## How to Use
 
+Create a client
+
 ```ruby
 drill = Drill.new(url: "http://localhost:8047")
+```
+
+And query away
+
+```ruby
 drill.query("SELECT * FROM dfs.`/path/to/some/file.csvh`")
 ```
 

data/lib/drill.rb

@@ -5,21 +5,26 @@ require "drill/version"
 class Drill
   class Error < StandardError; end
 
+  HEADERS = {
+    "Content-Type" => "application/json",
+    "Accept" => "application/json"
+  }
+
   def initialize(url: nil)
     url ||= ENV["DRILL_URL"] || "http://localhost:8047"
-    @uri = URI.parse("#{url}/query.json")
+    # strip trailing slash if exists
+    @uri = URI.parse("#{url.sub(/\/\z/, "")}/query.json")
     @http = Net::HTTP.new(@uri.host, @uri.port)
   end
 
   def query(statement)
-    header = {"Content-Type" => "application/json", "Accept" => "application/json"}
     data = {
       queryType: "sql",
       query: statement
     }
 
     begin
-      response = @http.post(@uri.request_uri, data.to_json, header)
+      response = @http.post(@uri.request_uri, data.to_json, HEADERS)
     rescue Errno::ECONNREFUSED => e
       raise Drill::Error, e.message
     end
@@ -29,6 +34,12 @@ class Drill
       raise Drill::Error, body["errorMessage"].split("\n")[0]
     end
 
-    body["rows"]
+    # return columns in order
+    result = []
+    columns = body["columns"]
+    body["rows"].each do |row|
+      result << columns.each_with_object({}) { |c, memo| memo[c] = row[c] }
+    end
+    result
   end
 end

data/lib/drill/version.rb

@@ -1,3 +1,3 @@
 class Drill
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: drill-sergeant
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Andrew Kane