merged jquery-rails 2.0.0

Author: abstraktor

jquery-rails.gemspec

@@ -14,10 +14,8 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = ">= 1.3.6"
   s.rubyforge_project         = "jquery-rails"
 
-  s.add_dependency "railties", "~> 3.0"
+  s.add_dependency "railties", ">= 3.2.0.beta", "< 5.0"
   s.add_dependency "thor",     "~> 0.14"
-  s.add_development_dependency "bundler", "~> 1.0.0"
-  s.add_development_dependency "rails",   "~> 3.0"
 
   s.files        = `git ls-files`.split("\n")
   s.executables  = `git ls-files`.split("\n").select{|f| f =~ /^bin/}

lib/jquery/rails.rb

@@ -2,11 +2,7 @@ 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/engine'
     require 'jquery/rails/version'
   end
 end

lib/jquery/rails/engine.rb

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

lib/jquery/rails/railtie.rb

@@ -1,6 +1,6 @@
 module Jquery
   module Rails
-    VERSION = "1.0.19"
+    VERSION = "2.0.0"
     JQUERY_VERSION = "1.7.1"
     JQUERY_UI_VERSION  = "1.8.16"
     JQUERY_UJS_VERSION = "82292010fb1743f038ab72b1f1e994e91be3eda3"