stat_board 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de0bd3c95825876eee22d01d934b8289212e806ce954a817567f9c5fb3fed2d7
-  data.tar.gz: 452130740530b8fc1da4d3bb301618fbbf6b16ed29dabbebbe75c0c687d41419
+  metadata.gz: 56119a7dfb242c2870891827f9c4f02cef7132a49e0d12ed277f0de62dcf3761
+  data.tar.gz: 40c2c2d54dfac7611707ddbaf5102382703f0c3a5ab934388496fbf14ebae2ad
 SHA512:
-  metadata.gz: 0013c7c2908001696a1ed86c7286b7ae02dbc9a0481a7c81eb5af49cb5e795afbd52f7c272a9e1c4e8aac4fdfa2af65a074909793b3193aa4722e9ba5879a71d
-  data.tar.gz: 897ea2ade4d762b3b88dc56137d5a358589e08e5915e23c1bcaf966128b7e17cac79c82116392d3ed293b9512f34dd6a877a757fa8aacce178bfaa5d4868f71e
+  metadata.gz: a631aca73ed4e7bcd7dcc870d856a1c392e0af94555444678e639c7dd90e960e52480e8554872cf96622422344d02ebc397f36456b22adc37c13f21d978d160b
+  data.tar.gz: 9be14830e8df286e04dedb8f60cbe9320da7cd288e4b63c1344de0ab59661c8508b90589ed49c8283e80554a59e611c3f76466ae2d1ce8c32412c05da047f0eb

data/README.markdown

@@ -52,7 +52,7 @@ In `config/initializers/stat_board.rb`:
         module StatBoard
           module Reports
             class DayReport < Report
-              def name(original_date = nil)
+              def name
                 "Last day"
               end
 

data/app/assets/stylesheets/stat_board/bootstrap.css

@@ -1,3 +1,14 @@
+.statboard-filter form {
+  display: flex;
+  margin: 20px auto;
+  width: 500px;
+}
+
+.statboard-filter form input {
+  margin: 0 10px;
+}
+
+
 /*!
  * Bootstrap v2.2.1
  *

data/app/controllers/stat_board/application_controller.rb

@@ -1,15 +1,13 @@
 module StatBoard
   class ApplicationController < ActionController::Base
+    before_action :basic_authenticate, :if => lambda { StatBoard.username && StatBoard.password }
 
     private
 
-    [:date_steps, :first_day_ever, :resources_by_date].each do |method|
-      helper_method method
-      delegate method, :to => :graph_helper
-    end
-
-    def graph_helper
-      @graph_helper ||= GraphHelper.new
+    def basic_authenticate
+      authenticate_or_request_with_http_basic do |name, password|
+        name == StatBoard.username && password == StatBoard.password
+      end
     end
 
   end

data/app/controllers/stat_board/stats_controller.rb

@@ -2,18 +2,46 @@ require_dependency "stat_board/application_controller"
 
 module StatBoard
   class StatsController < ApplicationController
-    before_action :basic_authenticate, :if => lambda { StatBoard.username && StatBoard.password }
 
     def index
-      @reports = ReportsFinder.all
+      @reports = ReportsFinder.all.map do |report_klass|
+        report_klass.new(start_at, end_at)
+      end
     end
 
     private
 
-    def basic_authenticate
-      authenticate_or_request_with_http_basic do |name, password|
-        name == StatBoard.username && password == StatBoard.password
+    [:date_steps, :resources_by_date].each do |method|
+      helper_method method
+      delegate method, :to => :graph_helper
+    end
+
+    def graph_helper
+      @graph_helper ||= GraphHelper.new(start_at, end_at)
+    end
+
+    def start_at
+      @start_at ||= begin
+        Date.parse(params[:stats][:start_at])
+      rescue
+        first_day_ever
       end
     end
+    helper_method :start_at
+
+    def end_at
+      @end_at ||= Date.parse(params[:stats][:end_at])
+    rescue
+      Date.today
+    end
+    helper_method :end_at
+
+    def first_day_ever
+      StatBoard.models.map do |m|
+        klass = m.to_s.constantize
+        klass.order("created_at ASC").first.try(:created_at) || Time.now
+      end.sort.first
+    end
+    helper_method :first_day_ever
   end
 end

data/app/views/stat_board/stats/_chart.html.erb

@@ -2,7 +2,7 @@
   <table class="table table-striped">
     <thead>
       <tr>
-        <th colspan="2"><%= report.name(first_day_ever) %></th>
+        <th colspan="2"><%= report.name %></th>
       </tr>
     </thead>
 

data/app/views/stat_board/stats/_graph.html.erb

@@ -3,7 +3,7 @@
 <%= javascript_include_tag "stat_board/highcharts" %>
 <script>
   var pointInterval = <%= date_steps.days * 1000 %>;
-  var pointStart    = <%= first_day_ever.to_i * 1000 %>;
+  var pointStart    = <%= start_at.to_time.to_i * 1000 %>;
 
   Highcharts.chart('container', {
     title: { text: '' },

data/app/views/stat_board/stats/index.html.erb

@@ -3,6 +3,16 @@
     <%= render "graph" %>
   <% end %>
 
+  <div class="statboard-filter">
+    <%= form_for :stats, method: :get do |f| %>
+      <%= f.date_field :start_at, value: start_at %>
+      <%= f.date_field :end_at, value: end_at %>
+
+      <%= f.submit "Filter", class: "btn btn-primary" %>
+      <%= link_to "Clear", {}, class: "btn" %>
+    <% end %>
+  </div>
+
   <div class="row">
     <%= render :partial => "chart", :collection => @reports, :as => :report %>
   </div>

data/lib/stat_board/graph_helper.rb

@@ -1,13 +1,10 @@
 module StatBoard
   class GraphHelper
+    attr_reader :start_at, :end_at
 
-    # number of days per interval on the graph's x axis
-    def date_steps
-      @date_steps ||= date_range.count / [date_range.count, 50].min
-    end
-
-    def first_day_ever
-      @first_day_ever ||= first_day_of_each_model.sort.first
+    def initialize(sa, ea)
+      @start_at = sa.to_date
+      @end_at   = ea.to_date
     end
 
     # a string of the array of the count of (klass) objects
@@ -21,15 +18,16 @@ module StatBoard
       end.to_s
     end
 
+    # number of days per interval on the graph's x axis
+    def date_steps
+      @date_steps ||= date_range.count / [date_range.count, 50].min
+    end
+
     private
 
     # range of dates shown on the graph (array of days)
     def date_range
-      @date_range ||= first_day_ever.to_date..Date.today
-    end
-
-    def first_day_of_each_model
-      StatBoard.models.map { |m| first_day_of(m) }
+      @date_range ||= start_at..end_at
     end
 
     # returns the earliest `created_at` of a given class

data/lib/stat_board/reports/monthly_report.rb

@@ -1,12 +1,12 @@
 module StatBoard
   module Reports
     class MonthlyReport < Report
-      def name(original_date = nil)
+      def name
         "Last 30 days"
       end
 
       def scope(model)
-        super.where(["created_at > ?", 30.days.ago])
+        super.where(["created_at > ? AND created_at < ?", end_date - 30.days, end_date + 1.day])
       end
     end
   end

data/lib/stat_board/reports/overall_report.rb

@@ -1,12 +1,12 @@
 module StatBoard
   module Reports
     class OverallReport < Report
-      def name(original_date = nil)
-        if original_date
-          "Overall (since #{original_date.strftime("%m-%d-%Y")})"
-        else
-          "Overall"
-        end
+      def name
+        "Overall (#{start_date.strftime("%m-%d-%Y")} - #{end_date.strftime("%m-%d-%Y")})"
+      end
+
+      def scope(model)
+        super.where(["created_at > ? AND created_at < ?", start_date, end_date + 1.day])
       end
     end
   end

data/lib/stat_board/reports/report.rb

@@ -1,7 +1,14 @@
 module StatBoard
   module Reports
     class Report
-      def name(original_date = nil)
+      attr_reader :start_date, :end_date
+
+      def initialize(start_date, end_date)
+        @start_date = start_date
+        @end_date = end_date
+      end
+
+      def name
         # define in subclass
       end
 

data/lib/stat_board/reports/weekly_report.rb

@@ -1,12 +1,12 @@
 module StatBoard
   module Reports
     class WeeklyReport < Report
-      def name(original_date = nil)
+      def name
         "Last 7 days"
       end
 
       def scope(model)
-        super.where(["created_at > ?", 1.week.ago])
+        super.where(["created_at > ? AND created_at < ?", end_date - 1.week, end_date + 1.day])
       end
     end
   end

data/lib/stat_board/reports_finder.rb

@@ -1,14 +1,14 @@
 module StatBoard
   class ReportsFinder < Struct.new(:directory)
-    def reports
+    def report_klasses
       Dir[File.join(directory, "/*_report.rb")].map do |report|
-        "StatBoard::Reports::#{File.basename(report, ".rb").camelcase}".constantize.new
+        "StatBoard::Reports::#{File.basename(report, ".rb").camelcase}".constantize
       end
     end
 
     def self.all
-      self.new(File.join(StatBoard::Engine.root, "lib/stat_board/reports")).reports +
-      self.new(File.join(Rails.root, "lib/stat_board/reports")).reports
+      self.new(File.join(StatBoard::Engine.root, "lib/stat_board/reports")).report_klasses +
+      self.new(File.join(Rails.root, "lib/stat_board/reports")).report_klasses
     end
   end
 end

data/lib/stat_board/version.rb

@@ -1,3 +1,3 @@
 module StatBoard
-  VERSION = '1.0.2'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stat_board
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - David Eisinger