Fix admix path option

Author: sadjow

admix/app/controllers/admix/admix_controller.rb

@@ -1,7 +1,7 @@
 module Admix
   class AdmixController < MixController
 
-    before_filter :authenticate_user!, :add_initial_breadcrumbs, :globals
+    before_filter :authenticate_admix_user!, :add_initial_breadcrumbs, :globals
 
     protected
 

admix/config/routes.rb

@@ -1,6 +1,12 @@
 Rails.application.routes.draw do
-  namespace :admix do
-    match 'upload' => 'nicedit#upload'
-    root to: 'dashboard#index'
-  end
-end
+
+    devise_for :admix_users, class_name: 'User', path: Admix::namespace_path, controllers: { sessions: 'admix/sessions', passwords: 'admix/passwords' },
+             path_names: { :sign_in => 'login', :sign_out => 'logout' }
+
+
+    scope Admix::namespace_path, as: :admix, module: :admix do
+      match 'upload' => 'nicedit#upload'
+      root to: 'dashboard#index'
+    end
+
+end

admix/lib/admix.rb

@@ -19,9 +19,13 @@
 
 
 module Admix
-  mattr_accessor :menus_container
+
+  mattr_accessor :menus_container, :namespace_path
+
   self.menus_container = []
 
+  self.namespace_path = 'admix'
+
 
   module Navigation
   end

mix-rails-albums/config/routes.rb

@@ -4,7 +4,7 @@
     resources :albums
   end
 
-  namespace :admix do
+  scope Admix::namespace_path, as: :admix, module: :admix do
     resources :albums do
       resources :photos
     end

mix-rails-auth/app/models/ability.rb

@@ -4,6 +4,7 @@ class Ability
   def initialize(user)
     # Define abilities for the passed in user here. For example:
     #
+    raise User
     user ||= User.new # guest user (not logged in)
     if user.is?(:admin)
       can :manage, :all

mix-rails-auth/app/models/user.rb

@@ -9,7 +9,7 @@ class User
   # :token_authenticatable, :confirmable,
   # :lockable, :timeoutable and :omniauthable
   devise :database_authenticatable, :recoverable, :rememberable,
-         :trackable, :validatable#, :registerable
+         :trackable, :validatable, :registerable
 
   ## Database authenticatable
   field :email,              :type => String, :default => ""

mix-rails-auth/config/routes.rb

@@ -1,10 +1,8 @@
 Rails.application.routes.draw do
 
-  devise_for :users, controllers: { sessions: 'admix/sessions', passwords: 'admix/passwords' },
-             path_names: { :sign_in => 'login', :sign_out => 'logout' }
+  devise_for :users
 
-
-  namespace :admix do
+  scope Admix::namespace_path, as: :admix, module: :admix do
     resources :users
   end
 

mix-rails-message-board/config/routes.rb

@@ -4,7 +4,7 @@
     resources :board_messages
   end
 
-  namespace :admix do
+  scope Admix::namespace_path, as: :admix, module: :admix do
     resources :board_messages do
 
       resources :board_replies

mix-rails-settings/config/routes.rb

@@ -1,5 +1,5 @@
 Rails.application.routes.draw do
-  namespace :admix do
+  scope Admix::namespace_path, as: :admix, module: :admix do
     resources :settings
   end
 end

mix-rails-songs/config/routes.rb

@@ -8,7 +8,7 @@
     end
   end
 
-  namespace :admix do
+  scope Admix::namespace_path, as: :admix, module: :admix do
     resources :songs
   end