blazer 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04d14bae947237ea5450d0c8104572d41030e2ba
-  data.tar.gz: 1cf2e2ecad47ab458a653382728911dfaa82b1d9
+  metadata.gz: 2c31bc7010e3093044d6a2983172c97ed52f3009
+  data.tar.gz: a40086b84c9964fec00038bd4c4a2b2128ee7bf7
 SHA512:
-  metadata.gz: 6331237e96ba16d02561cfeb1f2de6e95abdbc2b6f2069cdfa2a72309e92720137ae899498b4ac177abc9b3fb663293950006ff84e186560101b0786c9a6c75a
-  data.tar.gz: b71679dded9d87c6637c082da7a41bda1ff448122fbfd3de62b1a8d8b5604b14196a26a96d8b2a14b0db38e65b77a8f2e0299761b3c25f411955541ce276e865
+  metadata.gz: 51b03a70d9acc454fe316edaacd87b102e3d832e420190037d674fe67d675e1a569c6a8055d7ee4c5be6237c53c2143f153bee6b5a31711567e2554f7c0cbfaa
+  data.tar.gz: 814bd7bd06a5d42ba29504a4d1511890df47d9ae89076b2580532211f5aa9b54f59b0cc2d9b98a4d72fac17ce538e66d3e2d09d78858f48c45ae43e4ab45a446

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.6.1
+
+- Added support for Presto [beta]
+- Added support for Elasticsearch timeouts
+- Fixed error in Rails 5
+
 ## 1.6.0
 
 - Added support for MongoDB [beta]

data/README.md

@@ -111,6 +111,16 @@ GRANT SELECT, SHOW VIEW ON database_name.* TO blazer@’127.0.0.1′ IDENTIFIED
 FLUSH PRIVILEGES;
 ```
 
+### MongoDB
+
+Create a user with read only permissions:
+
+```
+db.createUser({user: "blazer", pwd: "password", roles: ["read"]})
+```
+
+Also, make sure authorization is enabled when you start the server.
+
 ### Sensitive Data
 
 To protect sensitive info like password hashes and access tokens, use views. Documentation coming soon.
@@ -357,6 +367,7 @@ data_sources:
 - [Redshift](#redshift)
 - [MongoDB](#mongodb) [beta]
 - [Elasticsearch](#elasticsearch) [beta]
+- [Presto](#presto) [beta]
 
 You can also create an adapter for any other data store.
 
@@ -399,6 +410,16 @@ data_sources:
     url: http://user:password@hostname:9200/
 ```
 
+### Presto
+
+Add [presto-client](https://github.com/treasure-data/presto-client-ruby) to your Gemfile and set:
+
+```yml
+data_sources:
+  my_source:
+    url: presto://user@hostname:8080/catalog
+```
+
 ## Learn SQL
 
 Have team members who want to learn SQL? Here are a few great, free resources.
@@ -415,7 +436,7 @@ For an easy way to group by day, week, month, and more with correct time zones,
 Add the [R buildpack](https://github.com/virtualstaticvoid/heroku-buildpack-r) to your app.
 
 ```sh
-heroku buildpacks:add --index 1 https://github.com/ankane/heroku-buildpack-r.git\#cedar-14
+heroku buildpacks:add --index 1 https://github.com/virtualstaticvoid/heroku-buildpack-r.git\#cedar-14
 ```
 
 And create an `init.r` with:

data/app/controllers/blazer/base_controller.rb

@@ -6,7 +6,6 @@ module Blazer
       skip_before_action(*filters, raise: false)
       skip_after_action(*filters, raise: false)
       skip_around_action(*filters, raise: false)
-      before_action :verify_request_size
     else
       skip_action_callback *filters
     end

data/app/helpers/blazer/base_helper.rb

@@ -12,7 +12,7 @@ module Blazer
     BLAZER_IMAGE_EXT = %w[png jpg jpeg gif]
 
     def blazer_format_value(key, value)
-      if value.is_a?(Integer) && !key.to_s.end_with?("id")
+      if value.is_a?(Integer) && !key.to_s.end_with?("id") && !key.to_s.start_with?("id")
         number_with_delimiter(value)
       elsif value =~ BLAZER_URL_REGEX
         # see if image or link

data/app/views/blazer/queries/show.html.erb

@@ -172,7 +172,7 @@
   </script>
 <% end %>
 
-<% if Blazer.data_sources[@query.data_source].adapter == "activerecord" %>
+<% if %w[sql presto].include?(Blazer.data_sources[@query.data_source].adapter) %>
   <script>
     // do not highlight really long queries
     // this can lead to performance issues

data/lib/blazer.rb

@@ -9,6 +9,7 @@ require "blazer/run_statement"
 require "blazer/adapters/base_adapter"
 require "blazer/adapters/elasticsearch_adapter"
 require "blazer/adapters/mongodb_adapter"
+require "blazer/adapters/presto_adapter"
 require "blazer/adapters/sql_adapter"
 require "blazer/engine"
 

data/lib/blazer/adapters/elasticsearch_adapter.rb

@@ -8,16 +8,22 @@ module Blazer
 
         begin
           header, body = statement.gsub(/\/\/.+/, "").strip.split("\n", 2)
-          response = client.msearch(body: [JSON.parse(header), JSON.parse(body)])["responses"].first
-          hits = response["hits"]["hits"]
-          source_keys = hits.flat_map { |r| r["_source"].keys }.uniq
-          hit_keys = (hits.first.try(:keys) || []) - ["_source"]
-          columns = source_keys + hit_keys
-          rows =
-            hits.map do |r|
-              source = r["_source"]
-              source_keys.map { |k| source[k] } + hit_keys.map { |k| r[k] }
-            end
+          body = JSON.parse(body)
+          body["timeout"] ||= data_source.timeout if data_source.timeout
+          response = client.msearch(body: [JSON.parse(header), body])["responses"].first
+          if response["error"]
+            error = response["error"]
+          else
+            hits = response["hits"]["hits"]
+            source_keys = hits.flat_map { |r| r["_source"].keys }.uniq
+            hit_keys = (hits.first.try(:keys) || []) - ["_source"]
+            columns = source_keys + hit_keys
+            rows =
+              hits.map do |r|
+                source = r["_source"]
+                source_keys.map { |k| source[k] } + hit_keys.map { |k| r[k] }
+              end
+          end
         rescue => e
           error = e.message
         end
@@ -26,7 +32,7 @@ module Blazer
       end
 
       def tables
-        client.indices.get_aliases.map { |k, v| [k, v["aliases"].keys] }.flatten.uniq.sort
+        client.indices.get_aliases(name: "*").map { |k, v| [k, v["aliases"].keys] }.flatten.uniq.sort
       end
 
       def preview_statement

data/lib/blazer/adapters/presto_adapter.rb

@@ -0,0 +1,45 @@
+module Blazer
+  module Adapters
+    class PrestoAdapter < BaseAdapter
+      def run_statement(statement, comment)
+        columns = []
+        rows = []
+        error = nil
+
+        begin
+          columns, rows = client.run("#{statement} /*#{comment}*/")
+          columns = columns.map(&:name)
+        rescue => e
+          error = e.message
+        end
+
+        [columns, rows, error]
+      end
+
+      def tables
+        _, rows = client.run("SHOW TABLES")
+        rows.map(&:first)
+      end
+
+      def preview_statement
+        "SELECT * FROM {table} LIMIT 10"
+      end
+
+      protected
+
+      def client
+        @client ||= begin
+          uri = URI.parse(settings["url"])
+          query = uri.query ? CGI::parse(uri.query) : {}
+          Presto::Client.new(
+            server: "#{uri.host}:#{uri.port}",
+            catalog: uri.path.to_s.sub(/\A\//, ""),
+            schema: query["schema"] || "public",
+            user: uri.user,
+            http_debug: false
+          )
+        end
+      end
+    end
+  end
+end

data/lib/blazer/data_source.rb

@@ -18,12 +18,14 @@ module Blazer
 
       @adapter_instance =
         case adapter
-        when "sql"
-          Blazer::Adapters::SqlAdapter.new(self)
         when "elasticsearch"
           Blazer::Adapters::ElasticsearchAdapter.new(self)
         when "mongodb"
           Blazer::Adapters::MongodbAdapter.new(self)
+        when "presto"
+          Blazer::Adapters::PrestoAdapter.new(self)
+        when "sql"
+          Blazer::Adapters::SqlAdapter.new(self)
         else
           raise Blazer::Error, "Unknown adapter"
         end
@@ -178,8 +180,10 @@ module Blazer
     end
 
     def detect_adapter
-      if settings["url"].to_s.start_with?("mongodb://")
-        "mongodb"
+      schema = settings["url"].to_s.split("://").first
+      case schema
+      when "mongodb", "presto"
+        schema
       else
         "sql"
       end

data/lib/blazer/version.rb

@@ -1,3 +1,3 @@
 module Blazer
-  VERSION = "1.6.0"
+  VERSION = "1.6.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blazer
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-29 00:00:00.000000000 Z
+date: 2016-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -162,6 +162,7 @@ files:
 - lib/blazer/adapters/base_adapter.rb
 - lib/blazer/adapters/elasticsearch_adapter.rb
 - lib/blazer/adapters/mongodb_adapter.rb
+- lib/blazer/adapters/presto_adapter.rb
 - lib/blazer/adapters/sql_adapter.rb
 - lib/blazer/data_source.rb
 - lib/blazer/detect_anomalies.R