daily 0.0.3 → 0.0.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/app/controllers/daily_reports_controller.rb +35 -0
- data/app/controllers/daily_tables_controller.rb +24 -0
- data/app/controllers/{users_controller.rb → daily_users_controller.rb} +6 -6
- data/app/controllers/main_controller.rb +1 -1
- data/app/jobs/generate_report_job.rb +5 -1
- data/app/metrics/metric.rb +41 -0
- data/app/metrics/sql_query.rb +11 -0
- data/app/models/{report.rb → daily_report.rb} +4 -4
- data/app/models/{table.rb → daily_table.rb} +27 -17
- data/app/models/{user.rb → daily_user.rb} +3 -3
- data/app/transforms/transform.rb +2 -1
- data/app/views/daily_reports/_form.erb +14 -0
- data/app/views/{reports → daily_reports}/_list.erb +1 -1
- data/app/views/daily_reports/edit.erb +2 -0
- data/app/views/daily_reports/index.erb +3 -0
- data/app/views/{reports → daily_reports}/new.erb +0 -0
- data/app/views/daily_reports/show.erb +23 -0
- data/app/views/{tables → daily_tables}/_form.erb +5 -2
- data/app/views/{tables → daily_tables}/_list.erb +0 -0
- data/app/views/daily_tables/edit.erb +2 -0
- data/app/views/daily_tables/index.erb +3 -0
- data/app/views/{tables → daily_tables}/new.erb +0 -0
- data/app/views/daily_tables/show.erb +35 -0
- data/app/views/{users → daily_users}/_form.erb +1 -1
- data/app/views/daily_users/_items.erb +8 -0
- data/app/views/{users → daily_users}/_list.erb +0 -0
- data/app/views/daily_users/edit.erb +2 -0
- data/app/views/daily_users/index.erb +3 -0
- data/app/views/{users → daily_users}/new.erb +0 -0
- data/app/views/daily_users/show.erb +4 -0
- data/app/views/main/home.erb +1 -1
- data/config/authorization_rules.rb +11 -11
- data/config/initializers/ruport.rb +1 -2
- data/config/locales/en.yml +27 -1
- data/config/routes.rb +6 -6
- data/db/development.sqlite3 +0 -0
- data/db/migrate/20120111054115_create_table_metrics.rb +42 -0
- data/db/migrate/20120111081745_namespace_models.rb +13 -0
- data/db/schema.rb +26 -25
- data/db/test.sqlite3 +0 -0
- data/lib/daily.rb +4 -4
- data/lib/daily/activemetric.rb +5 -0
- data/lib/daily/daily_config.rb +20 -3
- data/lib/daily/version.rb +1 -1
- data/lib/{daily → engine}/engine.rb +0 -0
- data/lib/tasks/user.rake +2 -2
- metadata +63 -44
- data/app/controllers/reports_controller.rb +0 -35
- data/app/controllers/tables_controller.rb +0 -20
- data/app/views/reports/_form.erb +0 -14
- data/app/views/reports/edit.erb +0 -2
- data/app/views/reports/index.erb +0 -3
- data/app/views/reports/show.erb +0 -23
- data/app/views/tables/edit.erb +0 -2
- data/app/views/tables/index.erb +0 -3
- data/app/views/tables/show.erb +0 -35
- data/app/views/users/_items.erb +0 -8
- data/app/views/users/edit.erb +0 -2
- data/app/views/users/index.erb +0 -3
- data/app/views/users/show.erb +0 -4
@@ -1,35 +0,0 @@
|
|
1
|
-
class ReportsController < InheritedResources::Base
|
2
|
-
nested_belongs_to :table, :optional => true
|
3
|
-
filter_resource_access :nested_in => :table, :additional_member => :generate
|
4
|
-
|
5
|
-
def create
|
6
|
-
build_resource.user = current_user
|
7
|
-
create! do |success, failure|
|
8
|
-
success.all { redirect_to table_report_path(@report.table, @report)}
|
9
|
-
failure.all { render :new }
|
10
|
-
end
|
11
|
-
end
|
12
|
-
|
13
|
-
def update
|
14
|
-
update! do |success, failure|
|
15
|
-
success.all { redirect_to table_report_path(@report.table, @report)}
|
16
|
-
failure.all { render :edit }
|
17
|
-
end
|
18
|
-
end
|
19
|
-
|
20
|
-
def generate
|
21
|
-
@report.queue_now!
|
22
|
-
redirect_to table_report_path(@report.table, @report)
|
23
|
-
end
|
24
|
-
|
25
|
-
protected
|
26
|
-
|
27
|
-
# methods to make declarative_authorization allow optional table
|
28
|
-
def load_table
|
29
|
-
@table ||= load_parent_controller_object(:table) if params[:table_id]
|
30
|
-
@table # loaded by inherited_resources if there
|
31
|
-
end
|
32
|
-
def new_report_for_collection
|
33
|
-
@report ||= @table ? new_controller_object_for_collection : Report.new
|
34
|
-
end
|
35
|
-
end
|
@@ -1,20 +0,0 @@
|
|
1
|
-
class TablesController < InheritedResources::Base
|
2
|
-
filter_resource_access
|
3
|
-
|
4
|
-
def create
|
5
|
-
build_resource.user = current_user
|
6
|
-
build_resource.data_type = "sql"
|
7
|
-
create!
|
8
|
-
end
|
9
|
-
|
10
|
-
def update
|
11
|
-
update!
|
12
|
-
end
|
13
|
-
|
14
|
-
def show
|
15
|
-
show! do
|
16
|
-
@test_html = @table.test if params[:test]
|
17
|
-
end
|
18
|
-
end
|
19
|
-
|
20
|
-
end
|
data/app/views/reports/_form.erb
DELETED
@@ -1,14 +0,0 @@
|
|
1
|
-
<h3>Table: <%= link_to @report.table.name, table_path(@report.table) %></h3>
|
2
|
-
|
3
|
-
<%= simple_form_for [@report.table, @report] do |f| %>
|
4
|
-
<%= f.input :name %>
|
5
|
-
<%= f.input :filename unless @report.new_record? %>
|
6
|
-
|
7
|
-
<%= f.input :formatter, :collection => Report.formatters %>
|
8
|
-
<%= f.input :formatter_json, :as => :text %>
|
9
|
-
|
10
|
-
<%= f.input :transform, :collection => Transform.transforms, :label_method => :display_name, :value_method => :name %>
|
11
|
-
<%= f.input :transform_json, :as => :text %>
|
12
|
-
|
13
|
-
<%= f.button :submit %>
|
14
|
-
<% end %>
|
data/app/views/reports/edit.erb
DELETED
data/app/views/reports/index.erb
DELETED
data/app/views/reports/show.erb
DELETED
@@ -1,23 +0,0 @@
|
|
1
|
-
<% title @report.name %>
|
2
|
-
<h3>Table: <%= link_to @report.table.name, table_path(@report.table) %></h3>
|
3
|
-
|
4
|
-
<% if @report.file_exists? %>
|
5
|
-
<h5>URL: <%= link_to @report.url(root_url), @report.url(root_url) %></h5>
|
6
|
-
<% else %>
|
7
|
-
<h5>URL: <%= @report.url(root_url) %></h5>
|
8
|
-
<% end %>
|
9
|
-
|
10
|
-
<h6>User: <%= "#{@report.user.email}" %></h6>
|
11
|
-
<h6>Running time: <%= report_time_run(@report) %></h6>
|
12
|
-
<h6>Last updated: <%= report_time_ago(@report) %></h6>
|
13
|
-
<h6>Next updated: <%= report_time_next(@report) %></h6>
|
14
|
-
<%= button_to "Queue Update Now", generate_table_report_path(@report.table, @report) if permitted_to? :generate, @report %>
|
15
|
-
|
16
|
-
<%= content_tag(:p, link_to("Edit", edit_table_report_path(@report.table, @report))) if permitted_to? :edit, @report %>
|
17
|
-
|
18
|
-
<%= formatter_display(@report) %>
|
19
|
-
|
20
|
-
<%= transform_display(@report) %>
|
21
|
-
|
22
|
-
<hr/>
|
23
|
-
<%= report_error_html(@report) %>
|
data/app/views/tables/edit.erb
DELETED
data/app/views/tables/index.erb
DELETED
data/app/views/tables/show.erb
DELETED
@@ -1,35 +0,0 @@
|
|
1
|
-
<% title @table.name %>
|
2
|
-
|
3
|
-
<h3>Reports</h3>
|
4
|
-
<p><%= link_to "New report from this table", new_table_report_path(@table) if permitted_to? :report, @table %></p>
|
5
|
-
<%= render "reports/list", :list => @table.reports %>
|
6
|
-
|
7
|
-
<hr/>
|
8
|
-
|
9
|
-
<h6>User: <%= "#{@table.user.email}" %></h6>
|
10
|
-
<h6>Type: <%= "#{@table.data_type}" %></h6>
|
11
|
-
<h6>Running time: <%= table_time_run(@table) %></h6>
|
12
|
-
<%= content_tag(:p, link_to("Edit", edit_table_path(@table))) if permitted_to? :edit, @table %>
|
13
|
-
|
14
|
-
<% if @test_html %>
|
15
|
-
<p><%= link_to "Hide Table Output", table_path(@table) %></p>
|
16
|
-
<%= @test_html %>
|
17
|
-
<% else %>
|
18
|
-
<p><%= link_to "See Table Output", table_path(@table, :test => true) %></p>
|
19
|
-
|
20
|
-
<% if @table.column_names and @table.column_names.size > 0 %>
|
21
|
-
<table>
|
22
|
-
<tr>
|
23
|
-
<% @table.column_names.each do |name| %>
|
24
|
-
<th><%= name %></th>
|
25
|
-
<% end %>
|
26
|
-
</tr>
|
27
|
-
</table>
|
28
|
-
<% end %>
|
29
|
-
<% end %>
|
30
|
-
|
31
|
-
<hr/>
|
32
|
-
|
33
|
-
<%= simple_format(@table.data) %>
|
34
|
-
|
35
|
-
<%= transform_display(@table) %>
|
data/app/views/users/_items.erb
DELETED
@@ -1,8 +0,0 @@
|
|
1
|
-
<h3>Tables</h3>
|
2
|
-
<p><%= link_to "New Table", new_table_path if user == current_user && permitted_to?(:new, :tables) %></p>
|
3
|
-
<%= render "tables/list", :list => user.tables %>
|
4
|
-
|
5
|
-
<% if user.reports.size > 0 %>
|
6
|
-
<h3>Reports</h3>
|
7
|
-
<%= render "reports/list", :list => user.reports %>
|
8
|
-
<% end %>
|
data/app/views/users/edit.erb
DELETED
data/app/views/users/index.erb
DELETED
data/app/views/users/show.erb
DELETED