sql-jarvis 2.0.4 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25be2a6a0d6cc1e011d670352cea22b1aedff43f51fcb184462d6ae57e5ac464
-  data.tar.gz: 6a22c94bd8c898e2c9e0bdea8b178a09de3b40663c691b9b5c5cd6c2d75b9503
+  metadata.gz: e469ba7d576c25611eb5c323c2e9da0aec4dce044a4ecae7d43c648ac918faff
+  data.tar.gz: 5fd46cef2f53af2956685559e8c32bc29fe365f684c25342eea9a9ada13120c1
 SHA512:
-  metadata.gz: 6cffad21db8437dc63e980d21b9a273b7b00cecbee674b8ce78ffe17ada67484adbeeff49ca3338aaa0a0b8ece38ad0af0aed87b12f817be08a604b804b490f4
-  data.tar.gz: 902cf9b1b26ab4dea83b2e39cbfbe4db9d00a5bade0136fc394bd7febba25120b1d992d596acc30163d985a3587bd1f85dceed0a8c62e734d117e4b4a55a023e
+  metadata.gz: 2026a11120566feb528bd204a8d47b93e9d662fad291d8585a3bbb2efac56c010f60b6e3f193e15c6adbd7c22e3170fe28b60638be01ce6b0b1e70108d6e6fcf
+  data.tar.gz: d0730f29e831bae5abe7edfc91a9e39083ff1c24e8b323210cf0804616d83c6a4e8d7140bf12c1dd6852368fe38574fd2c0d17dfa25f5fcf539f75f15bfc8c86

data/app/controllers/blazer/queries_controller.rb

@@ -365,7 +365,17 @@ module Blazer
       end
 
       def blazer_time_value(data_source, k, v)
-        data_source.local_time_suffix.any? { |s| k.ends_with?(s) } ? v.to_s.sub(" UTC", "") : v.in_time_zone(Blazer.time_zone)
+        if k.end_with?('_date')
+          v.in_time_zone(Blazer.time_zone).strftime("%Y/%m/%d")
+        elsif k.end_with?('_time')
+          v.in_time_zone(Blazer.time_zone).strftime("%H:%M")
+        elsif data_source.local_time_suffix.any? { |s| k.ends_with?(s) }
+          v.to_s.sub(" UTC", "")
+        else
+          v.in_time_zone(Blazer.time_zone)
+        end
+      rescue
+        return v
       end
       helper_method :blazer_time_value
 

data/app/helpers/blazer/base_helper.rb

@@ -23,6 +23,10 @@ module Blazer
         else
           link_to value, value, target: "_blank"
         end
+      elsif key.end_with?("_date")
+        value.in_time_zone(Blazer.time_zone).strftime('%Y/%m/%d') rescue value
+      elsif key.end_with?("_time")
+        value.in_time_zone(Blazer.time_zone).strftime('%H:%M') rescue value
       else
         value
       end

data/app/mailers/blazer/slack_notifier.rb

@@ -61,7 +61,7 @@ module Blazer
     end
 
     def self.query_url(id)
-      Blazer::Engine.routes.url_helpers.query_url(id, ActionMailer::Base.default_url_options)
+      Blazer::Engine.routes.url_helpers.query_url(id, ActionMailer::Base.default_url_options, subdomain: Blazer.subdomain)
     end
 
     def self.post(url, payload)

data/lib/blazer/excel_parser.rb

@@ -25,7 +25,7 @@ module Blazer
       excel.workbook.add_worksheet(name: "ID #{query.id}") do |sheet|
         sheet.add_row @columns
         @rows.each do |row|
-          sheet.add_row row
+          sheet.add_row row.each_with_index.map { |v, i| v.is_a?(Time) ? blazer_time_value(@columns[i], v) : v }
         end
       end
     end
@@ -36,5 +36,20 @@ module Blazer
       return tmp_file
     end
 
+    def blazer_time_value(key, value)
+      value_with_time_zone = (value.in_time_zone(Blazer.time_zone) rescue value)
+      if key.end_with?('_date')
+        value_with_time_zone.strftime("%Y/%m/%d")
+      elsif key.end_with?('_time')
+        value_with_time_zone.strftime("%H:%M")
+      elsif data_source.local_time_suffix.any? { |s| key.ends_with?(s) }
+        value.to_s.sub(" UTC", "")
+      else
+        value_with_time_zone
+      end
+    rescue
+      return value
+    end
+
   end
 end

data/lib/blazer/version.rb

@@ -1,3 +1,3 @@
 module Blazer
-  VERSION = '2.0.4'
+  VERSION = '2.0.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sql-jarvis
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-20 00:00:00.000000000 Z
+date: 2019-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties