jquery_on_rails 0.2.2 → 0.3.0

data/LICENSE

@@ -1,20 +1,20 @@
-Copyright (c) 2010 Joe Khoobyar
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+Copyright (c) 2010 Joe Khoobyar
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -1,4 +1,5 @@
 require 'rubygems'
+require 'rspec'
 require 'rake'
 gem 'rspec', '>= 2.0.0.beta.8'
 require 'rspec'
@@ -13,10 +14,10 @@ begin
     gem.email = "joe@ankhcraft.com"
     gem.homepage = "http://github.com/joekhoobyar/jquery_on_rails"
     gem.authors = ["Joe Khoobyar"]
-    gem.files = Dir["{lib,public,spec}/**/*", "{bin}/*", "*"]
+    gem.files = Dir["{lib,public,spec}/**/*", "{bin}/*", "*"].reject{|f| f.end_with? '.log'}
     gem.rubyforge_project = "jquery_on_rails"
-    gem.add_dependency "actionpack", ">= 3.0.0.beta1"
-    gem.add_development_dependency "rspec", ">= 2.0.0.beta.8"
+    gem.add_dependency "actionpack", "~> 3.0.0"
+    gem.add_development_dependency "rspec", "~> 2.0"
     # gem.add_development_dependency "rspec-rails", ">= 2.0.0.beta.8"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.3.0

data/jquery_on_rails.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jquery_on_rails}
-  s.version = "0.2.2"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joe Khoobyar"]
@@ -66,15 +66,15 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<actionpack>, [">= 3.0.0.beta1"])
-      s.add_development_dependency(%q<rspec>, [">= 2.0.0.beta.8"])
+      s.add_runtime_dependency(%q<actionpack>, ["~> 3.0.0"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.0"])
     else
-      s.add_dependency(%q<actionpack>, [">= 3.0.0.beta1"])
-      s.add_dependency(%q<rspec>, [">= 2.0.0.beta.8"])
+      s.add_dependency(%q<actionpack>, ["~> 3.0.0"])
+      s.add_dependency(%q<rspec>, ["~> 2.0"])
     end
   else
-    s.add_dependency(%q<actionpack>, [">= 3.0.0.beta1"])
-    s.add_dependency(%q<rspec>, [">= 2.0.0.beta.8"])
+    s.add_dependency(%q<actionpack>, ["~> 3.0.0"])
+    s.add_dependency(%q<rspec>, ["~> 2.0"])
   end
 end
 

data/lib/jquery_on_rails/helpers/jquery_helper.rb

@@ -92,13 +92,13 @@ module JQueryOnRails
 	      # Mostly copied from Rails 3 PrototypeHelper
         module GeneratorMethods
           def to_s #:nodoc:
-            returning javascript = @lines * $/ do
-              if ActionView::Base.debug_rjs
-                source = javascript.dup
-                javascript.replace "try {\n#{source}\n} catch (e) "
-                javascript << "{ alert('RJS error:\\n\\n' + e.toString()); alert('#{source.gsub('\\','\0\0').gsub(/\r\n|\n|\r/, "\\n").gsub(/["']/) { |m| "\\#{m}" }}'); throw e }"
-              end
+            javascript = @lines * $/
+            if ActionView::Base.debug_rjs
+              source = javascript.dup
+              javascript.replace "try {\n#{source}\n} catch (e) "
+              javascript << "{ alert('RJS error:\\n\\n' + e.toString()); alert('#{source.gsub('\\','\0\0').gsub(/\r\n|\n|\r/, "\\n").gsub(/["']/) { |m| "\\#{m}" }}'); throw e }"
             end
+            javascript
           end
     
           def [](id)
@@ -195,9 +195,9 @@ module JQueryOnRails
             end
     
             def record(line)
-              returning line = "#{line.to_s.chomp.gsub(/\;\z/, '')};" do
-                self << line
-              end
+              line = "#{line.to_s.chomp.gsub(/\;\z/, '')};"
+              self << line
+              line
             end
     
             def render(*options)

data/lib/jquery_on_rails/railtie.rb

@@ -2,6 +2,8 @@ require 'jquery_on_rails'
 require 'rails'
 
 class JQueryOnRails::Railtie < Rails::Railtie
+
+  config.action_view.javascript_expansions[:defaults] = %w(jquery rails)
   
   initializer "jquery_on_rails.action_view_helpers" do
     ActiveSupport.on_load(:action_view) do
@@ -16,14 +18,6 @@ class JQueryOnRails::Railtie < Rails::Railtie
 			ActionView::Helpers::JavaScriptHelper.send :include, JQueryOnRails::Helpers::JQueryHelper
 			ActionView::Helpers.send :include, JQueryOnRails::Helpers::JQueryHelper
 			ActionView::Base.send :include, JQueryOnRails::Helpers::JQueryHelper
-		
-			# Redefine the default sources so that we don't try to include prototype JS files.
-			require 'action_view/helpers/asset_tag_helper'
-			ActionView::Helpers::AssetTagHelper.class_eval do
-			  remove_const :JAVASCRIPT_DEFAULT_SOURCES if const_defined? :JAVASCRIPT_DEFAULT_SOURCES
-			  const_set :JAVASCRIPT_DEFAULT_SOURCES, %w/jquery rails/
-			  reset_javascript_include_default
-			end
 		end
   end
 end

data/public/javascripts/rails.js

@@ -1,3 +1,24 @@
+(function($) {
+  
+	/*
+	* Since jQuery doesn't really have an easy to use
+	* reset function, this is to replicate $.clear();
+	**/
+	$.fn.clear = function() {
+		return this.each(function() {
+			var type = this.type, tag = this.tagName.toLowerCase();
+			if (tag == 'form')
+				$(':input',this).clear ();
+			else if (type == 'text' || type == 'password' || tag == 'textarea')
+				this.value = '';
+			else if (type == 'checkbox' || type == 'radio')
+				this.checked = false;
+			else if (tag == 'select')
+				this.selectedIndex = -1;
+		});
+	}
+})(jQuery);
+
 jQuery(function ($) {
     var csrf_token = $('meta[name=csrf-token]').attr('content'),
         csrf_param = $('meta[name=csrf-param]').attr('content');
@@ -33,6 +54,7 @@ jQuery(function ($) {
                     $.ajax({
                         url: url,
                         data: data,
+                        dataType: 'script',
                         type: method.toUpperCase(),
                         beforeSend: function (xhr) {
                             xhr.setRequestHeader("Accept", "text/javascript");
@@ -52,69 +74,116 @@ jQuery(function ($) {
 
                 el.trigger('ajax:after');
             }
+        },
+        
+        /**
+         * Creates and fills out a new form, using an anchor's href as the action URL.
+         */
+        applyToNewForm : function (options) {
+			var link = $(this), elements = [], form = null;
+			options = options || {};
+			options.url = options.url || link.attr('href') || window.location.href;
+        	if (link && options.url) {
+				options.method = options.method || link.attr('data-method');
+				if (options.method)
+					elements.push ('<input name="_method" value="'+options.method+'" type="hidden" />');
+				if (csrf_param && csrf_token)
+					elements.push ('<input name="'+csrf_param+'" value="'+csrf_token+'" type="hidden" />');
+			  return $('<form method="post"/>').hide().appendTo('body').applyToForm (elements, options);
+			}
+        },
+
+        /**
+         * Applies the given element list and options to this form.
+         */
+        applyToForm : function (elements, options) {
+			var form = $(this);
+			if (arguments.length < 3 && ! $.isArray (elements))
+				{ options = elements; elements = null; }
+			elements = elements || [];
+			var url = options.url, params = options.parameters, method = options.method;
+			if (! url && (! params || $.isEmptyObject (params)))
+				return form;
+
+			// STRING parameter :  HTTP GET parameters (query string fragment)
+			if (typeof(params)=='string')
+				url += (url.indexOf('?')<0 ? '?' : '&') + params;
+
+			// OBJECT parameter :  HTTP POST variables (via hidden form elements)
+			//   This feature converts values into hidden form inputs,
+			//   flattening nested keys along the way.
+			else if ($.isPlainObject(params)) {
+				var key;
+
+				$.each (params, function (subkey,subval) {
+					if (key && typeof(subkey)=='string')
+						subkey = key+'['+subkey+']';
+
+					if (typeof(subval)!='string') {
+						key = subkey;
+						if ($.isPlainObject (subval) || $.isArray (subval))
+							$.each (subval, arguments.callee);
+					}
+					else if (form[0].elements[subkey]) {
+						$(form[0].elements[subkey]).val (subval);
+					}
+					else {
+						elements.push ($('<input type="hidden"/>').attr({'name': subkey, 'value' : subval}));
+					}
+				});
+			}
+
+			// Finally, we can fill in the form and return it.
+			for (var i = 0; i < elements.length; i++)
+				form.append(elements[i]);
+			if (url)
+				form.attr('action', url);
+			return form;
         }
     });
 
     /**
      *  confirmation handler
      */
-    $('a[data-confirm],input[data-confirm]').live('click', function () {
+    $('a[data-confirm],input[data-confirm]').live('click', function (e) {
         var el = $(this);
-        if (el.triggerAndReturn('confirm')) {
-            if (!confirm(el.attr('data-confirm'))) {
-                return false;
-            }
-        }
+        if (el.triggerAndReturn('confirm') && !confirm(el.attr('data-confirm')))
+            return false;
     });
 
-
     /**
      * remote handlers
      */
-    $('form[data-remote="true"]').live('submit', function (e) {
+    $('form[data-remote]').live('submit', function (e) {
         $(this).callRemote();
         e.preventDefault();
     });
 
-    $('a[data-remote="true"],input[data-remote="true"]').live('click', function (e) {
+    $('a[data-remote],input[data-remote]').live('click', function(e) {
         $(this).callRemote();
         e.preventDefault();
     });
 
-    $('a[data-method][data-remote!=true]').live('click',function(e){
-        var link = $(this),
-            href = link.attr('href'),
-            method = link.attr('data-method'),
-            form = $('<form method="post" action="'+href+'">'),
-            input = $('<input name="_method" value="'+method+'" type="hidden" />'),
-            csrf_input = $('<input name="'+csrf_param+'" value="'+csrf_token+'" type="hidden" />');
-
-        form.hide()
-            .append(input)
-            .append(csrf_input)
-            .appendTo('body'); // redundant?
-
+    $('a[data-method]:not([data-remote])').live('click', function(e) {
+        var form = $(this).applyToNewForm ();
         e.preventDefault();
         form.submit();
     });
 
     /**
-     * disable_with handlers
+     * disable-with handlers
      */
-    $('form[data-remote="true"]').live('ajax:before', function () {
-        $(this).children('input[data-disable-with]').each(function () {
+    $('form[data-remote]:has(input[data-disable-with])').live('ajax:before', function () {
+        $('input[data-disable-with]', this).each(function () {
             var input = $(this);
-            input.data('enable_with', input.val())
+            input.data('enable-with', input.val())
                  .attr('value', input.attr('data-disable-with'))
                  .attr('disabled', 'disabled');
         });
-    });
-
-    $('form[data-remote="true"]').live('ajax:after', function () {
-        $(this).children('input[data-disable-with]').each(function () {
+    }).live('ajax:after', function () {
+        $('input[data-disable-with]', this).each(function () {
             var input = $(this);
-            input.removeAttr('disabled')
-                 .val(input.data('enable_with'));
+            input.removeAttr('disabled').val(input.data('enable-with'));
         });
     });
 });

data/spec/dummy/app/controllers/dummy_controller.rb

@@ -1,5 +1,5 @@
-class DummyController < ActionController::Base
-
-  protect_from_forgery
-
-end
+class DummyController < ActionController::Base
+
+  protect_from_forgery
+
+end

data/spec/dummy/app/helpers/dummy_helper.rb

@@ -1,2 +1,2 @@
-module DummyHelper
-end
+module DummyHelper
+end

data/spec/dummy/config/boot.rb

@@ -1,3 +1,3 @@
-require 'rubygems'
-
-$:.unshift File.expand_path('../../../../lib', __FILE__)
+require 'rubygems'
+
+$:.unshift File.expand_path('../../../../lib', __FILE__)

data/spec/dummy/config/environment.rb

@@ -1,5 +1,5 @@
-# Load the rails application
-require File.expand_path('../application', __FILE__)
-
-# Initialize the rails application
-Dummy::Application.initialize!
+# Load the rails application
+require File.expand_path('../application', __FILE__)
+
+# Initialize the rails application
+Dummy::Application.initialize!

data/spec/dummy/config/environments/test.rb

@@ -1,6 +1,8 @@
 Dummy::Application.configure do
   config.cache_classes = true
-  config.consider_all_requests_local       = true
+  config.consider_all_requests_local = true
   config.log_level = :debug
   config.threadsafe!
+
+  config.active_support.deprecation = :stderr
 end

data/spec/dummy/config/routes.rb

@@ -1,3 +1,3 @@
-Dummy::Application.routes.draw do |map|
+Dummy::Application.routes.draw do
   match ':controller(/:action(/:id(.:format)))'
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 2
-  version: 0.2.2
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Joe Khoobyar
@@ -22,14 +22,13 @@ dependencies:
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 3
         - 0
         - 0
-        - beta1
-        version: 3.0.0.beta1
+        version: 3.0.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -37,15 +36,12 @@ dependencies:
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 2
         - 0
-        - 0
-        - beta
-        - 8
-        version: 2.0.0.beta.8
+        version: "2.0"
   type: :development
   version_requirements: *id002
 description: A complete replacement for Rails 3 javascript helpers and unobstrusive javacript (ujs) using JQuery instead of prototype/scriptaculous