Merge branch 'routing-filter'

config/app_config.yml.SAMPLE

@@ -5,6 +5,12 @@ development: &defaults
   # Don't forget to setup databases for each foodcoop. See also MULTI_COOP_INSTALL
   multi_coop_install: false
 
+  # http config for this host
+  # Required for action mailer
+  protocol: http
+  host: localhost
+  port: 3000
+
   # name of this foodcoop
   name: FC Test
   # foodcoop contact information (used for FAX messages)
@@ -16,9 +22,6 @@ development: &defaults
     email: foodsoft@myfoodcoop.org
     phone: "030 323 23249"
 
-  # base URL for this installation
-  base_url: http://foodsoft.fctest.de
-
   # Homepage
   homepage: http://www.fctest.de
 

config/environment.rb

@@ -59,6 +59,7 @@ Rails::Initializer.run do |config|
   config.gem "fastercsv"
   config.gem "prawn", :version => '<=0.6.3'
   config.gem "haml", :version => '>=2.0.6'
+  config.gem "routing-filter", :lib => "routing_filter"
 
   # The internationalization framework can be changed to have another default locale (standard is :en) or more load paths.
   # All files from config/locales/*.rb,yml are added automatically.

config/initializers/load_app_config.rb

@@ -1,33 +1,33 @@
 # Loads and returns config and databases for selected foodcoop.
+# TODO: When to use class or module. It seems this could also be a Foodsoft-class?
 module Foodsoft
-  @@configs = YAML.load(File.read(RAILS_ROOT + "/config/app_config.yml"))
-  @@databases = YAML.load(File.read(RAILS_ROOT + "/config/database.yml"))
-  @@env = RAILS_ENV
+  mattr_accessor :env, :config, :database
+  CONFIGS = YAML.load(File.read(RAILS_ROOT + "/config/app_config.yml"))
+  DATABASES = YAML.load(File.read(RAILS_ROOT + "/config/database.yml"))
 
-  def env=(env)
-    @@env = env
+  class << self
+    def env=(env)
+      raise "No config or database for this environment (#{env}) available!" if CONFIGS[env].nil? or DATABASES[env].nil?
+      @@config = CONFIGS[env].symbolize_keys
+      @@database = DATABASES[env].symbolize_keys
+      @@env = env
+    end
   end
-
-  def env
-    @@env
-  end
-
-  def config(rails_env = @@env)
-    raise "No config for this environment (or subdomain) available!" if @@configs[rails_env].nil?
-    @@configs[rails_env].symbolize_keys
-  end
-
-  def database(rails_env = @@env)
-    raise "No database for this environment (or subdomain) available!" if @@databases[rails_env].nil?
-    @@databases[rails_env].symbolize_keys
-  end
-
-  extend self
 end
+# Initial load the default config and database from rails environment
+Foodsoft.env = RAILS_ENV
 
+# Set action mailer default host for url generating
+url_options = {
+    :host => Foodsoft.config[:host],
+    :protocol => Foodsoft.config[:protocol]
+}
+url_options.merge!({:port => Foodsoft.config[:port]}) if Foodsoft.config[:port]
+ActionMailer::Base.default_url_options = url_options
 
 # Configuration of the exception_notification plugin
 # Mailadresses are set in config/foodsoft.yaml
 ExceptionNotifier.exception_recipients = Foodsoft.config[:notification]['error_recipients']
 ExceptionNotifier.sender_address = Foodsoft.config[:notification]['sender_address']
-ExceptionNotifier.email_prefix = Foodsoft.config[:notification]['email_prefix']
+ExceptionNotifier.email_prefix = Foodsoft.config[:notification]['email_prefix']
+

config/routes.rb

@@ -1,20 +1,36 @@
 ActionController::Routing::Routes.draw do |map|
+
+  # Use routing filter to select foodcoop config and datbase
+  map.filter 'foodcoop', :file => File.join(RAILS_ROOT, "lib", "foodcoop_filter")
+
+  # Root path
+  map.root :controller => 'home', :action => 'index'
+
+  # User specific
+  map.login "/login", :controller => 'login', :action => 'index'
+  map.logout '/logout', :controller => 'login', :action => 'logout'
+  map.my_profile '/home/profile', :controller => 'home', :action => 'profile'
+  map.my_ordergroup '/home/ordergroup', :controller => 'home', :action => 'ordergroup'
+
+  # Wiki
   map.resources :pages, :collection => { :all => :get }, :member => {:version => :get, :revert => :get}
   map.wiki_page "/wiki/:permalink", :controller => 'pages', :action => 'show', :permalink => /[^\s]+/
   map.wiki "/wiki", :controller => 'pages', :action => 'show', :permalink => 'Home'
 
-  map.logout '/logout', :controller => 'login', :action => 'logout'
-  map.my_profile '/home/profile', :controller => 'home', :action => 'profile'
-  map.my_ordergroup '/home/ordergroup', :controller => 'home', :action => 'ordergroup'
-  map.my_tasks '/home/tasks', :controller => 'tasks', :action => 'myTasks'
-
+  # Orders, ordering
   map.resources :orders, :member => { :finish => :post, :add_comment => :post }
+  map.with_options :controller => "ordering" do |ordering|
+    ordering.ordering "/ordering", :action => "index"
+    ordering.my_orders "/ordering/myOrders", :action => "myOrders"
+  end
 
+
+  # Foodcoop orga
+  map.resources :invites, :only => [:new, :create]
+  map.resources :tasks,
+    :collection => {:user => :get}
   map.resources :messages, :only => [:index, :show, :new, :create],
     :member => { :reply => :get, :user => :get, :group => :get }
-
-  map.resources :invites, :only => [:new, :create]
-
   map.namespace :foodcoop do |foodcoop|
     foodcoop.root :controller => "users", :action => "index"
     foodcoop.resources :users, :only => [:index]
@@ -23,23 +39,13 @@ ActionController::Routing::Routes.draw do |map|
       :member => {:memberships => :get}
   end
 
-  map.namespace :admin do |admin|
-    admin.resources :users
-    admin.resources :workgroups, :member => { :memberships => :get }
-    admin.resources :ordergroups, :member => { :memberships => :get }
-  end
-
-  map.namespace :finance do |finance|
-    finance.root :controller => 'balancing'
-    finance.resources :invoices
-  end
-
+  # Article management
   map.resources :stock_takings,
     :collection => {:fill_new_stock_article_form => :get, :add_stock_article => :post}
   map.resources :stock_articles,
     :controller => 'stockit', :as => 'stockit',
     :collection => {:auto_complete_for_article_name => :get, :fill_new_stock_article_form => :get}
-  
+
   map.resources :suppliers,
     :collection => { :shared_suppliers => :get } do |suppliers|
     suppliers.resources :deliveries,
@@ -52,47 +58,21 @@ ActionController::Routing::Routes.draw do |map|
   end
   map.resources :article_categories
 
-  map.root :controller => 'home', :action => 'index'
-  
-  # The priority is based upon order of creation: first created -> highest priority.
+  # Finance
+  map.namespace :finance do |finance|
+    finance.root :controller => 'balancing'
+    finance.balancing "balancing/list", :controller => 'balancing', :action => 'list'
+    finance.resources :invoices
+    finance.resources :transactions
+  end
 
-  # Sample of regular route:
-  #   map.connect 'products/:id', :controller => 'catalog', :action => 'view'
-  # Keep in mind you can assign values other than :controller and :action
-
-  # Sample of named route:
-  #   map.purchase 'products/:id/purchase', :controller => 'catalog', :action => 'purchase'
-  # This route can be invoked with purchase_url(:id => product.id)
-
-  # Sample resource route (maps HTTP verbs to controller actions automatically):
-  #   map.resources :products
-
-  # Sample resource route with options:
-  #   map.resources :products, :member => { :short => :get, :toggle => :post }, :collection => { :sold => :get }
-
-  # Sample resource route with sub-resources:
-  #   map.resources :products, :has_many => [ :comments, :sales ], :has_one => :seller
-
-  # Sample resource route with more complex sub-resources
-  #   map.resources :products do |products|
-  #     products.resources :comments
-  #     products.resources :sales, :collection => { :recent => :get }
-  #   end
-
-  # Sample resource route within a namespace:
-  #   map.namespace :admin do |admin|
-  #     # Directs /admin/products/* to Admin::ProductsController (app/controllers/admin/products_controller.rb)
-  #     admin.resources :products
-  #   end
-
-  # You can have the root of your site routed with map.root -- just remember to delete public/index.html.
-  # map.root :controller => "welcome"
-
-  # See how all your routes lay out with "rake routes"
-
-  # Install the default routes as the lowest priority.
-  # Note: These default routes make all actions in every controller accessible via GET requests. You should
-  # consider removing the them or commenting them out if you're using named routes and resources.
+  # Administration
+  map.namespace :admin do |admin|
+    admin.root :controller => "base", :action => "index"
+    admin.resources :users
+    admin.resources :workgroups, :member => { :memberships => :get }
+    admin.resources :ordergroups, :member => { :memberships => :get }
+  end
 
   # Install the default route as the lowest priority.
   map.connect ':controller/:action/:id'