bivouac 0.1.4 → 0.1.5

data/examples/bivouac_sample/public/javascripts/scriptaculous.js

@@ -1,6 +1,6 @@
-// script.aculo.us scriptaculous.js v1.7.0, Fri Jan 19 19:16:36 CET 2007
+// script.aculo.us scriptaculous.js v1.8.1, Thu Jan 03 22:07:12 -0500 2008
 
-// Copyright (c) 2005, 2006 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+// Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
 // 
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -24,25 +24,32 @@
 // For details, see the script.aculo.us web site: http://script.aculo.us/
 
 var Scriptaculous = {
-  Version: '1.7.0',
+  Version: '1.8.1',
   require: function(libraryName) {
     // inserting via DOM fails in Safari 2.0, so brute force approach
-    document.write('<script type="text/javascript" src="'+libraryName+'"></script>');
+    document.write('<script type="text/javascript" src="'+libraryName+'"><\/script>');
   },
+  REQUIRED_PROTOTYPE: '1.6.0',
   load: function() {
+    function convertVersionString(versionString){
+      var r = versionString.split('.');
+      return parseInt(r[0])*100000 + parseInt(r[1])*1000 + parseInt(r[2]);
+    }
+ 
     if((typeof Prototype=='undefined') || 
        (typeof Element == 'undefined') || 
        (typeof Element.Methods=='undefined') ||
-       parseFloat(Prototype.Version.split(".")[0] + "." +
-                  Prototype.Version.split(".")[1]) < 1.5)
-       throw("script.aculo.us requires the Prototype JavaScript framework >= 1.5.0");
+       (convertVersionString(Prototype.Version) < 
+        convertVersionString(Scriptaculous.REQUIRED_PROTOTYPE)))
+       throw("script.aculo.us requires the Prototype JavaScript framework >= " +
+        Scriptaculous.REQUIRED_PROTOTYPE);
     
     $A(document.getElementsByTagName("script")).findAll( function(s) {
       return (s.src && s.src.match(/scriptaculous\.js(\?.*)?$/))
     }).each( function(s) {
       var path = s.src.replace(/scriptaculous\.js(\?.*)?$/,'');
       var includes = s.src.match(/\?.*load=([a-z,]*)/);
-      (includes ? includes[1] : 'builder,effects,dragdrop,controls,slider').split(',').each(
+      (includes ? includes[1] : 'builder,effects,dragdrop,controls,slider,sound').split(',').each(
        function(include) { Scriptaculous.require(path+include+'.js') });
     });
   }

data/examples/bivouac_sample/public/javascripts/slider.js

@@ -1,12 +1,11 @@
-// script.aculo.us slider.js v1.7.0, Fri Jan 19 19:16:36 CET 2007
+// script.aculo.us slider.js v1.8.1, Thu Jan 03 22:07:12 -0500 2008
 
-// Copyright (c) 2005, 2006 Marty Haught, Thomas Fuchs 
+// Copyright (c) 2005-2007 Marty Haught, Thomas Fuchs 
 //
 // 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/
 
-if(!Control) var Control = {};
-Control.Slider = Class.create();
+if (!Control) var Control = { };
 
 // options:
 //  axis: 'vertical', or 'horizontal' (default)
@@ -14,18 +13,18 @@ Control.Slider = Class.create();
 // callbacks:
 //  onChange(value)
 //  onSlide(value)
-Control.Slider.prototype = {
+Control.Slider = Class.create({
   initialize: function(handle, track, options) {
     var slider = this;
     
-    if(handle instanceof Array) {
+    if (Object.isArray(handle)) {
       this.handles = handle.collect( function(e) { return $(e) });
     } else {
       this.handles = [$(handle)];
     }
     
     this.track   = $(track);
-    this.options = options || {};
+    this.options = options || { };
 
     this.axis      = this.options.axis || 'horizontal';
     this.increment = this.options.increment || 1;
@@ -59,11 +58,11 @@ Control.Slider.prototype = {
     this.dragging = false;
     this.disabled = false;
 
-    if(this.options.disabled) this.setDisabled();
+    if (this.options.disabled) this.setDisabled();
 
     // Allowed values array
     this.allowedValues = this.options.values ? this.options.values.sortBy(Prototype.K) : false;
-    if(this.allowedValues) {
+    if (this.allowedValues) {
       this.minimum = this.allowedValues.min();
       this.maximum = this.allowedValues.max();
     }
@@ -76,16 +75,15 @@ Control.Slider.prototype = {
     this.handles.each( function(h,i) {
       i = slider.handles.length-1-i;
       slider.setValue(parseFloat(
-        (slider.options.sliderValue instanceof Array ? 
+        (Object.isArray(slider.options.sliderValue) ? 
           slider.options.sliderValue[i] : slider.options.sliderValue) || 
          slider.range.start), i);
-      Element.makePositioned(h); // fix IE
-      Event.observe(h, "mousedown", slider.eventMouseDown);
+      h.makePositioned().observe("mousedown", slider.eventMouseDown);
     });
     
-    Event.observe(this.track, "mousedown", this.eventMouseDown);
-    Event.observe(document, "mouseup", this.eventMouseUp);
-    Event.observe(document, "mousemove", this.eventMouseMove);
+    this.track.observe("mousedown", this.eventMouseDown);
+    document.observe("mouseup", this.eventMouseUp);
+    document.observe("mousemove", this.eventMouseMove);
     
     this.initialized = true;
   },
@@ -105,36 +103,36 @@ Control.Slider.prototype = {
     this.disabled = false;
   },  
   getNearestValue: function(value){
-    if(this.allowedValues){
-      if(value >= this.allowedValues.max()) return(this.allowedValues.max());
-      if(value <= this.allowedValues.min()) return(this.allowedValues.min());
+    if (this.allowedValues){
+      if (value >= this.allowedValues.max()) return(this.allowedValues.max());
+      if (value <= this.allowedValues.min()) return(this.allowedValues.min());
       
       var offset = Math.abs(this.allowedValues[0] - value);
       var newValue = this.allowedValues[0];
       this.allowedValues.each( function(v) {
         var currentOffset = Math.abs(v - value);
-        if(currentOffset <= offset){
+        if (currentOffset <= offset){
           newValue = v;
           offset = currentOffset;
         } 
       });
       return newValue;
     }
-    if(value > this.range.end) return this.range.end;
-    if(value < this.range.start) return this.range.start;
+    if (value > this.range.end) return this.range.end;
+    if (value < this.range.start) return this.range.start;
     return value;
   },
   setValue: function(sliderValue, handleIdx){
-    if(!this.active) {
+    if (!this.active) {
       this.activeHandleIdx = handleIdx || 0;
       this.activeHandle    = this.handles[this.activeHandleIdx];
       this.updateStyles();
     }
     handleIdx = handleIdx || this.activeHandleIdx || 0;
-    if(this.initialized && this.restricted) {
-      if((handleIdx>0) && (sliderValue<this.values[handleIdx-1]))
+    if (this.initialized && this.restricted) {
+      if ((handleIdx>0) && (sliderValue<this.values[handleIdx-1]))
         sliderValue = this.values[handleIdx-1];
-      if((handleIdx < (this.handles.length-1)) && (sliderValue>this.values[handleIdx+1]))
+      if ((handleIdx < (this.handles.length-1)) && (sliderValue>this.values[handleIdx+1]))
         sliderValue = this.values[handleIdx+1];
     }
     sliderValue = this.getNearestValue(sliderValue);
@@ -145,7 +143,7 @@ Control.Slider.prototype = {
       this.translateToPx(sliderValue);
     
     this.drawSpans();
-    if(!this.dragging || !this.event) this.updateFinished();
+    if (!this.dragging || !this.event) this.updateFinished();
   },
   setValueBy: function(delta, handleIdx) {
     this.setValue(this.values[handleIdx || this.activeHandleIdx || 0] + delta, 
@@ -173,24 +171,24 @@ Control.Slider.prototype = {
       (this.track.offsetHeight != 0 ? this.track.offsetHeight :
         this.track.style.height.replace(/px$/,"")) - this.alignY : 
       (this.track.offsetWidth != 0 ? this.track.offsetWidth : 
-        this.track.style.width.replace(/px$/,"")) - this.alignY);
+        this.track.style.width.replace(/px$/,"")) - this.alignX);
   },  
   isVertical:  function(){
     return (this.axis == 'vertical');
   },
   drawSpans: function() {
     var slider = this;
-    if(this.spans)
+    if (this.spans)
       $R(0, this.spans.length-1).each(function(r) { slider.setSpan(slider.spans[r], slider.getRange(r)) });
-    if(this.options.startSpan)
+    if (this.options.startSpan)
       this.setSpan(this.options.startSpan,
         $R(0, this.values.length>1 ? this.getRange(0).min() : this.value ));
-    if(this.options.endSpan)
+    if (this.options.endSpan)
       this.setSpan(this.options.endSpan, 
         $R(this.values.length>1 ? this.getRange(this.spans.length-1).max() : this.value, this.maximum));
   },
   setSpan: function(span, range) {
-    if(this.isVertical()) {
+    if (this.isVertical()) {
       span.style.top = this.translateToPx(range.start);
       span.style.height = this.translateToPx(range.end - range.start + this.range.start);
     } else {
@@ -203,14 +201,14 @@ Control.Slider.prototype = {
     Element.addClassName(this.activeHandle, 'selected');
   },
   startDrag: function(event) {
-    if(Event.isLeftClick(event)) {
-      if(!this.disabled){
+    if (Event.isLeftClick(event)) {
+      if (!this.disabled){
         this.active = true;
         
         var handle = Event.element(event);
         var pointer  = [Event.pointerX(event), Event.pointerY(event)];
         var track = handle;
-        if(track==this.track) {
+        if (track==this.track) {
           var offsets  = Position.cumulativeOffset(this.track); 
           this.event = event;
           this.setValue(this.translateToValue( 
@@ -224,7 +222,7 @@ Control.Slider.prototype = {
           while((this.handles.indexOf(handle) == -1) && handle.parentNode) 
             handle = handle.parentNode;
             
-          if(this.handles.indexOf(handle)!=-1) {
+          if (this.handles.indexOf(handle)!=-1) {
             this.activeHandle    = handle;
             this.activeHandleIdx = this.handles.indexOf(this.activeHandle);
             this.updateStyles();
@@ -239,11 +237,10 @@ Control.Slider.prototype = {
     }
   },
   update: function(event) {
-   if(this.active) {
-      if(!this.dragging) this.dragging = true;
+   if (this.active) {
+      if (!this.dragging) this.dragging = true;
       this.draw(event);
-      // fix AppleWebKit rendering
-      if(navigator.appVersion.indexOf('AppleWebKit')>0) window.scrollBy(0,0);
+      if (Prototype.Browser.WebKit) window.scrollBy(0,0);
       Event.stop(event);
    }
   },
@@ -254,11 +251,11 @@ Control.Slider.prototype = {
     pointer[1] -= this.offsetY + offsets[1];
     this.event = event;
     this.setValue(this.translateToValue( this.isVertical() ? pointer[1] : pointer[0] ));
-    if(this.initialized && this.options.onSlide)
+    if (this.initialized && this.options.onSlide)
       this.options.onSlide(this.values.length>1 ? this.values : this.value, this);
   },
   endDrag: function(event) {
-    if(this.active && this.dragging) {
+    if (this.active && this.dragging) {
       this.finishDrag(event, true);
       Event.stop(event);
     }
@@ -271,8 +268,8 @@ Control.Slider.prototype = {
     this.updateFinished();
   },
   updateFinished: function() {
-    if(this.initialized && this.options.onChange) 
+    if (this.initialized && this.options.onChange) 
       this.options.onChange(this.values.length>1 ? this.values : this.value, this);
     this.event = null;
   }
-}
+});

data/examples/bivouac_sample/public/javascripts/sound.js

@@ -0,0 +1,55 @@
+// script.aculo.us sound.js v1.8.1, Thu Jan 03 22:07:12 -0500 2008
+
+// Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+//
+// Based on code created by Jules Gravinese (http://www.webveteran.com/)
+//
+// 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/
+
+Sound = {
+  tracks: {},
+  _enabled: true,
+  template:
+    new Template('<embed style="height:0" id="sound_#{track}_#{id}" src="#{url}" loop="false" autostart="true" hidden="true"/>'),
+  enable: function(){
+    Sound._enabled = true;
+  },
+  disable: function(){
+    Sound._enabled = false;
+  },
+  play: function(url){
+    if(!Sound._enabled) return;
+    var options = Object.extend({
+      track: 'global', url: url, replace: false
+    }, arguments[1] || {});
+    
+    if(options.replace && this.tracks[options.track]) {
+      $R(0, this.tracks[options.track].id).each(function(id){
+        var sound = $('sound_'+options.track+'_'+id);
+        sound.Stop && sound.Stop();
+        sound.remove();
+      })
+      this.tracks[options.track] = null;
+    }
+      
+    if(!this.tracks[options.track])
+      this.tracks[options.track] = { id: 0 }
+    else
+      this.tracks[options.track].id++;
+      
+    options.id = this.tracks[options.track].id;
+    $$('body')[0].insert( 
+      Prototype.Browser.IE ? new Element('bgsound',{
+        id: 'sound_'+options.track+'_'+options.id,
+        src: options.url, loop: 1, autostart: true
+      }) : Sound.template.evaluate(options));
+  }
+};
+
+if(Prototype.Browser.Gecko && navigator.userAgent.indexOf("Win") > 0){
+  if(navigator.plugins && $A(navigator.plugins).detect(function(p){ return p.name.indexOf('QuickTime') != -1 }))
+    Sound.template = new Template('<object id="sound_#{track}_#{id}" width="0" height="0" type="audio/mpeg" data="#{url}"/>')
+  else
+    Sound.play = function(){}
+}

data/examples/bivouac_sample/public/javascripts/unittest.js

@@ -1,8 +1,8 @@
-// script.aculo.us unittest.js v1.7.0, Fri Jan 19 19:16:36 CET 2007
+// script.aculo.us unittest.js v1.8.1, Thu Jan 03 22:07:12 -0500 2008
 
-// Copyright (c) 2005, 2006 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
-//           (c) 2005, 2006 Jon Tirsen (http://www.tirsen.com)
-//           (c) 2005, 2006 Michael Schuerig (http://www.schuerig.de/michael/)
+// Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+//           (c) 2005-2007 Jon Tirsen (http://www.tirsen.com)
+//           (c) 2005-2007 Michael Schuerig (http://www.schuerig.de/michael/)
 //
 // 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/
@@ -524,15 +524,19 @@ Test.setupBDDExtensionMethods = function(){
     shouldNotBe:     'assertReturnsFalse',
     shouldRespondTo: 'assertRespondsTo'
   };
-  Test.BDDMethods = {};
-  for(m in METHODMAP) {
-    Test.BDDMethods[m] = eval(
-      'function(){'+
-      'var args = $A(arguments);'+
-      'var scope = args.shift();'+
-      'scope.'+METHODMAP[m]+'.apply(scope,(args || []).concat([this])); }');
+  var makeAssertion = function(assertion, args, object) { 
+   	this[assertion].apply(this,(args || []).concat([object]));
   }
-  [Array.prototype, String.prototype, Number.prototype].each(
+  
+  Test.BDDMethods = {};   
+  $H(METHODMAP).each(function(pair) { 
+    Test.BDDMethods[pair.key] = function() { 
+       var args = $A(arguments); 
+       var scope = args.shift(); 
+       makeAssertion.apply(scope, [pair.value, args, this]); }; 
+  });
+  
+  [Array.prototype, String.prototype, Number.prototype, Boolean.prototype].each(
     function(p){ Object.extend(p, Test.BDDMethods) }
   );
 }

data/examples/bivouac_sample/script/console

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+require 'rubygems'
+app = File.dirname(__FILE__) + "/../app/bivouac_sample.rb"
+
+ENV['BIVOUAC_ROOT'] = File.expand_path( File.dirname(__FILE__) + "/../" )
+system "ruby #{app} -c #{ARGV.join(' ')}"

data/examples/bivouac_sample/script/plugin

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require 'rubygems'
+require 'bivouac/commands/plugin'

data/examples/bivouac_sample/script/server

@@ -2,4 +2,5 @@
 require 'rubygems'
 app = File.dirname(__FILE__) + "/../app/bivouac_sample.rb"
 
-system "ruby #{app} #{ARGV.join(' ')}"
+ENV['BIVOUAC_ROOT'] = File.expand_path( File.dirname(__FILE__) + "/../" )
+system "ruby #{app} #{ARGV.join(' ')} --"

data/examples/bivouac_sample/test/test_sound.rb

@@ -0,0 +1,15 @@
+require 'rubygems'
+require 'mosquito'
+
+ENV['BIVOUAC_ROOT'] = File.expand_path( File.dirname(__FILE__) + "/../" )
+require ENV['BIVOUAC_ROOT'] + "/app/bivouac_sample"
+
+BivouacSample.create if BivouacSample.respond_to? :create
+include BivouacSample::Models
+
+class TestBivouacSample < Camping::FunctionalTest
+  def test_sound
+    get '/sound'
+    assert_response :success
+  end
+end

data/lib/bivouac/helpers/view/goh/sound.rb

@@ -0,0 +1,38 @@
+module BivouacHelpers
+  module SoundView
+    # Play the file +file+
+    #
+    # Example:
+    #   play_sound("my_song.mp3", :replace => true)
+    #
+    # The +file+ must be in +public+
+    # 
+    # You can change the behaviour with various options, see
+    # http://script.aculo.us for more documentation.
+    def play_sound( file, options = {} )
+      javascript_tag(play_sound_js(file, options) + ";\n")
+    end
+    
+    def play_sound_js( file, options = {} ) #:nodoc:
+      %(Sound.play('/public/#{file}', #{options_for_javascript(options)}); return false)
+    end
+    
+    # Disable sound
+    def disable_sound( )
+      javascript_tag(disable_sound_js + ";\n")
+    end
+    
+    def disable_sound_js( ) #:nodoc:
+      %(Sound.disable(); return false)
+    end
+    
+    # Enable sound
+    def enable_sound( )
+      javascript_tag(enable_sound_js + ";\n")
+    end
+    
+    def enable_sound_js( ) #:nodoc:
+      %(Sound.enable(); return false)
+    end
+  end
+end

data/lib/bivouac/template/application/helpers_goh.rb

@@ -12,6 +12,7 @@ require 'bivouac/helpers/view/goh/html'
 require 'bivouac/helpers/view/goh/form'
 require 'bivouac/helpers/view/goh/scriptaculous'
 require 'bivouac/helpers/view/goh/javascript'
+require 'bivouac/helpers/view/goh/sound'
 require 'bivouac/helpers/view/goh/tooltip'
 
 helpers = [
@@ -20,6 +21,7 @@ helpers = [
   BivouacHelpers::FormView,
   BivouacHelpers::ScriptAculoUsView,
   BivouacHelpers::JavaScriptView, 
+  BivouacHelpers::SoundView, 
   BivouacHelpers::TooltipView
 ] + viewHelperModule
 

data/lib/bivouac/template/static/builder.js

@@ -1,6 +1,6 @@
-// script.aculo.us builder.js v1.7.0, Fri Jan 19 19:16:36 CET 2007
+// script.aculo.us builder.js v1.8.1, Thu Jan 03 22:07:12 -0500 2008
 
-// Copyright (c) 2005, 2006 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+// Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
 //
 // 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/
@@ -48,7 +48,8 @@ var Builder = {
     // attributes (or text)
     if(arguments[1])
       if(this._isStringOrNumber(arguments[1]) ||
-        (arguments[1] instanceof Array)) {
+        (arguments[1] instanceof Array) ||
+        arguments[1].tagName) {
           this._children(element, arguments[1]);
         } else {
           var attrs = this._attributes(arguments[1]);
@@ -66,7 +67,7 @@ var Builder = {
             }
             if(element.tagName.toUpperCase() != elementName)
               element = parentElement.getElementsByTagName(elementName)[0];
-            }
+          }
         } 
 
     // text, or array of children
@@ -88,10 +89,14 @@ var Builder = {
     var attrs = [];
     for(attribute in attributes)
       attrs.push((attribute in this.ATTR_MAP ? this.ATTR_MAP[attribute] : attribute) +
-          '="' + attributes[attribute].toString().escapeHTML() + '"');
+          '="' + attributes[attribute].toString().escapeHTML().gsub(/"/,'"') + '"');
     return attrs.join(" ");
   },
   _children: function(element, children) {
+    if(children.tagName) {
+      element.appendChild(children);
+      return;
+    }
     if(typeof children=='object') { // array can hold nodes and text
       children.flatten().each( function(e) {
         if(typeof e=='object')
@@ -101,8 +106,8 @@ var Builder = {
             element.appendChild(Builder._text(e));
       });
     } else
-      if(Builder._isStringOrNumber(children)) 
-         element.appendChild(Builder._text(children));
+      if(Builder._isStringOrNumber(children))
+        element.appendChild(Builder._text(children));
   },
   _isStringOrNumber: function(param) {
     return(typeof param=='string' || typeof param=='number');