daily 0.0.8 → 0.0.9

data/app/controllers/daily_reports_controller.rb

@@ -22,6 +22,28 @@ class DailyReportsController < InheritedResources::Base
     redirect_to daily_table_daily_report_path(@daily_report.table, @daily_report)
   end
   
+  def destroy
+    destroy! { daily_table_path(@daily_report.table) }
+  end
+  
+  def archiveit
+    if @daily_report.archive
+      flash[:notice] = "Report has been archived."
+    else
+      flash[:alert] = "Report has not been archived."
+    end
+    redirect_to daily_table_daily_report_path(@daily_report.table, @daily_report)
+  end
+  
+  def unarchiveit
+    if @daily_report.unarchive
+      flash[:notice] = "Report has been unarchived."
+    else
+      flash[:alert] = "Report has not been unarchived."
+    end
+    redirect_to daily_table_daily_report_path(@daily_report.table, @daily_report)
+  end
+  
   protected
   
   # methods to make declarative_authorization allow optional table

data/app/controllers/daily_tables_controller.rb

@@ -21,4 +21,26 @@ class DailyTablesController < InheritedResources::Base
     end
   end
 
+  def archiveit
+    if @daily_table.archive
+      flash[:notice] = "Table has been archived."
+    else
+      flash[:alert] = "Table has not been archived."
+    end
+    redirect_to @daily_table
+  end
+  
+  def unarchiveit
+    if @daily_table.unarchive
+      flash[:notice] = "Table has been unarchived."
+    else
+      flash[:alert] = "Table has not been unarchived."
+    end
+    redirect_to @daily_table
+  end
+
+  def destroy
+    destroy! { user_root_path }
+  end
+
 end

data/app/formatters/png_formatter.rb

@@ -0,0 +1,56 @@
+module Ruport
+  class Formatter::Png < Formatter
+    renders :png, :for => [Ruport::Controller::Table]
+    
+    CHART_TYPES = %w{line line_xy scatter bar venn pie pie_3d sparkline meter}
+    
+    save_as_binary_file
+    
+    def google_hash
+      out = options.to_hash.symbolize_keys
+      columns = out.delete(:columns) || data.column_names
+
+      if out[:legend] == false or skip_legend?
+        out.delete(:legend)
+      else
+        out[:legend] ||= columns
+      end
+      
+      unless out[:data]
+        out[:data] = []
+        columns.each_with_index do |col, i|
+          out[:data][i] ||= []
+        end
+        data.each_with_index do |row, i|
+          columns.each_with_index do |col, i|
+            out[:data][i] << row[col]
+          end
+        end
+      end
+      
+      out
+    end
+    
+    def skip_legend?
+      google_type == "sparkline"
+    end
+    
+    def google_type
+      options.chart_type.try(:to_s).try(:downcase) || CHART_TYPES.first
+    end
+    
+    def google_url
+      url = Gchart.send(google_type, google_hash)
+      unwise = %w({ } | \ ^ [ ] `)
+      unwise.each { |c| url.gsub!(c, "%#{c[0].to_s(16).upcase}") }
+      url.gsub!(/\s/, "%20")
+      url
+    end
+    
+    def finalize_table
+      require 'open-uri'
+      output << open(google_url).read
+    end
+    
+  end
+end

data/app/jobs/generate_report_job.rb

@@ -10,6 +10,7 @@ class GenerateReportJob < Struct.new(:report_id, :requeue)
 
   def perform
     return if report.nil?
+    return if report.archived?
     report.generate!
     report.queue_next! if requeue
   end

data/app/models/daily_report.rb

@@ -16,7 +16,10 @@ class DailyReport < ActiveRecord::Base
   before_validation :filename_extension_update
 
   after_save :ensure_job
-  after_save :queue_now!, :if => :filename_changed?
+  after_save :queue_now!, :if => :queue_job_now?
+  
+  after_save :delete_file!, :if => :archived?
+  after_destroy :delete_file!
   
   def self.formatters
     Ruport::Controller::Table.formats.keys
@@ -43,6 +46,11 @@ class DailyReport < ActiveRecord::Base
     File.file?(localfile)
   end
   
+  def delete_file!
+    File.delete(localfile) if File.file?(localfile)
+    true
+  end
+  
   def generate!
     Dir.mkdir(localdir) unless File.directory?(localdir)
     touch(:generate_started_at)
@@ -80,7 +88,27 @@ class DailyReport < ActiveRecord::Base
     jobs.by_priority.first
   end
 
+  def archive
+    self.archived = true
+    save ? self : nil
+  end
+  
+  def archive!
+    self.archived = true
+    save!
+  end
+  
+  def unarchive
+    self.archived = false
+    save ? self : nil
+  end
+  
   protected
+  
+  def queue_job_now?
+    return false if archived?
+    filename_changed? or archived_changed?
+  end
 
   def guid_append
     return "" if formatter.blank?
@@ -91,10 +119,8 @@ class DailyReport < ActiveRecord::Base
     Time.now + 1.hour
   end
   
-  protected
-  
   def ensure_job
-    queue_next! if jobs.reload.size == 0
+    queue_next! if not archived? and jobs.reload.size == 0
     true
   end
   

data/app/models/daily_table.rb

@@ -2,7 +2,7 @@ class DailyTable < ActiveRecord::Base
   include SharedBehaviors
   
   belongs_to :user, :class_name => "DailyUser"
-  has_many :reports, :class_name => "DailyReport", :foreign_key => "table_id"
+  has_many :reports, :class_name => "DailyReport", :foreign_key => "table_id", :dependent => :destroy
   
   # just easier with declarative auth to also have this one
   has_many :daily_reports, :foreign_key => "table_id"
@@ -54,7 +54,29 @@ class DailyTable < ActiveRecord::Base
       return "#{metric} (unknown)"
     end
   end
+  
+  def archive
+    transaction do
+      self.archived = true
+      reports.each do |report|
+        report.archive!
+      end
+      save!
+    end
+    return self
+    rescue ActiveRecord::RecordInvalid
+      return nil
+  end
+  
+  def unarchive
+    self.archived = false
+    save ? self : nil
+  end
     
+  def has_reports?
+    reports.size > 0
+  end  
+  
   protected
   
   def metric_valid

data/app/views/daily_reports/show.erb

@@ -8,11 +8,15 @@
 <% end %>
 
 <h6>User: <%= "#{@daily_report.user.email}" %></h6>
+<h6>State: <%= @daily_report.archived? ? "Archived" : "Active" %></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 %>
 
+<%= button_to "Archive", archiveit_daily_table_daily_report_path(@daily_report.table, @daily_report) if permitted_to? :archiveit, @daily_report %>
+<%= button_to "Unarchive", unarchiveit_daily_table_daily_report_path(@daily_report.table, @daily_report) if permitted_to? :unarchiveit, @daily_report %>
+<%= button_to "Delete", daily_table_daily_report_path(@daily_report.table, @daily_report), :method => :delete if permitted_to? :destroy, @daily_report %>
+<%= 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) %>

data/app/views/daily_tables/archive.erb

@@ -0,0 +1,21 @@
+<% title "Archive: " + @daily_table.name %>
+
+<%= content_tag(:p, link_to("Back to table", daily_table_path(@daily_table))) if permitted_to? :show, @daily_table %>
+<p><strong>Archiving</strong> this table will archive all of the associated reports.</p>
+<p>These reports will also have their respective files deleted and unavailable until unarchived.</p>
+
+<% if permitted_to? :destroy, @daily_table %>
+  <p><strong>Deleting</strong> this daily will delete all of the associated reports and files.</p>
+<% end %>
+
+<% if @daily_table.reports.size == 0 %>
+  <h3>No reports based on this table.</h3>
+<% else %>
+  <h3>Reports based on this table</h3>
+  <%= render "daily_reports/list", :list => @daily_table.reports %>
+<% end %>
+
+<hr/>
+
+<%= button_to "Archive", archiveit_daily_table_path(@daily_table) if permitted_to? :archiveit, @daily_table %>
+<%= button_to "Delete", daily_table_path(@daily_table), :method => :delete if permitted_to? :destroy, @daily_table %>

data/app/views/daily_tables/show.erb

@@ -7,8 +7,13 @@
 <hr/>
 
 <h6>User: <%= "#{@daily_table.user.email}" %></h6>
+<h6>State: <%= @daily_table.archived? ? "Archived" : "Active" %></h6>
 <h6>Type: <%= "#{@daily_table.metric_name}" %></h6>
 <h6>Running time: <%= table_time_run(@daily_table) %></h6>
+
+<%= button_to "Delete", daily_table_path(@daily_table), :method => :delete if permitted_to? :destroy, @daily_table %>
+<%= button_to "Unarchive", unarchiveit_daily_table_path(@daily_table) if permitted_to? :unarchiveit, @daily_table %>
+<%= content_tag(:p, link_to("Archive", archive_daily_table_path(@daily_table))) if permitted_to? :archive, @daily_table %>
 <%= content_tag(:p, link_to("Edit", edit_daily_table_path(@daily_table))) if permitted_to? :edit, @daily_table %>
 
 <% if @test_html %>

data/config/authorization_rules.rb

@@ -11,8 +11,24 @@ authorization do
       if_attribute :user => is { user }
     end
     
-    has_permission_on :daily_tables, :to => [:report] do
+    has_permission_on :daily_tables, :to => [:archive, :archiveit], :join_by => :and do
+      if_permitted_to :update
+      if_attribute :archived? => is_not { true }
+    end
+    
+    has_permission_on :daily_tables, :to => [:unarchiveit], :join_by => :and do
+      if_permitted_to :update
+      if_attribute :archived? => is { true }
+    end
+    
+    has_permission_on :daily_tables, :to => [:destroy], :join_by => :and do
+      if_permitted_to :update
+      if_attribute :has_reports? => is { false }
+    end
+    
+    has_permission_on :daily_tables, :to => [:report], :join_by => :and do
       if_permitted_to :show
+      if_attribute :archived? => is_not { true }
     end
     
     has_permission_on :daily_reports, :to => [:create] do
@@ -23,8 +39,27 @@ authorization do
       if_attribute :user => is { user }
     end
     
-    has_permission_on :daily_reports, :to => [:show, :generate] do
+    has_permission_on :daily_reports, :to => [:archive, :archiveit], :join_by => :and do
+      if_permitted_to :update
+      if_attribute :archived? => is_not { true }
+    end
+    
+    has_permission_on :daily_reports, :to => [:unarchiveit], :join_by => :and do
+      if_permitted_to :update
+      if_attribute :archived? => is { true }
+    end
+    
+    has_permission_on :daily_reports, :to => [:destroy], :join_by => :and do
+      if_permitted_to :update
+    end
+    
+    has_permission_on :daily_reports, :to => [:show] do
+      if_permitted_to :update
+    end
+    
+    has_permission_on :daily_reports, :to => [:generate], :join_by => :and do
       if_permitted_to :update
+      if_attribute :archived? => is_not { true }
     end
     
     has_permission_on :daily_users, :to => [:update, :account] do

data/config/locales/en.yml

@@ -24,8 +24,12 @@ en:
         notice: "Report was successfully created."
       update:
         notice: "Report was successfully updated."
+      destroy:
+        notice: "Report has been deleted."
     daily_tables:
       create:
         notice: "Table was successfully created."
       update:
-        notice: "Table was successfully updated."
+        notice: "Table was successfully updated."
+      destroy:
+        notice: "Table has been deleted."

data/config/routes.rb

@@ -11,9 +11,16 @@ Rails.application.routes.draw do
     match 'home' => 'main#home', :as => :user_root
   
     resources :daily_tables, :path => "tables" do
+      member do
+        get :archive
+        post :archiveit
+        post :unarchiveit
+      end
       resources :daily_reports, :path => "reports" do
         member do
           post :generate
+          post :archiveit
+          post :unarchiveit
         end
       end
     end

data/db/migrate/20120117020222_add_archived_to_tables.rb

@@ -0,0 +1,11 @@
+class AddArchivedToTables < ActiveRecord::Migration
+  def self.up
+    add_column :daily_tables, :archived, :boolean, :default => false
+    add_column :daily_reports, :archived, :boolean, :defualt => false
+  end
+  
+  def self.down
+    remove_column :daily_reports, :archived
+    remove_column :daily_tables, :archived
+  end
+end

data/db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20120111081745) do
+ActiveRecord::Schema.define(:version => 20120117020222) do
 
   create_table "daily_reports", :force => true do |t|
     t.string   "name"
@@ -25,6 +25,7 @@ ActiveRecord::Schema.define(:version => 20120111081745) do
     t.string   "transform"
     t.text     "transform_data"
     t.text     "formatter_data"
+    t.boolean  "archived"
   end
 
   create_table "daily_tables", :force => true do |t|
@@ -39,6 +40,7 @@ ActiveRecord::Schema.define(:version => 20120111081745) do
     t.text     "column_names"
     t.string   "transform"
     t.text     "transform_data"
+    t.boolean  "archived",              :default => false
   end
 
   create_table "daily_users", :force => true do |t|

data/lib/daily/version.rb

@@ -1,3 +1,3 @@
 module Daily
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: daily
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 0
-  - 8
-  version: 0.0.8
+  - 9
+  version: 0.0.9
 platform: ruby
 authors: 
 - Brian Leonard
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-13 00:00:00 -08:00
+date: 2012-01-18 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -364,6 +364,7 @@ files:
 - app/controllers/main_controller.rb
 - app/formatters/html_formatter.rb
 - app/formatters/json_formatter.rb
+- app/formatters/png_formatter.rb
 - app/helpers/application_helper.rb
 - app/jobs/generate_report_job.rb
 - app/metrics/metric.rb
@@ -382,6 +383,7 @@ files:
 - app/views/daily_reports/show.erb
 - app/views/daily_tables/_form.erb
 - app/views/daily_tables/_list.erb
+- app/views/daily_tables/archive.erb
 - app/views/daily_tables/edit.erb
 - app/views/daily_tables/index.erb
 - app/views/daily_tables/new.erb
@@ -436,6 +438,7 @@ files:
 - db/migrate/20120110075743_add_queue_to_delayed_jobs.rb
 - db/migrate/20120111054115_create_table_metrics.rb
 - db/migrate/20120111081745_namespace_models.rb
+- db/migrate/20120117020222_add_archived_to_tables.rb
 - db/schema.rb
 - db/seeds.rb
 - db/test.sqlite3