enju_leaf 1.2.2 → 1.3.0.beta.2

data/spec/factories/agent.rb

@@ -1,7 +1,7 @@
 FactoryBot.define do
   factory :agent do |f|
     f.sequence(:full_name){|n| "full_name_#{n}"}
-    f.agent_type_id{AgentType.find_by_name('Person').id}
+    f.agent_type_id{AgentType.find_by(name: 'Person').id}
     f.country_id{Country.first.id}
     f.language_id{Language.first.id}
   end

data/spec/factories/create_types.rb

@@ -2,8 +2,8 @@
 
 FactoryBot.define do
   factory :create_type do
-    name "MyString"
-    display_name "MyText"
-    note "MyText"
+    name { "MyString" }
+    display_name { "MyText" }
+    note { "MyText" }
   end
 end

data/spec/factories/produce_types.rb

@@ -2,8 +2,8 @@
 
 FactoryBot.define do
   factory :produce_type do
-    name "MyString"
-    display_name "MyText"
-    note "MyText"
+    name { "MyString" }
+    display_name { "MyText" }
+    note { "MyText" }
   end
 end

data/spec/factories/profile.rb

@@ -1,15 +1,15 @@
 FactoryBot.define do
-  factory :profile, :class => Profile do |f|
+  factory :profile, class: Profile do |f|
     f.user_group_id {UserGroup.first.id}
     f.required_role_id {Role.where(name: 'User').first.id}
     f.sequence(:user_number){|n| "user_number_#{n}"}
-    f.library_id 2
-    f.locale "ja"
-    factory :librarian_profile, :class => Profile do |profile|
+    f.library_id { 2 }
+    f.locale { "ja" }
+    factory :librarian_profile, class: Profile do |profile|
       profile.required_role_id {Role.where(name: 'Librarian').first.id}
       profile.association :user, factory: :librarian
     end
-    factory :admin_profile, :class => Profile do |profile|
+    factory :admin_profile, class: Profile do |profile|
       profile.required_role_id {Role.where(name: 'Administrator').first.id}
       profile.association :user, factory: :admin
     end

data/spec/factories/realize_types.rb

@@ -2,8 +2,8 @@
 
 FactoryBot.define do
   factory :realize_type do
-    name "MyString"
-    display_name "MyText"
-    note "MyText"
+    name { "MyString" }
+    display_name { "MyText" }
+    note { "MyText" }
   end
 end

data/spec/factories/subscribe.rb

@@ -2,7 +2,7 @@ FactoryBot.define do
   factory :subscribe do |f|
     f.subscription_id{FactoryBot.create(:subscription).id}
     f.work_id{FactoryBot.create(:manifestation).id}
-    f.start_at 1.year.ago
-    f.end_at 1.year.from_now
+    f.start_at { 1.year.ago }
+    f.end_at { 1.year.from_now }
   end
 end

data/spec/factories/user.rb

@@ -2,11 +2,11 @@ FactoryBot.define do
   factory :admin, class: User do |f|
     f.sequence(:username){|n| "admin_#{n}"}
     f.sequence(:email){|n| "admin_#{n}@example.jp"}
-    f.password 'adminpassword'
-    f.password_confirmation 'adminpassword'
+    f.password { 'adminpassword' }
+    f.password_confirmation { 'adminpassword' }
     f.after(:create) do |user|
       user_has_role = UserHasRole.new
-      user_has_role.assign_attributes({user_id: user.id, role_id: Role.find_by_name('Administrator').id})
+      user_has_role.assign_attributes({user_id: user.id, role_id: Role.find_by(name: 'Administrator').id})
       user_has_role.save
       user.reload
     end
@@ -15,11 +15,11 @@ FactoryBot.define do
   factory :librarian, class: User do |f|
     f.sequence(:username){|n| "librarian_#{n}"}
     f.sequence(:email){|n| "librarian_#{n}@example.jp"}
-    f.password 'librarianpassword'
-    f.password_confirmation 'librarianpassword'
+    f.password { 'librarianpassword' }
+    f.password_confirmation { 'librarianpassword' }
     f.after(:create) do |user|
       user_has_role = UserHasRole.new
-      user_has_role.assign_attributes({user_id: user.id, role_id: Role.find_by_name('Librarian').id})
+      user_has_role.assign_attributes({user_id: user.id, role_id: Role.find_by(name: 'Librarian').id})
       user_has_role.save
       user.reload
     end
@@ -28,11 +28,11 @@ FactoryBot.define do
   factory :user, class: User do |f|
     f.sequence(:username){|n| "user_#{n}"}
     f.sequence(:email){|n| "user_#{n}@example.jp"}
-    f.password 'userpassword'
-    f.password_confirmation 'userpassword'
+    f.password { 'userpassword' }
+    f.password_confirmation { 'userpassword' }
     f.after(:create) do |user|
       user_has_role = UserHasRole.new
-      user_has_role.assign_attributes({user_id: user.id, role_id: Role.find_by_name('User').id})
+      user_has_role.assign_attributes({user_id: user.id, role_id: Role.find_by(name: 'User').id})
       user_has_role.save
       user.reload
     end

data/spec/factories/user_checkout_stat.rb

@@ -1,6 +1,6 @@
 FactoryBot.define do
   factory :user_checkout_stat do |f|
-    f.start_date 1.week.ago
-    f.end_date 1.day.ago
+    f.start_date { 1.week.ago }
+    f.end_date { 1.day.ago }
   end
 end

data/vendor/assets/javascripts/jquery.colorbox.js

@@ -1,5 +1,5 @@
 /*!
-	Colorbox 1.6.3
+	Colorbox 1.6.4
 	license: MIT
 	http://www.jacklmoore.com/colorbox
 */
@@ -155,7 +155,7 @@
 	$prev,
 	$close,
 	$groupControls,
-	$events = $('<a/>'), // $({}) would be prefered, but there is an issue with jQuery 1.4.2
+	$events = $('<a/>'), // $({}) would be preferred, but there is an issue with jQuery 1.4.2
 
 	// Variables for cached values or use across multiple functions
 	settings,
@@ -484,7 +484,7 @@
 				$current = $tag(div, "Current"),
 				$prev = $('<button type="button"/>').attr({id:prefix+'Previous'}),
 				$next = $('<button type="button"/>').attr({id:prefix+'Next'}),
-				$slideshow = $tag('button', "Slideshow"),
+				$slideshow = $('<button type="button"/>').attr({id:prefix+'Slideshow'}),
 				$loadingOverlay
 			);
 
@@ -950,7 +950,7 @@
 		}, 100);
 
 		if (settings.get('inline')) {
-			var $target = $(href);
+			var $target = $(href).eq(0);
 			// Inserts an empty placeholder where inline content is being pulled from.
 			// An event is bound to put inline content back when Colorbox closes or loads new content.
 			$inline = $('<div>').hide().insertBefore($target);
@@ -982,7 +982,7 @@
 					return;
 				}
 
-				// A small pause because some browsers will occassionaly report a
+				// A small pause because some browsers will occasionally report a
 				// img.width and img.height of zero immediately after the img.onload fires
 				setTimeout(function(){
 					var percent;