enju_message 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70593ab668f22d6eba649e265e7f22d944c221b6
-  data.tar.gz: 81e9ecf42698d145d286f937e735eaa9bef7599d
+  metadata.gz: fb3a849e9c31f0867bbccac8878932e6c5ad6a37
+  data.tar.gz: d5ea5c1c3b6b741b1dbe274c3883ebbc0324f86e
 SHA512:
-  metadata.gz: 1e8f1cb9ab6e4e25757f0b31379532982b765826a0a3654a2047ec33f1f9314d97e94c928ba4d11440a4d46c0cdf7d3481bcb982df0ec6d1b6fad6c7774fc2b5
-  data.tar.gz: 9b0ec8b0ef8e9930cf1b09e53ef1329ec4ab8b12b942b3dfe8c683cb5cbd827ad9e7c1e379de0a590495950f54fb0f4a45cd370543a0143210297595155789a6
+  metadata.gz: db9f9b8ffbcb0150781662824d986ce72bc1f9fe667c1fac89367272c55511aa4ba96efde4c5ce54d9e2c0be470900fcd850dc7ea397118d1882c38b2fc2a6ee
+  data.tar.gz: fe3810733225c04c7b7d1e30d87374a8c3098b696abd812009ef76ffa730270423571f8b18c3c503267968e2a515809fd010ae218e8c82c72db6232898c22017

data/lib/enju_message/version.rb

@@ -1,3 +1,3 @@
 module EnjuMessage
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/spec/controllers/message_requests_controller_spec.rb

@@ -46,7 +46,7 @@ describe MessageRequestsController do
       login_fixture_admin
 
       it 'assigns the requested message_request as @message_request' do
-        message_request = FactoryGirl.create(:message_request)
+        message_request = FactoryBot.create(:message_request)
         get :show, id: message_request.id
         assigns(:message_request).should eq(message_request)
       end
@@ -56,7 +56,7 @@ describe MessageRequestsController do
       login_fixture_librarian
 
       it 'assigns the requested message_request as @message_request' do
-        message_request = FactoryGirl.create(:message_request)
+        message_request = FactoryBot.create(:message_request)
         get :show, id: message_request.id
         assigns(:message_request).should eq(message_request)
       end
@@ -66,7 +66,7 @@ describe MessageRequestsController do
       login_fixture_user
 
       it 'assigns the requested message_request as @message_request' do
-        message_request = FactoryGirl.create(:message_request)
+        message_request = FactoryBot.create(:message_request)
         get :show, id: message_request.id
         assigns(:message_request).should eq(message_request)
       end
@@ -74,7 +74,7 @@ describe MessageRequestsController do
 
     describe 'When not logged in' do
       it 'assigns the requested message_request as @message_request' do
-        message_request = FactoryGirl.create(:message_request)
+        message_request = FactoryBot.create(:message_request)
         get :show, id: message_request.id
         assigns(:message_request).should eq(message_request)
       end
@@ -86,7 +86,7 @@ describe MessageRequestsController do
       login_fixture_admin
 
       it 'assigns the requested message_request as @message_request' do
-        message_request = FactoryGirl.create(:message_request)
+        message_request = FactoryBot.create(:message_request)
         get :edit, id: message_request.id
         assigns(:message_request).should eq(message_request)
       end
@@ -96,7 +96,7 @@ describe MessageRequestsController do
       login_fixture_librarian
 
       it 'assigns the requested message_request as @message_request' do
-        message_request = FactoryGirl.create(:message_request)
+        message_request = FactoryBot.create(:message_request)
         get :edit, id: message_request.id
         assigns(:message_request).should eq(message_request)
       end
@@ -106,7 +106,7 @@ describe MessageRequestsController do
       login_fixture_user
 
       it 'assigns the requested message_request as @message_request' do
-        message_request = FactoryGirl.create(:message_request)
+        message_request = FactoryBot.create(:message_request)
         get :edit, id: message_request.id
         response.should be_forbidden
       end
@@ -114,7 +114,7 @@ describe MessageRequestsController 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)
+        message_request = FactoryBot.create(:message_request)
         get :edit, id: message_request.id
         response.should redirect_to(new_user_session_url)
       end
@@ -123,8 +123,8 @@ describe MessageRequestsController do
 
   describe 'PUT update' do
     before(:each) do
-      @message_request = FactoryGirl.create(:message_request)
-      @attrs = FactoryGirl.attributes_for(:message_request).merge(body: 'test')
+      @message_request = FactoryBot.create(:message_request)
+      @attrs = FactoryBot.attributes_for(:message_request).merge(body: 'test')
       @invalid_attrs = { body: '' }
     end
 
@@ -219,7 +219,7 @@ describe MessageRequestsController do
 
   describe 'DELETE destroy' do
     before(:each) do
-      @message_request = FactoryGirl.create(:message_request)
+      @message_request = FactoryBot.create(:message_request)
     end
 
     describe 'When logged in as Administrator' do

data/spec/controllers/message_templates_controller_spec.rb

@@ -48,7 +48,7 @@ describe MessageTemplatesController do
       login_fixture_admin
 
       it 'assigns the requested message_template as @message_template' do
-        message_template = FactoryGirl.create(:message_template)
+        message_template = FactoryBot.create(:message_template)
         get :show, id: message_template.id
         assigns(:message_template).should eq(message_template)
       end
@@ -58,7 +58,7 @@ describe MessageTemplatesController do
       login_fixture_librarian
 
       it 'assigns the requested message_template as @message_template' do
-        message_template = FactoryGirl.create(:message_template)
+        message_template = FactoryBot.create(:message_template)
         get :show, id: message_template.id
         assigns(:message_template).should eq(message_template)
       end
@@ -68,7 +68,7 @@ describe MessageTemplatesController do
       login_fixture_user
 
       it 'assigns the requested message_template as @message_template' do
-        message_template = FactoryGirl.create(:message_template)
+        message_template = FactoryBot.create(:message_template)
         get :show, id: message_template.id
         assigns(:message_template).should eq(message_template)
       end
@@ -76,7 +76,7 @@ describe MessageTemplatesController do
 
     describe 'When not logged in' do
       it 'assigns the requested message_template as @message_template' do
-        message_template = FactoryGirl.create(:message_template)
+        message_template = FactoryBot.create(:message_template)
         get :show, id: message_template.id
         assigns(:message_template).should eq(message_template)
       end
@@ -128,7 +128,7 @@ describe MessageTemplatesController do
       login_fixture_admin
 
       it 'assigns the requested message_template as @message_template' do
-        message_template = FactoryGirl.create(:message_template)
+        message_template = FactoryBot.create(:message_template)
         get :edit, id: message_template.id
         assigns(:message_template).should eq(message_template)
       end
@@ -138,7 +138,7 @@ describe MessageTemplatesController do
       login_fixture_librarian
 
       it 'assigns the requested message_template as @message_template' do
-        message_template = FactoryGirl.create(:message_template)
+        message_template = FactoryBot.create(:message_template)
         get :edit, id: message_template.id
         response.should be_forbidden
       end
@@ -148,7 +148,7 @@ describe MessageTemplatesController do
       login_fixture_user
 
       it 'assigns the requested message_template as @message_template' do
-        message_template = FactoryGirl.create(:message_template)
+        message_template = FactoryBot.create(:message_template)
         get :edit, id: message_template.id
         response.should be_forbidden
       end
@@ -156,7 +156,7 @@ describe MessageTemplatesController do
 
     describe 'When not logged in' do
       it 'should not assign the requested message_template as @message_template' do
-        message_template = FactoryGirl.create(:message_template)
+        message_template = FactoryBot.create(:message_template)
         get :edit, id: message_template.id
         response.should redirect_to(new_user_session_url)
       end
@@ -165,7 +165,7 @@ describe MessageTemplatesController do
 
   describe 'POST create' do
     before(:each) do
-      @attrs = FactoryGirl.attributes_for(:message_template)
+      @attrs = FactoryBot.attributes_for(:message_template)
       @invalid_attrs = { status: '' }
     end
 
@@ -282,8 +282,8 @@ describe MessageTemplatesController do
 
   describe 'PUT update' do
     before(:each) do
-      @message_template = FactoryGirl.create(:message_template)
-      @attrs = FactoryGirl.attributes_for(:message_template)
+      @message_template = FactoryBot.create(:message_template)
+      @attrs = FactoryBot.attributes_for(:message_template)
       @invalid_attrs = { status: '' }
     end
 
@@ -383,7 +383,7 @@ describe MessageTemplatesController do
 
   describe 'DELETE destroy' do
     before(:each) do
-      @message_template = FactoryGirl.create(:message_template)
+      @message_template = FactoryBot.create(:message_template)
     end
 
     describe 'When logged in as Administrator' do

data/spec/controllers/messages_controller_spec.rb

@@ -221,7 +221,7 @@ describe MessagesController do
 
     describe 'When not logged in' do
       it 'assigns the requested message as @message' do
-        message = FactoryGirl.create(:message)
+        message = FactoryBot.create(:message)
         get :edit, id: message.id
         assigns(:message).should be_nil
         response.should redirect_to new_user_session_url
@@ -337,7 +337,7 @@ describe MessagesController do
   describe 'PUT update' do
     before(:each) do
       @message = messages(:user1_to_user2_1)
-      @attrs = FactoryGirl.attributes_for(:message)
+      @attrs = FactoryBot.attributes_for(:message)
       @invalid_attrs = { sender_id: '' }
     end
 
@@ -471,7 +471,7 @@ describe MessagesController do
       login_fixture_librarian
 
       it 'should destroy own message' do
-        @message = FactoryGirl.create(:message, recipient: @user.username)
+        @message = FactoryBot.create(:message, recipient: @user.username)
         delete :destroy, id: @message.id
         response.should redirect_to messages_url
       end
@@ -510,7 +510,7 @@ describe MessagesController do
     describe 'When logged in as Librarian' do
       login_fixture_librarian
       it 'should destroy own message' do
-        message = FactoryGirl.create(:message, recipient: @user.username)
+        message = FactoryBot.create(:message, recipient: @user.username)
         post :destroy_selected, delete: [message.id]
         response.should_not be_forbidden
         response.should redirect_to(messages_url)
@@ -520,7 +520,7 @@ describe MessagesController do
     describe 'When logged in as User' do
       login_fixture_user
       it 'should destroy own message' do
-        message = FactoryGirl.create(:message, recipient: @user.username)
+        message = FactoryBot.create(:message, recipient: @user.username)
         post :destroy_selected, delete: [message.id]
         response.should_not be_forbidden
         response.should redirect_to(messages_url)

data/spec/dummy/db/migrate/20170305064014_add_csv_charset_conversion_to_library_group.rb

@@ -0,0 +1,5 @@
+class AddCsvCharsetConversionToLibraryGroup < ActiveRecord::Migration
+  def change
+    add_column :library_groups, :csv_charset_conversion, :boolean, null: false, default: false
+  end
+end

data/spec/dummy/db/migrate/20171014084528_add_header_logo_to_library_group.rb

@@ -0,0 +1,5 @@
+class AddHeaderLogoToLibraryGroup < ActiveRecord::Migration
+  def change
+    add_attachment :library_groups, :header_logo
+  end
+end

data/spec/dummy/db/migrate/20171126133835_rename_login_banner_to_old_login_banner.rb

@@ -0,0 +1,5 @@
+class RenameLoginBannerToOldLoginBanner < ActiveRecord::Migration
+  def change
+    rename_column :library_groups, :login_banner, :old_login_banner
+  end
+end

data/spec/dummy/db/migrate/20171126135238_add_foreign_key_to_library_group_id_on_library.rb

@@ -0,0 +1,5 @@
+class AddForeignKeyToLibraryGroupIdOnLibrary < ActiveRecord::Migration
+  def change
+    add_foreign_key :libraries, :library_groups, null: false
+  end
+end

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20160814165332) do
+ActiveRecord::Schema.define(version: 20171126135238) do
 
   create_table "accepts", force: :cascade do |t|
     t.integer  "basket_id"
@@ -451,7 +451,7 @@ ActiveRecord::Schema.define(version: 20160814165332) do
     t.text     "display_name"
     t.string   "short_name",                                                       null: false
     t.text     "my_networks"
-    t.text     "login_banner"
+    t.text     "old_login_banner"
     t.text     "note"
     t.integer  "country_id"
     t.integer  "position"
@@ -465,6 +465,11 @@ ActiveRecord::Schema.define(version: 20160814165332) do
     t.boolean  "family_name_first",             default: true
     t.integer  "pub_year_facet_range_interval", default: 10
     t.integer  "user_id"
+    t.boolean  "csv_charset_conversion",        default: false,                    null: false
+    t.string   "header_logo_file_name"
+    t.string   "header_logo_content_type"
+    t.integer  "header_logo_file_size"
+    t.datetime "header_logo_updated_at"
   end
 
   add_index "library_groups", ["short_name"], name: "index_library_groups_on_short_name"

data/spec/factories/library.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :library do |f|
     f.sequence(:name){|n| "library#{n}"}
     f.sequence(:short_display_name){|n| "library_#{n}"}
@@ -6,7 +6,7 @@ FactoryGirl.define do
   end
 end
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :invalid_library, :class => Library do |f|
     f.library_group_id{LibraryGroup.first.id}
   end

data/spec/factories/message.rb

@@ -1,7 +1,7 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :message do |f|
-    f.recipient{FactoryGirl.create(:profile).user.username}
-    f.sender{FactoryGirl.create(:profile).user}
+    f.recipient{FactoryBot.create(:profile).user.username}
+    f.sender{FactoryBot.create(:profile).user}
     f.subject 'new message'
     f.body 'new message body is really short'
   end

data/spec/factories/message_request.rb

@@ -1,8 +1,8 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :message_request do |f|
-    f.sender_id{FactoryGirl.create(:user).id}
-    f.receiver_id{FactoryGirl.create(:user).id}
-    f.message_template_id{FactoryGirl.create(:message_template).id}
+    f.sender_id{FactoryBot.create(:user).id}
+    f.receiver_id{FactoryBot.create(:user).id}
+    f.message_template_id{FactoryBot.create(:message_template).id}
     f.body 'test'
   end
 end

data/spec/factories/message_template.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :message_template do |f|
     f.sequence(:title){|n| "message_template_#{n}"}
     f.sequence(:status){|n| "message_template_#{n}"}

data/spec/factories/profile.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :profile, :class => Profile do |f|
     f.user_group_id {UserGroup.first.id}
     f.required_role_id {Role.where(name: 'User').first.id}
@@ -6,7 +6,7 @@ FactoryGirl.define do
     f.library_id 2
     f.locale "ja"
     after(:create) do |profile|
-      user = FactoryGirl.create(:user)
+      user = FactoryBot.create(:user)
       profile.user = user
       profile.save
     end

data/spec/factories/user.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :admin, :class => User do |f|
     f.sequence(:username){|n| "admin_#{n}"}
     f.sequence(:email){|n| "admin_#{n}@example.jp"}

data/spec/fixtures/library_groups.yml

@@ -8,7 +8,7 @@ one:
   my_networks: 0.0.0.0/0
   url: "http://localhost:3000/"
   position: 1
-  login_banner: "*Next-L Enju*"
+  old_login_banner: "*Next-L Enju*"
   admin_networks: 0.0.0.0/0
   user_id: 1
 

data/spec/models/message_spec.rb

@@ -4,7 +4,7 @@ describe Message do
   fixtures :all
 
   before(:each) do
-    @message = FactoryGirl.create(:message)
+    @message = FactoryBot.create(:message)
   end
 
   it 'should require body' do

data/spec/rails_helper.rb

@@ -7,7 +7,7 @@ Coveralls.wear!
 ENV["RAILS_ENV"] ||= 'test'
 require File.expand_path("../dummy/config/environment", __FILE__)
 require 'rspec/rails'
-require 'factory_girl'
+require 'factory_bot'
 require 'sunspot-rails-tester'
 require 'rspec/active_model/mocks'
 
@@ -50,5 +50,5 @@ RSpec.configure do |config|
   config.infer_spec_type_from_file_location!
 end
 
-FactoryGirl.definition_file_paths << "#{::Rails.root}/../../spec/factories"
-FactoryGirl.find_definitions
+FactoryBot.definition_file_paths << "#{::Rails.root}/../../spec/factories"
+FactoryBot.find_definitions

data/spec/support/controller_macros.rb

@@ -2,14 +2,14 @@ module ControllerMacros
   def login_admin
     before(:each) do
       @request.env["devise.mapping"] = Devise.mappings[:admin]
-      sign_in FactoryGirl.create(:admin)
+      sign_in FactoryBot.create(:admin)
     end
   end
 
   def login_librarian
     before(:each) do
       @request.env["devise.mapping"] = Devise.mappings[:user]
-      user = FactoryGirl.create(:librarian)
+      user = FactoryBot.create(:librarian)
       sign_in user
     end
   end
@@ -17,7 +17,7 @@ module ControllerMacros
   def login_user
     before(:each) do
       @request.env["devise.mapping"] = Devise.mappings[:user]
-      user = FactoryGirl.create(:user)
+      user = FactoryBot.create(:user)
       sign_in user
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_message
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-12 00:00:00.000000000 Z
+date: 2018-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: enju_library
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.2.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.2.2
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -123,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.5'
 - !ruby/object:Gem::Dependency
-  name: factory_girl_rails
+  name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -447,6 +447,10 @@ files:
 - spec/dummy/db/migrate/20160813191733_add_family_name_first_to_library_group.rb
 - spec/dummy/db/migrate/20160813192542_add_pub_year_facet_range_interval_to_library_group.rb
 - spec/dummy/db/migrate/20160813203039_add_user_id_to_library_group.rb
+- spec/dummy/db/migrate/20170305064014_add_csv_charset_conversion_to_library_group.rb
+- spec/dummy/db/migrate/20171014084528_add_header_logo_to_library_group.rb
+- spec/dummy/db/migrate/20171126133835_rename_login_banner_to_old_login_banner.rb
+- spec/dummy/db/migrate/20171126135238_add_foreign_key_to_library_group_id_on_library.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
@@ -497,7 +501,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.1
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: enju_message plugin
@@ -537,6 +541,7 @@ test_files:
 - spec/dummy/public/500.html
 - spec/dummy/public/404.html
 - spec/dummy/db/schema.rb
+- spec/dummy/db/migrate/20170305064014_add_csv_charset_conversion_to_library_group.rb
 - spec/dummy/db/migrate/20140823095740_rename_manifestation_periodical_to_serial.rb
 - spec/dummy/db/migrate/20090720091429_create_content_types.rb
 - spec/dummy/db/migrate/20140709113413_create_user_export_files.rb
@@ -556,10 +561,12 @@ test_files:
 - spec/dummy/db/migrate/20110318183304_add_valid_period_for_new_user_to_user_group.rb
 - spec/dummy/db/migrate/20120510140958_add_closed_to_shelf.rb
 - spec/dummy/db/migrate/20160813203039_add_user_id_to_library_group.rb
+- spec/dummy/db/migrate/20171126133835_rename_login_banner_to_old_login_banner.rb
 - spec/dummy/db/migrate/20121116031206_add_fulltext_content_to_manifestation.rb
 - spec/dummy/db/migrate/015_create_creates.rb
 - spec/dummy/db/migrate/20081025083905_create_languages.rb
 - spec/dummy/db/migrate/20130421093852_add_periodical_to_manifestation.rb
+- spec/dummy/db/migrate/20171014084528_add_header_logo_to_library_group.rb
 - spec/dummy/db/migrate/20140720170714_add_default_library_id_to_user_import_file.rb
 - spec/dummy/db/migrate/20120125152919_add_title_subseries_transcription_to_series_statement.rb
 - spec/dummy/db/migrate/20140628072217_add_user_encoding_to_user_import_file.rb
@@ -625,6 +632,7 @@ test_files:
 - spec/dummy/db/migrate/20140811031145_add_expired_at_to_profile.rb
 - spec/dummy/db/migrate/20120415164821_add_attachment_meta_to_manifestation.rb
 - spec/dummy/db/migrate/041_create_roles.rb
+- spec/dummy/db/migrate/20171126135238_add_foreign_key_to_library_group_id_on_library.rb
 - spec/dummy/db/migrate/20110301035123_add_pub_date_to_manifestation.rb
 - spec/dummy/db/migrate/20150221063719_add_settings_to_library_group.rb
 - spec/dummy/db/migrate/20120129014038_create_budget_types.rb