Merge pull request #8 from finnlabs/feature/rails3_fix_autoload

Feature/rails3 fix autoload

app/models/cost_query.rb

@@ -1,5 +1,3 @@
-require 'reporting_engine/report'
-
 class CostQuery < Report
   def_delegators :result, :real_costs
 

app/models/cost_query/filter/base.rb

@@ -0,0 +1 @@
+class CostQuery::Filter::Base < Report::Filter::Base; end

app/models/cost_query/filter/status_id.rb

@@ -1,3 +1,5 @@
+#we have to require this here because the operators would not be defined otherwise
+require_dependency 'cost_query/operator'
 class CostQuery::Filter::StatusId < CostQuery::Filter::Base
   available_operators 'c', 'o'
   join_table Issue, IssueStatus => [Issue, :status]

app/models/cost_query/group_by/base.rb

@@ -0,0 +1 @@
+class CostQuery::GroupBy::Base < Report::GroupBy::Base; end

app/models/entry.rb

@@ -1,6 +1,3 @@
-require_dependency "time_entry"
-require_dependency "cost_entry"
-
 module Entry
   [TimeEntry, CostEntry].each { |e| e.send :include, self }
 

app/views/cost_reports/index.html.erb

@@ -10,7 +10,6 @@
 <h2 id="ur_caption">
   <%= render_widget Widget::Controls::QueryName, @query, :can_rename => allowed_to?(:rename, @query, current_user) %>
 </h2>
-
 <%= render_widget Widget::Settings, @query, :cost_types => @cost_types, :selected_type_id => @unit_id %>
 
 <div id="result-table" class="autoscroll">

lib/open_project/reporting/engine.rb

@@ -1,6 +1,3 @@
-require 'openproject_costs'
-require 'reporting_engine'
-
 module OpenProject::Reporting
   class Engine < ::Rails::Engine
     engine_name :openproject_reporting
@@ -38,12 +35,9 @@ module OpenProject::Reporting
     end
 
     config.to_prepare do
-      require_dependency 'reporting_engine/widget.rb'
-      require_dependency 'open_project/reporting/widgets/simple_table'
-      require_dependency 'open_project/reporting/widgets/entry_table'
-      require_dependency 'open_project/reporting/widgets/cost_types'
-      require_dependency 'open_project/reporting/widgets/settings'
-
+      require_dependency 'report/walker'
+      require_dependency 'report/transformer'
+      require_dependency 'widget/settings_patch'
       unless Redmine::Plugin.registered_plugins.include?(:openproject_reporting)
         Redmine::Plugin.register :openproject_reporting do
           name 'Reporting Plugin'

lib/widget/entry_table.rb

@@ -1,5 +1,3 @@
-require 'open_project/reporting/widgets/sortable_init'
-
 class Widget::Table::EntryTable < Widget::Table
   Fields = [:spent_on, :user_id, :activity_id, :issue_id, :comments, :project_id]
 

lib/widget/settings_patch.rb

@@ -1,4 +1,9 @@
+#explicitly require what will be patched to be loaded from the ReportingEngine
+require_dependency 'widget/settings'
 class Widget::Settings < Widget::Base
+  #make sure this patch gets unloaded as it does not fit
+  #the standard rails path
+  unloadable
 
   @@settings_to_render.insert -2, :cost_types
 

lib/widget/simple_table.rb

@@ -1,5 +1,3 @@
-require 'open_project/reporting/widgets/sortable_init'
-
 class Widget::Table::SimpleTable < Widget::Table
   simple_table self