jquery_on_rails 0.2.0 → 0.2.1

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/jquery_on_rails.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jquery_on_rails}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joe Khoobyar"]
@@ -24,7 +24,9 @@ Gem::Specification.new do |s|
      "jquery_on_rails.gemspec",
      "lib/jquery_on_rails.rb",
      "lib/jquery_on_rails/helpers/jquery_helper.rb",
+     "lib/jquery_on_rails/helpers/jquery_ui_helper.rb",
      "lib/jquery_on_rails/railtie.rb",
+     "public/javascripts/jquery-ui-effects.js",
      "public/javascripts/jquery.js",
      "public/javascripts/rails.js",
      "spec/dummy/app/controllers/dummy_controller.rb",
@@ -37,6 +39,7 @@ Gem::Specification.new do |s|
      "spec/dummy/log/test.log",
      "spec/jquery_helper_spec.rb",
      "spec/jquery_on_rails_spec.rb",
+     "spec/jquery_ui_helper_spec.rb",
      "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/joekhoobyar/jquery_on_rails}
@@ -55,6 +58,7 @@ Gem::Specification.new do |s|
      "spec/dummy/config/routes.rb",
      "spec/jquery_helper_spec.rb",
      "spec/jquery_on_rails_spec.rb",
+     "spec/jquery_ui_helper_spec.rb",
      "spec/spec_helper.rb"
   ]
 

data/lib/jquery_on_rails/helpers/jquery_helper.rb

@@ -32,14 +32,16 @@ module JQueryOnRails
                                 :jsonp, :jsonpCallback, :password, :processData, :scriptCharset,
                                 :timeout, :traditional, :type, :username, :xhr])
         CONFIRM_FUNCTION = 'confirm'.freeze
+        TOGGLE_EFFECTS = Set.new([:toggle_appear, :toggle_slide, :toggle_blind])
+        RENAME_EFFECTS = { :appear=>'fadeIn', :fade=>'fadeOut' }
       end
       
       # Returns the JavaScript needed for a remote function.
       # Takes the same arguments as link_to_remote.
       #
       # Example:
-      #   # Generates: <select id="options" onchange="$.ajax({method : 'GET',
-      #   # url : '/testing/update_options', async:true, evalScripts:true,
+      #   # Generates: <select id="options" onchange="jQuery.ajax({method : 'GET',
+      #   # url : '/testing/update_options', processData:false, async:true, evalScripts:true,
       #   # complete : function(data,status,request){$('#options').html(request.responseText)}})">
       #   <select id="options" onchange="<%= remote_function(:update => "options",
       #       :url => { :action => :update_options }) %>">
@@ -54,6 +56,22 @@ module JQueryOnRails
         function = "if (#{confirm_for_javascript(options[:confirm])}) { #{function}; }" if options[:confirm]
         function
       end
+
+      # Basic effects, limited to those supported by core jQuery 1.4
+      # Additional effects are supported by jQuery UI.
+      def visual_effect(name, element_id = false, js_options = {})
+        element = element_id ? ActiveSupport::JSON.encode("##{element_id}") : "element"
+        element = "jQuery(#{element})"
+        js_options = (options_for_javascript js_options unless js_options.empty?)
+        case name = name.to_sym
+        when :toggle_slide
+          "#{element}.slideToggle(#{js_options});"
+        when :toggle_appear
+          "(function(state){ return (function() { state=!state; return #{element}['fade'+(state?'In':'Out')](#{js_options}); })(); })(#{element}.css('visiblity')!='hidden');"
+        else
+          "#{element}.#{RENAME_EFFECTS[name] || name.to_s.camelize(false)}(#{js_options});"
+        end
+      end
     
       # Mostly copied from Rails 3 PrototypeHelper
       class JavaScriptGenerator #:nodoc:
@@ -162,6 +180,10 @@ module JQueryOnRails
             yield
             record "}, #{(seconds * 1000).to_i})"
           end
+
+          def visual_effect(name, id = nil, options = {})
+            record @context.send(:visual_effect, name, id, options)
+          end
     
           private
             def loop_on_multiple_ids(method, ids)
@@ -233,7 +255,7 @@ module JQueryOnRails
       def update_page_tag(html_options = {}, &block)
         javascript_tag update_page(&block), html_options
       end
-    
+      
 	  protected
 	  
       # Generates a JavaScript confirm() method call.

data/lib/jquery_on_rails/helpers/jquery_ui_helper.rb

@@ -0,0 +1,52 @@
+module JQueryOnRails
+  module Helpers
+    module JQueryUiHelper
+      unless const_defined? :FX_OPTIONS
+        FX_OPTIONS = {
+          'Up' => {:mode=>:hide,:direction=>:vertical}, 'Down' => {:mode=>:show,:direction=>:vertical},
+          'Left' => {:mode=>:hide,:direction=>:horizontal}, 'Right' => {:mode=>:show,:direction=>:horizontal},
+          'Out' => {:mode=>:hide,:direction=>nil}, 'In' => {:mode=>:show,:direction=>nil},
+          :fadeIn => {:mode=>:primitive,:direction=>nil}, :fadeOut => {:mode=>:primitive,:direction=>nil},
+          :animate => {:mode=>:primitive,:direction=>nil}, :puff => {:direction=>nil}, :size => {:direction=>nil},
+          :toggleAppear => {:direction=>nil,:mode=>"return element[name+(element.is(':hidden')?'In':'Out')](options);"}
+        }.with_indifferent_access
+
+        FX_NAMES = HashWithIndifferentAccess.new{|h,k| k}
+        FX_NAMES.update :toggleAppear=>'fade', :appear=>'fadeIn', :fade=>'fadeOut',
+                        :morph=>'animate', :shrink=>'sizeOut', :grow=>'sizeIn'
+      end
+      
+      # Generates jQuery UI effects.  This expands upon the core jQuery 1.4 effects
+      # that are generated by JQueryHelper#visual_effect
+      def visual_effect(name, element_id=false, js_options={})
+        element = element_id ? ActiveSupport::JSON.encode("##{element_id}") : "element"
+
+        fx_opt, name = FX_OPTIONS[name = name.to_s.camelize(:lower)] || {}, FX_NAMES[name]
+        fx_opt ||= FX_NAMES[name]
+				fx_opt[:mode], name = :toggle, FX_NAMES[name[6,1].downcase+name[7..-1]] if name.start_with? 'toggle'
+				fx_opt = FX_OPTIONS[$1].merge fx_opt if ! FX_OPTIONS.include? name and name.sub! /(Up|Down|Left|Right|In|Out)$/, ''
+        fx_opt = FX_OPTIONS[name].merge fx_opt if FX_OPTIONS.include? name
+	      fx_opt.merge! js_options
+	      
+        if ! fx_opt.include? :direction then fx_opt[:direction] = "'vertical'"
+			  elsif fx_opt[:direction].nil? then fx_opt.delete :direction
+			  else fx_opt[:direction] = "'#{fx_opt[:direction]}'"
+		    end
+	      
+        # [:endcolor, :direction, :startcolor, :scaleMode, :restorecolor]
+        fx = "jQuery(#{element})"
+        fx = "#{fx}.css('background-color','#{fx_opt.delete :startcolor}')" if fx_opt[:startcolor]
+	      if name=='animate' then fx_opt[:backgroundColor] ||= fx_opt.delete :endcolor
+	      elsif fx_opt[:endcolor] then fx = "#{fx}.animate('background-color','#{fx_opt.delete :endcolor}')"
+        end
+        method, fx_opt = fx_opt.delete(:mode)||:effect, (options_for_javascript fx_opt unless fx_opt.empty?)
+        
+        case method; when :primitive; "#{fx}.#{name}(#{fx_opt});"
+        when Symbol; "#{fx}.#{method}('#{name}'#{','+fx_opt if fx_opt.present?});"
+        else "(function(element,name,options){ #{method} })(#{fx},'#{name}'#{','+fx_opt if fx_opt.present?});"
+        end
+      end
+
+    end
+  end
+end

data/lib/jquery_on_rails.rb

@@ -1,4 +1,14 @@
+require 'active_support'
+
 module JQueryOnRails
   VERSION = File.read(File.expand_path('../../VERSION', __FILE__)).strip
+  
+  module Helpers
+    extend ActiveSupport::Autoload
+
+    autoload :JQueryHelper, 'jquery_on_rails/helpers/jquery_helper'
+    autoload :JQueryUiHelper, 'jquery_on_rails/helpers/jquery_ui_helper'
+  end
+
 	require 'jquery_on_rails/railtie' if defined? Rails
 end

data/public/javascripts/jquery-ui-effects.js

@@ -0,0 +1,207 @@
+/*
+ * jQuery UI Effects 1.8.1
+ *
+ * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT (MIT-LICENSE.txt)
+ * and GPL (GPL-LICENSE.txt) licenses.
+ *
+ * http://docs.jquery.com/UI/Effects/
+ */
+jQuery.effects||function(f){function k(c){var a;if(c&&c.constructor==Array&&c.length==3)return c;if(a=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(c))return[parseInt(a[1],10),parseInt(a[2],10),parseInt(a[3],10)];if(a=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(c))return[parseFloat(a[1])*2.55,parseFloat(a[2])*2.55,parseFloat(a[3])*2.55];if(a=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(c))return[parseInt(a[1],
+16),parseInt(a[2],16),parseInt(a[3],16)];if(a=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(c))return[parseInt(a[1]+a[1],16),parseInt(a[2]+a[2],16),parseInt(a[3]+a[3],16)];if(/rgba\(0, 0, 0, 0\)/.exec(c))return l.transparent;return l[f.trim(c).toLowerCase()]}function q(c,a){var b;do{b=f.curCSS(c,a);if(b!=""&&b!="transparent"||f.nodeName(c,"body"))break;a="backgroundColor"}while(c=c.parentNode);return k(b)}function m(){var c=document.defaultView?document.defaultView.getComputedStyle(this,null):this.currentStyle,
+a={},b,d;if(c&&c.length&&c[0]&&c[c[0]])for(var e=c.length;e--;){b=c[e];if(typeof c[b]=="string"){d=b.replace(/\-(\w)/g,function(g,h){return h.toUpperCase()});a[d]=c[b]}}else for(b in c)if(typeof c[b]==="string")a[b]=c[b];return a}function n(c){var a,b;for(a in c){b=c[a];if(b==null||f.isFunction(b)||a in r||/scrollbar/.test(a)||!/color/i.test(a)&&isNaN(parseFloat(b)))delete c[a]}return c}function s(c,a){var b={_:0},d;for(d in a)if(c[d]!=a[d])b[d]=a[d];return b}function j(c,a,b,d){if(typeof c=="object"){d=
+a;b=null;a=c;c=a.effect}if(f.isFunction(a)){d=a;b=null;a={}}if(f.isFunction(b)){d=b;b=null}if(typeof a=="number"||f.fx.speeds[a]){d=b;b=a;a={}}a=a||{};b=b||a.duration;b=f.fx.off?0:typeof b=="number"?b:f.fx.speeds[b]||f.fx.speeds._default;d=d||a.complete;return[c,a,b,d]}f.effects={};f.each(["backgroundColor","borderBottomColor","borderLeftColor","borderRightColor","borderTopColor","color","outlineColor"],function(c,a){f.fx.step[a]=function(b){if(!b.colorInit){b.start=q(b.elem,a);b.end=k(b.end);b.colorInit=
+true}b.elem.style[a]="rgb("+Math.max(Math.min(parseInt(b.pos*(b.end[0]-b.start[0])+b.start[0],10),255),0)+","+Math.max(Math.min(parseInt(b.pos*(b.end[1]-b.start[1])+b.start[1],10),255),0)+","+Math.max(Math.min(parseInt(b.pos*(b.end[2]-b.start[2])+b.start[2],10),255),0)+")"}});var l={aqua:[0,255,255],azure:[240,255,255],beige:[245,245,220],black:[0,0,0],blue:[0,0,255],brown:[165,42,42],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgrey:[169,169,169],darkgreen:[0,100,0],darkkhaki:[189,
+183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkviolet:[148,0,211],fuchsia:[255,0,255],gold:[255,215,0],green:[0,128,0],indigo:[75,0,130],khaki:[240,230,140],lightblue:[173,216,230],lightcyan:[224,255,255],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightyellow:[255,255,224],lime:[0,255,0],magenta:[255,0,255],maroon:[128,0,0],navy:[0,0,128],olive:[128,128,0],orange:[255,
+165,0],pink:[255,192,203],purple:[128,0,128],violet:[128,0,128],red:[255,0,0],silver:[192,192,192],white:[255,255,255],yellow:[255,255,0],transparent:[255,255,255]},o=["add","remove","toggle"],r={border:1,borderBottom:1,borderColor:1,borderLeft:1,borderRight:1,borderTop:1,borderWidth:1,margin:1,padding:1};f.effects.animateClass=function(c,a,b,d){if(f.isFunction(b)){d=b;b=null}return this.each(function(){var e=f(this),g=e.attr("style")||" ",h=n(m.call(this)),p,t=e.attr("className");f.each(o,function(u,
+i){c[i]&&e[i+"Class"](c[i])});p=n(m.call(this));e.attr("className",t);e.animate(s(h,p),a,b,function(){f.each(o,function(u,i){c[i]&&e[i+"Class"](c[i])});if(typeof e.attr("style")=="object"){e.attr("style").cssText="";e.attr("style").cssText=g}else e.attr("style",g);d&&d.apply(this,arguments)})})};f.fn.extend({_addClass:f.fn.addClass,addClass:function(c,a,b,d){return a?f.effects.animateClass.apply(this,[{add:c},a,b,d]):this._addClass(c)},_removeClass:f.fn.removeClass,removeClass:function(c,a,b,d){return a?
+f.effects.animateClass.apply(this,[{remove:c},a,b,d]):this._removeClass(c)},_toggleClass:f.fn.toggleClass,toggleClass:function(c,a,b,d,e){return typeof a=="boolean"||a===undefined?b?f.effects.animateClass.apply(this,[a?{add:c}:{remove:c},b,d,e]):this._toggleClass(c,a):f.effects.animateClass.apply(this,[{toggle:c},a,b,d])},switchClass:function(c,a,b,d,e){return f.effects.animateClass.apply(this,[{add:a,remove:c},b,d,e])}});f.extend(f.effects,{version:"1.8.1",save:function(c,a){for(var b=0;b<a.length;b++)a[b]!==
+null&&c.data("ec.storage."+a[b],c[0].style[a[b]])},restore:function(c,a){for(var b=0;b<a.length;b++)a[b]!==null&&c.css(a[b],c.data("ec.storage."+a[b]))},setMode:function(c,a){if(a=="toggle")a=c.is(":hidden")?"show":"hide";return a},getBaseline:function(c,a){var b;switch(c[0]){case "top":b=0;break;case "middle":b=0.5;break;case "bottom":b=1;break;default:b=c[0]/a.height}switch(c[1]){case "left":c=0;break;case "center":c=0.5;break;case "right":c=1;break;default:c=c[1]/a.width}return{x:c,y:b}},createWrapper:function(c){if(c.parent().is(".ui-effects-wrapper"))return c.parent();
+var a={width:c.outerWidth(true),height:c.outerHeight(true),"float":c.css("float")},b=f("<div></div>").addClass("ui-effects-wrapper").css({fontSize:"100%",background:"transparent",border:"none",margin:0,padding:0});c.wrap(b);b=c.parent();if(c.css("position")=="static"){b.css({position:"relative"});c.css({position:"relative"})}else{f.extend(a,{position:c.css("position"),zIndex:c.css("z-index")});f.each(["top","left","bottom","right"],function(d,e){a[e]=c.css(e);if(isNaN(parseInt(a[e],10)))a[e]="auto"});
+c.css({position:"relative",top:0,left:0})}return b.css(a).show()},removeWrapper:function(c){if(c.parent().is(".ui-effects-wrapper"))return c.parent().replaceWith(c);return c},setTransition:function(c,a,b,d){d=d||{};f.each(a,function(e,g){unit=c.cssUnit(g);if(unit[0]>0)d[g]=unit[0]*b+unit[1]});return d}});f.fn.extend({effect:function(c){var a=j.apply(this,arguments);a={options:a[1],duration:a[2],callback:a[3]};var b=f.effects[c];return b&&!f.fx.off?b.call(this,a):this},_show:f.fn.show,show:function(c){if(!c||
+typeof c=="number"||f.fx.speeds[c])return this._show.apply(this,arguments);else{var a=j.apply(this,arguments);a[1].mode="show";return this.effect.apply(this,a)}},_hide:f.fn.hide,hide:function(c){if(!c||typeof c=="number"||f.fx.speeds[c])return this._hide.apply(this,arguments);else{var a=j.apply(this,arguments);a[1].mode="hide";return this.effect.apply(this,a)}},__toggle:f.fn.toggle,toggle:function(c){if(!c||typeof c=="number"||f.fx.speeds[c]||typeof c=="boolean"||f.isFunction(c))return this.__toggle.apply(this,
+arguments);else{var a=j.apply(this,arguments);a[1].mode="toggle";return this.effect.apply(this,a)}},cssUnit:function(c){var a=this.css(c),b=[];f.each(["em","px","%","pt"],function(d,e){if(a.indexOf(e)>0)b=[parseFloat(a),e]});return b}});f.easing.jswing=f.easing.swing;f.extend(f.easing,{def:"easeOutQuad",swing:function(c,a,b,d,e){return f.easing[f.easing.def](c,a,b,d,e)},easeInQuad:function(c,a,b,d,e){return d*(a/=e)*a+b},easeOutQuad:function(c,a,b,d,e){return-d*(a/=e)*(a-2)+b},easeInOutQuad:function(c,
+a,b,d,e){if((a/=e/2)<1)return d/2*a*a+b;return-d/2*(--a*(a-2)-1)+b},easeInCubic:function(c,a,b,d,e){return d*(a/=e)*a*a+b},easeOutCubic:function(c,a,b,d,e){return d*((a=a/e-1)*a*a+1)+b},easeInOutCubic:function(c,a,b,d,e){if((a/=e/2)<1)return d/2*a*a*a+b;return d/2*((a-=2)*a*a+2)+b},easeInQuart:function(c,a,b,d,e){return d*(a/=e)*a*a*a+b},easeOutQuart:function(c,a,b,d,e){return-d*((a=a/e-1)*a*a*a-1)+b},easeInOutQuart:function(c,a,b,d,e){if((a/=e/2)<1)return d/2*a*a*a*a+b;return-d/2*((a-=2)*a*a*a-2)+
+b},easeInQuint:function(c,a,b,d,e){return d*(a/=e)*a*a*a*a+b},easeOutQuint:function(c,a,b,d,e){return d*((a=a/e-1)*a*a*a*a+1)+b},easeInOutQuint:function(c,a,b,d,e){if((a/=e/2)<1)return d/2*a*a*a*a*a+b;return d/2*((a-=2)*a*a*a*a+2)+b},easeInSine:function(c,a,b,d,e){return-d*Math.cos(a/e*(Math.PI/2))+d+b},easeOutSine:function(c,a,b,d,e){return d*Math.sin(a/e*(Math.PI/2))+b},easeInOutSine:function(c,a,b,d,e){return-d/2*(Math.cos(Math.PI*a/e)-1)+b},easeInExpo:function(c,a,b,d,e){return a==0?b:d*Math.pow(2,
+10*(a/e-1))+b},easeOutExpo:function(c,a,b,d,e){return a==e?b+d:d*(-Math.pow(2,-10*a/e)+1)+b},easeInOutExpo:function(c,a,b,d,e){if(a==0)return b;if(a==e)return b+d;if((a/=e/2)<1)return d/2*Math.pow(2,10*(a-1))+b;return d/2*(-Math.pow(2,-10*--a)+2)+b},easeInCirc:function(c,a,b,d,e){return-d*(Math.sqrt(1-(a/=e)*a)-1)+b},easeOutCirc:function(c,a,b,d,e){return d*Math.sqrt(1-(a=a/e-1)*a)+b},easeInOutCirc:function(c,a,b,d,e){if((a/=e/2)<1)return-d/2*(Math.sqrt(1-a*a)-1)+b;return d/2*(Math.sqrt(1-(a-=2)*
+a)+1)+b},easeInElastic:function(c,a,b,d,e){c=1.70158;var g=0,h=d;if(a==0)return b;if((a/=e)==1)return b+d;g||(g=e*0.3);if(h<Math.abs(d)){h=d;c=g/4}else c=g/(2*Math.PI)*Math.asin(d/h);return-(h*Math.pow(2,10*(a-=1))*Math.sin((a*e-c)*2*Math.PI/g))+b},easeOutElastic:function(c,a,b,d,e){c=1.70158;var g=0,h=d;if(a==0)return b;if((a/=e)==1)return b+d;g||(g=e*0.3);if(h<Math.abs(d)){h=d;c=g/4}else c=g/(2*Math.PI)*Math.asin(d/h);return h*Math.pow(2,-10*a)*Math.sin((a*e-c)*2*Math.PI/g)+d+b},easeInOutElastic:function(c,
+a,b,d,e){c=1.70158;var g=0,h=d;if(a==0)return b;if((a/=e/2)==2)return b+d;g||(g=e*0.3*1.5);if(h<Math.abs(d)){h=d;c=g/4}else c=g/(2*Math.PI)*Math.asin(d/h);if(a<1)return-0.5*h*Math.pow(2,10*(a-=1))*Math.sin((a*e-c)*2*Math.PI/g)+b;return h*Math.pow(2,-10*(a-=1))*Math.sin((a*e-c)*2*Math.PI/g)*0.5+d+b},easeInBack:function(c,a,b,d,e,g){if(g==undefined)g=1.70158;return d*(a/=e)*a*((g+1)*a-g)+b},easeOutBack:function(c,a,b,d,e,g){if(g==undefined)g=1.70158;return d*((a=a/e-1)*a*((g+1)*a+g)+1)+b},easeInOutBack:function(c,
+a,b,d,e,g){if(g==undefined)g=1.70158;if((a/=e/2)<1)return d/2*a*a*(((g*=1.525)+1)*a-g)+b;return d/2*((a-=2)*a*(((g*=1.525)+1)*a+g)+2)+b},easeInBounce:function(c,a,b,d,e){return d-f.easing.easeOutBounce(c,e-a,0,d,e)+b},easeOutBounce:function(c,a,b,d,e){return(a/=e)<1/2.75?d*7.5625*a*a+b:a<2/2.75?d*(7.5625*(a-=1.5/2.75)*a+0.75)+b:a<2.5/2.75?d*(7.5625*(a-=2.25/2.75)*a+0.9375)+b:d*(7.5625*(a-=2.625/2.75)*a+0.984375)+b},easeInOutBounce:function(c,a,b,d,e){if(a<e/2)return f.easing.easeInBounce(c,a*2,0,
+d,e)*0.5+b;return f.easing.easeOutBounce(c,a*2-e,0,d,e)*0.5+d*0.5+b}})}(jQuery);
+;/*
+ * jQuery UI Effects Blind 1.8.1
+ *
+ * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT (MIT-LICENSE.txt)
+ * and GPL (GPL-LICENSE.txt) licenses.
+ *
+ * http://docs.jquery.com/UI/Effects/Blind
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function(b){b.effects.blind=function(c){return this.queue(function(){var a=b(this),g=["position","top","left"],f=b.effects.setMode(a,c.options.mode||"hide"),d=c.options.direction||"vertical";b.effects.save(a,g);a.show();var e=b.effects.createWrapper(a).css({overflow:"hidden"}),h=d=="vertical"?"height":"width";d=d=="vertical"?e.height():e.width();f=="show"&&e.css(h,0);var i={};i[h]=f=="show"?d:0;e.animate(i,c.duration,c.options.easing,function(){f=="hide"&&a.hide();b.effects.restore(a,g);b.effects.removeWrapper(a);
+c.callback&&c.callback.apply(a[0],arguments);a.dequeue()})})}})(jQuery);
+;/*
+ * jQuery UI Effects Bounce 1.8.1
+ *
+ * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT (MIT-LICENSE.txt)
+ * and GPL (GPL-LICENSE.txt) licenses.
+ *
+ * http://docs.jquery.com/UI/Effects/Bounce
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function(e){e.effects.bounce=function(b){return this.queue(function(){var a=e(this),l=["position","top","left"],h=e.effects.setMode(a,b.options.mode||"effect"),d=b.options.direction||"up",c=b.options.distance||20,m=b.options.times||5,i=b.duration||250;/show|hide/.test(h)&&l.push("opacity");e.effects.save(a,l);a.show();e.effects.createWrapper(a);var f=d=="up"||d=="down"?"top":"left";d=d=="up"||d=="left"?"pos":"neg";c=b.options.distance||(f=="top"?a.outerHeight({margin:true})/3:a.outerWidth({margin:true})/
+3);if(h=="show")a.css("opacity",0).css(f,d=="pos"?-c:c);if(h=="hide")c/=m*2;h!="hide"&&m--;if(h=="show"){var g={opacity:1};g[f]=(d=="pos"?"+=":"-=")+c;a.animate(g,i/2,b.options.easing);c/=2;m--}for(g=0;g<m;g++){var j={},k={};j[f]=(d=="pos"?"-=":"+=")+c;k[f]=(d=="pos"?"+=":"-=")+c;a.animate(j,i/2,b.options.easing).animate(k,i/2,b.options.easing);c=h=="hide"?c*2:c/2}if(h=="hide"){g={opacity:0};g[f]=(d=="pos"?"-=":"+=")+c;a.animate(g,i/2,b.options.easing,function(){a.hide();e.effects.restore(a,l);e.effects.removeWrapper(a);
+b.callback&&b.callback.apply(this,arguments)})}else{j={};k={};j[f]=(d=="pos"?"-=":"+=")+c;k[f]=(d=="pos"?"+=":"-=")+c;a.animate(j,i/2,b.options.easing).animate(k,i/2,b.options.easing,function(){e.effects.restore(a,l);e.effects.removeWrapper(a);b.callback&&b.callback.apply(this,arguments)})}a.queue("fx",function(){a.dequeue()});a.dequeue()})}})(jQuery);
+;/*
+ * jQuery UI Effects Clip 1.8.1
+ *
+ * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT (MIT-LICENSE.txt)
+ * and GPL (GPL-LICENSE.txt) licenses.
+ *
+ * http://docs.jquery.com/UI/Effects/Clip
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function(b){b.effects.clip=function(e){return this.queue(function(){var a=b(this),i=["position","top","left","height","width"],f=b.effects.setMode(a,e.options.mode||"hide"),c=e.options.direction||"vertical";b.effects.save(a,i);a.show();var d=b.effects.createWrapper(a).css({overflow:"hidden"});d=a[0].tagName=="IMG"?d:a;var g={size:c=="vertical"?"height":"width",position:c=="vertical"?"top":"left"};c=c=="vertical"?d.height():d.width();if(f=="show"){d.css(g.size,0);d.css(g.position,c/2)}var h={};h[g.size]=
+f=="show"?c:0;h[g.position]=f=="show"?0:c/2;d.animate(h,{queue:false,duration:e.duration,easing:e.options.easing,complete:function(){f=="hide"&&a.hide();b.effects.restore(a,i);b.effects.removeWrapper(a);e.callback&&e.callback.apply(a[0],arguments);a.dequeue()}})})}})(jQuery);
+;/*
+ * jQuery UI Effects Drop 1.8.1
+ *
+ * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT (MIT-LICENSE.txt)
+ * and GPL (GPL-LICENSE.txt) licenses.
+ *
+ * http://docs.jquery.com/UI/Effects/Drop
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function(c){c.effects.drop=function(d){return this.queue(function(){var a=c(this),h=["position","top","left","opacity"],e=c.effects.setMode(a,d.options.mode||"hide"),b=d.options.direction||"left";c.effects.save(a,h);a.show();c.effects.createWrapper(a);var f=b=="up"||b=="down"?"top":"left";b=b=="up"||b=="left"?"pos":"neg";var g=d.options.distance||(f=="top"?a.outerHeight({margin:true})/2:a.outerWidth({margin:true})/2);if(e=="show")a.css("opacity",0).css(f,b=="pos"?-g:g);var i={opacity:e=="show"?1:
+0};i[f]=(e=="show"?b=="pos"?"+=":"-=":b=="pos"?"-=":"+=")+g;a.animate(i,{queue:false,duration:d.duration,easing:d.options.easing,complete:function(){e=="hide"&&a.hide();c.effects.restore(a,h);c.effects.removeWrapper(a);d.callback&&d.callback.apply(this,arguments);a.dequeue()}})})}})(jQuery);
+;/*
+ * jQuery UI Effects Explode 1.8.1
+ *
+ * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT (MIT-LICENSE.txt)
+ * and GPL (GPL-LICENSE.txt) licenses.
+ *
+ * http://docs.jquery.com/UI/Effects/Explode
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function(j){j.effects.explode=function(a){return this.queue(function(){var c=a.options.pieces?Math.round(Math.sqrt(a.options.pieces)):3,d=a.options.pieces?Math.round(Math.sqrt(a.options.pieces)):3;a.options.mode=a.options.mode=="toggle"?j(this).is(":visible")?"hide":"show":a.options.mode;var b=j(this).show().css("visibility","hidden"),g=b.offset();g.top-=parseInt(b.css("marginTop"),10)||0;g.left-=parseInt(b.css("marginLeft"),10)||0;for(var h=b.outerWidth(true),i=b.outerHeight(true),e=0;e<c;e++)for(var f=
+0;f<d;f++)b.clone().appendTo("body").wrap("<div></div>").css({position:"absolute",visibility:"visible",left:-f*(h/d),top:-e*(i/c)}).parent().addClass("ui-effects-explode").css({position:"absolute",overflow:"hidden",width:h/d,height:i/c,left:g.left+f*(h/d)+(a.options.mode=="show"?(f-Math.floor(d/2))*(h/d):0),top:g.top+e*(i/c)+(a.options.mode=="show"?(e-Math.floor(c/2))*(i/c):0),opacity:a.options.mode=="show"?0:1}).animate({left:g.left+f*(h/d)+(a.options.mode=="show"?0:(f-Math.floor(d/2))*(h/d)),top:g.top+
+e*(i/c)+(a.options.mode=="show"?0:(e-Math.floor(c/2))*(i/c)),opacity:a.options.mode=="show"?1:0},a.duration||500);setTimeout(function(){a.options.mode=="show"?b.css({visibility:"visible"}):b.css({visibility:"visible"}).hide();a.callback&&a.callback.apply(b[0]);b.dequeue();j("div.ui-effects-explode").remove()},a.duration||500)})}})(jQuery);
+;/*
+ * jQuery UI Effects Fold 1.8.1
+ *
+ * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT (MIT-LICENSE.txt)
+ * and GPL (GPL-LICENSE.txt) licenses.
+ *
+ * http://docs.jquery.com/UI/Effects/Fold
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function(c){c.effects.fold=function(a){return this.queue(function(){var b=c(this),j=["position","top","left"],d=c.effects.setMode(b,a.options.mode||"hide"),g=a.options.size||15,h=!!a.options.horizFirst,k=a.duration?a.duration/2:c.fx.speeds._default/2;c.effects.save(b,j);b.show();var e=c.effects.createWrapper(b).css({overflow:"hidden"}),f=d=="show"!=h,l=f?["width","height"]:["height","width"];f=f?[e.width(),e.height()]:[e.height(),e.width()];var i=/([0-9]+)%/.exec(g);if(i)g=parseInt(i[1],10)/100*
+f[d=="hide"?0:1];if(d=="show")e.css(h?{height:0,width:g}:{height:g,width:0});h={};i={};h[l[0]]=d=="show"?f[0]:g;i[l[1]]=d=="show"?f[1]:0;e.animate(h,k,a.options.easing).animate(i,k,a.options.easing,function(){d=="hide"&&b.hide();c.effects.restore(b,j);c.effects.removeWrapper(b);a.callback&&a.callback.apply(b[0],arguments);b.dequeue()})})}})(jQuery);
+;/*
+ * jQuery UI Effects Highlight 1.8.1
+ *
+ * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT (MIT-LICENSE.txt)
+ * and GPL (GPL-LICENSE.txt) licenses.
+ *
+ * http://docs.jquery.com/UI/Effects/Highlight
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function(b){b.effects.highlight=function(c){return this.queue(function(){var a=b(this),e=["backgroundImage","backgroundColor","opacity"],d=b.effects.setMode(a,c.options.mode||"show"),f={backgroundColor:a.css("backgroundColor")};if(d=="hide")f.opacity=0;b.effects.save(a,e);a.show().css({backgroundImage:"none",backgroundColor:c.options.color||"#ffff99"}).animate(f,{queue:false,duration:c.duration,easing:c.options.easing,complete:function(){d=="hide"&&a.hide();b.effects.restore(a,e);d=="show"&&!b.support.opacity&&
+this.style.removeAttribute("filter");c.callback&&c.callback.apply(this,arguments);a.dequeue()}})})}})(jQuery);
+;/*
+ * jQuery UI Effects Pulsate 1.8.1
+ *
+ * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT (MIT-LICENSE.txt)
+ * and GPL (GPL-LICENSE.txt) licenses.
+ *
+ * http://docs.jquery.com/UI/Effects/Pulsate
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function(d){d.effects.pulsate=function(a){return this.queue(function(){var b=d(this),c=d.effects.setMode(b,a.options.mode||"show");times=(a.options.times||5)*2-1;duration=a.duration?a.duration/2:d.fx.speeds._default/2;isVisible=b.is(":visible");animateTo=0;if(!isVisible){b.css("opacity",0).show();animateTo=1}if(c=="hide"&&isVisible||c=="show"&&!isVisible)times--;for(c=0;c<times;c++){b.animate({opacity:animateTo},duration,a.options.easing);animateTo=(animateTo+1)%2}b.animate({opacity:animateTo},duration,
+a.options.easing,function(){animateTo==0&&b.hide();a.callback&&a.callback.apply(this,arguments)});b.queue("fx",function(){b.dequeue()}).dequeue()})}})(jQuery);
+;/*
+ * jQuery UI Effects Scale 1.8.1
+ *
+ * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT (MIT-LICENSE.txt)
+ * and GPL (GPL-LICENSE.txt) licenses.
+ *
+ * http://docs.jquery.com/UI/Effects/Scale
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function(c){c.effects.puff=function(b){return this.queue(function(){var a=c(this),e=c.effects.setMode(a,b.options.mode||"hide"),g=parseInt(b.options.percent,10)||150,h=g/100,i={height:a.height(),width:a.width()};c.extend(b.options,{fade:true,mode:e,percent:e=="hide"?g:100,from:e=="hide"?i:{height:i.height*h,width:i.width*h}});a.effect("scale",b.options,b.duration,b.callback);a.dequeue()})};c.effects.scale=function(b){return this.queue(function(){var a=c(this),e=c.extend(true,{},b.options),g=c.effects.setMode(a,
+b.options.mode||"effect"),h=parseInt(b.options.percent,10)||(parseInt(b.options.percent,10)==0?0:g=="hide"?0:100),i=b.options.direction||"both",f=b.options.origin;if(g!="effect"){e.origin=f||["middle","center"];e.restore=true}f={height:a.height(),width:a.width()};a.from=b.options.from||(g=="show"?{height:0,width:0}:f);h={y:i!="horizontal"?h/100:1,x:i!="vertical"?h/100:1};a.to={height:f.height*h.y,width:f.width*h.x};if(b.options.fade){if(g=="show"){a.from.opacity=0;a.to.opacity=1}if(g=="hide"){a.from.opacity=
+1;a.to.opacity=0}}e.from=a.from;e.to=a.to;e.mode=g;a.effect("size",e,b.duration,b.callback);a.dequeue()})};c.effects.size=function(b){return this.queue(function(){var a=c(this),e=["position","top","left","width","height","overflow","opacity"],g=["position","top","left","overflow","opacity"],h=["width","height","overflow"],i=["fontSize"],f=["borderTopWidth","borderBottomWidth","paddingTop","paddingBottom"],k=["borderLeftWidth","borderRightWidth","paddingLeft","paddingRight"],p=c.effects.setMode(a,
+b.options.mode||"effect"),n=b.options.restore||false,m=b.options.scale||"both",l=b.options.origin,j={height:a.height(),width:a.width()};a.from=b.options.from||j;a.to=b.options.to||j;if(l){l=c.effects.getBaseline(l,j);a.from.top=(j.height-a.from.height)*l.y;a.from.left=(j.width-a.from.width)*l.x;a.to.top=(j.height-a.to.height)*l.y;a.to.left=(j.width-a.to.width)*l.x}var d={from:{y:a.from.height/j.height,x:a.from.width/j.width},to:{y:a.to.height/j.height,x:a.to.width/j.width}};if(m=="box"||m=="both"){if(d.from.y!=
+d.to.y){e=e.concat(f);a.from=c.effects.setTransition(a,f,d.from.y,a.from);a.to=c.effects.setTransition(a,f,d.to.y,a.to)}if(d.from.x!=d.to.x){e=e.concat(k);a.from=c.effects.setTransition(a,k,d.from.x,a.from);a.to=c.effects.setTransition(a,k,d.to.x,a.to)}}if(m=="content"||m=="both")if(d.from.y!=d.to.y){e=e.concat(i);a.from=c.effects.setTransition(a,i,d.from.y,a.from);a.to=c.effects.setTransition(a,i,d.to.y,a.to)}c.effects.save(a,n?e:g);a.show();c.effects.createWrapper(a);a.css("overflow","hidden").css(a.from);
+if(m=="content"||m=="both"){f=f.concat(["marginTop","marginBottom"]).concat(i);k=k.concat(["marginLeft","marginRight"]);h=e.concat(f).concat(k);a.find("*[width]").each(function(){child=c(this);n&&c.effects.save(child,h);var o={height:child.height(),width:child.width()};child.from={height:o.height*d.from.y,width:o.width*d.from.x};child.to={height:o.height*d.to.y,width:o.width*d.to.x};if(d.from.y!=d.to.y){child.from=c.effects.setTransition(child,f,d.from.y,child.from);child.to=c.effects.setTransition(child,
+f,d.to.y,child.to)}if(d.from.x!=d.to.x){child.from=c.effects.setTransition(child,k,d.from.x,child.from);child.to=c.effects.setTransition(child,k,d.to.x,child.to)}child.css(child.from);child.animate(child.to,b.duration,b.options.easing,function(){n&&c.effects.restore(child,h)})})}a.animate(a.to,{queue:false,duration:b.duration,easing:b.options.easing,complete:function(){a.to.opacity===0&&a.css("opacity",a.from.opacity);p=="hide"&&a.hide();c.effects.restore(a,n?e:g);c.effects.removeWrapper(a);b.callback&&
+b.callback.apply(this,arguments);a.dequeue()}})})}})(jQuery);
+;/*
+ * jQuery UI Effects Shake 1.8.1
+ *
+ * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT (MIT-LICENSE.txt)
+ * and GPL (GPL-LICENSE.txt) licenses.
+ *
+ * http://docs.jquery.com/UI/Effects/Shake
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function(d){d.effects.shake=function(a){return this.queue(function(){var b=d(this),j=["position","top","left"];d.effects.setMode(b,a.options.mode||"effect");var c=a.options.direction||"left",e=a.options.distance||20,l=a.options.times||3,f=a.duration||a.options.duration||140;d.effects.save(b,j);b.show();d.effects.createWrapper(b);var g=c=="up"||c=="down"?"top":"left",h=c=="up"||c=="left"?"pos":"neg";c={};var i={},k={};c[g]=(h=="pos"?"-=":"+=")+e;i[g]=(h=="pos"?"+=":"-=")+e*2;k[g]=(h=="pos"?"-=":"+=")+
+e*2;b.animate(c,f,a.options.easing);for(e=1;e<l;e++)b.animate(i,f,a.options.easing).animate(k,f,a.options.easing);b.animate(i,f,a.options.easing).animate(c,f/2,a.options.easing,function(){d.effects.restore(b,j);d.effects.removeWrapper(b);a.callback&&a.callback.apply(this,arguments)});b.queue("fx",function(){b.dequeue()});b.dequeue()})}})(jQuery);
+;/*
+ * jQuery UI Effects Slide 1.8.1
+ *
+ * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT (MIT-LICENSE.txt)
+ * and GPL (GPL-LICENSE.txt) licenses.
+ *
+ * http://docs.jquery.com/UI/Effects/Slide
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function(c){c.effects.slide=function(d){return this.queue(function(){var a=c(this),h=["position","top","left"],e=c.effects.setMode(a,d.options.mode||"show"),b=d.options.direction||"left";c.effects.save(a,h);a.show();c.effects.createWrapper(a).css({overflow:"hidden"});var f=b=="up"||b=="down"?"top":"left";b=b=="up"||b=="left"?"pos":"neg";var g=d.options.distance||(f=="top"?a.outerHeight({margin:true}):a.outerWidth({margin:true}));if(e=="show")a.css(f,b=="pos"?-g:g);var i={};i[f]=(e=="show"?b=="pos"?
+"+=":"-=":b=="pos"?"-=":"+=")+g;a.animate(i,{queue:false,duration:d.duration,easing:d.options.easing,complete:function(){e=="hide"&&a.hide();c.effects.restore(a,h);c.effects.removeWrapper(a);d.callback&&d.callback.apply(this,arguments);a.dequeue()}})})}})(jQuery);
+;/*
+ * jQuery UI Effects Transfer 1.8.1
+ *
+ * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT (MIT-LICENSE.txt)
+ * and GPL (GPL-LICENSE.txt) licenses.
+ *
+ * http://docs.jquery.com/UI/Effects/Transfer
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function(e){e.effects.transfer=function(a){return this.queue(function(){var b=e(this),c=e(a.options.to),d=c.offset();c={top:d.top,left:d.left,height:c.innerHeight(),width:c.innerWidth()};d=b.offset();var f=e('<div class="ui-effects-transfer"></div>').appendTo(document.body).addClass(a.options.className).css({top:d.top,left:d.left,height:b.innerHeight(),width:b.innerWidth(),position:"absolute"}).animate(c,a.duration,a.options.easing,function(){f.remove();a.callback&&a.callback.apply(b[0],arguments);
+b.dequeue()})})}})(jQuery);
+;

data/spec/dummy/config/application.rb

@@ -1,5 +1,7 @@
 require File.expand_path('../boot', __FILE__)
 
+require "active_support/railtie"
+require "active_model/railtie"
 require "action_dispatch/railtie"
 require "action_controller/railtie"
 require "action_view/railtie"

data/spec/jquery_helper_spec.rb

@@ -1,9 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 require 'dummy_controller'
-require 'active_model'
-require 'active_model/naming'
-require 'active_model/conversion'
 
 class Ovechkin < Struct.new(:Ovechkin, :id)
   extend ActiveModel::Naming
@@ -12,23 +9,25 @@ class Ovechkin < Struct.new(:Ovechkin, :id)
 end
 
 describe JQueryOnRails::Helpers::JQueryHelper do
-  before(:all) do
-    ActiveSupport::JSON::Encoding.escape_html_entities_in_json = true
-  end
   before(:each) do
     @t = DummyController.new.tap do |c|
 	    c.request = ActionDispatch::Request.new Rack::MockRequest.env_for('/dummy')
     end.view_context
   end
+
+	def create_generator
+	  block = Proc.new{|*args| yield *args if block_given?}
+	  @t.class::JavaScriptGenerator.new @t, &block
+	end
   
   it "is automatically mixed into the template class" do
     @t.class.included_modules.should be_include(JQueryOnRails::Helpers::JQueryHelper)
   end
-  it "overrides all instance methods ActionView::Helpers::PrototypeHelper" do
+  it "overrides all instance methods from ActionView::Helpers::PrototypeHelper" do
     (ActionView::Helpers::PrototypeHelper.instance_methods -
       JQueryOnRails::Helpers::JQueryHelper.instance_methods).should == []
   end
-  it "overrides all instance methods ActionView::Helpers::ScriptaculousHelper" do
+  it "overrides all instance methods from ActionView::Helpers::ScriptaculousHelper" do
     return pending("not yet implemented")
     (ActionView::Helpers::ScriptaculousHelper.instance_methods -
       JQueryOnRails::Helpers::JQueryHelper.instance_methods).should == []
@@ -94,184 +93,197 @@ describe JQueryOnRails::Helpers::JQueryHelper do
 	  end
   end
   
-  describe "javascript generation" do
+  describe '#visual_effect' do
+	  it "renames effects" do
+	    @t.visual_effect(:fade,'blah').should == %(jQuery("#blah").fadeOut();)
+	    @t.visual_effect(:appear,'blah').should == %(jQuery("#blah").fadeIn();)
+	  end
+	  it "renames toggle effects" do
+	    @t.visual_effect(:toggle_slide,'blah').should == %(jQuery("#blah").slideToggle();)
+	  end
+	  it "rewrites :toggle_appear" do
+	    @t.visual_effect(:toggle_appear,'blah').should == 
+	      "(function(state){ return (function() { state=!state; return jQuery(\"#blah\")['fade'+(state?'In':'Out')](); })(); })(jQuery(\"#blah\").css('visiblity')!='hidden');"
+	  end
+  end
+
+  describe '#update_page' do
+    it 'matches output from #create_generator' do
+      @block = proc{|page| page.replace_html 'foo', 'bar'}
+      @t.update_page(&@block).should == create_generator(&@block).to_s
+    end
+  end
+  
+  describe '#update_page_tag' do
     before(:each) do
       @block = proc{|page| page.replace_html 'foo', 'bar'}
     end
-    
-    def create_generator
-      block = Proc.new{|*args| yield *args if block_given?}
-      @t.class::JavaScriptGenerator.new @t, &block
+    it 'matches output from #create_generator wrapped in a script tag' do
+      @t.update_page_tag(&@block).should == @t.javascript_tag(create_generator(&@block).to_s)
     end
-    
-    describe 'JavaScriptGenerator' do
-      before(:each) do
-        @g = create_generator
-      end
-      it "replaces the PrototypeHelper's generator" do
+    it 'outputs html attributes' do
+      @t.update_page_tag(:defer=>true, &@block).should == @t.javascript_tag(create_generator(&@block).to_s, :defer=>true)
+    end
+  end
+  
+	describe 'JavaScriptGenerator' do
+	  before(:each) do
+	    @g = create_generator
+	  end
+	  it "replaces the PrototypeHelper's generator" do
 	      @t.class::JavaScriptGenerator.should == JQueryOnRails::Helpers::JQueryHelper::JavaScriptGenerator
 	      JQueryOnRails::Helpers::JQueryHelper::JavaScriptGenerator.should === @g
-      end
-      it "#insert_html" do
-        @g.insert_html(:top, 'element', '<p>This is a test</p>').should ==
-          'jQuery("#element").prepend("\\u003Cp\\u003EThis is a test\\u003C/p\\u003E");'
-        @g.insert_html(:bottom, 'element', '<p>This is a test</p>').should ==
-          'jQuery("#element").append("\\u003Cp\\u003EThis is a test\\u003C/p\\u003E");'
-        @g.insert_html(:before, 'element', '<p>This is a test</p>').should ==
-          'jQuery("#element").before("\\u003Cp\\u003EThis is a test\\u003C/p\\u003E");'
-        @g.insert_html(:after, 'element', '<p>This is a test</p>').should ==
-          'jQuery("#element").after("\\u003Cp\\u003EThis is a test\\u003C/p\\u003E");'
-      end
-      it "#replace_html" do
-	      @g.replace_html('element', '<p>This is a test</p>').should ==
-			    'jQuery("#element").html("\\u003Cp\\u003EThis is a test\\u003C/p\\u003E");'
-      end
-      it "#replace" do
-	      @g.replace('element', '<div id="element"><p>This is a test</p></div>').should ==
-			    'jQuery("#element").replaceWith("\\u003Cdiv id=\"element\"\\u003E\\u003Cp\\u003EThis is a test\\u003C/p\\u003E\\u003C/div\\u003E");'
-      end
-      it "#remove" do
-	      @g.remove('foo').should == 'jQuery("#foo").remove();'
-	      @g.remove('foo', 'bar', 'baz').should == 'jQuery("#foo, #bar, #baz").remove();'
-      end
-      it "#show" do
-        @g.show('foo').should == 'jQuery("#foo").show();'
-	      @g.show('foo', 'bar', 'baz').should == 'jQuery("#foo, #bar, #baz").show();'
-      end
-      it "#hide" do
-        @g.hide('foo').should == 'jQuery("#foo").hide();'
-	      @g.hide('foo', 'bar', 'baz').should == 'jQuery("#foo, #bar, #baz").hide();'
-      end
-      it "#toggle" do
-        @g.toggle('foo').should == 'jQuery("#foo").toggle();'
-	      @g.toggle('foo', 'bar', 'baz').should == 'jQuery("#foo, #bar, #baz").toggle();'
-      end
-      it "#alert" do
-				@g.alert('hello').should == 'alert("hello");'
-      end
-      it "#redirect_to" do
-				@g.redirect_to(:controller=>'dummy', :action=>'index').should ==
-				  'window.location.href = "/dummy";'
-				@g.redirect_to("http://www.example.com/welcome?a=b&c=d").should == 
-				  'window.location.href = "http://www.example.com/welcome?a=b&c=d";'
-      end
-      it "#reload" do
-				@g.reload.should == 'window.location.reload();'
-      end
-      it "#delay" do
-        @g.delay(20){@g.hide('foo')}
-        @g.to_s.should == "setTimeout(function(){\n;\njQuery(\"#foo\").hide();\n}, 20000);"
-      end
-      it "#to_s" do
-		    @g.insert_html(:top, 'element', '<p>This is a test</p>')
-		    @g.insert_html(:bottom, 'element', '<p>This is a test</p>')
-		    @g.remove('foo', 'bar')
-		    @g.replace_html('baz', '<p>This is a test</p>')
-
-        @g.to_s.should == <<-EOS.chomp
+	  end
+	  it "#insert_html" do
+	    @g.insert_html(:top, 'element', '<p>This is a test</p>').should ==
+	      'jQuery("#element").prepend("\\u003Cp\\u003EThis is a test\\u003C/p\\u003E");'
+	    @g.insert_html(:bottom, 'element', '<p>This is a test</p>').should ==
+	      'jQuery("#element").append("\\u003Cp\\u003EThis is a test\\u003C/p\\u003E");'
+	    @g.insert_html(:before, 'element', '<p>This is a test</p>').should ==
+	      'jQuery("#element").before("\\u003Cp\\u003EThis is a test\\u003C/p\\u003E");'
+	    @g.insert_html(:after, 'element', '<p>This is a test</p>').should ==
+	      'jQuery("#element").after("\\u003Cp\\u003EThis is a test\\u003C/p\\u003E");'
+	  end
+	  it "#replace_html" do
+      @g.replace_html('element', '<p>This is a test</p>').should ==
+		    'jQuery("#element").html("\\u003Cp\\u003EThis is a test\\u003C/p\\u003E");'
+	  end
+	  it "#replace" do
+      @g.replace('element', '<div id="element"><p>This is a test</p></div>').should ==
+		    'jQuery("#element").replaceWith("\\u003Cdiv id=\"element\"\\u003E\\u003Cp\\u003EThis is a test\\u003C/p\\u003E\\u003C/div\\u003E");'
+	  end
+	  it "#remove" do
+      @g.remove('foo').should == 'jQuery("#foo").remove();'
+      @g.remove('foo', 'bar', 'baz').should == 'jQuery("#foo, #bar, #baz").remove();'
+	  end
+	  it "#show" do
+	    @g.show('foo').should == 'jQuery("#foo").show();'
+      @g.show('foo', 'bar', 'baz').should == 'jQuery("#foo, #bar, #baz").show();'
+	  end
+	  it "#hide" do
+	    @g.hide('foo').should == 'jQuery("#foo").hide();'
+      @g.hide('foo', 'bar', 'baz').should == 'jQuery("#foo, #bar, #baz").hide();'
+	  end
+	  it "#toggle" do
+	    @g.toggle('foo').should == 'jQuery("#foo").toggle();'
+      @g.toggle('foo', 'bar', 'baz').should == 'jQuery("#foo, #bar, #baz").toggle();'
+	  end
+	  it "#alert" do
+			@g.alert('hello').should == 'alert("hello");'
+	  end
+	  it "#redirect_to" do
+			@g.redirect_to(:controller=>'dummy', :action=>'index').should ==
+			  'window.location.href = "/dummy";'
+			@g.redirect_to("http://www.example.com/welcome?a=b&c=d").should == 
+			  'window.location.href = "http://www.example.com/welcome?a=b&c=d";'
+	  end
+	  it "#reload" do
+			@g.reload.should == 'window.location.reload();'
+	  end
+	  it "#delay" do
+	    @g.delay(20){@g.hide('foo')}
+	    @g.to_s.should == "setTimeout(function(){\n;\njQuery(\"#foo\").hide();\n}, 20000);"
+	  end
+	  it "#to_s" do
+	    @g.insert_html(:top, 'element', '<p>This is a test</p>')
+	    @g.insert_html(:bottom, 'element', '<p>This is a test</p>')
+	    @g.remove('foo', 'bar')
+	    @g.replace_html('baz', '<p>This is a test</p>')
+	
+	    @g.to_s.should == <<-EOS.chomp
 jQuery("#element").prepend("\\u003Cp\\u003EThis is a test\\u003C/p\\u003E");
 jQuery("#element").append("\\u003Cp\\u003EThis is a test\\u003C/p\\u003E");
 jQuery("#foo, #bar").remove();
 jQuery("#baz").html("\\u003Cp\\u003EThis is a test\\u003C/p\\u003E");
 EOS
-      end
-		  it "#literal" do
-		    ActiveSupport::JSON.encode(@g.literal("function() {}")).should == "function() {}"
-		    @g.to_s.should == ""
-		  end
-		  it "proxies to class methods" do
-		    @g.form.focus('my_field')
-		    @g.to_s.should == "Form.focus(\"my_field\");"
-		  end
-		  it "proxies to class methods with blocks" do
-		    @g.my_object.my_method do |p|
-		      p[:one].show
-		      p[:two].hide
-		    end
-		    @g.to_s.should == "MyObject.myMethod(function() { jQuery(\"#one\").show();\njQuery(\"#two\").hide(); });"
-		  end
-		  it "calls with or without blocks" do
-		    @g.call(:before)
-		    @g.call(:my_method) do |p|
-		      p[:one].show
-		      p[:two].hide
-		    end
-		    @g.call(:in_between)
-		    @g.call(:my_method_with_arguments, true, "hello") do |p|
-		      p[:three].toggle
-		    end
-		    @g.to_s.should == "before();\nmy_method(function() { jQuery(\"#one\").show();\njQuery(\"#two\").hide(); });\nin_between();\nmy_method_with_arguments(true, \"hello\", function() { jQuery(\"#three\").toggle(); });"
-		  end
-
-      describe "element proxy compatibility" do
-        before(:each) do
-          @g.extend @g.class::CompatibilityMethods
-        end
-        it "gets properties" do
-          @g['hello']['style']
-          @g.to_s.should == 'jQuery("#hello")[0].style;'
-        end
-        it "gets nested properties" do
-          @g['hello']['style']['color']
-          @g.to_s.should == 'jQuery("#hello")[0].style.color;'
-        end
-        it "sets properties" do
-          @g['hello'].width = 400;
-          @g.to_s.should == 'jQuery("#hello")[0].width = 400;'
-        end
-        it "sets nested properties" do
-          @g['hello']['style']['color'] = 'red';
-          @g.to_s.should == 'jQuery("#hello")[0].style.color = "red";'
-        end
-      end
-      describe "element proxy" do
-	      it "refers by element ID" do
-				  @g['hello'].should == 'jQuery("#hello");'
-	      end
-	      it "refers via ActiveModel::Naming" do
-				  @g[Ovechkin.new(:id=>5)].should == 'jQuery("#bunny_5");'
-				  @g[Ovechkin.new].should == 'jQuery("#new_bunny");'
-	      end
-	      it "refers indirectly" do
-	        @g['hello'].hide('first').show
-	        @g.to_s.should == 'jQuery("#hello").hide("first").show();'
-	      end
-	      it "calls methods" do
-	        @g['hello'].hide
-	        @g.to_s.should == 'jQuery("#hello").hide();'
-	      end
-	      it "gets properties" do
-	        @g['hello'][0]['style']
-	        @g.to_s.should == 'jQuery("#hello")[0].style;'
-	      end
-	      it "gets nested properties" do
-	        @g['hello'][0]['style']['color']
-	        @g.to_s.should == 'jQuery("#hello")[0].style.color;'
-	      end
-	      it "sets properties" do
-	        @g['hello'][0].width = 400;
-	        @g.to_s.should == 'jQuery("#hello")[0].width = 400;'
-	      end
-	      it "sets nested properties" do
-	        @g['hello'][0]['style']['color'] = 'red';
-	        @g.to_s.should == 'jQuery("#hello")[0].style.color = "red";'
-	      end
-      end
-    end
-  
-	  describe '#update_page' do
-	    it 'matches output from #create_generator' do
-	      @t.update_page(&@block).should == create_generator(&@block).to_s
+	  end
+	  it "#literal" do
+	    ActiveSupport::JSON.encode(@g.literal("function() {}")).should == "function() {}"
+	    @g.to_s.should == ""
+	  end
+	  it "proxies to class methods" do
+	    @g.form.focus('my_field')
+	    @g.to_s.should == "Form.focus(\"my_field\");"
+	  end
+	  it "proxies to class methods with blocks" do
+	    @g.my_object.my_method do |p|
+	      p[:one].show
+	      p[:two].hide
 	    end
+	    @g.to_s.should == "MyObject.myMethod(function() { jQuery(\"#one\").show();\njQuery(\"#two\").hide(); });"
 	  end
-  
-	  describe '#update_page_tag' do
-	    it 'matches output from #create_generator wrapped in a script tag' do
-	      @t.update_page_tag(&@block).should == @t.javascript_tag(create_generator(&@block).to_s)
+	  it "calls with or without blocks" do
+	    @g.call(:before)
+	    @g.call(:my_method) do |p|
+	      p[:one].show
+	      p[:two].hide
 	    end
-	    it 'outputs html attributes' do
-	      @t.update_page_tag(:defer=>true, &@block).should == @t.javascript_tag(create_generator(&@block).to_s, :defer=>true)
+	    @g.call(:in_between)
+	    @g.call(:my_method_with_arguments, true, "hello") do |p|
+	      p[:three].toggle
 	    end
+	    @g.to_s.should == "before();\nmy_method(function() { jQuery(\"#one\").show();\njQuery(\"#two\").hide(); });\nin_between();\nmy_method_with_arguments(true, \"hello\", function() { jQuery(\"#three\").toggle(); });"
 	  end
+	  it '#visual_effect matches helper method output' do
+	    @g.visual_effect(:toggle_slide,'blah')
+	    @g.to_s.should == @t.visual_effect(:toggle_slide,'blah')
+	  end
+	
+	  describe "element proxy compatibility" do
+	    before(:each) do
+	      @g.extend @g.class::CompatibilityMethods
+	    end
+	    it "gets properties" do
+	      @g['hello']['style']
+	      @g.to_s.should == 'jQuery("#hello")[0].style;'
+	    end
+	    it "gets nested properties" do
+	      @g['hello']['style']['color']
+	      @g.to_s.should == 'jQuery("#hello")[0].style.color;'
+	    end
+	    it "sets properties" do
+	      @g['hello'].width = 400;
+	      @g.to_s.should == 'jQuery("#hello")[0].width = 400;'
+	    end
+	    it "sets nested properties" do
+	      @g['hello']['style']['color'] = 'red';
+	      @g.to_s.should == 'jQuery("#hello")[0].style.color = "red";'
+	    end
+	  end
+	  describe "element proxy" do
+      it "refers by element ID" do
+			  @g['hello']
+			  @g.to_s.should == 'jQuery("#hello")'
+      end
+      it "refers by element ID, using ActiveModel::Naming" do
+			  @g[Ovechkin.new]
+			  @g.to_s.should == 'jQuery("#new_ovechkin")'
+      end
+      it "refers indirectly" do
+        @g['hello'].hide('first').show
+        @g.to_s.should == 'jQuery("#hello").hide("first").show();'
+      end
+      it "calls methods" do
+        @g['hello'].hide
+        @g.to_s.should == 'jQuery("#hello").hide();'
+      end
+      it "gets properties" do
+        @g['hello'][0]['style']
+        @g.to_s.should == 'jQuery("#hello")[0].style;'
+      end
+      it "gets nested properties" do
+        @g['hello'][0]['style']['color']
+        @g.to_s.should == 'jQuery("#hello")[0].style.color;'
+      end
+      it "sets properties" do
+        @g['hello'][0].width = 400;
+        @g.to_s.should == 'jQuery("#hello")[0].width = 400;'
+      end
+      it "sets nested properties" do
+        @g['hello'][0]['style']['color'] = 'red';
+        @g.to_s.should == 'jQuery("#hello")[0].style.color = "red";'
+      end
+	  end
+	  
   end
 end

data/spec/jquery_ui_helper_spec.rb

@@ -0,0 +1,55 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+require 'dummy_controller'
+
+describe JQueryOnRails::Helpers::JQueryUiHelper do
+  before(:each) do
+    @t = DummyController.new.tap do |c|
+      c.request = ActionDispatch::Request.new Rack::MockRequest.env_for('/dummy')
+    end.view_context
+    @t.extend JQueryOnRails::Helpers::JQueryUiHelper
+  end
+  describe '#visual_effect' do
+    it "calls core jQuery effects primitives" do
+      @t.visual_effect(:fade,'blah').should == %(jQuery("#blah").fadeOut();)
+      @t.visual_effect(:appear,'blah').should == %(jQuery("#blah").fadeIn();)
+    end
+    it "calls hide() or show() based on the effect name" do
+      @t.visual_effect(:shrink,'blah').should == %(jQuery("#blah").hide('size');)
+      @t.visual_effect(:grow,'blah').should == %(jQuery("#blah").show('size');)
+      @t.visual_effect(:puff_in,'blah').should == %(jQuery("#blah").show('puff');)
+      @t.visual_effect(:puff_out,'blah').should == %(jQuery("#blah").hide('puff');)
+    end
+    it "calls effect() by default" do
+      @t.visual_effect(:puff,'blah').should == %(jQuery("#blah").effect('puff');)
+    end
+    it "uses default options for :direction" do
+      @t.visual_effect(:blind_down,'blah').should ==
+        %(jQuery("#blah").show('blind',{direction:'vertical'});)
+      @t.visual_effect(:blind_up,'blah').should ==
+        %(jQuery("#blah").hide('blind',{direction:'vertical'});)
+      @t.visual_effect(:blind_right,'blah').should ==
+        %(jQuery("#blah").show('blind',{direction:'horizontal'});)
+      @t.visual_effect(:blind_left,'blah').should ==
+        %(jQuery("#blah").hide('blind',{direction:'horizontal'});)
+      @t.visual_effect(:blind_up,'blah',:direction=>:horizontal).should ==
+        %(jQuery("#blah").hide('blind',{direction:'horizontal'});)
+      @t.visual_effect(:blind_right,'blah',:direction=>:vertical).should ==
+        %(jQuery("#blah").show('blind',{direction:'vertical'});)
+    end
+    it "uses jQuery UI toggle effects" do
+      @t.visual_effect(:toggle_slide,'blah').should == %(jQuery("#blah").toggle('slide',{direction:'vertical'});)
+      @t.visual_effect(:toggle_blind,'blah').should == %(jQuery("#blah").toggle('blind',{direction:'vertical'});)
+      @t.visual_effect(:toggle_blind,'blah',:direction=>:horizontal).should ==
+        %(jQuery("#blah").toggle('blind',{direction:'horizontal'});)
+      @t.visual_effect(:toggle_shrink,'blah').should == %(jQuery("#blah").toggle('size');)
+      @t.visual_effect(:toggle_grow,'blah').should == %(jQuery("#blah").toggle('size');)
+      @t.visual_effect(:toggle_puff,'blah').should == %(jQuery("#blah").toggle('puff');)
+    end
+    it "implements :toggle_appear with inline JavaScript" do
+      body = JQueryOnRails::Helpers::JQueryUiHelper::FX_OPTIONS[:toggleAppear][:mode]
+      @t.visual_effect(:toggle_appear,'blah').should == 
+        "(function(element,name,options){ #{body} })(jQuery(\"#blah\"),'fade');"
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -12,6 +12,7 @@ require "rspec"
 #require "rspec/rails"
 
 Rails.backtrace_cleaner.remove_silencers!
+ActiveSupport::JSON::Encoding.escape_html_entities_in_json = true
 
 Rspec.configure do |config|
   require 'rspec/expectations'

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Joe Khoobyar
@@ -65,7 +65,9 @@ files:
 - jquery_on_rails.gemspec
 - lib/jquery_on_rails.rb
 - lib/jquery_on_rails/helpers/jquery_helper.rb
+- lib/jquery_on_rails/helpers/jquery_ui_helper.rb
 - lib/jquery_on_rails/railtie.rb
+- public/javascripts/jquery-ui-effects.js
 - public/javascripts/jquery.js
 - public/javascripts/rails.js
 - spec/dummy/app/controllers/dummy_controller.rb
@@ -78,6 +80,7 @@ files:
 - spec/dummy/log/test.log
 - spec/jquery_helper_spec.rb
 - spec/jquery_on_rails_spec.rb
+- spec/jquery_ui_helper_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/joekhoobyar/jquery_on_rails
@@ -119,4 +122,5 @@ test_files:
 - spec/dummy/config/routes.rb
 - spec/jquery_helper_spec.rb
 - spec/jquery_on_rails_spec.rb
+- spec/jquery_ui_helper_spec.rb
 - spec/spec_helper.rb