blazer 1.7.10 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f47130dee076e979384bf983f7faff420979a002
-  data.tar.gz: 3e0aa371bf99fb223b0db1bc5a85c97c51353cfc
+  metadata.gz: fbc55f959283cd23c0918c46696caa293ea2b744
+  data.tar.gz: 3af376a2e4ac0893cf808f315f456a8ed7f0514a
 SHA512:
-  metadata.gz: 248be46d44525be01771768364029b0e0376a368c433957ef53dacdebae45d7d5b9114a36a16d48398e63860b29050d9346f8c52153ef3308e65854aa54a7f85
-  data.tar.gz: a4db6ce496c4b7fd20adc85ffc16b792867833f2d1f1340f5fae73ba2f227520904defd0371c3d34cad6339180888d278a2822447fc69c5e74ab8ca06d97894f
+  metadata.gz: 132855365db01b0b94dffda991fc5a6660c93d9d6e85e6e34db25bcd22b8534b79e7ae7db203640e0de93fa372c7214eb8e641a42309e11939b91233e267d952
+  data.tar.gz: 9ede011c24175a761fcc9832bd2afa1a9c08d7cfa44c64afd47ec0de377d55ea7178b684d1128fd24e0e849dfc36b495fb592469029600d4afdb0a89eba359c7

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.8.0
+
+- Added support for Rails 5.1
+
 ## 1.7.10
 
 - Added support for Google BigQuery

data/README.md

@@ -392,7 +392,7 @@ data_sources:
 - [Redshift](#redshift)
 - [Presto](#presto)
 - [Apache Drill](#apache-drill)
-- [Google BigQuery](#google-bigquery-master)
+- [Google BigQuery](#google-bigquery)
 - [MongoDB](#mongodb-1)
 - [Elasticsearch](#elasticsearch) [beta]
 
@@ -485,7 +485,7 @@ data_sources:
     url: http://hostname:8047
 ```
 
-### Google BigQuery [master]
+### Google BigQuery
 
 Add [google-cloud-bigquery](https://github.com/GoogleCloudPlatform/google-cloud-ruby/tree/master/google-cloud-bigquery) to your Gemfile and set:
 

data/app/helpers/blazer/base_helper.rb

@@ -49,5 +49,9 @@ module Blazer
         json_escape(s)
       end
     end
+
+    def blazer_series_name(k)
+      k.nil? ? "null" : k.to_s
+    end
   end
 end

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

@@ -76,11 +76,11 @@
         map.fitBounds(featureLayer.getBounds());
       </script>
     <% elsif chart_type == "line" %>
-      <%= line_chart @columns[1..-1].each_with_index.map{ |k, i| {name: k, data: @rows.map{ |r| [r[0], r[i + 1]] }, library: series_library[i]} }, chart_options %>
+      <%= line_chart @columns[1..-1].each_with_index.map{ |k, i| {name: blazer_series_name(k), data: @rows.map{ |r| [r[0], r[i + 1]] }, library: series_library[i]} }, chart_options %>
     <% elsif chart_type == "line2" %>
-      <%= line_chart @rows.group_by { |r| v = r[1]; (@boom[@columns[1]] || {})[v.to_s] || v }.each_with_index.map { |(name, v), i| {name: name, data: v.map { |v2| [v2[0], v2[2]] }, library: series_library[i]} }, chart_options %>
+      <%= line_chart @rows.group_by { |r| v = r[1]; (@boom[@columns[1]] || {})[v.to_s] || v }.each_with_index.map { |(name, v), i| {name: blazer_series_name(name), data: v.map { |v2| [v2[0], v2[2]] }, library: series_library[i]} }, chart_options %>
     <% elsif chart_type == "bar" %>
-      <%= column_chart (values.size - 1).times.map { |i| name = @columns[i + 1]; {name: name, data: @rows.first(20).map { |r| [(@boom[@columns[0]] || {})[r[0].to_s] || r[0], r[i + 1]] } } }, id: chart_id %>
+      <%= column_chart (values.size - 1).times.map { |i| name = @columns[i + 1]; {name: blazer_series_name(name), data: @rows.first(20).map { |r| [(@boom[@columns[0]] || {})[r[0].to_s] || r[0], r[i + 1]] } } }, id: chart_id %>
     <% elsif chart_type == "bar2" %>
       <% first_20 = @rows.group_by { |r| r[0] }.values.first(20).flatten(1) %>
       <% labels = first_20.map { |r| r[0] }.uniq %>
@@ -90,7 +90,7 @@
           <% first_20 << [l, s, 0] unless first_20.find { |r| r[0] == l && r[1] == s } %>
         <% end %>
       <% 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 %>
+      <%= 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: blazer_series_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], id: chart_id %>
     <% elsif @only_chart %>

data/lib/blazer/version.rb

@@ -1,3 +1,3 @@
 module Blazer
-  VERSION = "1.7.10"
+  VERSION = "1.8.0"
 end

data/lib/generators/blazer/install_generator.rb

@@ -22,12 +22,18 @@ module Blazer
       end
 
       def copy_migration
-        migration_template "install.rb", "db/migrate/install_blazer.rb"
+        migration_template "install.rb", "db/migrate/install_blazer.rb", migration_version: migration_version
       end
 
       def copy_config
         template "config.yml", "config/blazer.yml"
       end
+
+      def migration_version
+        if ActiveRecord::VERSION::MAJOR >= 5
+          "[#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}]"
+        end
+      end
     end
   end
 end

data/lib/generators/blazer/templates/install.rb

@@ -1,4 +1,4 @@
-class <%= migration_class_name %> < ActiveRecord::Migration
+class <%= migration_class_name %> < ActiveRecord::Migration<%= migration_version %>
   def change
     create_table :blazer_queries do |t|
       t.references :creator

metadata

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