jquery-rails 3.0.0 → 3.1.0

data/CHANGELOG.md

@@ -1,3 +1,26 @@
+## 3.1.0 (29 January 2014)
+
+  - Updated to jQuery 1.11.0
+  - Updated to latest jquery-ujs
+  - Added development rake task for updating jQuery
+
+## 3.0.4 (10 July 2013)
+
+  - Fixed jQuery source map
+ 
+## 3.0.3 (10 July 2013)
+
+  - Updated to jQuery 1.10.2
+
+## 3.0.2 (04 July 2013)
+
+  - Updated to latest jquery-ujs
+
+## 3.0.1 (07 June 2013)
+
+  - Updated to jQuery 1.10.1
+  - Removed jQuery UI from generator
+
 ## 3.0.0 (29 May 2013)
 
   - Removed jQuery UI

data/Gemfile

@@ -1,4 +1,4 @@
-source :gemcutter
+source 'https://rubygems.org'
 
 # Specify your gem's dependencies in jquery-rails.gemspec
 gemspec

data/README.md

@@ -4,8 +4,7 @@ jQuery! For Rails! So great.
 
 This gem provides:
 
-  * jQuery 1.10.0
-  * jQuery UI 1.10.3 (javascript only)
+  * jQuery 1.10.2
   * the jQuery UJS adapter
   * assert_select_jquery to test jQuery responses in Ruby tests
 
@@ -20,7 +19,7 @@ minor version bump = minor-level updates to jquery
 major version bump = major-level updates to jquery and updates to rails which may be backwards-incompatible
 ```
 
-See CHANGELOG.md to see which versions of jquery-rails bundle which
+See [VERSIONS.md](VERSIONS.md) to see which versions of jquery-rails bundle which
 versions of jQuery.
 
 ## Installation
@@ -57,25 +56,28 @@ jquery-ui-rails gem above.*
 
 ### Rails 3.0 (or greater with asset pipeline *disabled*)
 
-This gem adds a single generator: `jquery:install`. Running the generator will remove any Prototype JS files you may happen to have, and copy jQuery and the jQuery-ujs driver for Rails (and optionally, jQuery UI) to the `public/javascripts` directory.
+This gem adds a single generator: `jquery:install`. Running the generator will remove any Prototype JS files you may happen to have, and copy jQuery and the jQuery-ujs driver for Rails to the `public/javascripts` directory.
 
-This gem will also hook into the Rails configuration process, removing Prototype and adding jQuery to the javascript files included by the `javascript_include_tag(:defaults)` call. While this gem contains the minified and un-minified versions of jQuery and jQuery UI, only the minified versions will be included in the `:defaults` when Rails is run in `production` or `test` mode  (un-minified versions will be included when Rails is run in `development` mode).
+This gem will also hook into the Rails configuration process, removing Prototype and adding jQuery to the javascript files included by the `javascript_include_tag(:defaults)` call. While this gem contains the minified and un-minified versions of jQuery, only the minified versions will be included in the `:defaults` when Rails is run in `production` or `test` mode  (un-minified versions will be included when Rails is run in `development` mode).
 
 To invoke the generator, run:
 
 ```sh
-rails generate jquery:install #--ui to enable jQuery UI
+rails generate jquery:install
 ```
 
 You're done!
 
+*As of v3.0, jquery-rails no longer includes jQuery UI, you will need to
+install it by yourself as needed.*
+
 ## Contributing
 
 Feel free to open an issue ticket if you find something that could be improved. A couple notes:
 
 * If it's an issue pertaining to the jquery-ujs javascript, please report it to the [jquery-ujs project](https://github.com/rails/jquery-ujs).
 
-* If the jquery or jquery-ui scripts are outdated (i.e. maybe a new version of jquery was released yesterday), feel free to open an issue and prod us to get that thing updated. However, for security reasons, we won't be accepting pull requests with updated jquery or jquery-ui scripts.
+* If the jquery scripts are outdated (i.e. maybe a new version of jquery was released yesterday), feel free to open an issue and prod us to get that thing updated. However, for security reasons, we won't be accepting pull requests with updated jquery scripts.
 
 ## Acknowledgements
 

data/Rakefile

@@ -19,3 +19,30 @@ task :guard_version do
 
   check_version('jquery.js', /jQuery JavaScript Library v([\S]+)/, 'JQUERY_VERSION')
 end
+
+task :update_jquery do
+  puts "Downloading jquery.js"
+  puts `curl -o vendor/assets/javascripts/jquery.js http://code.jquery.com/jquery.js`
+  puts "Downloading jquery.min.js"
+  puts `curl -o vendor/assets/javascripts/jquery.min.js http://code.jquery.com/jquery.min.js`
+  puts "Downloading jquery.min.map"
+  puts `curl -o vendor/assets/javascripts/jquery.min.map http://code.jquery.com/jquery.min.map`
+
+  puts "Updating version.rb"
+  version = false
+  File.foreach('vendor/assets/javascripts/jquery.js') do |line|
+    version = line.match(/jQuery JavaScript Library v([\S]+)/)
+    version = version && version[1]
+    break if version
+  end
+
+  version_path = 'lib/jquery/rails/version.rb'
+  lines = IO.readlines(version_path).map do |line|
+    line.gsub(/JQUERY_VERSION = "([\d\.]+)"/, "JQUERY_VERSION = \"#{version}\"")
+  end
+  File.open(version_path, 'w') do |file|
+    file.puts lines
+  end
+
+  puts "\e[32mDone!\e[0m"
+end

data/VERSIONS.md

@@ -0,0 +1,43 @@
+# Bundled Versions
+
+| Gem    | jQuery | jQuery UI |
+|--------|--------|-----------|
+| 3.0.5  | 1.11.0 | -         |
+| 3.0.4  | ↾      | -         |
+| 3.0.3  | 1.10.2 | -         |
+| 3.0.2  | ↾      | -         |
+| 3.0.1  | 1.10.1 | -         |
+| 3.0.0  | ↾      | -         |
+| 2.3.0  | 1.10.0 | 1.10.3    |
+| 2.2.2  | ↾      | ↾         |
+| 2.2.1  | 1.9.1  | ↾         |
+| 2.2.0  | 1.9.0  | ↾         |
+| 2.1.4  | 1.8.3  | 1.9.2     |
+| 2.1.3  | 1.8.2  | ↾         |
+| 2.1.2  | 1.8.1  | ↾         |
+| 2.1.1  | ↾      | ↾         |
+| 2.1.0  | 1.8.0  | 1.8.23    |
+| 2.0.3  | ↾      | ↾         |
+| 2.0.2  | 1.7.2  | 1.8.18    |
+| 2.0.1  | ↾      | ↾         |
+| 2.0.0  | ↾      | ↾         |
+| 1.0.19 | 1.7.1  | ↾         |
+| 1.0.18 | ↾      | ↾         |
+| 1.0.17 | 1.7.0  | ↾         |
+| 1.0.16 | 1.6.4  | 1.8.16    |
+| 1.0.15 | ↾      | ↾         |
+| 1.0.14 | ↾      | ↾         |
+| 1.0.13 | 1.6.2  | 1.8.14    |
+| 1.0.12 | ↾      | ↾         |
+| 1.0.11 | ↾      | ↾         |
+| 1.0.10 | ↾      | ↾         |
+| 1.0.9  | ↾      | ↾         |
+| 1.0.8  | ↾      | ↾         |
+| 1.0.7  | ↾      | ↾         |
+| 1.0.6  | ↾      | ↾         |
+| 1.0.5  | ↾      | ↾         |
+| 1.0.4  | ↾      | ↾         |
+| 1.0.3  | 1.6.1  | ↾         |
+| 1.0.2  | ↾      | ↾         |
+| 1.0.1  | ↾      | 1.8.12    |
+| 1.0.0  | 1.6.0  | -         |

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

@@ -6,8 +6,7 @@ if ::Rails.version < "3.1" || !::Rails.application.config.assets.enabled
     module Generators
       class InstallGenerator < ::Rails::Generators::Base
 
-        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"
+        desc "This generator installs jQuery #{Jquery::Rails::JQUERY_VERSION} and jQuery-ujs"
         source_root File.expand_path('../../../../../vendor/assets/javascripts', __FILE__)
 
         def remove_prototype
@@ -22,14 +21,6 @@ if ::Rails.version < "3.1" || !::Rails.application.config.assets.enabled
           copy_file "jquery.min.js", "public/javascripts/jquery.min.js"
         end
 
-        def copy_jquery_ui
-          if options.ui?
-            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::Rails::JQUERY_UJS_VERSION[0..5]})", :green)
           remove_file "public/javascripts/rails.js"

data/lib/jquery/rails/railtie.rb

@@ -5,12 +5,7 @@ module Jquery
     class Railtie < ::Rails::Railtie
       config.before_configuration do
         if config.action_view.javascript_expansions
-          if ::Rails.root.join("public/javascripts/jquery-ui.min.js").exist?
-            jq_defaults = %w(jquery jquery-ui)
-            jq_defaults.map!{|a| a + ".min" } if ::Rails.env.production? || ::Rails.env.test?
-          else
-            jq_defaults = ::Rails.env.production? || ::Rails.env.test? ? %w(jquery.min) : %w(jquery)
-          end
+          jq_defaults = ::Rails.env.production? || ::Rails.env.test? ? %w(jquery.min) : %w(jquery)
 
           # Merge the jQuery scripts, remove the Prototype defaults and finally add 'jquery_ujs'
           # at the end, because load order is important

data/lib/jquery/rails/version.rb

@@ -1,7 +1,7 @@
 module Jquery
   module Rails
-    VERSION = "3.0.0"
-    JQUERY_VERSION = "1.10.0"
-    JQUERY_UJS_VERSION = "87587d476054e9869865f53c1b78cb8164619a05"
+    VERSION = "3.1.0"
+    JQUERY_VERSION = "1.11.0"
+    JQUERY_UJS_VERSION = "f160fa2f4615f93e1a0d75e49de59d19c18c8728"
   end
 end