end
def preinitialize
- load(preinitializer_path) if File.exists?(preinitializer_path)
+ load(preinitializer_path) if File.exist?(preinitializer_path)
end
def preinitializer_path
class VendorBoot < Boot
def load_initializer
require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
+ Rails::Initializer.run(:install_gem_spec_stubs)
end
end
class << self
def rubygems_version
- Gem::RubyGemsVersion if defined? Gem::RubyGemsVersion
+ Gem::RubyGemsVersion rescue nil
end
def gem_version
def load_rubygems
require 'rubygems'
-
- unless rubygems_version >= '0.9.4'
- $stderr.puts %(Rails requires RubyGems >= 0.9.4 (you have #{rubygems_version}). Please `gem update --system` and try again.)
+ min_version = '1.3.1'
+ unless rubygems_version >= min_version
+ $stderr.puts %Q(Rails requires RubyGems >= #{min_version} (you have #{rubygems_version}). Please `gem update --system` and try again.)
exit 1
end
rescue LoadError
- $stderr.puts %(Rails requires RubyGems >= 0.9.4. Please install RubyGems and try again: http://rubygems.rubyforge.org)
+ $stderr.puts %Q(Rails requires RubyGems >= #{min_version}. Please install RubyGems and try again: http://rubygems.rubyforge.org)
exit 1
end
def parse_gem_version(text)
- $1 if text =~ /^[^#]*RAILS_GEM_VERSION\s*=\s*'([!~<>=]*\s*[\d.]+)'/
+ $1 if text =~ /^[^#]*RAILS_GEM_VERSION\s*=\s*["']([!~<>=]*\s*[\d.]+)["']/
end
private
ENV['RAILS_ENV'] ||= 'production'
# Specifies gem version of Rails to use when vendor/rails is not present
-RAILS_GEM_VERSION = '2.1.2' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.2.2' unless defined? RAILS_GEM_VERSION
# Set the server URL
SERVER_URL = ENV['OSM_SERVER_URL'] || 'www.openstreetmap.org'
# config.gem "bj"
# config.gem "hpricot", :version => '0.6', :source => "http://code.whytheluckystiff.net"
# config.gem "aws-s3", :lib => "aws/s3"
- config.gem 'composite_primary_keys', :version => '1.1.0'
+ config.gem 'composite_primary_keys', :version => '2.2.2'
config.gem 'libxml-ruby', :version => '>= 1.1.1', :lib => 'libxml'
config.gem 'rmagick', :lib => 'RMagick'
-// Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
-// (c) 2005-2007 Ivan Krstic (http://blogs.law.harvard.edu/ivan)
-// (c) 2005-2007 Jon Tirsen (http://www.tirsen.com)
+// Copyright (c) 2005-2008 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+// (c) 2005-2008 Ivan Krstic (http://blogs.law.harvard.edu/ivan)
+// (c) 2005-2008 Jon Tirsen (http://www.tirsen.com)
// Contributors:
// Richard Livsey
// Rahul Bhargava
// Rob Wills
-//
+//
// script.aculo.us is freely distributable under the terms of an MIT-style license.
// For details, see the script.aculo.us web site: http://script.aculo.us/
-// Autocompleter.Base handles all the autocompletion functionality
+// Autocompleter.Base handles all the autocompletion functionality
// that's independent of the data source for autocompletion. This
// includes drawing the autocompletion menu, observing keyboard
// and mouse events, and similar.
//
-// Specific autocompleters need to provide, at the very least,
+// Specific autocompleters need to provide, at the very least,
// a getUpdatedChoices function that will be invoked every time
-// the text inside the monitored textbox changes. This method
+// the text inside the monitored textbox changes. This method
// should get the text for which to provide autocompletion by
// invoking this.getToken(), NOT by directly accessing
// this.element.value. This is to allow incremental tokenized
// will incrementally autocomplete with a comma as the token.
// Additionally, ',' in the above example can be replaced with
// a token array, e.g. { tokens: [',', '\n'] } which
-// enables autocompletion on multiple tokens. This is most
-// useful when one of the tokens is \n (a newline), as it
+// enables autocompletion on multiple tokens. This is most
+// useful when one of the tokens is \n (a newline), as it
// allows smart autocompletion after linebreaks.
if(typeof Effect == 'undefined')
throw("controls.js requires including script.aculo.us' effects.js library");
-var Autocompleter = { }
+var Autocompleter = { };
Autocompleter.Base = Class.create({
baseInitialize: function(element, update, options) {
- element = $(element)
- this.element = element;
- this.update = $(update);
- this.hasFocus = false;
- this.changed = false;
- this.active = false;
- this.index = 0;
+ element = $(element);
+ this.element = element;
+ this.update = $(update);
+ this.hasFocus = false;
+ this.changed = false;
+ this.active = false;
+ this.index = 0;
this.entryCount = 0;
this.oldElementValue = this.element.value;
this.options.tokens = this.options.tokens || [];
this.options.frequency = this.options.frequency || 0.4;
this.options.minChars = this.options.minChars || 1;
- this.options.onShow = this.options.onShow ||
- function(element, update){
+ this.options.onShow = this.options.onShow ||
+ function(element, update){
if(!update.style.position || update.style.position=='absolute') {
update.style.position = 'absolute';
Position.clone(element, update, {
- setHeight: false,
+ setHeight: false,
offsetTop: element.offsetHeight
});
}
Effect.Appear(update,{duration:0.15});
};
- this.options.onHide = this.options.onHide ||
+ this.options.onHide = this.options.onHide ||
function(element, update){ new Effect.Fade(update,{duration:0.15}) };
- if(typeof(this.options.tokens) == 'string')
+ if(typeof(this.options.tokens) == 'string')
this.options.tokens = new Array(this.options.tokens);
// Force carriage returns as token delimiters anyway
if (!this.options.tokens.include('\n'))
this.options.tokens.push('\n');
this.observer = null;
-
+
this.element.setAttribute('autocomplete','off');
Element.hide(this.update);
show: function() {
if(Element.getStyle(this.update, 'display')=='none') this.options.onShow(this.element, this.update);
- if(!this.iefix &&
+ if(!this.iefix &&
(Prototype.Browser.IE) &&
(Element.getStyle(this.update, 'position')=='absolute')) {
- new Insertion.After(this.update,
+ new Insertion.After(this.update,
'<iframe id="' + this.update.id + '_iefix" '+
'style="display:none;position:absolute;filter:progid:DXImageTransform.Microsoft.Alpha(opacity=0);" ' +
'src="javascript:false;" frameborder="0" scrolling="no"></iframe>');
}
if(this.iefix) setTimeout(this.fixIEOverlapping.bind(this), 50);
},
-
+
fixIEOverlapping: function() {
Position.clone(this.update, this.iefix, {setTop:(!this.update.style.height)});
this.iefix.style.zIndex = 1;
Event.stop(event);
return;
}
- else
- if(event.keyCode==Event.KEY_TAB || event.keyCode==Event.KEY_RETURN ||
+ else
+ if(event.keyCode==Event.KEY_TAB || event.keyCode==Event.KEY_RETURN ||
(Prototype.Browser.WebKit > 0 && event.keyCode == 0)) return;
this.changed = true;
this.hasFocus = true;
if(this.observer) clearTimeout(this.observer);
- this.observer =
+ this.observer =
setTimeout(this.onObserverEvent.bind(this), this.options.frequency*1000);
},
onHover: function(event) {
var element = Event.findElement(event, 'LI');
- if(this.index != element.autocompleteIndex)
+ if(this.index != element.autocompleteIndex)
{
this.index = element.autocompleteIndex;
this.render();
}
Event.stop(event);
},
-
+
onClick: function(event) {
var element = Event.findElement(event, 'LI');
this.index = element.autocompleteIndex;
this.selectEntry();
this.hide();
},
-
+
onBlur: function(event) {
// needed to make click events working
setTimeout(this.hide.bind(this), 250);
this.hasFocus = false;
- this.active = false;
- },
-
+ this.active = false;
+ },
+
render: function() {
if(this.entryCount > 0) {
for (var i = 0; i < this.entryCount; i++)
- this.index==i ?
- Element.addClassName(this.getEntry(i),"selected") :
+ this.index==i ?
+ Element.addClassName(this.getEntry(i),"selected") :
Element.removeClassName(this.getEntry(i),"selected");
- if(this.hasFocus) {
+ if(this.hasFocus) {
this.show();
this.active = true;
}
this.hide();
}
},
-
+
markPrevious: function() {
- if(this.index > 0) this.index--
+ if(this.index > 0) this.index--;
else this.index = this.entryCount-1;
this.getEntry(this.index).scrollIntoView(true);
},
-
+
markNext: function() {
- if(this.index < this.entryCount-1) this.index++
+ if(this.index < this.entryCount-1) this.index++;
else this.index = 0;
this.getEntry(this.index).scrollIntoView(false);
},
-
+
getEntry: function(index) {
return this.update.firstChild.childNodes[index];
},
-
+
getCurrentEntry: function() {
return this.getEntry(this.index);
},
-
+
selectEntry: function() {
this.active = false;
this.updateElement(this.getCurrentEntry());
if(nodes.length>0) value = Element.collectTextNodes(nodes[0], this.options.select);
} else
value = Element.collectTextNodesIgnoreClass(selectedElement, 'informal');
-
+
var bounds = this.getTokenBounds();
if (bounds[0] != -1) {
var newValue = this.element.value.substr(0, bounds[0]);
}
this.oldElementValue = this.element.value;
this.element.focus();
-
+
if (this.options.afterUpdateElement)
this.options.afterUpdateElement(this.element, selectedElement);
},
Element.cleanWhitespace(this.update.down());
if(this.update.firstChild && this.update.down().childNodes) {
- this.entryCount =
+ this.entryCount =
this.update.down().childNodes.length;
for (var i = 0; i < this.entryCount; i++) {
var entry = this.getEntry(i);
entry.autocompleteIndex = i;
this.addObservers(entry);
}
- } else {
+ } else {
this.entryCount = 0;
}
this.stopIndicator();
this.index = 0;
-
+
if(this.entryCount==1 && this.options.autoSelect) {
this.selectEntry();
this.hide();
},
onObserverEvent: function() {
- this.changed = false;
+ this.changed = false;
this.tokenBounds = null;
if(this.getToken().length>=this.options.minChars) {
this.getUpdatedChoices();
getUpdatedChoices: function() {
this.startIndicator();
-
- var entry = encodeURIComponent(this.options.paramName) + '=' +
+
+ var entry = encodeURIComponent(this.options.paramName) + '=' +
encodeURIComponent(this.getToken());
this.options.parameters = this.options.callback ?
this.options.callback(this.element, entry) : entry;
- if(this.options.defaultParams)
+ if(this.options.defaultParams)
this.options.parameters += '&' + this.options.defaultParams;
-
+
new Ajax.Request(this.url, this.options);
},
// - choices - How many autocompletion choices to offer
//
// - partialSearch - If false, the autocompleter will match entered
-// text only at the beginning of strings in the
+// text only at the beginning of strings in the
// autocomplete array. Defaults to true, which will
// match text at the beginning of any *word* in the
// strings in the autocomplete array. If you want to
// - ignoreCase - Whether to ignore case when autocompleting.
// Defaults to true.
//
-// It's possible to pass in a custom function as the 'selector'
+// It's possible to pass in a custom function as the 'selector'
// option, if you prefer to write your own autocompletion logic.
// In that case, the other options above will not apply unless
// you support them.
var entry = instance.getToken();
var count = 0;
- for (var i = 0; i < instance.options.array.length &&
- ret.length < instance.options.choices ; i++) {
+ for (var i = 0; i < instance.options.array.length &&
+ ret.length < instance.options.choices ; i++) {
var elem = instance.options.array[i];
- var foundPos = instance.options.ignoreCase ?
- elem.toLowerCase().indexOf(entry.toLowerCase()) :
+ var foundPos = instance.options.ignoreCase ?
+ elem.toLowerCase().indexOf(entry.toLowerCase()) :
elem.indexOf(entry);
while (foundPos != -1) {
- if (foundPos == 0 && elem.length != entry.length) {
- ret.push("<li><strong>" + elem.substr(0, entry.length) + "</strong>" +
+ if (foundPos == 0 && elem.length != entry.length) {
+ ret.push("<li><strong>" + elem.substr(0, entry.length) + "</strong>" +
elem.substr(entry.length) + "</li>");
break;
- } else if (entry.length >= instance.options.partialChars &&
+ } else if (entry.length >= instance.options.partialChars &&
instance.options.partialSearch && foundPos != -1) {
if (instance.options.fullSearch || /\s/.test(elem.substr(foundPos-1,1))) {
partial.push("<li>" + elem.substr(0, foundPos) + "<strong>" +
}
}
- foundPos = instance.options.ignoreCase ?
- elem.toLowerCase().indexOf(entry.toLowerCase(), foundPos + 1) :
+ foundPos = instance.options.ignoreCase ?
+ elem.toLowerCase().indexOf(entry.toLowerCase(), foundPos + 1) :
elem.indexOf(entry, foundPos + 1);
}
}
if (partial.length)
- ret = ret.concat(partial.slice(0, instance.options.choices - ret.length))
+ ret = ret.concat(partial.slice(0, instance.options.choices - ret.length));
return "<ul>" + ret.join('') + "</ul>";
}
}, options || { });
setTimeout(function() {
Field.activate(field);
}, 1);
-}
+};
Ajax.InPlaceEditor = Class.create({
initialize: function(element, url, options) {
this.triggerCallback('onEnterHover');
},
getText: function() {
- return this.element.innerHTML;
+ return this.element.innerHTML.unescapeHTML();
},
handleAJAXFailure: function(transport) {
this.triggerCallback('onFailure', transport);
onSuccess: function(transport) {
var js = transport.responseText.strip();
if (!/^\[.*\]$/.test(js)) // TODO: improve sanity check
- throw 'Server returned an invalid collection representation.';
+ throw('Server returned an invalid collection representation.');
this._collection = eval(js);
this.checkForExternalText();
}.bind(this),
loadingCollectionText: 'Loading options...'
};
-// Delayed observer, like Form.Element.Observer,
+// Delayed observer, like Form.Element.Observer,
// but waits for delay after last key input
// Ideal for live-search fields
this.element = $(element);
this.callback = callback;
this.timer = null;
- this.lastValue = $F(this.element);
+ this.lastValue = $F(this.element);
Event.observe(this.element,'keyup',this.delayedListener.bindAsEventListener(this));
},
delayedListener: function(event) {
this.timer = null;
this.callback(this.element, $F(this.element));
}
-});
+});
\ No newline at end of file
-// Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
-// (c) 2005-2007 Sammi Williams (http://www.oriontransfer.co.nz, sammi@oriontransfer.co.nz)
-//
+// Copyright (c) 2005-2008 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+// (c) 2005-2008 Sammi Williams (http://www.oriontransfer.co.nz, sammi@oriontransfer.co.nz)
+//
// script.aculo.us is freely distributable under the terms of an MIT-style license.
// For details, see the script.aculo.us web site: http://script.aculo.us/
options._containers.push($(containment));
}
}
-
+
if(options.accept) options.accept = [options.accept].flatten();
Element.makePositioned(element); // fix IE
this.drops.push(options);
},
-
+
findDeepestChild: function(drops) {
deepest = drops[0];
-
+
for (i = 1; i < drops.length; ++i)
if (Element.isParent(drops[i].element, deepest.element))
deepest = drops[i];
-
+
return deepest;
},
isContained: function(element, drop) {
var containmentNode;
if(drop.tree) {
- containmentNode = element.treeNode;
+ containmentNode = element.treeNode;
} else {
containmentNode = element.parentNode;
}
return drop._containers.detect(function(c) { return containmentNode == c });
},
-
+
isAffected: function(point, element, drop) {
return (
(drop.element!=element) &&
((!drop._containers) ||
this.isContained(element, drop)) &&
((!drop.accept) ||
- (Element.classNames(element).detect(
+ (Element.classNames(element).detect(
function(v) { return drop.accept.include(v) } ) )) &&
Position.within(drop.element, point[0], point[1]) );
},
show: function(point, element) {
if(!this.drops.length) return;
var drop, affected = [];
-
+
this.drops.each( function(drop) {
if(Droppables.isAffected(point, element, drop))
affected.push(drop);
});
-
+
if(affected.length>0)
drop = Droppables.findDeepestChild(affected);
Position.within(drop.element, point[0], point[1]);
if(drop.onHover)
drop.onHover(element, drop.element, Position.overlap(drop.overlap, drop.element));
-
+
if (drop != this.last_active) Droppables.activate(drop);
}
},
if (this.isAffected([Event.pointerX(event), Event.pointerY(event)], element, this.last_active))
if (this.last_active.onDrop) {
- this.last_active.onDrop(element, this.last_active.element, event);
- return true;
+ this.last_active.onDrop(element, this.last_active.element, event);
+ return true;
}
},
if(this.last_active)
this.deactivate(this.last_active);
}
-}
+};
var Draggables = {
drags: [],
observers: [],
-
+
register: function(draggable) {
if(this.drags.length == 0) {
this.eventMouseUp = this.endDrag.bindAsEventListener(this);
this.eventMouseMove = this.updateDrag.bindAsEventListener(this);
this.eventKeypress = this.keyPress.bindAsEventListener(this);
-
+
Event.observe(document, "mouseup", this.eventMouseUp);
Event.observe(document, "mousemove", this.eventMouseMove);
Event.observe(document, "keypress", this.eventKeypress);
}
this.drags.push(draggable);
},
-
+
unregister: function(draggable) {
this.drags = this.drags.reject(function(d) { return d==draggable });
if(this.drags.length == 0) {
Event.stopObserving(document, "keypress", this.eventKeypress);
}
},
-
+
activate: function(draggable) {
- if(draggable.options.delay) {
- this._timeout = setTimeout(function() {
- Draggables._timeout = null;
- window.focus();
- Draggables.activeDraggable = draggable;
- }.bind(this), draggable.options.delay);
+ if(draggable.options.delay) {
+ this._timeout = setTimeout(function() {
+ Draggables._timeout = null;
+ window.focus();
+ Draggables.activeDraggable = draggable;
+ }.bind(this), draggable.options.delay);
} else {
window.focus(); // allows keypress events if window isn't currently focused, fails for Safari
this.activeDraggable = draggable;
}
},
-
+
deactivate: function() {
this.activeDraggable = null;
},
-
+
updateDrag: function(event) {
if(!this.activeDraggable) return;
var pointer = [Event.pointerX(event), Event.pointerY(event)];
// the same coordinates, prevent needless redrawing (moz bug?)
if(this._lastPointer && (this._lastPointer.inspect() == pointer.inspect())) return;
this._lastPointer = pointer;
-
+
this.activeDraggable.updateDrag(event, pointer);
},
-
+
endDrag: function(event) {
- if(this._timeout) {
- clearTimeout(this._timeout);
- this._timeout = null;
+ if(this._timeout) {
+ clearTimeout(this._timeout);
+ this._timeout = null;
}
if(!this.activeDraggable) return;
this._lastPointer = null;
this.activeDraggable.endDrag(event);
this.activeDraggable = null;
},
-
+
keyPress: function(event) {
if(this.activeDraggable)
this.activeDraggable.keyPress(event);
},
-
+
addObserver: function(observer) {
this.observers.push(observer);
this._cacheObserverCallbacks();
},
-
+
removeObserver: function(element) { // element instead of observer fixes mem leaks
this.observers = this.observers.reject( function(o) { return o.element==element });
this._cacheObserverCallbacks();
},
-
+
notify: function(eventName, draggable, event) { // 'onStart', 'onEnd', 'onDrag'
if(this[eventName+'Count'] > 0)
this.observers.each( function(o) {
});
if(draggable.options[eventName]) draggable.options[eventName](draggable, event);
},
-
+
_cacheObserverCallbacks: function() {
['onStart','onEnd','onDrag'].each( function(eventName) {
Draggables[eventName+'Count'] = Draggables.observers.select(
).length;
});
}
-}
+};
/*--------------------------------------------------------------------------*/
},
endeffect: function(element) {
var toOpacity = Object.isNumber(element._opacity) ? element._opacity : 1.0;
- new Effect.Opacity(element, {duration:0.2, from:0.7, to:toOpacity,
+ new Effect.Opacity(element, {duration:0.2, from:0.7, to:toOpacity,
queue: {scope:'_draggable', position:'end'},
- afterFinish: function(){
- Draggable._dragging[element] = false
+ afterFinish: function(){
+ Draggable._dragging[element] = false
}
- });
+ });
},
zindex: 1000,
revert: false,
snap: false, // false, or xy or [x,y] or function(x,y){ return [x,y] }
delay: 0
};
-
+
if(!arguments[1] || Object.isUndefined(arguments[1].endeffect))
Object.extend(defaults, {
starteffect: function(element) {
element._opacity = Element.getOpacity(element);
Draggable._dragging[element] = true;
- new Effect.Opacity(element, {duration:0.2, from:element._opacity, to:0.7});
+ new Effect.Opacity(element, {duration:0.2, from:element._opacity, to:0.7});
}
});
-
+
var options = Object.extend(defaults, arguments[1] || { });
this.element = $(element);
-
+
if(options.handle && Object.isString(options.handle))
this.handle = this.element.down('.'+options.handle, 0);
-
+
if(!this.handle) this.handle = $(options.handle);
if(!this.handle) this.handle = this.element;
-
+
if(options.scroll && !options.scroll.scrollTo && !options.scroll.outerHTML) {
options.scroll = $(options.scroll);
this._isScrollChild = Element.childOf(this.element, options.scroll);
}
- Element.makePositioned(this.element); // fix IE
+ Element.makePositioned(this.element); // fix IE
this.options = options;
- this.dragging = false;
+ this.dragging = false;
this.eventMouseDown = this.initDrag.bindAsEventListener(this);
Event.observe(this.handle, "mousedown", this.eventMouseDown);
-
+
Draggables.register(this);
},
-
+
destroy: function() {
Event.stopObserving(this.handle, "mousedown", this.eventMouseDown);
Draggables.unregister(this);
},
-
+
currentDelta: function() {
return([
parseInt(Element.getStyle(this.element,'left') || '0'),
parseInt(Element.getStyle(this.element,'top') || '0')]);
},
-
+
initDrag: function(event) {
if(!Object.isUndefined(Draggable._dragging[this.element]) &&
Draggable._dragging[this.element]) return;
- if(Event.isLeftClick(event)) {
+ if(Event.isLeftClick(event)) {
// abort on form elements, fixes a Firefox issue
var src = Event.element(event);
if((tag_name = src.tagName.toUpperCase()) && (
tag_name=='OPTION' ||
tag_name=='BUTTON' ||
tag_name=='TEXTAREA')) return;
-
+
var pointer = [Event.pointerX(event), Event.pointerY(event)];
var pos = Position.cumulativeOffset(this.element);
this.offset = [0,1].map( function(i) { return (pointer[i] - pos[i]) });
-
+
Draggables.activate(this);
Event.stop(event);
}
},
-
+
startDrag: function(event) {
this.dragging = true;
if(!this.delta)
this.delta = this.currentDelta();
-
+
if(this.options.zindex) {
this.originalZ = parseInt(Element.getStyle(this.element,'z-index') || 0);
this.element.style.zIndex = this.options.zindex;
}
-
+
if(this.options.ghosting) {
this._clone = this.element.cloneNode(true);
- this.element._originallyAbsolute = (this.element.getStyle('position') == 'absolute');
- if (!this.element._originallyAbsolute)
+ this._originallyAbsolute = (this.element.getStyle('position') == 'absolute');
+ if (!this._originallyAbsolute)
Position.absolutize(this.element);
this.element.parentNode.insertBefore(this._clone, this.element);
}
-
+
if(this.options.scroll) {
if (this.options.scroll == window) {
var where = this._getWindowScroll(this.options.scroll);
this.originalScrollTop = this.options.scroll.scrollTop;
}
}
-
+
Draggables.notify('onStart', this, event);
-
+
if(this.options.starteffect) this.options.starteffect(this.element);
},
-
+
updateDrag: function(event, pointer) {
if(!this.dragging) this.startDrag(event);
-
+
if(!this.options.quiet){
Position.prepare();
Droppables.show(pointer, this.element);
}
-
+
Draggables.notify('onDrag', this, event);
-
+
this.draw(pointer);
if(this.options.change) this.options.change(this);
-
+
if(this.options.scroll) {
this.stopScrolling();
-
+
var p;
if (this.options.scroll == window) {
with(this._getWindowScroll(this.options.scroll)) { p = [ left, top, left+width, top+height ]; }
if(pointer[1] > (p[3]-this.options.scrollSensitivity)) speed[1] = pointer[1]-(p[3]-this.options.scrollSensitivity);
this.startScrolling(speed);
}
-
+
// fix AppleWebKit rendering
if(Prototype.Browser.WebKit) window.scrollBy(0,0);
-
+
Event.stop(event);
},
-
+
finishDrag: function(event, success) {
this.dragging = false;
-
+
if(this.options.quiet){
Position.prepare();
var pointer = [Event.pointerX(event), Event.pointerY(event)];
}
if(this.options.ghosting) {
- if (!this.element._originallyAbsolute)
+ if (!this._originallyAbsolute)
Position.relativize(this.element);
- delete this.element._originallyAbsolute;
+ delete this._originallyAbsolute;
Element.remove(this._clone);
this._clone = null;
}
- var dropped = false;
- if(success) {
- dropped = Droppables.fire(event, this.element);
- if (!dropped) dropped = false;
+ var dropped = false;
+ if(success) {
+ dropped = Droppables.fire(event, this.element);
+ if (!dropped) dropped = false;
}
if(dropped && this.options.onDropped) this.options.onDropped(this.element);
Draggables.notify('onEnd', this, event);
var revert = this.options.revert;
if(revert && Object.isFunction(revert)) revert = revert(this.element);
-
+
var d = this.currentDelta();
if(revert && this.options.reverteffect) {
if (dropped == 0 || revert != 'failure')
if(this.options.zindex)
this.element.style.zIndex = this.originalZ;
- if(this.options.endeffect)
+ if(this.options.endeffect)
this.options.endeffect(this.element);
-
+
Draggables.deactivate(this);
Droppables.reset();
},
-
+
keyPress: function(event) {
if(event.keyCode!=Event.KEY_ESC) return;
this.finishDrag(event, false);
Event.stop(event);
},
-
+
endDrag: function(event) {
if(!this.dragging) return;
this.stopScrolling();
this.finishDrag(event, true);
Event.stop(event);
},
-
+
draw: function(point) {
var pos = Position.cumulativeOffset(this.element);
if(this.options.ghosting) {
var r = Position.realOffset(this.element);
pos[0] += r[0] - Position.deltaX; pos[1] += r[1] - Position.deltaY;
}
-
+
var d = this.currentDelta();
pos[0] -= d[0]; pos[1] -= d[1];
-
+
if(this.options.scroll && (this.options.scroll != window && this._isScrollChild)) {
pos[0] -= this.options.scroll.scrollLeft-this.originalScrollLeft;
pos[1] -= this.options.scroll.scrollTop-this.originalScrollTop;
}
-
- var p = [0,1].map(function(i){
- return (point[i]-pos[i]-this.offset[i])
+
+ var p = [0,1].map(function(i){
+ return (point[i]-pos[i]-this.offset[i])
}.bind(this));
-
+
if(this.options.snap) {
if(Object.isFunction(this.options.snap)) {
p = this.options.snap(p[0],p[1],this);
} else {
if(Object.isArray(this.options.snap)) {
p = p.map( function(v, i) {
- return (v/this.options.snap[i]).round()*this.options.snap[i] }.bind(this))
+ return (v/this.options.snap[i]).round()*this.options.snap[i] }.bind(this));
} else {
p = p.map( function(v) {
- return (v/this.options.snap).round()*this.options.snap }.bind(this))
+ return (v/this.options.snap).round()*this.options.snap }.bind(this));
}
}}
-
+
var style = this.element.style;
if((!this.options.constraint) || (this.options.constraint=='horizontal'))
style.left = p[0] + "px";
if((!this.options.constraint) || (this.options.constraint=='vertical'))
style.top = p[1] + "px";
-
+
if(style.visibility=="hidden") style.visibility = ""; // fix gecko rendering
},
-
+
stopScrolling: function() {
if(this.scrollInterval) {
clearInterval(this.scrollInterval);
Draggables._lastScrollPointer = null;
}
},
-
+
startScrolling: function(speed) {
if(!(speed[0] || speed[1])) return;
this.scrollSpeed = [speed[0]*this.options.scrollSpeed,speed[1]*this.options.scrollSpeed];
this.lastScrolled = new Date();
this.scrollInterval = setInterval(this.scroll.bind(this), 10);
},
-
+
scroll: function() {
var current = new Date();
var delta = current - this.lastScrolled;
this.options.scroll.scrollLeft += this.scrollSpeed[0] * delta / 1000;
this.options.scroll.scrollTop += this.scrollSpeed[1] * delta / 1000;
}
-
+
Position.prepare();
Droppables.show(Draggables._lastPointer, this.element);
Draggables.notify('onDrag', this);
Draggables._lastScrollPointer[1] = 0;
this.draw(Draggables._lastScrollPointer);
}
-
+
if(this.options.change) this.options.change(this);
},
-
+
_getWindowScroll: function(w) {
var T, L, W, H;
with (w.document) {
H = documentElement.clientHeight;
} else {
W = body.offsetWidth;
- H = body.offsetHeight
+ H = body.offsetHeight;
}
}
return { top: T, left: L, width: W, height: H };
this.observer = observer;
this.lastValue = Sortable.serialize(this.element);
},
-
+
onStart: function() {
this.lastValue = Sortable.serialize(this.element);
},
-
+
onEnd: function() {
Sortable.unmark();
if(this.lastValue != Sortable.serialize(this.element))
var Sortable = {
SERIALIZE_RULE: /^[^_\-](?:[A-Za-z0-9\-\_]*)[_](.*)$/,
-
+
sortables: { },
-
+
_findRootElement: function(element) {
- while (element.tagName.toUpperCase() != "BODY") {
+ while (element.tagName.toUpperCase() != "BODY") {
if(element.id && Sortable.sortables[element.id]) return element;
element = element.parentNode;
}
if(!element) return;
return Sortable.sortables[element.id];
},
-
+
destroy: function(element){
- var s = Sortable.options(element);
-
+ element = $(element);
+ var s = Sortable.sortables[element.id];
+
if(s) {
Draggables.removeObserver(s.element);
s.droppables.each(function(d){ Droppables.remove(d) });
s.draggables.invoke('destroy');
-
+
delete Sortable.sortables[s.element.id];
}
},
create: function(element) {
element = $(element);
- var options = Object.extend({
+ var options = Object.extend({
element: element,
tag: 'li', // assumes li children, override with tag: 'tagname'
dropOnEmpty: false,
delay: 0,
hoverclass: null,
ghosting: false,
- quiet: false,
+ quiet: false,
scroll: false,
scrollSensitivity: 20,
scrollSpeed: 15,
format: this.SERIALIZE_RULE,
-
- // these take arrays of elements or ids and can be
+
+ // these take arrays of elements or ids and can be
// used for better initialization performance
elements: false,
handles: false,
-
+
onChange: Prototype.emptyFunction,
onUpdate: Prototype.emptyFunction
}, arguments[1] || { });
if(options.zindex)
options_for_draggable.zindex = options.zindex;
- // build options for the droppables
+ // build options for the droppables
var options_for_droppable = {
overlap: options.overlap,
containment: options.containment,
tree: options.tree,
hoverclass: options.hoverclass,
onHover: Sortable.onHover
- }
-
+ };
+
var options_for_tree = {
onHover: Sortable.onEmptyHover,
overlap: options.overlap,
containment: options.containment,
hoverclass: options.hoverclass
- }
+ };
// fix for gecko engine
- Element.cleanWhitespace(element);
+ Element.cleanWhitespace(element);
options.draggables = [];
options.droppables = [];
(options.elements || this.findElements(element, options) || []).each( function(e,i) {
var handle = options.handles ? $(options.handles[i]) :
- (options.handle ? $(e).select('.' + options.handle)[0] : e);
+ (options.handle ? $(e).select('.' + options.handle)[0] : e);
options.draggables.push(
new Draggable(e, Object.extend(options_for_draggable, { handle: handle })));
Droppables.add(e, options_for_droppable);
if(options.tree) e.treeNode = element;
- options.droppables.push(e);
+ options.droppables.push(e);
});
-
+
if(options.tree) {
(Sortable.findTreeElements(element, options) || []).each( function(e) {
Droppables.add(e, options_for_tree);
return Element.findChildren(
element, options.only, options.tree ? true : false, options.tag);
},
-
+
findTreeElements: function(element, options) {
return Element.findChildren(
element, options.only, options.tree ? true : false, options.treeTag);
var oldParentNode = element.parentNode;
element.style.visibility = "hidden"; // fix gecko rendering
dropon.parentNode.insertBefore(element, dropon);
- if(dropon.parentNode!=oldParentNode)
+ if(dropon.parentNode!=oldParentNode)
Sortable.options(oldParentNode).onChange(element);
Sortable.options(dropon.parentNode).onChange(element);
}
var oldParentNode = element.parentNode;
element.style.visibility = "hidden"; // fix gecko rendering
dropon.parentNode.insertBefore(element, nextElement);
- if(dropon.parentNode!=oldParentNode)
+ if(dropon.parentNode!=oldParentNode)
Sortable.options(oldParentNode).onChange(element);
Sortable.options(dropon.parentNode).onChange(element);
}
}
},
-
+
onEmptyHover: function(element, dropon, overlap) {
var oldParentNode = element.parentNode;
var droponOptions = Sortable.options(dropon);
-
+
if(!Element.isParent(dropon, element)) {
var index;
-
+
var children = Sortable.findElements(dropon, {tag: droponOptions.tag, only: droponOptions.only});
var child = null;
-
+
if(children) {
var offset = Element.offsetSize(dropon, droponOptions.overlap) * (1.0 - overlap);
-
+
for (index = 0; index < children.length; index += 1) {
if (offset - Element.offsetSize (children[index], droponOptions.overlap) >= 0) {
offset -= Element.offsetSize (children[index], droponOptions.overlap);
}
}
}
-
+
dropon.insertBefore(element, child);
-
+
Sortable.options(oldParentNode).onChange(element);
droponOptions.onChange(element);
}
mark: function(dropon, position) {
// mark on ghosting only
var sortable = Sortable.options(dropon.parentNode);
- if(sortable && !sortable.ghosting) return;
+ if(sortable && !sortable.ghosting) return;
if(!Sortable._marker) {
- Sortable._marker =
+ Sortable._marker =
($('dropmarker') || Element.extend(document.createElement('DIV'))).
hide().addClassName('dropmarker').setStyle({position:'absolute'});
document.getElementsByTagName("body").item(0).appendChild(Sortable._marker);
- }
+ }
var offsets = Position.cumulativeOffset(dropon);
Sortable._marker.setStyle({left: offsets[0]+'px', top: offsets[1] + 'px'});
-
+
if(position=='after')
- if(sortable.overlap == 'horizontal')
+ if(sortable.overlap == 'horizontal')
Sortable._marker.setStyle({left: (offsets[0]+dropon.clientWidth) + 'px'});
else
Sortable._marker.setStyle({top: (offsets[1]+dropon.clientHeight) + 'px'});
-
+
Sortable._marker.show();
},
-
+
_tree: function(element, options, parent) {
var children = Sortable.findElements(element, options) || [];
-
+
for (var i = 0; i < children.length; ++i) {
var match = children[i].id.match(options.format);
if (!match) continue;
-
+
var child = {
id: encodeURIComponent(match ? match[1] : null),
element: element,
children: [],
position: parent.children.length,
container: $(children[i]).down(options.treeTag)
- }
-
+ };
+
/* Get the element containing the children and recurse over it */
if (child.container)
- this._tree(child.container, options, child)
-
+ this._tree(child.container, options, child);
+
parent.children.push (child);
}
- return parent;
+ return parent;
},
tree: function(element) {
name: element.id,
format: sortableOptions.format
}, arguments[1] || { });
-
+
var root = {
id: null,
parent: null,
children: [],
container: element,
position: 0
- }
-
+ };
+
return Sortable._tree(element, options, root);
},
sequence: function(element) {
element = $(element);
var options = Object.extend(this.options(element), arguments[1] || { });
-
+
return $(this.findElements(element, options) || []).map( function(item) {
return item.id.match(options.format) ? item.id.match(options.format)[1] : '';
});
setSequence: function(element, new_sequence) {
element = $(element);
var options = Object.extend(this.options(element), arguments[2] || { });
-
+
var nodeMap = { };
this.findElements(element, options).each( function(n) {
if (n.id.match(options.format))
nodeMap[n.id.match(options.format)[1]] = [n, n.parentNode];
n.parentNode.removeChild(n);
});
-
+
new_sequence.each(function(ident) {
var n = nodeMap[ident];
if (n) {
}
});
},
-
+
serialize: function(element) {
element = $(element);
var options = Object.extend(Sortable.options(element), arguments[1] || { });
var name = encodeURIComponent(
(arguments[1] && arguments[1].name) ? arguments[1].name : element.id);
-
+
if (options.tree) {
return Sortable.tree(element, arguments[1]).children.map( function (item) {
- return [name + Sortable._constructIndex(item) + "[id]=" +
+ return [name + Sortable._constructIndex(item) + "[id]=" +
encodeURIComponent(item.id)].concat(item.children.map(arguments.callee));
}).flatten().join('&');
} else {
}).join('&');
}
}
-}
+};
// Returns true if child is contained within element
Element.isParent = function(child, element) {
if (!child.parentNode || child == element) return false;
if (child.parentNode == element) return true;
return Element.isParent(child.parentNode, element);
-}
+};
-Element.findChildren = function(element, only, recursive, tagName) {
+Element.findChildren = function(element, only, recursive, tagName) {
if(!element.hasChildNodes()) return null;
tagName = tagName.toUpperCase();
if(only) only = [only].flatten();
});
return (elements.length>0 ? elements.flatten() : []);
-}
+};
Element.offsetSize = function (element, type) {
return element['offset' + ((type=='vertical' || type=='height') ? 'Height' : 'Width')];
-}
+};
\ No newline at end of file
-// Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+// Copyright (c) 2005-2008 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
// Contributors:
// Justin Palmer (http://encytemedia.com/)
// Mark Pilgrim (http://diveintomark.org/)
// Martin Bialasinki
-//
+//
// script.aculo.us is freely distributable under the terms of an MIT-style license.
-// For details, see the script.aculo.us web site: http://script.aculo.us/
+// For details, see the script.aculo.us web site: http://script.aculo.us/
-// converts rgb() and #xxx to #xxxxxx format,
-// returns self (or first argument) if not convertable
-String.prototype.parseColor = function() {
+// converts rgb() and #xxx to #xxxxxx format,
+// returns self (or first argument) if not convertable
+String.prototype.parseColor = function() {
var color = '#';
- if (this.slice(0,4) == 'rgb(') {
- var cols = this.slice(4,this.length-1).split(',');
- var i=0; do { color += parseInt(cols[i]).toColorPart() } while (++i<3);
- } else {
- if (this.slice(0,1) == '#') {
- if (this.length==4) for(var i=1;i<4;i++) color += (this.charAt(i) + this.charAt(i)).toLowerCase();
- if (this.length==7) color = this.toLowerCase();
- }
- }
- return (color.length==7 ? color : (arguments[0] || this));
+ if (this.slice(0,4) == 'rgb(') {
+ var cols = this.slice(4,this.length-1).split(',');
+ var i=0; do { color += parseInt(cols[i]).toColorPart() } while (++i<3);
+ } else {
+ if (this.slice(0,1) == '#') {
+ if (this.length==4) for(var i=1;i<4;i++) color += (this.charAt(i) + this.charAt(i)).toLowerCase();
+ if (this.length==7) color = this.toLowerCase();
+ }
+ }
+ return (color.length==7 ? color : (arguments[0] || this));
};
/*--------------------------------------------------------------------------*/
-Element.collectTextNodes = function(element) {
+Element.collectTextNodes = function(element) {
return $A($(element).childNodes).collect( function(node) {
- return (node.nodeType==3 ? node.nodeValue :
+ return (node.nodeType==3 ? node.nodeValue :
(node.hasChildNodes() ? Element.collectTextNodes(node) : ''));
}).flatten().join('');
};
-Element.collectTextNodesIgnoreClass = function(element, className) {
+Element.collectTextNodesIgnoreClass = function(element, className) {
return $A($(element).childNodes).collect( function(node) {
- return (node.nodeType==3 ? node.nodeValue :
- ((node.hasChildNodes() && !Element.hasClassName(node,className)) ?
+ return (node.nodeType==3 ? node.nodeValue :
+ ((node.hasChildNodes() && !Element.hasClassName(node,className)) ?
Element.collectTextNodesIgnoreClass(node, className) : ''));
}).flatten().join('');
};
Element.setContentZoom = function(element, percent) {
- element = $(element);
- element.setStyle({fontSize: (percent/100) + 'em'});
+ element = $(element);
+ element.setStyle({fontSize: (percent/100) + 'em'});
if (Prototype.Browser.WebKit) window.scrollBy(0,0);
return element;
};
Transitions: {
linear: Prototype.K,
sinoidal: function(pos) {
- return (-Math.cos(pos*Math.PI)/2) + 0.5;
+ return (-Math.cos(pos*Math.PI)/2) + .5;
},
reverse: function(pos) {
return 1-pos;
},
flicker: function(pos) {
- var pos = ((-Math.cos(pos*Math.PI)/4) + 0.75) + Math.random()/4;
+ var pos = ((-Math.cos(pos*Math.PI)/4) + .75) + Math.random()/4;
return pos > 1 ? 1 : pos;
},
wobble: function(pos) {
- return (-Math.cos(pos*Math.PI*(9*pos))/2) + 0.5;
+ return (-Math.cos(pos*Math.PI*(9*pos))/2) + .5;
},
- pulse: function(pos, pulses) {
- pulses = pulses || 5;
- return (
- ((pos % (1/pulses)) * pulses).round() == 0 ?
- ((pos * pulses * 2) - (pos * pulses * 2).floor()) :
- 1 - ((pos * pulses * 2) - (pos * pulses * 2).floor())
- );
+ pulse: function(pos, pulses) {
+ return (-Math.cos((pos*((pulses||5)-.5)*2)*Math.PI)/2) + .5;
},
- spring: function(pos) {
- return 1 - (Math.cos(pos * 4.5 * Math.PI) * Math.exp(-pos * 6));
+ spring: function(pos) {
+ return 1 - (Math.cos(pos * 4.5 * Math.PI) * Math.exp(-pos * 6));
},
none: function(pos) {
return 0;
tagifyText: function(element) {
var tagifyStyle = 'position:relative';
if (Prototype.Browser.IE) tagifyStyle += ';zoom:1';
-
+
element = $(element);
$A(element.childNodes).each( function(child) {
if (child.nodeType==3) {
child.nodeValue.toArray().each( function(character) {
element.insertBefore(
new Element('span', {style: tagifyStyle}).update(
- character == ' ' ? String.fromCharCode(160) : character),
+ character == ' ' ? String.fromCharCode(160) : character),
child);
});
Element.remove(child);
},
multiple: function(element, effect) {
var elements;
- if (((typeof element == 'object') ||
- Object.isFunction(element)) &&
+ if (((typeof element == 'object') ||
+ Object.isFunction(element)) &&
(element.length))
elements = element;
else
elements = $(element).childNodes;
-
+
var options = Object.extend({
speed: 0.1,
delay: 0.0
var options = Object.extend({
queue: { position:'end', scope:(element.id || 'global'), limit: 1 }
}, arguments[2] || { });
- Effect[element.visible() ?
+ Effect[element.visible() ?
Effect.PAIRS[effect][1] : Effect.PAIRS[effect][0]](element, options);
}
};
Effect.ScopedQueue = Class.create(Enumerable, {
initialize: function() {
this.effects = [];
- this.interval = null;
+ this.interval = null;
},
_each: function(iterator) {
this.effects._each(iterator);
},
add: function(effect) {
var timestamp = new Date().getTime();
-
- var position = Object.isString(effect.options.queue) ?
+
+ var position = Object.isString(effect.options.queue) ?
effect.options.queue : effect.options.queue.position;
-
+
switch(position) {
case 'front':
- // move unstarted effects after this effect
+ // move unstarted effects after this effect
this.effects.findAll(function(e){ return e.state=='idle' }).each( function(e) {
e.startOn += effect.finishOn;
e.finishOn += effect.finishOn;
timestamp = this.effects.pluck('finishOn').max() || timestamp;
break;
}
-
+
effect.startOn += timestamp;
effect.finishOn += timestamp;
if (!effect.options.queue.limit || (this.effects.length < effect.options.queue.limit))
this.effects.push(effect);
-
+
if (!this.interval)
this.interval = setInterval(this.loop.bind(this), 15);
},
},
loop: function() {
var timePos = new Date().getTime();
- for(var i=0, len=this.effects.length;i<len;i++)
+ for(var i=0, len=this.effects.length;i<len;i++)
this.effects[i] && this.effects[i].loop(timePos);
}
});
instances: $H(),
get: function(queueName) {
if (!Object.isString(queueName)) return queueName;
-
+
return this.instances.get(queueName) ||
this.instances.set(queueName, new Effect.ScopedQueue());
}
this.fromToDelta = this.options.to-this.options.from;
this.totalTime = this.finishOn-this.startOn;
this.totalFrames = this.options.fps*this.options.duration;
-
- eval('this.render = function(pos){ '+
- 'if (this.state=="idle"){this.state="running";'+
- codeForEvent(this.options,'beforeSetup')+
- (this.setup ? 'this.setup();':'')+
- codeForEvent(this.options,'afterSetup')+
- '};if (this.state=="running"){'+
- 'pos=this.options.transition(pos)*'+this.fromToDelta+'+'+this.options.from+';'+
- 'this.position=pos;'+
- codeForEvent(this.options,'beforeUpdate')+
- (this.update ? 'this.update(pos);':'')+
- codeForEvent(this.options,'afterUpdate')+
- '}}');
-
+
+ this.render = (function() {
+ function dispatch(effect, eventName) {
+ if (effect.options[eventName + 'Internal'])
+ effect.options[eventName + 'Internal'](effect);
+ if (effect.options[eventName])
+ effect.options[eventName](effect);
+ }
+
+ return function(pos) {
+ if (this.state === "idle") {
+ this.state = "running";
+ dispatch(this, 'beforeSetup');
+ if (this.setup) this.setup();
+ dispatch(this, 'afterSetup');
+ }
+ if (this.state === "running") {
+ pos = (this.options.transition(pos) * this.fromToDelta) + this.options.from;
+ this.position = pos;
+ dispatch(this, 'beforeUpdate');
+ if (this.update) this.update(pos);
+ dispatch(this, 'afterUpdate');
+ }
+ };
+ })();
+
this.event('beforeStart');
if (!this.options.sync)
- Effect.Queues.get(Object.isString(this.options.queue) ?
+ Effect.Queues.get(Object.isString(this.options.queue) ?
'global' : this.options.queue.scope).add(this);
},
loop: function(timePos) {
this.render(1.0);
this.cancel();
this.event('beforeFinish');
- if (this.finish) this.finish();
+ if (this.finish) this.finish();
this.event('afterFinish');
- return;
+ return;
}
var pos = (timePos - this.startOn) / this.totalTime,
frame = (pos * this.totalFrames).round();
},
cancel: function() {
if (!this.options.sync)
- Effect.Queues.get(Object.isString(this.options.queue) ?
+ Effect.Queues.get(Object.isString(this.options.queue) ?
'global' : this.options.queue.scope).remove(this);
this.state = 'finished';
},
Effect.Tween = Class.create(Effect.Base, {
initialize: function(object, from, to) {
object = Object.isString(object) ? $(object) : object;
- var args = $A(arguments), method = args.last(),
+ var args = $A(arguments), method = args.last(),
options = args.length == 5 ? args[3] : null;
this.method = Object.isFunction(method) ? method.bind(object) :
- Object.isFunction(object[method]) ? object[method].bind(object) :
+ Object.isFunction(object[method]) ? object[method].bind(object) :
function(value) { object[method] = value };
this.start(Object.extend({ from: from, to: to }, options || { }));
},
// for backwards compatibility
Effect.MoveBy = function(element, toTop, toLeft) {
- return new Effect.Move(element,
+ return new Effect.Move(element,
Object.extend({ x: toLeft, y: toTop }, arguments[3] || { }));
};
setup: function() {
this.restoreAfterFinish = this.options.restoreAfterFinish || false;
this.elementPositioning = this.element.getStyle('position');
-
+
this.originalStyle = { };
['top','left','width','height','fontSize'].each( function(k) {
this.originalStyle[k] = this.element.style[k];
}.bind(this));
-
+
this.originalTop = this.element.offsetTop;
this.originalLeft = this.element.offsetLeft;
-
+
var fontSize = this.element.getStyle('font-size') || '100%';
['em','px','%','pt'].each( function(fontSizeType) {
if (fontSize.indexOf(fontSizeType)>0) {
this.fontSizeType = fontSizeType;
}
}.bind(this));
-
+
this.factor = (this.options.scaleTo - this.options.scaleFrom)/100;
-
+
this.dims = null;
if (this.options.scaleMode=='box')
this.dims = [this.element.offsetHeight, this.element.offsetWidth];
Effect.ScrollTo = function(element) {
var options = arguments[1] || { },
- scrollOffsets = document.viewport.getScrollOffsets(),
- elementOffsets = $(element).cumulativeOffset(),
- max = (window.height || document.body.scrollHeight) - document.viewport.getHeight();
+ scrollOffsets = document.viewport.getScrollOffsets(),
+ elementOffsets = $(element).cumulativeOffset();
if (options.offset) elementOffsets[1] += options.offset;
return new Effect.Tween(null,
scrollOffsets.top,
- elementOffsets[1] > max ? max : elementOffsets[1],
+ elementOffsets[1],
options,
- function(p){ scrollTo(scrollOffsets.left, p.round()) }
+ function(p){ scrollTo(scrollOffsets.left, p.round()); }
);
};
var options = Object.extend({
from: element.getOpacity() || 1.0,
to: 0.0,
- afterFinishInternal: function(effect) {
+ afterFinishInternal: function(effect) {
if (effect.options.to!=0) return;
- effect.element.hide().setStyle({opacity: oldOpacity});
+ effect.element.hide().setStyle({opacity: oldOpacity});
}
}, arguments[1] || { });
return new Effect.Opacity(element,options);
effect.element.forceRerendering();
},
beforeSetup: function(effect) {
- effect.element.setOpacity(effect.options.from).show();
+ effect.element.setOpacity(effect.options.from).show();
}}, arguments[1] || { });
return new Effect.Opacity(element,options);
};
Effect.Puff = function(element) {
element = $(element);
- var oldStyle = {
- opacity: element.getInlineOpacity(),
+ var oldStyle = {
+ opacity: element.getInlineOpacity(),
position: element.getStyle('position'),
top: element.style.top,
left: element.style.left,
height: element.style.height
};
return new Effect.Parallel(
- [ new Effect.Scale(element, 200,
- { sync: true, scaleFromCenter: true, scaleContent: true, restoreAfterFinish: true }),
- new Effect.Opacity(element, { sync: true, to: 0.0 } ) ],
- Object.extend({ duration: 1.0,
+ [ new Effect.Scale(element, 200,
+ { sync: true, scaleFromCenter: true, scaleContent: true, restoreAfterFinish: true }),
+ new Effect.Opacity(element, { sync: true, to: 0.0 } ) ],
+ Object.extend({ duration: 1.0,
beforeSetupInternal: function(effect) {
- Position.absolutize(effect.effects[0].element)
+ Position.absolutize(effect.effects[0].element);
},
afterFinishInternal: function(effect) {
effect.effects[0].element.hide().setStyle(oldStyle); }
element = $(element);
element.makeClipping();
return new Effect.Scale(element, 0,
- Object.extend({ scaleContent: false,
- scaleX: false,
+ Object.extend({ scaleContent: false,
+ scaleX: false,
restoreAfterFinish: true,
afterFinishInternal: function(effect) {
effect.element.hide().undoClipping();
- }
+ }
}, arguments[1] || { })
);
};
Effect.BlindDown = function(element) {
element = $(element);
var elementDimensions = element.getDimensions();
- return new Effect.Scale(element, 100, Object.extend({
- scaleContent: false,
+ return new Effect.Scale(element, 100, Object.extend({
+ scaleContent: false,
scaleX: false,
scaleFrom: 0,
scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width},
restoreAfterFinish: true,
afterSetup: function(effect) {
- effect.element.makeClipping().setStyle({height: '0px'}).show();
- },
+ effect.element.makeClipping().setStyle({height: '0px'}).show();
+ },
afterFinishInternal: function(effect) {
effect.element.undoClipping();
}
from: 0,
transition: Effect.Transitions.flicker,
afterFinishInternal: function(effect) {
- new Effect.Scale(effect.element, 1, {
+ new Effect.Scale(effect.element, 1, {
duration: 0.3, scaleFromCenter: true,
scaleX: false, scaleContent: false, restoreAfterFinish: true,
- beforeSetup: function(effect) {
+ beforeSetup: function(effect) {
effect.element.makePositioned().makeClipping();
},
afterFinishInternal: function(effect) {
effect.element.hide().undoClipping().undoPositioned().setStyle({opacity: oldOpacity});
}
- })
+ });
}
}, arguments[1] || { }));
};
left: element.getStyle('left'),
opacity: element.getInlineOpacity() };
return new Effect.Parallel(
- [ new Effect.Move(element, {x: 0, y: 100, sync: true }),
+ [ new Effect.Move(element, {x: 0, y: 100, sync: true }),
new Effect.Opacity(element, { sync: true, to: 0.0 }) ],
Object.extend(
{ duration: 0.5,
beforeSetup: function(effect) {
- effect.effects[0].element.makePositioned();
+ effect.effects[0].element.makePositioned();
},
afterFinishInternal: function(effect) {
effect.effects[0].element.hide().undoPositioned().setStyle(oldStyle);
- }
+ }
}, arguments[1] || { }));
};
new Effect.Move(effect.element,
{ x: -distance, y: 0, duration: split, afterFinishInternal: function(effect) {
effect.element.undoPositioned().setStyle(oldStyle);
- }}) }}) }}) }}) }}) }});
+ }}); }}); }}); }}); }}); }});
};
Effect.SlideDown = function(element) {
// SlideDown need to have the content of the element wrapped in a container element with fixed height!
var oldInnerBottom = element.down().getStyle('bottom');
var elementDimensions = element.getDimensions();
- return new Effect.Scale(element, 100, Object.extend({
- scaleContent: false,
- scaleX: false,
+ return new Effect.Scale(element, 100, Object.extend({
+ scaleContent: false,
+ scaleX: false,
scaleFrom: window.opera ? 0 : 1,
scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width},
restoreAfterFinish: true,
effect.element.makePositioned();
effect.element.down().makePositioned();
if (window.opera) effect.element.setStyle({top: ''});
- effect.element.makeClipping().setStyle({height: '0px'}).show();
+ effect.element.makeClipping().setStyle({height: '0px'}).show();
},
afterUpdateInternal: function(effect) {
effect.element.down().setStyle({bottom:
- (effect.dims[0] - effect.element.clientHeight) + 'px' });
+ (effect.dims[0] - effect.element.clientHeight) + 'px' });
},
afterFinishInternal: function(effect) {
effect.element.undoClipping().undoPositioned();
var oldInnerBottom = element.down().getStyle('bottom');
var elementDimensions = element.getDimensions();
return new Effect.Scale(element, window.opera ? 0 : 1,
- Object.extend({ scaleContent: false,
- scaleX: false,
+ Object.extend({ scaleContent: false,
+ scaleX: false,
scaleMode: 'box',
scaleFrom: 100,
scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width},
effect.element.down().makePositioned();
if (window.opera) effect.element.setStyle({top: ''});
effect.element.makeClipping().show();
- },
+ },
afterUpdateInternal: function(effect) {
effect.element.down().setStyle({bottom:
(effect.dims[0] - effect.element.clientHeight) + 'px' });
);
};
-// Bug in opera makes the TD containing this element expand for a instance after finish
+// Bug in opera makes the TD containing this element expand for a instance after finish
Effect.Squish = function(element) {
- return new Effect.Scale(element, window.opera ? 1 : 0, {
+ return new Effect.Scale(element, window.opera ? 1 : 0, {
restoreAfterFinish: true,
beforeSetup: function(effect) {
- effect.element.makeClipping();
- },
+ effect.element.makeClipping();
+ },
afterFinishInternal: function(effect) {
- effect.element.hide().undoClipping();
+ effect.element.hide().undoClipping();
}
});
};
width: element.style.width,
opacity: element.getInlineOpacity() };
- var dims = element.getDimensions();
+ var dims = element.getDimensions();
var initialMoveX, initialMoveY;
var moveX, moveY;
-
+
switch (options.direction) {
case 'top-left':
- initialMoveX = initialMoveY = moveX = moveY = 0;
+ initialMoveX = initialMoveY = moveX = moveY = 0;
break;
case 'top-right':
initialMoveX = dims.width;
moveY = -dims.height / 2;
break;
}
-
+
return new Effect.Move(element, {
x: initialMoveX,
y: initialMoveY,
- duration: 0.01,
+ duration: 0.01,
beforeSetup: function(effect) {
effect.element.hide().makeClipping().makePositioned();
},
[ new Effect.Opacity(effect.element, { sync: true, to: 1.0, from: 0.0, transition: options.opacityTransition }),
new Effect.Move(effect.element, { x: moveX, y: moveY, sync: true, transition: options.moveTransition }),
new Effect.Scale(effect.element, 100, {
- scaleMode: { originalHeight: dims.height, originalWidth: dims.width },
+ scaleMode: { originalHeight: dims.height, originalWidth: dims.width },
sync: true, scaleFrom: window.opera ? 1 : 0, transition: options.scaleTransition, restoreAfterFinish: true})
], Object.extend({
beforeSetup: function(effect) {
- effect.effects[0].element.setStyle({height: '0px'}).show();
+ effect.effects[0].element.setStyle({height: '0px'}).show();
},
afterFinishInternal: function(effect) {
- effect.effects[0].element.undoClipping().undoPositioned().setStyle(oldStyle);
+ effect.effects[0].element.undoClipping().undoPositioned().setStyle(oldStyle);
}
}, options)
- )
+ );
}
});
};
var dims = element.getDimensions();
var moveX, moveY;
-
+
switch (options.direction) {
case 'top-left':
moveX = moveY = 0;
moveX = dims.width;
moveY = dims.height;
break;
- case 'center':
+ case 'center':
moveX = dims.width / 2;
moveY = dims.height / 2;
break;
}
-
+
return new Effect.Parallel(
[ new Effect.Opacity(element, { sync: true, to: 0.0, from: 1.0, transition: options.opacityTransition }),
new Effect.Scale(element, window.opera ? 1 : 0, { sync: true, transition: options.scaleTransition, restoreAfterFinish: true}),
new Effect.Move(element, { x: moveX, y: moveY, sync: true, transition: options.moveTransition })
- ], Object.extend({
+ ], Object.extend({
beforeStartInternal: function(effect) {
- effect.effects[0].element.makePositioned().makeClipping();
+ effect.effects[0].element.makePositioned().makeClipping();
},
afterFinishInternal: function(effect) {
effect.effects[0].element.hide().undoClipping().undoPositioned().setStyle(oldStyle); }
Effect.Pulsate = function(element) {
element = $(element);
- var options = arguments[1] || { };
- var oldOpacity = element.getInlineOpacity();
- var transition = options.transition || Effect.Transitions.sinoidal;
- var reverser = function(pos){ return transition(1-Effect.Transitions.pulse(pos, options.pulses)) };
- reverser.bind(transition);
- return new Effect.Opacity(element,
+ var options = arguments[1] || { },
+ oldOpacity = element.getInlineOpacity(),
+ transition = options.transition || Effect.Transitions.linear,
+ reverser = function(pos){
+ return 1 - transition((-Math.cos((pos*(options.pulses||5)*2)*Math.PI)/2) + .5);
+ };
+
+ return new Effect.Opacity(element,
Object.extend(Object.extend({ duration: 2.0, from: 0,
afterFinishInternal: function(effect) { effect.element.setStyle({opacity: oldOpacity}); }
}, options), {transition: reverser}));
width: element.style.width,
height: element.style.height };
element.makeClipping();
- return new Effect.Scale(element, 5, Object.extend({
+ return new Effect.Scale(element, 5, Object.extend({
scaleContent: false,
scaleX: false,
afterFinishInternal: function(effect) {
- new Effect.Scale(element, 1, {
- scaleContent: false,
+ new Effect.Scale(element, 1, {
+ scaleContent: false,
scaleY: false,
afterFinishInternal: function(effect) {
effect.element.hide().undoClipping().setStyle(oldStyle);
var options = Object.extend({
style: { }
}, arguments[1] || { });
-
+
if (!Object.isString(options.style)) this.style = $H(options.style);
else {
if (options.style.include(':'))
effect.transforms.each(function(transform) {
effect.element.style[transform.style] = '';
});
- }
+ };
}
}
this.start(options);
},
-
+
setup: function(){
function parseColor(color){
if (!color || ['rgba(0, 0, 0, 0)','transparent'].include(color)) color = '#ffffff';
color = color.parseColor();
return $R(0,2).map(function(i){
- return parseInt( color.slice(i*2+1,i*2+3), 16 )
+ return parseInt( color.slice(i*2+1,i*2+3), 16 );
});
}
this.transforms = this.style.map(function(pair){
}
var originalValue = this.element.getStyle(property);
- return {
- style: property.camelize(),
- originalValue: unit=='color' ? parseColor(originalValue) : parseFloat(originalValue || 0),
+ return {
+ style: property.camelize(),
+ originalValue: unit=='color' ? parseColor(originalValue) : parseFloat(originalValue || 0),
targetValue: unit=='color' ? parseColor(value) : value,
unit: unit
};
transform.unit != 'color' &&
(isNaN(transform.originalValue) || isNaN(transform.targetValue))
)
- )
+ );
});
},
update: function(position) {
var style = { }, transform, i = this.transforms.length;
while(i--)
- style[(transform = this.transforms[i]).style] =
+ style[(transform = this.transforms[i]).style] =
transform.unit=='color' ? '#'+
(Math.round(transform.originalValue[0]+
(transform.targetValue[0]-transform.originalValue[0])*position)).toColorPart() +
(Math.round(transform.originalValue[2]+
(transform.targetValue[2]-transform.originalValue[2])*position)).toColorPart() :
(transform.originalValue +
- (transform.targetValue - transform.originalValue) * position).toFixed(3) +
+ (transform.targetValue - transform.originalValue) * position).toFixed(3) +
(transform.unit === null ? '' : transform.unit);
this.element.setStyle(style, true);
}
});
Element.CSS_PROPERTIES = $w(
- 'backgroundColor backgroundPosition borderBottomColor borderBottomStyle ' +
+ 'backgroundColor backgroundPosition borderBottomColor borderBottomStyle ' +
'borderBottomWidth borderLeftColor borderLeftStyle borderLeftWidth ' +
'borderRightColor borderRightStyle borderRightWidth borderSpacing ' +
'borderTopColor borderTopStyle borderTopWidth bottom clip color ' +
'maxWidth minHeight minWidth opacity outlineColor outlineOffset ' +
'outlineWidth paddingBottom paddingLeft paddingRight paddingTop ' +
'right textIndent top width wordSpacing zIndex');
-
+
Element.CSS_LENGTH = /^(([\+\-]?[0-9\.]+)(em|ex|px|in|cm|mm|pt|pc|\%))|0$/;
String.__parseStyleElement = document.createElement('div');
String.__parseStyleElement.innerHTML = '<div style="' + this + '"></div>';
style = String.__parseStyleElement.childNodes[0].style;
}
-
+
Element.CSS_PROPERTIES.each(function(property){
- if (style[property]) styleRules.set(property, style[property]);
+ if (style[property]) styleRules.set(property, style[property]);
});
-
+
if (Prototype.Browser.IE && this.include('opacity'))
styleRules.set('opacity', this.match(/opacity:\s*((?:0|1)?(?:\.\d*)?)/)[1]);
Element.getStyles = function(element) {
element = $(element);
var css = element.currentStyle, styles;
- styles = Element.CSS_PROPERTIES.inject({ }, function(hash, property) {
- hash.set(property, css[property]);
- return hash;
+ styles = Element.CSS_PROPERTIES.inject({ }, function(results, property) {
+ results[property] = css[property];
+ return results;
});
- if (!styles.opacity) styles.set('opacity', element.getOpacity());
+ if (!styles.opacity) styles.opacity = element.getOpacity();
return styles;
};
-};
+}
Effect.Methods = {
morph: function(element, style) {
return element;
},
visualEffect: function(element, effect, options) {
- element = $(element)
+ element = $(element);
var s = effect.dasherize().camelize(), klass = s.charAt(0).toUpperCase() + s.substring(1);
new Effect[klass](element, options);
return element;
$w('fade appear grow shrink fold blindUp blindDown slideUp slideDown '+
'pulsate shake puff squish switchOff dropOut').each(
- function(effect) {
+ function(effect) {
Effect.Methods[effect] = function(element, options){
element = $(element);
Effect[effect.charAt(0).toUpperCase() + effect.substring(1)](element, options);
return element;
- }
+ };
}
);
-$w('getInlineOpacity forceRerendering setContentZoom collectTextNodes collectTextNodesIgnoreClass getStyles').each(
+$w('getInlineOpacity forceRerendering setContentZoom collectTextNodes collectTextNodesIgnoreClass getStyles').each(
function(f) { Effect.Methods[f] = Element[f]; }
);
-Element.addMethods(Effect.Methods);
+Element.addMethods(Effect.Methods);
\ No newline at end of file
-/* Prototype JavaScript framework, version 1.6.0.1
- * (c) 2005-2007 Sam Stephenson
+/* Prototype JavaScript framework, version 1.6.0.3
+ * (c) 2005-2008 Sam Stephenson
*
* Prototype is freely distributable under the terms of an MIT-style license.
* For details, see the Prototype web site: http://www.prototypejs.org/
*--------------------------------------------------------------------------*/
var Prototype = {
- Version: '1.6.0.1',
+ Version: '1.6.0.3',
Browser: {
- IE: !!(window.attachEvent && !window.opera),
- Opera: !!window.opera,
+ IE: !!(window.attachEvent &&
+ navigator.userAgent.indexOf('Opera') === -1),
+ Opera: navigator.userAgent.indexOf('Opera') > -1,
WebKit: navigator.userAgent.indexOf('AppleWebKit/') > -1,
- Gecko: navigator.userAgent.indexOf('Gecko') > -1 && navigator.userAgent.indexOf('KHTML') == -1,
+ Gecko: navigator.userAgent.indexOf('Gecko') > -1 &&
+ navigator.userAgent.indexOf('KHTML') === -1,
MobileSafari: !!navigator.userAgent.match(/Apple.*Mobile.*Safari/)
},
BrowserFeatures: {
XPath: !!document.evaluate,
+ SelectorsAPI: !!document.querySelector,
ElementExtensions: !!window.HTMLElement,
SpecificElementExtensions:
- document.createElement('div').__proto__ &&
- document.createElement('div').__proto__ !==
- document.createElement('form').__proto__
+ document.createElement('div')['__proto__'] &&
+ document.createElement('div')['__proto__'] !==
+ document.createElement('form')['__proto__']
},
ScriptFragment: '<script[^>]*>([\\S\\s]*?)<\/script>',
var property = properties[i], value = source[property];
if (ancestor && Object.isFunction(value) &&
value.argumentNames().first() == "$super") {
- var method = value, value = Object.extend((function(m) {
+ var method = value;
+ value = (function(m) {
return function() { return ancestor[m].apply(this, arguments) };
- })(property).wrap(method), {
- valueOf: function() { return method },
- toString: function() { return method.toString() }
- });
+ })(property).wrap(method);
+
+ value.valueOf = method.valueOf.bind(method);
+ value.toString = method.toString.bind(method);
}
this.prototype[property] = value;
}
try {
if (Object.isUndefined(object)) return 'undefined';
if (object === null) return 'null';
- return object.inspect ? object.inspect() : object.toString();
+ return object.inspect ? object.inspect() : String(object);
} catch (e) {
if (e instanceof RangeError) return '...';
throw e;
},
isElement: function(object) {
- return object && object.nodeType == 1;
+ return !!(object && object.nodeType == 1);
},
isArray: function(object) {
- return object && object.constructor === Array;
+ return object != null && typeof object == "object" &&
+ 'splice' in object && 'join' in object;
},
isHash: function(object) {
Object.extend(Function.prototype, {
argumentNames: function() {
- var names = this.toString().match(/^[\s\(]*function[^(]*\((.*?)\)/)[1].split(",").invoke("strip");
+ var names = this.toString().match(/^[\s\(]*function[^(]*\(([^\)]*)\)/)[1]
+ .replace(/\s+/g, '').split(',');
return names.length == 1 && !names[0] ? [] : names;
},
}, timeout);
},
+ defer: function() {
+ var args = [0.01].concat($A(arguments));
+ return this.delay.apply(this, args);
+ },
+
wrap: function(wrapper) {
var __method = this;
return function() {
}
});
-Function.prototype.defer = Function.prototype.delay.curry(0.01);
-
Date.prototype.toJSON = function() {
return '"' + this.getUTCFullYear() + '-' +
(this.getUTCMonth() + 1).toPaddedString(2) + '-' +
return this.replace(/&/g,'&').replace(/</g,'<').replace(/>/g,'>');
},
unescapeHTML: function() {
- return this.replace(/&/g,'&').replace(/</g,'<').replace(/>/g,'>');
+ return this.stripTags().replace(/&/g,'&').replace(/</g,'<').replace(/>/g,'>');
}
});
text: document.createTextNode('')
});
-with (String.prototype.escapeHTML) div.appendChild(text);
+String.prototype.escapeHTML.div.appendChild(String.prototype.escapeHTML.text);
var Template = Class.create({
initialize: function(template, pattern) {
}
return before + String.interpret(ctx);
- }.bind(this));
+ });
}
});
Template.Pattern = /(^|.|\r|\n)(#\{(.*?)\})/;
var Enumerable = {
each: function(iterator, context) {
var index = 0;
- iterator = iterator.bind(context);
try {
this._each(function(value) {
- iterator(value, index++);
+ iterator.call(context, value, index++);
});
} catch (e) {
if (e != $break) throw e;
},
eachSlice: function(number, iterator, context) {
- iterator = iterator ? iterator.bind(context) : Prototype.K;
var index = -number, slices = [], array = this.toArray();
+ if (number < 1) return array;
while ((index += number) < array.length)
slices.push(array.slice(index, index+number));
return slices.collect(iterator, context);
},
all: function(iterator, context) {
- iterator = iterator ? iterator.bind(context) : Prototype.K;
+ iterator = iterator || Prototype.K;
var result = true;
this.each(function(value, index) {
- result = result && !!iterator(value, index);
+ result = result && !!iterator.call(context, value, index);
if (!result) throw $break;
});
return result;
},
any: function(iterator, context) {
- iterator = iterator ? iterator.bind(context) : Prototype.K;
+ iterator = iterator || Prototype.K;
var result = false;
this.each(function(value, index) {
- if (result = !!iterator(value, index))
+ if (result = !!iterator.call(context, value, index))
throw $break;
});
return result;
},
collect: function(iterator, context) {
- iterator = iterator ? iterator.bind(context) : Prototype.K;
+ iterator = iterator || Prototype.K;
var results = [];
this.each(function(value, index) {
- results.push(iterator(value, index));
+ results.push(iterator.call(context, value, index));
});
return results;
},
detect: function(iterator, context) {
- iterator = iterator.bind(context);
var result;
this.each(function(value, index) {
- if (iterator(value, index)) {
+ if (iterator.call(context, value, index)) {
result = value;
throw $break;
}
},
findAll: function(iterator, context) {
- iterator = iterator.bind(context);
var results = [];
this.each(function(value, index) {
- if (iterator(value, index))
+ if (iterator.call(context, value, index))
results.push(value);
});
return results;
},
grep: function(filter, iterator, context) {
- iterator = iterator ? iterator.bind(context) : Prototype.K;
+ iterator = iterator || Prototype.K;
var results = [];
if (Object.isString(filter))
this.each(function(value, index) {
if (filter.match(value))
- results.push(iterator(value, index));
+ results.push(iterator.call(context, value, index));
});
return results;
},
},
inject: function(memo, iterator, context) {
- iterator = iterator.bind(context);
this.each(function(value, index) {
- memo = iterator(memo, value, index);
+ memo = iterator.call(context, memo, value, index);
});
return memo;
},
},
max: function(iterator, context) {
- iterator = iterator ? iterator.bind(context) : Prototype.K;
+ iterator = iterator || Prototype.K;
var result;
this.each(function(value, index) {
- value = iterator(value, index);
+ value = iterator.call(context, value, index);
if (result == null || value >= result)
result = value;
});
},
min: function(iterator, context) {
- iterator = iterator ? iterator.bind(context) : Prototype.K;
+ iterator = iterator || Prototype.K;
var result;
this.each(function(value, index) {
- value = iterator(value, index);
+ value = iterator.call(context, value, index);
if (result == null || value < result)
result = value;
});
},
partition: function(iterator, context) {
- iterator = iterator ? iterator.bind(context) : Prototype.K;
+ iterator = iterator || Prototype.K;
var trues = [], falses = [];
this.each(function(value, index) {
- (iterator(value, index) ?
+ (iterator.call(context, value, index) ?
trues : falses).push(value);
});
return [trues, falses];
},
reject: function(iterator, context) {
- iterator = iterator.bind(context);
var results = [];
this.each(function(value, index) {
- if (!iterator(value, index))
+ if (!iterator.call(context, value, index))
results.push(value);
});
return results;
},
sortBy: function(iterator, context) {
- iterator = iterator.bind(context);
return this.map(function(value, index) {
- return {value: value, criteria: iterator(value, index)};
+ return {
+ value: value,
+ criteria: iterator.call(context, value, index)
+ };
}).sort(function(left, right) {
var a = left.criteria, b = right.criteria;
return a < b ? -1 : a > b ? 1 : 0;
function $A(iterable) {
if (!iterable) return [];
if (iterable.toArray) return iterable.toArray();
- var length = iterable.length, results = new Array(length);
+ var length = iterable.length || 0, results = new Array(length);
while (length--) results[length] = iterable[length];
return results;
}
if (Prototype.Browser.WebKit) {
- function $A(iterable) {
+ $A = function(iterable) {
if (!iterable) return [];
- if (!(Object.isFunction(iterable) && iterable == '[object NodeList]') &&
- iterable.toArray) return iterable.toArray();
- var length = iterable.length, results = new Array(length);
+ // In Safari, only use the `toArray` method if it's not a NodeList.
+ // A NodeList is a function, has an function `item` property, and a numeric
+ // `length` property. Adapted from Google Doctype.
+ if (!(typeof iterable === 'function' && typeof iterable.length ===
+ 'number' && typeof iterable.item === 'function') && iterable.toArray)
+ return iterable.toArray();
+ var length = iterable.length || 0, results = new Array(length);
while (length--) results[length] = iterable[length];
return results;
- }
+ };
}
Array.from = $A;
return this + 1;
},
- times: function(iterator) {
- $R(0, this, true).each(iterator);
+ times: function(iterator, context) {
+ $R(0, this, true).each(iterator, context);
return this;
},
},
get: function(key) {
- return this._object[key];
+ // simulating poorly supported hasOwnProperty
+ if (this._object[key] !== Object.prototype[key])
+ return this._object[key];
},
unset: function(key) {
},
toQueryString: function() {
- return this.map(function(pair) {
+ return this.inject([], function(results, pair) {
var key = encodeURIComponent(pair.key), values = pair.value;
if (values && typeof values == 'object') {
if (Object.isArray(values))
- return values.map(toQueryPair.curry(key)).join('&');
- }
- return toQueryPair(key, values);
+ return results.concat(values.map(toQueryPair.curry(key)));
+ } else results.push(toQueryPair(key, values));
+ return results;
}).join('&');
},
var contentType = response.getHeader('Content-type');
if (this.options.evalJS == 'force'
- || (this.options.evalJS && contentType
+ || (this.options.evalJS && this.isSameOrigin() && contentType
&& contentType.match(/^\s*(text|application)\/(x-)?(java|ecma)script(;.*)?\s*$/i)))
this.evalResponse();
}
}
},
+ isSameOrigin: function() {
+ var m = this.url.match(/^\s*https?:\/\/[^\/]*/);
+ return !m || (m[0] == '#{protocol}//#{domain}#{port}'.interpolate({
+ protocol: location.protocol,
+ domain: document.domain,
+ port: location.port ? ':' + location.port : ''
+ }));
+ },
+
getHeader: function(name) {
try {
- return this.transport.getResponseHeader(name);
+ return this.transport.getResponseHeader(name) || null;
} catch (e) { return null }
},
if (!json) return null;
json = decodeURIComponent(escape(json));
try {
- return json.evalJSON(this.request.options.sanitizeJSON);
+ return json.evalJSON(this.request.options.sanitizeJSON ||
+ !this.request.isSameOrigin());
} catch (e) {
this.request.dispatchException(e);
}
this.responseText.blank())
return null;
try {
- return this.responseText.evalJSON(options.sanitizeJSON);
+ return this.responseText.evalJSON(options.sanitizeJSON ||
+ !this.request.isSameOrigin());
} catch (e) {
this.request.dispatchException(e);
}
return Element.writeAttribute(cache[tagName].cloneNode(false), attributes);
};
Object.extend(this.Element, element || { });
+ if (element) this.Element.prototype = element.prototype;
}).call(window);
Element.cache = { };
},
hide: function(element) {
- $(element).style.display = 'none';
+ element = $(element);
+ element.style.display = 'none';
return element;
},
show: function(element) {
- $(element).style.display = '';
+ element = $(element);
+ element.style.display = '';
return element;
},
Object.isElement(insertions) || (insertions && (insertions.toElement || insertions.toHTML)))
insertions = {bottom:insertions};
- var content, t, range;
+ var content, insert, tagName, childNodes;
- for (position in insertions) {
+ for (var position in insertions) {
content = insertions[position];
position = position.toLowerCase();
- t = Element._insertionTranslations[position];
+ insert = Element._insertionTranslations[position];
if (content && content.toElement) content = content.toElement();
if (Object.isElement(content)) {
- t.insert(element, content);
+ insert(element, content);
continue;
}
content = Object.toHTML(content);
- range = element.ownerDocument.createRange();
- t.initializeRange(element, range);
- t.insert(element, range.createContextualFragment(content.stripScripts()));
+ tagName = ((position == 'before' || position == 'after')
+ ? element.parentNode : element).tagName.toUpperCase();
+
+ childNodes = Element._getContentFromAnonymousElement(tagName, content.stripScripts());
+
+ if (position == 'top' || position == 'after') childNodes.reverse();
+ childNodes.each(insert.curry(element));
content.evalScripts.bind(content).defer();
}
},
descendants: function(element) {
- return $(element).getElementsBySelector("*");
+ return $(element).select("*");
},
firstDescendant: function(element) {
element = $(element);
if (arguments.length == 1) return $(element.parentNode);
var ancestors = element.ancestors();
- return expression ? Selector.findElement(ancestors, expression, index) :
- ancestors[index || 0];
+ return Object.isNumber(expression) ? ancestors[expression] :
+ Selector.findElement(ancestors, expression, index);
},
down: function(element, expression, index) {
element = $(element);
if (arguments.length == 1) return element.firstDescendant();
- var descendants = element.descendants();
- return expression ? Selector.findElement(descendants, expression, index) :
- descendants[index || 0];
+ return Object.isNumber(expression) ? element.descendants()[expression] :
+ Element.select(element, expression)[index || 0];
},
previous: function(element, expression, index) {
element = $(element);
if (arguments.length == 1) return $(Selector.handlers.previousElementSibling(element));
var previousSiblings = element.previousSiblings();
- return expression ? Selector.findElement(previousSiblings, expression, index) :
- previousSiblings[index || 0];
+ return Object.isNumber(expression) ? previousSiblings[expression] :
+ Selector.findElement(previousSiblings, expression, index);
},
next: function(element, expression, index) {
element = $(element);
if (arguments.length == 1) return $(Selector.handlers.nextElementSibling(element));
var nextSiblings = element.nextSiblings();
- return expression ? Selector.findElement(nextSiblings, expression, index) :
- nextSiblings[index || 0];
+ return Object.isNumber(expression) ? nextSiblings[expression] :
+ Selector.findElement(nextSiblings, expression, index);
},
select: function() {
descendantOf: function(element, ancestor) {
element = $(element), ancestor = $(ancestor);
- var originalAncestor = ancestor;
if (element.compareDocumentPosition)
return (element.compareDocumentPosition(ancestor) & 8) === 8;
- if (element.sourceIndex && !Prototype.Browser.Opera) {
- var e = element.sourceIndex, a = ancestor.sourceIndex,
- nextAncestor = ancestor.nextSibling;
- if (!nextAncestor) {
- do { ancestor = ancestor.parentNode; }
- while (!(nextAncestor = ancestor.nextSibling) && ancestor.parentNode);
- }
- if (nextAncestor) return (e > a && e < nextAncestor.sourceIndex);
- }
+ if (ancestor.contains)
+ return ancestor.contains(element) && ancestor !== element;
while (element = element.parentNode)
- if (element == originalAncestor) return true;
+ if (element == ancestor) return true;
+
return false;
},
element = $(element);
style = style == 'float' ? 'cssFloat' : style.camelize();
var value = element.style[style];
- if (!value) {
+ if (!value || value == 'auto') {
var css = document.defaultView.getComputedStyle(element, null);
value = css ? css[style] : null;
}
getDimensions: function(element) {
element = $(element);
- var display = $(element).getStyle('display');
+ var display = element.getStyle('display');
if (display != 'none' && display != null) // Safari bug
return {width: element.offsetWidth, height: element.offsetHeight};
element.style.position = 'relative';
// Opera returns the offset relative to the positioning context, when an
// element is position relative but top and left have not been defined
- if (window.opera) {
+ if (Prototype.Browser.Opera) {
element.style.top = 0;
element.style.left = 0;
}
valueL += element.offsetLeft || 0;
element = element.offsetParent;
if (element) {
- if (element.tagName == 'BODY') break;
+ if (element.tagName.toUpperCase() == 'BODY') break;
var p = Element.getStyle(element, 'position');
- if (p == 'relative' || p == 'absolute') break;
+ if (p !== 'static') break;
}
} while (element);
return Element._returnOffset(valueL, valueT);
absolutize: function(element) {
element = $(element);
- if (element.getStyle('position') == 'absolute') return;
+ if (element.getStyle('position') == 'absolute') return element;
// Position.prepare(); // To be done manually by Scripty when it needs it.
var offsets = element.positionedOffset();
relativize: function(element) {
element = $(element);
- if (element.getStyle('position') == 'relative') return;
+ if (element.getStyle('position') == 'relative') return element;
// Position.prepare(); // To be done manually by Scripty when it needs it.
element.style.position = 'relative';
element = forElement;
do {
- if (!Prototype.Browser.Opera || element.tagName == 'BODY') {
+ if (!Prototype.Browser.Opera || (element.tagName && (element.tagName.toUpperCase() == 'BODY'))) {
valueT -= element.scrollTop || 0;
valueL -= element.scrollLeft || 0;
}
}
};
-
-if (!document.createRange || Prototype.Browser.Opera) {
- Element.Methods.insert = function(element, insertions) {
- element = $(element);
-
- if (Object.isString(insertions) || Object.isNumber(insertions) ||
- Object.isElement(insertions) || (insertions && (insertions.toElement || insertions.toHTML)))
- insertions = { bottom: insertions };
-
- var t = Element._insertionTranslations, content, position, pos, tagName;
-
- for (position in insertions) {
- content = insertions[position];
- position = position.toLowerCase();
- pos = t[position];
-
- if (content && content.toElement) content = content.toElement();
- if (Object.isElement(content)) {
- pos.insert(element, content);
- continue;
- }
-
- content = Object.toHTML(content);
- tagName = ((position == 'before' || position == 'after')
- ? element.parentNode : element).tagName.toUpperCase();
-
- if (t.tags[tagName]) {
- var fragments = Element._getContentFromAnonymousElement(tagName, content.stripScripts());
- if (position == 'top' || position == 'after') fragments.reverse();
- fragments.each(pos.insert.curry(element));
- }
- else element.insertAdjacentHTML(pos.adjacency, content.stripScripts());
-
- content.evalScripts.bind(content).defer();
- }
-
- return element;
- };
-}
-
if (Prototype.Browser.Opera) {
Element.Methods.getStyle = Element.Methods.getStyle.wrap(
function(proceed, element, style) {
}
else if (Prototype.Browser.IE) {
- $w('positionedOffset getOffsetParent viewportOffset').each(function(method) {
+ // IE doesn't report offsets correctly for static elements, so we change them
+ // to "relative" to get the values, then change them back.
+ Element.Methods.getOffsetParent = Element.Methods.getOffsetParent.wrap(
+ function(proceed, element) {
+ element = $(element);
+ // IE throws an error if element is not in document
+ try { element.offsetParent }
+ catch(e) { return $(document.body) }
+ var position = element.getStyle('position');
+ if (position !== 'static') return proceed(element);
+ element.setStyle({ position: 'relative' });
+ var value = proceed(element);
+ element.setStyle({ position: position });
+ return value;
+ }
+ );
+
+ $w('positionedOffset viewportOffset').each(function(method) {
Element.Methods[method] = Element.Methods[method].wrap(
function(proceed, element) {
element = $(element);
+ try { element.offsetParent }
+ catch(e) { return Element._returnOffset(0,0) }
var position = element.getStyle('position');
- if (position != 'static') return proceed(element);
+ if (position !== 'static') return proceed(element);
+ // Trigger hasLayout on the offset parent so that IE6 reports
+ // accurate offsetTop and offsetLeft values for position: fixed.
+ var offsetParent = element.getOffsetParent();
+ if (offsetParent && offsetParent.getStyle('position') === 'fixed')
+ offsetParent.setStyle({ zoom: 1 });
element.setStyle({ position: 'relative' });
var value = proceed(element);
element.setStyle({ position: position });
);
});
+ Element.Methods.cumulativeOffset = Element.Methods.cumulativeOffset.wrap(
+ function(proceed, element) {
+ try { element.offsetParent }
+ catch(e) { return Element._returnOffset(0,0) }
+ return proceed(element);
+ }
+ );
+
Element.Methods.getStyle = function(element, style) {
element = $(element);
style = (style == 'float' || style == 'cssFloat') ? 'styleFloat' : style.camelize();
};
Element._attributeTranslations.write = {
- names: Object.clone(Element._attributeTranslations.read.names),
+ names: Object.extend({
+ cellpadding: 'cellPadding',
+ cellspacing: 'cellSpacing'
+ }, Element._attributeTranslations.read.names),
values: {
checked: function(element, value) {
element.checked = !!value;
Element._attributeTranslations.has = {};
$w('colSpan rowSpan vAlign dateTime accessKey tabIndex ' +
- 'encType maxLength readOnly longDesc').each(function(attr) {
+ 'encType maxLength readOnly longDesc frameBorder').each(function(attr) {
Element._attributeTranslations.write.names[attr.toLowerCase()] = attr;
Element._attributeTranslations.has[attr.toLowerCase()] = attr;
});
(value < 0.00001) ? 0 : value;
if (value == 1)
- if(element.tagName == 'IMG' && element.width) {
+ if(element.tagName.toUpperCase() == 'IMG' && element.width) {
element.width++; element.width--;
} else try {
var n = document.createTextNode(' ');
};
}
-if (document.createElement('div').outerHTML) {
+if ('outerHTML' in document.createElement('div')) {
Element.Methods.replace = function(element, content) {
element = $(element);
Element._getContentFromAnonymousElement = function(tagName, html) {
var div = new Element('div'), t = Element._insertionTranslations.tags[tagName];
- div.innerHTML = t[0] + html + t[1];
- t[2].times(function() { div = div.firstChild });
+ if (t) {
+ div.innerHTML = t[0] + html + t[1];
+ t[2].times(function() { div = div.firstChild });
+ } else div.innerHTML = html;
return $A(div.childNodes);
};
Element._insertionTranslations = {
- before: {
- adjacency: 'beforeBegin',
- insert: function(element, node) {
- element.parentNode.insertBefore(node, element);
- },
- initializeRange: function(element, range) {
- range.setStartBefore(element);
- }
+ before: function(element, node) {
+ element.parentNode.insertBefore(node, element);
},
- top: {
- adjacency: 'afterBegin',
- insert: function(element, node) {
- element.insertBefore(node, element.firstChild);
- },
- initializeRange: function(element, range) {
- range.selectNodeContents(element);
- range.collapse(true);
- }
+ top: function(element, node) {
+ element.insertBefore(node, element.firstChild);
},
- bottom: {
- adjacency: 'beforeEnd',
- insert: function(element, node) {
- element.appendChild(node);
- }
+ bottom: function(element, node) {
+ element.appendChild(node);
},
- after: {
- adjacency: 'afterEnd',
- insert: function(element, node) {
- element.parentNode.insertBefore(node, element.nextSibling);
- },
- initializeRange: function(element, range) {
- range.setStartAfter(element);
- }
+ after: function(element, node) {
+ element.parentNode.insertBefore(node, element.nextSibling);
},
tags: {
TABLE: ['<table>', '</table>', 1],
};
(function() {
- this.bottom.initializeRange = this.top.initializeRange;
Object.extend(this.tags, {
THEAD: this.tags.TBODY,
TFOOT: this.tags.TBODY,
hasAttribute: function(element, attribute) {
attribute = Element._attributeTranslations.has[attribute] || attribute;
var node = $(element).getAttributeNode(attribute);
- return node && node.specified;
+ return !!(node && node.specified);
}
};
Object.extend(Element, Element.Methods);
if (!Prototype.BrowserFeatures.ElementExtensions &&
- document.createElement('div').__proto__) {
+ document.createElement('div')['__proto__']) {
window.HTMLElement = { };
- window.HTMLElement.prototype = document.createElement('div').__proto__;
+ window.HTMLElement.prototype = document.createElement('div')['__proto__'];
Prototype.BrowserFeatures.ElementExtensions = true;
}
element.nodeType != 1 || element == window) return element;
var methods = Object.clone(Methods),
- tagName = element.tagName, property, value;
+ tagName = element.tagName.toUpperCase(), property, value;
// extend methods for specific tags
if (ByTag[tagName]) Object.extend(methods, ByTag[tagName]);
if (window[klass]) return window[klass];
window[klass] = { };
- window[klass].prototype = document.createElement(tagName).__proto__;
+ window[klass].prototype = document.createElement(tagName)['__proto__'];
return window[klass];
}
document.viewport = {
getDimensions: function() {
- var dimensions = { };
- var B = Prototype.Browser;
+ var dimensions = { }, B = Prototype.Browser;
$w('width height').each(function(d) {
var D = d.capitalize();
- dimensions[d] = (B.WebKit && !document.evaluate) ? self['inner' + D] :
- (B.Opera) ? document.body['client' + D] : document.documentElement['client' + D];
+ if (B.WebKit && !document.evaluate) {
+ // Safari <3.0 needs self.innerWidth/Height
+ dimensions[d] = self['inner' + D];
+ } else if (B.Opera && parseFloat(window.opera.version()) < 9.5) {
+ // Opera <9.5 needs document.body.clientWidth/Height
+ dimensions[d] = document.body['client' + D]
+ } else {
+ dimensions[d] = document.documentElement['client' + D];
+ }
});
return dimensions;
},
window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop);
}
};
-/* Portions of the Selector class are derived from Jack Slocum’s DomQuery,
+/* Portions of the Selector class are derived from Jack Slocum's DomQuery,
* part of YUI-Ext version 0.40, distributed under the terms of an MIT-style
* license. Please see http://www.yui-ext.com/ for more information. */
var Selector = Class.create({
initialize: function(expression) {
this.expression = expression.strip();
- this.compileMatcher();
+
+ if (this.shouldUseSelectorsAPI()) {
+ this.mode = 'selectorsAPI';
+ } else if (this.shouldUseXPath()) {
+ this.mode = 'xpath';
+ this.compileXPathMatcher();
+ } else {
+ this.mode = "normal";
+ this.compileMatcher();
+ }
+
},
shouldUseXPath: function() {
// XPath can't do namespaced attributes, nor can it read
// the "checked" property from DOM nodes
- if ((/(\[[\w-]*?:|:checked)/).test(this.expression))
+ if ((/(\[[\w-]*?:|:checked)/).test(e))
return false;
return true;
},
- compileMatcher: function() {
- if (this.shouldUseXPath())
- return this.compileXPathMatcher();
+ shouldUseSelectorsAPI: function() {
+ if (!Prototype.BrowserFeatures.SelectorsAPI) return false;
+
+ if (!Selector._div) Selector._div = new Element('div');
+
+ // Make sure the browser treats the selector as valid. Test on an
+ // isolated element to minimize cost of this check.
+ try {
+ Selector._div.querySelector(this.expression);
+ } catch(e) {
+ return false;
+ }
+ return true;
+ },
+
+ compileMatcher: function() {
var e = this.expression, ps = Selector.patterns, h = Selector.handlers,
c = Selector.criteria, le, p, m;
p = ps[i];
if (m = e.match(p)) {
this.matcher.push(Object.isFunction(c[i]) ? c[i](m) :
- new Template(c[i]).evaluate(m));
+ new Template(c[i]).evaluate(m));
e = e.replace(m[0], '');
break;
}
findElements: function(root) {
root = root || document;
- if (this.xpath) return document._getElementsByXPath(this.xpath, root);
- return this.matcher(root);
+ var e = this.expression, results;
+
+ switch (this.mode) {
+ case 'selectorsAPI':
+ // querySelectorAll queries document-wide, then filters to descendants
+ // of the context element. That's not what we want.
+ // Add an explicit context to the selector if necessary.
+ if (root !== document) {
+ var oldId = root.id, id = $(root).identify();
+ e = "#" + id + " " + e;
+ }
+
+ results = $A(root.querySelectorAll(e)).map(Element.extend);
+ root.id = oldId;
+
+ return results;
+ case 'xpath':
+ return document._getElementsByXPath(this.xpath, root);
+ default:
+ return this.matcher(root);
+ }
},
match: function(element) {
'first-child': '[not(preceding-sibling::*)]',
'last-child': '[not(following-sibling::*)]',
'only-child': '[not(preceding-sibling::* or following-sibling::*)]',
- 'empty': "[count(*) = 0 and (count(text()) = 0 or translate(text(), ' \t\r\n', '') = '')]",
+ 'empty': "[count(*) = 0 and (count(text()) = 0)]",
'checked': "[@checked]",
- 'disabled': "[@disabled]",
- 'enabled': "[not(@disabled)]",
+ 'disabled': "[(@disabled) and (@type!='hidden')]",
+ 'enabled': "[not(@disabled) and (@type!='hidden')]",
'not': function(m) {
var e = m[6], p = Selector.patterns,
x = Selector.xpath, le, v;
},
criteria: {
- tagName: 'n = h.tagName(n, r, "#{1}", c); c = false;',
- className: 'n = h.className(n, r, "#{1}", c); c = false;',
- id: 'n = h.id(n, r, "#{1}", c); c = false;',
- attrPresence: 'n = h.attrPresence(n, r, "#{1}"); c = false;',
+ tagName: 'n = h.tagName(n, r, "#{1}", c); c = false;',
+ className: 'n = h.className(n, r, "#{1}", c); c = false;',
+ id: 'n = h.id(n, r, "#{1}", c); c = false;',
+ attrPresence: 'n = h.attrPresence(n, r, "#{1}", c); c = false;',
attr: function(m) {
m[3] = (m[5] || m[6]);
- return new Template('n = h.attr(n, r, "#{1}", "#{3}", "#{2}"); c = false;').evaluate(m);
+ return new Template('n = h.attr(n, r, "#{1}", "#{3}", "#{2}", c); c = false;').evaluate(m);
},
pseudo: function(m) {
if (m[6]) m[6] = m[6].replace(/"/g, '\\"');
tagName: /^\s*(\*|[\w\-]+)(\b|$)?/,
id: /^#([\w\-\*]+)(\b|$)/,
className: /^\.([\w\-\*]+)(\b|$)/,
- pseudo: /^:((first|last|nth|nth-last|only)(-child|-of-type)|empty|checked|(en|dis)abled|not)(\((.*?)\))?(\b|$|(?=\s)|(?=:))/,
- attrPresence: /^\[([\w]+)\]/,
+ pseudo:
+/^:((first|last|nth|nth-last|only)(-child|-of-type)|empty|checked|(en|dis)abled|not)(\((.*?)\))?(\b|$|(?=\s|[:+~>]))/,
+ attrPresence: /^\[((?:[\w]+:)?[\w]+)\]/,
attr: /\[((?:[\w-]*:)?[\w-]+)\s*(?:([!^$*~|]?=)\s*((['"])([^\4]*?)\4|([^'"][^\]]*?)))?\]/
},
attr: function(element, matches) {
var nodeValue = Element.readAttribute(element, matches[1]);
- return Selector.operators[matches[2]](nodeValue, matches[3]);
+ return nodeValue && Selector.operators[matches[2]](nodeValue, matches[5] || matches[6]);
}
},
// marks an array of nodes for counting
mark: function(nodes) {
+ var _true = Prototype.emptyFunction;
for (var i = 0, node; node = nodes[i]; i++)
- node._counted = true;
+ node._countedByPrototype = _true;
return nodes;
},
unmark: function(nodes) {
for (var i = 0, node; node = nodes[i]; i++)
- node._counted = undefined;
+ node._countedByPrototype = undefined;
return nodes;
},
// "ofType" flag indicates whether we're indexing for nth-of-type
// rather than nth-child
index: function(parentNode, reverse, ofType) {
- parentNode._counted = true;
+ parentNode._countedByPrototype = Prototype.emptyFunction;
if (reverse) {
for (var nodes = parentNode.childNodes, i = nodes.length - 1, j = 1; i >= 0; i--) {
var node = nodes[i];
- if (node.nodeType == 1 && (!ofType || node._counted)) node.nodeIndex = j++;
+ if (node.nodeType == 1 && (!ofType || node._countedByPrototype)) node.nodeIndex = j++;
}
} else {
for (var i = 0, j = 1, nodes = parentNode.childNodes; node = nodes[i]; i++)
- if (node.nodeType == 1 && (!ofType || node._counted)) node.nodeIndex = j++;
+ if (node.nodeType == 1 && (!ofType || node._countedByPrototype)) node.nodeIndex = j++;
}
},
if (nodes.length == 0) return nodes;
var results = [], n;
for (var i = 0, l = nodes.length; i < l; i++)
- if (!(n = nodes[i])._counted) {
- n._counted = true;
+ if (!(n = nodes[i])._countedByPrototype) {
+ n._countedByPrototype = Prototype.emptyFunction;
results.push(Element.extend(n));
}
return Selector.handlers.unmark(results);
nextElementSibling: function(node) {
while (node = node.nextSibling)
- if (node.nodeType == 1) return node;
+ if (node.nodeType == 1) return node;
return null;
},
// TOKEN FUNCTIONS
tagName: function(nodes, root, tagName, combinator) {
- tagName = tagName.toUpperCase();
+ var uTagName = tagName.toUpperCase();
var results = [], h = Selector.handlers;
if (nodes) {
if (combinator) {
if (tagName == "*") return nodes;
}
for (var i = 0, node; node = nodes[i]; i++)
- if (node.tagName.toUpperCase() == tagName) results.push(node);
+ if (node.tagName.toUpperCase() === uTagName) results.push(node);
return results;
} else return root.getElementsByTagName(tagName);
},
return results;
},
- attrPresence: function(nodes, root, attr) {
+ attrPresence: function(nodes, root, attr, combinator) {
if (!nodes) nodes = root.getElementsByTagName("*");
+ if (nodes && combinator) nodes = this[combinator](nodes);
var results = [];
for (var i = 0, node; node = nodes[i]; i++)
if (Element.hasAttribute(node, attr)) results.push(node);
return results;
},
- attr: function(nodes, root, attr, value, operator) {
+ attr: function(nodes, root, attr, value, operator, combinator) {
if (!nodes) nodes = root.getElementsByTagName("*");
+ if (nodes && combinator) nodes = this[combinator](nodes);
var handler = Selector.operators[operator], results = [];
for (var i = 0, node; node = nodes[i]; i++) {
var nodeValue = Element.readAttribute(node, attr);
var h = Selector.handlers, results = [], indexed = [], m;
h.mark(nodes);
for (var i = 0, node; node = nodes[i]; i++) {
- if (!node.parentNode._counted) {
+ if (!node.parentNode._countedByPrototype) {
h.index(node.parentNode, reverse, ofType);
indexed.push(node.parentNode);
}
'empty': function(nodes, value, root) {
for (var i = 0, results = [], node; node = nodes[i]; i++) {
// IE treats comments as element nodes
- if (node.tagName == '!' || (node.firstChild && !node.innerHTML.match(/^\s*$/))) continue;
+ if (node.tagName == '!' || node.firstChild) continue;
results.push(node);
}
return results;
var exclusions = new Selector(selector).findElements(root);
h.mark(exclusions);
for (var i = 0, results = [], node; node = nodes[i]; i++)
- if (!node._counted) results.push(node);
+ if (!node._countedByPrototype) results.push(node);
h.unmark(exclusions);
return results;
},
'enabled': function(nodes, value, root) {
for (var i = 0, results = [], node; node = nodes[i]; i++)
- if (!node.disabled) results.push(node);
+ if (!node.disabled && (!node.type || node.type !== 'hidden'))
+ results.push(node);
return results;
},
operators: {
'=': function(nv, v) { return nv == v; },
'!=': function(nv, v) { return nv != v; },
- '^=': function(nv, v) { return nv.startsWith(v); },
+ '^=': function(nv, v) { return nv == v || nv && nv.startsWith(v); },
+ '$=': function(nv, v) { return nv == v || nv && nv.endsWith(v); },
+ '*=': function(nv, v) { return nv == v || nv && nv.include(v); },
'$=': function(nv, v) { return nv.endsWith(v); },
'*=': function(nv, v) { return nv.include(v); },
'~=': function(nv, v) { return (' ' + nv + ' ').include(' ' + v + ' '); },
- '|=': function(nv, v) { return ('-' + nv.toUpperCase() + '-').include('-' + v.toUpperCase() + '-'); }
+ '|=': function(nv, v) { return ('-' + (nv || "").toUpperCase() +
+ '-').include('-' + (v || "").toUpperCase() + '-'); }
+ },
+
+ split: function(expression) {
+ var expressions = [];
+ expression.scan(/(([\w#:.~>+()\s-]+|\*|\[.*?\])+)\s*(,|$)/, function(m) {
+ expressions.push(m[1].strip());
+ });
+ return expressions;
},
matchElements: function(elements, expression) {
- var matches = new Selector(expression).findElements(), h = Selector.handlers;
+ var matches = $$(expression), h = Selector.handlers;
h.mark(matches);
for (var i = 0, results = [], element; element = elements[i]; i++)
- if (element._counted) results.push(element);
+ if (element._countedByPrototype) results.push(element);
h.unmark(matches);
return results;
},
},
findChildElements: function(element, expressions) {
- var exprs = expressions.join(',');
- expressions = [];
- exprs.scan(/(([\w#:.~>+()\s-]+|\*|\[.*?\])+)\s*(,|$)/, function(m) {
- expressions.push(m[1].strip());
- });
+ expressions = Selector.split(expressions.join(','));
var results = [], h = Selector.handlers;
for (var i = 0, l = expressions.length, selector; i < l; i++) {
selector = new Selector(expressions[i].strip());
});
if (Prototype.Browser.IE) {
- // IE returns comment nodes on getElementsByTagName("*").
- // Filter them out.
- Selector.handlers.concat = function(a, b) {
- for (var i = 0, node; node = b[i]; i++)
- if (node.tagName !== "!") a.push(node);
- return a;
- };
+ Object.extend(Selector.handlers, {
+ // IE returns comment nodes on getElementsByTagName("*").
+ // Filter them out.
+ concat: function(a, b) {
+ for (var i = 0, node; node = b[i]; i++)
+ if (node.tagName !== "!") a.push(node);
+ return a;
+ },
+
+ // IE improperly serializes _countedByPrototype in (inner|outer)HTML.
+ unmark: function(nodes) {
+ for (var i = 0, node; node = nodes[i]; i++)
+ node.removeAttribute('_countedByPrototype');
+ return nodes;
+ }
+ });
}
function $$() {
var data = elements.inject({ }, function(result, element) {
if (!element.disabled && element.name) {
key = element.name; value = $(element).getValue();
- if (value != null && (element.type != 'submit' || (!submitted &&
+ if (value != null && element.type != 'file' && (element.type != 'submit' || (!submitted &&
submit !== false && (!submit || key == submit) && (submitted = true)))) {
if (key in result) {
// a key is already present; construct an array of values
disable: function(element) {
element = $(element);
- element.blur();
element.disabled = true;
return element;
},
else element.value = value;
},
- select: function(element, index) {
- if (Object.isUndefined(index))
+ select: function(element, value) {
+ if (Object.isUndefined(value))
return this[element.type == 'select-one' ?
'selectOne' : 'selectMany'](element);
else {
- var opt, value, single = !Object.isArray(index);
+ var opt, currentValue, single = !Object.isArray(value);
for (var i = 0, length = element.length; i < length; i++) {
opt = element.options[i];
- value = this.optionValue(opt);
+ currentValue = this.optionValue(opt);
if (single) {
- if (value == index) {
+ if (currentValue == value) {
opt.selected = true;
return;
}
}
- else opt.selected = index.include(value);
+ else opt.selected = value.include(currentValue);
}
}
},
isRightClick: function(event) { return isButton(event, 2) },
element: function(event) {
- var node = Event.extend(event).target;
- return Element.extend(node.nodeType == Node.TEXT_NODE ? node.parentNode : node);
+ event = Event.extend(event);
+
+ var node = event.target,
+ type = event.type,
+ currentTarget = event.currentTarget;
+
+ if (currentTarget && currentTarget.tagName) {
+ // Firefox screws up the "click" event when moving between radio buttons
+ // via arrow keys. It also screws up the "load" and "error" events on images,
+ // reporting the document as the target instead of the original image.
+ if (type === 'load' || type === 'error' ||
+ (type === 'click' && currentTarget.tagName.toLowerCase() === 'input'
+ && currentTarget.type === 'radio'))
+ node = currentTarget;
+ }
+ if (node.nodeType == Node.TEXT_NODE) node = node.parentNode;
+ return Element.extend(node);
},
findElement: function(event, expression) {
},
pointer: function(event) {
+ var docElement = document.documentElement,
+ body = document.body || { scrollLeft: 0, scrollTop: 0 };
return {
x: event.pageX || (event.clientX +
- (document.documentElement.scrollLeft || document.body.scrollLeft)),
+ (docElement.scrollLeft || body.scrollLeft) -
+ (docElement.clientLeft || 0)),
y: event.pageY || (event.clientY +
- (document.documentElement.scrollTop || document.body.scrollTop))
+ (docElement.scrollTop || body.scrollTop) -
+ (docElement.clientTop || 0))
};
},
};
} else {
- Event.prototype = Event.prototype || document.createEvent("HTMLEvents").__proto__;
+ Event.prototype = Event.prototype || document.createEvent("HTMLEvents")['__proto__'];
Object.extend(Event.prototype, methods);
return Prototype.K;
}
var cache = Event.cache;
function getEventID(element) {
- if (element._eventID) return element._eventID;
+ if (element._prototypeEventID) return element._prototypeEventID[0];
arguments.callee.id = arguments.callee.id || 1;
- return element._eventID = ++arguments.callee.id;
+ return element._prototypeEventID = [++arguments.callee.id];
}
function getDOMEventName(eventName) {
return false;
Event.extend(event);
- handler.call(element, event)
+ handler.call(element, event);
};
wrapper.handler = handler;
cache[id][eventName] = null;
}
+
+ // Internet Explorer needs to remove event handlers on page unload
+ // in order to avoid memory leaks.
if (window.attachEvent) {
window.attachEvent("onunload", destroyCache);
}
+ // Safari has a dummy event handler on page unload so that it won't
+ // use its bfcache. Safari <= 3.1 has an issue with restoring the "document"
+ // object when page is returned to via the back button using its bfcache.
+ if (Prototype.Browser.WebKit) {
+ window.addEventListener('unload', Prototype.emptyFunction, false);
+ }
+
return {
observe: function(element, eventName, handler) {
element = $(element);
if (element == document && document.createEvent && !element.dispatchEvent)
element = document.documentElement;
+ var event;
if (document.createEvent) {
- var event = document.createEvent("HTMLEvents");
+ event = document.createEvent("HTMLEvents");
event.initEvent("dataavailable", true, true);
} else {
- var event = document.createEventObject();
+ event = document.createEventObject();
event.eventType = "ondataavailable";
}
Object.extend(document, {
fire: Element.Methods.fire.methodize(),
observe: Element.Methods.observe.methodize(),
- stopObserving: Element.Methods.stopObserving.methodize()
+ stopObserving: Element.Methods.stopObserving.methodize(),
+ loaded: false
});
(function() {
/* Support for the DOMContentLoaded event is based on work by Dan Webb,
Matthias Miller, Dean Edwards and John Resig. */
- var timer, fired = false;
+ var timer;
function fireContentLoadedEvent() {
- if (fired) return;
+ if (document.loaded) return;
if (timer) window.clearInterval(timer);
document.fire("dom:loaded");
- fired = true;
+ document.loaded = true;
}
if (document.addEventListener) {
--- /dev/null
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../config/boot'
+require 'commands/dbconsole'
--- /dev/null
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../../config/boot'
+require 'commands/performance/request'
--- /dev/null
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../../config/boot'
+require 'commands/process/inspector'
+++ /dev/null
-== 1.1.0 2008-10-29
-
-* fixes to get cpk working for Rails 2.1.2
-
-== 1.0.10 2008-10-22
-
-* add composite key where clause creator method [timurv]
-
-== 1.0.9 2008-09-08
-
-* fix postgres tests
-* fix for delete_records when has_many association has composite keys [darxriggs]
-* more consistent table/column name quoting [pbrant]
-
-== 1.0.8 2008-08-27
-
-* fix has_many :through for non composite models [thx rcarver]
-
-== 1.0.7 2008-08-12
-
-* fix for the last fix -- when has_many is composite and belongs_to is single
-
-== 1.0.6 2008-08-06
-
-* fix associations create
-
-== 1.0.5 2008-07-25
-
-* fix for calculations with a group by clause [thx Sirius Black]
-
-== 1.0.4 2008-07-15
-
-* support for oracle_enhanced adapter [thx Raimonds Simanovskis]
-
-== 1.0.3 2008-07-13
-
-* more fixes and tests for has many through [thx Menno van der Sman]
-
-== 1.0.2 2008-06-07
-
-* fix for has many through when through association has composite keys
-
-== 1.0.1 2008-06-06
-
-* Oracle fixes
-
-== 1.0.0 2008-06-05
-
-* Support for Rails 2.1
-
-== 0.9.93 2008-06-01
-
-* set fixed dependency on activerecord 2.0.2
-
-== 0.9.92 2008-02-22
-
-* Support for has_and_belongs_to_many
-
-== 0.9.91 2008-01-27
-
-* Incremented activerecord dependency to 2.0.2 [thx emmanuel.pirsch]
-
-== 0.9.90 2008-01-27
-
-* Trial release for rails/activerecord 2.0.2 supported
-
-== 0.9.1 2007-10-28
-
-* Migrations fix - allow :primary_key => [:name] to work [no unit test] [thx Shugo Maeda]
-
-== 0.9.0 2007-09-28
-
-* Added support for polymorphs [thx nerdrew]
-* init.rb file so gem can be installed as a plugin for Rails [thx nerdrew]
-* Added ibm_db support [thx K Venkatasubramaniyan]
-* Support for cleaning dependents [thx K Venkatasubramaniyan]
-* Rafactored db rake tasks into namespaces
-* Added namespaced tests (e.g. mysql:test for test_mysql)
-
-== 0.8.6 / 2007-6-12
-
-* 1 emergency fix due to Rails Core change
- * Rails v7004 removed #quote; fixed with connection.quote_column_name [thx nerdrew]
-
-== 0.8.5 / 2007-6-5
-
-* 1 change due to Rails Core change
- * Can no longer use RAILS_CONNECTION_ADAPTERS from Rails core
-* 7 dev improvement:
- * Changed History.txt syntax to rdoc format
- * Added deploy tasks
- * Removed CHANGELOG + migrated into History.txt
- * Changed PKG_NAME -> GEM_NAME in Rakefile
- * Renamed README -> README.txt for :publish_docs task
- * Added :check_version task
- * VER => VERS in rakefile
-* 1 website improvement:
- * website/index.txt includes link to "8 steps to fix other ppls code"
-
-== 0.8.4 / 2007-5-3
-
-* 1 bugfix
- * Corrected ids_list => ids in the exception message. That'll teach me for not adding unit tests before fixing bugs.
-
-== 0.8.3 / 2007-5-3
-
-* 1 bugfix
- * Explicit reference to ::ActiveRecord::RecordNotFound
-* 1 website addition:
- * Added routing help [Pete Sumskas]
-
-== 0.8.2 / 2007-4-11
-
-* 1 major enhancement:
- * Oracle unit tests!! [Darrin Holst]
- * And they work too
-
-== 0.8.1 / 2007-4-10
-
-* 1 bug fix:
- * Fixed the distinct(count) for oracle (removed 'as')
-
-== 0.8.0 / 2007-4-6
-
-* 1 major enhancement:
- * Support for calcualtions on associations
-* 2 new DB supported:
- * Tests run on sqlite
- * Tests run on postgresql
-* History.txt to keep track of changes like these
-* Using Hoe for Rakefile
-* Website generator rake tasks
-
-== 0.3.3
-* id=
-* create now work
-
-== 0.1.4
-* it was important that #{primary_key} for composites --> 'key1,key2' and not 'key1key2' so created PrimaryKeys class
-
-== 0.0.1
-* Initial version
-* set_primary_keys(*keys) is the activation class method to transform an ActiveRecord into a composite primary key AR
-* find(*ids) supports the passing of
- * id sets: Foo.find(2,1),
- * lists of id sets: Foo.find([2,1], [7,3], [8,12]),
- * and even stringified versions of the above:
- * Foo.find '2,1' or Foo.find '2,1;7,3'
+++ /dev/null
-History.txt
-Manifest.txt
-README.txt
-README_DB2.txt
-Rakefile
-init.rb
-install.rb
-lib/adapter_helper/base.rb
-lib/adapter_helper/mysql.rb
-lib/adapter_helper/oracle.rb
-lib/adapter_helper/postgresql.rb
-lib/adapter_helper/sqlite3.rb
-lib/composite_primary_keys.rb
-lib/composite_primary_keys/association_preload.rb
-lib/composite_primary_keys/associations.rb
-lib/composite_primary_keys/attribute_methods.rb
-lib/composite_primary_keys/base.rb
-lib/composite_primary_keys/calculations.rb
-lib/composite_primary_keys/composite_arrays.rb
-lib/composite_primary_keys/connection_adapters/ibm_db_adapter.rb
-lib/composite_primary_keys/connection_adapters/oracle_adapter.rb
-lib/composite_primary_keys/connection_adapters/postgresql_adapter.rb
-lib/composite_primary_keys/connection_adapters/sqlite3_adapter.rb
-lib/composite_primary_keys/fixtures.rb
-lib/composite_primary_keys/migration.rb
-lib/composite_primary_keys/reflection.rb
-lib/composite_primary_keys/version.rb
-loader.rb
-local/database_connections.rb.sample
-local/paths.rb.sample
-local/tasks.rb.sample
-scripts/console.rb
-scripts/txt2html
-scripts/txt2js
-tasks/activerecord_selection.rake
-tasks/databases.rake
-tasks/databases/mysql.rake
-tasks/databases/oracle.rake
-tasks/databases/postgresql.rake
-tasks/databases/sqlite3.rake
-tasks/deployment.rake
-tasks/local_setup.rake
-tasks/website.rake
-test/README_tests.txt
-test/abstract_unit.rb
-test/connections/native_ibm_db/connection.rb
-test/connections/native_mysql/connection.rb
-test/connections/native_oracle/connection.rb
-test/connections/native_postgresql/connection.rb
-test/connections/native_sqlite/connection.rb
-test/fixtures/article.rb
-test/fixtures/articles.yml
-test/fixtures/comment.rb
-test/fixtures/comments.yml
-test/fixtures/db_definitions/db2-create-tables.sql
-test/fixtures/db_definitions/db2-drop-tables.sql
-test/fixtures/db_definitions/mysql.sql
-test/fixtures/db_definitions/oracle.drop.sql
-test/fixtures/db_definitions/oracle.sql
-test/fixtures/db_definitions/postgresql.sql
-test/fixtures/db_definitions/sqlite.sql
-test/fixtures/department.rb
-test/fixtures/departments.yml
-test/fixtures/employee.rb
-test/fixtures/employees.yml
-test/fixtures/group.rb
-test/fixtures/groups.yml
-test/fixtures/hack.rb
-test/fixtures/hacks.yml
-test/fixtures/membership.rb
-test/fixtures/membership_status.rb
-test/fixtures/membership_statuses.yml
-test/fixtures/memberships.yml
-test/fixtures/product.rb
-test/fixtures/product_tariff.rb
-test/fixtures/product_tariffs.yml
-test/fixtures/products.yml
-test/fixtures/reading.rb
-test/fixtures/readings.yml
-test/fixtures/reference_code.rb
-test/fixtures/reference_codes.yml
-test/fixtures/reference_type.rb
-test/fixtures/reference_types.yml
-test/fixtures/street.rb
-test/fixtures/streets.yml
-test/fixtures/suburb.rb
-test/fixtures/suburbs.yml
-test/fixtures/tariff.rb
-test/fixtures/tariffs.yml
-test/fixtures/user.rb
-test/fixtures/users.yml
-test/hash_tricks.rb
-test/plugins/pagination.rb
-test/plugins/pagination_helper.rb
-test/test_associations.rb
-test/test_attribute_methods.rb
-test/test_attributes.rb
-test/test_clone.rb
-test/test_composite_arrays.rb
-test/test_create.rb
-test/test_delete.rb
-test/test_dummy.rb
-test/test_find.rb
-test/test_ids.rb
-test/test_miscellaneous.rb
-test/test_pagination.rb
-test/test_polymorphic.rb
-test/test_santiago.rb
-test/test_tutorial_examle.rb
-test/test_update.rb
-tmp/test.db
-website/index.html
-website/index.txt
-website/javascripts/rounded_corners_lite.inc.js
-website/stylesheets/screen.css
-website/template.js
-website/template.rhtml
-website/version-raw.js
-website/version-raw.txt
-website/version.js
-website/version.txt
+++ /dev/null
-= Composite Primary Keys for ActiveRecords\r
-\r
-== Summary\r
-\r
-ActiveRecords/Rails famously doesn't support composite primary keys. \r
-This RubyGem extends the activerecord gem to provide CPK support.\r
-\r
-== Installation\r
-\r
- gem install composite_primary_keys\r
- \r
-== Usage\r
- \r
- require 'composite_primary_keys'\r
- class ProductVariation\r
- set_primary_keys :product_id, :variation_seq\r
- end\r
- \r
- pv = ProductVariation.find(345, 12)\r
- \r
-It even supports composite foreign keys for associations.\r
-\r
-See http://compositekeys.rubyforge.org for more.\r
-\r
-== Running Tests\r
-\r
-See test/README.tests.txt\r
-\r
-== Url\r
-\r
-http://compositekeys.rubyforge.org\r
-\r
-== Questions, Discussion and Contributions\r
-\r
-http://groups.google.com/compositekeys\r
-\r
-== Author\r
-\r
-Written by Dr Nic Williams, drnicwilliams@gmail\r
-Contributions by many!\r
-\r
+++ /dev/null
-Composite Primary key support for db2
-
-== Driver Support ==
-
-DB2 support requires the IBM_DB driver provided by http://rubyforge.org/projects/rubyibm/
-project. Install using gem install ibm_db. Tested against version 0.60 of the driver.
-This rubyforge project appears to be permenant location for the IBM adapter.
-Older versions of the driver available from IBM Alphaworks will not work.
-
-== Driver Bug and workaround provided as part of this plugin ==
-
-Unlike the basic quote routine available for Rails AR, the DB2 adapter's quote
-method doesn't return " column_name = 1 " when string values (integers in string type variable)
-are passed for quoting numeric column. Rather it returns "column_name = '1'.
-DB2 doesn't accept single quoting numeric columns in SQL. Currently, as part of
-this plugin a fix is provided for the DB2 adapter since this plugin does
-pass string values like this. Perhaps a patch should be sent to the DB2 adapter
-project for a permanant fix.
-
-== Database Setup ==
-
-Database must be manually created using a separate command. Read the rake task
-for creating tables and change the db name, user and passwords accordingly.
-
-== Tested Database Server version ==
-
-This is tested against DB2 v9.1 in Ubuntu Feisty Fawn (7.04)
-
-== Tested Database Client version ==
-
-This is tested against DB2 v9.1 in Ubuntu Feisty Fawn (7.04)
-
-
+++ /dev/null
-require 'rubygems'\r
-require 'rake'\r
-require 'rake/clean'\r
-require 'rake/testtask'\r
-require 'rake/rdoctask'\r
-require 'rake/packagetask'\r
-require 'rake/gempackagetask'\r
-require 'rake/contrib/rubyforgepublisher'\r
-require 'fileutils'\r
-require 'hoe'\r
-include FileUtils\r
-require File.join(File.dirname(__FILE__), 'lib', 'composite_primary_keys', 'version')\r
-\r
-AUTHOR = "Dr Nic Williams"\r
-EMAIL = "drnicwilliams@gmail.com"\r
-DESCRIPTION = "Composite key support for ActiveRecords"\r
-GEM_NAME = "composite_primary_keys" # what ppl will type to install your gem\r
-if File.exists?("~/.rubyforge/user-config.yml")\r
- # TODO this should prob go in a local/ file\r
- config = YAML.load(File.read(File.expand_path("~/.rubyforge/user-config.yml")))\r
- RUBYFORGE_USERNAME = config["username"]\r
-end\r
-RUBYFORGE_PROJECT = "compositekeys"\r
-HOMEPATH = "http://#{RUBYFORGE_PROJECT}.rubyforge.org"\r
-\r
-REV = nil #File.read(".svn/entries")[/committed-rev="(\d+)"/, 1] rescue nil\r
-VERS = ENV['VERSION'] || (CompositePrimaryKeys::VERSION::STRING + (REV ? ".#{REV}" : ""))\r
-CLEAN.include ['**/.*.sw?', '*.gem', '.config','debug.log','*.db','logfile','log/**/*','**/.DS_Store', '.project']\r
-RDOC_OPTS = ['--quiet', '--title', "newgem documentation",\r
- "--opname", "index.html",\r
- "--line-numbers", \r
- "--main", "README",\r
- "--inline-source"]\r
-\r
-class Hoe\r
- def extra_deps \r
- @extra_deps.reject { |x| Array(x).first == 'hoe' } \r
- end \r
-end\r
-\r
-# Generate all the Rake tasks\r
-# Run 'rake -T' to see list of generated tasks (from gem root directory)\r
-hoe = Hoe.new(GEM_NAME, VERS) do |p|\r
- p.author = AUTHOR \r
- p.description = DESCRIPTION\r
- p.email = EMAIL\r
- p.summary = DESCRIPTION\r
- p.url = HOMEPATH\r
- p.rubyforge_name = RUBYFORGE_PROJECT if RUBYFORGE_PROJECT\r
- p.test_globs = ["test/**/test*.rb"]\r
- p.clean_globs |= CLEAN #An array of file patterns to delete on clean.\r
-\r
- # == Optional\r
- p.changes = p.paragraphs_of("History.txt", 0..1).join("\n\n")\r
- p.extra_deps = [['activerecord', '>= 2.1.2']] #An array of rubygem dependencies.\r
- #p.spec_extras - A hash of extra values to set in the gemspec.\r
-end\r
-\r
-CHANGES = hoe.paragraphs_of('History.txt', 0..1).join("\n\n")\r
-PATH = RUBYFORGE_PROJECT\r
-hoe.remote_rdoc_dir = File.join(PATH.gsub(/^#{RUBYFORGE_PROJECT}\/?/,''), 'rdoc')\r
-\r
-PROJECT_ROOT = File.expand_path(".")\r
-\r
-require 'loader'\r
+++ /dev/null
-# Include hook code here
-require_dependency 'composite_primary_keys'
+++ /dev/null
-require 'rbconfig'\r
-require 'find'\r
-require 'ftools'\r
-\r
-include Config\r
-\r
-# this was adapted from rdoc's install.rb by ways of Log4r\r
-\r
-$sitedir = CONFIG["sitelibdir"]\r
-unless $sitedir\r
- version = CONFIG["MAJOR"] + "." + CONFIG["MINOR"]\r
- $libdir = File.join(CONFIG["libdir"], "ruby", version)\r
- $sitedir = $:.find {|x| x =~ /site_ruby/ }\r
- if !$sitedir\r
- $sitedir = File.join($libdir, "site_ruby")\r
- elsif $sitedir !~ Regexp.quote(version)\r
- $sitedir = File.join($sitedir, version)\r
- end\r
-end\r
-\r
-# the acual gruntwork\r
-Dir.chdir("lib")\r
-\r
-Find.find("composite_primary_keys", "composite_primary_keys.rb") { |f|\r
- if f[-3..-1] == ".rb"\r
- File::install(f, File.join($sitedir, *f.split(/\//)), 0644, true)\r
- else\r
- File::makedirs(File.join($sitedir, *f.split(/\//)))\r
- end\r
-}\r
+++ /dev/null
-module AdapterHelper
- class Base
- class << self
- attr_accessor :adapter
-
- def load_connection_from_env(adapter)
- self.adapter = adapter
- unless ENV['cpk_adapters']
- puts error_msg_setup_helper
- exit
- end
-
- ActiveRecord::Base.configurations = YAML.load(ENV['cpk_adapters'])
- unless spec = ActiveRecord::Base.configurations[adapter]
- puts error_msg_adapter_helper
- exit
- end
- spec[:adapter] = adapter
- spec
- end
-
- def error_msg_setup_helper
- <<-EOS
-Setup Helper:
- CPK now has a place for your individual testing configuration.
- That is, instead of hardcoding it in the Rakefile and test/connections files,
- there is now a local/database_connections.rb file that is NOT in the
- repository. Your personal DB information (username, password etc) can
- be stored here without making it difficult to submit patches etc.
-
-Installation:
- i) cp locals/database_connections.rb.sample locals/database_connections.rb
- ii) For #{adapter} connection details see "Adapter Setup Helper" below.
- iii) Rerun this task
-
-#{error_msg_adapter_helper}
-
-Current ENV:
- #{ENV.inspect}
- EOS
- end
-
- def error_msg_adapter_helper
- <<-EOS
-Adapter Setup Helper:
- To run #{adapter} tests, you need to setup your #{adapter} connections.
- In your local/database_connections.rb file, within the ENV['cpk_adapter'] hash, add:
- "#{adapter}" => { adapter settings }
-
- That is, it will look like:
- ENV['cpk_adapters'] = {
- "#{adapter}" => {
- :adapter => "#{adapter}",
- :username => "root",
- :password => "root",
- # ...
- }
- }.to_yaml
- EOS
- end
- end
- end
-end
\ No newline at end of file
+++ /dev/null
-require File.join(File.dirname(__FILE__), 'base')
-
-module AdapterHelper
- class MySQL < Base
- class << self
- def load_connection_from_env
- spec = super('mysql')
- spec[:database] ||= 'composite_primary_keys_unittest'
- spec
- end
- end
- end
-end
\ No newline at end of file
+++ /dev/null
-require File.join(File.dirname(__FILE__), 'base')
-
-module AdapterHelper
- class Oracle < Base
- class << self
- def load_connection_from_env
- spec = super('oracle')
- spec
- end
- end
- end
-end
\ No newline at end of file
+++ /dev/null
-require File.join(File.dirname(__FILE__), 'base')
-
-module AdapterHelper
- class Postgresql < Base
- class << self
- def load_connection_from_env
- spec = super('postgresql')
- spec[:database] ||= 'composite_primary_keys_unittest'
- spec
- end
- end
- end
-end
\ No newline at end of file
+++ /dev/null
-require File.join(File.dirname(__FILE__), 'base')
-
-module AdapterHelper
- class Sqlite3 < Base
- class << self
- def load_connection_from_env
- spec = super('sqlite3')
- spec[:dbfile] ||= "tmp/test.db"
- spec
- end
- end
- end
-end
\ No newline at end of file
+++ /dev/null
-#--\r
-# Copyright (c) 2006 Nic Williams\r
-#\r
-# Permission is hereby granted, free of charge, to any person obtaining\r
-# a copy of this software and associated documentation files (the\r
-# "Software"), to deal in the Software without restriction, including\r
-# without limitation the rights to use, copy, modify, merge, publish,\r
-# distribute, sublicense, and/or sell copies of the Software, and to\r
-# permit persons to whom the Software is furnished to do so, subject to\r
-# the following conditions:\r
-#\r
-# The above copyright notice and this permission notice shall be\r
-# included in all copies or substantial portions of the Software.\r
-#\r
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,\r
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\r
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND\r
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE\r
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION\r
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION\r
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\r
-#++\r
-\r
-$:.unshift(File.dirname(__FILE__)) unless\r
- $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))\r
-\r
-unless defined?(ActiveRecord)\r
- begin\r
- require 'active_record' \r
- rescue LoadError\r
- require 'rubygems'\r
- require_gem 'activerecord'\r
- end\r
-end\r
-\r
-require 'composite_primary_keys/fixtures'\r
-require 'composite_primary_keys/composite_arrays'\r
-require 'composite_primary_keys/associations'\r
-require 'composite_primary_keys/association_preload'\r
-require 'composite_primary_keys/reflection'\r
-require 'composite_primary_keys/base'\r
-require 'composite_primary_keys/calculations'\r
-require 'composite_primary_keys/migration'\r
-require 'composite_primary_keys/attribute_methods'\r
-\r
-ActiveRecord::Base.class_eval do\r
- include CompositePrimaryKeys::ActiveRecord::Base\r
-end\r
-\r
-Dir[File.dirname(__FILE__) + '/composite_primary_keys/connection_adapters/*.rb'].each do |adapter|\r
- begin\r
- require adapter.gsub('.rb','')\r
- rescue MissingSourceFile\r
- end\r
-end\r
+++ /dev/null
-module CompositePrimaryKeys
- module ActiveRecord
- module AssociationPreload
- def self.append_features(base)
- super
- base.send(:extend, ClassMethods)
- end
-
- # Composite key versions of Association functions
- module ClassMethods
- def preload_has_and_belongs_to_many_association(records, reflection, preload_options={})
- table_name = reflection.klass.quoted_table_name
- id_to_record_map, ids = construct_id_map(records)
- records.each {|record| record.send(reflection.name).loaded}
- options = reflection.options
-
- if composite?
- primary_key = reflection.primary_key_name.to_s.split(CompositePrimaryKeys::ID_SEP)
- where = (primary_key * ids.size).in_groups_of(primary_key.size).map do |keys|
- "(" + keys.map{|key| "t0.#{connection.quote_column_name(key)} = ?"}.join(" AND ") + ")"
- end.join(" OR ")
-
- conditions = [where, ids].flatten
- joins = "INNER JOIN #{connection.quote_table_name options[:join_table]} t0 ON #{full_composite_join_clause(reflection, reflection.klass.table_name, reflection.klass.primary_key, 't0', reflection.association_foreign_key)}"
- parent_primary_keys = reflection.primary_key_name.to_s.split(CompositePrimaryKeys::ID_SEP).map{|k| "t0.#{connection.quote_column_name(k)}"}
- parent_record_id = connection.concat(*parent_primary_keys.zip(["','"] * (parent_primary_keys.size - 1)).flatten.compact)
- else
- conditions = ["t0.#{connection.quote_column_name(reflection.primary_key_name)} IN (?)", ids]
- joins = "INNER JOIN #{connection.quote_table_name options[:join_table]} t0 ON #{reflection.klass.quoted_table_name}.#{connection.quote_column_name(reflection.klass.primary_key)} = t0.#{connection.quote_column_name(reflection.association_foreign_key)})"
- parent_record_id = reflection.primary_key_name
- end
-
- conditions.first << append_conditions(reflection, preload_options)
-
- associated_records = reflection.klass.find(:all,
- :conditions => conditions,
- :include => options[:include],
- :joins => joins,
- :select => "#{options[:select] || table_name+'.*'}, #{parent_record_id} as parent_record_id_",
- :order => options[:order])
-
- set_association_collection_records(id_to_record_map, reflection.name, associated_records, 'parent_record_id_')
- end
-
- def preload_has_many_association(records, reflection, preload_options={})
- id_to_record_map, ids = construct_id_map(records)
- records.each {|record| record.send(reflection.name).loaded}
- options = reflection.options
-
- if options[:through]
- through_records = preload_through_records(records, reflection, options[:through])
- through_reflection = reflections[options[:through]]
- through_primary_key = through_reflection.primary_key_name
-
- unless through_records.empty?
- source = reflection.source_reflection.name
- #add conditions from reflection!
- through_records.first.class.preload_associations(through_records, source, reflection.options)
- through_records.each do |through_record|
- key = through_primary_key.to_s.split(CompositePrimaryKeys::ID_SEP).map{|k| through_record.send(k)}.join(CompositePrimaryKeys::ID_SEP)
- add_preloaded_records_to_collection(id_to_record_map[key], reflection.name, through_record.send(source))
- end
- end
- else
- associated_records = find_associated_records(ids, reflection, preload_options)
- set_association_collection_records(id_to_record_map, reflection.name, associated_records, reflection.primary_key_name.to_s.split(CompositePrimaryKeys::ID_SEP))
- end
- end
-
- def preload_through_records(records, reflection, through_association)
- through_reflection = reflections[through_association]
- through_primary_key = through_reflection.primary_key_name
-
- if reflection.options[:source_type]
- interface = reflection.source_reflection.options[:foreign_type]
- preload_options = {:conditions => ["#{connection.quote_column_name interface} = ?", reflection.options[:source_type]]}
-
- records.compact!
- records.first.class.preload_associations(records, through_association, preload_options)
-
- # Dont cache the association - we would only be caching a subset
- through_records = []
- records.each do |record|
- proxy = record.send(through_association)
-
- if proxy.respond_to?(:target)
- through_records << proxy.target
- proxy.reset
- else # this is a has_one :through reflection
- through_records << proxy if proxy
- end
- end
- through_records.flatten!
- else
- records.first.class.preload_associations(records, through_association)
- through_records = records.map {|record| record.send(through_association)}.flatten
- end
-
- through_records.compact!
- through_records
- end
-
- def preload_belongs_to_association(records, reflection, preload_options={})
- options = reflection.options
- primary_key_name = reflection.primary_key_name.to_s.split(CompositePrimaryKeys::ID_SEP)
-
- if options[:polymorphic]
- raise AssociationNotSupported, "Polymorphic joins not supported for composite keys"
- else
- # I need to keep the original ids for each record (as opposed to the stringified) so
- # that they get properly converted for each db so the id_map ends up looking like:
- #
- # { '1,2' => {:id => [1,2], :records => [...records...]}}
- id_map = {}
-
- records.each do |record|
- key = primary_key_name.map{|k| record.attributes[k]}
- key_as_string = key.join(CompositePrimaryKeys::ID_SEP)
-
- if key_as_string
- mapped_records = (id_map[key_as_string] ||= {:id => key, :records => []})
- mapped_records[:records] << record
- end
- end
-
-
- klasses_and_ids = [[reflection.klass.name, id_map]]
- end
-
- klasses_and_ids.each do |klass_and_id|
- klass_name, id_map = *klass_and_id
- klass = klass_name.constantize
- table_name = klass.quoted_table_name
- connection = reflection.active_record.connection
-
- if composite?
- primary_key = klass.primary_key.to_s.split(CompositePrimaryKeys::ID_SEP)
- ids = id_map.keys.uniq.map {|id| id_map[id][:id]}
-
- where = (primary_key * ids.size).in_groups_of(primary_key.size).map do |keys|
- "(" + keys.map{|key| "#{table_name}.#{connection.quote_column_name(key)} = ?"}.join(" AND ") + ")"
- end.join(" OR ")
-
- conditions = [where, ids].flatten
- else
- conditions = ["#{table_name}.#{connection.quote_column_name(primary_key)} IN (?)", id_map.keys.uniq]
- end
-
- conditions.first << append_conditions(reflection, preload_options)
-
- associated_records = klass.find(:all,
- :conditions => conditions,
- :include => options[:include],
- :select => options[:select],
- :joins => options[:joins],
- :order => options[:order])
-
- set_association_single_records(id_map, reflection.name, associated_records, primary_key)
- end
- end
-
- def set_association_collection_records(id_to_record_map, reflection_name, associated_records, key)
- associated_records.each do |associated_record|
- associated_record_key = associated_record[key]
- associated_record_key = associated_record_key.is_a?(Array) ? associated_record_key.join(CompositePrimaryKeys::ID_SEP) : associated_record_key.to_s
- mapped_records = id_to_record_map[associated_record_key]
- add_preloaded_records_to_collection(mapped_records, reflection_name, associated_record)
- end
- end
-
- def set_association_single_records(id_to_record_map, reflection_name, associated_records, key)
- seen_keys = {}
- associated_records.each do |associated_record|
- associated_record_key = associated_record[key]
- associated_record_key = associated_record_key.is_a?(Array) ? associated_record_key.join(CompositePrimaryKeys::ID_SEP) : associated_record_key.to_s
-
- #this is a has_one or belongs_to: there should only be one record.
- #Unfortunately we can't (in portable way) ask the database for 'all records where foo_id in (x,y,z), but please
- # only one row per distinct foo_id' so this where we enforce that
- next if seen_keys[associated_record_key]
- seen_keys[associated_record_key] = true
- mapped_records = id_to_record_map[associated_record_key][:records]
- mapped_records.each do |mapped_record|
- mapped_record.send("set_#{reflection_name}_target", associated_record)
- end
- end
- end
-
- def find_associated_records(ids, reflection, preload_options)
- options = reflection.options
- table_name = reflection.klass.quoted_table_name
-
- if interface = reflection.options[:as]
- raise AssociationNotSupported, "Polymorphic joins not supported for composite keys"
- else
- connection = reflection.active_record.connection
- foreign_key = reflection.primary_key_name
- conditions = ["#{table_name}.#{connection.quote_column_name(foreign_key)} IN (?)", ids]
-
- if composite?
- foreign_keys = foreign_key.to_s.split(CompositePrimaryKeys::ID_SEP)
-
- where = (foreign_keys * ids.size).in_groups_of(foreign_keys.size).map do |keys|
- "(" + keys.map{|key| "#{table_name}.#{connection.quote_column_name(key)} = ?"}.join(" AND ") + ")"
- end.join(" OR ")
-
- conditions = [where, ids].flatten
- end
- end
-
- conditions.first << append_conditions(reflection, preload_options)
-
- reflection.klass.find(:all,
- :select => (preload_options[:select] || options[:select] || "#{table_name}.*"),
- :include => preload_options[:include] || options[:include],
- :conditions => conditions,
- :joins => options[:joins],
- :group => preload_options[:group] || options[:group],
- :order => preload_options[:order] || options[:order])
- end
-
- def full_composite_join_clause(reflection, table1, full_keys1, table2, full_keys2)
- connection = reflection.active_record.connection
- full_keys1 = full_keys1.split(CompositePrimaryKeys::ID_SEP) if full_keys1.is_a?(String)
- full_keys2 = full_keys2.split(CompositePrimaryKeys::ID_SEP) if full_keys2.is_a?(String)
- where_clause = [full_keys1, full_keys2].transpose.map do |key_pair|
- quoted1 = connection.quote_table_name(table1)
- quoted2 = connection.quote_table_name(table2)
- "#{quoted1}.#{connection.quote_column_name(key_pair.first)}=#{quoted2}.#{connection.quote_column_name(key_pair.last)}"
- end.join(" AND ")
- "(#{where_clause})"
- end
- end
- end
- end
-end
+++ /dev/null
-module CompositePrimaryKeys
- module ActiveRecord
- module Associations
- def self.append_features(base)
- super
- base.send(:extend, ClassMethods)
- end
-
- # Composite key versions of Association functions
- module ClassMethods
-
- def construct_counter_sql_with_included_associations(options, join_dependency)
- scope = scope(:find)
- sql = "SELECT COUNT(DISTINCT #{quoted_table_columns(primary_key)})"
-
- # A (slower) workaround if we're using a backend, like sqlite, that doesn't support COUNT DISTINCT.
- if !self.connection.supports_count_distinct?
- sql = "SELECT COUNT(*) FROM (SELECT DISTINCT #{quoted_table_columns(primary_key)}"
- end
-
- sql << " FROM #{quoted_table_name} "
- sql << join_dependency.join_associations.collect{|join| join.association_join }.join
-
- add_joins!(sql, options, scope)
- add_conditions!(sql, options[:conditions], scope)
- add_limited_ids_condition!(sql, options, join_dependency) if !using_limitable_reflections?(join_dependency.reflections) && ((scope && scope[:limit]) || options[:limit])
-
- add_limit!(sql, options, scope) if using_limitable_reflections?(join_dependency.reflections)
-
- if !self.connection.supports_count_distinct?
- sql << ")"
- end
-
- return sanitize_sql(sql)
- end
-
- def construct_finder_sql_with_included_associations(options, join_dependency)
- scope = scope(:find)
- sql = "SELECT #{column_aliases(join_dependency)} FROM #{(scope && scope[:from]) || options[:from] || quoted_table_name} "
- sql << join_dependency.join_associations.collect{|join| join.association_join }.join
-
- add_joins!(sql, options, scope)
- add_conditions!(sql, options[:conditions], scope)
- add_limited_ids_condition!(sql, options, join_dependency) if !using_limitable_reflections?(join_dependency.reflections) && options[:limit]
-
- sql << "ORDER BY #{options[:order]} " if options[:order]
-
- add_limit!(sql, options, scope) if using_limitable_reflections?(join_dependency.reflections)
-
- return sanitize_sql(sql)
- end
-
- def table_columns(columns)
- columns.collect {|column| "#{self.quoted_table_name}.#{connection.quote_column_name(column)}"}
- end
-
- def quoted_table_columns(columns)
- table_columns(columns).join(ID_SEP)
- end
-
- end
-
- end
- end
-end
-
-module ActiveRecord::Associations::ClassMethods
- class JoinDependency
- def construct_association(record, join, row)
- case join.reflection.macro
- when :has_many, :has_and_belongs_to_many
- collection = record.send(join.reflection.name)
- collection.loaded
-
- join_aliased_primary_keys = join.active_record.composite? ?
- join.aliased_primary_key : [join.aliased_primary_key]
- return nil if
- record.id.to_s != join.parent.record_id(row).to_s or not
- join_aliased_primary_keys.select {|key| row[key].nil?}.blank?
- association = join.instantiate(row)
- collection.target.push(association) unless collection.target.include?(association)
- when :has_one, :belongs_to
- return if record.id.to_s != join.parent.record_id(row).to_s or
- [*join.aliased_primary_key].any? { |key| row[key].nil? }
- association = join.instantiate(row)
- record.send("set_#{join.reflection.name}_target", association)
- else
- raise ConfigurationError, "unknown macro: #{join.reflection.macro}"
- end
- return association
- end
-
- class JoinBase
- def aliased_primary_key
- active_record.composite? ?
- primary_key.inject([]) {|aliased_keys, key| aliased_keys << "#{ aliased_prefix }_r#{aliased_keys.length}"} :
- "#{ aliased_prefix }_r0"
- end
-
- def record_id(row)
- active_record.composite? ?
- aliased_primary_key.map {|key| row[key]}.to_composite_ids :
- row[aliased_primary_key]
- end
-
- def column_names_with_alias
- unless @column_names_with_alias
- @column_names_with_alias = []
- keys = active_record.composite? ? primary_key.map(&:to_s) : [primary_key]
- (keys + (column_names - keys)).each_with_index do |column_name, i|
- @column_names_with_alias << [column_name, "#{ aliased_prefix }_r#{ i }"]
- end
- end
- return @column_names_with_alias
- end
- end
-
- class JoinAssociation < JoinBase
- alias single_association_join association_join
- def association_join
- reflection.active_record.composite? ? composite_association_join : single_association_join
- end
-
- def composite_association_join
- join = case reflection.macro
- when :has_and_belongs_to_many
- " LEFT OUTER JOIN %s ON %s " % [
- table_alias_for(options[:join_table], aliased_join_table_name),
- composite_join_clause(
- full_keys(aliased_join_table_name, options[:foreign_key] || reflection.active_record.to_s.classify.foreign_key),
- full_keys(reflection.active_record.table_name, reflection.active_record.primary_key)
- )
- ] +
- " LEFT OUTER JOIN %s ON %s " % [
- table_name_and_alias,
- composite_join_clause(
- full_keys(aliased_table_name, klass.primary_key),
- full_keys(aliased_join_table_name, options[:association_foreign_key] || klass.table_name.classify.foreign_key)
- )
- ]
- when :has_many, :has_one
- case
- when reflection.macro == :has_many && reflection.options[:through]
- through_conditions = through_reflection.options[:conditions] ? "AND #{interpolate_sql(sanitize_sql(through_reflection.options[:conditions]))}" : ''
- if through_reflection.options[:as] # has_many :through against a polymorphic join
- raise AssociationNotSupported, "Polymorphic joins not supported for composite keys"
- else
- if source_reflection.macro == :has_many && source_reflection.options[:as]
- raise AssociationNotSupported, "Polymorphic joins not supported for composite keys"
- else
- case source_reflection.macro
- when :belongs_to
- first_key = primary_key
- second_key = options[:foreign_key] || klass.to_s.classify.foreign_key
- when :has_many
- first_key = through_reflection.klass.to_s.classify.foreign_key
- second_key = options[:foreign_key] || primary_key
- end
-
- " LEFT OUTER JOIN %s ON %s " % [
- table_alias_for(through_reflection.klass.table_name, aliased_join_table_name),
- composite_join_clause(
- full_keys(aliased_join_table_name, through_reflection.primary_key_name),
- full_keys(parent.aliased_table_name, parent.primary_key)
- )
- ] +
- " LEFT OUTER JOIN %s ON %s " % [
- table_name_and_alias,
- composite_join_clause(
- full_keys(aliased_table_name, first_key),
- full_keys(aliased_join_table_name, second_key)
- )
- ]
- end
- end
-
- when reflection.macro == :has_many && reflection.options[:as]
- raise AssociationNotSupported, "Polymorphic joins not supported for composite keys"
- when reflection.macro == :has_one && reflection.options[:as]
- raise AssociationNotSupported, "Polymorphic joins not supported for composite keys"
- else
- foreign_key = options[:foreign_key] || reflection.active_record.name.foreign_key
- " LEFT OUTER JOIN %s ON %s " % [
- table_name_and_alias,
- composite_join_clause(
- full_keys(aliased_table_name, foreign_key),
- full_keys(parent.aliased_table_name, parent.primary_key)),
- ]
- end
- when :belongs_to
- " LEFT OUTER JOIN %s ON %s " % [
- table_name_and_alias,
- composite_join_clause(
- full_keys(aliased_table_name, reflection.klass.primary_key),
- full_keys(parent.aliased_table_name, options[:foreign_key] || klass.to_s.foreign_key)),
- ]
- else
- ""
- end || ''
- join << %(AND %s.%s = %s ) % [
- aliased_table_name,
- reflection.active_record.connection.quote_column_name(reflection.active_record.inheritance_column),
- klass.connection.quote(klass.name)] unless klass.descends_from_active_record?
- join << "AND #{interpolate_sql(sanitize_sql(reflection.options[:conditions]))} " if reflection.options[:conditions]
- join
- end
-
- def full_keys(table_name, keys)
- connection = reflection.active_record.connection
- quoted_table_name = connection.quote_table_name(table_name)
- if keys.is_a?(Array)
- keys.collect {|key| "#{quoted_table_name}.#{connection.quote_column_name(key)}"}.join(CompositePrimaryKeys::ID_SEP)
- else
- "#{quoted_table_name}.#{connection.quote_column_name(keys)}"
- end
- end
-
- def composite_join_clause(full_keys1, full_keys2)
- full_keys1 = full_keys1.split(CompositePrimaryKeys::ID_SEP) if full_keys1.is_a?(String)
- full_keys2 = full_keys2.split(CompositePrimaryKeys::ID_SEP) if full_keys2.is_a?(String)
- where_clause = [full_keys1, full_keys2].transpose.map do |key1, key2|
- "#{key1}=#{key2}"
- end.join(" AND ")
- "(#{where_clause})"
- end
- end
- end
-end
-
-module ActiveRecord::Associations
- class AssociationProxy #:nodoc:
-
- def composite_where_clause(full_keys, ids)
- full_keys = full_keys.split(CompositePrimaryKeys::ID_SEP) if full_keys.is_a?(String)
-
- if ids.is_a?(String)
- ids = [[ids]]
- elsif not ids.first.is_a?(Array) # if single comp key passed, turn into an array of 1
- ids = [ids.to_composite_ids]
- end
-
- where_clause = ids.map do |id_set|
- transposed = id_set.size == 1 ? [[full_keys, id_set.first]] : [full_keys, id_set].transpose
- transposed.map do |full_key, id|
- "#{full_key.to_s}=#{@reflection.klass.sanitize(id)}"
- end.join(" AND ")
- end.join(") OR (")
-
- "(#{where_clause})"
- end
-
- def composite_join_clause(full_keys1, full_keys2)
- full_keys1 = full_keys1.split(CompositePrimaryKeys::ID_SEP) if full_keys1.is_a?(String)
- full_keys2 = full_keys2.split(CompositePrimaryKeys::ID_SEP) if full_keys2.is_a?(String)
-
- where_clause = [full_keys1, full_keys2].transpose.map do |key1, key2|
- "#{key1}=#{key2}"
- end.join(" AND ")
-
- "(#{where_clause})"
- end
-
- def full_composite_join_clause(table1, full_keys1, table2, full_keys2)
- connection = @reflection.active_record.connection
- full_keys1 = full_keys1.split(CompositePrimaryKeys::ID_SEP) if full_keys1.is_a?(String)
- full_keys2 = full_keys2.split(CompositePrimaryKeys::ID_SEP) if full_keys2.is_a?(String)
-
- quoted1 = connection.quote_table_name(table1)
- quoted2 = connection.quote_table_name(table2)
-
- where_clause = [full_keys1, full_keys2].transpose.map do |key_pair|
- "#{quoted1}.#{connection.quote_column_name(key_pair.first)}=#{quoted2}.#{connection.quote_column_name(key_pair.last)}"
- end.join(" AND ")
-
- "(#{where_clause})"
- end
-
- def full_keys(table_name, keys)
- connection = @reflection.active_record.connection
- quoted_table_name = connection.quote_table_name(table_name)
- keys = keys.split(CompositePrimaryKeys::ID_SEP) if keys.is_a?(String)
- if keys.is_a?(Array)
- keys.collect {|key| "#{quoted_table_name}.#{connection.quote_column_name(key)}"}.join(CompositePrimaryKeys::ID_SEP)
- else
- "#{quoted_table_name}.#{connection.quote_column_name(keys)}"
- end
- end
-
- def full_columns_equals(table_name, keys, quoted_ids)
- connection = @reflection.active_record.connection
- quoted_table_name = connection.quote_table_name(table_name)
- if keys.is_a?(Symbol) or (keys.is_a?(String) and keys == keys.to_s.split(CompositePrimaryKeys::ID_SEP))
- return "#{quoted_table_name}.#{connection.quote_column_name(keys)} = #{quoted_ids}"
- end
- keys = keys.split(CompositePrimaryKeys::ID_SEP) if keys.is_a?(String)
- quoted_ids = quoted_ids.split(CompositePrimaryKeys::ID_SEP) if quoted_ids.is_a?(String)
- keys_ids = [keys, quoted_ids].transpose
- keys_ids.collect {|key, id| "(#{quoted_table_name}.#{connection.quote_column_name(key)} = #{id})"}.join(' AND ')
- end
-
- def set_belongs_to_association_for(record)
- if @reflection.options[:as]
- record["#{@reflection.options[:as]}_id"] = @owner.id unless @owner.new_record?
- record["#{@reflection.options[:as]}_type"] = @owner.class.base_class.name.to_s
- else
- key_values = @reflection.primary_key_name.to_s.split(CompositePrimaryKeys::ID_SEP).zip([@owner.id].flatten)
- key_values.each{|key, value| record[key] = value} unless @owner.new_record?
- end
- end
- end
-
- class HasAndBelongsToManyAssociation < AssociationCollection #:nodoc:
- def construct_sql
- @reflection.options[:finder_sql] &&= interpolate_sql(@reflection.options[:finder_sql])
-
- if @reflection.options[:finder_sql]
- @finder_sql = @reflection.options[:finder_sql]
- else
- @finder_sql = full_columns_equals(@reflection.options[:join_table], @reflection.primary_key_name, @owner.quoted_id)
- @finder_sql << " AND (#{conditions})" if conditions
- end
-
- @join_sql = "INNER JOIN #{@reflection.active_record.connection.quote_table_name(@reflection.options[:join_table])} ON " +
- full_composite_join_clause(@reflection.klass.table_name, @reflection.klass.primary_key, @reflection.options[:join_table], @reflection.association_foreign_key)
- end
- end
-
- class HasManyAssociation < AssociationCollection #:nodoc:
- def construct_sql
- case
- when @reflection.options[:finder_sql]
- @finder_sql = interpolate_sql(@reflection.options[:finder_sql])
-
- when @reflection.options[:as]
- @finder_sql =
- "#{@reflection.klass.quoted_table_name}.#{@reflection.options[:as]}_id = #{@owner.quoted_id} AND " +
- "#{@reflection.klass.quoted_table_name}.#{@reflection.options[:as]}_type = #{@owner.class.quote_value(@owner.class.base_class.name.to_s)}"
- @finder_sql << " AND (#{conditions})" if conditions
-
- else
- @finder_sql = full_columns_equals(@reflection.klass.table_name, @reflection.primary_key_name, @owner.quoted_id)
- @finder_sql << " AND (#{conditions})" if conditions
- end
-
- if @reflection.options[:counter_sql]
- @counter_sql = interpolate_sql(@reflection.options[:counter_sql])
- elsif @reflection.options[:finder_sql]
- # replace the SELECT clause with COUNT(*), preserving any hints within /* ... */
- @reflection.options[:counter_sql] = @reflection.options[:finder_sql].sub(/SELECT (\/\*.*?\*\/ )?(.*)\bFROM\b/im) { "SELECT #{$1}COUNT(*) FROM" }
- @counter_sql = interpolate_sql(@reflection.options[:counter_sql])
- else
- @counter_sql = @finder_sql
- end
- end
-
- def delete_records(records)
- if @reflection.options[:dependent]
- records.each { |r| r.destroy }
- else
- connection = @reflection.active_record.connection
- field_names = @reflection.primary_key_name.split(',')
- field_names.collect! {|n| connection.quote_column_name(n) + " = NULL"}
- records.each do |r|
- where_clause = nil
-
- if r.quoted_id.to_s.include?(CompositePrimaryKeys::ID_SEP)
- where_clause_terms = [@reflection.klass.primary_key, r.quoted_id].transpose.map do |pair|
- "(#{connection.quote_column_name(pair[0])} = #{pair[1]})"
- end
- where_clause = where_clause_terms.join(" AND ")
- else
- where_clause = connection.quote_column_name(@reflection.klass.primary_key) + ' = ' + r.quoted_id
- end
-
- @reflection.klass.update_all( field_names.join(',') , where_clause)
- end
- end
- end
- end
-
- class HasOneAssociation < BelongsToAssociation #:nodoc:
- def construct_sql
- case
- when @reflection.options[:as]
- @finder_sql =
- "#{@reflection.klass.quoted_table_name}.#{@reflection.options[:as]}_id = #{@owner.quoted_id} AND " +
- "#{@reflection.klass.quoted_table_name}.#{@reflection.options[:as]}_type = #{@owner.class.quote_value(@owner.class.base_class.name.to_s)}"
- else
- @finder_sql = full_columns_equals(@reflection.klass.table_name, @reflection.primary_key_name, @owner.quoted_id)
- end
-
- @finder_sql << " AND (#{conditions})" if conditions
- end
- end
-
- class HasManyThroughAssociation < HasManyAssociation #:nodoc:
- def construct_conditions_with_composite_keys
- if @reflection.through_reflection.options[:as]
- construct_conditions_without_composite_keys
- else
- conditions = full_columns_equals(@reflection.through_reflection.table_name, @reflection.through_reflection.primary_key_name, @owner.quoted_id)
- conditions << " AND (#{sql_conditions})" if sql_conditions
- conditions
- end
- end
- alias_method_chain :construct_conditions, :composite_keys
-
- def construct_joins_with_composite_keys(custom_joins = nil)
- if @reflection.through_reflection.options[:as] || @reflection.source_reflection.options[:as]
- construct_joins_without_composite_keys(custom_joins)
- else
- if @reflection.source_reflection.macro == :belongs_to
- reflection_primary_key = @reflection.klass.primary_key
- source_primary_key = @reflection.source_reflection.primary_key_name
- else
- reflection_primary_key = @reflection.source_reflection.primary_key_name
- source_primary_key = @reflection.klass.primary_key
- end
-
- "INNER JOIN %s ON %s #{@reflection.options[:joins]} #{custom_joins}" % [
- @reflection.through_reflection.quoted_table_name,
- composite_join_clause(full_keys(@reflection.table_name, reflection_primary_key), full_keys(@reflection.through_reflection.table_name, source_primary_key))
- ]
- end
- end
- alias_method_chain :construct_joins, :composite_keys
- end
-end
+++ /dev/null
-module CompositePrimaryKeys
- module ActiveRecord
- module AttributeMethods #:nodoc:
- def self.append_features(base)
- super
- base.send(:extend, ClassMethods)
- end
-
- module ClassMethods
- # Define an attribute reader method. Cope with nil column.
- def define_read_method(symbol, attr_name, column)
- cast_code = column.type_cast_code('v') if column
- cast_code = "::#{cast_code}" if cast_code && cast_code.match('ActiveRecord::.*')
- access_code = cast_code ? "(v=@attributes['#{attr_name}']) && #{cast_code}" : "@attributes['#{attr_name}']"
-
- unless self.primary_keys.include?(attr_name.to_sym)
- access_code = access_code.insert(0, "missing_attribute('#{attr_name}', caller) unless @attributes.has_key?('#{attr_name}'); ")
- end
-
- if cache_attribute?(attr_name)
- access_code = "@attributes_cache['#{attr_name}'] ||= (#{access_code})"
- end
-
- evaluate_attribute_method attr_name, "def #{symbol}; #{access_code}; end"
- end
-
- # Evaluate the definition for an attribute related method
- def evaluate_attribute_method(attr_name, method_definition, method_name=attr_name)
- unless primary_keys.include?(method_name.to_sym)
- generated_methods << method_name
- end
-
- begin
- class_eval(method_definition, __FILE__, __LINE__)
- rescue SyntaxError => err
- generated_methods.delete(attr_name)
- if logger
- logger.warn "Exception occurred during reader method compilation."
- logger.warn "Maybe #{attr_name} is not a valid Ruby identifier?"
- logger.warn "#{err.message}"
- end
- end
- end
- end
-
- # Allows access to the object attributes, which are held in the @attributes hash, as though they
- # were first-class methods. So a Person class with a name attribute can use Person#name and
- # Person#name= and never directly use the attributes hash -- except for multiple assigns with
- # ActiveRecord#attributes=. A Milestone class can also ask Milestone#completed? to test that
- # the completed attribute is not nil or 0.
- #
- # It's also possible to instantiate related objects, so a Client class belonging to the clients
- # table with a master_id foreign key can instantiate master through Client#master.
- def method_missing(method_id, *args, &block)
- method_name = method_id.to_s
-
- # If we haven't generated any methods yet, generate them, then
- # see if we've created the method we're looking for.
- if !self.class.generated_methods?
- self.class.define_attribute_methods
-
- if self.class.generated_methods.include?(method_name)
- return self.send(method_id, *args, &block)
- end
- end
-
- if self.class.primary_keys.include?(method_name.to_sym)
- ids[self.class.primary_keys.index(method_name.to_sym)]
- elsif md = self.class.match_attribute_method?(method_name)
- attribute_name, method_type = md.pre_match, md.to_s
- if @attributes.include?(attribute_name)
- __send__("attribute#{method_type}", attribute_name, *args, &block)
- else
- super
- end
- elsif @attributes.include?(method_name)
- read_attribute(method_name)
- else
- super
- end
- end
- end
- end
-end
+++ /dev/null
-module CompositePrimaryKeys\r
- module ActiveRecord #:nodoc:\r
- class CompositeKeyError < StandardError #:nodoc:\r
- end\r
-\r
- module Base #:nodoc:\r
-\r
- INVALID_FOR_COMPOSITE_KEYS = 'Not appropriate for composite primary keys'\r
- NOT_IMPLEMENTED_YET = 'Not implemented for composite primary keys yet'\r
-\r
- def self.append_features(base)\r
- super\r
- base.send(:include, InstanceMethods)\r
- base.extend(ClassMethods)\r
- end\r
-\r
- module ClassMethods\r
- def set_primary_keys(*keys)\r
- keys = keys.first if keys.first.is_a?(Array)\r
- keys = keys.map { |k| k.to_sym }\r
- cattr_accessor :primary_keys\r
- self.primary_keys = keys.to_composite_keys\r
-\r
- class_eval <<-EOV\r
- extend CompositeClassMethods\r
- include CompositeInstanceMethods\r
-\r
- include CompositePrimaryKeys::ActiveRecord::Associations\r
- include CompositePrimaryKeys::ActiveRecord::AssociationPreload\r
- include CompositePrimaryKeys::ActiveRecord::Calculations\r
- include CompositePrimaryKeys::ActiveRecord::AttributeMethods\r
- EOV\r
- end\r
-\r
- def composite?\r
- false\r
- end\r
- end\r
-\r
- module InstanceMethods\r
- def composite?; self.class.composite?; end\r
- end\r
-\r
- module CompositeInstanceMethods\r
-\r
- # A model instance's primary keys is always available as model.ids\r
- # whether you name it the default 'id' or set it to something else.\r
- def id\r
- attr_names = self.class.primary_keys\r
- CompositeIds.new(attr_names.map { |attr_name| read_attribute(attr_name) })\r
- end\r
- alias_method :ids, :id\r
-\r
- def to_param\r
- id.to_s\r
- end\r
-\r
- def id_before_type_cast #:nodoc:\r
- raise CompositeKeyError, CompositePrimaryKeys::ActiveRecord::Base::NOT_IMPLEMENTED_YET\r
- end\r
-\r
- def quoted_id #:nodoc:\r
- [self.class.primary_keys, ids].\r
- transpose.\r
- map {|attr_name,id| quote_value(id, column_for_attribute(attr_name))}.\r
- to_composite_ids\r
- end\r
-\r
- # Sets the primary ID.\r
- def id=(ids)\r
- ids = ids.split(ID_SEP) if ids.is_a?(String)\r
- ids.flatten!\r
- unless ids.is_a?(Array) and ids.length == self.class.primary_keys.length\r
- raise "#{self.class}.id= requires #{self.class.primary_keys.length} ids"\r
- end\r
- [primary_keys, ids].transpose.each {|key, an_id| write_attribute(key , an_id)}\r
- id\r
- end\r
-\r
- # Returns a clone of the record that hasn't been assigned an id yet and\r
- # is treated as a new record. Note that this is a "shallow" clone:\r
- # it copies the object's attributes only, not its associations.\r
- # The extent of a "deep" clone is application-specific and is therefore\r
- # left to the application to implement according to its need.\r
- def clone\r
- attrs = self.attributes_before_type_cast\r
- self.class.primary_keys.each {|key| attrs.delete(key.to_s)}\r
- self.class.new do |record|\r
- record.send :instance_variable_set, '@attributes', attrs\r
- end\r
- end\r
-\r
-\r
- private\r
- # The xx_without_callbacks methods are overwritten as that is the end of the alias chain\r
-\r
- # Creates a new record with values matching those of the instance attributes.\r
- def create_without_callbacks\r
- unless self.id\r
- raise CompositeKeyError, "Composite keys do not generated ids from sequences, you must provide id values"\r
- end\r
- attributes_minus_pks = attributes_with_quotes(false)\r
- quoted_pk_columns = self.class.primary_key.map { |col| connection.quote_column_name(col) }\r
- cols = quoted_column_names(attributes_minus_pks) << quoted_pk_columns\r
- vals = attributes_minus_pks.values << quoted_id\r
- connection.insert(\r
- "INSERT INTO #{self.class.quoted_table_name} " +\r
- "(#{cols.join(', ')}) " +\r
- "VALUES (#{vals.join(', ')})",\r
- "#{self.class.name} Create",\r
- self.class.primary_key,\r
- self.id\r
- )\r
- @new_record = false\r
- return true\r
- end\r
-\r
- # Updates the associated record with values matching those of the instance attributes.\r
- def update_without_callbacks\r
- where_clause_terms = [self.class.primary_key, quoted_id].transpose.map do |pair| \r
- "(#{connection.quote_column_name(pair[0])} = #{pair[1]})"\r
- end\r
- where_clause = where_clause_terms.join(" AND ")\r
- connection.update(\r
- "UPDATE #{self.class.quoted_table_name} " +\r
- "SET #{quoted_comma_pair_list(connection, attributes_with_quotes(false))} " +\r
- "WHERE #{where_clause}",\r
- "#{self.class.name} Update"\r
- )\r
- return true\r
- end\r
-\r
- # Deletes the record in the database and freezes this instance to reflect that no changes should\r
- # be made (since they can't be persisted).\r
- def destroy_without_callbacks\r
- where_clause_terms = [self.class.primary_key, quoted_id].transpose.map do |pair| \r
- "(#{connection.quote_column_name(pair[0])} = #{pair[1]})"\r
- end\r
- where_clause = where_clause_terms.join(" AND ")\r
- unless new_record?\r
- connection.delete(\r
- "DELETE FROM #{self.class.quoted_table_name} " +\r
- "WHERE #{where_clause}",\r
- "#{self.class.name} Destroy"\r
- )\r
- end\r
- freeze\r
- end\r
- end\r
-\r
- module CompositeClassMethods\r
- def primary_key; primary_keys; end\r
- def primary_key=(keys); primary_keys = keys; end\r
-\r
- def composite?\r
- true\r
- end\r
-\r
- #ids_to_s([[1,2],[7,3]]) -> "(1,2),(7,3)"\r
- #ids_to_s([[1,2],[7,3]], ',', ';') -> "1,2;7,3"\r
- def ids_to_s(many_ids, id_sep = CompositePrimaryKeys::ID_SEP, list_sep = ',', left_bracket = '(', right_bracket = ')')\r
- many_ids.map {|ids| "#{left_bracket}#{ids}#{right_bracket}"}.join(list_sep)\r
- end\r
- \r
- # Creates WHERE condition from list of composited ids\r
- # User.update_all({:role => 'admin'}, :conditions => composite_where_clause([[1, 2], [2, 2]])) #=> UPDATE admins SET admin.role='admin' WHERE (admin.type=1 AND admin.type2=2) OR (admin.type=2 AND admin.type2=2)\r
- # User.find(:all, :conditions => composite_where_clause([[1, 2], [2, 2]])) #=> SELECT * FROM admins WHERE (admin.type=1 AND admin.type2=2) OR (admin.type=2 AND admin.type2=2)\r
- def composite_where_clause(ids)\r
- if ids.is_a?(String)\r
- ids = [[ids]]\r
- elsif not ids.first.is_a?(Array) # if single comp key passed, turn into an array of 1\r
- ids = [ids.to_composite_ids]\r
- end\r
- \r
- ids.map do |id_set|\r
- [primary_keys, id_set].transpose.map do |key, id|\r
- "#{table_name}.#{key.to_s}=#{sanitize(id)}"\r
- end.join(" AND ")\r
- end.join(") OR (") \r
- end\r
-\r
- # Returns true if the given +ids+ represents the primary keys of a record in the database, false otherwise.\r
- # Example:\r
- # Person.exists?(5,7)\r
- def exists?(ids)\r
- obj = find(ids) rescue false\r
- !obj.nil? and obj.is_a?(self)\r
- end\r
-\r
- # Deletes the record with the given +ids+ without instantiating an object first, e.g. delete(1,2)\r
- # If an array of ids is provided (e.g. delete([1,2], [3,4]), all of them\r
- # are deleted.\r
- def delete(*ids)\r
- unless ids.is_a?(Array); raise "*ids must be an Array"; end\r
- ids = [ids.to_composite_ids] if not ids.first.is_a?(Array)\r
- where_clause = ids.map do |id_set|\r
- [primary_keys, id_set].transpose.map do |key, id|\r
- "#{quoted_table_name}.#{connection.quote_column_name(key.to_s)}=#{sanitize(id)}"\r
- end.join(" AND ")\r
- end.join(") OR (")\r
- delete_all([ "(#{where_clause})" ])\r
- end\r
-\r
- # Destroys the record with the given +ids+ by instantiating the object and calling #destroy (all the callbacks are the triggered).\r
- # If an array of ids is provided, all of them are destroyed.\r
- def destroy(*ids)\r
- unless ids.is_a?(Array); raise "*ids must be an Array"; end\r
- if ids.first.is_a?(Array)\r
- ids = ids.map{|compids| compids.to_composite_ids}\r
- else\r
- ids = ids.to_composite_ids\r
- end\r
- ids.first.is_a?(CompositeIds) ? ids.each { |id_set| find(id_set).destroy } : find(ids).destroy\r
- end\r
-\r
- # Returns an array of column objects for the table associated with this class.\r
- # Each column that matches to one of the primary keys has its\r
- # primary attribute set to true\r
- def columns\r
- unless @columns\r
- @columns = connection.columns(table_name, "#{name} Columns")\r
- @columns.each {|column| column.primary = primary_keys.include?(column.name.to_sym)}\r
- end\r
- @columns\r
- end\r
-\r
- ## DEACTIVATED METHODS ##\r
- public\r
- # Lazy-set the sequence name to the connection's default. This method\r
- # is only ever called once since set_sequence_name overrides it.\r
- def sequence_name #:nodoc:\r
- raise CompositeKeyError, CompositePrimaryKeys::ActiveRecord::Base::INVALID_FOR_COMPOSITE_KEYS\r
- end\r
-\r
- def reset_sequence_name #:nodoc:\r
- raise CompositeKeyError, CompositePrimaryKeys::ActiveRecord::Base::INVALID_FOR_COMPOSITE_KEYS\r
- end\r
-\r
- def set_primary_key(value = nil, &block)\r
- raise CompositeKeyError, CompositePrimaryKeys::ActiveRecord::Base::INVALID_FOR_COMPOSITE_KEYS\r
- end\r
-\r
- private\r
- def find_one(id, options)\r
- raise CompositeKeyError, CompositePrimaryKeys::ActiveRecord::Base::INVALID_FOR_COMPOSITE_KEYS\r
- end\r
-\r
- def find_some(ids, options)\r
- raise CompositeKeyError, CompositePrimaryKeys::ActiveRecord::Base::INVALID_FOR_COMPOSITE_KEYS\r
- end\r
-\r
- def find_from_ids(ids, options)\r
- ids = ids.first if ids.last == nil\r
- conditions = " AND (#{sanitize_sql(options[:conditions])})" if options[:conditions]\r
- # if ids is just a flat list, then its size must = primary_key.length (one id per primary key, in order)\r
- # if ids is list of lists, then each inner list must follow rule above\r
- if ids.first.is_a? String\r
- # find '2,1' -> ids = ['2,1']\r
- # find '2,1;7,3' -> ids = ['2,1;7,3']\r
- ids = ids.first.split(ID_SET_SEP).map {|id_set| id_set.split(ID_SEP).to_composite_ids}\r
- # find '2,1;7,3' -> ids = [['2','1'],['7','3']], inner [] are CompositeIds\r
- end\r
- ids = [ids.to_composite_ids] if not ids.first.kind_of?(Array)\r
- ids.each do |id_set|\r
- unless id_set.is_a?(Array)\r
- raise "Ids must be in an Array, instead received: #{id_set.inspect}"\r
- end\r
- unless id_set.length == primary_keys.length\r
- raise "#{id_set.inspect}: Incorrect number of primary keys for #{class_name}: #{primary_keys.inspect}"\r
- end\r
- end\r
-\r
- # Let keys = [:a, :b]\r
- # If ids = [[10, 50], [11, 51]], then :conditions => \r
- # "(#{quoted_table_name}.a, #{quoted_table_name}.b) IN ((10, 50), (11, 51))"\r
-\r
- conditions = ids.map do |id_set|\r
- [primary_keys, id_set].transpose.map do |key, id|\r
- col = columns_hash[key.to_s]\r
- val = quote_value(id, col)\r
- "#{quoted_table_name}.#{connection.quote_column_name(key.to_s)}=#{val}"\r
- end.join(" AND ")\r
- end.join(") OR (")\r
- \r
- options.update :conditions => "(#{conditions})"\r
-\r
- result = find_every(options)\r
-\r
- if result.size == ids.size\r
- ids.size == 1 ? result[0] : result\r
- else\r
- raise ::ActiveRecord::RecordNotFound, "Couldn't find all #{name.pluralize} with IDs (#{ids.inspect})#{conditions}"\r
- end\r
- end\r
- end\r
- end\r
- end\r
-end\r
-\r
-\r
-module ActiveRecord\r
- ID_SEP = ','\r
- ID_SET_SEP = ';'\r
-\r
- class Base\r
- # Allows +attr_name+ to be the list of primary_keys, and returns the id\r
- # of the object\r
- # e.g. @object[@object.class.primary_key] => [1,1]\r
- def [](attr_name)\r
- if attr_name.is_a?(String) and attr_name != attr_name.split(ID_SEP).first\r
- attr_name = attr_name.split(ID_SEP)\r
- end\r
- attr_name.is_a?(Array) ?\r
- attr_name.map {|name| read_attribute(name)} :\r
- read_attribute(attr_name)\r
- end\r
-\r
- # Updates the attribute identified by <tt>attr_name</tt> with the specified +value+.\r
- # (Alias for the protected write_attribute method).\r
- def []=(attr_name, value)\r
- if attr_name.is_a?(String) and attr_name != attr_name.split(ID_SEP).first\r
- attr_name = attr_name.split(ID_SEP)\r
- end\r
-\r
- if attr_name.is_a? Array\r
- value = value.split(ID_SEP) if value.is_a? String\r
- unless value.length == attr_name.length\r
- raise "Number of attr_names and values do not match"\r
- end\r
- #breakpoint\r
- [attr_name, value].transpose.map {|name,val| write_attribute(name.to_s, val)}\r
- else\r
- write_attribute(attr_name, value)\r
- end\r
- end\r
- end\r
-end\r
+++ /dev/null
-module CompositePrimaryKeys
- module ActiveRecord
- module Calculations
- def self.append_features(base)
- super
- base.send(:extend, ClassMethods)
- end
-
- module ClassMethods
- def construct_calculation_sql(operation, column_name, options) #:nodoc:
- operation = operation.to_s.downcase
- options = options.symbolize_keys
-
- scope = scope(:find)
- merged_includes = merge_includes(scope ? scope[:include] : [], options[:include])
- aggregate_alias = column_alias_for(operation, column_name)
- use_workaround = !connection.supports_count_distinct? && options[:distinct] && operation.to_s.downcase == 'count'
- join_dependency = nil
-
- if merged_includes.any? && operation.to_s.downcase == 'count'
- options[:distinct] = true
- use_workaround = !connection.supports_count_distinct?
- column_name = options[:select] || primary_key.map{ |part| "#{quoted_table_name}.#{connection.quote_column_name(part)}"}.join(',')
- end
-
- sql = "SELECT #{operation}(#{'DISTINCT ' if options[:distinct]}#{column_name}) AS #{aggregate_alias}"
-
- # A (slower) workaround if we're using a backend, like sqlite, that doesn't support COUNT DISTINCT.
- sql = "SELECT COUNT(*) AS #{aggregate_alias}" if use_workaround
-
- sql << ", #{connection.quote_column_name(options[:group_field])} AS #{options[:group_alias]}" if options[:group]
- sql << " FROM (SELECT DISTINCT #{column_name}" if use_workaround
- sql << " FROM #{quoted_table_name} "
- if merged_includes.any?
- join_dependency = ::ActiveRecord::Associations::ClassMethods::JoinDependency.new(self, merged_includes, options[:joins])
- sql << join_dependency.join_associations.collect{|join| join.association_join }.join
- end
- add_joins!(sql, options, scope)
- add_conditions!(sql, options[:conditions], scope)
- add_limited_ids_condition!(sql, options, join_dependency) if \
- join_dependency &&
- !using_limitable_reflections?(join_dependency.reflections) &&
- ((scope && scope[:limit]) || options[:limit])
-
- if options[:group]
- group_key = connection.adapter_name == 'FrontBase' ? :group_alias : :group_field
- sql << " GROUP BY #{connection.quote_column_name(options[group_key])} "
- end
-
- if options[:group] && options[:having]
- # FrontBase requires identifiers in the HAVING clause and chokes on function calls
- if connection.adapter_name == 'FrontBase'
- options[:having].downcase!
- options[:having].gsub!(/#{operation}\s*\(\s*#{column_name}\s*\)/, aggregate_alias)
- end
-
- sql << " HAVING #{options[:having]} "
- end
-
- sql << " ORDER BY #{options[:order]} " if options[:order]
- add_limit!(sql, options, scope)
- sql << ') w1' if use_workaround # assign a dummy table name as required for postgresql
- sql
- end
- end
- end
- end
-end
+++ /dev/null
-module CompositePrimaryKeys\r
- ID_SEP = ','\r
- ID_SET_SEP = ';'\r
-\r
- module ArrayExtension\r
- def to_composite_keys\r
- CompositeKeys.new(self)\r
- end\r
-\r
- def to_composite_ids\r
- CompositeIds.new(self)\r
- end\r
- end\r
-\r
- class CompositeArray < Array\r
- def to_s\r
- join(ID_SEP)\r
- end\r
- end\r
-\r
- class CompositeKeys < CompositeArray\r
-\r
- end\r
-\r
- class CompositeIds < CompositeArray\r
-\r
- end\r
-end\r
-\r
-Array.send(:include, CompositePrimaryKeys::ArrayExtension)\r
+++ /dev/null
-module ActiveRecord
- module ConnectionAdapters
- class IBM_DBAdapter < AbstractAdapter
-
- # This mightn't be in Core, but count(distinct x,y) doesn't work for me
- def supports_count_distinct? #:nodoc:
- false
- end
-
- alias_method :quote_original, :quote
- def quote(value, column = nil)
- if value.kind_of?(String) && column && [:integer, :float].include?(column.type)
- value = column.type == :integer ? value.to_i : value.to_f
- value.to_s
- else
- quote_original(value, column)
- end
- end
- end
- end
-end
+++ /dev/null
-module ActiveRecord
- module ConnectionAdapters
- class OracleAdapter < AbstractAdapter
-
- # This mightn't be in Core, but count(distinct x,y) doesn't work for me
- def supports_count_distinct? #:nodoc:
- false
- end
-
- def concat(*columns)
- "(#{columns.join('||')})"
- end
- end
- end
-end
\ No newline at end of file
+++ /dev/null
-module ActiveRecord
- module ConnectionAdapters
- class PostgreSQLAdapter < AbstractAdapter
-
- # This mightn't be in Core, but count(distinct x,y) doesn't work for me
- def supports_count_distinct? #:nodoc:
- false
- end
-
- def concat(*columns)
- columns = columns.map { |c| "CAST(#{c} AS varchar)" }
- "(#{columns.join('||')})"
- end
-
- # Executes an INSERT query and returns the new record's ID
- def insert(sql, name = nil, pk = nil, id_value = nil, sequence_name = nil)
- # Extract the table from the insert sql. Yuck.
- table = sql.split(" ", 4)[2].gsub('"', '')
-
- # Try an insert with 'returning id' if available (PG >= 8.2)
- if supports_insert_with_returning?
- pk, sequence_name = *pk_and_sequence_for(table) unless pk
- if pk
- quoted_pk = if pk.is_a?(Array)
- pk.map { |col| quote_column_name(col) }.join(ID_SEP)
- else
- quote_column_name(pk)
- end
- id = select_value("#{sql} RETURNING #{quoted_pk}")
- clear_query_cache
- return id
- end
- end
-
- # Otherwise, insert then grab last_insert_id.
- if insert_id = super
- insert_id
- else
- # If neither pk nor sequence name is given, look them up.
- unless pk || sequence_name
- pk, sequence_name = *pk_and_sequence_for(table)
- end
-
- # If a pk is given, fallback to default sequence name.
- # Don't fetch last insert id for a table without a pk.
- if pk && sequence_name ||= default_sequence_name(table, pk)
- last_insert_id(table, sequence_name)
- end
- end
- end
- end
- end
-end
+++ /dev/null
-require 'active_record/connection_adapters/sqlite_adapter'
-
-module ActiveRecord
- module ConnectionAdapters #:nodoc:
- class SQLite3Adapter < SQLiteAdapter # :nodoc:
- def supports_count_distinct? #:nodoc:
- false
- end
-
- def concat(*columns)
- "(#{columns.join('||')})"
- end
- end
- end
-end
\ No newline at end of file
+++ /dev/null
-class Fixture #:nodoc:
- def [](key)
- if key.is_a? Array
- return key.map { |a_key| self[a_key.to_s] }.to_composite_ids.to_s
- end
- @fixture[key]
- end
-end
+++ /dev/null
-ActiveRecord::ConnectionAdapters::ColumnDefinition.send(:alias_method, :to_s_without_composite_keys, :to_s)
-
-ActiveRecord::ConnectionAdapters::ColumnDefinition.class_eval <<-'EOF'
- def to_s
- if name.is_a? Array
- "PRIMARY KEY (#{name.join(',')})"
- else
- to_s_without_composite_keys
- end
- end
-EOF
-
-ActiveRecord::ConnectionAdapters::TableDefinition.class_eval <<-'EOF'
- def [](name)
- @columns.find { |column|
- !column.name.is_a?(Array) && column.name.to_s == name.to_s
- }
- end
-EOF
-
\ No newline at end of file
+++ /dev/null
-module ActiveRecord\r
- module Reflection\r
- class AssociationReflection\r
- def primary_key_name\r
- return @primary_key_name if @primary_key_name\r
- case\r
- when macro == :belongs_to\r
- @primary_key_name = options[:foreign_key] || class_name.foreign_key\r
- when options[:as]\r
- @primary_key_name = options[:foreign_key] || "#{options[:as]}_id"\r
- else\r
- @primary_key_name = options[:foreign_key] || active_record.name.foreign_key\r
- end\r
- @primary_key_name = @primary_key_name.to_composite_keys.to_s if @primary_key_name.is_a? Array\r
- @primary_key_name\r
- end\r
- end\r
- end\r
-end
\ No newline at end of file
+++ /dev/null
-module CompositePrimaryKeys\r
- module VERSION #:nodoc:\r
- MAJOR = 1\r
- MINOR = 1\r
- TINY = 0\r
- STRING = [MAJOR, MINOR, TINY].join('.')\r
- end\r
-end\r
+++ /dev/null
-# Load local config files in /local
-begin
- local_file_supported = Dir[File.join(PROJECT_ROOT, 'local/*.sample')].map { |path| File.basename(path).sub(".sample","") }
- local_file_supported.each do |file|
- require "local/#{file}"
- end
-rescue LoadError
- puts <<-EOS
- This Gem supports local developer extensions in local/ folder.
- Supported files:
- #{local_file_supported.map { |f| "local/#{f}"}.join(', ')}
-
- Setup default sample files:
- rake local:setup
-
- Current warning: #{$!}
-
- EOS
-end
-
-
-# Now load Rake tasks from /tasks
-rakefiles = Dir[File.join(File.dirname(__FILE__), "tasks/**/*.rake")]
-rakefiles.each { |rakefile| load File.expand_path(rakefile) }
+++ /dev/null
-require 'yaml'
-
-ENV['cpk_adapters'] = {
- "mysql" => {
- :adapter => "mysql",
- :username => "root",
- :password => "root",
- # ...
- }
-}.to_yaml
\ No newline at end of file
+++ /dev/null
-# location of folder containing activerecord, railties, etc folders for each Rails gem
-ENV['EDGE_RAILS_DIR'] ||= "/path/to/copy/of/edge/rails"
+++ /dev/null
-# This file loaded into Rakefile
-# Place any extra development tasks you want here
\ No newline at end of file
+++ /dev/null
-#!/usr/bin/env ruby
-
-#
-# if run as script, load the file as library while starting irb
-#
-if __FILE__ == $0
- irb = RUBY_PLATFORM =~ /(:?mswin|mingw)/ ? 'irb.bat' : 'irb'
- ENV['ADAPTER'] = ARGV[0]
- exec "#{irb} -f -r #{$0} --simple-prompt"
-end
-
-#
-# check if the given adapter is supported (default: mysql)
-#
-adapters = %w[mysql sqlite oracle oracle_enhanced postgresql ibm_db]
-adapter = ENV['ADAPTER'] || 'mysql'
-unless adapters.include? adapter
- puts "Usage: #{__FILE__} <adapter>"
- puts ''
- puts 'Adapters: '
- puts adapters.map{ |adapter| " #{adapter}" }.join("\n")
- exit 1
-end
-
-#
-# load all necessary libraries
-#
-require 'rubygems'
-require 'local/database_connections'
-
-$LOAD_PATH.unshift 'lib'
-
-begin
- require 'local/paths'
- $LOAD_PATH.unshift "#{ENV['EDGE_RAILS_DIR']}/activerecord/lib" if ENV['EDGE_RAILS_DIR']
- $LOAD_PATH.unshift "#{ENV['EDGE_RAILS_DIR']}/activesupport/lib" if ENV['EDGE_RAILS_DIR']
-rescue
-end
-
-require 'active_support'
-require 'active_record'
-
-require "test/connections/native_#{adapter}/connection"
-require 'composite_primary_keys'
-
-PROJECT_ROOT = File.join(File.dirname(__FILE__), '..')
-Dir[File.join(PROJECT_ROOT,'test/fixtures/*.rb')].each { |model| require model }
-
+++ /dev/null
-#!/usr/bin/env ruby
-
-require 'rubygems'
-require 'redcloth'
-require 'syntax/convertors/html'
-require 'erb'
-require File.dirname(__FILE__) + '/../lib/composite_primary_keys/version.rb'
-
-version = CompositePrimaryKeys::VERSION::STRING
-download = 'http://rubyforge.org/projects/compositekeys'
-
-class Fixnum
- def ordinal
- # teens
- return 'th' if (10..19).include?(self % 100)
- # others
- case self % 10
- when 1: return 'st'
- when 2: return 'nd'
- when 3: return 'rd'
- else return 'th'
- end
- end
-end
-
-class Time
- def pretty
- return "#{mday}#{mday.ordinal} #{strftime('%B')} #{year}"
- end
-end
-
-def convert_syntax(syntax, source)
- return Syntax::Convertors::HTML.for_syntax(syntax).convert(source).gsub(%r!^<pre>|</pre>$!,'')
-end
-
-if ARGV.length >= 1
- src, template = ARGV
- template ||= File.dirname(__FILE__) + '/../website/template.rhtml'
-
-else
- puts("Usage: #{File.split($0).last} source.txt [template.rhtml] > output.html")
- exit!
-end
-
-template = ERB.new(File.open(template).read)
-
-title = nil
-body = nil
-File.open(src) do |fsrc|
- title_text = fsrc.readline
- body_text = fsrc.read
- syntax_items = []
- body_text.gsub!(%r!<(pre|code)[^>]*?syntax=['"]([^'"]+)[^>]*>(.*?)</\1>!m){
- ident = syntax_items.length
- element, syntax, source = $1, $2, $3
- syntax_items << "<#{element} class=\"syntax\">#{convert_syntax(syntax, source)}</#{element}>"
- "syntax-temp-#{ident}"
- }
- title = RedCloth.new(title_text).to_html.gsub(%r!<.*?>!,'').strip
- body = RedCloth.new(body_text).to_html
- body.gsub!(%r!(?:<pre><code>)?syntax-temp-(\d+)(?:</code></pre>)?!){ syntax_items[$1.to_i] }
-end
-stat = File.stat(src)
-created = stat.ctime
-modified = stat.mtime
-
-$stdout << template.result(binding)
+++ /dev/null
-#!/usr/bin/env ruby
-
-require 'rubygems'
-require 'redcloth'
-require 'syntax/convertors/html'
-require 'erb'
-require 'active_support'
-require File.dirname(__FILE__) + '/../lib/composite_primary_keys/version.rb'
-
-version = CompositePrimaryKeys::VERSION::STRING
-download = 'http://rubyforge.org/projects/compositekeys'
-
-class Fixnum
- def ordinal
- # teens
- return 'th' if (10..19).include?(self % 100)
- # others
- case self % 10
- when 1: return 'st'
- when 2: return 'nd'
- when 3: return 'rd'
- else return 'th'
- end
- end
-end
-
-class Time
- def pretty
- return "#{mday}#{mday.ordinal} #{strftime('%B')} #{year}"
- end
-end
-
-def convert_syntax(syntax, source)
- return Syntax::Convertors::HTML.for_syntax(syntax).convert(source).gsub(%r!^<pre>|</pre>$!,'')
-end
-
-if ARGV.length >= 1
- src, template = ARGV
- template ||= File.dirname(__FILE__) + '/../website/template.js'
-else
- puts("Usage: #{File.split($0).last} source.txt [template.js] > output.html")
- exit!
-end
-
-template = ERB.new(File.open(template).read)
-
-title = nil
-body = nil
-File.open(src) do |fsrc|
- title_text = fsrc.readline
- body_text = fsrc.read
- title = RedCloth.new(title_text).to_html.gsub(%r!<.*?>!,'').strip
- body = RedCloth.new(body_text)
-end
-stat = File.stat(src)
-created = stat.ctime
-modified = stat.mtime
-
-$stdout << template.result(binding)
+++ /dev/null
-namespace :ar do
- desc 'Pre-load edge rails ActiveRecord'
- task :edge do
- unless path = ENV['EDGE_RAILS_DIR'] || ENV['EDGE_RAILS']
- puts <<-EOS
-
-Need to define env var EDGE_RAILS_DIR or EDGE_RAILS- root of edge rails on your machine.
- i) Get copy of Edge Rails - http://dev.rubyonrails.org
- ii) Set EDGE_RAILS_DIR to this folder in local/paths.rb - see local/paths.rb.sample for example
- or
- a) Set folder from environment or command line (rake ar:edge EDGE_RAILS_DIR=/path/to/rails)
-
- EOS
- exit
- end
-
- ENV['AR_LOAD_PATH'] = File.join(path, "activerecord/lib")
- end
-
- desc 'Pre-load ActiveRecord using VERSION=X.Y.Z, instead of latest'
- task :set do
- unless version = ENV['VERSION']
- puts <<-EOS
-Usage: rake ar:get_version VERSION=1.15.3
- Specify the version number with VERSION=X.Y.Z; and make sure you have that activerecord gem version installed.
-
- EOS
- end
- version = nil if version == "" || version == []
- begin
- version ? gem('activerecord', version) : gem('activerecord')
- require 'active_record'
- ENV['AR_LOAD_PATH'] = $:.reverse.find { |path| /activerecord/ =~ path }
- rescue LoadError
- puts <<-EOS
-Missing: Cannot find activerecord #{version} installed.
- Install: gem install activerecord -v #{version}
-
- EOS
- exit
- end
- end
-end
\ No newline at end of file
+++ /dev/null
-require 'active_record'
-
-# UNTESTED - firebird sqlserver sqlserver_odbc db2 sybase openbase
-for adapter in %w( mysql sqlite oracle oracle_enhanced postgresql ibm_db )
- Rake::TestTask.new("test_#{adapter}") { |t|
- t.libs << "test" << "test/connections/native_#{adapter}"
- t.pattern = "test/test_*.rb"
- t.verbose = true
- }
-end
-
-SCHEMA_PATH = File.join(PROJECT_ROOT, *%w(test fixtures db_definitions))
+++ /dev/null
-namespace :mysql do
- desc 'Build the MySQL test databases'
- task :build_databases => :load_connection do
- puts File.join(SCHEMA_PATH, 'mysql.sql')
- options_str = ENV['cpk_adapter_options_str']
- # creates something like "-u#{username} -p#{password} -S#{socket}"
- sh %{ mysqladmin #{options_str} create "#{GEM_NAME}_unittest" }
- sh %{ mysql #{options_str} "#{GEM_NAME}_unittest" < #{File.join(SCHEMA_PATH, 'mysql.sql')} }
- end
-
- desc 'Drop the MySQL test databases'
- task :drop_databases => :load_connection do
- options_str = ENV['cpk_adapter_options_str']
- sh %{ mysqladmin #{options_str} -f drop "#{GEM_NAME}_unittest" }
- end
-
- desc 'Rebuild the MySQL test databases'
- task :rebuild_databases => [:drop_databases, :build_databases]
-
- task :load_connection do
- require File.join(PROJECT_ROOT, %w[lib adapter_helper mysql])
- spec = AdapterHelper::MySQL.load_connection_from_env
- options = {}
- options['u'] = spec[:username] if spec[:username]
- options['p'] = spec[:password] if spec[:password]
- options['S'] = spec[:sock] if spec[:sock]
- options_str = options.map { |key, value| "-#{key}#{value}" }.join(" ")
- ENV['cpk_adapter_options_str'] = options_str
- end
-end
+++ /dev/null
-namespace :oracle do
- desc 'Build the Oracle test databases'
- task :build_databases => :load_connection do
- puts File.join(SCHEMA_PATH, 'oracle.sql')
- options_str = ENV['cpk_adapter_options_str']
- sh %( sqlplus #{options_str} < #{File.join(SCHEMA_PATH, 'oracle.sql')} )
- end
-
- desc 'Drop the Oracle test databases'
- task :drop_databases => :load_connection do
- puts File.join(SCHEMA_PATH, 'oracle.drop.sql')
- options_str = ENV['cpk_adapter_options_str']
- sh %( sqlplus #{options_str} < #{File.join(SCHEMA_PATH, 'oracle.drop.sql')} )
- end
-
- desc 'Rebuild the Oracle test databases'
- task :rebuild_databases => [:drop_databases, :build_databases]
-
- task :load_connection do
- require File.join(PROJECT_ROOT, %w[lib adapter_helper oracle])
- spec = AdapterHelper::Oracle.load_connection_from_env
- ENV['cpk_adapter_options_str'] = "#{spec[:username]}/#{spec[:password]}@#{spec[:host]}"
- end
-
-end
+++ /dev/null
-namespace :postgresql do
- desc 'Build the PostgreSQL test databases'
- task :build_databases => :load_connection do
- sh %{ createdb "#{GEM_NAME}_unittest" }
- sh %{ psql "#{GEM_NAME}_unittest" -f #{File.join(SCHEMA_PATH, 'postgresql.sql')} }
- end
-
- desc 'Drop the PostgreSQL test databases'
- task :drop_databases => :load_connection do
- sh %{ dropdb "#{GEM_NAME}_unittest" }
- end
-
- desc 'Rebuild the PostgreSQL test databases'
- task :rebuild_databases => [:drop_databases, :build_databases]
-
- task :load_connection do
- require File.join(PROJECT_ROOT, %w[lib adapter_helper postgresql])
- spec = AdapterHelper::Postgresql.load_connection_from_env
- options = {}
- options['u'] = spec[:username] if spec[:username]
- options['p'] = spec[:password] if spec[:password]
- options_str = options.map { |key, value| "-#{key}#{value}" }.join(" ")
- ENV['cpk_adapter_options_str'] = options_str
- end
-end
-
+++ /dev/null
-namespace :sqlite3 do
- desc 'Build the sqlite test databases'
- task :build_databases => :load_connection do
- file = File.join(SCHEMA_PATH, 'sqlite.sql')
- dbfile = File.join(PROJECT_ROOT, ENV['cpk_adapter_options_str'])
- cmd = "mkdir -p #{File.dirname(dbfile)}"
- puts cmd
- sh %{ #{cmd} }
- cmd = "sqlite3 #{dbfile} < #{file}"
- puts cmd
- sh %{ #{cmd} }
- end
-
- desc 'Drop the sqlite test databases'
- task :drop_databases => :load_connection do
- dbfile = ENV['cpk_adapter_options_str']
- sh %{ rm -f #{dbfile} }
- end
-
- desc 'Rebuild the sqlite test databases'
- task :rebuild_databases => [:drop_databases, :build_databases]
-
- task :load_connection do
- require File.join(PROJECT_ROOT, %w[lib adapter_helper sqlite3])
- spec = AdapterHelper::Sqlite3.load_connection_from_env
- ENV['cpk_adapter_options_str'] = spec[:dbfile]
- end
-end
+++ /dev/null
-desc 'Release the website and new gem version'
-task :deploy => [:check_version, :website, :release] do
- puts "Remember to create SVN tag:"
- puts "svn copy svn+ssh://#{RUBYFORGE_USERNAME}@rubyforge.org/var/svn/#{PATH}/trunk " +
- "svn+ssh://#{RUBYFORGE_USERNAME}@rubyforge.org/var/svn/#{PATH}/tags/REL-#{VERS} "
- puts "Suggested comment:"
- puts "Tagging release #{CHANGES}"
-end
-
-desc 'Runs tasks website_generate and install_gem as a local deployment of the gem'
-task :local_deploy => [:website_generate, :install_gem]
-
-task :check_version do
- unless ENV['VERSION']
- puts 'Must pass a VERSION=x.y.z release version'
- exit
- end
- unless ENV['VERSION'] == VERS
- puts "Please update your version.rb to match the release version, currently #{VERS}"
- exit
- end
-end
+++ /dev/null
-namespace :local do
- desc 'Copies over the same local files ready for editing'
- task :setup do
- sample_files = Dir[File.join(PROJECT_ROOT, "local/*.rb.sample")]
- sample_files.each do |sample_file|
- file = sample_file.sub(".sample","")
- unless File.exists?(file)
- puts "Copying #{sample_file} -> #{file}"
- sh %{ cp #{sample_file} #{file} }
- end
- end
- end
-end
\ No newline at end of file
+++ /dev/null
-desc 'Generate website files'
-task :website_generate do
- sh %{ ruby scripts/txt2html website/index.txt > website/index.html }
- sh %{ ruby scripts/txt2js website/version.txt > website/version.js }
- sh %{ ruby scripts/txt2js website/version-raw.txt > website/version-raw.js }
-end
-
-desc 'Upload website files to rubyforge'
-task :website_upload do
- config = YAML.load(File.read(File.expand_path("~/.rubyforge/user-config.yml")))
- host = "#{config["username"]}@rubyforge.org"
- remote_dir = "/var/www/gforge-projects/#{RUBYFORGE_PROJECT}/"
- local_dir = 'website'
- sh %{rsync -aCv #{local_dir}/ #{host}:#{remote_dir}}
-end
-
-desc 'Generate and upload website files'
-task :website => [:website_generate, :website_upload, :publish_docs]
+++ /dev/null
-= Composite Primary Keys - Testing Readme
-
-== Testing an adapter
-
-There are tests available for the following adapters:
-
-* ibmdb
-* mysql
-* oracle
-* postgresql
-* sqlite
-
-To run the tests for on of the adapters, follow these steps (using mysql in the example):
-
-* rake -T | grep mysql
-
- rake mysql:build_databases # Build the MySQL test databases
- rake mysql:drop_databases # Drop the MySQL test databases
- rake mysql:rebuild_databases # Rebuild the MySQL test databases
- rake test_mysql # Run tests for test_mysql
-
-* rake mysql:build_databases
-* rake test_mysql
-
-== Testing against different ActiveRecord versions (or Edge Rails)
-
-ActiveRecord is a RubyGem within Rails, and is constantly being improved/changed on
-its repository (http://dev.rubyonrails.org). These changes may create errors for the CPK
-gem. So, we need a way to test CPK against Edge Rails, as well as officially released RubyGems.
-
-The default test (as above) uses the latest RubyGem in your cache.
-
-You can select an older RubyGem version by running the following:
-
-* rake ar:set VERSION=1.14.4 test_mysql
-
-== Edge Rails
-
-Before you can test CPK against Edge Rails, you must checkout a copy of edge rails somewhere (see http://dev.rubyonrails.org for for examples)
-
-* cd /path/to/gems
-* svn co http://svn.rubyonrails.org/rails/trunk rails
-
-Say the rails folder is /path/to/gems/rails
-
-Three ways to run CPK tests for Edge Rails:
-
-i) Run:
-
- EDGE_RAILS_DIR=/path/to/gems/rails rake ar:edge test_mysql
-
-ii) In your .profile, set the environment variable EDGE_RAILS_DIR=/path/to/gems/rails,
- and once you reload your profile, run:
-
- rake ar:edge test_mysql
-
-iii) Store the path in local/paths.rb. Run:
-
- cp local/paths.rb.sample local/paths.rb
- # Now set ENV['EDGE_RAILS_DIR']=/path/to/gems/rails
- rake ar:edge test_mysql
-
-These are all variations of the same theme:
-
-* Set the environment variable EDGE_RAILS_DIR to the path to Rails (which contains the activerecord/lib folder)
-* Run: rake ar:edge test_<adapter>
-
+++ /dev/null
-$:.unshift(ENV['AR_LOAD_PATH']) if ENV['AR_LOAD_PATH']
-
-require 'test/unit'
-require 'hash_tricks'
-require 'rubygems'
-require 'active_record'
-require 'active_record/fixtures'
-begin
- require 'connection'
-rescue MissingSourceFile => e
- adapter = 'postgresql' #'sqlite'
- require "#{File.dirname(__FILE__)}/connections/native_#{adapter}/connection"
-end
-require 'composite_primary_keys'
-
-QUOTED_TYPE = ActiveRecord::Base.connection.quote_column_name('type') unless Object.const_defined?(:QUOTED_TYPE)
-
-class Test::Unit::TestCase #:nodoc:
- self.fixture_path = File.dirname(__FILE__) + "/fixtures/"
- self.use_instantiated_fixtures = false
- self.use_transactional_fixtures = true
-
- def assert_date_from_db(expected, actual, message = nil)
- # SQL Server doesn't have a separate column type just for dates,
- # so the time is in the string and incorrectly formatted
- if current_adapter?(:SQLServerAdapter)
- assert_equal expected.strftime("%Y/%m/%d 00:00:00"), actual.strftime("%Y/%m/%d 00:00:00")
- elsif current_adapter?(:SybaseAdapter)
- assert_equal expected.to_s, actual.to_date.to_s, message
- else
- assert_equal expected.to_s, actual.to_s, message
- end
- end
-
- def assert_queries(num = 1)
- ActiveRecord::Base.connection.class.class_eval do
- self.query_count = 0
- alias_method :execute, :execute_with_query_counting
- end
- yield
- ensure
- ActiveRecord::Base.connection.class.class_eval do
- alias_method :execute, :execute_without_query_counting
- end
- assert_equal num, ActiveRecord::Base.connection.query_count, "#{ActiveRecord::Base.connection.query_count} instead of #{num} queries were executed."
- end
-
- def assert_no_queries(&block)
- assert_queries(0, &block)
- end
-
- cattr_accessor :classes
-protected
-
- def testing_with(&block)
- classes.keys.each do |@key_test|
- @klass_info = classes[@key_test]
- @klass, @primary_keys = @klass_info[:class], @klass_info[:primary_keys]
- order = @klass.primary_key.is_a?(String) ? @klass.primary_key : @klass.primary_key.join(',')
- @first = @klass.find(:first, :order => order)
- yield
- end
- end
-
- def first_id
- ids = (1..@primary_keys.length).map {|num| 1}
- composite? ? ids.to_composite_ids : ids.first
- end
-
- def first_id_str
- composite? ? first_id.join(CompositePrimaryKeys::ID_SEP) : first_id.to_s
- end
-
- def composite?
- @key_test != :single
- end
-end
-
-def current_adapter?(type)
- ActiveRecord::ConnectionAdapters.const_defined?(type) &&
- ActiveRecord::Base.connection.instance_of?(ActiveRecord::ConnectionAdapters.const_get(type))
-end
-
-ActiveRecord::Base.connection.class.class_eval do
- cattr_accessor :query_count
- alias_method :execute_without_query_counting, :execute
- def execute_with_query_counting(sql, name = nil)
- self.query_count += 1
- execute_without_query_counting(sql, name)
- end
-end
-
-#ActiveRecord::Base.logger = Logger.new(STDOUT)
-#ActiveRecord::Base.colorize_logging = false
+++ /dev/null
-print "Using IBM2 \n"
-require 'logger'
-
-gem 'ibm_db'
-require 'IBM_DB'
-
-RAILS_CONNECTION_ADAPTERS = %w( mysql postgresql sqlite firebird sqlserver db2 oracle sybase openbase frontbase ibm_db )
-
-
-ActiveRecord::Base.logger = Logger.new("debug.log")
-
-db1 = 'composite_primary_keys_unittest'
-
-connection_options = {
- :adapter => "ibm_db",
- :database => "ocdpdev",
- :username => "db2inst1",
- :password => "password",
- :host => '192.168.2.21'
-}
-
-ActiveRecord::Base.configurations = { db1 => connection_options }
-ActiveRecord::Base.establish_connection(connection_options)
+++ /dev/null
-print "Using native MySQL\n"
-require 'fileutils'
-require 'logger'
-require 'adapter_helper/mysql'
-
-log_path = File.expand_path(File.join(File.dirname(__FILE__), %w[.. .. .. log]))
-FileUtils.mkdir_p log_path
-puts "Logging to #{log_path}/debug.log"
-ActiveRecord::Base.logger = Logger.new("#{log_path}/debug.log")
-
-# Adapter config setup in locals/database_connections.rb
-connection_options = AdapterHelper::MySQL.load_connection_from_env
-ActiveRecord::Base.establish_connection(connection_options)
+++ /dev/null
-print "Using native Oracle\n"
-require 'fileutils'
-require 'logger'
-require 'adapter_helper/oracle'
-
-log_path = File.expand_path(File.join(File.dirname(__FILE__), %w[.. .. .. log]))
-FileUtils.mkdir_p log_path
-puts "Logging to #{log_path}/debug.log"
-ActiveRecord::Base.logger = Logger.new("#{log_path}/debug.log")
-
-# Adapter config setup in locals/database_connections.rb
-connection_options = AdapterHelper::Oracle.load_connection_from_env
-puts connection_options.inspect
-ActiveRecord::Base.establish_connection(connection_options)
+++ /dev/null
-print "Using native Postgresql\n"
-require 'logger'
-require 'adapter_helper/postgresql'
-
-ActiveRecord::Base.logger = Logger.new("debug.log")
-
-# Adapter config setup in locals/database_connections.rb
-connection_options = AdapterHelper::Postgresql.load_connection_from_env
-ActiveRecord::Base.establish_connection(connection_options)
+++ /dev/null
-print "Using native Sqlite3\n"
-require 'logger'
-require 'adapter_helper/sqlite3'
-
-ActiveRecord::Base.logger = Logger.new("debug.log")
-
-# Adapter config setup in locals/database_connections.rb
-connection_options = AdapterHelper::Sqlite3.load_connection_from_env
-ActiveRecord::Base.establish_connection(connection_options)
+++ /dev/null
-class Article < ActiveRecord::Base\r
- has_many :readings\r
- has_many :users, :through => :readings\r
-end\r
-\r
+++ /dev/null
-first:\r
- id: 1\r
- name: Article One\r
-second:\r
- id: 2\r
- name: Article Two
\ No newline at end of file
+++ /dev/null
-class Comment < ActiveRecord::Base
- set_primary_keys :id
- belongs_to :person, :polymorphic => true
- belongs_to :hack
-end
-
+++ /dev/null
-comment1:
- id: 1
- person_id: 1
- person_type: Employee
-
-comment2:
- id: 2
- person_id: 1
- person_type: User
- hack_id: andrew
-
-comment3:
- id: 3
- person_id: andrew
- person_type: Hack
-
\ No newline at end of file
+++ /dev/null
-CREATE TABLE reference_types (
- reference_type_id integer NOT NULL generated by default as identity (start with 100, increment by 1, no cache),
- type_label varchar(50) default NULL,
- abbreviation varchar(50) default NULL,
- description varchar(50) default NULL,
- PRIMARY KEY (reference_type_id)
-);
-
-CREATE TABLE reference_codes (
- reference_type_id integer,
- reference_code integer NOT NULL,
- code_label varchar(50) default NULL,
- abbreviation varchar(50) default NULL,
- description varchar(50) default NULL,
- PRIMARY KEY (reference_type_id,reference_code)
-);
-
-CREATE TABLE products (
- id integer NOT NULL,
- name varchar(50) default NULL,
- PRIMARY KEY (id)
-);
-
-CREATE TABLE tariffs (
- tariff_id integer NOT NULL,
- start_date date NOT NULL,
- amount integer default NULL,
- PRIMARY KEY (tariff_id,start_date)
-);
-
-CREATE TABLE product_tariffs (
- product_id integer NOT NULL,
- tariff_id integer NOT NULL,
- tariff_start_date date NOT NULL,
- PRIMARY KEY (product_id,tariff_id,tariff_start_date)
-);
-
-CREATE TABLE suburbs (
- city_id integer NOT NULL,
- suburb_id integer NOT NULL,
- name varchar(50) NOT NULL,
- PRIMARY KEY (city_id,suburb_id)
-);
-
-CREATE TABLE streets (
- id integer NOT NULL ,
- city_id integer NOT NULL,
- suburb_id integer NOT NULL,
- name varchar(50) NOT NULL,
- PRIMARY KEY (id)
-);
-
-CREATE TABLE users (
- id integer NOT NULL ,
- name varchar(50) NOT NULL,
- PRIMARY KEY (id)
-);
-
-CREATE TABLE articles (
- id integer NOT NULL ,
- name varchar(50) NOT NULL,
- PRIMARY KEY (id)
-);
-
-CREATE TABLE readings (
- id integer NOT NULL ,
- user_id integer NOT NULL,
- article_id integer NOT NULL,
- rating integer NOT NULL,
- PRIMARY KEY (id)
-);
-
-CREATE TABLE groups (
- id integer NOT NULL ,
- name varchar(50) NOT NULL,
- PRIMARY KEY (id)
-);
-
-CREATE TABLE memberships (
- user_id integer NOT NULL,
- group_id integer NOT NULL,
- PRIMARY KEY (user_id,group_id)
-);
-
-CREATE TABLE membership_statuses (
- id integer NOT NULL ,
- user_id integer NOT NULL,
- group_id integer NOT NULL,
- status varchar(50) NOT NULL,
- PRIMARY KEY (id)
-);
-
-create table kitchen_sinks (
- id_1 integer not null,
- id_2 integer not null,
- a_date date,
- a_string varchar(100),
- primary key (id_1, id_2)
-);
-
-create table restaurants (
- franchise_id integer not null,
- store_id integer not null,
- name varchar(100),
- primary key (franchise_id, store_id)
-);
-
-create table restaurants_suburbs (
- franchise_id integer not null,
- store_id integer not null,
- city_id integer not null,
- suburb_id integer not null
-);
+++ /dev/null
-drop table MEMBERSHIPS;
-drop table REFERENCE_CODES;
-drop table TARIFFS;
-drop table ARTICLES;
-drop table GROUPS;
-drop table MEMBERSHIP_STATUSES;
-drop table READINGS;
-drop table REFERENCE_TYPES;
-drop table STREETS;
-drop table PRODUCTS;
-drop table USERS;
-drop table SUBURBS;
-drop table PRODUCT_TARIFFS;
-drop table KITCHEN_SINK;
-drop table RESTAURANTS;
-drop table RESTAURANTS_SUBURBS;
+++ /dev/null
-create table reference_types (
- reference_type_id int(11) not null auto_increment,
- type_label varchar(50) default null,
- abbreviation varchar(50) default null,
- description varchar(50) default null,
- primary key (reference_type_id)
-) type=InnoDB;
-
-create table reference_codes (
- reference_type_id int(11),
- reference_code int(11) not null,
- code_label varchar(50) default null,
- abbreviation varchar(50) default null,
- description varchar(50) default null,
- primary key (reference_type_id, reference_code)
-) type=InnoDB;
-
-create table products (
- id int(11) not null auto_increment,
- name varchar(50) default null,
- primary key (id)
-) type=InnoDB;
-
-create table tariffs (
- tariff_id int(11) not null,
- start_date date not null,
- amount integer(11) default null,
- primary key (tariff_id, start_date)
-) type=InnoDB;
-
-create table product_tariffs (
- product_id int(11) not null,
- tariff_id int(11) not null,
- tariff_start_date date not null,
- primary key (product_id, tariff_id, tariff_start_date)
-) type=InnoDB;
-
-create table suburbs (
- city_id int(11) not null,
- suburb_id int(11) not null,
- name varchar(50) not null,
- primary key (city_id, suburb_id)
-) type=InnoDB;
-
-create table streets (
- id int(11) not null auto_increment,
- city_id int(11) not null,
- suburb_id int(11) not null,
- name varchar(50) not null,
- primary key (id)
-) type=InnoDB;
-
-create table users (
- id int(11) not null auto_increment,
- name varchar(50) not null,
- primary key (id)
-) type=InnoDB;
-
-create table articles (
- id int(11) not null auto_increment,
- name varchar(50) not null,
- primary key (id)
-) type=InnoDB;
-
-create table readings (
- id int(11) not null auto_increment,
- user_id int(11) not null,
- article_id int(11) not null,
- rating int(11) not null,
- primary key (id)
-) type=InnoDB;
-
-create table groups (
- id int(11) not null auto_increment,
- name varchar(50) not null,
- primary key (id)
-) type=InnoDB;
-
-create table memberships (
- user_id int(11) not null,
- group_id int(11) not null,
- primary key (user_id,group_id)
-) type=InnoDB;
-
-create table membership_statuses (
- id int(11) not null auto_increment,
- user_id int(11) not null,
- group_id int(11) not null,
- status varchar(50) not null,
- primary key (id)
-) type=InnoDB;
-
-create table departments (
- department_id int(11) not null,
- location_id int(11) not null,
- primary key (department_id, location_id)
-) type=InnoDB;
-
-create table employees (
- id int(11) not null auto_increment,
- department_id int(11) default null,
- location_id int(11) default null,
- primary key (id)
-) type=InnoDB;
-
-create table comments (
- id int(11) not null auto_increment,
- person_id varchar(100) default null,
- person_type varchar(100) default null,
- hack_id varchar(100) default null,
- primary key (id)
-) type=InnoDB;
-
-create table hacks (
- name varchar(50) not null,
- primary key (name)
-) type=InnoDB;
-
-create table kitchen_sinks (
- id_1 int(11) not null,
- id_2 int(11) not null,
- a_date date,
- a_string varchar(100),
- primary key (id_1, id_2)
-) type=InnoDB;
-
-create table restaurants (
- franchise_id int(11) not null,
- store_id int(11) not null,
- name varchar(100),
- primary key (franchise_id, store_id)
-) type=InnoDB;
-
-create table restaurants_suburbs (
- franchise_id int(11) not null,
- store_id int(11) not null,
- city_id int(11) not null,
- suburb_id int(11) not null
-) type=InnoDB;
-
-create table dorms (
- id int(11) not null auto_increment,
- primary key(id)
-) type=InnoDB;
-
-create table rooms (
- dorm_id int(11) not null,
- room_id int(11) not null,
- primary key (dorm_id, room_id)
-) type=InnoDB;
-
-create table room_attributes (
- id int(11) not null auto_increment,
- name varchar(50),
- primary key(id)
-) type=InnoDB;
-
-create table room_attribute_assignments (
- dorm_id int(11) not null,
- room_id int(11) not null,
- room_attribute_id int(11) not null
-) type=InnoDB;
-
-create table students (
- id int(11) not null auto_increment,
- primary key(id)
-) type=InnoDB;
-
-create table room_assignments (
- student_id int(11) not null,
- dorm_id int(11) not null,
- room_id int(11) not null
-) type=InnoDB;
-
+++ /dev/null
-drop table reference_types;
-drop sequence reference_types_seq;
-drop table reference_codes;
-drop table products;
-drop sequence products_seq;
-drop table tariffs;
-drop table product_tariffs;
-drop table suburbs;
-drop table streets;
-drop sequence streets_seq;
-drop table users;
-drop sequence users_seq;
-drop table articles;
-drop sequence articles_seq;
-drop table readings;
-drop sequence readings_seq;
-drop table groups;
-drop sequence groups_seq;
-drop table memberships;
-drop table membership_statuses;
-drop sequence membership_statuses_seq;
-drop table departments;
-drop table employees;
-drop sequence employees_seq;
-drop table comments;
-drop sequence comments_seq;
-drop table hacks;
-drop table kitchen_sinks;
-drop table restaurants;
-drop table restaurants_suburbs;
-drop table dorms;
-drop sequence dorms_seq;
-drop table rooms;
-drop table room_attributes;
-drop sequence room_attributes_seq;
-drop table room_attribute_assignments;
-drop table room_assignments;
-drop table students;
-drop sequence students_seq;
+++ /dev/null
-create sequence reference_types_seq start with 1000;
-
-create table reference_types (
- reference_type_id number(11) primary key,
- type_label varchar2(50) default null,
- abbreviation varchar2(50) default null,
- description varchar2(50) default null
-);
-
-create table reference_codes (
- reference_type_id number(11),
- reference_code number(11),
- code_label varchar2(50) default null,
- abbreviation varchar2(50) default null,
- description varchar2(50) default null
-);
-
-create sequence products_seq start with 1000;
-
-create table products (
- id number(11) primary key,
- name varchar2(50) default null
-);
-
-create table tariffs (
- tariff_id number(11),
- start_date date,
- amount number(11) default null,
- constraint tariffs_pk primary key (tariff_id, start_date)
-);
-
-create table product_tariffs (
- product_id number(11),
- tariff_id number(11),
- tariff_start_date date,
- constraint product_tariffs_pk primary key (product_id, tariff_id, tariff_start_date)
-);
-
-create table suburbs (
- city_id number(11),
- suburb_id number(11),
- name varchar2(50) not null,
- constraint suburbs_pk primary key (city_id, suburb_id)
-);
-
-create sequence streets_seq start with 1000;
-
-create table streets (
- id number(11) primary key,
- city_id number(11) not null,
- suburb_id number(11) not null,
- name varchar2(50) not null
-);
-
-create sequence users_seq start with 1000;
-
-create table users (
- id number(11) primary key,
- name varchar2(50) not null
-);
-
-create sequence articles_seq start with 1000;
-
-create table articles (
- id number(11) primary key,
- name varchar2(50) not null
-);
-
-create sequence readings_seq start with 1000;
-
-create table readings (
- id number(11) primary key,
- user_id number(11) not null,
- article_id number(11) not null,
- rating number(11) not null
-);
-
-create sequence groups_seq start with 1000;
-
-create table groups (
- id number(11) primary key,
- name varchar2(50) not null
-);
-
-create table memberships (
- user_id number(11) not null,
- group_id number(11) not null,
- constraint memberships_pk primary key (user_id, group_id)
-);
-
-create sequence membership_statuses_seq start with 1000;
-
-create table membership_statuses (
- id number(11) primary key,
- user_id number(11) not null,
- group_id number(11) not null,
- status varchar2(50) not null
-);
-
-create table departments (
- department_id number(11) not null,
- location_id number(11) not null,
- constraint departments_pk primary key (department_id, location_id)
-);
-
-create sequence employees_seq start with 1000;
-
-create table employees (
- id number(11) not null primary key,
- department_id number(11) default null,
- location_id number(11) default null
-);
-
-create sequence comments_seq start with 1000;
-
-create table comments (
- id number(11) not null primary key,
- person_id varchar(100) default null,
- person_type varchar(100) default null,
- hack_id varchar(100) default null
-);
-
-create table hacks (
- name varchar(50) not null primary key
-);
-
-create table kitchen_sinks (
- id_1 number(11) not null,
- id_2 number(11) not null,
- a_date date,
- a_string varchar(100),
- constraint kitchen_sinks_pk primary key (id_1, id_2)
-);
-
-create table restaurants (
- franchise_id number(11) not null,
- store_id number(11) not null,
- name varchar(100),
- constraint restaurants_pk primary key (franchise_id, store_id)
-);
-
-create table restaurants_suburbs (
- franchise_id number(11) not null,
- store_id number(11) not null,
- city_id number(11) not null,
- suburb_id number(11) not null
-);
-
-create sequence dorms_seq start with 1000;
-
-create table dorms (
- id number(11) not null,
- constraint dorms_pk primary key (id)
-);
-
-create table rooms (
- dorm_id number(11) not null,
- room_id number(11) not null,
- constraint rooms_pk primary key (dorm_id, room_id)
-);
-
-create sequence room_attributes_seq start with 1000;
-
-create table room_attributes (
- id number(11) not null,
- name varchar(50),
- constraint room_attributes_pk primary key (id)
-);
-
-create table room_attribute_assignments (
- dorm_id number(11) not null,
- room_id number(11) not null,
- room_attribute_id number(11) not null
-);
-
-create sequence students_seq start with 1000;
-
-create table students (
- id number(11) not null,
- constraint students_pk primary key (id)
-);
-
-create table room_assignments (
- student_id number(11) not null,
- dorm_id number(11) not null,
- room_id number(11) not null
-);
-
+++ /dev/null
-create sequence public.reference_types_seq start 1000;
-
-create table reference_types (
- reference_type_id int default nextval('public.reference_types_seq'),
- type_label varchar(50) default null,
- abbreviation varchar(50) default null,
- description varchar(50) default null,
- primary key (reference_type_id)
-);
-
-create table reference_codes (
- reference_type_id int,
- reference_code int not null,
- code_label varchar(50) default null,
- abbreviation varchar(50) default null,
- description varchar(50) default null
-);
-
-create sequence public.products_seq start 1000;
-
-create table products (
- id int not null default nextval('public.products_seq'),
- name varchar(50) default null,
- primary key (id)
-);
-
-create table tariffs (
- tariff_id int not null,
- start_date date not null,
- amount int default null,
- primary key (tariff_id, start_date)
-);
-
-create table product_tariffs (
- product_id int not null,
- tariff_id int not null,
- tariff_start_date date not null,
- primary key (product_id, tariff_id, tariff_start_date)
-);
-
-create table suburbs (
- city_id int not null,
- suburb_id int not null,
- name varchar(50) not null,
- primary key (city_id, suburb_id)
-);
-
-create sequence public.streets_seq start 1000;
-
-create table streets (
- id int not null default nextval('public.streets_seq'),
- city_id int not null,
- suburb_id int not null,
- name varchar(50) not null,
- primary key (id)
-);
-
-create sequence public.users_seq start 1000;
-
-create table users (
- id int not null default nextval('public.users_seq'),
- name varchar(50) not null,
- primary key (id)
-);
-
-create sequence public.articles_seq start 1000;
-
-create table articles (
- id int not null default nextval('public.articles_seq'),
- name varchar(50) not null,
- primary key (id)
-);
-
-create sequence public.readings_seq start 1000;
-
-create table readings (
- id int not null default nextval('public.readings_seq'),
- user_id int not null,
- article_id int not null,
- rating int not null,
- primary key (id)
-);
-
-create sequence public.groups_seq start 1000;
-
-create table groups (
- id int not null default nextval('public.groups_seq'),
- name varchar(50) not null,
- primary key (id)
-);
-
-create table memberships (
- user_id int not null,
- group_id int not null,
- primary key (user_id, group_id)
-);
-
-create sequence public.membership_statuses_seq start 1000;
-
-create table membership_statuses (
- id int not null default nextval('public.membership_statuses_seq'),
- user_id int not null,
- group_id int not null,
- status varchar(50) not null,
- primary key (id)
-);
-
-create table departments (
- department_id int not null,
- location_id int not null,
- primary key (department_id, location_id)
-);
-
-create sequence public.employees_seq start 1000;
-
-create table employees (
- id int not null default nextval('public.employees_seq'),
- department_id int default null,
- location_id int default null,
- primary key (id)
-);
-
-create sequence public.comments_seq start 1000;
-
-create table comments (
- id int not null default nextval('public.comments_seq'),
- person_id varchar(100) default null,
- person_type varchar(100) default null,
- hack_id varchar(100) default null,
- primary key (id)
-);
-
-create table hacks (
- name varchar(50) not null,
- primary key (name)
-);
-
-create table kitchen_sinks (
- id_1 int not null,
- id_2 int not null,
- a_date date,
- a_string varchar(100),
- primary key (id_1, id_2)
-);
-
-create table restaurants (
- franchise_id int not null,
- store_id int not null,
- name varchar(100),
- primary key (franchise_id, store_id)
-);
-
-create table restaurants_suburbs (
- franchise_id int not null,
- store_id int not null,
- city_id int not null,
- suburb_id int not null
-);
-
-create sequence public.dorms_seq start 1000;
-
-create table dorms (
- id int not null default nextval('public.dorms_seq'),
- primary key (id)
-);
-
-create table rooms (
- dorm_id int not null,
- room_id int not null,
- primary key (dorm_id, room_id)
-);
-
-create sequence public.room_attributes_seq start 1000;
-
-create table room_attributes (
- id int not null default nextval('public.room_attributes_seq'),
- name varchar(50),
- primary key (id)
-);
-
-create table room_attribute_assignments (
- dorm_id int not null,
- room_id int not null,
- room_attribute_id int not null
-);
-
-create sequence public.students_seq start 1000;
-
-create table students (
- id int not null default nextval('public.students_seq'),
- primary key (id)
-);
-
-create table room_assignments (
- student_id int not null,
- dorm_id int not null,
- room_id int not null
-);
-
+++ /dev/null
-create table reference_types (
- reference_type_id integer primary key,
- type_label varchar(50) default null,
- abbreviation varchar(50) default null,
- description varchar(50) default null
-);
-
-create table reference_codes (
- reference_type_id int(11),
- reference_code int(11) not null,
- code_label varchar(50) default null,
- abbreviation varchar(50) default null,
- description varchar(50) default null,
- primary key (reference_type_id, reference_code)
-);
-
-create table products (
- id int(11) not null primary key,
- name varchar(50) default null
-);
-
-create table tariffs (
- tariff_id int(11) not null,
- start_date date not null,
- amount integer(11) default null,
- primary key (tariff_id, start_date)
-);
-
-create table product_tariffs (
- product_id int(11) not null,
- tariff_id int(11) not null,
- tariff_start_date date not null,
- primary key (product_id, tariff_id, tariff_start_date)
-);
-
-create table suburbs (
- city_id int(11) not null,
- suburb_id int(11) not null,
- name varchar(50) not null,
- primary key (city_id, suburb_id)
-);
-
-create table streets (
- id integer not null primary key autoincrement,
- city_id int(11) not null,
- suburb_id int(11) not null,
- name varchar(50) not null
-);
-
-create table users (
- id integer not null primary key autoincrement,
- name varchar(50) not null
-);
-
-create table articles (
- id integer not null primary key autoincrement,
- name varchar(50) not null
-);
-
-create table readings (
- id integer not null primary key autoincrement,
- user_id int(11) not null,
- article_id int(11) not null,
- rating int(11) not null
-);
-
-create table groups (
- id integer not null primary key autoincrement,
- name varchar(50) not null
-);
-
-create table memberships (
- user_id int not null,
- group_id int not null,
- primary key (user_id, group_id)
-);
-
-create table membership_statuses (
- id integer not null primary key autoincrement,
- user_id int not null,
- group_id int not null,
- status varchar(50) not null
-);
-
-create table departments (
- department_id integer not null,
- location_id integer not null,
- primary key (department_id, location_id)
-);
-
-create table employees (
- id integer not null primary key autoincrement,
- department_id integer null,
- location_id integer null
-);
-
-create table comments (
- id integer not null primary key autoincrement,
- person_id varchar(100) null,
- person_type varchar(100) null,
- hack_id varchar(100) null
-);
-
-create table hacks (
- name varchar(50) not null primary key
-);
-
-create table kitchen_sinks (
- id_1 integer not null,
- id_2 integer not null,
- a_date date,
- a_string varchar(100),
- primary key (id_1, id_2)
-);
-
-create table restaurants (
- franchise_id integer not null,
- store_id integer not null,
- name varchar(100),
- primary key (franchise_id, store_id)
-);
-
-create table restaurants_suburbs (
- franchise_id integer not null,
- store_id integer not null,
- city_id integer not null,
- suburb_id integer not null
-);
-
-create table dorms (
- id integer not null primary key autoincrement
-);
-
-create table rooms (
- dorm_id integer not null,
- room_id integer not null,
- primary key (dorm_id, room_id)
-);
-
-create table room_attributes (
- id integer not null primary key autoincrement,
- name varchar(50)
-);
-
-create table room_attribute_assignments (
- dorm_id integer not null,
- room_id integer not null,
- room_attribute_id integer not null
-);
-
-create table students (
- id integer not null primary key autoincrement
-);
-
-create table room_assignments (
- student_id integer not null,
- dorm_id integer not null,
- room_id integer not null
-);
-
+++ /dev/null
-class Department < ActiveRecord::Base
- # set_primary_keys *keys - turns on composite key functionality
- set_primary_keys :department_id, :location_id
- has_many :employees, :foreign_key => [:department_id, :location_id]
-end
+++ /dev/null
-department1-cpk:
- department_id: 1
- location_id: 1
+++ /dev/null
-class Employee < ActiveRecord::Base
- belongs_to :department, :foreign_key => [:department_id, :location_id]
- has_many :comments, :as => :person
-end
+++ /dev/null
-employee1:
- id: 1
- department_id: 1
- location_id: 1
-employee2:
- id: 2
- department_id: 1
- location_id: 1
-
+++ /dev/null
-class Group < ActiveRecord::Base
- has_many :memberships
-end
\ No newline at end of file
+++ /dev/null
-cpk:
- id: 1
- name: Composite Primary Keys
\ No newline at end of file
+++ /dev/null
-class Hack < ActiveRecord::Base
- set_primary_keys :name
- has_many :comments, :as => :person
-
- has_one :first_comment, :as => :person, :class_name => "Comment"
-end
\ No newline at end of file
+++ /dev/null
-andrew:
- name: andrew
\ No newline at end of file
+++ /dev/null
-class Membership < ActiveRecord::Base
- # set_primary_keys *keys - turns on composite key functionality
- set_primary_keys :user_id, :group_id
- belongs_to :user
- belongs_to :group
- has_many :statuses, :class_name => 'MembershipStatus', :foreign_key => [:user_id, :group_id]
-end
\ No newline at end of file
+++ /dev/null
-class MembershipStatus < ActiveRecord::Base
- belongs_to :membership, :foreign_key => [:user_id, :group_id]
-end
\ No newline at end of file
+++ /dev/null
-santiago-cpk:
- id: 1
- user_id: 1
- group_id: 1
- status: Active
-drnic-cpk:
- id: 2
- user_id: 2
- group_id: 1
- status: Owner
\ No newline at end of file
+++ /dev/null
-santiago-cpk:
- user_id: 1
- group_id: 1
-drnic-cpk:
- user_id: 2
- group_id: 1
\ No newline at end of file
+++ /dev/null
-class Product < ActiveRecord::Base\r
- set_primary_keys :id # redundant\r
- has_many :product_tariffs, :foreign_key => :product_id\r
- has_one :product_tariff, :foreign_key => :product_id\r
-\r
- has_many :tariffs, :through => :product_tariffs, :foreign_key => [:tariff_id, :tariff_start_date]\r
-end\r
+++ /dev/null
-class ProductTariff < ActiveRecord::Base\r
- set_primary_keys :product_id, :tariff_id, :tariff_start_date\r
- belongs_to :product, :foreign_key => :product_id\r
- belongs_to :tariff, :foreign_key => [:tariff_id, :tariff_start_date]\r
-end\r
+++ /dev/null
-first_flat:\r
- product_id: 1\r
- tariff_id: 1\r
- tariff_start_date: <%= Date.today.to_s(:db) %>\r
-first_free: \r
- product_id: 1\r
- tariff_id: 2\r
- tariff_start_date: <%= Date.today.to_s(:db) %>\r
-second_free:\r
- product_id: 2\r
- tariff_id: 2\r
- tariff_start_date: <%= Date.today.to_s(:db) %>\r
+++ /dev/null
-first_product:\r
- id: 1\r
- name: Product One\r
-second_product:\r
- id: 2\r
- name: Product Two
\ No newline at end of file
+++ /dev/null
-class Reading < ActiveRecord::Base\r
- belongs_to :article\r
- belongs_to :user\r
-end \r
+++ /dev/null
-santiago_first:\r
- id: 1\r
- user_id: 1\r
- article_id: 1\r
- rating: 4\r
-santiago_second:\r
- id: 2\r
- user_id: 1\r
- article_id: 2\r
- rating: 5
\ No newline at end of file
+++ /dev/null
-class ReferenceCode < ActiveRecord::Base\r
- set_primary_keys :reference_type_id, :reference_code\r
- \r
- belongs_to :reference_type, :foreign_key => "reference_type_id"\r
- \r
- validates_presence_of :reference_code, :code_label, :abbreviation\r
-end\r
+++ /dev/null
-name_prefix_mr:\r
- reference_type_id: 1\r
- reference_code: 1\r
- code_label: MR\r
- abbreviation: Mr\r
-name_prefix_mrs:\r
- reference_type_id: 1\r
- reference_code: 2\r
- code_label: MRS\r
- abbreviation: Mrs\r
-name_prefix_ms:\r
- reference_type_id: 1\r
- reference_code: 3\r
- code_label: MS\r
- abbreviation: Ms\r
- \r
-gender_male:\r
- reference_type_id: 2\r
- reference_code: 1\r
- code_label: MALE\r
- abbreviation: Male\r
-gender_female:\r
- reference_type_id: 2\r
- reference_code: 2\r
- code_label: FEMALE\r
- abbreviation: Female\r
-\r
-
\ No newline at end of file
+++ /dev/null
-class ReferenceType < ActiveRecord::Base\r
- set_primary_key :reference_type_id\r
- has_many :reference_codes, :foreign_key => "reference_type_id"\r
- \r
- validates_presence_of :type_label, :abbreviation\r
- validates_uniqueness_of :type_label\r
-end\r
+++ /dev/null
-name_prefix:\r
- reference_type_id: 1\r
- type_label: NAME_PREFIX\r
- abbreviation: Name Prefix\r
-\r
-gender:\r
- reference_type_id: 2\r
- type_label: GENDER\r
- abbreviation: Gender\r
+++ /dev/null
-class Street < ActiveRecord::Base
- belongs_to :suburb, :foreign_key => [:city_id, :suburb_id]
-end
\ No newline at end of file
+++ /dev/null
-first:
- id: 1
- city_id: 1
- suburb_id: 1
- name: First Street
-second1:
- id: 2
- city_id: 2
- suburb_id: 1
- name: First Street
-second2:
- id: 3
- city_id: 2
- suburb_id: 1
- name: Second Street
\ No newline at end of file
+++ /dev/null
-class Suburb < ActiveRecord::Base\r
- set_primary_keys :city_id, :suburb_id\r
- has_many :streets, :foreign_key => [:city_id, :suburb_id]\r
- has_many :first_streets, :foreign_key => [:city_id, :suburb_id], \r
- :class_name => 'Street', :conditions => "streets.name = 'First Street'"\r
-end
\ No newline at end of file
+++ /dev/null
-first:\r
- city_id: 1\r
- suburb_id: 1\r
- name: First Suburb\r
-second:\r
- city_id: 2\r
- suburb_id: 1\r
- name: Second Suburb\r
-
\ No newline at end of file
+++ /dev/null
-class Tariff < ActiveRecord::Base\r
- set_primary_keys [:tariff_id, :start_date]\r
- has_many :product_tariffs, :foreign_key => [:tariff_id, :tariff_start_date]\r
- has_one :product_tariff, :foreign_key => [:tariff_id, :tariff_start_date]\r
- has_many :products, :through => :product_tariffs, :foreign_key => [:tariff_id, :tariff_start_date]\r
-end\r
+++ /dev/null
-flat:\r
- tariff_id: 1\r
- start_date: <%= Date.today.to_s(:db) %>\r
- amount: 50\r
-free:\r
- tariff_id: 2\r
- start_date: <%= Date.today.to_s(:db) %>\r
- amount: 0\r
-flat_future:\r
- tariff_id: 1\r
- start_date: <%= Date.today.next.to_s(:db) %>\r
- amount: 100\r
-
\ No newline at end of file
+++ /dev/null
-class User < ActiveRecord::Base\r
- has_many :readings\r
- has_many :articles, :through => :readings\r
- has_many :comments, :as => :person\r
- has_many :hacks, :through => :comments, :source => :hack\r
- \r
- def find_custom_articles\r
- articles.find(:all, :conditions => ["name = ?", "Article One"])\r
- end\r
-end\r
+++ /dev/null
-santiago:\r
- id: 1\r
- name: Santiago\r
-drnic:\r
- id: 2\r
- name: Dr Nic
\ No newline at end of file
+++ /dev/null
-# From:\r
-# http://www.bigbold.com/snippets/posts/show/2178\r
-# http://blog.caboo.se/articles/2006/06/11/stupid-hash-tricks\r
-# \r
-# An example utilisation of these methods in a controller is:\r
-# def some_action\r
-# # some script kiddie also passed in :bee, which we don't want tampered with _here_.\r
-# @model = Model.create(params.pass(:foo, :bar))\r
-# end\r
-class Hash\r
-\r
- # lets through the keys in the argument\r
- # >> {:one => 1, :two => 2, :three => 3}.pass(:one)\r
- # => {:one=>1}\r
- def pass(*keys)\r
- keys = keys.first if keys.first.is_a?(Array)\r
- tmp = self.clone\r
- tmp.delete_if {|k,v| ! keys.include?(k.to_sym) }\r
- tmp.delete_if {|k,v| ! keys.include?(k.to_s) }\r
- tmp\r
- end\r
-\r
- # blocks the keys in the arguments\r
- # >> {:one => 1, :two => 2, :three => 3}.block(:one)\r
- # => {:two=>2, :three=>3}\r
- def block(*keys)\r
- keys = keys.first if keys.first.is_a?(Array)\r
- tmp = self.clone\r
- tmp.delete_if {|k,v| keys.include?(k.to_sym) }\r
- tmp.delete_if {|k,v| keys.include?(k.to_s) }\r
- tmp\r
- end\r
-\r
-end\r
+++ /dev/null
-module ActionController
- # === Action Pack pagination for Active Record collections
- #
- # The Pagination module aids in the process of paging large collections of
- # Active Record objects. It offers macro-style automatic fetching of your
- # model for multiple views, or explicit fetching for single actions. And if
- # the magic isn't flexible enough for your needs, you can create your own
- # paginators with a minimal amount of code.
- #
- # The Pagination module can handle as much or as little as you wish. In the
- # controller, have it automatically query your model for pagination; or,
- # if you prefer, create Paginator objects yourself.
- #
- # Pagination is included automatically for all controllers.
- #
- # For help rendering pagination links, see
- # ActionView::Helpers::PaginationHelper.
- #
- # ==== Automatic pagination for every action in a controller
- #
- # class PersonController < ApplicationController
- # model :person
- #
- # paginate :people, :order => 'last_name, first_name',
- # :per_page => 20
- #
- # # ...
- # end
- #
- # Each action in this controller now has access to a <tt>@people</tt>
- # instance variable, which is an ordered collection of model objects for the
- # current page (at most 20, sorted by last name and first name), and a
- # <tt>@person_pages</tt> Paginator instance. The current page is determined
- # by the <tt>params[:page]</tt> variable.
- #
- # ==== Pagination for a single action
- #
- # def list
- # @person_pages, @people =
- # paginate :people, :order => 'last_name, first_name'
- # end
- #
- # Like the previous example, but explicitly creates <tt>@person_pages</tt>
- # and <tt>@people</tt> for a single action, and uses the default of 10 items
- # per page.
- #
- # ==== Custom/"classic" pagination
- #
- # def list
- # @person_pages = Paginator.new self, Person.count, 10, params[:page]
- # @people = Person.find :all, :order => 'last_name, first_name',
- # :limit => @person_pages.items_per_page,
- # :offset => @person_pages.current.offset
- # end
- #
- # Explicitly creates the paginator from the previous example and uses
- # Paginator#to_sql to retrieve <tt>@people</tt> from the model.
- #
- module Pagination
- unless const_defined?(:OPTIONS)
- # A hash holding options for controllers using macro-style pagination
- OPTIONS = Hash.new
-
- # The default options for pagination
- DEFAULT_OPTIONS = {
- :class_name => nil,
- :singular_name => nil,
- :per_page => 10,
- :conditions => nil,
- :order_by => nil,
- :order => nil,
- :join => nil,
- :joins => nil,
- :count => nil,
- :include => nil,
- :select => nil,
- :group => nil,
- :parameter => 'page'
- }
- else
- DEFAULT_OPTIONS[:group] = nil
- end
-
- def self.included(base) #:nodoc:
- super
- base.extend(ClassMethods)
- end
-
- def self.validate_options!(collection_id, options, in_action) #:nodoc:
- options.merge!(DEFAULT_OPTIONS) {|key, old, new| old}
-
- valid_options = DEFAULT_OPTIONS.keys
- valid_options << :actions unless in_action
-
- unknown_option_keys = options.keys - valid_options
- raise ActionController::ActionControllerError,
- "Unknown options: #{unknown_option_keys.join(', ')}" unless
- unknown_option_keys.empty?
-
- options[:singular_name] ||= ActiveSupport::Inflector.singularize(collection_id.to_s)
- options[:class_name] ||= ActiveSupport::Inflector.camelize(options[:singular_name])
- end
-
- # Returns a paginator and a collection of Active Record model instances
- # for the paginator's current page. This is designed to be used in a
- # single action; to automatically paginate multiple actions, consider
- # ClassMethods#paginate.
- #
- # +options+ are:
- # <tt>:singular_name</tt>:: the singular name to use, if it can't be inferred by singularizing the collection name
- # <tt>:class_name</tt>:: the class name to use, if it can't be inferred by
- # camelizing the singular name
- # <tt>:per_page</tt>:: the maximum number of items to include in a
- # single page. Defaults to 10
- # <tt>:conditions</tt>:: optional conditions passed to Model.find(:all, *params) and
- # Model.count
- # <tt>:order</tt>:: optional order parameter passed to Model.find(:all, *params)
- # <tt>:order_by</tt>:: (deprecated, used :order) optional order parameter passed to Model.find(:all, *params)
- # <tt>:joins</tt>:: optional joins parameter passed to Model.find(:all, *params)
- # and Model.count
- # <tt>:join</tt>:: (deprecated, used :joins or :include) optional join parameter passed to Model.find(:all, *params)
- # and Model.count
- # <tt>:include</tt>:: optional eager loading parameter passed to Model.find(:all, *params)
- # and Model.count
- # <tt>:select</tt>:: :select parameter passed to Model.find(:all, *params)
- #
- # <tt>:count</tt>:: parameter passed as :select option to Model.count(*params)
- #
- # <tt>:group</tt>:: :group parameter passed to Model.find(:all, *params). It forces the use of DISTINCT instead of plain COUNT to come up with the total number of records
- #
- def paginate(collection_id, options={})
- Pagination.validate_options!(collection_id, options, true)
- paginator_and_collection_for(collection_id, options)
- end
-
- # These methods become class methods on any controller
- module ClassMethods
- # Creates a +before_filter+ which automatically paginates an Active
- # Record model for all actions in a controller (or certain actions if
- # specified with the <tt>:actions</tt> option).
- #
- # +options+ are the same as PaginationHelper#paginate, with the addition
- # of:
- # <tt>:actions</tt>:: an array of actions for which the pagination is
- # active. Defaults to +nil+ (i.e., every action)
- def paginate(collection_id, options={})
- Pagination.validate_options!(collection_id, options, false)
- module_eval do
- before_filter :create_paginators_and_retrieve_collections
- OPTIONS[self] ||= Hash.new
- OPTIONS[self][collection_id] = options
- end
- end
- end
-
- def create_paginators_and_retrieve_collections #:nodoc:
- Pagination::OPTIONS[self.class].each do |collection_id, options|
- next unless options[:actions].include? action_name if
- options[:actions]
-
- paginator, collection =
- paginator_and_collection_for(collection_id, options)
-
- paginator_name = "@#{options[:singular_name]}_pages"
- self.instance_variable_set(paginator_name, paginator)
-
- collection_name = "@#{collection_id.to_s}"
- self.instance_variable_set(collection_name, collection)
- end
- end
-
- # Returns the total number of items in the collection to be paginated for
- # the +model+ and given +conditions+. Override this method to implement a
- # custom counter.
- def count_collection_for_pagination(model, options)
- model.count(:conditions => options[:conditions],
- :joins => options[:join] || options[:joins],
- :include => options[:include],
- :select => (options[:group] ? "DISTINCT #{options[:group]}" : options[:count]))
- end
-
- # Returns a collection of items for the given +model+ and +options[conditions]+,
- # ordered by +options[order]+, for the current page in the given +paginator+.
- # Override this method to implement a custom finder.
- def find_collection_for_pagination(model, options, paginator)
- model.find(:all, :conditions => options[:conditions],
- :order => options[:order_by] || options[:order],
- :joins => options[:join] || options[:joins], :include => options[:include],
- :select => options[:select], :limit => options[:per_page],
- :group => options[:group], :offset => paginator.current.offset)
- end
-
- protected :create_paginators_and_retrieve_collections,
- :count_collection_for_pagination,
- :find_collection_for_pagination
-
- def paginator_and_collection_for(collection_id, options) #:nodoc:
- klass = options[:class_name].constantize
- page = params[options[:parameter]]
- count = count_collection_for_pagination(klass, options)
- paginator = Paginator.new(self, count, options[:per_page], page)
- collection = find_collection_for_pagination(klass, options, paginator)
-
- return paginator, collection
- end
-
- private :paginator_and_collection_for
-
- # A class representing a paginator for an Active Record collection.
- class Paginator
- include Enumerable
-
- # Creates a new Paginator on the given +controller+ for a set of items
- # of size +item_count+ and having +items_per_page+ items per page.
- # Raises ArgumentError if items_per_page is out of bounds (i.e., less
- # than or equal to zero). The page CGI parameter for links defaults to
- # "page" and can be overridden with +page_parameter+.
- def initialize(controller, item_count, items_per_page, current_page=1)
- raise ArgumentError, 'must have at least one item per page' if
- items_per_page <= 0
-
- @controller = controller
- @item_count = item_count || 0
- @items_per_page = items_per_page
- @pages = {}
-
- self.current_page = current_page
- end
- attr_reader :controller, :item_count, :items_per_page
-
- # Sets the current page number of this paginator. If +page+ is a Page
- # object, its +number+ attribute is used as the value; if the page does
- # not belong to this Paginator, an ArgumentError is raised.
- def current_page=(page)
- if page.is_a? Page
- raise ArgumentError, 'Page/Paginator mismatch' unless
- page.paginator == self
- end
- page = page.to_i
- @current_page_number = has_page_number?(page) ? page : 1
- end
-
- # Returns a Page object representing this paginator's current page.
- def current_page
- @current_page ||= self[@current_page_number]
- end
- alias current :current_page
-
- # Returns a new Page representing the first page in this paginator.
- def first_page
- @first_page ||= self[1]
- end
- alias first :first_page
-
- # Returns a new Page representing the last page in this paginator.
- def last_page
- @last_page ||= self[page_count]
- end
- alias last :last_page
-
- # Returns the number of pages in this paginator.
- def page_count
- @page_count ||= @item_count.zero? ? 1 :
- (q,r=@item_count.divmod(@items_per_page); r==0? q : q+1)
- end
-
- alias length :page_count
-
- # Returns true if this paginator contains the page of index +number+.
- def has_page_number?(number)
- number >= 1 and number <= page_count
- end
-
- # Returns a new Page representing the page with the given index
- # +number+.
- def [](number)
- @pages[number] ||= Page.new(self, number)
- end
-
- # Successively yields all the paginator's pages to the given block.
- def each(&block)
- page_count.times do |n|
- yield self[n+1]
- end
- end
-
- # A class representing a single page in a paginator.
- class Page
- include Comparable
-
- # Creates a new Page for the given +paginator+ with the index
- # +number+. If +number+ is not in the range of valid page numbers or
- # is not a number at all, it defaults to 1.
- def initialize(paginator, number)
- @paginator = paginator
- @number = number.to_i
- @number = 1 unless @paginator.has_page_number? @number
- end
- attr_reader :paginator, :number
- alias to_i :number
-
- # Compares two Page objects and returns true when they represent the
- # same page (i.e., their paginators are the same and they have the
- # same page number).
- def ==(page)
- return false if page.nil?
- @paginator == page.paginator and
- @number == page.number
- end
-
- # Compares two Page objects and returns -1 if the left-hand page comes
- # before the right-hand page, 0 if the pages are equal, and 1 if the
- # left-hand page comes after the right-hand page. Raises ArgumentError
- # if the pages do not belong to the same Paginator object.
- def <=>(page)
- raise ArgumentError unless @paginator == page.paginator
- @number <=> page.number
- end
-
- # Returns the item offset for the first item in this page.
- def offset
- @paginator.items_per_page * (@number - 1)
- end
-
- # Returns the number of the first item displayed.
- def first_item
- offset + 1
- end
-
- # Returns the number of the last item displayed.
- def last_item
- [@paginator.items_per_page * @number, @paginator.item_count].min
- end
-
- # Returns true if this page is the first page in the paginator.
- def first?
- self == @paginator.first
- end
-
- # Returns true if this page is the last page in the paginator.
- def last?
- self == @paginator.last
- end
-
- # Returns a new Page object representing the page just before this
- # page, or nil if this is the first page.
- def previous
- if first? then nil else @paginator[@number - 1] end
- end
-
- # Returns a new Page object representing the page just after this
- # page, or nil if this is the last page.
- def next
- if last? then nil else @paginator[@number + 1] end
- end
-
- # Returns a new Window object for this page with the specified
- # +padding+.
- def window(padding=2)
- Window.new(self, padding)
- end
-
- # Returns the limit/offset array for this page.
- def to_sql
- [@paginator.items_per_page, offset]
- end
-
- def to_param #:nodoc:
- @number.to_s
- end
- end
-
- # A class for representing ranges around a given page.
- class Window
- # Creates a new Window object for the given +page+ with the specified
- # +padding+.
- def initialize(page, padding=2)
- @paginator = page.paginator
- @page = page
- self.padding = padding
- end
- attr_reader :paginator, :page
-
- # Sets the window's padding (the number of pages on either side of the
- # window page).
- def padding=(padding)
- @padding = padding < 0 ? 0 : padding
- # Find the beginning and end pages of the window
- @first = @paginator.has_page_number?(@page.number - @padding) ?
- @paginator[@page.number - @padding] : @paginator.first
- @last = @paginator.has_page_number?(@page.number + @padding) ?
- @paginator[@page.number + @padding] : @paginator.last
- end
- attr_reader :padding, :first, :last
-
- # Returns an array of Page objects in the current window.
- def pages
- (@first.number..@last.number).to_a.collect! {|n| @paginator[n]}
- end
- alias to_a :pages
- end
- end
-
- end
-end
+++ /dev/null
-module ActionView
- module Helpers
- # Provides methods for linking to ActionController::Pagination objects using a simple generator API. You can optionally
- # also build your links manually using ActionView::Helpers::AssetHelper#link_to like so:
- #
- # <%= link_to "Previous page", { :page => paginator.current.previous } if paginator.current.previous %>
- # <%= link_to "Next page", { :page => paginator.current.next } if paginator.current.next %>
- module PaginationHelper
- unless const_defined?(:DEFAULT_OPTIONS)
- DEFAULT_OPTIONS = {
- :name => :page,
- :window_size => 2,
- :always_show_anchors => true,
- :link_to_current_page => false,
- :params => {}
- }
- end
-
- # Creates a basic HTML link bar for the given +paginator+. Links will be created
- # for the next and/or previous page and for a number of other pages around the current
- # pages position. The +html_options+ hash is passed to +link_to+ when the links are created.
- #
- # ==== Options
- # <tt>:name</tt>:: the routing name for this paginator
- # (defaults to +page+)
- # <tt>:prefix</tt>:: prefix for pagination links
- # (i.e. Older Pages: 1 2 3 4)
- # <tt>:suffix</tt>:: suffix for pagination links
- # (i.e. 1 2 3 4 <- Older Pages)
- # <tt>:window_size</tt>:: the number of pages to show around
- # the current page (defaults to <tt>2</tt>)
- # <tt>:always_show_anchors</tt>:: whether or not the first and last
- # pages should always be shown
- # (defaults to +true+)
- # <tt>:link_to_current_page</tt>:: whether or not the current page
- # should be linked to (defaults to
- # +false+)
- # <tt>:params</tt>:: any additional routing parameters
- # for page URLs
- #
- # ==== Examples
- # # We'll assume we have a paginator setup in @person_pages...
- #
- # pagination_links(@person_pages)
- # # => 1 <a href="/?page=2/">2</a> <a href="/?page=3/">3</a> ... <a href="/?page=10/">10</a>
- #
- # pagination_links(@person_pages, :link_to_current_page => true)
- # # => <a href="/?page=1/">1</a> <a href="/?page=2/">2</a> <a href="/?page=3/">3</a> ... <a href="/?page=10/">10</a>
- #
- # pagination_links(@person_pages, :always_show_anchors => false)
- # # => 1 <a href="/?page=2/">2</a> <a href="/?page=3/">3</a>
- #
- # pagination_links(@person_pages, :window_size => 1)
- # # => 1 <a href="/?page=2/">2</a> ... <a href="/?page=10/">10</a>
- #
- # pagination_links(@person_pages, :params => { :viewer => "flash" })
- # # => 1 <a href="/?page=2&viewer=flash/">2</a> <a href="/?page=3&viewer=flash/">3</a> ...
- # # <a href="/?page=10&viewer=flash/">10</a>
- def pagination_links(paginator, options={}, html_options={})
- name = options[:name] || DEFAULT_OPTIONS[:name]
- params = (options[:params] || DEFAULT_OPTIONS[:params]).clone
-
- prefix = options[:prefix] || ''
- suffix = options[:suffix] || ''
-
- pagination_links_each(paginator, options, prefix, suffix) do |n|
- params[name] = n
- link_to(n.to_s, params, html_options)
- end
- end
-
- # Iterate through the pages of a given +paginator+, invoking a
- # block for each page number that needs to be rendered as a link.
- #
- # ==== Options
- # <tt>:window_size</tt>:: the number of pages to show around
- # the current page (defaults to +2+)
- # <tt>:always_show_anchors</tt>:: whether or not the first and last
- # pages should always be shown
- # (defaults to +true+)
- # <tt>:link_to_current_page</tt>:: whether or not the current page
- # should be linked to (defaults to
- # +false+)
- #
- # ==== Example
- # # Turn paginated links into an Ajax call
- # pagination_links_each(paginator, page_options) do |link|
- # options = { :url => {:action => 'list'}, :update => 'results' }
- # html_options = { :href => url_for(:action => 'list') }
- #
- # link_to_remote(link.to_s, options, html_options)
- # end
- def pagination_links_each(paginator, options, prefix = nil, suffix = nil)
- options = DEFAULT_OPTIONS.merge(options)
- link_to_current_page = options[:link_to_current_page]
- always_show_anchors = options[:always_show_anchors]
-
- current_page = paginator.current_page
- window_pages = current_page.window(options[:window_size]).pages
- return if window_pages.length <= 1 unless link_to_current_page
-
- first, last = paginator.first, paginator.last
-
- html = ''
-
- html << prefix if prefix
-
- if always_show_anchors and not (wp_first = window_pages[0]).first?
- html << yield(first.number)
- html << ' ... ' if wp_first.number - first.number > 1
- html << ' '
- end
-
- window_pages.each do |page|
- if current_page == page && !link_to_current_page
- html << page.number.to_s
- else
- html << yield(page.number)
- end
- html << ' '
- end
-
- if always_show_anchors and not (wp_last = window_pages[-1]).last?
- html << ' ... ' if last.number - wp_last.number > 1
- html << yield(last.number)
- end
-
- html << suffix if suffix
-
- html
- end
-
- end # PaginationHelper
- end # Helpers
-end # ActionView
+++ /dev/null
-require 'abstract_unit'\r
-require 'fixtures/article'\r
-require 'fixtures/product'\r
-require 'fixtures/tariff'\r
-require 'fixtures/product_tariff'\r
-require 'fixtures/suburb'\r
-require 'fixtures/street'\r
-require 'fixtures/restaurant'\r
-require 'fixtures/dorm'\r
-require 'fixtures/room'\r
-require 'fixtures/room_attribute'\r
-require 'fixtures/room_attribute_assignment'\r
-require 'fixtures/student'\r
-require 'fixtures/room_assignment'\r
-require 'fixtures/user'\r
-require 'fixtures/reading'\r
-\r
-class TestAssociations < Test::Unit::TestCase\r
- fixtures :articles, :products, :tariffs, :product_tariffs, :suburbs, :streets, :restaurants, :restaurants_suburbs,\r
- :dorms, :rooms, :room_attributes, :room_attribute_assignments, :students, :room_assignments, :users, :readings\r
- \r
- def test_has_many_through_with_conditions_when_through_association_is_not_composite\r
- user = User.find(:first)\r
- assert_equal 1, user.articles.find(:all, :conditions => ["articles.name = ?", "Article One"]).size\r
- end\r
-\r
- def test_has_many_through_with_conditions_when_through_association_is_composite\r
- room = Room.find(:first)\r
- assert_equal 0, room.room_attributes.find(:all, :conditions => ["room_attributes.name != ?", "keg"]).size\r
- end\r
-\r
- def test_has_many_through_on_custom_finder_when_through_association_is_composite_finder_when_through_association_is_not_composite\r
- user = User.find(:first)\r
- assert_equal 1, user.find_custom_articles.size\r
- end\r
-\r
- def test_has_many_through_on_custom_finder_when_through_association_is_composite\r
- room = Room.find(:first)\r
- assert_equal 0, room.find_custom_room_attributes.size\r
- end\r
- \r
- def test_count\r
- assert_equal 2, Product.count(:include => :product_tariffs)\r
- assert_equal 3, Tariff.count(:include => :product_tariffs)\r
- assert_equal 2, Tariff.count(:group => :start_date).size\r
- end\r
- \r
- def test_products\r
- assert_not_nil products(:first_product).product_tariffs\r
- assert_equal 2, products(:first_product).product_tariffs.length\r
- assert_not_nil products(:first_product).tariffs\r
- assert_equal 2, products(:first_product).tariffs.length\r
- assert_not_nil products(:first_product).product_tariff\r
- end\r
- \r
- def test_product_tariffs\r
- assert_not_nil product_tariffs(:first_flat).product\r
- assert_not_nil product_tariffs(:first_flat).tariff\r
- assert_equal Product, product_tariffs(:first_flat).product.class\r
- assert_equal Tariff, product_tariffs(:first_flat).tariff.class\r
- end\r
- \r
- def test_tariffs\r
- assert_not_nil tariffs(:flat).product_tariffs\r
- assert_equal 1, tariffs(:flat).product_tariffs.length\r
- assert_not_nil tariffs(:flat).products\r
- assert_equal 1, tariffs(:flat).products.length\r
- assert_not_nil tariffs(:flat).product_tariff\r
- end\r
- \r
- # Its not generating the instances of associated classes from the rows\r
- def test_find_includes_products\r
- assert @products = Product.find(:all, :include => :product_tariffs)\r
- assert_equal 2, @products.length\r
- assert_not_nil @products.first.instance_variable_get('@product_tariffs'), '@product_tariffs not set; should be array'\r
- assert_equal 3, @products.inject(0) {|sum, tariff| sum + tariff.instance_variable_get('@product_tariffs').length}, \r
- "Incorrect number of product_tariffs returned"\r
- end\r
- \r
- def test_find_includes_tariffs\r
- assert @tariffs = Tariff.find(:all, :include => :product_tariffs)\r
- assert_equal 3, @tariffs.length\r
- assert_not_nil @tariffs.first.instance_variable_get('@product_tariffs'), '@product_tariffs not set; should be array'\r
- assert_equal 3, @tariffs.inject(0) {|sum, tariff| sum + tariff.instance_variable_get('@product_tariffs').length}, \r
- "Incorrect number of product_tariffs returnedturned"\r
- end\r
- \r
- def test_find_includes_product\r
- assert @product_tariffs = ProductTariff.find(:all, :include => :product)\r
- assert_equal 3, @product_tariffs.length\r
- assert_not_nil @product_tariffs.first.instance_variable_get('@product'), '@product not set'\r
- end\r
- \r
- def test_find_includes_comp_belongs_to_tariff\r
- assert @product_tariffs = ProductTariff.find(:all, :include => :tariff)\r
- assert_equal 3, @product_tariffs.length\r
- assert_not_nil @product_tariffs.first.instance_variable_get('@tariff'), '@tariff not set'\r
- end\r
- \r
- def test_find_includes_extended\r
- assert @products = Product.find(:all, :include => {:product_tariffs => :tariff})\r
- assert_equal 3, @products.inject(0) {|sum, product| sum + product.instance_variable_get('@product_tariffs').length},\r
- "Incorrect number of product_tariffs returned"\r
- \r
- assert @tariffs = Tariff.find(:all, :include => {:product_tariffs => :product})\r
- assert_equal 3, @tariffs.inject(0) {|sum, tariff| sum + tariff.instance_variable_get('@product_tariffs').length}, \r
- "Incorrect number of product_tariffs returned"\r
- end\r
- \r
- def test_join_where_clause\r
- @product = Product.find(:first, :include => :product_tariffs)\r
- where_clause = @product.product_tariffs.composite_where_clause(\r
- ['foo','bar'], [1,2]\r
- )\r
- assert_equal('(foo=1 AND bar=2)', where_clause)\r
- end\r
- \r
- def test_has_many_through\r
- @products = Product.find(:all, :include => :tariffs)\r
- assert_equal 3, @products.inject(0) {|sum, product| sum + product.instance_variable_get('@tariffs').length},\r
- "Incorrect number of tariffs returned"\r
- end\r
- \r
- def test_has_many_through_when_not_pre_loaded\r
- student = Student.find(:first)\r
- rooms = student.rooms\r
- assert_equal 1, rooms.size\r
- assert_equal 1, rooms.first.dorm_id\r
- assert_equal 1, rooms.first.room_id\r
- end\r
- \r
- def test_has_many_through_when_through_association_is_composite\r
- dorm = Dorm.find(:first)\r
- assert_equal 1, dorm.rooms.length\r
- assert_equal 1, dorm.rooms.first.room_attributes.length\r
- assert_equal 'keg', dorm.rooms.first.room_attributes.first.name\r
- end\r
-\r
- def test_associations_with_conditions\r
- @suburb = Suburb.find([2, 1])\r
- assert_equal 2, @suburb.streets.size\r
-\r
- @suburb = Suburb.find([2, 1])\r
- assert_equal 1, @suburb.first_streets.size\r
-\r
- @suburb = Suburb.find([2, 1], :include => :streets)\r
- assert_equal 2, @suburb.streets.size\r
-\r
- @suburb = Suburb.find([2, 1], :include => :first_streets)\r
- assert_equal 1, @suburb.first_streets.size\r
- end\r
- \r
- def test_has_and_belongs_to_many\r
- @restaurant = Restaurant.find([1,1])\r
- assert_equal 2, @restaurant.suburbs.size\r
- \r
- @restaurant = Restaurant.find([1,1], :include => :suburbs)\r
- assert_equal 2, @restaurant.suburbs.size \r
- end\r
-end\r
+++ /dev/null
-require 'abstract_unit'
-require 'fixtures/kitchen_sink'
-require 'fixtures/reference_type'
-
-class TestAttributeMethods < Test::Unit::TestCase
- fixtures :kitchen_sinks, :reference_types
-
- def test_read_attribute_with_single_key
- rt = ReferenceType.find(1)
- assert_equal(1, rt.reference_type_id)
- assert_equal('NAME_PREFIX', rt.type_label)
- assert_equal('Name Prefix', rt.abbreviation)
- end
-
- def test_read_attribute_with_composite_keys
- sink = KitchenSink.find(1,2)
- assert_equal(1, sink.id_1)
- assert_equal(2, sink.id_2)
- assert_equal(Date.today, sink.a_date.to_date)
- assert_equal('string', sink.a_string)
- end
-end
+++ /dev/null
-require 'abstract_unit'
-require 'fixtures/reference_type'
-require 'fixtures/reference_code'
-require 'fixtures/product'
-require 'fixtures/tariff'
-require 'fixtures/product_tariff'
-
-class TestAttributes < Test::Unit::TestCase
- fixtures :reference_types, :reference_codes, :products, :tariffs, :product_tariffs
-
- CLASSES = {
- :single => {
- :class => ReferenceType,
- :primary_keys => :reference_type_id,
- },
- :dual => {
- :class => ReferenceCode,
- :primary_keys => [:reference_type_id, :reference_code],
- },
- }
-
- def setup
- self.class.classes = CLASSES
- end
-
- def test_brackets
- testing_with do
- @first.attributes.each_pair do |attr_name, value|
- assert_equal value, @first[attr_name]
- end
- end
- end
-
- def test_brackets_primary_key
- testing_with do
- assert_equal @first.id, @first[@primary_keys], "[] failing for #{@klass}"
- assert_equal @first.id, @first[@first.class.primary_key]
- end
- end
-
- def test_brackets_assignment
- testing_with do
- @first.attributes.each_pair do |attr_name, value|
- @first[attr_name]= !value.nil? ? value * 2 : '1'
- assert_equal !value.nil? ? value * 2 : '1', @first[attr_name]
- end
- end
- end
-
- def test_brackets_foreign_key_assignment
- @flat = Tariff.find(1, Date.today.to_s(:db))
- @second_free = ProductTariff.find(2,2,Date.today.to_s(:db))
- @second_free_fk = [:tariff_id, :tariff_start_date]
- @second_free[key = @second_free_fk] = @flat.id
- compare_indexes('@flat', @flat.class.primary_key, '@second_free', @second_free_fk)
- assert_equal @flat.id, @second_free[key]
- @second_free[key = @second_free_fk.to_composite_ids] = @flat.id
- assert_equal @flat.id, @second_free[key]
- compare_indexes('@flat', @flat.class.primary_key, '@second_free', @second_free_fk)
- @second_free[key = @second_free_fk.to_composite_ids] = @flat.id.to_s
- assert_equal @flat.id, @second_free[key]
- compare_indexes('@flat', @flat.class.primary_key, '@second_free', @second_free_fk)
- @second_free[key = @second_free_fk.to_composite_ids] = @flat.id.to_s
- assert_equal @flat.id, @second_free[key]
- compare_indexes('@flat', @flat.class.primary_key, '@second_free', @second_free_fk)
- @second_free[key = @second_free_fk.to_composite_ids.to_s] = @flat.id
- assert_equal @flat.id, @second_free[key]
- compare_indexes('@flat', @flat.class.primary_key, '@second_free', @second_free_fk)
- @second_free[key = @second_free_fk.to_composite_ids.to_s] = @flat.id.to_s
- assert_equal @flat.id, @second_free[key]
- compare_indexes('@flat', @flat.class.primary_key, '@second_free', @second_free_fk)
- end
-private
- def compare_indexes(obj_name1, indexes1, obj_name2, indexes2)
- obj1, obj2 = eval "[#{obj_name1}, #{obj_name2}]"
- indexes1.length.times do |key_index|
- assert_equal obj1[indexes1[key_index].to_s],
- obj2[indexes2[key_index].to_s],
- "#{obj_name1}[#{indexes1[key_index]}]=#{obj1[indexes1[key_index].to_s].inspect} != " +
- "#{obj_name2}[#{indexes2[key_index]}]=#{obj2[indexes2[key_index].to_s].inspect}; " +
- "#{obj_name2} = #{obj2.inspect}"
- end
- end
-end
\ No newline at end of file
+++ /dev/null
-require 'abstract_unit'\r
-require 'fixtures/reference_type'\r
-require 'fixtures/reference_code'\r
-\r
-class TestClone < Test::Unit::TestCase\r
- fixtures :reference_types, :reference_codes\r
- \r
- CLASSES = {\r
- :single => {\r
- :class => ReferenceType,\r
- :primary_keys => :reference_type_id,\r
- },\r
- :dual => { \r
- :class => ReferenceCode,\r
- :primary_keys => [:reference_type_id, :reference_code],\r
- },\r
- }\r
- \r
- def setup\r
- self.class.classes = CLASSES\r
- end\r
- \r
- def test_truth\r
- testing_with do\r
- clone = @first.clone\r
- assert_equal @first.attributes.block(@klass.primary_key), clone.attributes\r
- if composite?\r
- @klass.primary_key.each {|key| assert_nil clone[key], "Primary key '#{key}' should be nil"} \r
- else\r
- assert_nil clone[@klass.primary_key], "Sole primary key should be nil"\r
- end\r
- end\r
- end\r
-end
\ No newline at end of file
+++ /dev/null
-require 'abstract_unit'
-require 'fixtures/reference_type'
-require 'fixtures/reference_code'
-
-class CompositeArraysTest < Test::Unit::TestCase
-
- def test_new_primary_keys
- keys = CompositePrimaryKeys::CompositeKeys.new
- assert_not_nil keys
- assert_equal '', keys.to_s
- assert_equal '', "#{keys}"
- end
-
- def test_initialize_primary_keys
- keys = CompositePrimaryKeys::CompositeKeys.new([1,2,3])
- assert_not_nil keys
- assert_equal '1,2,3', keys.to_s
- assert_equal '1,2,3', "#{keys}"
- end
-
- def test_to_composite_keys
- keys = [1,2,3].to_composite_keys
- assert_equal CompositePrimaryKeys::CompositeKeys, keys.class
- assert_equal '1,2,3', keys.to_s
- end
-
- def test_new_ids
- keys = CompositePrimaryKeys::CompositeIds.new
- assert_not_nil keys
- assert_equal '', keys.to_s
- assert_equal '', "#{keys}"
- end
-
- def test_initialize_ids
- keys = CompositePrimaryKeys::CompositeIds.new([1,2,3])
- assert_not_nil keys
- assert_equal '1,2,3', keys.to_s
- assert_equal '1,2,3', "#{keys}"
- end
-
- def test_to_composite_ids
- keys = [1,2,3].to_composite_ids
- assert_equal CompositePrimaryKeys::CompositeIds, keys.class
- assert_equal '1,2,3', keys.to_s
- end
-
- def test_flatten
- keys = [CompositePrimaryKeys::CompositeIds.new([1,2,3]), CompositePrimaryKeys::CompositeIds.new([4,5,6])]
- assert_equal 6, keys.flatten.size
- end
-end
\ No newline at end of file
+++ /dev/null
-require 'abstract_unit'
-require 'fixtures/reference_type'
-require 'fixtures/reference_code'
-require 'fixtures/street'
-require 'fixtures/suburb'
-
-class TestCreate < Test::Unit::TestCase
- fixtures :reference_types, :reference_codes, :streets, :suburbs
-
- CLASSES = {
- :single => {
- :class => ReferenceType,
- :primary_keys => :reference_type_id,
- :create => {:reference_type_id => 10, :type_label => 'NEW_TYPE', :abbreviation => 'New Type'}
- },
- :dual => {
- :class => ReferenceCode,
- :primary_keys => [:reference_type_id, :reference_code],
- :create => {:reference_type_id => 1, :reference_code => 20, :code_label => 'NEW_CODE', :abbreviation => 'New Code'}
- },
- }
-
- def setup
- self.class.classes = CLASSES
- end
-
- def test_setup
- testing_with do
- assert_not_nil @klass_info[:create]
- end
- end
-
- def test_create
- testing_with do
- assert new_obj = @klass.create(@klass_info[:create])
- assert !new_obj.new_record?
- end
- end
-
- def test_create_no_id
- testing_with do
- begin
- @obj = @klass.create(@klass_info[:create].block(@klass.primary_key))
- @successful = !composite?
- rescue CompositePrimaryKeys::ActiveRecord::CompositeKeyError
- @successful = false
- rescue
- flunk "Incorrect exception raised: #{$!}, #{$!.class}"
- end
- assert_equal composite?, !@successful, "Create should have failed for composites; #{@obj.inspect}"
- end
- end
-
- def test_create_on_association
- suburb = Suburb.find(:first)
- suburb.streets.create(:name => "my street")
- street = Street.find_by_name('my street')
- assert_equal(suburb.city_id, street.city_id)
- assert_equal(suburb.suburb_id, street.suburb_id)
- end
-
- def test_create_on_association_when_belongs_to_is_single_key
- rt = ReferenceType.find(:first)
- rt.reference_codes.create(:reference_code => 4321, :code_label => 'foo', :abbreviation => 'bar')
- rc = ReferenceCode.find_by_reference_code(4321)
- assert_equal(rc.reference_type_id, rt.reference_type_id)
- end
-end
+++ /dev/null
-require 'abstract_unit'\r
-require 'fixtures/reference_type'\r
-require 'fixtures/reference_code'\r
-require 'fixtures/department'\r
-require 'fixtures/employee'\r
-\r
-class TestDelete < Test::Unit::TestCase\r
- fixtures :reference_types, :reference_codes, :departments, :employees\r
- \r
- CLASSES = {\r
- :single => {\r
- :class => ReferenceType,\r
- :primary_keys => :reference_type_id,\r
- },\r
- :dual => { \r
- :class => ReferenceCode,\r
- :primary_keys => [:reference_type_id, :reference_code],\r
- },\r
- }\r
- \r
- def setup\r
- self.class.classes = CLASSES\r
- end\r
- \r
- def test_destroy_one\r
- testing_with do\r
- #assert @first.destroy\r
- assert true\r
- end\r
- end\r
- \r
- def test_destroy_one_via_class\r
- testing_with do\r
- assert @klass.destroy(*@first.id)\r
- end\r
- end\r
- \r
- def test_destroy_one_alone_via_class\r
- testing_with do\r
- assert @klass.destroy(@first.id)\r
- end\r
- end\r
- \r
- def test_delete_one\r
- testing_with do\r
- assert @klass.delete(*@first.id) if composite?\r
- end\r
- end\r
- \r
- def test_delete_one_alone\r
- testing_with do\r
- assert @klass.delete(@first.id)\r
- end\r
- end\r
- \r
- def test_delete_many\r
- testing_with do\r
- to_delete = @klass.find(:all)[0..1]\r
- assert_equal 2, to_delete.length\r
- end\r
- end\r
- \r
- def test_delete_all\r
- testing_with do\r
- @klass.delete_all\r
- end\r
- end\r
-\r
- def test_clear_association\r
- department = Department.find(1,1)\r
- assert_equal 2, department.employees.size, "Before clear employee count should be 2."\r
- department.employees.clear\r
- assert_equal 0, department.employees.size, "After clear employee count should be 0."\r
- department.reload\r
- assert_equal 0, department.employees.size, "After clear and a reload from DB employee count should be 0."\r
- end\r
-\r
- def test_delete_association\r
- department = Department.find(1,1)\r
- assert_equal 2, department.employees.size , "Before delete employee count should be 2."\r
- first_employee = department.employees[0]\r
- department.employees.delete(first_employee)\r
- assert_equal 1, department.employees.size, "After delete employee count should be 1."\r
- department.reload\r
- assert_equal 1, department.employees.size, "After delete and a reload from DB employee count should be 1."\r
- end\r
-\r
- def test_delete_records_for_has_many_association_with_composite_primary_key\r
- reference_type = ReferenceType.find(1)\r
- codes_to_delete = reference_type.reference_codes[0..1]\r
- assert_equal 3, reference_type.reference_codes.size, "Before deleting records reference_code count should be 3."\r
- reference_type.reference_codes.delete_records(codes_to_delete)\r
- reference_type.reload\r
- assert_equal 1, reference_type.reference_codes.size, "After deleting 2 records and a reload from DB reference_code count should be 1."\r
- end\r
-end\r
+++ /dev/null
-require 'abstract_unit'\r
-require 'fixtures/reference_type'\r
-require 'fixtures/reference_code'\r
-\r
-class TestDummy < Test::Unit::TestCase\r
- fixtures :reference_types, :reference_codes\r
- \r
- classes = {\r
- :single => {\r
- :class => ReferenceType,\r
- :primary_keys => :reference_type_id,\r
- },\r
- :dual => { \r
- :class => ReferenceCode,\r
- :primary_keys => [:reference_type_id, :reference_code],\r
- },\r
- }\r
- \r
- def setup\r
- self.class.classes = classes\r
- end\r
- \r
- def test_truth\r
- testing_with do\r
- assert true\r
- end\r
- end\r
-end
\ No newline at end of file
+++ /dev/null
-require 'abstract_unit'\r
-require 'fixtures/reference_type'\r
-require 'fixtures/reference_code'\r
-\r
-# Testing the find action on composite ActiveRecords with two primary keys\r
-class TestFind < Test::Unit::TestCase\r
- fixtures :reference_types, :reference_codes\r
- \r
- CLASSES = {\r
- :single => {\r
- :class => ReferenceType,\r
- :primary_keys => [:reference_type_id],\r
- },\r
- :dual => { \r
- :class => ReferenceCode,\r
- :primary_keys => [:reference_type_id, :reference_code],\r
- },\r
- :dual_strs => { \r
- :class => ReferenceCode,\r
- :primary_keys => ['reference_type_id', 'reference_code'],\r
- },\r
- }\r
- \r
- def setup\r
- self.class.classes = CLASSES\r
- end\r
- \r
- def test_find_first\r
- testing_with do\r
- obj = @klass.find(:first)\r
- assert obj\r
- assert_equal @klass, obj.class\r
- end\r
- end\r
- \r
- def test_find\r
- testing_with do\r
- found = @klass.find(*first_id) # e.g. find(1,1) or find 1,1\r
- assert found\r
- assert_equal @klass, found.class\r
- assert_equal found, @klass.find(found.id)\r
- assert_equal found, @klass.find(found.to_param)\r
- end\r
- end\r
- \r
- def test_find_composite_ids\r
- testing_with do\r
- found = @klass.find(first_id) # e.g. find([1,1].to_composite_ids)\r
- assert found\r
- assert_equal @klass, found.class\r
- assert_equal found, @klass.find(found.id)\r
- assert_equal found, @klass.find(found.to_param)\r
- end\r
- end\r
- \r
- def test_to_param\r
- testing_with do\r
- assert_equal first_id_str, @first.to_param.to_s\r
- end\r
- end\r
- \r
- def things_to_look_at\r
- testing_with do\r
- assert_equal found, @klass.find(found.id.to_s) # fails for 2+ keys\r
- end\r
- end\r
- \r
- def test_not_found\r
- assert_raise(::ActiveRecord::RecordNotFound) do\r
- ReferenceCode.send :find, '999,999'\r
- end\r
- end\r
-end
\ No newline at end of file
+++ /dev/null
-require 'abstract_unit'\r
-require 'fixtures/reference_type'\r
-require 'fixtures/reference_code'\r
-\r
-class TestIds < Test::Unit::TestCase\r
- fixtures :reference_types, :reference_codes\r
- \r
- CLASSES = {\r
- :single => {\r
- :class => ReferenceType,\r
- :primary_keys => [:reference_type_id],\r
- },\r
- :dual => { \r
- :class => ReferenceCode,\r
- :primary_keys => [:reference_type_id, :reference_code],\r
- },\r
- :dual_strs => { \r
- :class => ReferenceCode,\r
- :primary_keys => ['reference_type_id', 'reference_code'],\r
- },\r
- }\r
- \r
- def setup\r
- self.class.classes = CLASSES\r
- end\r
- \r
- def test_id\r
- testing_with do\r
- assert_equal @first.id, @first.ids if composite?\r
- end\r
- end\r
- \r
- def test_id_to_s\r
- testing_with do\r
- assert_equal first_id_str, @first.id.to_s\r
- assert_equal first_id_str, "#{@first.id}"\r
- end\r
- end\r
- \r
- def test_ids_to_s\r
- testing_with do\r
- order = @klass.primary_key.is_a?(String) ? @klass.primary_key : @klass.primary_key.join(',')\r
- to_test = @klass.find(:all, :order => order)[0..1].map(&:id)\r
- assert_equal '(1,1),(1,2)', @klass.ids_to_s(to_test) if @key_test == :dual\r
- assert_equal '1,1;1,2', @klass.ids_to_s(to_test, ',', ';', '', '') if @key_test == :dual\r
- end\r
- end\r
- \r
- def test_composite_where_clause\r
- testing_with do\r
- where = 'reference_codes.reference_type_id=1 AND reference_codes.reference_code=2) OR (reference_codes.reference_type_id=2 AND reference_codes.reference_code=2'\r
- assert_equal(where, @klass.composite_where_clause([[1, 2], [2, 2]])) if @key_test == :dual\r
- end\r
- end\r
- \r
- def test_set_ids_string\r
- testing_with do\r
- array = @primary_keys.collect {|key| 5}\r
- expected = composite? ? array.to_composite_keys : array.first\r
- @first.id = expected.to_s\r
- assert_equal expected, @first.id\r
- end\r
- end\r
- \r
- def test_set_ids_array\r
- testing_with do\r
- array = @primary_keys.collect {|key| 5}\r
- expected = composite? ? array.to_composite_keys : array.first\r
- @first.id = expected\r
- assert_equal expected, @first.id\r
- end\r
- end\r
- \r
- def test_set_ids_comp\r
- testing_with do\r
- array = @primary_keys.collect {|key| 5}\r
- expected = composite? ? array.to_composite_keys : array.first\r
- @first.id = expected\r
- assert_equal expected, @first.id\r
- end\r
- end\r
- \r
- def test_primary_keys\r
- testing_with do\r
- if composite?\r
- assert_not_nil @klass.primary_keys\r
- assert_equal @primary_keys.map {|key| key.to_sym}, @klass.primary_keys\r
- assert_equal @klass.primary_keys, @klass.primary_key\r
- else\r
- assert_not_nil @klass.primary_key\r
- assert_equal @primary_keys, [@klass.primary_key.to_sym]\r
- end\r
- assert_equal @primary_keys.join(','), @klass.primary_key.to_s\r
- # Need a :primary_keys should be Array with to_s overridden\r
- end\r
- end\r
-end
\ No newline at end of file
+++ /dev/null
-require 'abstract_unit'\r
-require 'fixtures/reference_type'\r
-require 'fixtures/reference_code'\r
-\r
-class TestMiscellaneous < Test::Unit::TestCase\r
- fixtures :reference_types, :reference_codes, :products\r
- \r
- CLASSES = {\r
- :single => {\r
- :class => ReferenceType,\r
- :primary_keys => :reference_type_id,\r
- },\r
- :dual => { \r
- :class => ReferenceCode,\r
- :primary_keys => [:reference_type_id, :reference_code],\r
- },\r
- }\r
- \r
- def setup\r
- self.class.classes = CLASSES\r
- end\r
-\r
- def test_composite_class\r
- testing_with do\r
- assert_equal composite?, @klass.composite?\r
- end\r
- end\r
-\r
- def test_composite_instance\r
- testing_with do\r
- assert_equal composite?, @first.composite?\r
- end\r
- end\r
- \r
- def test_count\r
- assert_equal 2, Product.count\r
- end\r
- \r
-end
\ No newline at end of file
+++ /dev/null
-require 'abstract_unit'\r
-require 'fixtures/reference_type'\r
-require 'fixtures/reference_code'\r
-require 'plugins/pagination'\r
-\r
-class TestPagination < Test::Unit::TestCase\r
- fixtures :reference_types, :reference_codes\r
- \r
- include ActionController::Pagination\r
- DEFAULT_PAGE_SIZE = 2\r
- \r
- attr_accessor :params\r
- \r
- CLASSES = {\r
- :single => {\r
- :class => ReferenceType,\r
- :primary_keys => :reference_type_id,\r
- :table => :reference_types,\r
- },\r
- :dual => { \r
- :class => ReferenceCode,\r
- :primary_keys => [:reference_type_id, :reference_code],\r
- :table => :reference_codes,\r
- },\r
- }\r
- \r
- def setup\r
- self.class.classes = CLASSES\r
- @params = {}\r
- end\r
-\r
- def test_paginate_all\r
- testing_with do\r
- @object_pages, @objects = paginate @klass_info[:table], :per_page => DEFAULT_PAGE_SIZE\r
- assert_equal 2, @objects.length, "Each page should have #{DEFAULT_PAGE_SIZE} items"\r
- end\r
- end\r
-end
\ No newline at end of file
+++ /dev/null
-require 'abstract_unit'
-require 'fixtures/comment'
-require 'fixtures/user'
-require 'fixtures/employee'
-require 'fixtures/hack'
-
-class TestPolymorphic < Test::Unit::TestCase
- fixtures :users, :employees, :comments, :hacks
-
- def test_polymorphic_has_many
- comments = Hack.find('andrew').comments
- assert_equal 'andrew', comments[0].person_id
- end
-
- def test_polymorphic_has_one
- first_comment = Hack.find('andrew').first_comment
- assert_equal 'andrew', first_comment.person_id
- end
-
- def test_has_many_through
- user = users(:santiago)
- article_names = user.articles.collect { |a| a.name }.sort
- assert_equal ['Article One', 'Article Two'], article_names
- end
-
- def test_polymorphic_has_many_through
- user = users(:santiago)
- assert_equal ['andrew'], user.hacks.collect { |a| a.name }.sort
- end
-
-end
+++ /dev/null
-# Test cases devised by Santiago that broke the Composite Primary Keys\r
-# code at one point in time. But no more!!!\r
-\r
-require 'abstract_unit'\r
-require 'fixtures/user'\r
-require 'fixtures/article'\r
-require 'fixtures/reading'\r
-\r
-class TestSantiago < Test::Unit::TestCase\r
- fixtures :suburbs, :streets, :users, :articles, :readings\r
- \r
- def test_normal_and_composite_associations\r
- assert_not_nil @suburb = Suburb.find(1,1)\r
- assert_equal 1, @suburb.streets.length\r
- \r
- assert_not_nil @street = Street.find(1)\r
- assert_not_nil @street.suburb\r
- end\r
- \r
- def test_single_keys\r
- @santiago = User.find(1)\r
- assert_not_nil @santiago.articles\r
- assert_equal 2, @santiago.articles.length\r
- assert_not_nil @santiago.readings\r
- assert_equal 2, @santiago.readings.length\r
- end\r
-end\r
+++ /dev/null
-require 'abstract_unit'
-require 'fixtures/user'
-require 'fixtures/group'
-require 'fixtures/membership_status'
-require 'fixtures/membership'
-
-class TestTutorialExample < Test::Unit::TestCase
- fixtures :users, :groups, :memberships, :membership_statuses
-
- def test_membership
- assert(membership = Membership.find(1,1), "Cannot find a membership")
- assert(membership.user)
- assert(membership.group)
- end
-
- def test_status
- assert(membership = Membership.find(1,1), "Cannot find a membership")
- assert(statuses = membership.statuses, "No has_many association to status")
- assert_equal(membership, statuses.first.membership)
- end
-
- def test_count
- assert(membership = Membership.find(1,1), "Cannot find a membership")
- assert_equal(1, membership.statuses.count)
- end
-end
\ No newline at end of file
+++ /dev/null
-require 'abstract_unit'\r
-require 'fixtures/reference_type'\r
-require 'fixtures/reference_code'\r
-\r
-class TestUpdate < Test::Unit::TestCase\r
- fixtures :reference_types, :reference_codes\r
- \r
- CLASSES = {\r
- :single => {\r
- :class => ReferenceType,\r
- :primary_keys => :reference_type_id,\r
- :update => { :description => 'RT Desc' },\r
- },\r
- :dual => { \r
- :class => ReferenceCode,\r
- :primary_keys => [:reference_type_id, :reference_code],\r
- :update => { :description => 'RT Desc' },\r
- },\r
- }\r
- \r
- def setup\r
- self.class.classes = CLASSES\r
- end\r
- \r
- def test_setup\r
- testing_with do\r
- assert_not_nil @klass_info[:update]\r
- end\r
- end\r
- \r
- def test_update_attributes\r
- testing_with do\r
- assert @first.update_attributes(@klass_info[:update])\r
- assert @first.reload\r
- @klass_info[:update].each_pair do |attr_name, new_value|\r
- assert_equal new_value, @first[attr_name], "Attribute #{attr_name} is incorrect"\r
- end\r
- end\r
- end\r
-end
\ No newline at end of file
+++ /dev/null
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
- <link rel="stylesheet" href="stylesheets/screen.css" type="text/css" media="screen" />
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title>
- Composite Primary Keys
- </title>
- <script src="javascripts/rounded_corners_lite.inc.js" type="text/javascript"></script>
-<style>
-
-</style>
- <script type="text/javascript">
- window.onload = function() {
- settings = {
- tl: { radius: 10 },
- tr: { radius: 10 },
- bl: { radius: 10 },
- br: { radius: 10 },
- antiAlias: true,
- autoPad: true,
- validTags: ["div"]
- }
- var versionBox = new curvyCorners(settings, document.getElementById("version"));
- versionBox.applyCornersToAll();
- }
- </script>
-</head>
-<body>
-<div id="main">
-
- <h1>Composite Primary Keys</h1>
- <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/compositekeys"; return false'>
- Get Version
- <a href="http://rubyforge.org/projects/compositekeys" class="numbers">1.1.0</a>
- </div>
- <h1>&#x2192; Ruby on Rails</h1>
-<h1>&#x2192; ActiveRecords</h1>
-<h2>What</h2>
-<p>Ruby on Rails does not support composite primary keys. This free software is an extension <br />
-to the database layer of Rails – <a href="http://wiki.rubyonrails.com/rails/pages/ActiveRecord">ActiveRecords</a> – to support composite primary keys as transparently as possible.</p>
-<p>Any Ruby script using ActiveRecords can use Composite Primary Keys with this library.</p>
-<h2>Installing</h2>
-<p><pre class="syntax"><span class="ident">sudo</span> <span class="ident">gem</span> <span class="ident">install</span> <span class="ident">composite_primary_keys</span></pre></p>
-<p>Rails: Add the following to the bottom of your <code>environment.rb</code> file</p>
-<p><pre class="syntax"><span class="ident">require</span> <span class="punct">'</span><span class="string">composite_primary_keys</span><span class="punct">'</span></pre></p>
-<p>Ruby scripts: Add the following to the top of your script</p>
-<p><pre class="syntax"><span class="ident">require</span> <span class="punct">'</span><span class="string">rubygems</span><span class="punct">'</span>
-<span class="ident">require</span> <span class="punct">'</span><span class="string">composite_primary_keys</span><span class="punct">'</span></pre></p>
-<h2>The basics</h2>
-<p>A model with composite primary keys would look like…</p>
-<p><pre class="syntax"><span class="keyword">class </span><span class="class">Membership</span> <span class="punct"><</span> <span class="constant">ActiveRecord</span><span class="punct">::</span><span class="constant">Base</span>
- <span class="comment"># set_primary_keys *keys - turns on composite key functionality</span>
- <span class="ident">set_primary_keys</span> <span class="symbol">:user_id</span><span class="punct">,</span> <span class="symbol">:group_id</span>
- <span class="ident">belongs_to</span> <span class="symbol">:user</span>
- <span class="ident">belongs_to</span> <span class="symbol">:group</span>
- <span class="ident">has_many</span> <span class="symbol">:statuses</span><span class="punct">,</span> <span class="symbol">:class_name</span> <span class="punct">=></span> <span class="punct">'</span><span class="string">MembershipStatus</span><span class="punct">',</span> <span class="symbol">:foreign_key</span> <span class="punct">=></span> <span class="punct">[</span><span class="symbol">:user_id</span><span class="punct">,</span> <span class="symbol">:group_id</span><span class="punct">]</span>
-<span class="keyword">end</span></pre></p>
-<p>A model associated with a composite key model would be defined like…</p>
-<p><pre class="syntax"><span class="keyword">class </span><span class="class">MembershipStatus</span> <span class="punct"><</span> <span class="constant">ActiveRecord</span><span class="punct">::</span><span class="constant">Base</span>
- <span class="ident">belongs_to</span> <span class="symbol">:membership</span><span class="punct">,</span> <span class="symbol">:foreign_key</span> <span class="punct">=></span> <span class="punct">[</span><span class="symbol">:user_id</span><span class="punct">,</span> <span class="symbol">:group_id</span><span class="punct">]</span>
-<span class="keyword">end</span></pre></p>
-<p>That is, associations can include composite keys too. Nice.</p>
-<h2>Demonstration of usage</h2>
-<p>Once you’ve created your models to specify composite primary keys (such as the Membership class) and associations (such as MembershipStatus#membership), you can uses them like any normal model with associations.</p>
-<p>But first, lets check out our primary keys.</p>
-<p><pre class="syntax"><span class="constant">MembershipStatus</span><span class="punct">.</span><span class="ident">primary_key</span> <span class="comment"># => "id" # normal single key</span>
-<span class="constant">Membership</span><span class="punct">.</span><span class="ident">primary_key</span> <span class="comment"># => [:user_id, :group_id] # composite keys</span>
-<span class="constant">Membership</span><span class="punct">.</span><span class="ident">primary_key</span><span class="punct">.</span><span class="ident">to_s</span> <span class="comment"># => "user_id,group_id"</span></pre></p>
-<p>Now we want to be able to find instances using the same syntax we always use for ActiveRecords…</p>
-<p><pre class="syntax"><span class="constant">MembershipStatus</span><span class="punct">.</span><span class="ident">find</span><span class="punct">(</span><span class="number">1</span><span class="punct">)</span> <span class="comment"># single id returns single instance</span>
-<span class="punct">=></span> <span class="punct"><</span><span class="constant">MembershipStatus</span><span class="punct">:</span><span class="number">0x392a8c8</span> <span class="attribute">@attributes</span><span class="punct">={"</span><span class="string">id</span><span class="punct">"=>"</span><span class="string">1</span><span class="punct">",</span> <span class="punct">"</span><span class="string">status</span><span class="punct">"=>"</span><span class="string">Active</span><span class="punct">"}></span>
-<span class="constant">Membership</span><span class="punct">.</span><span class="ident">find</span><span class="punct">(</span><span class="number">1</span><span class="punct">,</span><span class="number">1</span><span class="punct">)</span> <span class="comment"># composite ids returns single instance</span>
-<span class="punct">=></span> <span class="punct"><</span><span class="constant">Membership</span><span class="punct">:</span><span class="number">0x39218b0</span> <span class="attribute">@attributes</span><span class="punct">={"</span><span class="string">user_id</span><span class="punct">"=>"</span><span class="string">1</span><span class="punct">",</span> <span class="punct">"</span><span class="string">group_id</span><span class="punct">"=>"</span><span class="string">1</span><span class="punct">"}></span></pre></p>
-<p>Using <a href="http://www.rubyonrails.org">Ruby on Rails</a>? You’ll want to your url_for helpers<br />
-to convert composite keys into strings and back again…</p>
-<p><pre class="syntax"><span class="constant">Membership</span><span class="punct">.</span><span class="ident">find</span><span class="punct">(</span><span class="symbol">:first</span><span class="punct">).</span><span class="ident">to_param</span> <span class="comment"># => "1,1"</span></pre></p>
-<p>And then use the string id within your controller to find the object again</p>
-<p><pre class="syntax"><span class="ident">params</span><span class="punct">[</span><span class="symbol">:id</span><span class="punct">]</span> <span class="comment"># => '1,1'</span>
-<span class="constant">Membership</span><span class="punct">.</span><span class="ident">find</span><span class="punct">(</span><span class="ident">params</span><span class="punct">[</span><span class="symbol">:id</span><span class="punct">])</span>
-<span class="punct">=></span> <span class="punct"><</span><span class="constant">Membership</span><span class="punct">:</span><span class="number">0x3904288</span> <span class="attribute">@attributes</span><span class="punct">={"</span><span class="string">user_id</span><span class="punct">"=>"</span><span class="string">1</span><span class="punct">",</span> <span class="punct">"</span><span class="string">group_id</span><span class="punct">"=>"</span><span class="string">1</span><span class="punct">"}></span></pre></p>
-<p>That is, an ActiveRecord supporting composite keys behaves transparently<br />
-throughout your application. Just like a normal ActiveRecord.</p>
-<h2>Other tricks</h2>
-<h3>Pass a list of composite ids to the <code>#find</code> method</h3>
-<p><pre class="syntax"><span class="constant">Membership</span><span class="punct">.</span><span class="ident">find</span> <span class="punct">[</span><span class="number">1</span><span class="punct">,</span><span class="number">1</span><span class="punct">],</span> <span class="punct">[</span><span class="number">2</span><span class="punct">,</span><span class="number">1</span><span class="punct">]</span>
-<span class="punct">=></span> <span class="punct">[</span>
- <span class="punct"><</span><span class="constant">Membership</span><span class="punct">:</span><span class="number">0x394ade8</span> <span class="attribute">@attributes</span><span class="punct">={"</span><span class="string">user_id</span><span class="punct">"=>"</span><span class="string">1</span><span class="punct">",</span> <span class="punct">"</span><span class="string">group_id</span><span class="punct">"=>"</span><span class="string">1</span><span class="punct">"}>,</span>
- <span class="punct"><</span><span class="constant">Membership</span><span class="punct">:</span><span class="number">0x394ada0</span> <span class="attribute">@attributes</span><span class="punct">={"</span><span class="string">user_id</span><span class="punct">"=>"</span><span class="string">2</span><span class="punct">",</span> <span class="punct">"</span><span class="string">group_id</span><span class="punct">"=>"</span><span class="string">1</span><span class="punct">"}></span>
-<span class="punct">]</span></pre></p>
-<p>Perform <code>#count</code> operations</p>
-<p><pre class="syntax"><span class="constant">MembershipStatus</span><span class="punct">.</span><span class="ident">find</span><span class="punct">(</span><span class="symbol">:first</span><span class="punct">).</span><span class="ident">memberships</span><span class="punct">.</span><span class="ident">count</span> <span class="comment"># => 1</span></pre></p>
-<h3>Routes with Rails</h3>
-<p>From Pete Sumskas:</p>
-<blockquote>
-<p>I ran into one problem that I didn’t see mentioned on <a href="http://groups.google.com/group/compositekeys">this list</a> – <br />
- and I didn’t see any information about what I should do to address it in the<br />
- documentation (might have missed it).</p>
-<p>The problem was that the urls being generated for a ‘show’ action (for<br />
- example) had a syntax like:<br />
- <br />
- <pre>/controller/show/123000,Bu70</pre></p>
-<p>for a two-field composite PK. The default routing would not match that,<br />
- so after working out how to do the routing I added:<br />
- <br />
- <pre class="syntax"><span class="ident">map</span><span class="punct">.</span><span class="ident">connect</span> <span class="punct">'</span><span class="string">:controller/:action/:id</span><span class="punct">',</span> <span class="symbol">:id</span> <span class="punct">=></span> <span class="punct">/</span><span class="regex"><span class="escape">\w</span>+(,<span class="escape">\w</span>+)*</span><span class="punct">/</span></pre><br />
- <br />
- to my <code>route.rb</code> file.</p>
-</blockquote>
-<p><a name="dbs"></a></p>
-<h2>Which databases?</h2>
-<p>A suite of unit tests have been run on the following databases supported by ActiveRecord:</p>
-<table>
- <tr>
- <th>Database</th>
- <th>Test Success</th>
- <th>User feedback</th>
- </tr>
- <tr>
- <td>mysql </td>
- <td><span class=success><span class="caps">YES</span></span></td>
- <td><span class=success><span class="caps">YES</span></span> (<a href="mailto:compositekeys@googlegroups.com?subject=Mysql+is+working">Yes!</a> or <a href="mailto:compositekeys@googlegroups.com?subject=Mysql+is+failing">No…</a>)</td>
- </tr>
- <tr>
- <td>sqlite3 </td>
- <td><span class=success><span class="caps">YES</span></span></td>
- <td><span class=success><span class="caps">YES</span></span> (<a href="mailto:compositekeys@googlegroups.com?subject=Sqlite3+is+working">Yes!</a> or <a href="mailto:compositekeys@googlegroups.com?subject=Sqlite3+is+failing">No…</a>)</td>
- </tr>
- <tr>
- <td>postgresql</td>
- <td><span class=success><span class="caps">YES</span></span></td>
- <td><span class=success><span class="caps">YES</span></span> (<a href="mailto:compositekeys@googlegroups.com?subject=Postgresql+is+working">Yes!</a> or <a href="mailto:compositekeys@googlegroups.com?subject=Postgresql+is+failing">No…</a>)</td>
- </tr>
- <tr>
- <td>oracle </td>
- <td><span class=success><span class="caps">YES</span></span></td>
- <td><span class=success><span class="caps">YES</span></span> (<a href="mailto:compositekeys@googlegroups.com?subject=Oracle+is+working">Yes!</a> or <a href="mailto:compositekeys@googlegroups.com?subject=Oracle+is+failing">No…</a>)</td>
- </tr>
- <tr>
- <td>sqlserver </td>
- <td><span class=unknown>???</span> (<a href="mailto:compositekeys@googlegroups.com?subject=Help+with+SQLServer">I can help</a>)</td>
- <td><span class=unknown>???</span> (<a href="mailto:compositekeys@googlegroups.com?subject=SQLServer+is+working">Yes!</a> or <a href="mailto:compositekeys@googlegroups.com?subject=SQLServer+is+failing">No…</a>)</td>
- </tr>
- <tr>
- <td>db2 </td>
- <td><span class=unknown>???</span> (<a href="mailto:compositekeys@googlegroups.com?subject=Help+with+DB2">I can help</a>)</td>
- <td><span class=unknown>???</span> (<a href="mailto:compositekeys@googlegroups.com?subject=DB2+is+working">Yes!</a> or <a href="mailto:compositekeys@googlegroups.com?subject=DB2+is+failing">No…</a>)</td>
- </tr>
- <tr>
- <td>firebird </td>
- <td><span class=unknown>???</span> (<a href="mailto:compositekeys@googlegroups.com?subject=Help+with+Firebird">I can help</a>)</td>
- <td><span class=unknown>???</span> (<a href="mailto:compositekeys@googlegroups.com?subject=Firebird+is+working">Yes!</a> or <a href="mailto:compositekeys@googlegroups.com?subject=Firebird+is+failing">No…</a>)</td>
- </tr>
- <tr>
- <td>sybase </td>
- <td><span class=unknown>???</span> (<a href="mailto:compositekeys@googlegroups.com?subject=Help+with+Sybase">I can help</a>)</td>
- <td><span class=unknown>???</span> (<a href="mailto:compositekeys@googlegroups.com?subject=Sybase+is+working">Yes!</a> or <a href="mailto:compositekeys@googlegroups.com?subject=Sybase+is+failing">No…</a>)</td>
- </tr>
- <tr>
- <td>openbase </td>
- <td><span class=unknown>???</span> (<a href="mailto:compositekeys@googlegroups.com?subject=Help+with+Openbase">I can help</a>)</td>
- <td><span class=unknown>???</span> (<a href="mailto:compositekeys@googlegroups.com?subject=Openbase+is+working">Yes!</a> or <a href="mailto:compositekeys@googlegroups.com?subject=Openbase+is+failing">No…</a>)</td>
- </tr>
- <tr>
- <td>frontbase </td>
- <td><span class=unknown>???</span> (<a href="mailto:compositekeys@googlegroups.com?subject=Help+with+Frontbase">I can help</a>)</td>
- <td><span class=unknown>???</span> (<a href="mailto:compositekeys@googlegroups.com?subject=Frontbase+is+working">Yes!</a> or <a href="mailto:compositekeys@googlegroups.com?subject=Frontbase+is+failing">No…</a>)</td>
- </tr>
-</table>
-<h2>Dr Nic’s Blog</h2>
-<p><a href="http://www.drnicwilliams.com">http://www.drnicwilliams.com</a> – for future announcements and<br />
-other stories and things.</p>
-<h2>Forum</h2>
-<p><a href="http://groups.google.com/group/compositekeys">http://groups.google.com/group/compositekeys</a></p>
-<h2>How to submit patches</h2>
-<p>Read the <a href="http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/">8 steps for fixing other people’s code</a> and for section <a href="http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/#8b-google-groups">8b: Submit patch to Google Groups</a>, use the Google Group above.</p>
-<p>The source for this project is available via git. You can <a href="http://github.com/drnic/composite_primary_keys/tree/master">browse and/or fork the source</a>, or to clone the project locally:<br />
- <br />
-<pre>git clone git://github.com/drnic/composite_primary_keys.git</pre></p>
-<h2>Licence</h2>
-<p>This code is free to use under the terms of the <span class="caps">MIT</span> licence.</p>
-<h2>Contact</h2>
-<p>Comments are welcome. Send an email to <a href="mailto:drnicwilliams@gmail.com">Dr Nic Williams</a>.</p>
- <p class="coda">
- <a href="mailto:drnicwilliams@gmail.com">Dr Nic</a>, 25th October 2008<br>
- Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
- </p>
-</div>
-
-<script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
-</script>
-<script type="text/javascript">
-_uacct = "UA-567811-2";
-urchinTracker();
-</script>
-
-</body>
-</html>
+++ /dev/null
-h1. Composite Primary Keys
-
-h1. → Ruby on Rails
-
-h1. → ActiveRecords
-
-h2. What
-
-Ruby on Rails does not support composite primary keys. This free software is an extension
-to the database layer of Rails - "ActiveRecords":http://wiki.rubyonrails.com/rails/pages/ActiveRecord - to support composite primary keys as transparently as possible.
-
-Any Ruby script using ActiveRecords can use Composite Primary Keys with this library.
-
-h2. Installing
-
-<pre syntax="ruby">sudo gem install composite_primary_keys</pre>
-
-Rails: Add the following to the bottom of your <code>environment.rb</code> file
-
-<pre syntax="ruby">require 'composite_primary_keys'</pre>
-
-Ruby scripts: Add the following to the top of your script
-
-<pre syntax="ruby">require 'rubygems'
-require 'composite_primary_keys'</pre>
-
-h2. The basics
-
-A model with composite primary keys would look like...
-
-<pre syntax="ruby">class Membership < ActiveRecord::Base
- # set_primary_keys *keys - turns on composite key functionality
- set_primary_keys :user_id, :group_id
- belongs_to :user
- belongs_to :group
- has_many :statuses, :class_name => 'MembershipStatus', :foreign_key => [:user_id, :group_id]
-end</pre>
-
-A model associated with a composite key model would be defined like...
-
-<pre syntax="ruby">class MembershipStatus < ActiveRecord::Base
- belongs_to :membership, :foreign_key => [:user_id, :group_id]
-end</pre>
-
-That is, associations can include composite keys too. Nice.
-
-h2. Demonstration of usage
-
-Once you've created your models to specify composite primary keys (such as the Membership class) and associations (such as MembershipStatus#membership), you can uses them like any normal model with associations.
-
-But first, lets check out our primary keys.
-
-<pre syntax="ruby">MembershipStatus.primary_key # => "id" # normal single key
-Membership.primary_key # => [:user_id, :group_id] # composite keys
-Membership.primary_key.to_s # => "user_id,group_id"</pre>
-
-Now we want to be able to find instances using the same syntax we always use for ActiveRecords...
-
-<pre syntax="ruby">MembershipStatus.find(1) # single id returns single instance
-=> <MembershipStatus:0x392a8c8 @attributes={"id"=>"1", "status"=>"Active"}>
-Membership.find(1,1) # composite ids returns single instance
-=> <Membership:0x39218b0 @attributes={"user_id"=>"1", "group_id"=>"1"}></pre>
-
-Using "Ruby on Rails":http://www.rubyonrails.org? You'll want to your url_for helpers
-to convert composite keys into strings and back again...
-
-<pre syntax="ruby">Membership.find(:first).to_param # => "1,1"</pre>
-
-And then use the string id within your controller to find the object again
-
-<pre syntax="ruby">params[:id] # => '1,1'
-Membership.find(params[:id])
-=> <Membership:0x3904288 @attributes={"user_id"=>"1", "group_id"=>"1"}></pre>
-
-That is, an ActiveRecord supporting composite keys behaves transparently
-throughout your application. Just like a normal ActiveRecord.
-
-
-h2. Other tricks
-
-h3. Pass a list of composite ids to the <code>#find</code> method
-
-<pre syntax="ruby">Membership.find [1,1], [2,1]
-=> [
- <Membership:0x394ade8 @attributes={"user_id"=>"1", "group_id"=>"1"}>,
- <Membership:0x394ada0 @attributes={"user_id"=>"2", "group_id"=>"1"}>
-]</pre>
-
-Perform <code>#count</code> operations
-
-<pre syntax="ruby">MembershipStatus.find(:first).memberships.count # => 1</pre>
-
-h3. Routes with Rails
-
-From Pete Sumskas:
-
-<blockquote>
- I ran into one problem that I didn't see mentioned on "this list":http://groups.google.com/group/compositekeys -
- and I didn't see any information about what I should do to address it in the
- documentation (might have missed it).
-
- The problem was that the urls being generated for a 'show' action (for
- example) had a syntax like:
-
- <pre>/controller/show/123000,Bu70</pre>
-
- for a two-field composite PK. The default routing would not match that,
- so after working out how to do the routing I added:
-
- <pre syntax="ruby">map.connect ':controller/:action/:id', :id => /\w+(,\w+)*/</pre>
-
- to my <code>route.rb</code> file.
-
-</blockquote>
-
-<a name="dbs"></a>
-
-h2. Which databases?
-
-
-A suite of unit tests have been run on the following databases supported by ActiveRecord:
-
-|_.Database|_.Test Success|_.User feedback|
-|mysql |<span class=success>YES</span>|<span class=success>YES</span> ("Yes!":mailto:compositekeys@googlegroups.com?subject=Mysql+is+working or "No...":mailto:compositekeys@googlegroups.com?subject=Mysql+is+failing)|
-|sqlite3 |<span class=success>YES</span>|<span class=success>YES</span> ("Yes!":mailto:compositekeys@googlegroups.com?subject=Sqlite3+is+working or "No...":mailto:compositekeys@googlegroups.com?subject=Sqlite3+is+failing)|
-|postgresql|<span class=success>YES</span>|<span class=success>YES</span> ("Yes!":mailto:compositekeys@googlegroups.com?subject=Postgresql+is+working or "No...":mailto:compositekeys@googlegroups.com?subject=Postgresql+is+failing)|
-|oracle |<span class=success>YES</span>|<span class=success>YES</span> ("Yes!":mailto:compositekeys@googlegroups.com?subject=Oracle+is+working or "No...":mailto:compositekeys@googlegroups.com?subject=Oracle+is+failing)|
-|sqlserver |<span class=unknown>???</span> ("I can help":mailto:compositekeys@googlegroups.com?subject=Help+with+SQLServer)|<span class=unknown>???</span> ("Yes!":mailto:compositekeys@googlegroups.com?subject=SQLServer+is+working or "No...":mailto:compositekeys@googlegroups.com?subject=SQLServer+is+failing)|
-|db2 |<span class=unknown>???</span> ("I can help":mailto:compositekeys@googlegroups.com?subject=Help+with+DB2)|<span class=unknown>???</span> ("Yes!":mailto:compositekeys@googlegroups.com?subject=DB2+is+working or "No...":mailto:compositekeys@googlegroups.com?subject=DB2+is+failing)|
-|firebird |<span class=unknown>???</span> ("I can help":mailto:compositekeys@googlegroups.com?subject=Help+with+Firebird)|<span class=unknown>???</span> ("Yes!":mailto:compositekeys@googlegroups.com?subject=Firebird+is+working or "No...":mailto:compositekeys@googlegroups.com?subject=Firebird+is+failing)|
-|sybase |<span class=unknown>???</span> ("I can help":mailto:compositekeys@googlegroups.com?subject=Help+with+Sybase)|<span class=unknown>???</span> ("Yes!":mailto:compositekeys@googlegroups.com?subject=Sybase+is+working or "No...":mailto:compositekeys@googlegroups.com?subject=Sybase+is+failing)|
-|openbase |<span class=unknown>???</span> ("I can help":mailto:compositekeys@googlegroups.com?subject=Help+with+Openbase)|<span class=unknown>???</span> ("Yes!":mailto:compositekeys@googlegroups.com?subject=Openbase+is+working or "No...":mailto:compositekeys@googlegroups.com?subject=Openbase+is+failing)|
-|frontbase |<span class=unknown>???</span> ("I can help":mailto:compositekeys@googlegroups.com?subject=Help+with+Frontbase)|<span class=unknown>???</span> ("Yes!":mailto:compositekeys@googlegroups.com?subject=Frontbase+is+working or "No...":mailto:compositekeys@googlegroups.com?subject=Frontbase+is+failing)|
-
-h2. Dr Nic's Blog
-
-"http://www.drnicwilliams.com":http://www.drnicwilliams.com - for future announcements and
-other stories and things.
-
-h2. Forum
-
-"http://groups.google.com/group/compositekeys":http://groups.google.com/group/compositekeys
-
-h2. How to submit patches
-
-Read the "8 steps for fixing other people's code":http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/ and for section "8b: Submit patch to Google Groups":http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/#8b-google-groups, use the Google Group above.
-
-
-The source for this project is available via git. You can "browse and/or fork the source":http://github.com/drnic/composite_primary_keys/tree/master, or to clone the project locally:
-
-<pre>git clone git://github.com/drnic/composite_primary_keys.git</pre>
-
-h2. Licence
-
-This code is free to use under the terms of the MIT licence.
-
-h2. Contact
-
-Comments are welcome. Send an email to "Dr Nic Williams":mailto:drnicwilliams@gmail.com.
+++ /dev/null
-
- /****************************************************************
- * *
- * curvyCorners *
- * ------------ *
- * *
- * This script generates rounded corners for your divs. *
- * *
- * Version 1.2.9 *
- * Copyright (c) 2006 Cameron Cooke *
- * By: Cameron Cooke and Tim Hutchison. *
- * *
- * *
- * Website: http://www.curvycorners.net *
- * Email: info@totalinfinity.com *
- * Forum: http://www.curvycorners.net/forum/ *
- * *
- * *
- * This library is free software; you can redistribute *
- * it and/or modify it under the terms of the GNU *
- * Lesser General Public License as published by the *
- * Free Software Foundation; either version 2.1 of the *
- * License, or (at your option) any later version. *
- * *
- * This library is distributed in the hope that it will *
- * be useful, but WITHOUT ANY WARRANTY; without even the *
- * implied warranty of MERCHANTABILITY or FITNESS FOR A *
- * PARTICULAR PURPOSE. See the GNU Lesser General Public *
- * License for more details. *
- * *
- * You should have received a copy of the GNU Lesser *
- * General Public License along with this library; *
- * Inc., 59 Temple Place, Suite 330, Boston, *
- * MA 02111-1307 USA *
- * *
- ****************************************************************/
-
-var isIE = navigator.userAgent.toLowerCase().indexOf("msie") > -1; var isMoz = document.implementation && document.implementation.createDocument; var isSafari = ((navigator.userAgent.toLowerCase().indexOf('safari')!=-1)&&(navigator.userAgent.toLowerCase().indexOf('mac')!=-1))?true:false; function curvyCorners()
-{ if(typeof(arguments[0]) != "object") throw newCurvyError("First parameter of curvyCorners() must be an object."); if(typeof(arguments[1]) != "object" && typeof(arguments[1]) != "string") throw newCurvyError("Second parameter of curvyCorners() must be an object or a class name."); if(typeof(arguments[1]) == "string")
-{ var startIndex = 0; var boxCol = getElementsByClass(arguments[1]);}
-else
-{ var startIndex = 1; var boxCol = arguments;}
-var curvyCornersCol = new Array(); if(arguments[0].validTags)
-var validElements = arguments[0].validTags; else
-var validElements = ["div"]; for(var i = startIndex, j = boxCol.length; i < j; i++)
-{ var currentTag = boxCol[i].tagName.toLowerCase(); if(inArray(validElements, currentTag) !== false)
-{ curvyCornersCol[curvyCornersCol.length] = new curvyObject(arguments[0], boxCol[i]);}
-}
-this.objects = curvyCornersCol; this.applyCornersToAll = function()
-{ for(var x = 0, k = this.objects.length; x < k; x++)
-{ this.objects[x].applyCorners();}
-}
-}
-function curvyObject()
-{ this.box = arguments[1]; this.settings = arguments[0]; this.topContainer = null; this.bottomContainer = null; this.masterCorners = new Array(); this.contentDIV = null; var boxHeight = get_style(this.box, "height", "height"); var boxWidth = get_style(this.box, "width", "width"); var borderWidth = get_style(this.box, "borderTopWidth", "border-top-width"); var borderColour = get_style(this.box, "borderTopColor", "border-top-color"); var boxColour = get_style(this.box, "backgroundColor", "background-color"); var backgroundImage = get_style(this.box, "backgroundImage", "background-image"); var boxPosition = get_style(this.box, "position", "position"); var boxPadding = get_style(this.box, "paddingTop", "padding-top"); this.boxHeight = parseInt(((boxHeight != "" && boxHeight != "auto" && boxHeight.indexOf("%") == -1)? boxHeight.substring(0, boxHeight.indexOf("px")) : this.box.scrollHeight)); this.boxWidth = parseInt(((boxWidth != "" && boxWidth != "auto" && boxWidth.indexOf("%") == -1)? boxWidth.substring(0, boxWidth.indexOf("px")) : this.box.scrollWidth)); this.borderWidth = parseInt(((borderWidth != "" && borderWidth.indexOf("px") !== -1)? borderWidth.slice(0, borderWidth.indexOf("px")) : 0)); this.boxColour = format_colour(boxColour); this.boxPadding = parseInt(((boxPadding != "" && boxPadding.indexOf("px") !== -1)? boxPadding.slice(0, boxPadding.indexOf("px")) : 0)); this.borderColour = format_colour(borderColour); this.borderString = this.borderWidth + "px" + " solid " + this.borderColour; this.backgroundImage = ((backgroundImage != "none")? backgroundImage : ""); this.boxContent = this.box.innerHTML; if(boxPosition != "absolute") this.box.style.position = "relative"; this.box.style.padding = "0px"; if(isIE && boxWidth == "auto" && boxHeight == "auto") this.box.style.width = "100%"; if(this.settings.autoPad == true && this.boxPadding > 0)
-this.box.innerHTML = ""; this.applyCorners = function()
-{ for(var t = 0; t < 2; t++)
-{ switch(t)
-{ case 0:
-if(this.settings.tl || this.settings.tr)
-{ var newMainContainer = document.createElement("DIV"); newMainContainer.style.width = "100%"; newMainContainer.style.fontSize = "1px"; newMainContainer.style.overflow = "hidden"; newMainContainer.style.position = "absolute"; newMainContainer.style.paddingLeft = this.borderWidth + "px"; newMainContainer.style.paddingRight = this.borderWidth + "px"; var topMaxRadius = Math.max(this.settings.tl ? this.settings.tl.radius : 0, this.settings.tr ? this.settings.tr.radius : 0); newMainContainer.style.height = topMaxRadius + "px"; newMainContainer.style.top = 0 - topMaxRadius + "px"; newMainContainer.style.left = 0 - this.borderWidth + "px"; this.topContainer = this.box.appendChild(newMainContainer);}
-break; case 1:
-if(this.settings.bl || this.settings.br)
-{ var newMainContainer = document.createElement("DIV"); newMainContainer.style.width = "100%"; newMainContainer.style.fontSize = "1px"; newMainContainer.style.overflow = "hidden"; newMainContainer.style.position = "absolute"; newMainContainer.style.paddingLeft = this.borderWidth + "px"; newMainContainer.style.paddingRight = this.borderWidth + "px"; var botMaxRadius = Math.max(this.settings.bl ? this.settings.bl.radius : 0, this.settings.br ? this.settings.br.radius : 0); newMainContainer.style.height = botMaxRadius + "px"; newMainContainer.style.bottom = 0 - botMaxRadius + "px"; newMainContainer.style.left = 0 - this.borderWidth + "px"; this.bottomContainer = this.box.appendChild(newMainContainer);}
-break;}
-}
-if(this.topContainer) this.box.style.borderTopWidth = "0px"; if(this.bottomContainer) this.box.style.borderBottomWidth = "0px"; var corners = ["tr", "tl", "br", "bl"]; for(var i in corners)
-{ if(i > -1 < 4)
-{ var cc = corners[i]; if(!this.settings[cc])
-{ if(((cc == "tr" || cc == "tl") && this.topContainer != null) || ((cc == "br" || cc == "bl") && this.bottomContainer != null))
-{ var newCorner = document.createElement("DIV"); newCorner.style.position = "relative"; newCorner.style.fontSize = "1px"; newCorner.style.overflow = "hidden"; if(this.backgroundImage == "")
-newCorner.style.backgroundColor = this.boxColour; else
-newCorner.style.backgroundImage = this.backgroundImage; switch(cc)
-{ case "tl":
-newCorner.style.height = topMaxRadius - this.borderWidth + "px"; newCorner.style.marginRight = this.settings.tr.radius - (this.borderWidth*2) + "px"; newCorner.style.borderLeft = this.borderString; newCorner.style.borderTop = this.borderString; newCorner.style.left = -this.borderWidth + "px"; break; case "tr":
-newCorner.style.height = topMaxRadius - this.borderWidth + "px"; newCorner.style.marginLeft = this.settings.tl.radius - (this.borderWidth*2) + "px"; newCorner.style.borderRight = this.borderString; newCorner.style.borderTop = this.borderString; newCorner.style.backgroundPosition = "-" + (topMaxRadius + this.borderWidth) + "px 0px"; newCorner.style.left = this.borderWidth + "px"; break; case "bl":
-newCorner.style.height = botMaxRadius - this.borderWidth + "px"; newCorner.style.marginRight = this.settings.br.radius - (this.borderWidth*2) + "px"; newCorner.style.borderLeft = this.borderString; newCorner.style.borderBottom = this.borderString; newCorner.style.left = -this.borderWidth + "px"; newCorner.style.backgroundPosition = "-" + (this.borderWidth) + "px -" + (this.boxHeight + (botMaxRadius + this.borderWidth)) + "px"; break; case "br":
-newCorner.style.height = botMaxRadius - this.borderWidth + "px"; newCorner.style.marginLeft = this.settings.bl.radius - (this.borderWidth*2) + "px"; newCorner.style.borderRight = this.borderString; newCorner.style.borderBottom = this.borderString; newCorner.style.left = this.borderWidth + "px"
-newCorner.style.backgroundPosition = "-" + (botMaxRadius + this.borderWidth) + "px -" + (this.boxHeight + (botMaxRadius + this.borderWidth)) + "px"; break;}
-}
-}
-else
-{ if(this.masterCorners[this.settings[cc].radius])
-{ var newCorner = this.masterCorners[this.settings[cc].radius].cloneNode(true);}
-else
-{ var newCorner = document.createElement("DIV"); newCorner.style.height = this.settings[cc].radius + "px"; newCorner.style.width = this.settings[cc].radius + "px"; newCorner.style.position = "absolute"; newCorner.style.fontSize = "1px"; newCorner.style.overflow = "hidden"; var borderRadius = parseInt(this.settings[cc].radius - this.borderWidth); for(var intx = 0, j = this.settings[cc].radius; intx < j; intx++)
-{ if((intx +1) >= borderRadius)
-var y1 = -1; else
-var y1 = (Math.floor(Math.sqrt(Math.pow(borderRadius, 2) - Math.pow((intx+1), 2))) - 1); if(borderRadius != j)
-{ if((intx) >= borderRadius)
-var y2 = -1; else
-var y2 = Math.ceil(Math.sqrt(Math.pow(borderRadius,2) - Math.pow(intx, 2))); if((intx+1) >= j)
-var y3 = -1; else
-var y3 = (Math.floor(Math.sqrt(Math.pow(j ,2) - Math.pow((intx+1), 2))) - 1);}
-if((intx) >= j)
-var y4 = -1; else
-var y4 = Math.ceil(Math.sqrt(Math.pow(j ,2) - Math.pow(intx, 2))); if(y1 > -1) this.drawPixel(intx, 0, this.boxColour, 100, (y1+1), newCorner, -1, this.settings[cc].radius); if(borderRadius != j)
-{ for(var inty = (y1 + 1); inty < y2; inty++)
-{ if(this.settings.antiAlias)
-{ if(this.backgroundImage != "")
-{ var borderFract = (pixelFraction(intx, inty, borderRadius) * 100); if(borderFract < 30)
-{ this.drawPixel(intx, inty, this.borderColour, 100, 1, newCorner, 0, this.settings[cc].radius);}
-else
-{ this.drawPixel(intx, inty, this.borderColour, 100, 1, newCorner, -1, this.settings[cc].radius);}
-}
-else
-{ var pixelcolour = BlendColour(this.boxColour, this.borderColour, pixelFraction(intx, inty, borderRadius)); this.drawPixel(intx, inty, pixelcolour, 100, 1, newCorner, 0, this.settings[cc].radius, cc);}
-}
-}
-if(this.settings.antiAlias)
-{ if(y3 >= y2)
-{ if (y2 == -1) y2 = 0; this.drawPixel(intx, y2, this.borderColour, 100, (y3 - y2 + 1), newCorner, 0, 0);}
-}
-else
-{ if(y3 >= y1)
-{ this.drawPixel(intx, (y1 + 1), this.borderColour, 100, (y3 - y1), newCorner, 0, 0);}
-}
-var outsideColour = this.borderColour;}
-else
-{ var outsideColour = this.boxColour; var y3 = y1;}
-if(this.settings.antiAlias)
-{ for(var inty = (y3 + 1); inty < y4; inty++)
-{ this.drawPixel(intx, inty, outsideColour, (pixelFraction(intx, inty , j) * 100), 1, newCorner, ((this.borderWidth > 0)? 0 : -1), this.settings[cc].radius);}
-}
-}
-this.masterCorners[this.settings[cc].radius] = newCorner.cloneNode(true);}
-if(cc != "br")
-{ for(var t = 0, k = newCorner.childNodes.length; t < k; t++)
-{ var pixelBar = newCorner.childNodes[t]; var pixelBarTop = parseInt(pixelBar.style.top.substring(0, pixelBar.style.top.indexOf("px"))); var pixelBarLeft = parseInt(pixelBar.style.left.substring(0, pixelBar.style.left.indexOf("px"))); var pixelBarHeight = parseInt(pixelBar.style.height.substring(0, pixelBar.style.height.indexOf("px"))); if(cc == "tl" || cc == "bl"){ pixelBar.style.left = this.settings[cc].radius -pixelBarLeft -1 + "px";}
-if(cc == "tr" || cc == "tl"){ pixelBar.style.top = this.settings[cc].radius -pixelBarHeight -pixelBarTop + "px";}
-switch(cc)
-{ case "tr":
-pixelBar.style.backgroundPosition = "-" + Math.abs((this.boxWidth - this.settings[cc].radius + this.borderWidth) + pixelBarLeft) + "px -" + Math.abs(this.settings[cc].radius -pixelBarHeight -pixelBarTop - this.borderWidth) + "px"; break; case "tl":
-pixelBar.style.backgroundPosition = "-" + Math.abs((this.settings[cc].radius -pixelBarLeft -1) - this.borderWidth) + "px -" + Math.abs(this.settings[cc].radius -pixelBarHeight -pixelBarTop - this.borderWidth) + "px"; break; case "bl":
-pixelBar.style.backgroundPosition = "-" + Math.abs((this.settings[cc].radius -pixelBarLeft -1) - this.borderWidth) + "px -" + Math.abs((this.boxHeight + this.settings[cc].radius + pixelBarTop) -this.borderWidth) + "px"; break;}
-}
-}
-}
-if(newCorner)
-{ switch(cc)
-{ case "tl":
-if(newCorner.style.position == "absolute") newCorner.style.top = "0px"; if(newCorner.style.position == "absolute") newCorner.style.left = "0px"; if(this.topContainer) this.topContainer.appendChild(newCorner); break; case "tr":
-if(newCorner.style.position == "absolute") newCorner.style.top = "0px"; if(newCorner.style.position == "absolute") newCorner.style.right = "0px"; if(this.topContainer) this.topContainer.appendChild(newCorner); break; case "bl":
-if(newCorner.style.position == "absolute") newCorner.style.bottom = "0px"; if(newCorner.style.position == "absolute") newCorner.style.left = "0px"; if(this.bottomContainer) this.bottomContainer.appendChild(newCorner); break; case "br":
-if(newCorner.style.position == "absolute") newCorner.style.bottom = "0px"; if(newCorner.style.position == "absolute") newCorner.style.right = "0px"; if(this.bottomContainer) this.bottomContainer.appendChild(newCorner); break;}
-}
-}
-}
-var radiusDiff = new Array(); radiusDiff["t"] = Math.abs(this.settings.tl.radius - this.settings.tr.radius)
-radiusDiff["b"] = Math.abs(this.settings.bl.radius - this.settings.br.radius); for(z in radiusDiff)
-{ if(z == "t" || z == "b")
-{ if(radiusDiff[z])
-{ var smallerCornerType = ((this.settings[z + "l"].radius < this.settings[z + "r"].radius)? z +"l" : z +"r"); var newFiller = document.createElement("DIV"); newFiller.style.height = radiusDiff[z] + "px"; newFiller.style.width = this.settings[smallerCornerType].radius+ "px"
-newFiller.style.position = "absolute"; newFiller.style.fontSize = "1px"; newFiller.style.overflow = "hidden"; newFiller.style.backgroundColor = this.boxColour; switch(smallerCornerType)
-{ case "tl":
-newFiller.style.bottom = "0px"; newFiller.style.left = "0px"; newFiller.style.borderLeft = this.borderString; this.topContainer.appendChild(newFiller); break; case "tr":
-newFiller.style.bottom = "0px"; newFiller.style.right = "0px"; newFiller.style.borderRight = this.borderString; this.topContainer.appendChild(newFiller); break; case "bl":
-newFiller.style.top = "0px"; newFiller.style.left = "0px"; newFiller.style.borderLeft = this.borderString; this.bottomContainer.appendChild(newFiller); break; case "br":
-newFiller.style.top = "0px"; newFiller.style.right = "0px"; newFiller.style.borderRight = this.borderString; this.bottomContainer.appendChild(newFiller); break;}
-}
-var newFillerBar = document.createElement("DIV"); newFillerBar.style.position = "relative"; newFillerBar.style.fontSize = "1px"; newFillerBar.style.overflow = "hidden"; newFillerBar.style.backgroundColor = this.boxColour; newFillerBar.style.backgroundImage = this.backgroundImage; switch(z)
-{ case "t":
-if(this.topContainer)
-{ if(this.settings.tl.radius && this.settings.tr.radius)
-{ newFillerBar.style.height = topMaxRadius - this.borderWidth + "px"; newFillerBar.style.marginLeft = this.settings.tl.radius - this.borderWidth + "px"; newFillerBar.style.marginRight = this.settings.tr.radius - this.borderWidth + "px"; newFillerBar.style.borderTop = this.borderString; if(this.backgroundImage != "")
-newFillerBar.style.backgroundPosition = "-" + (topMaxRadius + this.borderWidth) + "px 0px"; this.topContainer.appendChild(newFillerBar);}
-this.box.style.backgroundPosition = "0px -" + (topMaxRadius - this.borderWidth) + "px";}
-break; case "b":
-if(this.bottomContainer)
-{ if(this.settings.bl.radius && this.settings.br.radius)
-{ newFillerBar.style.height = botMaxRadius - this.borderWidth + "px"; newFillerBar.style.marginLeft = this.settings.bl.radius - this.borderWidth + "px"; newFillerBar.style.marginRight = this.settings.br.radius - this.borderWidth + "px"; newFillerBar.style.borderBottom = this.borderString; if(this.backgroundImage != "")
-newFillerBar.style.backgroundPosition = "-" + (botMaxRadius + this.borderWidth) + "px -" + (this.boxHeight + (topMaxRadius + this.borderWidth)) + "px"; this.bottomContainer.appendChild(newFillerBar);}
-}
-break;}
-}
-}
-if(this.settings.autoPad == true && this.boxPadding > 0)
-{ var contentContainer = document.createElement("DIV"); contentContainer.style.position = "relative"; contentContainer.innerHTML = this.boxContent; contentContainer.className = "autoPadDiv"; var topPadding = Math.abs(topMaxRadius - this.boxPadding); var botPadding = Math.abs(botMaxRadius - this.boxPadding); if(topMaxRadius < this.boxPadding)
-contentContainer.style.paddingTop = topPadding + "px"; if(botMaxRadius < this.boxPadding)
-contentContainer.style.paddingBottom = botMaxRadius + "px"; contentContainer.style.paddingLeft = this.boxPadding + "px"; contentContainer.style.paddingRight = this.boxPadding + "px"; this.contentDIV = this.box.appendChild(contentContainer);}
-}
-this.drawPixel = function(intx, inty, colour, transAmount, height, newCorner, image, cornerRadius)
-{ var pixel = document.createElement("DIV"); pixel.style.height = height + "px"; pixel.style.width = "1px"; pixel.style.position = "absolute"; pixel.style.fontSize = "1px"; pixel.style.overflow = "hidden"; var topMaxRadius = Math.max(this.settings["tr"].radius, this.settings["tl"].radius); if(image == -1 && this.backgroundImage != "")
-{ pixel.style.backgroundImage = this.backgroundImage; pixel.style.backgroundPosition = "-" + (this.boxWidth - (cornerRadius - intx) + this.borderWidth) + "px -" + ((this.boxHeight + topMaxRadius + inty) -this.borderWidth) + "px";}
-else
-{ pixel.style.backgroundColor = colour;}
-if (transAmount != 100)
-setOpacity(pixel, transAmount); pixel.style.top = inty + "px"; pixel.style.left = intx + "px"; newCorner.appendChild(pixel);}
-}
-function insertAfter(parent, node, referenceNode)
-{ parent.insertBefore(node, referenceNode.nextSibling);}
-function BlendColour(Col1, Col2, Col1Fraction)
-{ var red1 = parseInt(Col1.substr(1,2),16); var green1 = parseInt(Col1.substr(3,2),16); var blue1 = parseInt(Col1.substr(5,2),16); var red2 = parseInt(Col2.substr(1,2),16); var green2 = parseInt(Col2.substr(3,2),16); var blue2 = parseInt(Col2.substr(5,2),16); if(Col1Fraction > 1 || Col1Fraction < 0) Col1Fraction = 1; var endRed = Math.round((red1 * Col1Fraction) + (red2 * (1 - Col1Fraction))); if(endRed > 255) endRed = 255; if(endRed < 0) endRed = 0; var endGreen = Math.round((green1 * Col1Fraction) + (green2 * (1 - Col1Fraction))); if(endGreen > 255) endGreen = 255; if(endGreen < 0) endGreen = 0; var endBlue = Math.round((blue1 * Col1Fraction) + (blue2 * (1 - Col1Fraction))); if(endBlue > 255) endBlue = 255; if(endBlue < 0) endBlue = 0; return "#" + IntToHex(endRed)+ IntToHex(endGreen)+ IntToHex(endBlue);}
-function IntToHex(strNum)
-{ base = strNum / 16; rem = strNum % 16; base = base - (rem / 16); baseS = MakeHex(base); remS = MakeHex(rem); return baseS + '' + remS;}
-function MakeHex(x)
-{ if((x >= 0) && (x <= 9))
-{ return x;}
-else
-{ switch(x)
-{ case 10: return "A"; case 11: return "B"; case 12: return "C"; case 13: return "D"; case 14: return "E"; case 15: return "F";}
-}
-}
-function pixelFraction(x, y, r)
-{ var pixelfraction = 0; var xvalues = new Array(1); var yvalues = new Array(1); var point = 0; var whatsides = ""; var intersect = Math.sqrt((Math.pow(r,2) - Math.pow(x,2))); if ((intersect >= y) && (intersect < (y+1)))
-{ whatsides = "Left"; xvalues[point] = 0; yvalues[point] = intersect - y; point = point + 1;}
-var intersect = Math.sqrt((Math.pow(r,2) - Math.pow(y+1,2))); if ((intersect >= x) && (intersect < (x+1)))
-{ whatsides = whatsides + "Top"; xvalues[point] = intersect - x; yvalues[point] = 1; point = point + 1;}
-var intersect = Math.sqrt((Math.pow(r,2) - Math.pow(x+1,2))); if ((intersect >= y) && (intersect < (y+1)))
-{ whatsides = whatsides + "Right"; xvalues[point] = 1; yvalues[point] = intersect - y; point = point + 1;}
-var intersect = Math.sqrt((Math.pow(r,2) - Math.pow(y,2))); if ((intersect >= x) && (intersect < (x+1)))
-{ whatsides = whatsides + "Bottom"; xvalues[point] = intersect - x; yvalues[point] = 0;}
-switch (whatsides)
-{ case "LeftRight":
-pixelfraction = Math.min(yvalues[0],yvalues[1]) + ((Math.max(yvalues[0],yvalues[1]) - Math.min(yvalues[0],yvalues[1]))/2); break; case "TopRight":
-pixelfraction = 1-(((1-xvalues[0])*(1-yvalues[1]))/2); break; case "TopBottom":
-pixelfraction = Math.min(xvalues[0],xvalues[1]) + ((Math.max(xvalues[0],xvalues[1]) - Math.min(xvalues[0],xvalues[1]))/2); break; case "LeftBottom":
-pixelfraction = (yvalues[0]*xvalues[1])/2; break; default:
-pixelfraction = 1;}
-return pixelfraction;}
-function rgb2Hex(rgbColour)
-{ try{ var rgbArray = rgb2Array(rgbColour); var red = parseInt(rgbArray[0]); var green = parseInt(rgbArray[1]); var blue = parseInt(rgbArray[2]); var hexColour = "#" + IntToHex(red) + IntToHex(green) + IntToHex(blue);}
-catch(e){ alert("There was an error converting the RGB value to Hexadecimal in function rgb2Hex");}
-return hexColour;}
-function rgb2Array(rgbColour)
-{ var rgbValues = rgbColour.substring(4, rgbColour.indexOf(")")); var rgbArray = rgbValues.split(", "); return rgbArray;}
-function setOpacity(obj, opacity)
-{ opacity = (opacity == 100)?99.999:opacity; if(isSafari && obj.tagName != "IFRAME")
-{ var rgbArray = rgb2Array(obj.style.backgroundColor); var red = parseInt(rgbArray[0]); var green = parseInt(rgbArray[1]); var blue = parseInt(rgbArray[2]); obj.style.backgroundColor = "rgba(" + red + ", " + green + ", " + blue + ", " + opacity/100 + ")";}
-else if(typeof(obj.style.opacity) != "undefined")
-{ obj.style.opacity = opacity/100;}
-else if(typeof(obj.style.MozOpacity) != "undefined")
-{ obj.style.MozOpacity = opacity/100;}
-else if(typeof(obj.style.filter) != "undefined")
-{ obj.style.filter = "alpha(opacity:" + opacity + ")";}
-else if(typeof(obj.style.KHTMLOpacity) != "undefined")
-{ obj.style.KHTMLOpacity = opacity/100;}
-}
-function inArray(array, value)
-{ for(var i = 0; i < array.length; i++){ if (array[i] === value) return i;}
-return false;}
-function inArrayKey(array, value)
-{ for(key in array){ if(key === value) return true;}
-return false;}
-function addEvent(elm, evType, fn, useCapture) { if (elm.addEventListener) { elm.addEventListener(evType, fn, useCapture); return true;}
-else if (elm.attachEvent) { var r = elm.attachEvent('on' + evType, fn); return r;}
-else { elm['on' + evType] = fn;}
-}
-function removeEvent(obj, evType, fn, useCapture){ if (obj.removeEventListener){ obj.removeEventListener(evType, fn, useCapture); return true;} else if (obj.detachEvent){ var r = obj.detachEvent("on"+evType, fn); return r;} else { alert("Handler could not be removed");}
-}
-function format_colour(colour)
-{ var returnColour = "#ffffff"; if(colour != "" && colour != "transparent")
-{ if(colour.substr(0, 3) == "rgb")
-{ returnColour = rgb2Hex(colour);}
-else if(colour.length == 4)
-{ returnColour = "#" + colour.substring(1, 2) + colour.substring(1, 2) + colour.substring(2, 3) + colour.substring(2, 3) + colour.substring(3, 4) + colour.substring(3, 4);}
-else
-{ returnColour = colour;}
-}
-return returnColour;}
-function get_style(obj, property, propertyNS)
-{ try
-{ if(obj.currentStyle)
-{ var returnVal = eval("obj.currentStyle." + property);}
-else
-{ if(isSafari && obj.style.display == "none")
-{ obj.style.display = ""; var wasHidden = true;}
-var returnVal = document.defaultView.getComputedStyle(obj, '').getPropertyValue(propertyNS); if(isSafari && wasHidden)
-{ obj.style.display = "none";}
-}
-}
-catch(e)
-{ }
-return returnVal;}
-function getElementsByClass(searchClass, node, tag)
-{ var classElements = new Array(); if(node == null)
-node = document; if(tag == null)
-tag = '*'; var els = node.getElementsByTagName(tag); var elsLen = els.length; var pattern = new RegExp("(^|\s)"+searchClass+"(\s|$)"); for (i = 0, j = 0; i < elsLen; i++)
-{ if(pattern.test(els[i].className))
-{ classElements[j] = els[i]; j++;}
-}
-return classElements;}
-function newCurvyError(errorMessage)
-{ return new Error("curvyCorners Error:\n" + errorMessage)
-}
+++ /dev/null
-body {\r
- background-color: #2F30EE;\r
- font-family: "Georgia", sans-serif;\r
- font-size: 16px;\r
- line-height: 1.6em;\r
- padding: 1.6em 0 0 0;\r
- color: #eee;\r
-}\r
-h1, h2, h3, h4, h5, h6 {\r
- color: #FFEDFA;\r
-}\r
-h1 { \r
- font-family: sans-serif;\r
- font-weight: normal;\r
- font-size: 4em;\r
- line-height: 0.8em;\r
- letter-spacing: -0.1ex;\r
- margin: 5px;\r
-}\r
-li {\r
- padding: 0;\r
- margin: 0;\r
- list-style-type: square;\r
-}\r
-a {\r
- color: #99f;\r
- font-weight: normal;\r
- text-decoration: underline;\r
-}\r
-blockquote {\r
- font-size: 90%;\r
- font-style: italic;\r
- border-left: 1px solid #eee;\r
- padding-left: 1em;\r
-}\r
-.caps {\r
- font-size: 80%;\r
-}\r
-\r
-#main {\r
- width: 45em;\r
- padding: 0;\r
- margin: 0 auto;\r
-}\r
-.coda {\r
- text-align: right;\r
- color: #77f;\r
- font-size: smaller;\r
-}\r
-\r
-table {\r
- font-size: 90%;\r
- line-height: 1.4em;\r
- color: #ff8;\r
- background-color: #111;\r
- padding: 2px 10px 2px 10px;\r
- border-style: dashed;\r
-}\r
-\r
-th {\r
- color: #fff;\r
-}\r
-\r
-td {\r
- padding: 2px 10px 2px 10px;\r
-}\r
-\r
-.success {\r
- color: #0CC52B;\r
-}\r
-\r
-.failed {\r
- color: #E90A1B;\r
-}\r
-\r
-.unknown {\r
- color: #995000;\r
-}\r
-pre, code {\r
- font-family: monospace;\r
- font-size: 90%;\r
- line-height: 1.4em;\r
- color: #ff8;\r
- background-color: #111;\r
- padding: 2px 10px 2px 10px;\r
-}\r
-.comment { color: #aaa; font-style: italic; }\r
-.keyword { color: #eff; font-weight: bold; }\r
-.punct { color: #eee; font-weight: bold; }\r
-.symbol { color: #0bb; }\r
-.string { color: #6b4; }\r
-.ident { color: #ff8; }\r
-.constant { color: #66f; }\r
-.regex { color: #ec6; }\r
-.number { color: #F99; }\r
-.expr { color: #227; }\r
-\r
-#version {\r
- float: right;\r
- text-align: right;\r
- font-family: sans-serif;\r
- font-weight: normal;\r
- background-color: #ff8;\r
- color: #66f;\r
- padding: 15px 20px 10px 20px;\r
- margin: 0 auto;\r
- margin-top: 15px;\r
- border: 3px solid #66f;\r
-}\r
-\r
-#version .numbers {\r
- display: block;\r
- font-size: 4em;\r
- line-height: 0.8em;\r
- letter-spacing: -0.1ex;\r
-}\r
-\r
-#version a {\r
- text-decoration: none;\r
-}\r
-\r
-.clickable {\r
- cursor: pointer; \r
- cursor: hand;\r
-}\r
-\r
+++ /dev/null
-// <%= title %>
-var version = <%= version.to_json %>;
-<%= body %>
+++ /dev/null
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
- <link rel="stylesheet" href="stylesheets/screen.css" type="text/css" media="screen" />
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title>
- <%= title %>
- </title>
- <script src="javascripts/rounded_corners_lite.inc.js" type="text/javascript"></script>
-<style>
-
-</style>
- <script type="text/javascript">
- window.onload = function() {
- settings = {
- tl: { radius: 10 },
- tr: { radius: 10 },
- bl: { radius: 10 },
- br: { radius: 10 },
- antiAlias: true,
- autoPad: true,
- validTags: ["div"]
- }
- var versionBox = new curvyCorners(settings, document.getElementById("version"));
- versionBox.applyCornersToAll();
- }
- </script>
-</head>
-<body>
-<div id="main">
-
- <h1><%= title %></h1>
- <div id="version" class="clickable" onclick='document.location = "<%= download %>"; return false'>
- Get Version
- <a href="<%= download %>" class="numbers"><%= version %></a>
- </div>
- <%= body %>
- <p class="coda">
- <a href="mailto:drnicwilliams@gmail.com">Dr Nic</a>, <%= modified.pretty %><br>
- Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
- </p>
-</div>
-
-<script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
-</script>
-<script type="text/javascript">
-_uacct = "UA-567811-2";
-urchinTracker();
-</script>
-
-</body>
-</html>
+++ /dev/null
-// Announcement JS file
-var version = "1.1.0";
-MagicAnnouncement.show('compositekeys', version);
+++ /dev/null
-h1. Announcement JS file\r
-MagicAnnouncement.show('compositekeys', version);
\ No newline at end of file
+++ /dev/null
-// Version JS file
-var version = "1.1.0";
-\r
-document.write(" - " + version);
+++ /dev/null
-h1. Version JS file\r
-\r
-document.write(" - " + version);
\ No newline at end of file
projects / rails.git / commitdiff