enju_subject 0.1.1 → 0.2.0.beta.1

data/spec/controllers/subject_heading_types_controller_spec.rb

@@ -19,7 +19,7 @@ describe SubjectHeadingTypesController do
 
       it "assigns all subject_heading_types as @subject_heading_types" do
         get :index
-        expect(assigns(:subject_heading_types)).to eq(SubjectHeadingType.all)
+        expect(assigns(:subject_heading_types)).to eq(SubjectHeadingType.order(:position))
       end
     end
 
@@ -28,7 +28,7 @@ describe SubjectHeadingTypesController do
 
       it "assigns all subject_heading_types as @subject_heading_types" do
         get :index
-        expect(assigns(:subject_heading_types)).to eq(SubjectHeadingType.all)
+        expect(assigns(:subject_heading_types)).to eq(SubjectHeadingType.order(:position))
       end
     end
 
@@ -37,14 +37,14 @@ describe SubjectHeadingTypesController do
 
       it "assigns all subject_heading_types as @subject_heading_types" do
         get :index
-        expect(assigns(:subject_heading_types)).to eq(SubjectHeadingType.all)
+        expect(assigns(:subject_heading_types)).to eq(SubjectHeadingType.order(:position))
       end
     end
 
     describe "When not logged in" do
       it "assigns all subject_heading_types as @subject_heading_types" do
         get :index
-        expect(assigns(:subject_heading_types)).to eq(SubjectHeadingType.all)
+        expect(assigns(:subject_heading_types)).to eq(SubjectHeadingType.order(:position))
       end
     end
   end
@@ -55,7 +55,7 @@ describe SubjectHeadingTypesController do
 
       it "assigns the requested subject_heading_type as @subject_heading_type" do
         subject_heading_type = FactoryGirl.create(:subject_heading_type)
-        get :show, :id => subject_heading_type.id
+        get :show, id: subject_heading_type.id
         expect(assigns(:subject_heading_type)).to eq(subject_heading_type)
       end
     end
@@ -65,7 +65,7 @@ describe SubjectHeadingTypesController do
 
       it "assigns the requested subject_heading_type as @subject_heading_type" do
         subject_heading_type = FactoryGirl.create(:subject_heading_type)
-        get :show, :id => subject_heading_type.id
+        get :show, id: subject_heading_type.id
         expect(assigns(:subject_heading_type)).to eq(subject_heading_type)
       end
     end
@@ -75,7 +75,7 @@ describe SubjectHeadingTypesController do
 
       it "assigns the requested subject_heading_type as @subject_heading_type" do
         subject_heading_type = FactoryGirl.create(:subject_heading_type)
-        get :show, :id => subject_heading_type.id
+        get :show, id: subject_heading_type.id
         expect(assigns(:subject_heading_type)).to eq(subject_heading_type)
       end
     end
@@ -83,7 +83,7 @@ describe SubjectHeadingTypesController do
     describe "When not logged in" do
       it "assigns the requested subject_heading_type as @subject_heading_type" do
         subject_heading_type = FactoryGirl.create(:subject_heading_type)
-        get :show, :id => subject_heading_type.id
+        get :show, id: subject_heading_type.id
         expect(assigns(:subject_heading_type)).to eq(subject_heading_type)
       end
     end
@@ -105,7 +105,7 @@ describe SubjectHeadingTypesController do
 
       it "should not assign the requested subject_heading_type as @subject_heading_type" do
         get :new
-        expect(assigns(:subject_heading_type)).not_to be_valid
+        expect(assigns(:subject_heading_type)).to be_nil
         response.should be_forbidden
       end
     end
@@ -115,7 +115,7 @@ describe SubjectHeadingTypesController do
 
       it "should not assign the requested subject_heading_type as @subject_heading_type" do
         get :new
-        expect(assigns(:subject_heading_type)).not_to be_valid
+        expect(assigns(:subject_heading_type)).to be_nil
         response.should be_forbidden
       end
     end
@@ -123,7 +123,7 @@ describe SubjectHeadingTypesController do
     describe "When not logged in" do
       it "should not assign the requested subject_heading_type as @subject_heading_type" do
         get :new
-        expect(assigns(:subject_heading_type)).not_to be_valid
+        expect(assigns(:subject_heading_type)).to be_nil
         response.should redirect_to(new_user_session_url)
       end
     end
@@ -135,7 +135,7 @@ describe SubjectHeadingTypesController do
 
       it "assigns the requested subject_heading_type as @subject_heading_type" do
         subject_heading_type = FactoryGirl.create(:subject_heading_type)
-        get :edit, :id => subject_heading_type.id
+        get :edit, id: subject_heading_type.id
         expect(assigns(:subject_heading_type)).to eq(subject_heading_type)
       end
     end
@@ -145,7 +145,7 @@ describe SubjectHeadingTypesController do
 
       it "assigns the requested subject_heading_type as @subject_heading_type" do
         subject_heading_type = FactoryGirl.create(:subject_heading_type)
-        get :edit, :id => subject_heading_type.id
+        get :edit, id: subject_heading_type.id
         response.should be_forbidden
       end
     end
@@ -155,7 +155,7 @@ describe SubjectHeadingTypesController do
 
       it "assigns the requested subject_heading_type as @subject_heading_type" do
         subject_heading_type = FactoryGirl.create(:subject_heading_type)
-        get :edit, :id => subject_heading_type.id
+        get :edit, id: subject_heading_type.id
         response.should be_forbidden
       end
     end
@@ -163,7 +163,7 @@ describe SubjectHeadingTypesController do
     describe "When not logged in" do
       it "should not assign the requested subject_heading_type as @subject_heading_type" do
         subject_heading_type = FactoryGirl.create(:subject_heading_type)
-        get :edit, :id => subject_heading_type.id
+        get :edit, id: subject_heading_type.id
         response.should redirect_to(new_user_session_url)
       end
     end
@@ -180,24 +180,24 @@ describe SubjectHeadingTypesController do
 
       describe "with valid params" do
         it "assigns a newly created subject_heading_type as @subject_heading_type" do
-          post :create, :subject_heading_type => @attrs
+          post :create, subject_heading_type: @attrs
           expect(assigns(:subject_heading_type)).to be_valid
         end
 
         it "redirects to the created agent" do
-          post :create, :subject_heading_type => @attrs
+          post :create, subject_heading_type: @attrs
           response.should redirect_to(assigns(:subject_heading_type))
         end
       end
 
       describe "with invalid params" do
         it "assigns a newly created but unsaved subject_heading_type as @subject_heading_type" do
-          post :create, :subject_heading_type => @invalid_attrs
+          post :create, subject_heading_type: @invalid_attrs
           expect(assigns(:subject_heading_type)).not_to be_valid
         end
 
         it "should be successful" do
-          post :create, :subject_heading_type => @invalid_attrs
+          post :create, subject_heading_type: @invalid_attrs
           response.should be_success
         end
       end
@@ -208,24 +208,24 @@ describe SubjectHeadingTypesController do
 
       describe "with valid params" do
         it "assigns a newly created subject_heading_type as @subject_heading_type" do
-          post :create, :subject_heading_type => @attrs
-          expect(assigns(:subject_heading_type)).to be_valid
+          post :create, subject_heading_type: @attrs
+          expect(assigns(:subject_heading_type)).to be_nil
         end
 
         it "should be forbidden" do
-          post :create, :subject_heading_type => @attrs
+          post :create, subject_heading_type: @attrs
           response.should be_forbidden
         end
       end
 
       describe "with invalid params" do
         it "assigns a newly created but unsaved subject_heading_type as @subject_heading_type" do
-          post :create, :subject_heading_type => @invalid_attrs
-          expect(assigns(:subject_heading_type)).not_to be_valid
+          post :create, subject_heading_type: @invalid_attrs
+          expect(assigns(:subject_heading_type)).to be_nil
         end
 
         it "should be forbidden" do
-          post :create, :subject_heading_type => @invalid_attrs
+          post :create, subject_heading_type: @invalid_attrs
           response.should be_forbidden
         end
       end
@@ -236,24 +236,24 @@ describe SubjectHeadingTypesController do
 
       describe "with valid params" do
         it "assigns a newly created subject_heading_type as @subject_heading_type" do
-          post :create, :subject_heading_type => @attrs
-          expect(assigns(:subject_heading_type)).to be_valid
+          post :create, subject_heading_type: @attrs
+          expect(assigns(:subject_heading_type)).to be_nil
         end
 
         it "should be forbidden" do
-          post :create, :subject_heading_type => @attrs
+          post :create, subject_heading_type: @attrs
           response.should be_forbidden
         end
       end
 
       describe "with invalid params" do
         it "assigns a newly created but unsaved subject_heading_type as @subject_heading_type" do
-          post :create, :subject_heading_type => @invalid_attrs
-          expect(assigns(:subject_heading_type)).not_to be_valid
+          post :create, subject_heading_type: @invalid_attrs
+          expect(assigns(:subject_heading_type)).to be_nil
         end
 
         it "should be forbidden" do
-          post :create, :subject_heading_type => @invalid_attrs
+          post :create, subject_heading_type: @invalid_attrs
           response.should be_forbidden
         end
       end
@@ -262,24 +262,24 @@ describe SubjectHeadingTypesController do
     describe "When not logged in" do
       describe "with valid params" do
         it "assigns a newly created subject_heading_type as @subject_heading_type" do
-          post :create, :subject_heading_type => @attrs
-          expect(assigns(:subject_heading_type)).to be_valid
+          post :create, subject_heading_type: @attrs
+          expect(assigns(:subject_heading_type)).to be_nil
         end
 
         it "should be forbidden" do
-          post :create, :subject_heading_type => @attrs
+          post :create, subject_heading_type: @attrs
           response.should redirect_to(new_user_session_url)
         end
       end
 
       describe "with invalid params" do
         it "assigns a newly created but unsaved subject_heading_type as @subject_heading_type" do
-          post :create, :subject_heading_type => @invalid_attrs
-          expect(assigns(:subject_heading_type)).not_to be_valid
+          post :create, subject_heading_type: @invalid_attrs
+          expect(assigns(:subject_heading_type)).to be_nil
         end
 
         it "should be forbidden" do
-          post :create, :subject_heading_type => @invalid_attrs
+          post :create, subject_heading_type: @invalid_attrs
           response.should redirect_to(new_user_session_url)
         end
       end
@@ -298,23 +298,23 @@ describe SubjectHeadingTypesController do
 
       describe "with valid params" do
         it "updates the requested subject_heading_type" do
-          put :update, :id => @subject_heading_type.id, :subject_heading_type => @attrs
+          put :update, id: @subject_heading_type.id, subject_heading_type: @attrs
         end
 
         it "assigns the requested subject_heading_type as @subject_heading_type" do
-          put :update, :id => @subject_heading_type.id, :subject_heading_type => @attrs
+          put :update, id: @subject_heading_type.id, subject_heading_type: @attrs
           expect(assigns(:subject_heading_type)).to eq(@subject_heading_type)
         end
 
         it "moves its position when specified" do
-          put :update, :id => @subject_heading_type.id, :subject_heading_type => @attrs, :move => 'lower'
+          put :update, id: @subject_heading_type.id, subject_heading_type: @attrs, :move => 'lower'
           response.should redirect_to(subject_heading_types_url)
         end
       end
 
       describe "with invalid params" do
         it "assigns the requested subject_heading_type as @subject_heading_type" do
-          put :update, :id => @subject_heading_type.id, :subject_heading_type => @invalid_attrs
+          put :update, id: @subject_heading_type.id, subject_heading_type: @invalid_attrs
           response.should render_template("edit")
         end
       end
@@ -325,11 +325,11 @@ describe SubjectHeadingTypesController do
 
       describe "with valid params" do
         it "updates the requested subject_heading_type" do
-          put :update, :id => @subject_heading_type.id, :subject_heading_type => @attrs
+          put :update, id: @subject_heading_type.id, subject_heading_type: @attrs
         end
 
         it "assigns the requested subject_heading_type as @subject_heading_type" do
-          put :update, :id => @subject_heading_type.id, :subject_heading_type => @attrs
+          put :update, id: @subject_heading_type.id, subject_heading_type: @attrs
           expect(assigns(:subject_heading_type)).to eq(@subject_heading_type)
           response.should be_forbidden
         end
@@ -337,7 +337,7 @@ describe SubjectHeadingTypesController do
 
       describe "with invalid params" do
         it "assigns the requested subject_heading_type as @subject_heading_type" do
-          put :update, :id => @subject_heading_type.id, :subject_heading_type => @invalid_attrs
+          put :update, id: @subject_heading_type.id, subject_heading_type: @invalid_attrs
           response.should be_forbidden
         end
       end
@@ -348,11 +348,11 @@ describe SubjectHeadingTypesController do
 
       describe "with valid params" do
         it "updates the requested subject_heading_type" do
-          put :update, :id => @subject_heading_type.id, :subject_heading_type => @attrs
+          put :update, id: @subject_heading_type.id, subject_heading_type: @attrs
         end
 
         it "assigns the requested subject_heading_type as @subject_heading_type" do
-          put :update, :id => @subject_heading_type.id, :subject_heading_type => @attrs
+          put :update, id: @subject_heading_type.id, subject_heading_type: @attrs
           expect(assigns(:subject_heading_type)).to eq(@subject_heading_type)
           response.should be_forbidden
         end
@@ -360,7 +360,7 @@ describe SubjectHeadingTypesController do
 
       describe "with invalid params" do
         it "assigns the requested subject_heading_type as @subject_heading_type" do
-          put :update, :id => @subject_heading_type.id, :subject_heading_type => @invalid_attrs
+          put :update, id: @subject_heading_type.id, subject_heading_type: @invalid_attrs
           response.should be_forbidden
         end
       end
@@ -369,18 +369,18 @@ describe SubjectHeadingTypesController do
     describe "When not logged in" do
       describe "with valid params" do
         it "updates the requested subject_heading_type" do
-          put :update, :id => @subject_heading_type.id, :subject_heading_type => @attrs
+          put :update, id: @subject_heading_type.id, subject_heading_type: @attrs
         end
 
         it "should be forbidden" do
-          put :update, :id => @subject_heading_type.id, :subject_heading_type => @attrs
+          put :update, id: @subject_heading_type.id, subject_heading_type: @attrs
           response.should redirect_to(new_user_session_url)
         end
       end
 
       describe "with invalid params" do
         it "assigns the requested subject_heading_type as @subject_heading_type" do
-          put :update, :id => @subject_heading_type.id, :subject_heading_type => @invalid_attrs
+          put :update, id: @subject_heading_type.id, subject_heading_type: @invalid_attrs
           response.should redirect_to(new_user_session_url)
         end
       end
@@ -396,11 +396,11 @@ describe SubjectHeadingTypesController do
       login_admin
 
       it "destroys the requested subject_heading_type" do
-        delete :destroy, :id => @subject_heading_type.id
+        delete :destroy, id: @subject_heading_type.id
       end
 
       it "redirects to the subject_heading_types list" do
-        delete :destroy, :id => @subject_heading_type.id
+        delete :destroy, id: @subject_heading_type.id
         response.should redirect_to(subject_heading_types_url)
       end
     end
@@ -409,11 +409,11 @@ describe SubjectHeadingTypesController do
       login_librarian
 
       it "destroys the requested subject_heading_type" do
-        delete :destroy, :id => @subject_heading_type.id
+        delete :destroy, id: @subject_heading_type.id
       end
 
       it "should be forbidden" do
-        delete :destroy, :id => @subject_heading_type.id
+        delete :destroy, id: @subject_heading_type.id
         response.should be_forbidden
       end
     end
@@ -422,22 +422,22 @@ describe SubjectHeadingTypesController do
       login_user
 
       it "destroys the requested subject_heading_type" do
-        delete :destroy, :id => @subject_heading_type.id
+        delete :destroy, id: @subject_heading_type.id
       end
 
       it "should be forbidden" do
-        delete :destroy, :id => @subject_heading_type.id
+        delete :destroy, id: @subject_heading_type.id
         response.should be_forbidden
       end
     end
 
     describe "When not logged in" do
       it "destroys the requested subject_heading_type" do
-        delete :destroy, :id => @subject_heading_type.id
+        delete :destroy, id: @subject_heading_type.id
       end
 
       it "should be forbidden" do
-        delete :destroy, :id => @subject_heading_type.id
+        delete :destroy, id: @subject_heading_type.id
         response.should redirect_to(new_user_session_url)
       end
     end

data/spec/controllers/subject_types_controller_spec.rb

@@ -19,7 +19,7 @@ describe SubjectTypesController do
 
       it "assigns all subject_types as @subject_types" do
         get :index
-        expect(assigns(:subject_types)).to eq(SubjectType.all)
+        expect(assigns(:subject_types)).to eq(SubjectType.order(:position))
       end
     end
 
@@ -28,7 +28,7 @@ describe SubjectTypesController do
 
       it "assigns all subject_types as @subject_types" do
         get :index
-        expect(assigns(:subject_types)).to eq(SubjectType.all)
+        expect(assigns(:subject_types)).to eq(SubjectType.order(:position))
       end
     end
 
@@ -37,7 +37,7 @@ describe SubjectTypesController do
 
       it "assigns all subject_types as @subject_types" do
         get :index
-        expect(assigns(:subject_types)).to be_empty
+        expect(assigns(:subject_types)).to be_nil
         response.should be_forbidden
       end
     end
@@ -45,7 +45,7 @@ describe SubjectTypesController do
     describe "When not logged in" do
       it "assigns all subject_types as @subject_types" do
         get :index
-        expect(assigns(:subject_types)).to be_empty
+        expect(assigns(:subject_types)).to be_nil
         response.should redirect_to(new_user_session_url)
       end
     end
@@ -107,7 +107,7 @@ describe SubjectTypesController do
 
       it "should not assign the requested subject_type as @subject_type" do
         get :new
-        expect(assigns(:subject_type)).not_to be_valid
+        expect(assigns(:subject_type)).to be_nil
         response.should be_forbidden
       end
     end
@@ -117,7 +117,7 @@ describe SubjectTypesController do
 
       it "should not assign the requested subject_type as @subject_type" do
         get :new
-        expect(assigns(:subject_type)).not_to be_valid
+        expect(assigns(:subject_type)).to be_nil
         response.should be_forbidden
       end
     end
@@ -125,7 +125,7 @@ describe SubjectTypesController do
     describe "When not logged in" do
       it "should not assign the requested subject_type as @subject_type" do
         get :new
-        expect(assigns(:subject_type)).not_to be_valid
+        expect(assigns(:subject_type)).to be_nil
         response.should redirect_to(new_user_session_url)
       end
     end
@@ -211,7 +211,7 @@ describe SubjectTypesController do
       describe "with valid params" do
         it "assigns a newly created subject_type as @subject_type" do
           post :create, :subject_type => @attrs
-          expect(assigns(:subject_type)).to be_valid
+          expect(assigns(:subject_type)).to be_nil
         end
 
         it "should be forbidden" do
@@ -223,7 +223,7 @@ describe SubjectTypesController do
       describe "with invalid params" do
         it "assigns a newly created but unsaved subject_type as @subject_type" do
           post :create, :subject_type => @invalid_attrs
-          expect(assigns(:subject_type)).not_to be_valid
+          expect(assigns(:subject_type)).to be_nil
         end
 
         it "should be forbidden" do
@@ -239,7 +239,7 @@ describe SubjectTypesController do
       describe "with valid params" do
         it "assigns a newly created subject_type as @subject_type" do
           post :create, :subject_type => @attrs
-          expect(assigns(:subject_type)).to be_valid
+          expect(assigns(:subject_type)).to be_nil
         end
 
         it "should be forbidden" do
@@ -251,7 +251,7 @@ describe SubjectTypesController do
       describe "with invalid params" do
         it "assigns a newly created but unsaved subject_type as @subject_type" do
           post :create, :subject_type => @invalid_attrs
-          expect(assigns(:subject_type)).not_to be_valid
+          expect(assigns(:subject_type)).to be_nil
         end
 
         it "should be forbidden" do
@@ -265,7 +265,7 @@ describe SubjectTypesController do
       describe "with valid params" do
         it "assigns a newly created subject_type as @subject_type" do
           post :create, :subject_type => @attrs
-          expect(assigns(:subject_type)).to be_valid
+          expect(assigns(:subject_type)).to be_nil
         end
 
         it "should be forbidden" do
@@ -277,7 +277,7 @@ describe SubjectTypesController do
       describe "with invalid params" do
         it "assigns a newly created but unsaved subject_type as @subject_type" do
           post :create, :subject_type => @invalid_attrs
-          expect(assigns(:subject_type)).not_to be_valid
+          expect(assigns(:subject_type)).to be_nil
         end
 
         it "should be forbidden" do

data/spec/controllers/subjects_controller_spec.rb

@@ -103,7 +103,7 @@ describe SubjectsController do
 
       it "assigns the requested subject as @subject" do
         get :new
-        expect(assigns(:subject)).not_to be_valid
+        expect(assigns(:subject)).to be_nil
       end
     end
 
@@ -112,7 +112,7 @@ describe SubjectsController do
 
       it "should not assign the requested subject as @subject" do
         get :new
-        expect(assigns(:subject)).not_to be_valid
+        expect(assigns(:subject)).to be_nil
         response.should be_forbidden
       end
     end
@@ -120,7 +120,7 @@ describe SubjectsController do
     describe "When not logged in" do
       it "should not assign the requested subject as @subject" do
         get :new
-        expect(assigns(:subject)).not_to be_valid
+        expect(assigns(:subject)).to be_nil
         response.should redirect_to(new_user_session_url)
       end
     end
@@ -206,7 +206,7 @@ describe SubjectsController do
       describe "with valid params" do
         it "assigns a newly created subject as @subject" do
           post :create, :subject => @attrs
-          expect(assigns(:subject)).to be_valid
+          expect(assigns(:subject)).to be_nil
         end
 
         it "should be forbidden" do
@@ -218,7 +218,7 @@ describe SubjectsController do
       describe "with invalid params" do
         it "assigns a newly created but unsaved subject as @subject" do
           post :create, :subject => @invalid_attrs
-          expect(assigns(:subject)).not_to be_valid
+          expect(assigns(:subject)).to be_nil
         end
 
         it "should be forbidden" do
@@ -234,7 +234,7 @@ describe SubjectsController do
       describe "with valid params" do
         it "assigns a newly created subject as @subject" do
           post :create, :subject => @attrs
-          expect(assigns(:subject)).to be_valid
+          expect(assigns(:subject)).to be_nil
         end
 
         it "should be forbidden" do
@@ -246,7 +246,7 @@ describe SubjectsController do
       describe "with invalid params" do
         it "assigns a newly created but unsaved subject as @subject" do
           post :create, :subject => @invalid_attrs
-          expect(assigns(:subject)).not_to be_valid
+          expect(assigns(:subject)).to be_nil
         end
 
         it "should be forbidden" do
@@ -260,7 +260,7 @@ describe SubjectsController do
       describe "with valid params" do
         it "assigns a newly created subject as @subject" do
           post :create, :subject => @attrs
-          expect(assigns(:subject)).to be_valid
+          expect(assigns(:subject)).to be_nil
         end
 
         it "should be forbidden" do
@@ -272,7 +272,7 @@ describe SubjectsController do
       describe "with invalid params" do
         it "assigns a newly created but unsaved subject as @subject" do
           post :create, :subject => @invalid_attrs
-          expect(assigns(:subject)).not_to be_valid
+          expect(assigns(:subject)).to be_nil
         end
 
         it "should be forbidden" do

data/spec/dummy/app/controllers/application_controller.rb

@@ -1,8 +1,12 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery
 
-  enju_leaf
-  enju_biblio
-  enju_library
-  enju_subject
+  include EnjuLeaf::Controller
+  include EnjuBiblio::Controller
+  include EnjuLibrary::Controller
+  include EnjuSubject::Controller
+  before_action :set_paper_trail_whodunnit
+  after_action :verify_authorized
+
+  include Pundit
 end

data/spec/dummy/app/models/user.rb

@@ -4,5 +4,5 @@ class User < ActiveRecord::Base
     :recoverable, :rememberable, :trackable, #, :validatable
     :lockable, :lock_strategy => :none, :unlock_strategy => :none
 
-  enju_leaf_user_model
+  include EnjuLeaf::EnjuUser
 end

data/spec/dummy/config/application.rb

@@ -2,8 +2,9 @@ require File.expand_path('../boot', __FILE__)
 
 require 'rails/all'
 
-Bundler.require
-require "enju_subject"
+Bundler.require(*Rails.groups)
+require 'enju_leaf'
+require 'enju_subject'
 
 module Dummy
   class Application < Rails::Application
@@ -11,16 +12,6 @@ module Dummy
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.
 
-    # Custom directories with classes and modules you want to be autoloadable.
-    # config.autoload_paths += %W(#{config.root}/extras)
-
-    # Only load the plugins named here, in the order given (default is alphabetical).
-    # :all can be used as a placeholder for all plugins not explicitly named.
-    # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
-
-    # Activate observers that should always be running.
-    # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
-
     # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
     # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
     # config.time_zone = 'Central Time (US & Canada)'
@@ -29,18 +20,8 @@ module Dummy
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de
 
-    # Configure the default encoding used in templates for Ruby 1.9.
-    config.encoding = "utf-8"
-
-    # Configure sensitive parameters which will be filtered from the log file.
-    config.filter_parameters += [:password]
-
-    # Enable the asset pipeline
-    config.assets.enabled = true
-
-    # Version of your assets, change this if you want to expire all your assets
-    config.assets.version = '1.0'
+    # Do not swallow errors in after_commit/after_rollback callbacks.
+    config.active_record.raise_in_transactional_callbacks = true
   end
 end
 
-require 'enju_leaf'