blazer 0.0.5 → 0.0.6

data/app/assets/stylesheets/blazer/daterangepicker-bs3.css

@@ -1,9 +1,8 @@
 /*!
  * Stylesheet for the Date Range Picker, for use with Bootstrap 3.x
  *
- * Copyright 2013 Dan Grossman ( http://www.dangrossman.info )
- * Licensed under the Apache License v2.0
- * http://www.apache.org/licenses/LICENSE-2.0
+ * Copyright 2013-2015 Dan Grossman ( http://www.dangrossman.info )
+ * Licensed under the MIT license. See http://www.opensource.org/licenses/mit-license.php
  *
  * Built for http://www.improvely.com
  */
@@ -18,11 +17,16 @@
   margin: 4px;
 }
 
-.daterangepicker.opensright .ranges, .daterangepicker.opensright .calendar {
+.daterangepicker.opensright .ranges, .daterangepicker.opensright .calendar,
+.daterangepicker.openscenter .ranges, .daterangepicker.openscenter .calendar {
   float: right;
   margin: 4px;
 }
 
+.daterangepicker.single .ranges, .daterangepicker.single .calendar {
+  float: none;
+}
+
 .daterangepicker .ranges {
   width: 160px;
   text-align: left;
@@ -75,7 +79,6 @@
 }
 
 .daterangepicker .ranges .input-mini {
-  background-color: #eee;
   border: 1px solid #ccc;
   border-radius: 4px;
   color: #555;
@@ -162,6 +165,37 @@
   content: '';
 }
 
+.daterangepicker.openscenter:before {
+  position: absolute;
+  top: -7px;
+  left: 0;
+  right: 0;
+  width: 0;
+  margin-left: auto;
+  margin-right: auto;
+  display: inline-block;
+  border-right: 7px solid transparent;
+  border-bottom: 7px solid #ccc;
+  border-left: 7px solid transparent;
+  border-bottom-color: rgba(0, 0, 0, 0.2);
+  content: '';
+}
+
+.daterangepicker.openscenter:after {
+  position: absolute;
+  top: -6px;
+  left: 0;
+  right: 0;
+  width: 0;
+  margin-left: auto;
+  margin-right: auto;
+  display: inline-block;
+  border-right: 6px solid transparent;
+  border-bottom: 6px solid #fff;
+  border-left: 6px solid transparent;
+  content: '';
+}
+
 .daterangepicker.opensright:before {
   position: absolute;
   top: -7px;
@@ -205,7 +239,7 @@
   color: #999;
 }
 
-.daterangepicker td.disabled {
+.daterangepicker td.disabled, .daterangepicker option.disabled {
   color: #999;
 }
 
@@ -220,6 +254,24 @@
   border-radius: 0;
 }
 
+.daterangepicker td.start-date {
+  -webkit-border-radius: 4px 0 0 4px;
+  -moz-border-radius: 4px 0 0 4px;
+  border-radius: 4px 0 0 4px;
+}
+
+.daterangepicker td.end-date {
+  -webkit-border-radius: 0 4px 4px 0;
+  -moz-border-radius: 0 4px 4px 0;
+  border-radius: 0 4px 4px 0;
+}
+
+.daterangepicker td.start-date.end-date {
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+}
+
 .daterangepicker td.active, .daterangepicker td.active:hover {
   background-color: #357ebd;
   border-color: #3071a9;
@@ -248,7 +300,7 @@
   width: 40%;
 }
 
-.daterangepicker select.hourselect, .daterangepicker select.minuteselect, .daterangepicker select.ampmselect {
+.daterangepicker select.hourselect, .daterangepicker select.minuteselect, .daterangepicker select.secondselect, .daterangepicker select.ampmselect {
   width: 50px;
   margin-bottom: 0;
 }

data/app/controllers/blazer/queries_controller.rb

@@ -15,8 +15,9 @@ module Blazer
     before_action :set_query, only: [:show, :edit, :update, :destroy]
 
     def index
-      @queries = Blazer::Query.order(:name).includes(:creator)
-      @trending_queries = Blazer::Audit.group(:query_id).where("created_at > ?", 2.days.ago).having("COUNT(*) >= 3").uniq.count(:user_id)
+      @queries = Blazer::Query.order(:name)
+      @queries = @queries.includes(:creator) if Blazer.user_class
+      @trending_queries = Blazer::Audit.group(:query_id).where("created_at > ?", 2.days.ago).having("COUNT(DISTINCT user_id) >= 3").uniq.count(:user_id)
     end
 
     def new
@@ -25,7 +26,7 @@ module Blazer
 
     def create
       @query = Blazer::Query.new(query_params)
-      @query.creator = current_user if respond_to?(:current_user)
+      @query.creator = current_user if respond_to?(:current_user) && Blazer.user_class
 
       if @query.save
         redirect_to @query
@@ -44,7 +45,7 @@ module Blazer
         query = smart_variables[var]
         if query
           rows, error = run_statement(query)
-          @smart_vars[var] = rows.map{|v| v.values.reverse }
+          @smart_vars[var] = rows.map { |v| v.values.reverse }
           @sql_errors << error if error
         end
       end
@@ -64,7 +65,7 @@ module Blazer
         if Blazer.audit
           audit = Blazer::Audit.new(statement: @statement)
           audit.query = @query
-          audit.user = current_user if respond_to?(:current_user)
+          audit.user = current_user if respond_to?(:current_user) && Blazer.user_class
           audit.save!
         end
 
@@ -87,15 +88,15 @@ module Blazer
 
         @filename = @query.name.parameterize if @query
 
-        @min_width_types = (@rows.first || {}).select{|k, v| v.is_a?(Time) or v.is_a?(String) or smart_columns[k] }.keys
+        @min_width_types = (@rows.first || {}).select { |k, v| v.is_a?(Time) || v.is_a?(String) || smart_columns[k] }.keys
 
         @boom = {}
         @columns.keys.each do |key|
           query = smart_columns[key]
           if query
-            values = @rows.map{|r| r[key] }.compact.uniq
+            values = @rows.map { |r| r[key] }.compact.uniq
             rows, error = run_statement(ActiveRecord::Base.send(:sanitize_sql_array, [query.sub("{value}", "(?)"), values]))
-            @boom[key] = Hash[ rows.map(&:values) ]
+            @boom[key] = Hash[rows.map(&:values)]
           end
         end
 
@@ -107,7 +108,7 @@ module Blazer
           render layout: false
         end
         format.csv do
-          send_data csv_data(@rows), type: 'text/csv; charset=utf-8; header=present', disposition: "attachment; filename=\"#{@query ? @query.name.parameterize : "query"}.csv\""
+          send_data csv_data(@rows), type: "text/csv; charset=utf-8; header=present", disposition: "attachment; filename=\"#{@query ? @query.name.parameterize : 'query'}.csv\""
         end
       end
     end
@@ -173,12 +174,12 @@ module Blazer
     end
 
     def extract_vars(statement)
-      statement.scan(/\{.*?\}/).map{|v| v[1...-1] }.uniq
+      statement.scan(/\{.*?\}/).map { |v| v[1...-1] }.uniq
     end
 
     def process_vars(statement)
       @bind_vars = extract_vars(statement)
-      @success = @bind_vars.all?{|v| params[v] }
+      @success = @bind_vars.all? { |v| params[v] }
 
       if @success
         @bind_vars.each do |var|
@@ -212,13 +213,12 @@ module Blazer
       default_schema = postgresql? ? "public" : Blazer::Connection.connection_config[:database]
       schema = Blazer::Connection.connection_config[:schema] || default_schema
       rows, error = run_statement(Blazer::Connection.send(:sanitize_sql_array, ["SELECT table_name, column_name, ordinal_position, data_type FROM information_schema.columns WHERE table_schema = ?", schema]))
-      Hash[ rows.group_by{|r| r["table_name"] }.map{|t, f| [t, f.sort_by{|f| f["ordinal_position"] }.map{|f| f.slice("column_name", "data_type") }] }.sort_by{|t, f| t } ]
+      Hash[rows.group_by { |r| r["table_name"] }.map { |t, f| [t, f.sort_by { |f| f["ordinal_position"] }.map { |f| f.slice("column_name", "data_type") }] }.sort_by { |t, _f| t }]
     end
     helper_method :tables
 
     def postgresql?
       Blazer::Connection.connection.adapter_name == "PostgreSQL"
     end
-
   end
 end

data/app/helpers/blazer/queries_helper.rb

@@ -1,6 +1,5 @@
 module Blazer
   module QueriesHelper
-
     def title(title = nil)
       if title
         content_for(:title) { title }
@@ -10,12 +9,11 @@ module Blazer
     end
 
     def format_value(key, value)
-      if value.is_a?(Integer) and !key.to_s.end_with?("id")
+      if value.is_a?(Integer) && !key.to_s.end_with?("id")
         number_with_delimiter(value)
       else
         value
       end
     end
-
   end
 end

data/app/models/blazer/connection.rb

@@ -1,5 +1,6 @@
 module Blazer
   class Connection < ActiveRecord::Base
     establish_connection ENV["BLAZER_DATABASE_URL"] if ENV["BLAZER_DATABASE_URL"]
+    self.abstract_class = true
   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
+    belongs_to :creator, class_name: Blazer.user_class.to_s if Blazer.user_class
 
     validates :name, presence: true
     validates :statement, presence: true
@@ -8,6 +8,5 @@ module Blazer
     def to_param
       [id, name.gsub("'", "").parameterize].join("-")
     end
-
   end
 end

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

@@ -26,7 +26,7 @@
             <% end %>
           </td>
           <td class="creator text-right text-muted">
-            <% if (creator = query.creator) and creator.respond_to?(Blazer.user_name) %>
+            <% if query.respond_to?(:creator) && (creator = query.creator) && creator.respond_to?(Blazer.user_name) %>
               <% name = creator.send(Blazer.user_name) %>
               <% if respond_to?(:current_user) and creator == current_user %>
                 You

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

@@ -11,6 +11,7 @@
       </div>
       <div class="col-sm-3 text-right">
         <%= link_to "Edit", edit_query_path(@query), class: "btn btn-default" %>
+        <%= link_to "Fork", new_query_path(statement: @query.statement), class: "btn btn-info" %>
 
         <% if !@error and @success %>
           <%= button_to "Download", run_queries_path(statement: @query.statement, query_id: @query.id, format: "csv"), class: "btn btn-primary" %>
@@ -77,32 +78,48 @@
       </div>
 
       <script>
+        var timeZone = "<%= Blazer.time_zone.tzinfo.name %>";
+        var format = "YYYY-MM-DD";
+        var now = moment.tz(timeZone);
+
+        function dateStr(daysAgo) {
+          return now.clone().subtract(daysAgo || 0, "days").format(format);
+        }
+
+        function toDate(time) {
+          return moment.tz(time.format(format), timeZone);
+        }
+
+        function setTimeInputs(start, end) {
+          $("#start_time").val(toDate(start).utc().format());
+          $("#end_time").val(toDate(end).endOf("day").utc().format());
+        }
+
         $('#reportrange').daterangepicker(
           {
             ranges: {
-             'Today': [moment(), moment()],
-             'Last 7 Days': [moment().subtract('days', 6), moment()],
-             'Last 30 Days': [moment().subtract('days', 29), moment()]
+             "Today": [dateStr(), dateStr()],
+             "Last 7 Days": [dateStr(6), dateStr()],
+             "Last 30 Days": [dateStr(29), dateStr()]
             },
-            startDate: moment().subtract('days', 29),
-            endDate: moment(),
+            format: format,
+            startDate: dateStr(29),
+            endDate: dateStr(),
             opens: "left"
           },
           function(start, end) {
-            $("#start_time").val(start.toISOString());
-            $("#end_time").val(end.endOf("day").toISOString());
-            $("#start_time").closest("form").submit();
+            setTimeInputs(start, end);
+            submitIfCompleted($("#start_time").closest("form"));
           }
         ).on('apply.daterangepicker', function(ev, picker) {
-          $("#start_time").val(picker.startDate.toISOString());
-          $("#end_time").val(picker.endDate.endOf("day").toISOString());
-          $('#reportrange span').html(picker.startDate.format('MMMM D, YYYY') + ' - ' + picker.endDate.format('MMMM D, YYYY'));
+          setTimeInputs(picker.startDate, picker.endDate);
+          $('#reportrange span').html(toDate(picker.startDate).format('MMMM D, YYYY') + ' - ' + toDate(picker.endDate).format('MMMM D, YYYY'));
         })
 
         if ($("#start_time").val().length > 0) {
           var picker = $("#reportrange").data('daterangepicker');
-          picker.setStartDate(moment($("#start_time").val()));
-          picker.setEndDate(moment($("#end_time").val()));
+          picker.setStartDate(moment.tz($("#start_time").val(), timeZone));
+          picker.setEndDate(moment.tz($("#end_time").val(), timeZone));
           $("#reportrange").trigger('apply.daterangepicker', picker)
         }
       </script>
@@ -130,9 +147,7 @@
 <script>
   hljs.initHighlightingOnLoad();
 
-  $(".form-inline input, .form-inline select").change( function () {
-    // see if all value are entered
-    var $form = $(this).closest("form");
+  function submitIfCompleted($form) {
     var completed = true;
     $form.find("input[name], select").each( function () {
       if ($(this).val() == "") {
@@ -142,5 +157,9 @@
     if (completed) {
       $form.submit();
     }
+  }
+
+  $(".form-inline input, .form-inline select").change( function () {
+    submitIfCompleted($(this).closest("form"));
   });
 </script>

data/blazer.gemspec

@@ -1,15 +1,15 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'blazer/version'
+require "blazer/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "blazer"
   spec.version       = Blazer::VERSION
   spec.authors       = ["Andrew Kane"]
   spec.email         = ["andrew@chartkick.com"]
-  spec.summary       = %q{Share data effortlessly with your team}
-  spec.description   = %q{Share data effortlessly with your team}
+  spec.summary       = "Share data effortlessly with your team"
+  spec.description   = "Share data effortlessly with your team"
   spec.homepage      = "https://github.com/ankane/blazer"
   spec.license       = "MIT"
 

data/lib/blazer.rb

@@ -14,7 +14,7 @@ module Blazer
   self.audit = true
   self.user_name = :name
   self.timeout = 15
-  self.user_class = 'User'
+  self.user_class = "User"
 
   def self.time_zone=(time_zone)
     @time_zone = time_zone.is_a?(ActiveSupport::TimeZone) ? time_zone : ActiveSupport::TimeZone[time_zone.to_s]

data/lib/blazer/engine.rb

@@ -4,8 +4,7 @@ module Blazer
 
     initializer "precompile" do |app|
       # use a proc instead of a string
-      app.config.assets.precompile << Proc.new{|path| path =~ /\Ablazer\/application\.(js|css)\z/ }
+      app.config.assets.precompile << proc { |path| path =~ /\Ablazer\/application\.(js|css)\z/ }
     end
-
   end
 end

data/lib/blazer/version.rb

@@ -1,3 +1,3 @@
 module Blazer
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blazer
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-31 00:00:00.000000000 Z
+date: 2015-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -92,6 +92,7 @@ files:
 - app/assets/javascripts/blazer/jquery.stickytableheaders.js
 - app/assets/javascripts/blazer/jquery_ujs.js
 - app/assets/javascripts/blazer/list.js
+- app/assets/javascripts/blazer/moment-timezone.js
 - app/assets/javascripts/blazer/moment.js
 - app/assets/javascripts/blazer/selectize.js
 - app/assets/javascripts/blazer/stupidtable.js
@@ -145,3 +146,4 @@ signing_key:
 specification_version: 4
 summary: Share data effortlessly with your team
 test_files: []
+has_rdoc: