daily 0.0.3 → 0.0.4

data/app/controllers/daily_reports_controller.rb

@@ -0,0 +1,35 @@
+class DailyReportsController < InheritedResources::Base
+  nested_belongs_to :daily_table, :optional => true
+  filter_resource_access :nested_in => :daily_table, :additional_member => :generate
+  
+  def create
+    build_resource.user = current_user
+    create! do |success, failure|
+      success.all { redirect_to daily_table_daily_report_path(@daily_report.table, @daily_report)}
+      failure.all { render :new }
+    end
+  end
+  
+  def update
+    update! do |success, failure|
+      success.all { redirect_to daily_table_daily_report_path(@daily_report.table, @daily_report)}
+      failure.all { render :edit }
+    end
+  end
+  
+  def generate
+    @daily_report.queue_now!
+    redirect_to daily_table_daily_report_path(@daily_report.table, @daily_report)
+  end
+  
+  protected
+  
+  # methods to make declarative_authorization allow optional table
+  def load_daily_table
+    @daily_table ||= load_parent_controller_object(:daily_table) if params[:daily_table_id]
+    @daily_table  # loaded by inherited_resources if there
+  end
+  def new_daily_report_for_collection
+    @daily_report ||= @daily_table ? new_controller_object_for_collection : DailyReport.new
+  end
+end

data/app/controllers/daily_tables_controller.rb

@@ -0,0 +1,24 @@
+class DailyTablesController < InheritedResources::Base
+  filter_resource_access
+
+  def new
+    build_resource.metric = "SqlQuery"
+    new!
+  end
+  
+  def create
+    build_resource.user = current_user
+    create!
+  end
+  
+  def update
+    update!
+  end
+
+  def show
+    show! do
+      @test_html = @daily_table.test if params[:test]
+    end
+  end
+
+end

data/app/controllers/{users_controller.rb → daily_users_controller.rb}

@@ -1,9 +1,9 @@
-class UsersController < InheritedResources::Base
+class DailyUsersController < InheritedResources::Base
   before_filter :user_from_current, :only => :edit
   filter_resource_access
   
   def update
-    params[:user][:password] = nil if params[:user][:password].blank?
+    params[:daily_user][:password] = nil if params[:daily_user][:password].blank?
     
     update! do |success, failure|
       success.all { redirect_after_update }
@@ -16,11 +16,11 @@ class UsersController < InheritedResources::Base
     params[:id] ||= (current_user.try(:id) || 0)
   end
   def redirect_after_update
-    if @user == current_user
-      sign_in @user, :bypass => true
+    if @daily_user == current_user
+      sign_in @daily_user, :bypass => true
       redirect_to user_root_path
-    elsif permitted_to? :show, @user
-      redirect_to user_path(@user)
+    elsif permitted_to? :show, @daily_user
+      redirect_to daily_user_path(@daily_user)
     else
       redirect_to user_root_path
     end

data/app/controllers/main_controller.rb

@@ -1,5 +1,5 @@
 class MainController < ApplicationController
   def home
-    redirect_to root_url unless current_user
+    redirect_to root_path unless current_user
   end
 end

data/app/jobs/generate_report_job.rb

@@ -1,7 +1,11 @@
 class GenerateReportJob < Struct.new(:report_id, :requeue)
 
+  def enqueue(job)
+    job.report_id = self.report_id
+  end
+
   def report
-    @report ||= Report.find_by_id(report_id)
+    @daily_report ||= DailyReport.find_by_id(report_id)
   end
 
   def perform

data/app/metrics/metric.rb

@@ -0,0 +1,41 @@
+class Metric
+  def self.metrics
+    DailyConfig.load_classes if Rails.env.development?
+    subclasses
+  end
+  
+  def self.display_name
+    name.demodulize.underscore.humanize.titleize
+  end
+  
+  def self.form_keys
+    []  # override to get more / different
+  end
+  
+  def self.validates_presence_of_data
+    @validates_presence_of_data = true
+  end
+  
+  def self.get_data_errors(data)
+    return ["can't be blank"] if @validates_presence_of_data and data.blank?
+    validate_data(data) || []
+  end
+  
+  def self.validate_data(data)
+    []
+  end
+    
+  attr_accessor :data
+  def initialize(data)
+    self.data = data
+  end
+
+  def setting(key, default = nil)
+    val = settings[key.to_sym]
+    val.blank? ? default : val
+  end
+
+  def result
+    raise("Metrics must override result")
+  end
+end

data/app/metrics/sql_query.rb

@@ -0,0 +1,11 @@
+class SqlQuery < Metric
+  validates_presence_of_data
+  
+  def self.display_name
+    "SQL Query"
+  end
+  
+  def result
+    Ruport::Query.new(data).result
+  end
+end

data/app/models/{report.rb → daily_report.rb}

@@ -1,8 +1,8 @@
-class Report < ActiveRecord::Base
+class DailyReport < ActiveRecord::Base
   include SharedBehaviors
-  belongs_to :user
-  belongs_to :table
-  has_many :jobs, :class_name => "::Delayed::Job"
+  belongs_to :user, :class_name => "DailyUser"
+  belongs_to :table, :class_name => "DailyTable"
+  has_many :jobs, :class_name => "::Delayed::Job", :foreign_key => "report_id"
   
   has_data :formatter
   

data/app/models/{table.rb → daily_table.rb}

@@ -1,24 +1,21 @@
-class Table < ActiveRecord::Base
+class DailyTable < ActiveRecord::Base
   include SharedBehaviors
   
-  belongs_to :user
-  has_many :reports
+  belongs_to :user, :class_name => "DailyUser"
+  has_many :reports, :class_name => "DailyReport", :foreign_key => "table_id"
+  
+  # just easier with declarative auth to also have this one
+  has_many :daily_reports, :foreign_key => "table_id"
   
   generate_guid :guid
   
   validates_presence_of :user
   validates_unique_presence_of :name
-  validates_stripped_presence_of :data
-  validates_stripped_presence_of :data_type
+  validates_stripped_presence_of :metric
 
-  validate :data_type_known
-  
+  validate :metric_valid
   serialize :column_names, Array
   
-  def sql?
-    data_type == "sql"
-  end
-  
   def result
     fetch
   end
@@ -48,18 +45,31 @@ class Table < ActiveRecord::Base
       out.gsub("\n", "<br/>").html_safe
     end
   end
+  
+  def metric_name
+    return "" if metric.blank?
+    begin
+      return metric.constantize.display_name
+    rescue Exception => e
+      return "#{metric} (unknown)"
+    end
+  end
     
   protected
-  def data_type_known
-    return if data_type.blank?
-    unless sql?
-      errors.add(:data_type, "is not known")
+  
+  def metric_valid
+    return if metric.blank?
+    begin
+      metric.constantize.get_data_errors(metric_data).each do |message|
+        errors.add(:metric_data, message)
+      end
+    rescue Exception => e
+      errors.add(:metric, "is not known")
     end
   end
   
   def fetch_data
-    return Ruport::Query.new(data).result if sql?
-    Ruport::Data::Table.new
+    metric.constantize.new(metric_data).result
   end
   
 end

data/app/models/{user.rb → daily_user.rb}

@@ -1,4 +1,4 @@
-class User < ActiveRecord::Base
+class DailyUser < ActiveRecord::Base
   # Include default devise modules. Others available are:
   # :token_authenticatable, :encryptable, :confirmable, :lockable, :timeoutable and :omniauthable
   devise :database_authenticatable, :registerable,
@@ -7,8 +7,8 @@ class User < ActiveRecord::Base
   # Setup accessible (or protected) attributes for your model
   attr_accessible :email, :password, :password_confirmation, :remember_me
   
-  has_many :tables
-  has_many :reports
+  has_many :tables, :class_name => "DailyTable", :foreign_key => "user_id"
+  has_many :reports, :class_name => "DailyReport", :foreign_key => "user_id"
   
   def role_symbols
     return [] if new_record?

data/app/transforms/transform.rb

@@ -1,6 +1,7 @@
 class Transform
   def self.transforms
-    [ColumnFilter, MovingAverage]
+    DailyConfig.load_classes if Rails.env.development?
+    subclasses
   end
   
   def self.display_name

data/app/views/daily_reports/_form.erb

@@ -0,0 +1,14 @@
+<h3>Table: <%= link_to @daily_report.table.name, daily_table_path(@daily_report.table) %></h3>
+
+<%= simple_form_for [@daily_report.table, @daily_report] do |f| %>
+  <%= f.input :name %>
+  <%= f.input :filename unless @daily_report.new_record? %>
+  
+  <%= f.input :formatter, :collection => DailyReport.formatters %>
+  <%= f.input :formatter_json, :as => :text %>
+  
+  <%= f.input :transform, :collection => Transform.transforms, :label_method => :display_name, :value_method => :name %>
+  <%= f.input :transform_json, :as => :text %>
+  
+  <%= f.button :submit %>
+<% end %>

data/app/views/{reports → daily_reports}/_list.erb

@@ -2,7 +2,7 @@
   <ul>
     <% list.each do |report| %>
       <% if permitted_to? :show, report %>
-        <li><%= link_to report.name, table_report_path(report.table, report) %></li>
+        <li><%= link_to report.name, daily_table_daily_report_path(report.table, report) %></li>
       <% end %>
     <% end %>
   </ul>

data/app/views/daily_reports/edit.erb

@@ -0,0 +1,2 @@
+<% title "Edit Report: #{@daily_report.name}" %>
+<%= render 'form' %>

data/app/views/daily_reports/index.erb

@@ -0,0 +1,3 @@
+<% title "Reports" %>
+
+<%= render "daily_reports/list", :list => @daily_reports %>

data/app/views/daily_reports/show.erb

@@ -0,0 +1,23 @@
+<% title @daily_report.name %>
+<h3>Table: <%= link_to @daily_report.table.name, daily_table_path(@daily_report.table) %></h3>
+
+<% if @daily_report.file_exists? %>
+  <h5>URL: <%= link_to @daily_report.url(root_url), @daily_report.url(root_url) %></h5>
+<% else %>
+  <h5>URL: <%= @daily_report.url(root_url) %></h5>
+<% end %>
+
+<h6>User: <%= "#{@daily_report.user.email}" %></h6>
+<h6>Running time: <%= report_time_run(@daily_report) %></h6>
+<h6>Last updated: <%= report_time_ago(@daily_report) %></h6>
+<h6>Next updated: <%= report_time_next(@daily_report) %></h6>
+<%= button_to "Queue Update Now", generate_daily_table_daily_report_path(@daily_report.table, @daily_report) if permitted_to? :generate, @daily_report %>
+
+<%= content_tag(:p, link_to("Edit", edit_daily_table_daily_report_path(@daily_report.table, @daily_report))) if permitted_to? :edit, @daily_report %>
+
+<%= formatter_display(@daily_report) %>
+
+<%= transform_display(@daily_report) %>
+
+<hr/>
+<%= report_error_html(@daily_report) %>

data/app/views/{tables → daily_tables}/_form.erb

@@ -1,8 +1,11 @@
-<%= simple_form_for @table do |f| %>
+<%= simple_form_for @daily_table do |f| %>
   <%= f.input :name %>
-  <%= f.input :data %>
+  
+  <%= f.input :metric, :collection => Metric.metrics, :label_method => :display_name, :value_method => :name, :include_blank => false %>
+  <%= f.input :metric_data %>
   
   <%= f.input :transform, :collection => Transform.transforms, :label_method => :display_name, :value_method => :name %>
   <%= f.input :transform_json, :as => :text %>
+  
   <%= f.button :submit %>
 <% end %>

data/app/views/daily_tables/edit.erb

@@ -0,0 +1,2 @@
+<% title "Edit Table: #{@daily_table.name}" %>
+<%= render 'form' %>

data/app/views/daily_tables/index.erb

@@ -0,0 +1,3 @@
+<% title "Tables" %>
+
+<%= render "daily_tables/list", :list => @daily_tables %>

data/app/views/daily_tables/show.erb

@@ -0,0 +1,35 @@
+<% title @daily_table.name %>
+
+<h3>Reports</h3>
+<p><%= link_to "New report from this table", new_daily_table_daily_report_path(@daily_table) if permitted_to? :report, @daily_table  %></p>
+<%= render "daily_reports/list", :list => @daily_table.reports %>
+
+<hr/>
+
+<h6>User: <%= "#{@daily_table.user.email}" %></h6>
+<h6>Type: <%= "#{@daily_table.metric_name}" %></h6>
+<h6>Running time: <%= table_time_run(@daily_table) %></h6>
+<%= content_tag(:p, link_to("Edit", edit_daily_table_path(@daily_table))) if permitted_to? :edit, @daily_table %>
+
+<% if @test_html %>
+  <p><%= link_to "Hide Table Output", daily_table_path(@daily_table) %></p>
+  <%= @test_html %>
+<% else %>
+  <p><%= link_to "See Table Output", daily_table_path(@daily_table, :test => true) %></p>
+  
+  <% if @daily_table.column_names and @daily_table.column_names.size > 0 %>
+    <table>
+      <tr>
+        <% @daily_table.column_names.each do |name| %>
+          <th><%= name %></th>
+        <% end %>
+      </tr>
+    </table>
+  <% end %>
+<% end %>
+
+<hr/>
+
+<%= simple_format(@daily_table.metric_data) %>
+
+<%= transform_display(@daily_table) %>

data/app/views/{users → daily_users}/_form.erb

@@ -1,4 +1,4 @@
-<%= simple_form_for @user do |f| %>
+<%= simple_form_for @daily_user do |f| %>
   <%= f.input :email %>
   <%= f.input :password %>
   <%= f.button :submit %>

data/app/views/daily_users/_items.erb

@@ -0,0 +1,8 @@
+<h3>Tables</h3>
+<p><%= link_to "New Table", new_daily_table_path if user == current_user && permitted_to?(:new, :daily_tables) %></p>
+<%= render "daily_tables/list", :list => user.tables %>
+
+<% if user.reports.size > 0 %>
+  <h3>Reports</h3>
+  <%= render "daily_reports/list", :list => user.reports %>
+<% end %>

data/app/views/daily_users/edit.erb

@@ -0,0 +1,2 @@
+<% title "Edit User: #{@daily_user.email}" %>
+<%= render 'form' %>

data/app/views/daily_users/index.erb

@@ -0,0 +1,3 @@
+<% title "Users" %>
+
+<%= render "daily_users/list", :list => @daily_users %>

data/app/views/daily_users/show.erb

@@ -0,0 +1,4 @@
+<% title "#{@daily_user.email}" %>
+<%= content_tag(:p, link_to("Update Account", edit_daily_user_path(@daily_user))) if permitted_to? :edit, @daily_user %>
+
+<%= render 'daily_users/items', :user => @daily_user %>