enju_seed 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 91ee753aaf3aefd0bf26d1b887ba3b456201ccb8
-  data.tar.gz: 3da5ee3a78634a4e0c6763338492537e80c2befc
+  metadata.gz: f82f28685be0ce77bbae3b1a5669dd3f8e4efd7a
+  data.tar.gz: 6e850f5e9c2962054d294a256eada15067afa5a5
 SHA512:
-  metadata.gz: 5cf6b0aa28175b246e6b568c987f2597152d4dc1612a9e6b81448297b73be78f8523f58882ff96c18e661e1edb440017aa095f25261b6c3c55e94bf88fa4393b
-  data.tar.gz: 9f8db69b3f6df5b63aee0a8cfc6ec0a0989c9b73ee90f1f64b37b207b299d29c8ef13d057f381b98b1040b791015cba1f90e988e71050403d72a81e4a225b9ff
+  metadata.gz: 12a0dad577c19e0f6a5d82101381ddd630bb06d24a3fdd8fc57641f8f661c0c854105d66f75a00b758a39c2e19abb7ba8b200ed5cc1dcc7c10a3918c37d70477
+  data.tar.gz: ffcaaf6327814aff63e4a3bc3f40576b61aebf712287659e35fbfd6b9e90e014e466ad9f4a23283d3741588e0ee41733dc408c677708c3270b07594e9335a0ba

data/lib/enju_seed/version.rb

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

data/spec/controllers/my_accounts_controller_spec.rb

@@ -27,8 +27,8 @@ describe MyAccountsController do
   describe "GET edit" do
     describe "When logged in as Administrator" do
       before(:each) do
-        profile = FactoryGirl.create(:profile)
-        @user = FactoryGirl.create(:admin)
+        profile = FactoryBot.create(:profile)
+        @user = FactoryBot.create(:admin)
         @user.profile = profile
         sign_in @user
       end
@@ -41,8 +41,8 @@ describe MyAccountsController do
 
     describe "When logged in as Librarian" do
       before(:each) do
-        profile = FactoryGirl.create(:profile)
-        @user = FactoryGirl.create(:librarian)
+        profile = FactoryBot.create(:profile)
+        @user = FactoryBot.create(:librarian)
         @user.profile = profile
         sign_in @user
       end
@@ -55,8 +55,8 @@ describe MyAccountsController do
 
     describe "When logged in as User" do
       before(:each) do
-        profile = FactoryGirl.create(:profile)
-        @user = FactoryGirl.create(:user)
+        profile = FactoryBot.create(:profile)
+        @user = FactoryBot.create(:user)
         @user.profile = profile
         sign_in @user
       end
@@ -86,8 +86,8 @@ describe MyAccountsController do
 
     describe "When logged in as Administrator" do
       before(:each) do
-        profile = FactoryGirl.create(:profile)
-        @user = FactoryGirl.create(:admin, :password => 'password', :password_confirmation => 'password')
+        profile = FactoryBot.create(:profile)
+        @user = FactoryBot.create(:admin, :password => 'password', :password_confirmation => 'password')
         @user.profile = profile
         sign_in @user
       end
@@ -134,8 +134,8 @@ describe MyAccountsController do
 
     describe "When logged in as Librarian" do
       before(:each) do
-        profile = FactoryGirl.create(:profile)
-        @user = FactoryGirl.create(:librarian, :password => 'password', :password_confirmation => 'password')
+        profile = FactoryBot.create(:profile)
+        @user = FactoryBot.create(:librarian, :password => 'password', :password_confirmation => 'password')
         @user.profile = profile
         sign_in @user
       end
@@ -177,8 +177,8 @@ describe MyAccountsController do
 
     describe "When logged in as User" do
       before(:each) do
-        profile = FactoryGirl.create(:profile)
-        @user = FactoryGirl.create(:user, :password => 'password', :password_confirmation => 'password')
+        profile = FactoryBot.create(:profile)
+        @user = FactoryBot.create(:user, :password => 'password', :password_confirmation => 'password')
         @user.profile = profile
         sign_in @user
       end

data/spec/controllers/profiles_controller_spec.rb

@@ -71,7 +71,7 @@ describe ProfilesController do
         assigns(:profile).should eq(profiles(:admin))
       end
       it "assigns the another requested user as @profile" do
-        admin_profile = FactoryGirl.create :admin_profile
+        admin_profile = FactoryBot.create :admin_profile
         get :show, id: admin_profile.id
         expect(response).not_to be_forbidden
         expect(assigns(:profile)).to eq admin_profile
@@ -86,12 +86,12 @@ describe ProfilesController do
         assigns(:profile).should eq(profiles(:librarian1))
       end
       it "should not assign the requested user as @admin" do
-        admin = FactoryGirl.create(:admin_profile)
+        admin = FactoryBot.create(:admin_profile)
         get :show, id: admin.id
         response.should be_forbidden
       end
       it "should assign the requested user as @librarian" do
-        librarian = FactoryGirl.create(:librarian_profile)
+        librarian = FactoryBot.create(:librarian_profile)
         get :show, id: librarian.id
         response.should_not be_forbidden
         assigns(:profile).should eq librarian
@@ -170,7 +170,7 @@ describe ProfilesController do
       login_fixture_admin
 
       it "assigns the requested user as @profile" do
-        profile = FactoryGirl.create(:profile)
+        profile = FactoryBot.create(:profile)
         get :edit, id: profile.id
         assigns(:profile).should eq(profile)
       end
@@ -180,25 +180,25 @@ describe ProfilesController do
       login_fixture_librarian
 
       it "should assign the requested user as @profile" do
-        profile = FactoryGirl.create(:profile)
+        profile = FactoryBot.create(:profile)
         get :edit, id: profile.id
         assigns(:profile).should eq(profile)
       end
       it "should not get edit page for admin required user" do
-        admin = FactoryGirl.create(:admin_profile)
+        admin = FactoryBot.create(:admin_profile)
         get :edit, id: admin.id
         response.should be_forbidden
         #assigns(:profile).should_not eq(admin)
       end
       it "should get edit page for other librarian user" do
-        librarian = FactoryGirl.create(:librarian_profile)
+        librarian = FactoryBot.create(:librarian_profile)
         get :edit, id: librarian.id
         response.should_not be_forbidden
         assigns(:profile).should eq librarian
       end
 
       it "should get edit page for other librarian user" do
-        admin = FactoryGirl.create(:admin_profile, required_role_id: Role.where(name: 'Librarian').first.id)
+        admin = FactoryBot.create(:admin_profile, required_role_id: Role.where(name: 'Librarian').first.id)
         get :edit, id: admin.id
         response.should be_forbidden
         assigns(:profile).should eq admin
@@ -209,7 +209,7 @@ describe ProfilesController do
       login_fixture_user
 
       it "should not assign the requested user as @profile" do
-        profile = FactoryGirl.create(:profile)
+        profile = FactoryBot.create(:profile)
         get :edit, id: profile.id
         assigns(:profile).should eq(profile)
         response.should be_forbidden
@@ -223,7 +223,7 @@ describe ProfilesController do
 
     describe "When not logged in" do
       it "should not assign the requested user as @profile" do
-        profile = FactoryGirl.create(:profile)
+        profile = FactoryBot.create(:profile)
         get :edit, id: profile.id
         assigns(:profile).should eq(profile)
         response.should redirect_to(new_user_session_url)
@@ -233,7 +233,7 @@ describe ProfilesController do
 
   describe "POST create" do
     before(:each) do
-      @attrs = FactoryGirl.attributes_for(:profile)
+      @attrs = FactoryBot.attributes_for(:profile)
       @invalid_attrs = {:user_group_id => '', :user_number => '日本語'}
     end
 
@@ -551,7 +551,7 @@ describe ProfilesController do
       end
 
       it "should not be able to delete other librarian user" do
-        librarian = FactoryGirl.create(:librarian_profile)
+        librarian = FactoryBot.create(:librarian_profile)
         delete :destroy, id: librarian.id
         response.should be_forbidden
       end

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/migrate/20180102162311_add_header_logo_meta_to_library_group.rb

@@ -0,0 +1,5 @@
+class AddHeaderLogoMetaToLibraryGroup < ActiveRecord::Migration
+  def change
+    add_column :library_groups, :header_logo_meta, :text
+  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: 20160813203039) do
+ActiveRecord::Schema.define(version: 20180102162311) do
 
   create_table "accepts", force: :cascade do |t|
     t.integer  "basket_id"
@@ -592,7 +592,7 @@ ActiveRecord::Schema.define(version: 20160813203039) 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"
@@ -606,6 +606,12 @@ ActiveRecord::Schema.define(version: 20160813203039) 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"
+    t.text     "header_logo_meta"
   end
 
   add_index "library_groups", ["short_name"], name: "index_library_groups_on_short_name"

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}

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/factories/user_group.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :user_group do |f|
     f.sequence(:name){|n| "user_group_#{n}"}
   end

data/spec/fixtures/library_groups.yml

@@ -9,7 +9,6 @@ one:
     ::/0"
   url: "http://localhost:3000/"
   position: 1
-  login_banner: "*Next-L Enju*"
   admin_networks: "0.0.0.0/0\r\n\
     ::/0"
   user_id: 1

data/spec/models/profile_spec.rb

@@ -5,35 +5,35 @@ describe Profile do
   fixtures :all
 
   it 'should create a profile' do
-    FactoryGirl.create(:profile)
+    FactoryBot.create(:profile)
   end
 
   it 'should destroy a profile' do
-    profile = FactoryGirl.create(:profile)
+    profile = FactoryBot.create(:profile)
     profile.destroy.should be_truthy
   end
 
   it 'should not set expired_at if its user group does not have valid period' do
-    profile = FactoryGirl.create(:profile)
+    profile = FactoryBot.create(:profile)
     profile.expired_at.should be_nil
   end
 
   it 'should set expired_at if its user group has valid period' do
-    profile = FactoryGirl.build(:profile)
-    user_group = FactoryGirl.create(:user_group, :valid_period_for_new_user => 10)
+    profile = FactoryBot.build(:profile)
+    user_group = FactoryBot.create(:user_group, :valid_period_for_new_user => 10)
     user_group.profiles << profile
     profile.user_group.valid_period_for_new_user.should eq 10
     profile.expired_at.should eq 10.days.from_now.end_of_day
   end
 
   it "should create profile" do
-    profile = FactoryGirl.create(:profile)
+    profile = FactoryBot.create(:profile)
     assert !profile.new_record?, "#{profile.errors.full_messages.to_sentence}"
   end
 
   it "should create profile with empty user_number" do
-    profile1 = FactoryGirl.create(:profile, user_number: "")
-    profile2 = FactoryGirl.create(:profile, user_number: "")
+    profile1 = FactoryBot.create(:profile, user_number: "")
+    profile2 = FactoryBot.create(:profile, user_number: "")
     profile1.should be_valid
     profile2.should be_valid
   end

data/spec/models/user_spec.rb

@@ -6,42 +6,42 @@ describe User do
   fixtures :all
 
   it 'should create an user' do
-    FactoryGirl.create(:user)
+    FactoryBot.create(:user)
   end
 
   it 'should destroy an user' do
-    user = FactoryGirl.create(:user)
+    user = FactoryBot.create(:user)
     user.destroy.should be_truthy
   end
 
   it 'should respond to has_role(Administrator)' do
-    admin = FactoryGirl.create(:admin)
+    admin = FactoryBot.create(:admin)
     admin.has_role?('Administrator').should be_truthy
   end
 
   it 'should respond to has_role(Librarian)' do
-    librarian = FactoryGirl.create(:librarian)
+    librarian = FactoryBot.create(:librarian)
     librarian.has_role?('Administrator').should be_falsy
     librarian.has_role?('Librarian').should be_truthy
     librarian.has_role?('User').should be_truthy
   end
 
   it 'should respond to has_role(User)' do
-    user = FactoryGirl.create(:user)
+    user = FactoryBot.create(:user)
     user.has_role?('Administrator').should be_falsy
     user.has_role?('Librarian').should be_falsy
     user.has_role?('User').should be_truthy
   end
 
   it 'should lock an user' do
-    user = FactoryGirl.create(:user)
+    user = FactoryBot.create(:user)
     user.locked = '1'
     user.save
     user.active_for_authentication?.should be_falsy
   end
 
   it 'should unlock an user' do
-    user = FactoryGirl.create(:user)
+    user = FactoryBot.create(:user)
     user.lock_access!
     user.locked = '0'
     user.save
@@ -49,26 +49,26 @@ describe User do
   end
 
   it "should create user" do
-    user = FactoryGirl.create(:user)
+    user = FactoryBot.create(:user)
     assert !user.new_record?, "#{user.errors.full_messages.to_sentence}"
   end
 
   it "should require username" do
     old_count = User.count
-    user = FactoryGirl.build(:user, :username => nil)
+    user = FactoryBot.build(:user, :username => nil)
     user.save
     user.errors[:username].should be_truthy
     User.count.should eq old_count
   end
 
   it "should require password" do
-    user = FactoryGirl.build(:user, :password => nil)
+    user = FactoryBot.build(:user, :password => nil)
     user.save
     user.errors[:password].should be_truthy
   end
 
   it "should not require password_confirmation on create" do
-    user = FactoryGirl.build(:user, :password => 'new_password', :password_confirmation => nil)
+    user = FactoryBot.build(:user, :password => 'new_password', :password_confirmation => nil)
     user.save
     user.errors[:email].should be_empty
   end

data/spec/rails_helper.rb

@@ -7,7 +7,7 @@ require File.expand_path('../../spec/dummy/config/environment', __FILE__)
 abort("The Rails environment is running in production mode!") if Rails.env.production?
 require 'spec_helper'
 require 'rspec/rails'
-require 'factory_girl'
+require 'factory_bot'
 require 'rspec/active_model/mocks'
 require 'sunspot_matchers'
 require 'pundit/rspec'
@@ -69,5 +69,5 @@ RSpec.configure do |config|
   config.include SunspotMatchers
 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,21 +2,21 @@ 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[:librarian]
-      sign_in FactoryGirl.create(:librarian)
+      sign_in FactoryBot.create(:librarian)
     end
   end
 
   def login_user
     before(:each) do
       @request.env["devise.mapping"] = Devise.mappings[:user]
-      sign_in FactoryGirl.create(:user)
+      sign_in FactoryBot.create(:user)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_seed
 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: rails
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '4.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '4.4'
 - !ruby/object:Gem::Dependency
   name: pundit
   requirement: !ruby/object:Gem::Requirement
@@ -212,14 +212,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: simple_form
   requirement: !ruby/object:Gem::Requirement
@@ -333,7 +333,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: factory_girl_rails
+  name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -686,6 +686,11 @@ 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/migrate/20180102162311_add_header_logo_meta_to_library_group.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
@@ -740,7 +745,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_seed plugin
@@ -784,6 +789,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/20140810061942_add_user_id_to_user_checkout_stat.rb
 - spec/dummy/db/migrate/20140823095740_rename_manifestation_periodical_to_serial.rb
 - spec/dummy/db/migrate/20130416054135_add_circulation_status_id_to_item.rb
@@ -809,12 +815,14 @@ test_files:
 - 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/20081030023412_create_checkout_types.rb
+- spec/dummy/db/migrate/20171126133835_rename_login_banner_to_old_login_banner.rb
 - spec/dummy/db/migrate/20150106001709_create_demands.rb
 - spec/dummy/db/migrate/20121116031206_add_fulltext_content_to_manifestation.rb
 - spec/dummy/db/migrate/20140810091231_add_checkout_icalendar_token_to_profile.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/20160703190209_add_foreign_key_on_manifestation_id_to_reserve.rb
@@ -895,6 +903,7 @@ test_files:
 - spec/dummy/db/migrate/20140720170735_add_default_user_group_id_to_user_import_file.rb
 - spec/dummy/db/migrate/20090812151902_create_agent_relationship_types.rb
 - spec/dummy/db/migrate/20120415164821_add_attachment_meta_to_manifestation.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/20140528045518_create_user_checkout_stat_transitions.rb
@@ -909,6 +918,7 @@ test_files:
 - spec/dummy/db/migrate/20111124110059_create_create_types.rb
 - spec/dummy/db/migrate/129_create_item_has_use_restrictions.rb
 - spec/dummy/db/migrate/20120319120638_add_content_type_id_to_manifestation.rb
+- spec/dummy/db/migrate/20180102162311_add_header_logo_meta_to_library_group.rb
 - spec/dummy/db/migrate/20081027150907_create_picture_files.rb
 - spec/dummy/db/migrate/20100607044753_create_manifestation_relationship_types.rb
 - spec/dummy/db/migrate/20130421164124_add_series_master_to_series_statement.rb