jquery-rails 1.0.9 → 1.0.10

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.0.10 (13 June 2011)
+
+  - Updated to latest jqueyr-ujs with bug fixes
+
 ## 1.0.9 (25 May 2011)
 
   - Merged with new rails repo (3.1 fix)

data/jquery-rails.gemspec

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-require File.expand_path('../lib/jquery-rails/version', __FILE__)
+require File.expand_path('../lib/jquery/rails/version', __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "jquery-rails"

data/lib/generators/jquery/install/install_generator.rb

@@ -3,36 +3,33 @@ require 'rails'
 module Jquery
   module Generators
     class InstallGenerator < ::Rails::Generators::Base
-      @@jquery_version     = "1.6.1"
-      @@jquery_ui_version  = "1.8.12"
-      @@jquery_ujs_version = "dad6982dc592686677e6845e681233c40d2ead27"
 
-      desc "This generator installs jQuery #{@@jquery_version}, jQuery-ujs, and (optionally) jQuery UI #{@@jquery_ui_version}"
+      desc "This generator installs jQuery #{Jquery::Rails::JQUERY_VERSION}, jQuery-ujs, and (optionally) jQuery UI #{Jquery::Rails::JQUERY_UI_VERSION}"
       class_option :ui, :type => :boolean, :default => false, :desc => "Include jQueryUI"
       source_root File.expand_path('../../../../../vendor/assets/javascripts', __FILE__)
 
       def remove_prototype
-        PROTOTYPE_JS.each do |name|
+        Rails::PROTOTYPE_JS.each do |name|
           remove_file "public/javascripts/#{name}.js"
         end
       end
 
       def copy_jquery
-        say_status("copying", "jQuery (#{@@jquery_version})", :green)
+        say_status("copying", "jQuery (#{Jquery::Rails::JQUERY_VERSION})", :green)
         copy_file "jquery.js", "public/javascripts/jquery.js"
         copy_file "jquery.min.js", "public/javascripts/jquery.min.js"
       end
 
       def copy_jquery_ui
         if options.ui?
-          say_status("copying", "jQuery UI (#{@@jquery_ui_version})", :green)
+          say_status("copying", "jQuery UI (#{Jquery::Rails::JQUERY_UI_VERSION})", :green)
           copy_file "jquery-ui.js", "public/javascripts/jquery-ui.js"
           copy_file "jquery-ui.min.js", "public/javascripts/jquery-ui.min.js"
         end
       end
 
       def copy_ujs_driver
-        say_status("copying", "jQuery UJS adapter (#{@@jquery_ujs_version[0..5]})", :green)
+        say_status("copying", "jQuery UJS adapter (#{Jquery::Rails::JQUERY_UJS_VERSION[0..5]})", :green)
         remove_file "public/javascripts/rails.js"
         copy_file "jquery_ujs.js", "public/javascripts/jquery_ujs.js"
       end

data/lib/jquery-rails.rb

@@ -1,12 +1 @@
-module Jquery
-  PROTOTYPE_JS = %w{prototype effects dragdrop controls}
-
-  module Rails
-    if ::Rails.version < "3.1"
-      require 'jquery-rails/railtie'
-    else
-      require 'jquery-rails/engine'
-    end
-  end
-
-end
+require 'jquery/rails'

data/lib/jquery/rails.rb

@@ -0,0 +1,12 @@
+module Jquery
+  module Rails
+    PROTOTYPE_JS = %w{prototype effects dragdrop controls}
+
+    if ::Rails.version < "3.1"
+      require 'jquery/rails/railtie'
+    else
+      require 'jquery/rails/engine'
+    end
+    require 'jquery/rails/version'
+  end
+end

data/lib/{jquery-rails → jquery/rails}/engine.rb

@@ -1,10 +1,10 @@
-# Configure Rails 3.1 to have assert_select_jquery
+# Configure Rails 3.1 to have assert_select_jquery() in tests
 module Jquery
   module Rails
 
     class Engine < ::Rails::Engine
       config.before_configuration do
-        require "jquery-rails/assert_select_jquery" if ::Rails.env.test?
+        require "jquery/assert_select" if ::Rails.env.test?
       end
     end
 

data/lib/{jquery-rails → jquery/rails}/railtie.rb

@@ -4,7 +4,7 @@ module Jquery
 
     class Railtie < ::Rails::Railtie
       config.before_configuration do
-        require "jquery-rails/assert_select_jquery" if ::Rails.env.test?
+        require "jquery/assert_select" if ::Rails.env.test?
 
         if ::Rails.root.join("public/javascripts/jquery-ui.min.js").exist?
           jq_defaults = %w(jquery jquery-ui)
@@ -13,7 +13,7 @@ module Jquery
           jq_defaults = ::Rails.env.production? ? %w(jquery.min) : %w(jquery)
         end
 
-        # Merge the jQuery scripts, remove the Prototype defaults and finally add 'rails'
+        # Merge the jQuery scripts, remove the Prototype defaults and finally add 'jquery_ujs'
         # at the end, because load order is important
         config.action_view.javascript_expansions[:defaults] -= PROTOTYPE_JS + ['rails']
         config.action_view.javascript_expansions[:defaults] |= jq_defaults

data/lib/jquery/rails/version.rb

@@ -0,0 +1,8 @@
+module Jquery
+  module Rails
+    VERSION = "1.0.10"
+    JQUERY_VERSION = "1.6.1"
+    JQUERY_UI_VERSION  = "1.8.12"
+    JQUERY_UJS_VERSION = "3c360e34fac79a951108842529f6a48f287734f5"
+  end
+end

data/vendor/assets/javascripts/jquery_ujs.js

@@ -43,7 +43,7 @@
  *     });
  */
 
-(function($) {
+(function($, undefined) {
   // Shorthand to make it a little easier to call public rails functions from within rails.js
   var rails;
 

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: jquery-rails
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 9
-  version: 1.0.9
+  prerelease: 
+  version: 1.0.10
 platform: ruby
 authors: 
 - "Andr\xC3\xA9 Arko"
@@ -14,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-25 00:00:00 -04:00
-default_executable: 
+date: 2011-06-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: railties
@@ -25,9 +20,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
         version: "3.0"
   type: :runtime
   version_requirements: *id001
@@ -39,9 +31,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 14
         version: "0.14"
   type: :runtime
   version_requirements: *id002
@@ -53,10 +42,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
         version: 1.0.0
   type: :development
   version_requirements: *id003
@@ -68,9 +53,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
         version: "3.0"
   type: :development
   version_requirements: *id004
@@ -94,10 +76,11 @@ files:
 - jquery-rails.gemspec
 - lib/generators/jquery/install/install_generator.rb
 - lib/jquery-rails.rb
-- lib/jquery-rails/assert_select_jquery.rb
-- lib/jquery-rails/engine.rb
-- lib/jquery-rails/railtie.rb
-- lib/jquery-rails/version.rb
+- lib/jquery/assert_select.rb
+- lib/jquery/rails.rb
+- lib/jquery/rails/engine.rb
+- lib/jquery/rails/railtie.rb
+- lib/jquery/rails/version.rb
 - spec/lib/jquery-rails_spec.rb
 - spec/spec_helper.rb
 - vendor/assets/javascripts/jquery-ui.js
@@ -105,7 +88,6 @@ files:
 - vendor/assets/javascripts/jquery.js
 - vendor/assets/javascripts/jquery.min.js
 - vendor/assets/javascripts/jquery_ujs.js
-has_rdoc: true
 homepage: http://rubygems.org/gems/jquery-rails
 licenses: []
 
@@ -119,23 +101,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 3
-      - 6
       version: 1.3.6
 requirements: []
 
 rubyforge_project: jquery-rails
-rubygems_version: 1.3.7
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Use jQuery with Rails 3

data/lib/jquery-rails/version.rb

@@ -1,5 +0,0 @@
-module Jquery
-  module Rails
-    VERSION = "1.0.9"
-  end
-end