diff --git a/app/controllers/inter_library_loans_controller.rb b/app/controllers/inter_library_loans_controller.rb index 3b7401c..7104171 100644 --- a/app/controllers/inter_library_loans_controller.rb +++ b/app/controllers/inter_library_loans_controller.rb @@ -1,7 +1,8 @@ class InterLibraryLoansController < ApplicationController - load_and_authorize_resource - before_filter :get_item - before_filter :store_page, :only => :index + before_action :set_inter_library_loan, only: [:show, :edit, :update, :destroy] + before_action :check_policy, only: [:index, :new, :create] + before_action :get_item + before_action :store_page, :only => :index # GET /inter_library_loans # GET /inter_library_loans.json @@ -120,6 +121,15 @@ def destroy end private + def set_inter_library_loan + @inter_library_loan = InterLibraryLoan.find(params[:id]) + authorize @inter_library_loan + end + + def check_policy + authorize InterLibraryLoan + end + def inter_library_loan_params params.require(:inter_library_loan).permit(:item_id, :borrowing_library_id) end diff --git a/app/models/enju_inter_library_loan/ability.rb b/app/models/enju_inter_library_loan/ability.rb deleted file mode 100644 index 047d5a5..0000000 --- a/app/models/enju_inter_library_loan/ability.rb +++ /dev/null @@ -1,14 +0,0 @@ -module EnjuInterLibraryLoan - class Ability - include CanCan::Ability - - def initialize(user, ip_address = nil) - case user.try(:role).try(:name) - when 'Administrator' - can :manage, InterLibraryLoan - when 'Librarian' - can :manage, InterLibraryLoan - end - end - end -end diff --git a/app/policies/inter_library_loan_policy.rb b/app/policies/inter_library_loan_policy.rb index 07dc601..04ccc5e 100644 --- a/app/policies/inter_library_loan_policy.rb +++ b/app/policies/inter_library_loan_policy.rb @@ -1,4 +1,12 @@ -class InterLibraryLoanPolicy < AdminPolicy +class InterLibraryLoanPolicy < ApplicationPolicy + def index? + user.try(:has_role?, 'Librarian') + end + + def show? + user.try(:has_role?, 'Librarian') + end + def create? user.try(:has_role?, 'Librarian') end diff --git a/app/views/inter_library_loans/index.html.erb b/app/views/inter_library_loans/index.html.erb index d6e06e1..1fa48d2 100644 --- a/app/views/inter_library_loans/index.html.erb +++ b/app/views/inter_library_loans/index.html.erb @@ -26,7 +26,7 @@ <%= l(inter_library_loan.shipped_at) if inter_library_loan.shipped_at -%>
<%= l(inter_library_loan.received_at) if inter_library_loan.received_at -%> - <%- if can? :destroy, inter_library_loan -%> + <%- if policy(inter_library_loan).destroy? -%> <%= link_to t('page.show'), inter_library_loan -%> <%= link_to t('page.edit'), edit_inter_library_loan_path(inter_library_loan) -%> @@ -43,7 +43,7 @@
diff --git a/enju_inter_library_loan.gemspec b/enju_inter_library_loan.gemspec index f25a3a0..cc94a28 100644 --- a/enju_inter_library_loan.gemspec +++ b/enju_inter_library_loan.gemspec @@ -16,8 +16,8 @@ Gem::Specification.new do |s| s.files = Dir["{app,config,db,lib}/**/*"] + ["MIT-LICENSE", "Rakefile", "README.rdoc"] s.test_files = Dir["spec/**/*"] - Dir["spec/dummy/log/*"] - Dir["spec/dummy/solr/{data,pids,default,development,test}/*"] - Dir["spec/dummy/tmp/*"] - #s.add_dependency "enju_biblio", "~> 0.1.0.pre63" - #s.add_dependency "enju_library", "~> 0.1.0.pre39" + #s.add_dependency "enju_biblio", "~> 0.2.0.pre1" + #s.add_dependency "enju_library", "~> 0.2.0.pre1" s.add_dependency "statesman", "~> 1.1" s.add_development_dependency "sqlite3" @@ -27,8 +27,10 @@ Gem::Specification.new do |s| s.add_development_dependency "factory_girl_rails" s.add_development_dependency "sunspot_solr", "~> 2.1" s.add_development_dependency "sunspot-rails-tester" - #s.add_development_dependency "enju_leaf", "~> 1.1.0.rc16" - #s.add_development_dependency "enju_circulation", "~> 0.1.0.pre41" + #s.add_development_dependency "enju_leaf", "~> 1.2.0.pre1" + #s.add_development_dependency "enju_circulation", "~> 0.2.0.pre1" s.add_development_dependency "simplecov" s.add_development_dependency "annotate" + s.add_development_dependency "redis-rails" + s.add_development_dependency "resque-scheduler", "~> 3.1" end diff --git a/spec/controllers/inter_library_loans_controller_spec.rb b/spec/controllers/inter_library_loans_controller_spec.rb index 1bd0c2d..aa74e41 100644 --- a/spec/controllers/inter_library_loans_controller_spec.rb +++ b/spec/controllers/inter_library_loans_controller_spec.rb @@ -33,16 +33,16 @@ sign_in FactoryGirl.create(:user) end - it "assigns empty as @inter_library_loans" do + it "assigns nil as @inter_library_loans" do get :index - assigns(:inter_library_loans).should be_empty + assigns(:inter_library_loans).should be_nil end end describe "When not logged in" do - it "assigns empty as @inter_library_loans" do + it "assigns nil as @inter_library_loans" do get :index - assigns(:inter_library_loans).should be_empty + assigns(:inter_library_loans).should be_nil end end end @@ -123,7 +123,7 @@ it "should not assign the requested inter_library_loan as @inter_library_loan" do get :new - assigns(:inter_library_loan).should_not be_valid + assigns(:inter_library_loan).should be_nil response.should be_forbidden end end @@ -131,7 +131,7 @@ describe "When not logged in" do it "should not assign the requested inter_library_loan as @inter_library_loan" do get :new - assigns(:inter_library_loan).should_not be_valid + assigns(:inter_library_loan).should be_nil response.should redirect_to(new_user_session_url) end end diff --git a/spec/dummy/app/controllers/application_controller.rb b/spec/dummy/app/controllers/application_controller.rb index 638dec6..30f98dd 100644 --- a/spec/dummy/app/controllers/application_controller.rb +++ b/spec/dummy/app/controllers/application_controller.rb @@ -1,4 +1,5 @@ class ApplicationController < ActionController::Base + include Pundit protect_from_forgery enju_leaf diff --git a/spec/dummy/app/policies/admin_policy.rb b/spec/dummy/app/policies/admin_policy.rb deleted file mode 100644 index 57a0ac7..0000000 --- a/spec/dummy/app/policies/admin_policy.rb +++ /dev/null @@ -1,27 +0,0 @@ -class AdminPolicy < ApplicationPolicy - class Scope < Struct.new(:user, :scope) - def resolve - scope.all - end - end - - def index? - user.try(:has_role?, 'Librarian') - end - - def show? - user.try(:has_role?, 'Librarian') - end - - def create? - false - end - - def update? - user.try(:has_role?, 'Administrator') - end - - def destroy? - false - end -end diff --git a/spec/dummy/app/policies/application_policy.rb b/spec/dummy/app/policies/application_policy.rb deleted file mode 100644 index 21f1796..0000000 --- a/spec/dummy/app/policies/application_policy.rb +++ /dev/null @@ -1,41 +0,0 @@ -class ApplicationPolicy - attr_reader :user, :record - - def initialize(user, record) - @user = user - @record = record - end - - def index? - false - end - - def show? - scope.where(:id => record.id).exists? - end - - def create? - false - end - - def new? - create? - end - - def update? - false - end - - def edit? - update? - end - - def destroy? - false - end - - def scope - Pundit.policy_scope!(user, record.class) - end -end - diff --git a/spec/dummy/config/initializers/resque.rb b/spec/dummy/config/initializers/resque.rb new file mode 100644 index 0000000..e70c3bd --- /dev/null +++ b/spec/dummy/config/initializers/resque.rb @@ -0,0 +1,3 @@ +require 'resque/server' +require 'resque/scheduler/server' +Resque.after_fork = Proc.new { ActiveRecord::Base.establish_connection }