enju_leaf 1.1.0.rc16 → 1.1.0.rc17

data/spec/fixtures/events.yml

@@ -3,48 +3,32 @@ event_00001:
   updated_at: 2008-01-13 02:54:43.764011 +09:00
   event_category_id: 1
   end_at: 2008-01-14 02:54:00 +09:00
-  name: !binary |
-    5LuV5LqL5aeL44KB
-
-  display_name: !binary |
-    5LuV5LqL5aeL44KB
-
+  name: 仕事始め
+  display_name: 仕事始め
   deleted_at: 
   start_at: 2008-01-13 02:54:00 +09:00
   id: 1
-  note: !binary |
-    44Gq44KT44Go44GL44GL44KT44Go44GL
-
+  note: なんとかかんとか
   library_id: 2
   created_at: 2008-01-01 16:20:54.372729 +09:00
 event_00002: 
   updated_at: 2008-01-13 02:54:21.134175 +09:00
   event_category_id: 2
   end_at: 2008-01-14 02:54:00 +09:00
-  name: !binary |
-    44OG44K544OI
-
-  display_name: !binary |
-    44OG44K544OI
-
+  name: テスト
+  display_name: テスト
   deleted_at: 
   start_at: 2008-01-13 02:54:00 +09:00
   id: 2
-  note: !binary |
-    44OG44K544OI55So44Gu44Kk44OZ44Oz44OI44Gn44GZ44CC
-
+  note: テスト用のイベントです。
   library_id: 2
   created_at: 2008-01-01 20:54:25.803201 +09:00
 event_00003: 
   updated_at: 2008-02-05 20:00:35.319131 +09:00
   event_category_id: 1
   end_at: 2008-02-05 00:00:00 +09:00
-  name: !binary |
-    44Of44O844OG44Kj44Oz44Kw
-
-  display_name: !binary |
-    44Of44O844OG44Kj44Oz44Kw
-
+  name: ミーティング
+  display_name: ミーティング
   deleted_at: 
   start_at: 2008-01-13 00:00:00 +09:00
   id: 3
@@ -55,18 +39,12 @@ event_00004:
   updated_at: 2008-02-05 15:43:42.617670 +09:00
   event_category_id: 4
   end_at: 2008-02-06 00:00:00 +09:00
-  name: !binary |
-    44OG44K544OI
-
-  display_name: !binary |
-    44OG44K544OI
-
+  name: テスト
+  display_name: テスト
   deleted_at: 
   start_at: 2008-02-05 00:00:00 +09:00
   id: 4
-  note: !binary |
-    44Gq44KT44Go44GL44GL44KT44Go44GL
-
+  note: なんとかかんとか
   library_id: 3
   created_at: 2008-02-05 15:43:42.617670 +09:00
 event_00005: 
@@ -85,12 +63,8 @@ event_00006:
   updated_at: 2008-02-05 23:52:06.315285 +09:00
   event_category_id: 2
   end_at: 2008-02-08 00:00:00 +09:00
-  name: !binary |
-    44Gq44KT44Go44GL44GL44KT44Go44GL
-
-  display_name: !binary |
-    44Gq44KT44Go44GL44GL44KT44Go44GL
-
+  name: なんとかかんとか
+  display_name: なんとかかんとか
   deleted_at: 
   start_at: 2008-02-05 00:00:00 +09:00
   id: 6

data/spec/models/user_import_file_spec.rb

@@ -13,24 +13,35 @@ describe UserImportFile do
       @file.save
     end
 
-    it "should be imported" do
+    it "should be imported", solr: true do
       old_users_count = User.count
       old_import_results_count = UserImportResult.count
+      old_profiles_solr_count = Profile.search.total
       @file.current_state.should eq 'pending'
       @file.import_start.should eq({:user_imported => 5, :user_found => 0, :failed => 0})
       User.order('id DESC')[1].username.should eq 'user005'
       User.order('id DESC')[2].username.should eq 'user003'
       User.count.should eq old_users_count + 5
+      Profile.search.total.should eq old_profiles_solr_count + 5
 
-      user002 = User.where(:username => 'user002').first
+      user001 = User.where(username: 'user001').first
+      user001.profile.keyword_list.should eq "日本史\n地理"
+      user001.profile.full_name.should eq '田辺 浩介'
+      user001.profile.full_name_transcription.should eq 'たなべ こうすけ'
+      user001.profile.required_role.name.should eq 'User'
+      user001.locked_at.should be_truthy
+
+      user002 = User.where(username: 'user002').first
       user002.profile.user_group.name.should eq 'faculty'
       user002.profile.expired_at.to_i.should eq Time.zone.parse('2013-12-01').end_of_day.to_i
       user002.valid_password?('4NsxXPLy')
       user002.profile.user_number.should eq '001002'
       user002.profile.library.name.should eq 'hachioji'
       user002.profile.locale.should eq 'en'
+      user002.profile.required_role.name.should eq 'Librarian'
+      user002.locked_at.should be_nil
 
-      user003 = User.where(:username => 'user003').first
+      user003 = User.where(username: 'user003').first
       user003.profile.note.should eq 'テストユーザ'
       user003.role.name.should eq 'Librarian'
       user003.profile.user_number.should eq '001003'
@@ -40,17 +51,17 @@ describe UserImportFile do
       user003.profile.save_checkout_history.should be_truthy
       user003.profile.save_search_history.should be_falsy
       user003.profile.share_bookmarks.should be_falsy
-      User.where(:username => 'user000').first.should be_nil
+      User.where(username: 'user000').first.should be_nil
       UserImportResult.count.should eq old_import_results_count + 6
 
-      user005 = User.where(:username => 'user005').first
+      user005 = User.where(username: 'user005').first
       user005.role.name.should eq 'User'
       user005.profile.library.name.should eq 'hachioji'
       user005.profile.locale.should eq 'en'
       user005.profile.user_number.should eq '001005'
       user005.profile.user_group.name.should eq 'faculty'
 
-      user006 = User.where(:username => 'user006').first
+      user006 = User.where(username: 'user006').first
       user006.role.name.should eq 'User'
       user006.profile.library.name.should eq 'hachioji'
       user006.profile.locale.should eq 'en'

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

@@ -1,8 +1,7 @@
 /*!
-	Colorbox v1.5.13 - 2014-08-04
-	jQuery lightbox and modal window plugin
-	(c) 2014 Jack Moore - http://www.jacklmoore.com/colorbox
-	license: http://www.opensource.org/licenses/mit-license.php
+	Colorbox 1.5.14
+	license: MIT
+	http://www.jacklmoore.com/colorbox
 */
 (function ($, document, window) {
 	var
@@ -435,7 +434,7 @@
 	// Colorbox's markup needs to be added to the DOM prior to being called
 	// so that the browser will go ahead and load the CSS background images.
 	function appendHTML() {
-		if (!$box && document.body) {
+		if (!$box) {
 			init = false;
 			$window = $(window);
 			$box = $tag(div).attr({
@@ -479,7 +478,8 @@
 			$loadingBay = $tag(div, false, 'position:absolute; width:9999px; visibility:hidden; display:none; max-width:none;');
 			
 			$groupControls = $next.add($prev).add($current).add($slideshow);
-
+		}
+		if (document.body && !$box.parent().length) {
 			$(document.body).append($overlay, $box.append($wrap, $loadingBay));
 		}
 	}

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

@@ -1,5 +1,5 @@
 /*!
- * jQuery Cookie Plugin v1.3.1
+ * jQuery Cookie Plugin v1.4.1
  * https://github.com/carhartl/jquery-cookie
  *
  * Copyright 2013 Klaus Hartl
@@ -7,53 +7,65 @@
  */
 (function (factory) {
 	if (typeof define === 'function' && define.amd) {
-		// AMD. Register as anonymous module.
+		// AMD
 		define(['jquery'], factory);
+	} else if (typeof exports === 'object') {
+		// CommonJS
+		factory(require('jquery'));
 	} else {
-		// Browser globals.
+		// Browser globals
 		factory(jQuery);
 	}
 }(function ($) {
 
 	var pluses = /\+/g;
 
+	function encode(s) {
+		return config.raw ? s : encodeURIComponent(s);
+	}
+
 	function decode(s) {
-		if (config.raw) {
-			return s;
-		}
-		return decodeURIComponent(s.replace(pluses, ' '));
+		return config.raw ? s : decodeURIComponent(s);
 	}
 
-	function decodeAndParse(s) {
+	function stringifyCookieValue(value) {
+		return encode(config.json ? JSON.stringify(value) : String(value));
+	}
+
+	function parseCookieValue(s) {
 		if (s.indexOf('"') === 0) {
 			// This is a quoted cookie as according to RFC2068, unescape...
 			s = s.slice(1, -1).replace(/\\"/g, '"').replace(/\\\\/g, '\\');
 		}
 
-		s = decode(s);
-
 		try {
+			// Replace server-side written pluses with spaces.
+			// If we can't decode the cookie, ignore it, it's unusable.
+			// If we can't parse the cookie, ignore it, it's unusable.
+			s = decodeURIComponent(s.replace(pluses, ' '));
 			return config.json ? JSON.parse(s) : s;
 		} catch(e) {}
 	}
 
+	function read(s, converter) {
+		var value = config.raw ? s : parseCookieValue(s);
+		return $.isFunction(converter) ? converter(value) : value;
+	}
+
 	var config = $.cookie = function (key, value, options) {
 
 		// Write
-		if (value !== undefined) {
+
+		if (value !== undefined && !$.isFunction(value)) {
 			options = $.extend({}, config.defaults, options);
 
 			if (typeof options.expires === 'number') {
 				var days = options.expires, t = options.expires = new Date();
-				t.setDate(t.getDate() + days);
+				t.setTime(+t + days * 864e+5);
 			}
 
-			value = config.json ? JSON.stringify(value) : String(value);
-
 			return (document.cookie = [
-				config.raw ? key : encodeURIComponent(key),
-				'=',
-				config.raw ? value : encodeURIComponent(value),
+				encode(key), '=', stringifyCookieValue(value),
 				options.expires ? '; expires=' + options.expires.toUTCString() : '', // use expires attribute, max-age is not supported by IE
 				options.path    ? '; path=' + options.path : '',
 				options.domain  ? '; domain=' + options.domain : '',
@@ -62,20 +74,28 @@
 		}
 
 		// Read
-		var cookies = document.cookie.split('; ');
+
 		var result = key ? undefined : {};
+
+		// To prevent the for loop in the first place assign an empty array
+		// in case there are no cookies at all. Also prevents odd result when
+		// calling $.cookie().
+		var cookies = document.cookie ? document.cookie.split('; ') : [];
+
 		for (var i = 0, l = cookies.length; i < l; i++) {
 			var parts = cookies[i].split('=');
 			var name = decode(parts.shift());
 			var cookie = parts.join('=');
 
 			if (key && key === name) {
-				result = decodeAndParse(cookie);
+				// If second argument (value) is a function it's a converter...
+				result = read(cookie, value);
 				break;
 			}
 
-			if (!key) {
-				result[name] = decodeAndParse(cookie);
+			// Prevent storing a cookie that we couldn't decode.
+			if (!key && (cookie = read(cookie)) !== undefined) {
+				result[name] = cookie;
 			}
 		}
 
@@ -85,12 +105,13 @@
 	config.defaults = {};
 
 	$.removeCookie = function (key, options) {
-		if ($.cookie(key) !== undefined) {
-			// Must not alter options, thus extending a fresh object...
-			$.cookie(key, '', $.extend({}, options, { expires: -1 }));
-			return true;
+		if ($.cookie(key) === undefined) {
+			return false;
 		}
-		return false;
+
+		// Must not alter options, thus extending a fresh object...
+		$.cookie(key, '', $.extend({}, options, { expires: -1 }));
+		return !$.cookie(key);
 	};
 
 }));