blazer 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6527427786a1c67ee8a4c0072adde1f39e4bb38d
-  data.tar.gz: 154592fc94b90aef1b1845d5c0b7fa4900812fb1
+  metadata.gz: 16ac494e37f4c14e418e50320667f1b371f05190
+  data.tar.gz: 8ebadcac25cbbf06a86c16e01d4b17f3f077eac0
 SHA512:
-  metadata.gz: 4100a254b43aa769ad01f8886f8dfdca0ea1ce67b3d4c52d0984ad40bc02176347e1d85345ef9aa9fa759f78016d4a5b74c56201fc09ba175a1b0270d69008fa
-  data.tar.gz: 525aaed2edd2297e12a51d0634bcf22fde25919497c4a3cc7ce4d5107670951bcb7f1c84fe5c62370778e892f6cab00f2fbc962eca8010caf0448696441ef4ef
+  metadata.gz: 3437a6d97706f7a7e3b394012f9b17d5b36661fda013966e80c66bc1b279ada234a6c968a4e6f567b4c13ed5946564f581ca4835d247f740b6a08de21d9a88b2
+  data.tar.gz: d56d5300d8267dcd5f866ce25ce4e40f7e27ffe4659c893b615effd40610ccd7d3326d5fc827ac412d2feb40ddfb4494474e6ca833ad7972038e6d0168309393

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.3.2
+
+- Added support for Rails 5
+- Attempt to reconnect for checks
+
 ## 1.3.1
 
 - Fixed migration error

data/app/controllers/blazer/base_controller.rb

@@ -33,7 +33,13 @@ module Blazer
       if @success
         @bind_vars.each do |var|
           value = params[var].presence
-          value = value.to_i if value.to_i.to_s == value
+          if value
+            if value =~ /\A\d+\z/
+              value = value.to_i
+            elsif value =~ /\A\d+\.\d+\z/
+              value = value.to_f
+            end
+          end
           if var.end_with?("_at")
             value = Blazer.time_zone.parse(value) rescue nil
           end
@@ -51,7 +57,7 @@ module Blazer
     helper_method :extract_vars
 
     def variable_params
-      params.except(:controller, :action, :id, :host, :query, :dashboard, :query_id, :query_ids, :table_names, :authenticity_token, :utf8, :_method, :commit, :statement, :data_source, :name, :fork_query_id)
+      params.except(:controller, :action, :id, :host, :query, :dashboard, :query_id, :query_ids, :table_names, :authenticity_token, :utf8, :_method, :commit, :statement, :data_source, :name, :fork_query_id).permit!
     end
     helper_method :variable_params
 

data/app/models/blazer/audit.rb

@@ -1,6 +1,6 @@
 module Blazer
   class Audit < ActiveRecord::Base
-    belongs_to :user, class_name: Blazer.user_class.to_s
-    belongs_to :query
+    belongs_to :user, class_name: Blazer.user_class.to_s, required: false
+    belongs_to :query, required: false
   end
 end

data/app/models/blazer/query.rb

@@ -1,6 +1,6 @@
 module Blazer
   class Query < ActiveRecord::Base
-    belongs_to :creator, class_name: Blazer.user_class.to_s if Blazer.user_class
+    belongs_to :creator, class_name: Blazer.user_class.to_s, required: false if Blazer.user_class
     has_many :checks, dependent: :destroy
     has_many :dashboard_queries, dependent: :destroy
     has_many :dashboards, through: :dashboard_queries

data/lib/blazer.rb

@@ -74,6 +74,11 @@ module Blazer
             Rails.logger.info "[blazer timeout] query=#{check.query.name}"
             tries += 1
             sleep(10)
+          elsif error.start_with?("PG::ConnectionBad")
+            data_sources[check.query.data_source].reconnect
+            Rails.logger.info "[blazer reconnect] query=#{check.query.name}"
+            tries += 1
+            sleep(10)
           else
             break
           end

data/lib/blazer/data_source.rb

@@ -90,10 +90,11 @@ module Blazer
             end
 
             result = connection_model.connection.select_all("#{statement} /*#{comment}*/")
+            cast_method = Rails::VERSION::MAJOR < 5 ? :type_cast : :cast_value
             result.each do |untyped_row|
               row = {}
               untyped_row.each do |k, v|
-                row[k] = result.column_types.empty? ? v : result.column_types[k].send(:type_cast, v)
+                row[k] = result.column_types.empty? ? v : result.column_types[k].send(cast_method, v)
               end
               rows << row
             end
@@ -139,6 +140,10 @@ module Blazer
       ["MySQL", "Mysql2", "Mysql2Spatial"].include?(adapter_name)
     end
 
+    def reconnect
+      connection_model.establish_connection(settings["url"])
+    end
+
     protected
 
     def adapter_name

data/lib/blazer/version.rb

@@ -1,3 +1,3 @@
 module Blazer
-  VERSION = "1.3.1"
+  VERSION = "1.3.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blazer
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-06 00:00:00.000000000 Z
+date: 2016-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -136,7 +136,7 @@ files:
 - app/views/blazer/dashboards/new.html.erb
 - app/views/blazer/dashboards/show.html.erb
 - app/views/blazer/queries/_form.html.erb
-- app/views/blazer/queries/_tables.html
+- app/views/blazer/queries/_tables.html.erb
 - app/views/blazer/queries/edit.html.erb
 - app/views/blazer/queries/home.html.erb
 - app/views/blazer/queries/new.html.erb