enju_biblio 0.1.0.pre42 → 0.1.0.pre43

data/lib/enju_biblio/biblio_helper.rb

@@ -34,8 +34,8 @@ module EnjuBiblio
       image_tag('icons/help.png', :size => '16x16', :alt => t('page.unknown'))
     end
 
-    def patron_type_icon(patron_type)
-      case patron_type
+    def agent_type_icon(agent_type)
+      case agent_type
       when 'Person'
         image_tag('icons/user.png', :size => '16x16', :alt => 'Person')
       when 'CorporateBody'
@@ -45,15 +45,15 @@ module EnjuBiblio
       end
     end
 
-    def patrons_list(patrons = [], options = {})
-      return nil if patrons.blank?
-      patrons_list = []
+    def agents_list(agents = [], options = {})
+      return nil if agents.blank?
+      agents_list = []
       if options[:nolink]
-        patrons_list = patrons.map{|patron| patron.full_name}
+        agents_list = agents.map{|agent| agent.full_name}
       else
-        patrons_list = patrons.map{|patron| link_to(patron.full_name, manifestations_path(:query => "\"#{patron.full_name}\""), options)}
+        agents_list = agents.map{|agent| link_to(agent.full_name, manifestations_path(:query => "\"#{agent.full_name}\""), options)}
       end
-      patrons_list.join(" ").html_safe
+      agents_list.join(" ").html_safe
     end
   end
 end

data/lib/enju_biblio/version.rb

@@ -1,3 +1,3 @@
 module EnjuBiblio
-  VERSION = "0.1.0.pre42"
+  VERSION = "0.1.0.pre43"
 end

data/lib/enju_biblio.rb

@@ -42,9 +42,9 @@ module EnjuBiblio
       @carrier_type = CarrierType.find(params[:carrier_type_id]) if params[:carrier_type_id]
     end
 
-    def get_patron
-      @patron = Patron.find(params[:patron_id]) if params[:patron_id]
-      authorize! :show, @patron if @patron
+    def get_agent
+      @agent = Agent.find(params[:agent_id]) if params[:agent_id]
+      authorize! :show, @agent if @agent
     end
 
     def get_series_statement

data/lib/generators/enju_biblio/setup/templates/db/fixtures/patron_relationship_types.yml

@@ -1,18 +1,18 @@
 # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
 
-patron_relationship_type_00001:
+agent_relationship_type_00001:
   id: 1
   name: See also
   display_name: See also
   note: 
   position: 1
-patron_relationship_type_00002:
+agent_relationship_type_00002:
   id: 2
   name: Member
   display_name: Member
   note: 
   position: 2
-patron_relationship_type_00003:
+agent_relationship_type_00003:
   id: 3
   name: Child
   display_name: Child

data/lib/generators/enju_biblio/setup/templates/db/fixtures/patron_types.yml

@@ -1,5 +1,5 @@
 --- 
-patron_type_00001:
+agent_type_00001:
   id: 1
   name: Person  
   display_name: "en: Person\r\n\
@@ -7,7 +7,7 @@ patron_type_00001:
   note: 
   position: 1
 
-patron_type_00002:
+agent_type_00002:
   id: 2
   name: CorporateBody  
   display_name: "en: CorporateBody\r\n\

data/lib/generators/enju_biblio/setup/templates/db/fixtures/patrons.yml

@@ -1,19 +1,19 @@
 --- 
-patron_00001: 
+agent_00001: 
   place: ""
   full_name: Administrator
   other_designation: ""
   id: 1
   address_1: 
   language_id: 1
-  patron_type_id: 1
+  agent_type_id: 1
   required_role_id: 1
-patron_00002: 
+agent_00002: 
   place: ""
   full_name: Your Library
   other_designation: ""
   id: 2
   address_1: 
   language_id: 1
-  patron_type_id: 2
+  agent_type_id: 2
   required_role_id: 1

data/spec/controllers/agent_import_files_controller_spec.rb

@@ -0,0 +1,321 @@
+# -*- encoding: utf-8 -*-
+require 'spec_helper'
+
+describe AgentImportFilesController do
+  fixtures :all
+
+  describe "GET index" do
+    describe "When logged in as Administrator" do
+      before(:each) do
+        sign_in FactoryGirl.create(:admin)
+      end
+
+      it "assigns all agent_import_files as @agent_import_files" do
+        get :index
+        assigns(:agent_import_files).should eq(AgentImportFile.page(1))
+      end
+    end
+
+    describe "When logged in as Librarian" do
+      before(:each) do
+        sign_in FactoryGirl.create(:librarian)
+      end
+
+      it "assigns all agent_import_files as @agent_import_files" do
+        get :index
+        assigns(:agent_import_files).should eq(AgentImportFile.page(1))
+      end
+    end
+
+    describe "When logged in as User" do
+      before(:each) do
+        sign_in FactoryGirl.create(:user)
+      end
+
+      it "assigns empty as @agent_import_files" do
+        get :index
+        assigns(:agent_import_files).should be_empty
+        response.should be_forbidden
+      end
+    end
+
+    describe "When not logged in" do
+      it "assigns empty as @agent_import_files" do
+        get :index
+        assigns(:agent_import_files).should be_empty
+        response.should redirect_to(new_user_session_url)
+      end
+    end
+  end
+
+  describe "GET show" do
+    describe "When logged in as Administrator" do
+      before(:each) do
+        sign_in FactoryGirl.create(:admin)
+      end
+
+      it "assigns the requested agent_import_file as @agent_import_file" do
+        get :show, :id => 1
+        assigns(:agent_import_file).should eq(AgentImportFile.find(1))
+      end
+    end
+
+    describe "When logged in as Librarian" do
+      before(:each) do
+        sign_in FactoryGirl.create(:librarian)
+      end
+
+      it "assigns the requested agent_import_file as @agent_import_file" do
+        get :show, :id => 1
+        assigns(:agent_import_file).should eq(AgentImportFile.find(1))
+      end
+    end
+
+    describe "When logged in as User" do
+      before(:each) do
+        sign_in FactoryGirl.create(:user)
+      end
+
+      it "assigns the requested agent_import_file as @agent_import_file" do
+        get :show, :id => 1
+        assigns(:agent_import_file).should eq(AgentImportFile.find(1))
+      end
+    end
+
+    describe "When not logged in" do
+      it "assigns the requested agent_import_file as @agent_import_file" do
+        get :show, :id => 1
+        assigns(:agent_import_file).should eq(AgentImportFile.find(1))
+        response.should redirect_to(new_user_session_url)
+      end
+    end
+  end
+
+  describe "GET new" do
+    describe "When logged in as Administrator" do
+      before(:each) do
+        sign_in FactoryGirl.create(:admin)
+      end
+
+      it "assigns the requested agent_import_file as @agent_import_file" do
+        get :new
+        assigns(:agent_import_file).should_not be_valid
+        response.should be_success
+      end
+    end
+
+    describe "When logged in as Librarian" do
+      before(:each) do
+        sign_in FactoryGirl.create(:librarian)
+      end
+
+      it "should not assign the requested agent_import_file as @agent_import_file" do
+        get :new
+        assigns(:agent_import_file).should_not be_valid
+        response.should be_success
+      end
+    end
+
+    describe "When logged in as User" do
+      before(:each) do
+        sign_in FactoryGirl.create(:user)
+      end
+
+      it "should not assign the requested agent_import_file as @agent_import_file" do
+        get :new
+        assigns(:agent_import_file).should_not be_valid
+        response.should be_forbidden
+      end
+    end
+
+    describe "When not logged in" do
+      it "should not assign the requested agent_import_file as @agent_import_file" do
+        get :new
+        assigns(:agent_import_file).should_not be_valid
+        response.should redirect_to(new_user_session_url)
+      end
+    end
+  end
+
+  describe "POST create" do
+    describe "When logged in as Librarian" do
+      before(:each) do
+        @user = FactoryGirl.create(:librarian)
+        sign_in @user
+      end
+
+      it "should create agent_import_file" do
+        post :create, :agent_import_file => {:agent_import => fixture_file_upload("/../../examples/agent_import_file_sample1.tsv", 'text/csv') }
+        assigns(:agent_import_file).should be_valid
+        assigns(:agent_import_file).user.username.should eq @user.username
+        response.should redirect_to agent_import_file_url(assigns(:agent_import_file))
+      end
+
+      it "should import user" do
+        old_agents_count = Agent.count
+        post :create, :agent_import_file => {:agent_import => fixture_file_upload("/../../examples/agent_import_file_sample2.tsv", 'text/csv') }
+        assigns(:agent_import_file).import_start
+        Agent.count.should eq old_agents_count + 7
+        response.should redirect_to agent_import_file_url(assigns(:agent_import_file))
+      end
+    end
+
+    describe "When logged in as User" do
+      before(:each) do
+        @user = FactoryGirl.create(:user)
+        sign_in @user
+      end
+
+      it "should be forbidden" do
+        post :create, :agent_import_file => {:agent_import => fixture_file_upload("/../..//examples/agent_import_file_sample1.tsv", 'text/csv') }
+        response.should be_forbidden
+      end
+    end
+
+    describe "When not logged in" do
+      it "should be redirect to new session url" do
+        post :create, :agent_import_file => {:agent_import => fixture_file_upload("/../../examples/agent_import_file_sample1.tsv", 'text/csv') }
+        response.should redirect_to new_user_session_url
+      end
+    end
+  end
+
+  describe "GET edit" do
+    describe "When logged in as Administrator" do
+      before(:each) do
+        sign_in FactoryGirl.create(:admin)
+      end
+
+      it "assigns the requested agent_import_file as @agent_import_file" do
+        agent_import_file = agent_import_files(:agent_import_file_00001)
+        get :edit, :id => agent_import_file.id
+        assigns(:agent_import_file).should eq(agent_import_file)
+      end
+    end
+
+    describe "When logged in as Librarian" do
+      before(:each) do
+        sign_in FactoryGirl.create(:librarian)
+      end
+
+      it "assigns the requested agent_import_file as @agent_import_file" do
+        agent_import_file = agent_import_files(:agent_import_file_00001)
+        get :edit, :id => agent_import_file.id
+        assigns(:agent_import_file).should eq(agent_import_file)
+      end
+    end
+
+    describe "When logged in as User" do
+      before(:each) do
+        sign_in FactoryGirl.create(:user)
+      end
+
+      it "assigns the requested agent_import_file as @agent_import_file" do
+        agent_import_file = agent_import_files(:agent_import_file_00001)
+        get :edit, :id => agent_import_file.id
+        response.should be_forbidden
+      end
+    end
+
+    describe "When not logged in" do
+      it "should not assign the requested agent_import_file as @agent_import_file" do
+        agent_import_file = agent_import_files(:agent_import_file_00001)
+        get :edit, :id => agent_import_file.id
+        response.should redirect_to(new_user_session_url)
+      end
+    end
+  end
+
+  describe "PUT update" do
+    describe "When logged in as Librarian" do
+      before(:each) do
+        sign_in FactoryGirl.create(:librarian)
+      end
+
+      it "should update agent_import_file" do
+        put :update, :id => agent_import_files(:agent_import_file_00003).id, :agent_import_file => { }
+        response.should redirect_to agent_import_file_url(assigns(:agent_import_file))
+      end
+    end
+
+    describe "When logged in as User" do
+      before(:each) do
+        sign_in FactoryGirl.create(:user)
+      end
+
+      it "should not update agent_import_file" do
+        put :update, :id => agent_import_files(:agent_import_file_00003).id, :agent_import_file => { }
+        response.should be_forbidden
+      end
+    end
+
+    describe "When not logged in" do
+      it "should not update agent_import_file" do
+        put :update, :id => agent_import_files(:agent_import_file_00003).id, :agent_import_file => { }
+        response.should redirect_to new_user_session_url
+      end
+    end
+  end
+
+  describe "DELETE destroy" do
+    before(:each) do
+      @agent_import_file = agent_import_files(:agent_import_file_00001)
+    end
+
+    describe "When logged in as Administrator" do
+      before(:each) do
+        sign_in FactoryGirl.create(:admin)
+      end
+
+      it "destroys the requested agent_import_file" do
+        delete :destroy, :id => @agent_import_file.id
+      end
+
+      it "redirects to the agent_import_files list" do
+        delete :destroy, :id => @agent_import_file.id
+        response.should redirect_to(agent_import_files_url)
+      end
+    end
+
+    describe "When logged in as Librarian" do
+      before(:each) do
+        sign_in FactoryGirl.create(:librarian)
+      end
+
+      it "destroys the requested agent_import_file" do
+        delete :destroy, :id => @agent_import_file.id
+      end
+
+      it "redirects to the agent_import_files list" do
+        delete :destroy, :id => @agent_import_file.id
+        response.should redirect_to(agent_import_files_url)
+      end
+    end
+
+    describe "When logged in as User" do
+      before(:each) do
+        sign_in FactoryGirl.create(:user)
+      end
+
+      it "destroys the requested agent_import_file" do
+        delete :destroy, :id => @agent_import_file.id
+      end
+
+      it "should be forbidden" do
+        delete :destroy, :id => @agent_import_file.id
+        response.should be_forbidden
+      end
+    end
+
+    describe "When not logged in" do
+      it "destroys the requested agent_import_file" do
+        delete :destroy, :id => @agent_import_file.id
+      end
+
+      it "should be forbidden" do
+        delete :destroy, :id => @agent_import_file.id
+        response.should redirect_to(new_user_session_url)
+      end
+    end
+  end
+end

data/spec/controllers/{patron_import_results_controller_spec.rb → agent_import_results_controller_spec.rb}

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 require 'spec_helper'
 
-describe PatronImportResultsController do
+describe AgentImportResultsController do
   fixtures :all
 
   describe "GET index" do
@@ -10,9 +10,9 @@ describe PatronImportResultsController do
         sign_in FactoryGirl.create(:admin)
       end
 
-      it "assigns all patron_import_results as @patron_import_results" do
+      it "assigns all agent_import_results as @agent_import_results" do
         get :index
-        assigns(:patron_import_results).should eq(PatronImportResult.page(1))
+        assigns(:agent_import_results).should eq(AgentImportResult.page(1))
       end
     end
 
@@ -21,9 +21,9 @@ describe PatronImportResultsController do
         sign_in FactoryGirl.create(:librarian)
       end
 
-      it "assigns all patron_import_results as @patron_import_results" do
+      it "assigns all agent_import_results as @agent_import_results" do
         get :index
-        assigns(:patron_import_results).should eq(PatronImportResult.page(1))
+        assigns(:agent_import_results).should eq(AgentImportResult.page(1))
       end
     end
 
@@ -32,17 +32,17 @@ describe PatronImportResultsController do
         sign_in FactoryGirl.create(:user)
       end
 
-      it "assigns empty as @patron_import_results" do
+      it "assigns empty as @agent_import_results" do
         get :index
-        assigns(:patron_import_results).should be_empty
+        assigns(:agent_import_results).should be_empty
         response.should be_forbidden
       end
     end
 
     describe "When not logged in" do
-      it "assigns empty as @patron_import_results" do
+      it "assigns empty as @agent_import_results" do
         get :index
-        assigns(:patron_import_results).should be_empty
+        assigns(:agent_import_results).should be_empty
         response.should redirect_to(new_user_session_url)
       end
     end
@@ -54,9 +54,9 @@ describe PatronImportResultsController do
         sign_in FactoryGirl.create(:admin)
       end
 
-      it "assigns the requested patron_import_result as @patron_import_result" do
+      it "assigns the requested agent_import_result as @agent_import_result" do
         get :show, :id => 1
-        assigns(:patron_import_result).should eq(PatronImportResult.find(1))
+        assigns(:agent_import_result).should eq(AgentImportResult.find(1))
       end
     end
 
@@ -65,9 +65,9 @@ describe PatronImportResultsController do
         sign_in FactoryGirl.create(:librarian)
       end
 
-      it "assigns the requested patron_import_result as @patron_import_result" do
+      it "assigns the requested agent_import_result as @agent_import_result" do
         get :show, :id => 1
-        assigns(:patron_import_result).should eq(PatronImportResult.find(1))
+        assigns(:agent_import_result).should eq(AgentImportResult.find(1))
       end
     end
 
@@ -76,16 +76,16 @@ describe PatronImportResultsController do
         sign_in FactoryGirl.create(:user)
       end
 
-      it "assigns the requested patron_import_result as @patron_import_result" do
+      it "assigns the requested agent_import_result as @agent_import_result" do
         get :show, :id => 1
-        assigns(:patron_import_result).should eq(PatronImportResult.find(1))
+        assigns(:agent_import_result).should eq(AgentImportResult.find(1))
       end
     end
 
     describe "When not logged in" do
-      it "assigns the requested patron_import_result as @patron_import_result" do
+      it "assigns the requested agent_import_result as @agent_import_result" do
         get :show, :id => 1
-        assigns(:patron_import_result).should eq(PatronImportResult.find(1))
+        assigns(:agent_import_result).should eq(AgentImportResult.find(1))
         response.should redirect_to(new_user_session_url)
       end
     end