enju_message 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f0045a198b296280a01ed907ced3a537c3d9b3a2
-  data.tar.gz: 6364cfbc156327eda16d31457863730175c98124
+SHA256:
+  metadata.gz: 86af615e611c78aa7455cb247a37fbfcbe4fabbf97ea75e7e3f7299ae33e30e2
+  data.tar.gz: e1f6331fbe4e8fd6d3831b3f26e4682bbde914acb4303b80cc91ec7b84276202
 SHA512:
-  metadata.gz: 3b2aff3a93e8415b4f67bd3a656ed5d0bec4c6ffb1365f586088aab31d114dea6a0400eae9dd91cce663e53948a5d4a9c3877df47caff5c5a245551d7ad2082f
-  data.tar.gz: 89d26b6191564dca081a7302188ca3b5d4295344271920f4797dd21a2dc1ac238ac5fdefd603330dd4477c0422b13db925ca931548ac05b203b93fdde23f37ee
+  metadata.gz: 808920419efade6ae75412f1a4aa8472c87dab8682ad9265bd7da02bf9f47623b7ddcde775a511031b599cae3359340148b5e372f878b1dcb87ef5606f7e5cc0
+  data.tar.gz: c5ba1032e2438e86ee5eedce8bd934c0de010cb75b9ff603541238f43c2edce5169ffd781bd605c6bc883cbb6e997faff97a5420087fcb005516513411a9d594

data/lib/enju_message/version.rb

@@ -1,3 +1,3 @@
 module EnjuMessage
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/spec/controllers/message_requests_controller_spec.rb

@@ -0,0 +1,275 @@
+require 'rails_helper'
+require 'sunspot/rails/spec_helper'
+
+describe MessageRequestsController do
+  fixtures :all
+  disconnect_sunspot
+
+  describe 'GET index' do
+    describe 'When logged in as Administrator' do
+      login_fixture_admin
+
+      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
+      login_fixture_librarian
+
+      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
+      login_fixture_user
+
+      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
+        get :index
+        assigns(:message_requests).should be_nil
+      end
+    end
+  end
+
+  describe 'GET show' do
+    describe 'When logged in as Administrator' do
+      login_fixture_admin
+
+      it 'assigns the requested message_request as @message_request' do
+        message_request = FactoryBot.create(:message_request)
+        get :show, params: { id: message_request.id }
+        assigns(:message_request).should eq(message_request)
+      end
+    end
+
+    describe 'When logged in as Librarian' do
+      login_fixture_librarian
+
+      it 'assigns the requested message_request as @message_request' do
+        message_request = FactoryBot.create(:message_request)
+        get :show, params: { id: message_request.id }
+        assigns(:message_request).should eq(message_request)
+      end
+    end
+
+    describe 'When logged in as User' do
+      login_fixture_user
+
+      it 'assigns the requested message_request as @message_request' do
+        message_request = FactoryBot.create(:message_request)
+        get :show, params: { 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
+        message_request = FactoryBot.create(:message_request)
+        get :show, params: { 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
+      login_fixture_admin
+
+      it 'assigns the requested message_request as @message_request' do
+        message_request = FactoryBot.create(:message_request)
+        get :edit, params: { id: message_request.id }
+        assigns(:message_request).should eq(message_request)
+      end
+    end
+
+    describe 'When logged in as Librarian' do
+      login_fixture_librarian
+
+      it 'assigns the requested message_request as @message_request' do
+        message_request = FactoryBot.create(:message_request)
+        get :edit, params: { id: message_request.id }
+        assigns(:message_request).should eq(message_request)
+      end
+    end
+
+    describe 'When logged in as User' do
+      login_fixture_user
+
+      it 'assigns the requested message_request as @message_request' do
+        message_request = FactoryBot.create(:message_request)
+        get :edit, params: { 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
+        message_request = FactoryBot.create(:message_request)
+        get :edit, params: { id: message_request.id }
+        response.should redirect_to(new_user_session_url)
+      end
+    end
+  end
+
+  describe 'PUT update' do
+    before(:each) do
+      @message_request = FactoryBot.create(:message_request)
+      @attrs = FactoryBot.attributes_for(:message_request).merge(body: 'test')
+      @invalid_attrs = { body: '' }
+    end
+
+    describe 'When logged in as Administrator' do
+      login_fixture_admin
+
+      describe 'with valid params' do
+        it 'updates the requested message_request' do
+          put :update, params: { id: @message_request.id, message_request: @attrs }
+        end
+
+        it 'assigns the requested message_request as @message_request' do
+          put :update, params: { 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, params: { id: @message_request.id, message_request: @invalid_attrs }
+          response.should render_template('edit')
+        end
+      end
+    end
+
+    describe 'When logged in as Librarian' do
+      login_fixture_librarian
+
+      describe 'with valid params' do
+        it 'updates the requested message_request' do
+          put :update, params: { id: @message_request.id, message_request: @attrs }
+        end
+
+        it 'assigns the requested message_request as @message_request' do
+          put :update, params: { 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, params: { id: @message_request.id, message_request: @invalid_attrs }
+          response.should render_template('edit')
+        end
+      end
+    end
+
+    describe 'When logged in as User' do
+      login_fixture_user
+
+      describe 'with valid params' do
+        it 'updates the requested message_request' do
+          put :update, params: { id: @message_request.id, message_request: @attrs }
+        end
+
+        it 'assigns the requested message_request as @message_request' do
+          put :update, params: { 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, params: { 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, params: { id: @message_request.id, message_request: @attrs }
+        end
+
+        it 'should be forbidden' do
+          put :update, params: { 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, params: { id: @message_request.id, message_request: @invalid_attrs }
+          response.should redirect_to(new_user_session_url)
+        end
+      end
+    end
+  end
+
+  describe 'DELETE destroy' do
+    before(:each) do
+      @message_request = FactoryBot.create(:message_request)
+    end
+
+    describe 'When logged in as Administrator' do
+      login_fixture_admin
+
+      it 'destroys the requested message_request' do
+        delete :destroy, params: { id: @message_request.id }
+      end
+
+      it 'redirects to the harvesting_requests list' do
+        delete :destroy, params: { id: @message_request.id }
+        response.should redirect_to(message_requests_url)
+      end
+    end
+
+    describe 'When logged in as Librarian' do
+      login_fixture_librarian
+
+      it 'destroys the requested message_request' do
+        delete :destroy, params: { id: @message_request.id }
+      end
+
+      it 'redirects to the harvesting_requests list' do
+        delete :destroy, params: { id: @message_request.id }
+        response.should redirect_to(message_requests_url)
+      end
+    end
+
+    describe 'When logged in as User' do
+      login_fixture_user
+
+      it 'destroys the requested message_request' do
+        delete :destroy, params: { id: @message_request.id }
+      end
+
+      it 'should be forbidden' do
+        delete :destroy, params: { 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, params: { id: @message_request.id }
+      end
+
+      it 'should be forbidden' do
+        delete :destroy, params: { id: @message_request.id }
+        response.should redirect_to(new_user_session_url)
+      end
+    end
+  end
+end

data/spec/controllers/messages_controller_spec.rb

@@ -264,15 +264,17 @@ describe MessagesController do
           response.should be_successful
         end
       end
+
       describe 'with invalid recipient' do
         it "re-renders the 'new' template" do
           post :create, params: { message: @invalid_user_attrs }
           message = assigns(:message)
           message.should_not be_valid
           message.errors.should have_key :receiver
-          message.errors.added?(:receiver, :invalid).should be_truthy
+          message.errors.added?(:receiver, :blank).should be_truthy
           response.should render_template('new')
         end
+
         it "re-renders the 'new' template" do
           post :create, params: { message: @blank_user_attrs }
           message = assigns(:message)

data/spec/dummy/config/application.rb

@@ -9,7 +9,7 @@ require "enju_leaf"
 module Dummy
   class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.
-    config.load_defaults 5.1
+    config.load_defaults 5.2
 
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers

data/spec/dummy/db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20180107162711) do
+ActiveRecord::Schema.define(version: 2018_01_07_162711) do
 
   create_table "accepts", force: :cascade do |t|
     t.integer "basket_id"

data/spec/factories/message.rb

@@ -2,8 +2,8 @@ FactoryBot.define do
   factory :message do
     recipient{FactoryBot.create(:profile).user.username}
     sender{FactoryBot.create(:profile).user}
-    subject 'new message'
-    body 'new message body is really short'
+    subject { 'new message' }
+    body { 'new message body is really short' }
     association :message_request
   end
 end

data/spec/factories/message_request.rb

@@ -3,6 +3,6 @@ FactoryBot.define do
     sender_id{FactoryBot.create(:user).id}
     receiver_id{FactoryBot.create(:user).id}
     message_template_id{FactoryBot.create(:message_template).id}
-    body 'test'
+    body { 'test' }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_message
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-29 00:00:00.000000000 Z
+date: 2019-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_nested_set
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.2
 - !ruby/object:Gem::Dependency
   name: erubis
   requirement: !ruby/object:Gem::Requirement
@@ -72,42 +72,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0.rc.1
+        version: 0.3.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0.rc.1
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: enju_leaf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0.rc.1
+        version: 1.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0.rc.1
+        version: 1.3.2
 - !ruby/object:Gem::Dependency
   name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.11'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.8'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -530,8 +530,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: enju_message plugin