enju_subject 0.0.6 → 0.0.7

data/app/controllers/classification_types_controller.rb

@@ -4,9 +4,8 @@ class ClassificationTypesController < InheritedResources::Base
 
   def update
     @classification_type = ClassificationType.find(params[:id])
-    if @classification_type and params[:position]
-      @classification_type.insert_at(params[:position])
-      redirect_to classification_types_url
+    if params[:move]
+      move_position(@classification_type, params[:move])
       return
     end
     update!

data/app/controllers/subject_heading_types_controller.rb

@@ -4,9 +4,8 @@ class SubjectHeadingTypesController < InheritedResources::Base
 
   def update
     @subject_heading_type = SubjectHeadingType.find(params[:id])
-    if params[:position]
-      @subject_heading_type.insert_at(params[:position])
-      redirect_to subject_heading_types_url
+    if params[:move]
+      move_position(@subject_heading_type, params[:move])
       return
     end
     update!

data/app/controllers/subject_types_controller.rb

@@ -4,9 +4,8 @@ class SubjectTypesController < InheritedResources::Base
 
   def update
     @subject_type = SubjectType.find(params[:id])
-    if params[:position]
-      @subject_type.insert_at(params[:position])
-      redirect_to subject_types_url
+    if params[:move]
+      move_position(@subject_type, params[:move])
       return
     end
     update!

data/app/controllers/work_has_subjects_controller.rb

@@ -68,10 +68,12 @@ class WorkHasSubjectsController < ApplicationController
   # PUT /work_has_subjects/1.json
   def update
     get_work
-    if @work and params[:position]
-      @work_has_subject.insert_at(params[:position])
-      redirect_to work_work_has_subjects_url(@work)
-      return
+    if @work and params[:move]
+      if ['higher', 'lower'].include?(params[:move])
+        @work_has_subject.send("move_#{params[:move]}")
+        redirect_to work_work_has_subjects_url(@work)
+        return
+      end
     end
 
     respond_to do |format|

data/lib/enju_subject/version.rb

@@ -1,3 +1,3 @@
 module EnjuSubject
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/spec/controllers/classification_types_controller_spec.rb

@@ -5,6 +5,10 @@ describe ClassificationTypesController do
   fixtures :all
   disconnect_sunspot
 
+  def valid_attributes
+    FactoryGirl.attributes_for(:classification_type)
+  end
+
   describe "GET index" do
     before(:each) do
       FactoryGirl.create(:classification_type)
@@ -167,7 +171,7 @@ describe ClassificationTypesController do
 
   describe "POST create" do
     before(:each) do
-      @attrs = FactoryGirl.attributes_for(:classification_type)
+      @attrs = valid_attributes
       @invalid_attrs = {:name => ''}
     end
 
@@ -285,7 +289,7 @@ describe ClassificationTypesController do
   describe "PUT update" do
     before(:each) do
       @classification_type = FactoryGirl.create(:classification_type)
-      @attrs = FactoryGirl.attributes_for(:classification_type)
+      @attrs = valid_attributes
       @invalid_attrs = {:name => ''}
     end
 
@@ -303,7 +307,7 @@ describe ClassificationTypesController do
         end
 
         it "moves its position when specified" do
-          put :update, :id => @classification_type.id, :classification_type => @attrs, :position => 2
+          put :update, :id => @classification_type.id, :classification_type => @attrs, :move => 'lower'
           response.should redirect_to(classification_types_url)
         end
       end

data/spec/controllers/classifications_controller_spec.rb

@@ -3,6 +3,10 @@ require 'spec_helper'
 describe ClassificationsController do
   fixtures :all
 
+  def valid_attributes
+    FactoryGirl.attributes_for(:classification)
+  end
+
   describe "GET index", :solr => true do
     describe "When logged in as Administrator" do
       login_admin
@@ -164,7 +168,7 @@ describe ClassificationsController do
 
   describe "POST create" do
     before(:each) do
-      @attrs = FactoryGirl.attributes_for(:classification)
+      @attrs = valid_attributes
       @invalid_attrs = {:category => ''}
     end
 
@@ -282,7 +286,7 @@ describe ClassificationsController do
   describe "PUT update" do
     before(:each) do
       @classification = FactoryGirl.create(:classification)
-      @attrs = FactoryGirl.attributes_for(:classification)
+      @attrs = valid_attributes
       @invalid_attrs = {:category => ''}
     end
 

data/spec/controllers/subject_has_classifications_controller_spec.rb

@@ -0,0 +1,443 @@
+require 'spec_helper'
+require 'sunspot/rails/spec_helper'
+
+describe SubjectHasClassificationsController do
+  fixtures :all
+  disconnect_sunspot
+
+  def valid_attributes
+    FactoryGirl.attributes_for(:subject_has_classification)
+  end
+
+  describe "GET index" do
+    before(:each) do
+      FactoryGirl.create(:subject_has_classification)
+    end
+
+    describe "When logged in as Administrator" do
+      login_admin
+
+      it "assigns all subject_has_classifications as @subject_has_classifications" do
+        get :index
+        assigns(:subject_has_classifications).should eq(SubjectHasClassification.page(1))
+      end
+    end
+
+    describe "When logged in as Librarian" do
+      login_librarian
+
+      it "assigns all subject_has_classifications as @subject_has_classifications" do
+        get :index
+        assigns(:subject_has_classifications).should eq(SubjectHasClassification.page(1))
+      end
+    end
+
+    describe "When logged in as User" do
+      login_user
+
+      it "assigns all subject_has_classifications as @subject_has_classifications" do
+        get :index
+        assigns(:subject_has_classifications).should eq(SubjectHasClassification.page(1))
+      end
+    end
+
+    describe "When not logged in" do
+      it "should not assign subject_has_classifications as @subject_has_classifications" do
+        get :index
+        assigns(:subject_has_classifications).should eq(SubjectHasClassification.page(1))
+      end
+    end
+  end
+
+  describe "GET show" do
+    describe "When logged in as Administrator" do
+      login_admin
+
+      it "assigns the requested subject_has_classification as @subject_has_classification" do
+        subject_has_classification = FactoryGirl.create(:subject_has_classification)
+        get :show, :id => subject_has_classification.id
+        assigns(:subject_has_classification).should eq(subject_has_classification)
+      end
+    end
+
+    describe "When logged in as Librarian" do
+      login_librarian
+
+      it "assigns the requested subject_has_classification as @subject_has_classification" do
+        subject_has_classification = FactoryGirl.create(:subject_has_classification)
+        get :show, :id => subject_has_classification.id
+        assigns(:subject_has_classification).should eq(subject_has_classification)
+      end
+    end
+
+    describe "When logged in as User" do
+      login_user
+
+      it "assigns the requested subject_has_classification as @subject_has_classification" do
+        subject_has_classification = FactoryGirl.create(:subject_has_classification)
+        get :show, :id => subject_has_classification.id
+        assigns(:subject_has_classification).should eq(subject_has_classification)
+      end
+    end
+
+    describe "When not logged in" do
+      it "assigns the requested subject_has_classification as @subject_has_classification" do
+        subject_has_classification = FactoryGirl.create(:subject_has_classification)
+        get :show, :id => subject_has_classification.id
+        assigns(:subject_has_classification).should eq(subject_has_classification)
+      end
+    end
+  end
+
+  describe "GET new" do
+    describe "When logged in as Administrator" do
+      login_admin
+
+      it "assigns the requested subject_has_classification as @subject_has_classification" do
+        get :new
+        assigns(:subject_has_classification).should_not be_valid
+      end
+    end
+
+    describe "When logged in as Librarian" do
+      login_librarian
+
+      it "assigns the requested subject_has_classification as @subject_has_classification" do
+        get :new
+        assigns(:subject_has_classification).should_not be_valid
+      end
+    end
+
+    describe "When logged in as User" do
+      login_user
+
+      it "should not assign the requested subject_has_classification as @subject_has_classification" do
+        get :new
+        assigns(:subject_has_classification).should_not be_valid
+        response.should be_forbidden
+      end
+    end
+
+    describe "When not logged in" do
+      it "should not assign the requested subject_has_classification as @subject_has_classification" do
+        get :new
+        assigns(:subject_has_classification).should_not be_valid
+        response.should redirect_to(new_user_session_url)
+      end
+    end
+  end
+
+  describe "GET edit" do
+    describe "When logged in as Administrator" do
+      login_admin
+
+      it "assigns the requested subject_has_classification as @subject_has_classification" do
+        subject_has_classification = FactoryGirl.create(:subject_has_classification)
+        get :edit, :id => subject_has_classification.id
+        assigns(:subject_has_classification).should eq(subject_has_classification)
+      end
+    end
+
+    describe "When logged in as Librarian" do
+      login_librarian
+
+      it "assigns the requested subject_has_classification as @subject_has_classification" do
+        subject_has_classification = FactoryGirl.create(:subject_has_classification)
+        get :edit, :id => subject_has_classification.id
+        assigns(:subject_has_classification).should eq(subject_has_classification)
+      end
+    end
+
+    describe "When logged in as User" do
+      login_user
+
+      it "assigns the requested subject_has_classification as @subject_has_classification" do
+        subject_has_classification = FactoryGirl.create(:subject_has_classification)
+        get :edit, :id => subject_has_classification.id
+        response.should be_forbidden
+      end
+    end
+
+    describe "When not logged in" do
+      it "should not assign the requested subject_has_classification as @subject_has_classification" do
+        subject_has_classification = FactoryGirl.create(:subject_has_classification)
+        get :edit, :id => subject_has_classification.id
+        response.should redirect_to(new_user_session_url)
+      end
+    end
+  end
+
+  describe "POST create" do
+    before(:each) do
+      @attrs = valid_attributes
+      @invalid_attrs = {:subject_id => ''}
+    end
+
+    describe "When logged in as Administrator" do
+      login_admin
+
+      describe "with valid params" do
+        it "assigns a newly created subject_has_classification as @subject_has_classification" do
+          post :create, :subject_has_classification => @attrs
+          assigns(:subject_has_classification).should be_valid
+        end
+
+        it "redirects to the created subject_has_classification" do
+          post :create, :subject_has_classification => @attrs
+          response.should redirect_to(subject_has_classification_url(assigns(:subject_has_classification)))
+        end
+      end
+
+      describe "with invalid params" do
+        it "assigns a newly created but unsaved subject_has_classification as @subject_has_classification" do
+          post :create, :subject_has_classification => @invalid_attrs
+          assigns(:subject_has_classification).should_not be_valid
+        end
+
+        it "re-renders the 'new' template" do
+          post :create, :subject_has_classification => @invalid_attrs
+          response.should render_template("new")
+        end
+      end
+    end
+
+    describe "When logged in as Librarian" do
+      login_librarian
+
+      describe "with valid params" do
+        it "assigns a newly created subject_has_classification as @subject_has_classification" do
+          post :create, :subject_has_classification => @attrs
+          assigns(:subject_has_classification).should be_valid
+        end
+
+        it "redirects to the created subject_has_classification" do
+          post :create, :subject_has_classification => @attrs
+          response.should redirect_to(subject_has_classification_url(assigns(:subject_has_classification)))
+        end
+      end
+
+      describe "with invalid params" do
+        it "assigns a newly created but unsaved subject_has_classification as @subject_has_classification" do
+          post :create, :subject_has_classification => @invalid_attrs
+          assigns(:subject_has_classification).should_not be_valid
+        end
+
+        it "re-renders the 'new' template" do
+          post :create, :subject_has_classification => @invalid_attrs
+          response.should render_template("new")
+        end
+      end
+    end
+
+    describe "When logged in as User" do
+      login_user
+
+      describe "with valid params" do
+        it "assigns a newly created subject_has_classification as @subject_has_classification" do
+          post :create, :subject_has_classification => @attrs
+          assigns(:subject_has_classification).should be_valid
+        end
+
+        it "should be forbidden" do
+          post :create, :subject_has_classification => @attrs
+          response.should be_forbidden
+        end
+      end
+
+      describe "with invalid params" do
+        it "assigns a newly created but unsaved subject_has_classification as @subject_has_classification" do
+          post :create, :subject_has_classification => @invalid_attrs
+          assigns(:subject_has_classification).should_not be_valid
+        end
+
+        it "should be forbidden" do
+          post :create, :subject_has_classification => @invalid_attrs
+          response.should be_forbidden
+        end
+      end
+    end
+
+    describe "When not logged in" do
+      describe "with valid params" do
+        it "assigns a newly created subject_has_classification as @subject_has_classification" do
+          post :create, :subject_has_classification => @attrs
+          assigns(:subject_has_classification).should be_valid
+        end
+
+        it "should be forbidden" do
+          post :create, :subject_has_classification => @attrs
+          response.should redirect_to(new_user_session_url)
+        end
+      end
+
+      describe "with invalid params" do
+        it "assigns a newly created but unsaved subject_has_classification as @subject_has_classification" do
+          post :create, :subject_has_classification => @invalid_attrs
+          assigns(:subject_has_classification).should_not be_valid
+        end
+
+        it "should be forbidden" do
+          post :create, :subject_has_classification => @invalid_attrs
+          response.should redirect_to(new_user_session_url)
+        end
+      end
+    end
+  end
+
+  describe "PUT update" do
+    before(:each) do
+      @subject_has_classification = FactoryGirl.create(:subject_has_classification)
+      @attrs = valid_attributes
+      @invalid_attrs = {:subject_id => ''}
+    end
+
+    describe "When logged in as Administrator" do
+      login_admin
+
+      describe "with valid params" do
+        it "updates the requested subject_has_classification" do
+          put :update, :id => @subject_has_classification.id, :subject_has_classification => @attrs
+        end
+
+        it "assigns the requested subject_has_classification as @subject_has_classification" do
+          put :update, :id => @subject_has_classification.id, :subject_has_classification => @attrs
+          assigns(:subject_has_classification).should eq(@subject_has_classification)
+        end
+      end
+
+      describe "with invalid params" do
+        it "assigns the requested subject_has_classification as @subject_has_classification" do
+          put :update, :id => @subject_has_classification.id, :subject_has_classification => @invalid_attrs
+          response.should render_template("edit")
+        end
+      end
+    end
+
+    describe "When logged in as Librarian" do
+      login_librarian
+
+      describe "with valid params" do
+        it "updates the requested subject_has_classification" do
+          put :update, :id => @subject_has_classification.id, :subject_has_classification => @attrs
+        end
+
+        it "assigns the requested subject_has_classification as @subject_has_classification" do
+          put :update, :id => @subject_has_classification.id, :subject_has_classification => @attrs
+          assigns(:subject_has_classification).should eq(@subject_has_classification)
+          response.should redirect_to(@subject_has_classification)
+        end
+      end
+
+      describe "with invalid params" do
+        it "assigns the subject_has_classification as @subject_has_classification" do
+          put :update, :id => @subject_has_classification, :subject_has_classification => @invalid_attrs
+          assigns(:subject_has_classification).should_not be_valid
+        end
+
+        it "re-renders the 'edit' template" do
+          put :update, :id => @subject_has_classification, :subject_has_classification => @invalid_attrs
+          response.should render_template("edit")
+        end
+      end
+    end
+
+    describe "When logged in as User" do
+      login_user
+
+      describe "with valid params" do
+        it "updates the requested subject_has_classification" do
+          put :update, :id => @subject_has_classification.id, :subject_has_classification => @attrs
+        end
+
+        it "assigns the requested subject_has_classification as @subject_has_classification" do
+          put :update, :id => @subject_has_classification.id, :subject_has_classification => @attrs
+          assigns(:subject_has_classification).should eq(@subject_has_classification)
+          response.should be_forbidden
+        end
+      end
+
+      describe "with invalid params" do
+        it "assigns the requested subject_has_classification as @subject_has_classification" do
+          put :update, :id => @subject_has_classification.id, :subject_has_classification => @invalid_attrs
+          response.should be_forbidden
+        end
+      end
+    end
+
+    describe "When not logged in" do
+      describe "with valid params" do
+        it "updates the requested subject_has_classification" do
+          put :update, :id => @subject_has_classification.id, :subject_has_classification => @attrs
+        end
+
+        it "should be forbidden" do
+          put :update, :id => @subject_has_classification.id, :subject_has_classification => @attrs
+          response.should redirect_to(new_user_session_url)
+        end
+      end
+
+      describe "with invalid params" do
+        it "assigns the requested subject_has_classification as @subject_has_classification" do
+          put :update, :id => @subject_has_classification.id, :subject_has_classification => @invalid_attrs
+          response.should redirect_to(new_user_session_url)
+        end
+      end
+    end
+  end
+
+  describe "DELETE destroy" do
+    before(:each) do
+      @subject_has_classification = FactoryGirl.create(:subject_has_classification)
+    end
+
+    describe "When logged in as Administrator" do
+      login_admin
+
+      it "destroys the requested subject_has_classification" do
+        delete :destroy, :id => @subject_has_classification.id
+      end
+
+      it "redirects to the subject_has_classifications list" do
+        delete :destroy, :id => @subject_has_classification.id
+        response.should redirect_to(subject_has_classifications_url)
+      end
+    end
+
+    describe "When logged in as Librarian" do
+      login_librarian
+
+      it "destroys the requested subject_has_classification" do
+        delete :destroy, :id => @subject_has_classification.id
+      end
+
+      it "should be forbidden" do
+        delete :destroy, :id => @subject_has_classification.id
+        response.should redirect_to(subject_has_classifications_url)
+      end
+    end
+
+    describe "When logged in as User" do
+      login_user
+
+      it "destroys the requested subject_has_classification" do
+        delete :destroy, :id => @subject_has_classification.id
+      end
+
+      it "should be forbidden" do
+        delete :destroy, :id => @subject_has_classification.id
+        response.should be_forbidden
+      end
+    end
+
+    describe "When not logged in" do
+      it "destroys the requested subject_has_classification" do
+        delete :destroy, :id => @subject_has_classification.id
+      end
+
+      it "should be forbidden" do
+        delete :destroy, :id => @subject_has_classification.id
+        response.should redirect_to(new_user_session_url)
+      end
+    end
+  end
+end

data/spec/controllers/subject_heading_type_has_subjects_controller_spec.rb

@@ -5,6 +5,10 @@ describe SubjectHeadingTypeHasSubjectsController do
   fixtures :all
   disconnect_sunspot
 
+  def valid_attributes
+    FactoryGirl.attributes_for(:subject_heading_type_has_subject)
+  end
+
   describe "GET index" do
     before(:each) do
       FactoryGirl.create(:subject_heading_type_has_subject)
@@ -169,7 +173,7 @@ describe SubjectHeadingTypeHasSubjectsController do
 
   describe "POST create" do
     before(:each) do
-      @attrs = FactoryGirl.attributes_for(:subject_heading_type_has_subject)
+      @attrs = valid_attributes
       @invalid_attrs = {:subject_heading_type_id => ''}
     end
 
@@ -287,7 +291,7 @@ describe SubjectHeadingTypeHasSubjectsController do
   describe "PUT update" do
     before(:each) do
       @subject_heading_type_has_subject = FactoryGirl.create(:subject_heading_type_has_subject)
-      @attrs = FactoryGirl.attributes_for(:subject_heading_type_has_subject)
+      @attrs = valid_attributes
       @invalid_attrs = {:subject_heading_type_id => ''}
     end
 

data/spec/controllers/subject_heading_types_controller_spec.rb

@@ -5,6 +5,10 @@ describe SubjectHeadingTypesController do
   fixtures :all
   disconnect_sunspot
 
+  def valid_attributes
+    FactoryGirl.attributes_for(:subject_heading_type)
+  end
+
   describe "GET index" do
     before(:each) do
       FactoryGirl.create(:subject_heading_type)
@@ -167,7 +171,7 @@ describe SubjectHeadingTypesController do
 
   describe "POST create" do
     before(:each) do
-      @attrs = FactoryGirl.attributes_for(:subject_heading_type)
+      @attrs = valid_attributes
       @invalid_attrs = {:name => ''}
     end
 
@@ -285,7 +289,7 @@ describe SubjectHeadingTypesController do
   describe "PUT update" do
     before(:each) do
       @subject_heading_type = FactoryGirl.create(:subject_heading_type)
-      @attrs = FactoryGirl.attributes_for(:subject_heading_type)
+      @attrs = valid_attributes
       @invalid_attrs = {:name => ''}
     end
 
@@ -303,7 +307,7 @@ describe SubjectHeadingTypesController do
         end
 
         it "moves its position when specified" do
-          put :update, :id => @subject_heading_type.id, :subject_heading_type => @attrs, :position => 2
+          put :update, :id => @subject_heading_type.id, :subject_heading_type => @attrs, :move => 'lower'
           response.should redirect_to(subject_heading_types_url)
         end
       end

data/spec/controllers/subject_types_controller_spec.rb

@@ -5,6 +5,10 @@ describe SubjectTypesController do
   fixtures :all
   disconnect_sunspot
 
+  def valid_attributes
+    FactoryGirl.attributes_for(:subject_type)
+  end
+
   describe "GET index" do
     before(:each) do
       FactoryGirl.create(:subject_type)
@@ -169,7 +173,7 @@ describe SubjectTypesController do
 
   describe "POST create" do
     before(:each) do
-      @attrs = FactoryGirl.attributes_for(:subject_type)
+      @attrs = valid_attributes
       @invalid_attrs = {:name => ''}
     end
 
@@ -287,7 +291,7 @@ describe SubjectTypesController do
   describe "PUT update" do
     before(:each) do
       @subject_type = FactoryGirl.create(:subject_type)
-      @attrs = FactoryGirl.attributes_for(:subject_type)
+      @attrs = valid_attributes
       @invalid_attrs = {:name => ''}
     end
 
@@ -305,7 +309,7 @@ describe SubjectTypesController do
         end
 
         it "moves its position when specified" do
-          put :update, :id => @subject_type.id, :subject_type => @attrs, :position => 2
+          put :update, :id => @subject_type.id, :subject_type => @attrs, :move => 'lower'
           response.should redirect_to(subject_types_url)
         end
       end