enju_message 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42692f5c51ab55c5852ca3dd7267a8c47318bd62
-  data.tar.gz: d93268aa7873e9fe0aee0d0ee167d5dbeb41378c
+  metadata.gz: 8a2c377d43781cce09f5e65df49223fe39d73628
+  data.tar.gz: a5960f20c1a0fa13d0382e504494aae501e0d0c0
 SHA512:
-  metadata.gz: dd08ada85e6210519c127847ea952bafcb2257a590055be66b954b7c48f42fa954ca85178420e17e8969df41cc45f101665d5ec4c455013adac6696416804b44
-  data.tar.gz: 17437037fc4e76a80dd0424759565de99f324a53177355a7704b9437b63ade9263db5a8b928c773fb51f9498104505885a6db95bb2aefab4c55bed909699da06
+  metadata.gz: 3a6abd68e26f585cdd020a144bb9bfecff773f8b3f107cd799a787810832ba49cf1273f958a80cbda4e720d42d57902a67437711a1e298ca33d43496ce2f7778
+  data.tar.gz: ecc771f18dc1d434112b5f3774173f776cd95da834a16f8bea8f3ff789fc9df44e62c89508ffd2410c3bc5f324b591ef0cff118a51978cd8d5f0ce4343f5b476

data/app/controllers/messages_controller.rb

@@ -170,4 +170,10 @@ class MessagesController < ApplicationController
       parent
     end
   end
+
+  def filtered_params
+    params.permit([:view, :format, :page, :mode, :sort_by, :per_page])
+  end
+
+  helper_method :filtered_params
 end

data/app/models/message_request.rb

@@ -26,16 +26,13 @@ class MessageRequest < ActiveRecord::Base
   def send_message
     message = nil
     MessageRequest.transaction do
-      if body
-        message = Message.new
-        message.sender = sender
-        message.recipient  = receiver.username
-        message.subject = subject
-        message.body = body
-        message.save!
-      else
-        raise 'body is empty!'
-      end
+      message = Message.new
+      message.sender = sender
+      message.recipient  = receiver.username
+      message.subject = subject
+      message.body = body
+      message.body = 'test'
+      message.save!
       self.sent_at = Time.zone.now
       save(validate: false)
       if ['reservation_expired_for_patron', 'reservation_expired_for_patron'].include?(message_template.status)
@@ -57,7 +54,7 @@ class MessageRequest < ActiveRecord::Base
       receiver: receiver,
       locale: receiver.profile.locale
     }.merge(options)
-    self.update_attributes!({body: message_template.embed_body(options)})
+    update_attributes!({body: message_template.embed_body(options)})
   end
 
   def self.send_messages

data/app/views/messages/index.html.erb

@@ -48,18 +48,18 @@
     <% mode = params[:mode].to_s %>
     <li>
       <%- if mode == 'unread' -%><strong><%- end -%>
-        <%= link_to t('message.unread'), url_for(params.merge(page: nil, mode: 'unread', only_path: true)) -%>
+        <%= link_to t('message.unread'), url_for(filtered_params.merge(page: nil, mode: 'unread', only_path: true)) -%>
       (<%= @message_facet['false'].to_i -%>)
       <%- if mode == 'unread' -%></strong><%- end -%>
     </li>
     <li>
       <%- if mode == 'read' -%><strong><%- end -%>
-        <%= link_to t('message.read'), url_for(params.merge(page: nil, mode: 'read', only_path: true)) -%>
+        <%= link_to t('message.read'), url_for(filtered_params.merge(page: nil, mode: 'read', only_path: true)) -%>
       (<%= @message_facet['true'].to_i -%>)
       <%- if mode == 'read' -%></strong><%- end -%>
     </li>
     <% if mode.present? %>
-      <li><%= link_to t('page.remove_this_facet'), url_for(params.merge(mode: nil, page: nil, only_path: true)) -%></li>
+      <li><%= link_to t('page.remove_this_facet'), url_for(filtered_params.merge(mode: nil, page: nil, only_path: true)) -%></li>
     <% end %>
   </ul>
 

data/lib/enju_message/version.rb

@@ -1,3 +1,3 @@
 module EnjuMessage
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/spec/controllers/message_requests_controller_spec.rb

@@ -5,269 +5,269 @@ describe MessageRequestsController do
   fixtures :all
   disconnect_sunspot
 
-  describe "GET index" do
-    describe "When logged in as Administrator" do
+  describe 'GET index' do
+    describe 'When logged in as Administrator' do
       login_fixture_admin
 
-      it "assigns all message_requests as @message_requests" do
+      it 'assigns all message_requests as @message_requests' do
         get :index
         assigns(:message_requests).should eq(MessageRequest.not_sent.order('created_at DESC').page(1))
       end
     end
 
-    describe "When logged in as Librarian" do
+    describe 'When logged in as Librarian' do
       login_fixture_librarian
 
-      it "assigns all message_requests as @message_requests" do
+      it 'assigns all message_requests as @message_requests' do
         get :index
         assigns(:message_requests).should eq(MessageRequest.not_sent.order('created_at DESC').page(1))
       end
     end
 
-    describe "When logged in as User" do
+    describe 'When logged in as User' do
       login_fixture_user
 
-      it "assigns all message_requests as @message_requests" do
+      it 'assigns all message_requests as @message_requests' do
         get :index
         assigns(:message_requests).should be_nil
       end
     end
 
-    describe "When not logged in" do
-      it "assigns all message_requests as @message_requests" do
+    describe 'When not logged in' do
+      it 'assigns all message_requests as @message_requests' do
         get :index
         assigns(:message_requests).should be_nil
       end
     end
   end
 
-  describe "GET show" do
-    describe "When logged in as Administrator" do
+  describe 'GET show' do
+    describe 'When logged in as Administrator' do
       login_fixture_admin
 
-      it "assigns the requested message_request as @message_request" do
+      it 'assigns the requested message_request as @message_request' do
         message_request = FactoryGirl.create(:message_request)
-        get :show, :id => message_request.id
+        get :show, id: message_request.id
         assigns(:message_request).should eq(message_request)
       end
     end
 
-    describe "When logged in as Librarian" do
+    describe 'When logged in as Librarian' do
       login_fixture_librarian
 
-      it "assigns the requested message_request as @message_request" do
+      it 'assigns the requested message_request as @message_request' do
         message_request = FactoryGirl.create(:message_request)
-        get :show, :id => message_request.id
+        get :show, id: message_request.id
         assigns(:message_request).should eq(message_request)
       end
     end
 
-    describe "When logged in as User" do
+    describe 'When logged in as User' do
       login_fixture_user
 
-      it "assigns the requested message_request as @message_request" do
+      it 'assigns the requested message_request as @message_request' do
         message_request = FactoryGirl.create(:message_request)
-        get :show, :id => message_request.id
+        get :show, id: message_request.id
         assigns(:message_request).should eq(message_request)
       end
     end
 
-    describe "When not logged in" do
-      it "assigns the requested message_request as @message_request" do
+    describe 'When not logged in' do
+      it 'assigns the requested message_request as @message_request' do
         message_request = FactoryGirl.create(:message_request)
-        get :show, :id => message_request.id
+        get :show, id: message_request.id
         assigns(:message_request).should eq(message_request)
       end
     end
   end
 
-  describe "GET edit" do
-    describe "When logged in as Administrator" do
+  describe 'GET edit' do
+    describe 'When logged in as Administrator' do
       login_fixture_admin
 
-      it "assigns the requested message_request as @message_request" do
+      it 'assigns the requested message_request as @message_request' do
         message_request = FactoryGirl.create(:message_request)
-        get :edit, :id => message_request.id
+        get :edit, id: message_request.id
         assigns(:message_request).should eq(message_request)
       end
     end
 
-    describe "When logged in as Librarian" do
+    describe 'When logged in as Librarian' do
       login_fixture_librarian
 
-      it "assigns the requested message_request as @message_request" do
+      it 'assigns the requested message_request as @message_request' do
         message_request = FactoryGirl.create(:message_request)
-        get :edit, :id => message_request.id
+        get :edit, id: message_request.id
         assigns(:message_request).should eq(message_request)
       end
     end
 
-    describe "When logged in as User" do
+    describe 'When logged in as User' do
       login_fixture_user
 
-      it "assigns the requested message_request as @message_request" do
+      it 'assigns the requested message_request as @message_request' do
         message_request = FactoryGirl.create(:message_request)
-        get :edit, :id => message_request.id
+        get :edit, id: message_request.id
         response.should be_forbidden
       end
     end
 
-    describe "When not logged in" do
-      it "should not assign the requested message_request as @message_request" do
+    describe 'When not logged in' do
+      it 'should not assign the requested message_request as @message_request' do
         message_request = FactoryGirl.create(:message_request)
-        get :edit, :id => message_request.id
+        get :edit, id: message_request.id
         response.should redirect_to(new_user_session_url)
       end
     end
   end
 
-  describe "PUT update" do
+  describe 'PUT update' do
     before(:each) do
       @message_request = FactoryGirl.create(:message_request)
-      @attrs = FactoryGirl.attributes_for(:message_request).merge(:body => 'test')
-      @invalid_attrs = {:body => ''}
+      @attrs = FactoryGirl.attributes_for(:message_request).merge(body: 'test')
+      @invalid_attrs = { body: '' }
     end
 
-    describe "When logged in as Administrator" do
+    describe 'When logged in as Administrator' do
       login_fixture_admin
 
-      describe "with valid params" do
-        it "updates the requested message_request" do
-          put :update, :id => @message_request.id, :message_request => @attrs
+      describe 'with valid params' do
+        it 'updates the requested message_request' do
+          put :update, id: @message_request.id, message_request: @attrs
         end
 
-        it "assigns the requested message_request as @message_request" do
-          put :update, :id => @message_request.id, :message_request => @attrs
+        it 'assigns the requested message_request as @message_request' do
+          put :update, id: @message_request.id, message_request: @attrs
           assigns(:message_request).should eq(@message_request)
         end
       end
 
-      describe "with invalid params" do
-        it "assigns the requested message_request as @message_request" do
-          put :update, :id => @message_request.id, :message_request => @invalid_attrs
-          response.should render_template("edit")
+      describe 'with invalid params' do
+        it 'assigns the requested message_request as @message_request' do
+          put :update, id: @message_request.id, message_request: @invalid_attrs
+          response.should render_template('edit')
         end
       end
     end
 
-    describe "When logged in as Librarian" do
+    describe 'When logged in as Librarian' do
       login_fixture_librarian
 
-      describe "with valid params" do
-        it "updates the requested message_request" do
-          put :update, :id => @message_request.id, :message_request => @attrs
+      describe 'with valid params' do
+        it 'updates the requested message_request' do
+          put :update, id: @message_request.id, message_request: @attrs
         end
 
-        it "assigns the requested message_request as @message_request" do
-          put :update, :id => @message_request.id, :message_request => @attrs
+        it 'assigns the requested message_request as @message_request' do
+          put :update, id: @message_request.id, message_request: @attrs
           assigns(:message_request).should eq(@message_request)
           response.should redirect_to(@message_request)
         end
       end
 
-      describe "with invalid params" do
-        it "assigns the requested message_request as @message_request" do
-          put :update, :id => @message_request.id, :message_request => @invalid_attrs
-          response.should render_template("edit")
+      describe 'with invalid params' do
+        it 'assigns the requested message_request as @message_request' do
+          put :update, id: @message_request.id, message_request: @invalid_attrs
+          response.should render_template('edit')
         end
       end
     end
 
-    describe "When logged in as User" do
+    describe 'When logged in as User' do
       login_fixture_user
 
-      describe "with valid params" do
-        it "updates the requested message_request" do
-          put :update, :id => @message_request.id, :message_request => @attrs
+      describe 'with valid params' do
+        it 'updates the requested message_request' do
+          put :update, id: @message_request.id, message_request: @attrs
         end
 
-        it "assigns the requested message_request as @message_request" do
-          put :update, :id => @message_request.id, :message_request => @attrs
+        it 'assigns the requested message_request as @message_request' do
+          put :update, id: @message_request.id, message_request: @attrs
           assigns(:message_request).should eq(@message_request)
           response.should be_forbidden
         end
       end
 
-      describe "with invalid params" do
-        it "assigns the requested message_request as @message_request" do
-          put :update, :id => @message_request.id, :message_request => @invalid_attrs
+      describe 'with invalid params' do
+        it 'assigns the requested message_request as @message_request' do
+          put :update, id: @message_request.id, message_request: @invalid_attrs
           response.should be_forbidden
         end
       end
     end
 
-    describe "When not logged in" do
-      describe "with valid params" do
-        it "updates the requested message_request" do
-          put :update, :id => @message_request.id, :message_request => @attrs
+    describe 'When not logged in' do
+      describe 'with valid params' do
+        it 'updates the requested message_request' do
+          put :update, id: @message_request.id, message_request: @attrs
         end
 
-        it "should be forbidden" do
-          put :update, :id => @message_request.id, :message_request => @attrs
+        it 'should be forbidden' do
+          put :update, id: @message_request.id, message_request: @attrs
           response.should redirect_to(new_user_session_url)
         end
       end
 
-      describe "with invalid params" do
-        it "assigns the requested message_request as @message_request" do
-          put :update, :id => @message_request.id, :message_request => @invalid_attrs
+      describe 'with invalid params' do
+        it 'assigns the requested message_request as @message_request' do
+          put :update, id: @message_request.id, message_request: @invalid_attrs
           response.should redirect_to(new_user_session_url)
         end
       end
     end
   end
 
-  describe "DELETE destroy" do
+  describe 'DELETE destroy' do
     before(:each) do
       @message_request = FactoryGirl.create(:message_request)
     end
 
-    describe "When logged in as Administrator" do
+    describe 'When logged in as Administrator' do
       login_fixture_admin
 
-      it "destroys the requested message_request" do
-        delete :destroy, :id => @message_request.id
+      it 'destroys the requested message_request' do
+        delete :destroy, id: @message_request.id
       end
 
-      it "redirects to the harvesting_requests list" do
-        delete :destroy, :id => @message_request.id
+      it 'redirects to the harvesting_requests list' do
+        delete :destroy, id: @message_request.id
         response.should redirect_to(message_requests_url)
       end
     end
 
-    describe "When logged in as Librarian" do
+    describe 'When logged in as Librarian' do
       login_fixture_librarian
 
-      it "destroys the requested message_request" do
-        delete :destroy, :id => @message_request.id
+      it 'destroys the requested message_request' do
+        delete :destroy, id: @message_request.id
       end
 
-      it "redirects to the harvesting_requests list" do
-        delete :destroy, :id => @message_request.id
+      it 'redirects to the harvesting_requests list' do
+        delete :destroy, id: @message_request.id
         response.should redirect_to(message_requests_url)
       end
     end
 
-    describe "When logged in as User" do
+    describe 'When logged in as User' do
       login_fixture_user
 
-      it "destroys the requested message_request" do
-        delete :destroy, :id => @message_request.id
+      it 'destroys the requested message_request' do
+        delete :destroy, id: @message_request.id
       end
 
-      it "should be forbidden" do
-        delete :destroy, :id => @message_request.id
+      it 'should be forbidden' do
+        delete :destroy, id: @message_request.id
         response.should be_forbidden
       end
     end
 
-    describe "When not logged in" do
-      it "destroys the requested message_request" do
-        delete :destroy, :id => @message_request.id
+    describe 'When not logged in' do
+      it 'destroys the requested message_request' do
+        delete :destroy, id: @message_request.id
       end
 
-      it "should be forbidden" do
-        delete :destroy, :id => @message_request.id
+      it 'should be forbidden' do
+        delete :destroy, id: @message_request.id
         response.should redirect_to(new_user_session_url)
       end
     end