blazer 1.7.7 → 1.7.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0960679b538f12dd8fc9df631a6dc5c66e3a17b4
-  data.tar.gz: 8207552bf1024524b3f32d0719b38c98666ee7a7
+  metadata.gz: 26fcc8a24832e5f3f482ac9e2ae622b43f2c44e8
+  data.tar.gz: a4ce257d4c97d36bf577a952202a139721097482
 SHA512:
-  metadata.gz: 9a47660580a4ab89a49e9ff6e95838c742056b9b025143eda6bf2cba494842b6f182b8f21fe4b08a0d3b06d31721fc53599339358c149c95f06a874d92fbd93a
-  data.tar.gz: 7aa7dc39d4b669a1bc3988180a70ad7f8b9e3fe8d9ed92e830e6504a86b1244dd17d71d0e1fe6c32d117f644fa5a6823a396dc0d76d331e40c56ad4eee89ff1d
+  metadata.gz: 115725c9779514165f926c36f9f71406a480892414d249f2f156c176ce632b1893b9bf9617a0c03a6f9044bf2e53aabe3d378ea971b1a7d64e18acf5bf357c5f
+  data.tar.gz: 985b07bf120c96a196d8c5bef81d8c9c5c6ee64cea56c15c64a3c4d2e7a2b9b0fe010ace797d3a98d6aa565171a0bd675d378fb944b911d29d1bb1cc7931274d

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 1.7.8
+
+- Added support for custom adapters
+- Fixed bug with scatter charts on dashboards
+- Fixed table preview for SQL Server
+- Fixed issue when `default_url_options` set
+
 ## 1.7.7
 
 - Fixed preview error for MySQL

data/README.md

@@ -394,7 +394,7 @@ data_sources:
 - [MongoDB](#mongodb-1) [beta]
 - [Elasticsearch](#elasticsearch) [beta]
 
-You can also create an adapter for any other data store.
+You can also [create an adapter](#creating-an-adapter) for any other data store.
 
 **Note:** In the examples below, we recommend using environment variables for urls.
 
@@ -426,7 +426,13 @@ data_sources:
 
 ### SQL Server
 
-Use [activerecord-sqlserver-adapter](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter).
+Add [tiny_tds](https://github.com/rails-sqlserver/tiny_tds) and [activerecord-sqlserver-adapter](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter) to your Gemfile and set:
+
+```yml
+data_sources:
+  my_source:
+    url: sqlserver://user:password@hostname:1433/database
+```
 
 ### Oracle
 
@@ -448,7 +454,7 @@ data_sources:
 
 ### Redshift
 
-Add [activerecord4-redshift-adapter](https://github.com/aamine/activerecord4-redshift-adapter) to your Gemfile and set:
+Add [activerecord4-redshift-adapter](https://github.com/aamine/activerecord4-redshift-adapter) or [activerecord5-redshift-adapter](https://github.com/ConsultingMD/activerecord5-redshift-adapter) to your Gemfile and set:
 
 ```yml
 data_sources:
@@ -487,6 +493,27 @@ data_sources:
     url: http://user:password@hostname:9200/
 ```
 
+## Creating an Adapter
+
+Create an adapter for any data store with:
+
+```ruby
+class FooAdapter < Blazer::Adapters::BaseAdapter
+  # code goes here
+end
+
+Blazer.register_adapter "foo", FooAdapter
+```
+
+See the [Presto adapter](https://github.com/ankane/blazer/blob/master/lib/blazer/adapters/presto_adapter.rb) for a good example. Then use:
+
+```yml
+data_sources:
+  my_source:
+    adapter: foo
+    url: http://user:password@hostname:9200/
+```
+
 ## Query Permissions
 
 Blazer supports a basic permissions model.
@@ -663,7 +690,10 @@ audit: true
 # class name of the user model
 # user_class: User
 
-# method name for the user model
+# method name for the current user
+# user_method: current_user
+
+# method name for the display name
 # user_name: name
 
 # email to send checks from

data/app/controllers/blazer/base_controller.rb

@@ -101,5 +101,10 @@ module Blazer
         action = resource.persisted? ? :edit : :new
         render action, status: :unprocessable_entity
       end
+
+      # do not inherit from ApplicationController - #120
+      def default_url_options
+        {}
+      end
   end
 end

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

@@ -92,7 +92,7 @@
       <% end %>
       <%= column_chart first_20.group_by { |r| v = r[1]; (@boom[@columns[1]] || {})[v.to_s] || v }.each_with_index.map { |(name, v), i| {name: name, data: v.sort_by { |r2| labels.index(r2[0]) }.map { |v2| v3 = v2[0]; [(@boom[@columns[0]] || {})[v3.to_s] || v3, v2[2]] }} }, id: chart_id %>
     <% elsif chart_type == "scatter" %>
-      <%= scatter_chart @rows, xtitle: @columns[0], ytitle: @columns[1] %>
+      <%= scatter_chart @rows, xtitle: @columns[0], ytitle: @columns[1], id: chart_id %>
     <% elsif @only_chart %>
       <% if @rows.size == 1 && @rows.first.size == 1 %>
         <% v = @rows.first.first %>

data/lib/blazer.rb

@@ -148,4 +148,17 @@ module Blazer
       end
     end
   end
+
+  def self.adapters
+    @adapters ||= {}
+  end
+
+  def self.register_adapter(name, adapter)
+    adapters[name] = adapter
+  end
 end
+
+Blazer.register_adapter "elasticsearch", Blazer::Adapters::ElasticsearchAdapter
+Blazer.register_adapter "mongodb", Blazer::Adapters::MongodbAdapter
+Blazer.register_adapter "presto", Blazer::Adapters::PrestoAdapter
+Blazer.register_adapter "sql", Blazer::Adapters::SqlAdapter

data/lib/blazer/adapters/sql_adapter.rb

@@ -53,6 +53,8 @@ module Blazer
       def preview_statement
         if postgresql?
           "SELECT * FROM \"{table}\" LIMIT 10"
+        elsif sqlserver?
+          "SELECT TOP (10) * FROM {table}"
         else
           "SELECT * FROM {table} LIMIT 10"
         end
@@ -64,13 +66,25 @@ module Blazer
 
       def cost(statement)
         result = explain(statement)
-        match = /cost=\d+\.\d+..(\d+\.\d+) /.match(result)
-        match[1] if match
+        if sqlserver?
+          result["TotalSubtreeCost"]
+        else
+          match = /cost=\d+\.\d+..(\d+\.\d+) /.match(result)
+          match[1] if match
+        end
       end
 
       def explain(statement)
         if postgresql? || redshift?
           select_all("EXPLAIN #{statement}").rows.first.first
+        elsif sqlserver?
+          begin
+            execute("SET SHOWPLAN_ALL ON")
+            result = select_all(statement).each.first
+          ensure
+            execute("SET SHOWPLAN_ALL OFF")
+          end
+          result
         end
       rescue
         nil
@@ -114,15 +128,29 @@ module Blazer
         ["MySQL", "Mysql2", "Mysql2Spatial"].include?(adapter_name)
       end
 
+      def sqlserver?
+        ["SQLServer", "tinytds", "mssql"].include?(adapter_name)
+      end
+
       def adapter_name
-        connection_model.connection.adapter_name
+        # prevent bad data source from taking down queries/new
+        connection_model.connection.adapter_name rescue nil
       end
 
       def schemas
-        default_schema = (postgresql? || redshift?) ? "public" : connection_model.connection_config[:database]
         settings["schemas"] || [connection_model.connection_config[:schema] || default_schema]
       end
 
+      def default_schema
+        if postgresql? || redshift?
+          "public"
+        elsif sqlserver?
+          "dbo"
+        else
+          connection_model.connection_config[:database]
+        end
+      end
+
       def set_timeout(timeout)
         if postgresql? || redshift?
           execute("SET #{use_transaction? ? "LOCAL " : ""}statement_timeout = #{timeout.to_i * 1000}")

data/lib/blazer/data_source.rb

@@ -17,15 +17,8 @@ module Blazer
       end
 
       @adapter_instance =
-        case adapter
-        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)
+        if Blazer.adapters[adapter]
+          Blazer.adapters[adapter].new(self)
         else
           raise Blazer::Error, "Unknown adapter"
         end

data/lib/blazer/version.rb

@@ -1,3 +1,3 @@
 module Blazer
-  VERSION = "1.7.7"
+  VERSION = "1.7.8"
 end

data/lib/generators/blazer/templates/config.yml

@@ -41,7 +41,10 @@ audit: true
 # class name of the user model
 # user_class: User
 
-# method name for the user model
+# method name for the current user
+# user_method: current_user
+
+# method name for the display name
 # user_name: name
 
 # optional auth method to use as a before_action (default: nil)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blazer
 version: !ruby/object:Gem::Version
-  version: 1.7.7
+  version: 1.7.8
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-17 00:00:00.000000000 Z
+date: 2017-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -199,7 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Explore your data with SQL. Easily create charts and dashboards, and share