enju_leaf 1.1.0.rc7 → 1.1.0.rc8

data/spec/controllers/user_import_results_controller_spec.rb

@@ -0,0 +1,137 @@
+# -*- encoding: utf-8 -*-
+require 'spec_helper'
+
+describe UserImportResultsController do
+  fixtures :all
+
+  describe "GET index" do
+    describe "When logged in as Administrator" do
+      login_admin
+
+      it "assigns all user_import_results as @user_import_results" do
+        get :index
+        assigns(:user_import_results).should eq(UserImportResult.page(1))
+      end
+    end
+
+    describe "When logged in as Librarian" do
+      login_librarian
+
+      it "assigns all user_import_results as @user_import_results" do
+        get :index
+        assigns(:user_import_results).should eq(UserImportResult.page(1))
+      end
+    end
+
+    describe "When logged in as User" do
+      login_user
+
+      it "assigns empty as @user_import_results" do
+        get :index
+        assigns(:user_import_results).should be_empty
+        response.should be_forbidden
+      end
+    end
+
+    describe "When not logged in" do
+      it "assigns empty as @user_import_results" do
+        get :index
+        assigns(:user_import_results).should be_empty
+        response.should redirect_to(new_user_session_url)
+      end
+    end
+  end
+
+  describe "GET show" do
+    describe "When logged in as Administrator" do
+      login_admin
+
+      it "assigns the requested user_import_result as @user_import_result" do
+        get :show, :id => 1
+        assigns(:user_import_result).should eq(UserImportResult.find(1))
+      end
+    end
+
+    describe "When logged in as Librarian" do
+      login_librarian
+
+      it "assigns the requested user_import_result as @user_import_result" do
+        get :show, :id => 1
+        assigns(:user_import_result).should eq(UserImportResult.find(1))
+      end
+    end
+
+    describe "When logged in as User" do
+      login_user
+
+      it "assigns the requested user_import_result as @user_import_result" do
+        get :show, :id => 1
+        assigns(:user_import_result).should eq(UserImportResult.find(1))
+      end
+    end
+
+    describe "When not logged in" do
+      it "assigns the requested user_import_result as @user_import_result" do
+        get :show, :id => 1
+        assigns(:user_import_result).should eq(UserImportResult.find(1))
+        response.should redirect_to(new_user_session_url)
+      end
+    end
+  end
+
+  describe "DELETE destroy" do
+    before(:each) do
+      @user_import_result = user_import_results(:one)
+    end
+
+    describe "When logged in as Administrator" do
+      login_admin
+
+      it "destroys the requested user_import_result" do
+        delete :destroy, :id => @user_import_result.id
+      end
+
+      it "should be forbidden" do
+        delete :destroy, :id => @user_import_result.id
+        response.should be_forbidden
+      end
+    end
+
+    describe "When logged in as Librarian" do
+      login_librarian
+
+      it "destroys the requested user_import_result" do
+        delete :destroy, :id => @user_import_result.id
+      end
+
+      it "should be forbidden" do
+        delete :destroy, :id => @user_import_result.id
+        response.should be_forbidden
+      end
+    end
+
+    describe "When logged in as User" do
+      login_user
+
+      it "destroys the requested user_import_result" do
+        delete :destroy, :id => @user_import_result.id
+      end
+
+      it "should be forbidden" do
+        delete :destroy, :id => @user_import_result.id
+        response.should be_forbidden
+      end
+    end
+
+    describe "When not logged in" do
+      it "destroys the requested user_import_result" do
+        delete :destroy, :id => @user_import_result.id
+      end
+
+      it "should be forbidden" do
+        delete :destroy, :id => @user_import_result.id
+        response.should redirect_to(new_user_session_url)
+      end
+    end
+  end
+end

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20130221154434) do
+ActiveRecord::Schema.define(:version => 20140110131010) do
 
   create_table "accepts", :force => true do |t|
     t.integer  "basket_id"
@@ -767,6 +767,30 @@ ActiveRecord::Schema.define(:version => 20130221154434) do
   add_index "user_has_roles", ["role_id"], :name => "index_user_has_roles_on_role_id"
   add_index "user_has_roles", ["user_id"], :name => "index_user_has_roles_on_user_id"
 
+  create_table "user_import_files", :force => true do |t|
+    t.integer  "user_id"
+    t.text     "note"
+    t.datetime "executed_at"
+    t.string   "state"
+    t.string   "user_import_file_name"
+    t.string   "user_import_content_type"
+    t.string   "user_import_file_size"
+    t.datetime "user_import_updated_at"
+    t.string   "user_import_fingerprint"
+    t.string   "edit_mode"
+    t.text     "error_message"
+    t.datetime "created_at",               :null => false
+    t.datetime "updated_at",               :null => false
+  end
+
+  create_table "user_import_results", :force => true do |t|
+    t.integer  "user_import_file_id"
+    t.integer  "user_id"
+    t.text     "body"
+    t.datetime "created_at",          :null => false
+    t.datetime "updated_at",          :null => false
+  end
+
   create_table "users", :force => true do |t|
     t.string   "email",                  :default => "", :null => false
     t.string   "encrypted_password",     :default => "", :null => false

data/spec/dummy/private/system/user_import_files/user_imports/980/190/963/original/user_delete_file.tsv

@@ -0,0 +1,4 @@
+username	email	role	user_group	expired_at	note
+user001	user001@example.jp	Administrator			test
+user002		User		2013-12-01	
+user003	user003@example.jp	Librarian			テストユーザ

data/spec/dummy/private/system/user_import_files/user_imports/980/190/963/original/user_import_file_sample.tsv

@@ -0,0 +1,5 @@
+username	email	user_number	role	user_group	expired_at	password	note	dummy
+user001	user001@example.jp	001001	Administrator	user			test	
+user002		001002	User	faculty	2013-12-01			
+user003	user003@example.jp	001003	Librarian	user		4NsxXPLy	テストユーザ	
+user004		001004		user				t

data/spec/dummy/private/system/user_import_files/user_imports/980/190/963/original/user_update_file.tsv

@@ -0,0 +1,4 @@
+username	email	role	user_group	expired_at	note
+user001	user001@example.jp	Administrator			test
+user002		User		2013-12-01	
+user003	user003@example.jp	Librarian			テストユーザ

data/spec/dummy/private/system/user_import_files/user_imports/980/190/964/original/user_delete_file.tsv

@@ -0,0 +1,4 @@
+username	email	role	user_group	expired_at	note
+user001	user001@example.jp	Administrator			test
+user002		User		2013-12-01	
+user003	user003@example.jp	Librarian			テストユーザ

data/spec/fixtures/user_import_files.yml

@@ -0,0 +1,27 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+one:
+  user_id: 1
+  note: MyText
+  executed_at: 2014-01-10 21:22:16
+  state: pending
+  user_import_file_name: MyString
+  user_import_content_type: text/csv
+  user_import_file_size: 1
+  user_import_updated_at: 2014-01-10 21:22:16
+  user_import_fingerprint: MyString
+  edit_mode: MyString
+  error_message: MyText
+
+two:
+  user_id: 1
+  note: MyText
+  executed_at: 2014-01-10 21:22:16
+  state: pending
+  user_import_file_name: MyString
+  user_import_content_type: text/csv
+  user_import_file_size: 1
+  user_import_updated_at: 2014-01-10 21:22:16
+  user_import_fingerprint: MyString
+  edit_mode: MyString
+  error_message: MyText

data/spec/fixtures/user_import_results.yml

@@ -0,0 +1,13 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+one:
+  id: 1
+  user_import_file_id: 1
+  user_id: 1
+  body: MyText
+
+two:
+  id: 2
+  user_import_file_id: 1
+  user_id: 2
+  body: MyText

data/spec/models/user_import_file_spec.rb

@@ -0,0 +1,64 @@
+# -*- encoding: utf-8 -*-
+require 'spec_helper'
+
+describe UserImportFile do
+  fixtures :all
+
+  describe "when its mode is 'create'" do
+    before(:each) do
+      @file = UserImportFile.new :user_import => File.new("#{Rails.root.to_s}/../../examples/user_import_file_sample.tsv")
+      @file.user = users(:admin)
+      @file.save
+    end
+
+    it "should be imported" do
+      old_users_count = User.count
+      old_import_results_count = UserImportResult.count
+      @file.state.should eq 'pending'
+      @file.import_start.should eq({:user_imported => 3, :user_found => 0, :failed => 0})
+      User.order('id DESC')[1].username.should eq 'user002'
+      User.order('id DESC')[2].username.should eq 'user001'
+      User.count.should eq old_users_count + 3
+
+      user002 = User.where(:username => 'user002').first
+      user002.user_number.should eq '001002'
+      user002.user_group.name.should eq 'faculty'
+      user002.expired_at.to_i.should eq Time.zone.parse('2013-12-01').end_of_day.to_i
+      user002.valid_password?('4NsxXPLy')
+
+      user003 = User.where(:username => 'user003').first
+      user002.user_number.should eq '001002'
+      user003.note.should eq 'テストユーザ'
+      user003.role.name.should eq 'Librarian'
+      user003.user_number.should eq '001003'
+      User.where(:username => 'user000').first.should be_nil
+      UserImportResult.count.should eq old_import_results_count + 4
+
+      @file.user_import_fingerprint.should be_true
+      @file.executed_at.should be_true
+    end
+  end
+
+  describe "when its mode is 'update'" do
+    it "should update users" do
+      @file = UserImportFile.create :user_import => File.new("#{Rails.root.to_s}/../../examples/user_update_file.tsv")
+      @file.modify
+    end
+  end
+
+  describe "when its mode is 'destroy'" do
+    before(:each) do
+      @file = UserImportFile.new :user_import => File.new("#{Rails.root.to_s}/../../examples/user_import_file_sample.tsv")
+      @file.user = users(:admin)
+      @file.save
+      @file.import_start
+    end
+
+    it "should remove users" do
+      old_count = User.count
+      @file = UserImportFile.create :user_import => File.new("#{Rails.root.to_s}/../../examples/user_delete_file.tsv")
+      @file.remove
+      User.count.should eq old_count - 3
+    end
+  end
+end

data/spec/models/user_import_result_spec.rb

@@ -0,0 +1,7 @@
+# -*- encoding: utf-8 -*-
+require 'spec_helper'
+
+describe UserImportResult do
+  #pending "add some examples to (or delete) #{__FILE__}"
+
+end

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

@@ -1,7 +1,7 @@
 /*!
-	Colorbox v1.4.33 - 2013-10-31
+	Colorbox v1.5.4 - 2014-03-07
 	jQuery lightbox and modal window plugin
-	(c) 2013 Jack Moore - http://www.jacklmoore.com/colorbox
+	(c) 2014 Jack Moore - http://www.jacklmoore.com/colorbox
 	license: http://www.opensource.org/licenses/mit-license.php
 */
 (function ($, document, window) {
@@ -29,9 +29,6 @@
 		maxHeight: false,
 		scalePhotos: true,
 		scrolling: true,
-		href: false,
-		title: false,
-		rel: false,
 		opacity: 0.9,
 		preloading: true,
 		className: false,
@@ -54,7 +51,7 @@
 		slideshowSpeed: 2500,
 		slideshowStart: "start slideshow",
 		slideshowStop: "stop slideshow",
-		photoRegex: /\.(gif|png|jp(e|g|eg)|bmp|ico|webp)((#|\?).*)?$/i,
+		photoRegex: /\.(gif|png|jp(e|g|eg)|bmp|ico|webp|jxr|svg)((#|\?).*)?$/i,
 
 		// alternate image paths for high-res displays
 		retinaImage: false,
@@ -78,9 +75,21 @@
 		onLoad: false,
 		onComplete: false,
 		onCleanup: false,
-		onClosed: false
+		onClosed: false,
+
+		rel: function() {
+			return this.rel;
+		},
+		href: function() {
+			// Using .attr() so that the href can also be used to provide a selector for inline content
+			return $(this).attr('href');
+		},
+		title: function() {
+			return this.title;
+		}
 	},
-	
+
+
 	// Abstracting the HTML and event identifiers for easy rebranding
 	colorbox = 'colorbox',
 	prefix = 'cbox',
@@ -115,7 +124,7 @@
 	$prev,
 	$close,
 	$groupControls,
-	$events = $('<a/>'), // $([]) would be prefered, but there is an issue with jQuery 1.4.2
+	$events = $('<a/>'), // $({}) would be prefered, but there is an issue with jQuery 1.4.2
 	
 	// Variables for cached values or use across multiple functions
 	settings,
@@ -123,7 +132,6 @@
 	interfaceWidth,
 	loadedHeight,
 	loadedWidth,
-	element,
 	index,
 	photo,
 	open,
@@ -132,7 +140,6 @@
 	loadingTimer,
 	publicMethod,
 	div = "div",
-	className,
 	requests = 0,
 	previousCSS = {},
 	init;
@@ -162,6 +169,38 @@
 		return window.innerHeight ? window.innerHeight : $(window).height();
 	}
 
+	function Settings(element, options) {
+		if (options !== Object(options)) {
+			options = {};
+		}
+
+		this.cache = {};
+		this.el = element;
+
+		this.value = function(key) {
+			var dataAttr;
+
+			if (this.cache[key] === undefined) {
+				dataAttr = $(this.el).attr('data-cbox-'+key);
+
+				if (dataAttr !== undefined) {
+					this.cache[key] = dataAttr;
+				} else if (options[key] !== undefined) {
+					this.cache[key] = options[key];
+				} else if (defaults[key] !== undefined) {
+					this.cache[key] = defaults[key];
+				}
+			}
+
+			return this.cache[key];
+		};
+
+		this.get = function(key) {
+			var value = this.value(key);
+			return $.isFunction(value) ? value.call(this.el, this) : value;
+		};
+	}
+
 	// Determine the next and previous members in a group.
 	function getIndex(increment) {
 		var
@@ -179,62 +218,55 @@
 	// Checks an href to see if it is a photo.
 	// There is a force photo option (photo: true) for hrefs that cannot be matched by the regex.
 	function isImage(settings, url) {
-		return settings.photo || settings.photoRegex.test(url);
+		return settings.get('photo') || settings.get('photoRegex').test(url);
 	}
 
 	function retinaUrl(settings, url) {
-		return settings.retinaUrl && window.devicePixelRatio > 1 ? url.replace(settings.photoRegex, settings.retinaSuffix) : url;
+		return settings.get('retinaUrl') && window.devicePixelRatio > 1 ? url.replace(settings.get('photoRegex'), settings.get('retinaSuffix')) : url;
 	}
 
 	function trapFocus(e) {
-		if ('contains' in $box[0] && !$box[0].contains(e.target)) {
+		if ('contains' in $box[0] && !$box[0].contains(e.target) && e.target !== $overlay[0]) {
 			e.stopPropagation();
 			$box.focus();
 		}
 	}
 
-	// Assigns function results to their respective properties
-	function makeSettings() {
-		var i,
-			data = $.data(element, colorbox);
-		
-		if (data == null) {
-			settings = $.extend({}, defaults);
-			if (console && console.log) {
-				console.log('Error: cboxElement missing settings object');
-			}
-		} else {
-			settings = $.extend({}, data);
+	function setClass(str) {
+		if (setClass.str !== str) {
+			$box.add($overlay).removeClass(setClass.str).addClass(str);
+			setClass.str = str;
 		}
+	}
+
+	function getRelated() {
+		index = 0;
 		
-		for (i in settings) {
-			if ($.isFunction(settings[i]) && i.slice(0, 2) !== 'on') { // checks to make sure the function isn't one of the callbacks, they will be handled at the appropriate time.
-				settings[i] = settings[i].call(element);
+		if (rel && rel !== 'nofollow') {
+			$related = $('.' + boxElement).filter(function () {
+				var options = $.data(this, colorbox);
+				var settings = new Settings(this, options);
+				return (settings.get('rel') === rel);
+			});
+			index = $related.index(settings.el);
+			
+			// Check direct calls to Colorbox.
+			if (index === -1) {
+				$related = $related.add(settings.el);
+				index = $related.length - 1;
 			}
-		}
-		
-		settings.rel = settings.rel || element.rel || $(element).data('rel') || 'nofollow';
-		settings.href = settings.href || $(element).attr('href');
-		settings.title = settings.title || element.title;
-		
-		if (typeof settings.href === "string") {
-			settings.href = $.trim(settings.href);
+		} else {
+			$related = $(settings.el);
 		}
 	}
 
-	function trigger(event, callback) {
+	function trigger(event) {
 		// for external use
 		$(document).trigger(event);
-
 		// for internal use
 		$events.triggerHandler(event);
-
-		if ($.isFunction(callback)) {
-			callback.call(element);
-		}
 	}
 
-
 	var slideshow = (function(){
 		var active,
 			className = prefix + "Slideshow_",
@@ -246,15 +278,15 @@
 		}
 
 		function set() {
-			if (settings.loop || $related[index + 1]) {
+			if (settings.get('loop') || $related[index + 1]) {
 				clear();
-				timeOut = setTimeout(publicMethod.next, settings.slideshowSpeed);
+				timeOut = setTimeout(publicMethod.next, settings.get('slideshowSpeed'));
 			}
 		}
 
 		function start() {
 			$slideshow
-				.html(settings.slideshowStop)
+				.html(settings.get('slideshowStop'))
 				.unbind(click)
 				.one(click, stop);
 
@@ -273,7 +305,7 @@
 				.unbind(event_load, clear);
 
 			$slideshow
-				.html(settings.slideshowStart)
+				.html(settings.get('slideshowStart'))
 				.unbind(click)
 				.one(click, function () {
 					publicMethod.next();
@@ -295,15 +327,15 @@
 
 		return function(){
 			if (active) {
-				if (!settings.slideshow) {
+				if (!settings.get('slideshow')) {
 					$events.unbind(event_cleanup, reset);
 					reset();
 				}
 			} else {
-				if (settings.slideshow && $related[1]) {
+				if (settings.get('slideshow') && $related[1]) {
 					active = true;
 					$events.one(event_cleanup, reset);
-					if (settings.slideshowAuto) {
+					if (settings.get('slideshowAuto')) {
 						start();
 					} else {
 						stop();
@@ -316,65 +348,28 @@
 	}());
 
 
-	function launch(target) {
+	function launch(element) {
+		var options;
+
 		if (!closing) {
-			
-			element = target;
-			
-			makeSettings();
-			
-			$related = $(element);
-			
-			index = 0;
-			
-			if (settings.rel !== 'nofollow') {
-				$related = $('.' + boxElement).filter(function () {
-					var data = $.data(this, colorbox),
-						relRelated;
 
-					if (data) {
-						relRelated =  $(this).data('rel') || data.rel || this.rel;
-					}
-					
-					return (relRelated === settings.rel);
-				});
-				index = $related.index(element);
-				
-				// Check direct calls to Colorbox.
-				if (index === -1) {
-					$related = $related.add(element);
-					index = $related.length - 1;
-				}
-			}
-			
-			$overlay.css({
-				opacity: parseFloat(settings.opacity),
-				cursor: settings.overlayClose ? "pointer" : "auto",
-				visibility: 'visible'
-			}).show();
-			
+			options = $(element).data('colorbox');
 
-			if (className) {
-				$box.add($overlay).removeClass(className);
-			}
-			if (settings.className) {
-				$box.add($overlay).addClass(settings.className);
-			}
-			className = settings.className;
+			settings = new Settings(element, options);
 
-			if (settings.closeButton) {
-				$close.html(settings.close).appendTo($content);
-			} else {
-				$close.appendTo('<div/>');
-			}
+			rel = settings.get('rel');
+			
+			getRelated();
 
 			if (!open) {
 				open = active = true; // Prevents the page-change action from queuing up if the visitor holds down the left or right keys.
+
+				setClass(settings.get('className'));
 				
 				// Show colorbox so the sizes can be calculated in older versions of jQuery
 				$box.css({visibility:'hidden', display:'block'});
 				
-				$loaded = $tag(div, 'LoadedContent', 'width:0; height:0; overflow:hidden');
+				$loaded = $tag(div, 'LoadedContent', 'width:0; height:0; overflow:hidden; visibility:hidden');
 				$content.css({width:'', height:''}).append($loaded);
 
 				// Cache values needed for size calculations
@@ -384,18 +379,19 @@
 				loadedWidth = $loaded.outerWidth(true);
 
 				// Opens inital empty Colorbox prior to content being loaded.
-				settings.w = setSize(settings.initialWidth, 'x');
-				settings.h = setSize(settings.initialHeight, 'y');
+				settings.w = setSize(settings.get('initialWidth'), 'x');
+				settings.h = setSize(settings.get('initialHeight'), 'y');
 				$loaded.css({width:'', height:settings.h});
 				publicMethod.position();
 
-				trigger(event_open, settings.onOpen);
-				
+				trigger(event_open);
+				settings.get('onOpen');
+
 				$groupControls.add($title).hide();
 
 				$box.focus();
 				
-				if (settings.trapFocus) {
+				if (settings.get('trapFocus')) {
 					// Confine focus to the modal
 					// Uses event capturing that is not supported in IE8-
 					if (document.addEventListener) {
@@ -409,12 +405,25 @@
 				}
 
 				// Return focus on closing
-				if (settings.returnFocus) {
+				if (settings.get('returnFocus')) {
 					$events.one(event_closed, function () {
-						$(element).focus();
+						$(settings.el).focus();
 					});
 				}
 			}
+
+			$overlay.css({
+				opacity: parseFloat(settings.get('opacity')),
+				cursor: settings.get('overlayClose') ? "pointer" : "auto",
+				visibility: 'visible'
+			}).show();
+			
+			if (settings.get('closeButton')) {
+				$close.html(settings.get('close')).appendTo($content);
+			} else {
+				$close.appendTo('<div/>'); // replace with .detach() when dropping jQuery < 1.4
+			}
+
 			load();
 		}
 	}
@@ -497,7 +506,7 @@
 					publicMethod.close();
 				});
 				$overlay.click(function () {
-					if (settings.overlayClose) {
+					if (settings.get('overlayClose')) {
 						publicMethod.close();
 					}
 				});
@@ -505,11 +514,11 @@
 				// Key Bindings
 				$(document).bind('keydown.' + prefix, function (e) {
 					var key = e.keyCode;
-					if (open && settings.escKey && key === 27) {
+					if (open && settings.get('escKey') && key === 27) {
 						e.preventDefault();
 						publicMethod.close();
 					}
-					if (open && settings.arrowKey && $related[1] && !e.altKey) {
+					if (open && settings.get('arrowKey') && $related[1] && !e.altKey) {
 						if (key === 37) {
 							e.preventDefault();
 							$prev.click();
@@ -551,34 +560,44 @@
 	// ****************
 	
 	publicMethod = $.fn[colorbox] = $[colorbox] = function (options, callback) {
-		var $this = this;
-		
+		var settings;
+		var $obj = this;
+
 		options = options || {};
+
+		if ($.isFunction($obj)) { // assume a call to $.colorbox
+			$obj = $('<a/>');
+			options.open = true;
+		} else if (!$obj[0]) { // colorbox being applied to empty collection
+			return $obj;
+		}
+
+
+		if (!$obj[0]) { // colorbox being applied to empty collection
+			return $obj;
+		}
 		
 		appendHTML();
 
 		if (addBindings()) {
-			if ($.isFunction($this)) { // assume a call to $.colorbox
-				$this = $('<a/>');
-				options.open = true;
-			} else if (!$this[0]) { // colorbox being applied to empty collection
-				return $this;
-			}
-			
+
 			if (callback) {
 				options.onComplete = callback;
 			}
-			
-			$this.each(function () {
-				$.data(this, colorbox, $.extend({}, $.data(this, colorbox) || defaults, options));
+
+			$obj.each(function () {
+				var old = $.data(this, colorbox) || {};
+				$.data(this, colorbox, $.extend(old, options));
 			}).addClass(boxElement);
+
+			settings = new Settings($obj[0], options);
 			
-			if (($.isFunction(options.open) && options.open.call($this)) || options.open) {
-				launch($this[0]);
+			if (settings.get('open')) {
+				launch($obj[0]);
 			}
 		}
 		
-		return $this;
+		return $obj;
 	};
 
 	publicMethod.position = function (speed, loadedCallback) {
@@ -598,7 +617,7 @@
 		scrollTop = $window.scrollTop();
 		scrollLeft = $window.scrollLeft();
 
-		if (settings.fixed) {
+		if (settings.get('fixed')) {
 			offset.top -= scrollTop;
 			offset.left -= scrollLeft;
 			$box.css({position: 'fixed'});
@@ -609,18 +628,18 @@
 		}
 
 		// keeps the top and left positions within the browser's viewport.
-		if (settings.right !== false) {
-			left += Math.max($window.width() - settings.w - loadedWidth - interfaceWidth - setSize(settings.right, 'x'), 0);
-		} else if (settings.left !== false) {
-			left += setSize(settings.left, 'x');
+		if (settings.get('right') !== false) {
+			left += Math.max($window.width() - settings.w - loadedWidth - interfaceWidth - setSize(settings.get('right'), 'x'), 0);
+		} else if (settings.get('left') !== false) {
+			left += setSize(settings.get('left'), 'x');
 		} else {
 			left += Math.round(Math.max($window.width() - settings.w - loadedWidth - interfaceWidth, 0) / 2);
 		}
 		
-		if (settings.bottom !== false) {
-			top += Math.max(winheight() - settings.h - loadedHeight - interfaceHeight - setSize(settings.bottom, 'y'), 0);
-		} else if (settings.top !== false) {
-			top += setSize(settings.top, 'y');
+		if (settings.get('bottom') !== false) {
+			top += Math.max(winheight() - settings.h - loadedHeight - interfaceHeight - setSize(settings.get('bottom'), 'y'), 0);
+		} else if (settings.get('top') !== false) {
+			top += setSize(settings.get('top'), 'y');
 		} else {
 			top += Math.round(Math.max(winheight() - settings.h - loadedHeight - interfaceHeight, 0) / 2);
 		}
@@ -668,7 +687,7 @@
 				$wrap[0].style.width = (settings.w + loadedWidth + interfaceWidth) + "px";
 				$wrap[0].style.height = (settings.h + loadedHeight + interfaceHeight) + "px";
 				
-				if (settings.reposition) {
+				if (settings.get('reposition')) {
 					setTimeout(function () {  // small delay before binding onresize due to an IE8 bug.
 						$window.bind('resize.' + prefix, publicMethod.position);
 					}, 1);
@@ -718,7 +737,7 @@
 				$loaded.scrollTop(scrolltop);
 			}
 			
-			publicMethod.position(settings.transition === "none" ? 0 : settings.speed);
+			publicMethod.position(settings.get('transition') === "none" ? 0 : settings.get('speed'));
 		}
 	};
 
@@ -727,9 +746,9 @@
 			return;
 		}
 		
-		var callback, speed = settings.transition === "none" ? 0 : settings.speed;
+		var callback, speed = settings.get('transition') === "none" ? 0 : settings.get('speed');
 
-		$loaded.empty().remove(); // Using empty first may prevent some IE7 issues.
+		$loaded.remove();
 
 		$loaded = $tag(div, 'LoadedContent').append(object);
 		
@@ -746,7 +765,7 @@
 		
 		$loaded.hide()
 		.appendTo($loadingBay.show())// content has to be appended to the DOM for accurate size calculations.
-		.css({width: getWidth(), overflow: settings.scrolling ? 'auto' : 'hidden'})
+		.css({width: getWidth(), overflow: settings.get('scrolling') ? 'auto' : 'hidden'})
 		.css({height: getHeight()})// sets the height independently from the width in case the new width influences the value of height.
 		.prependTo($content);
 		
@@ -756,18 +775,18 @@
 		
 		$(photo).css({'float': 'none'});
 
+		setClass(settings.get('className'));
+
 		callback = function () {
 			var total = $related.length,
 				iframe,
-				frameBorder = 'frameBorder',
-				allowTransparency = 'allowTransparency',
 				complete;
 			
 			if (!open) {
 				return;
 			}
 			
-			function removeFilter() { // Needed for IE7 & IE8 in versions of jQuery prior to 1.7.2
+			function removeFilter() { // Needed for IE8 in versions of jQuery prior to 1.7.2
 				if ($.support.opacity === false) {
 					$box[0].style.removeAttribute('filter');
 				}
@@ -776,41 +795,34 @@
 			complete = function () {
 				clearTimeout(loadingTimer);
 				$loadingOverlay.hide();
-				trigger(event_complete, settings.onComplete);
+				trigger(event_complete);
+				settings.get('onComplete');
 			};
 
 			
-			$title.html(settings.title).add($loaded).show();
+			$title.html(settings.get('title')).show();
+			$loaded.show();
 			
 			if (total > 1) { // handle grouping
-				if (typeof settings.current === "string") {
-					$current.html(settings.current.replace('{current}', index + 1).replace('{total}', total)).show();
+				if (typeof settings.get('current') === "string") {
+					$current.html(settings.get('current').replace('{current}', index + 1).replace('{total}', total)).show();
 				}
 				
-				$next[(settings.loop || index < total - 1) ? "show" : "hide"]().html(settings.next);
-				$prev[(settings.loop || index) ? "show" : "hide"]().html(settings.previous);
+				$next[(settings.get('loop') || index < total - 1) ? "show" : "hide"]().html(settings.get('next'));
+				$prev[(settings.get('loop') || index) ? "show" : "hide"]().html(settings.get('previous'));
 				
 				slideshow();
 				
 				// Preloads images within a rel group
-				if (settings.preloading) {
+				if (settings.get('preloading')) {
 					$.each([getIndex(-1), getIndex(1)], function(){
-						var src,
-							img,
+						var img,
 							i = $related[this],
-							data = $.data(i, colorbox);
-
-						if (data && data.href) {
-							src = data.href;
-							if ($.isFunction(src)) {
-								src = src.call(i);
-							}
-						} else {
-							src = $(i).attr('href');
-						}
+							settings = new Settings(i, $.data(i, colorbox)),
+							src = settings.get('href');
 
-						if (src && isImage(data, src)) {
-							src = retinaUrl(data, src);
+						if (src && isImage(settings, src)) {
+							src = retinaUrl(settings, src);
 							img = document.createElement('img');
 							img.src = src;
 						}
@@ -820,29 +832,27 @@
 				$groupControls.hide();
 			}
 			
-			if (settings.iframe) {
-				iframe = $tag('iframe')[0];
+			if (settings.get('iframe')) {
+				iframe = document.createElement('iframe');
 				
-				if (frameBorder in iframe) {
-					iframe[frameBorder] = 0;
+				if ('frameBorder' in iframe) {
+					iframe.frameBorder = 0;
 				}
 				
-				if (allowTransparency in iframe) {
-					iframe[allowTransparency] = "true";
+				if ('allowTransparency' in iframe) {
+					iframe.allowTransparency = "true";
 				}
 
-				if (!settings.scrolling) {
+				if (!settings.get('scrolling')) {
 					iframe.scrolling = "no";
 				}
 				
 				$(iframe)
 					.attr({
-						src: settings.href,
+						src: settings.get('href'),
 						name: (new Date()).getTime(), // give the iframe a unique name to prevent caching
 						'class': prefix + 'Iframe',
-						allowFullScreen : true, // allow HTML5 video to go fullscreen
-						webkitAllowFullScreen : true,
-						mozallowfullscreen : true
+						allowFullScreen : true // allow HTML5 video to go fullscreen
 					})
 					.one('load', complete)
 					.appendTo($loaded);
@@ -851,21 +861,21 @@
 					iframe.src = "//about:blank";
 				});
 
-				if (settings.fastIframe) {
+				if (settings.get('fastIframe')) {
 					$(iframe).trigger('load');
 				}
 			} else {
 				complete();
 			}
 			
-			if (settings.transition === 'fade') {
+			if (settings.get('transition') === 'fade') {
 				$box.fadeTo(speed, 1, removeFilter);
 			} else {
 				removeFilter();
 			}
 		};
 		
-		if (settings.transition === 'fade') {
+		if (settings.get('transition') === 'fade') {
 			$box.fadeTo(speed, 0, function () {
 				publicMethod.position(0, callback);
 			});
@@ -881,21 +891,17 @@
 		
 		photo = false;
 		
-		element = $related[index];
-		
-		makeSettings();
-		
 		trigger(event_purge);
+		trigger(event_load);
+		settings.get('onLoad');
 		
-		trigger(event_load, settings.onLoad);
+		settings.h = settings.get('height') ?
+				setSize(settings.get('height'), 'y') - loadedHeight - interfaceHeight :
+				settings.get('innerHeight') && setSize(settings.get('innerHeight'), 'y');
 		
-		settings.h = settings.height ?
-				setSize(settings.height, 'y') - loadedHeight - interfaceHeight :
-				settings.innerHeight && setSize(settings.innerHeight, 'y');
-		
-		settings.w = settings.width ?
-				setSize(settings.width, 'x') - loadedWidth - interfaceWidth :
-				settings.innerWidth && setSize(settings.innerWidth, 'x');
+		settings.w = settings.get('width') ?
+				setSize(settings.get('width'), 'x') - loadedWidth - interfaceWidth :
+				settings.get('innerWidth') && setSize(settings.get('innerWidth'), 'x');
 		
 		// Sets the minimum dimensions for use in image scaling
 		settings.mw = settings.w;
@@ -903,22 +909,22 @@
 		
 		// Re-evaluate the minimum width and height based on maxWidth and maxHeight values.
 		// If the width or height exceed the maxWidth or maxHeight, use the maximum values instead.
-		if (settings.maxWidth) {
-			settings.mw = setSize(settings.maxWidth, 'x') - loadedWidth - interfaceWidth;
+		if (settings.get('maxWidth')) {
+			settings.mw = setSize(settings.get('maxWidth'), 'x') - loadedWidth - interfaceWidth;
 			settings.mw = settings.w && settings.w < settings.mw ? settings.w : settings.mw;
 		}
-		if (settings.maxHeight) {
-			settings.mh = setSize(settings.maxHeight, 'y') - loadedHeight - interfaceHeight;
+		if (settings.get('maxHeight')) {
+			settings.mh = setSize(settings.get('maxHeight'), 'y') - loadedHeight - interfaceHeight;
 			settings.mh = settings.h && settings.h < settings.mh ? settings.h : settings.mh;
 		}
 		
-		href = settings.href;
+		href = settings.get('href');
 		
 		loadingTimer = setTimeout(function () {
 			$loadingOverlay.show();
 		}, 100);
 		
-		if (settings.inline) {
+		if (settings.get('inline')) {
 			// 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 = $tag(div).hide().insertBefore($(href)[0]);
@@ -928,12 +934,12 @@
 			});
 
 			prep($(href));
-		} else if (settings.iframe) {
+		} else if (settings.get('iframe')) {
 			// IFrame element won't be added to the DOM until it is ready to be displayed,
 			// to avoid problems with DOM-ready JS that might be trying to run in that iframe.
 			prep(" ");
-		} else if (settings.html) {
-			prep(settings.html);
+		} else if (settings.get('html')) {
+			prep(settings.get('html'));
 		} else if (isImage(settings, href)) {
 
 			href = retinaUrl(settings, href);
@@ -943,8 +949,7 @@
 			$(photo)
 			.addClass(prefix + 'Photo')
 			.bind('error',function () {
-				settings.title = false;
-				prep($tag(div, 'Error').html(settings.imgError));
+				prep($tag(div, 'Error').html(settings.get('imgError')));
 			})
 			.one('load', function () {
 				var percent;
@@ -954,18 +959,18 @@
 				}
 
 				$.each(['alt', 'longdesc', 'aria-describedby'], function(i,val){
-					var attr = $(element).attr(val) || $(element).attr('data-'+val);
+					var attr = $(settings.el).attr(val) || $(settings.el).attr('data-'+val);
 					if (attr) {
 						photo.setAttribute(val, attr);
 					}
 				});
 
-				if (settings.retinaImage && window.devicePixelRatio > 1) {
+				if (settings.get('retinaImage') && window.devicePixelRatio > 1) {
 					photo.height = photo.height / window.devicePixelRatio;
 					photo.width = photo.width / window.devicePixelRatio;
 				}
 
-				if (settings.scalePhotos) {
+				if (settings.get('scalePhotos')) {
 					setResize = function () {
 						photo.height -= photo.height * percent;
 						photo.width -= photo.width * percent;
@@ -984,7 +989,7 @@
 					photo.style.marginTop = Math.max(settings.mh - photo.height, 0) / 2 + 'px';
 				}
 				
-				if ($related[1] && (settings.loop || $related[index + 1])) {
+				if ($related[1] && (settings.get('loop') || $related[index + 1])) {
 					photo.style.cursor = 'pointer';
 					photo.onclick = function () {
 						publicMethod.next();
@@ -1003,9 +1008,9 @@
 				photo.src = href;
 			}, 1);
 		} else if (href) {
-			$loadingBay.load(href, settings.data, function (data, status) {
+			$loadingBay.load(href, settings.get('data'), function (data, status) {
 				if (request === requests) {
-					prep(status === 'error' ? $tag(div, 'Error').html(settings.xhrError) : $(this).contents());
+					prep(status === 'error' ? $tag(div, 'Error').html(settings.get('xhrError')) : $(this).contents());
 				}
 			});
 		}
@@ -1013,14 +1018,14 @@
 		
 	// Navigates to the next page/image in a set.
 	publicMethod.next = function () {
-		if (!active && $related[1] && (settings.loop || $related[index + 1])) {
+		if (!active && $related[1] && (settings.get('loop') || $related[index + 1])) {
 			index = getIndex(1);
 			launch($related[index]);
 		}
 	};
 	
 	publicMethod.prev = function () {
-		if (!active && $related[1] && (settings.loop || index)) {
+		if (!active && $related[1] && (settings.get('loop') || index)) {
 			index = getIndex(-1);
 			launch($related[index]);
 		}
@@ -1034,23 +1039,25 @@
 			
 			open = false;
 			
-			trigger(event_cleanup, settings.onCleanup);
+			trigger(event_cleanup);
+			settings.get('onCleanup');
 			
 			$window.unbind('.' + prefix);
 			
-			$overlay.fadeTo(settings.fadeOut || 0, 0);
+			$overlay.fadeTo(settings.get('fadeOut') || 0, 0);
 			
-			$box.stop().fadeTo(settings.fadeOut || 0, 0, function () {
+			$box.stop().fadeTo(settings.get('fadeOut') || 0, 0, function () {
 			
 				$box.add($overlay).css({'opacity': 1, cursor: 'auto'}).hide();
 				
 				trigger(event_purge);
 				
-				$loaded.empty().remove(); // Using empty first may prevent some IE7 issues.
+				$loaded.remove();
 				
 				setTimeout(function () {
 					closing = false;
-					trigger(event_closed, settings.onClosed);
+					trigger(event_closed);
+					settings.get('onClosed');
 				}, 1);
 			});
 		}
@@ -1076,7 +1083,7 @@
 	// A method for fetching the current element Colorbox is referencing.
 	// returns a jQuery object.
 	publicMethod.element = function () {
-		return $(element);
+		return $(settings.el);
 	};
 
 	publicMethod.settings = defaults;