jquery-ui-rails 4.0.0 → 5.0.4

data/.travis.yml

@@ -1,3 +1,2 @@
 rvm:
-  - 1.9.2
   - 1.9.3

data/Gemfile

@@ -1,3 +1,3 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gemspec

data/History.md

@@ -1,5 +1,67 @@
 # master
 
+# 5.0.3
+
+* Speed up: Only use .erb extension if `<%= %>` tags are used
+
+# 5.0.2
+
+* Update to jQuery UI 1.11.2
+
+# 5.0.1
+
+* Update to jQuery UI 1.11.1
+
+# 5.0.0
+
+* Update to jQuery UI 1.11.0
+* Rename `jquery.ui.*.{js,css}` to `jquery-ui/*.{js,css}`
+* Add jquery-ui.js and jquery-ui.css assets
+
+# 4.2.1
+
+* Update to jQuery UI 1.10.4
+
+# 4.2.0
+
+* Bump Rails dependency to `>=3.2.16`
+* Re-release 4.1.1 as 4.2.0
+
+# 4.1.2
+
+* Re-release 4.1.0 as 4.1.2; last version compatible with Rails 3.1
+
+# 4.1.1
+
+* Declare image dependencies using `//= depend_on_asset`, to stop the
+  Sprockets cache from going stale.
+
+# 4.1.0
+
+* Add Jquery::Ui::Rails::JQUERY_UI_VERSION constant
+
+# 4.0.5
+
+* Remove unused dependency on the `jquery-rails` gem. If you get an error
+  "couldn't find file 'jquery'", you may need to explicitly add `gem
+  'jquery-rails'` to your Gemfile.
+
+# 4.0.4
+
+* Include license in gemspec
+
+# 4.0.3
+
+* Upgrade to jQuery UI 1.10.3
+
+# 4.0.2
+
+* Rails 4 compatibility
+
+# 4.0.1
+
+* Add missing animated-overlay.gif asset and fix image path
+
 # 4.0.0
 
 * Upgrade to jQuery UI 1.10.0

data/README.md

@@ -1,13 +1,26 @@
 # jquery-ui-rails
 
-[![Build Status](https://secure.travis-ci.org/joliss/jquery-ui-rails.png?branch=master)](http://travis-ci.org/joliss/jquery-ui-rails) [![Dependency Status](https://gemnasium.com/joliss/jquery-ui-rails.png)](https://gemnasium.com/joliss/jquery-ui-rails)
+[![Build Status](https://secure.travis-ci.org/joliss/jquery-ui-rails.png?branch=master)](http://travis-ci.org/joliss/jquery-ui-rails)
+[![Dependency Status](https://gemnasium.com/joliss/jquery-ui-rails.png)](https://gemnasium.com/joliss/jquery-ui-rails)
 
-This gem packages the jQuery UI 1.10.0 assets (JavaScripts, stylesheets, and
-images) for the Rails 3.1+ [asset
+This gem packages the jQuery UI assets (JavaScripts, stylesheets, and
+images) for the Rails [asset
 pipeline](http://guides.rubyonrails.org/asset_pipeline.html), so you never have
 to download a custom package through the [web
 interface](http://jqueryui.com/download) again.
 
+See [VERSIONS.md](VERSIONS.md) to see which versions of jquery-ui-rails bundle
+which versions of jQuery UI.
+
+Also check out the
+[jquery-ui-sass-rails](https://github.com/jhilden/jquery-ui-sass-rails) gem,
+which allows you to override theme variables with Sass.
+
+Warning: This gem is incompatible with the `jquery-rails` gem before version
+3.0.0! Strange things will happen if you use an earlier `jquery-rails`
+version. Run `bundle list` to ensure that you either aren't using
+`jquery-rails`, or at least version 3.0.0 of `jquery-rails`.
+
 ## Usage
 
 In your Gemfile, add:
@@ -21,17 +34,21 @@ gem 'jquery-ui-rails'
 To require all jQuery UI modules, add the following to your application.js:
 
 ```javascript
-//= require jquery.ui.all
+//= require jquery-ui
 ```
 
 Also add the jQuery UI CSS to your application.css:
 
 ```css
 /*
- *= require jquery.ui.all
+ *= require jquery-ui
  */
 ```
 
+Warning: If you are using a version below 5.0, you will have to use a different naming
+for the files to require, see https://github.com/joliss/jquery-ui-rails/blob/v4.2.1/README.md
+for more information.
+
 All images required by jQuery UI are automatically served through the asset
 pipeline, so you are good to go! For example, this code will add a
 [datepicker](http://jqueryui.com/demos/datepicker/):
@@ -53,14 +70,14 @@ For example, if you only need the datepicker module, add this to your
 application.js:
 
 ```javascript
-//= require jquery.ui.datepicker
+//= require jquery-ui/datepicker
 ```
 
 In your application.css, require the corresponding CSS module:
 
 ```css
 /*
- *= require jquery.ui.datepicker
+ *= require jquery-ui/datepicker
  */
 ```
 
@@ -69,10 +86,10 @@ In your application.css, require the corresponding CSS module:
 ### UI Core
 
 ```javascript
-//= require jquery.ui.core
-//= require jquery.ui.widget
-//= require jquery.ui.mouse
-//= require jquery.ui.position
+//= require jquery-ui/core
+//= require jquery-ui/widget
+//= require jquery-ui/mouse
+//= require jquery-ui/position
 ```
 
 You usually do not need to require these directly, as they are pulled in by the
@@ -81,30 +98,31 @@ other JavaScript modules as needed.
 ### Interactions
 
 ```javascript
-//= require jquery.ui.draggable
-//= require jquery.ui.droppable
-//= require jquery.ui.resizable
-//= require jquery.ui.selectable
-//= require jquery.ui.sortable
+//= require jquery-ui/draggable
+//= require jquery-ui/droppable
+//= require jquery-ui/resizable
+//= require jquery-ui/selectable
+//= require jquery-ui/sortable
 ```
 
-For `jquery.ui.resizable` and `jquery.ui.selectable`, remember to `require`
-their matching CSS files in your application.css as well.
+For all but `jquery-ui/droppable`, remember to `require` their matching CSS
+files in your application.css as well.
 
 ### Widgets
 
 ```javascript
-//= require jquery.ui.accordion
-//= require jquery.ui.autocomplete
-//= require jquery.ui.button
-//= require jquery.ui.datepicker
-//= require jquery.ui.dialog
-//= require jquery.ui.menu
-//= require jquery.ui.progressbar
-//= require jquery.ui.slider
-//= require jquery.ui.spinner
-//= require jquery.ui.tabs
-//= require jquery.ui.tooltip
+//= require jquery-ui/accordion
+//= require jquery-ui/autocomplete
+//= require jquery-ui/button
+//= require jquery-ui/datepicker
+//= require jquery-ui/dialog
+//= require jquery-ui/menu
+//= require jquery-ui/progressbar
+//= require jquery-ui/selectmenu
+//= require jquery-ui/slider
+//= require jquery-ui/spinner
+//= require jquery-ui/tabs
+//= require jquery-ui/tooltip
 ```
 
 For all of these, remember to `require` their matching CSS files in your
@@ -113,13 +131,13 @@ application.css as well.
 #### I18n
 
 Datepicker has optional i18n modules for non-US locales, named
-`jquery.ui.datepicker-xx[-YY]`
-([list](https://github.com/joliss/jquery-ui-rails/tree/master/vendor/assets/javascripts)),
+`jquery-ui/datepicker-xx[-YY]`
+([list](https://github.com/joliss/jquery-ui-rails/tree/master/app/assets/javascripts)),
 for example:
 
 ```javascript
-//= require jquery.ui.datepicker
-//= require jquery.ui.datepicker-pt-BR
+//= require jquery-ui/datepicker
+//= require jquery-ui/datepicker-pt-BR
 ```
 
 Note that you still need to include the main datepicker module. It is not
@@ -129,21 +147,23 @@ reasons](https://github.com/joliss/jquery-ui-rails/issues/9#issuecomment-6524987
 ### Effects
 
 ```javascript
-//= require jquery.ui.effect.all
-//= require jquery.ui.effect
-//= require jquery.ui.effect-blind
-//= require jquery.ui.effect-bounce
-//= require jquery.ui.effect-clip
-//= require jquery.ui.effect-drop
-//= require jquery.ui.effect-explode
-//= require jquery.ui.effect-fade
-//= require jquery.ui.effect-fold
-//= require jquery.ui.effect-highlight
-//= require jquery.ui.effect-pulsate
-//= require jquery.ui.effect-scale
-//= require jquery.ui.effect-shake
-//= require jquery.ui.effect-slide
-//= require jquery.ui.effect-transfer
+//= require jquery-ui/effect.all
+//= require jquery-ui/effect
+//= require jquery-ui/effect-blind
+//= require jquery-ui/effect-bounce
+//= require jquery-ui/effect-clip
+//= require jquery-ui/effect-drop
+//= require jquery-ui/effect-explode
+//= require jquery-ui/effect-fade
+//= require jquery-ui/effect-fold
+//= require jquery-ui/effect-highlight
+//= require jquery-ui/effect-puff
+//= require jquery-ui/effect-pulsate
+//= require jquery-ui/effect-scale
+//= require jquery-ui/effect-shake
+//= require jquery-ui/effect-size
+//= require jquery-ui/effect-slide
+//= require jquery-ui/effect-transfer
 ```
 
 ## Stylesheet Assets
@@ -152,8 +172,8 @@ reasons](https://github.com/joliss/jquery-ui-rails/issues/9#issuecomment-6524987
 
 ```css
 /*
- *= require jquery.ui.core
- *= require jquery.ui.theme
+ *= require jquery-ui/core
+ *= require jquery-ui/theme
  */
 ```
 
@@ -165,8 +185,10 @@ pulled in as dependencies.
 
 ```css
 /*
- *= require jquery.ui.resizable
- *= require jquery.ui.selectable
+ *= require jquery-ui/draggable
+ *= require jquery-ui/resizable
+ *= require jquery-ui/selectable
+ *= require jquery-ui/sortable
  */
 ```
 
@@ -174,17 +196,18 @@ pulled in as dependencies.
 
 ```css
 /*
- *= require jquery.ui.accordion
- *= require jquery.ui.autocomplete
- *= require jquery.ui.button
- *= require jquery.ui.datepicker
- *= require jquery.ui.dialog
- *= require jquery.ui.menu
- *= require jquery.ui.progressbar
- *= require jquery.ui.slider
- *= require jquery.ui.spinner
- *= require jquery.ui.tabs
- *= require jquery.ui.tooltip
+ *= require jquery-ui/accordion
+ *= require jquery-ui/autocomplete
+ *= require jquery-ui/button
+ *= require jquery-ui/datepicker
+ *= require jquery-ui/dialog
+ *= require jquery-ui/menu
+ *= require jquery-ui/progressbar
+ *= require jquery-ui/selectmenu
+ *= require jquery-ui/slider
+ *= require jquery-ui/spinner
+ *= require jquery-ui/tabs
+ *= require jquery-ui/tooltip
  */
 ```
 
@@ -269,14 +292,3 @@ Now point your browser at [http://localhost:3000/](http://localhost:3000/).
     (This is arguably cumbersome, not officially supported by this gem, and
     adds 1 KB overhead as both the base theme and the custom theme are served
     up.)
-
-*   The `jquery.ui.all.js` file is named `jquery-ui.js` in the official
-    distribution. We should follow their naming. But jquery-rails provides a
-    `jquery-ui.js` asset as well, so until that is removed from the
-    jquery-rails gem (see issue
-    [#46](https://github.com/rails/jquery-rails/issues/46)), we cannot
-    distribute `jquery-ui.js` without risking conflicts.
-
-    To reduce confusion, as long as there is no `jquery-ui.js`, we also do not
-    distribute the official `jquery-ui-i18n.js` and `jquery-ui.css`. The latter
-    is available as `jquery.ui.all.css` however.

data/Rakefile

@@ -1,10 +1,11 @@
+Encoding.default_external = "UTF-8" if defined?(Encoding)
 require 'json'
 require 'bundler/gem_tasks'
 
 # returns the source filename for a given JSON build file
-# (e.g., "ui.core.jquery.json" returns "jquery.ui.core.js")
+# (e.g., "ui.core.jquery.json" returns "core.js")
 def source_file_for_build_file(build_file)
-  "jquery.#{build_file.sub('.jquery.json', '')}.js"
+  "#{build_file.sub('ui.', '').sub('.jquery.json', '')}.js"
 end
 
 # returns the source filename for a named file in the 'dependencies'
@@ -17,16 +18,14 @@ end
 #      "ui.widget": "1.9.2"
 #    },
 #
-# then "ui.widget" returns "jquery.ui.widget.js")
+# then "ui.widget" returns "widget.js")
 #
 # The only exception is "jquery", which doesn't follow the
-# same naming conventions so its a special case.
+# same naming conventions so it's a special case.
 def source_file_for_dependency_entry(dep_entry)
-  # if the dependent file is jquery.js itself, return its filename
   return "jquery.js" if dep_entry == 'jquery'
 
-  # otherwise, tack 'jquery.' on the front
-  "jquery.#{dep_entry}.js"
+  "#{dep_entry.sub 'ui.', ''}.js"
 end
 
 # return a Hash of dependency info, whose keys are jquery-ui
@@ -51,7 +50,9 @@ def map_dependencies
   dependencies
 end
 
-DEPENDENCY_HASH = map_dependencies
+def dependency_hash
+  @dependency_hash ||= map_dependencies
+end
 
 def version
   JSON.load(File.read('jquery-ui/package.json'))['version']
@@ -62,7 +63,7 @@ task :submodule do
 end
 
 def get_js_dependencies(basename)
-  dependencies = DEPENDENCY_HASH[basename]
+  dependencies = dependency_hash[basename]
   if dependencies.nil?
     puts "Warning: No dependencies found for #{basename}"
     dependencies = []
@@ -87,22 +88,32 @@ def protect_copyright_notice(source_code)
   source_code.gsub!(/\A\s*\/\*\r?\n/, "/*!\n")
 end
 
-desc "Remove the vendor directory"
+def build_image_dependencies(source_code)
+  image_dependencies = Set.new source_code.scan(/url\("?images\/([-_.a-zA-Z0-9]+)"?\)/).map(&:first)
+  code = image_dependencies.inject("") do |acc, img|
+    acc += " *= depend_on_asset \"jquery-ui/#{img}\"\n"
+  end
+end
+
+desc "Remove the app directory"
 task :clean do
-  rm_rf 'vendor'
+  rm_rf 'app'
 end
 
 desc "Generate the JavaScript assets"
 task :javascripts => :submodule do
-  target_dir = "vendor/assets/javascripts"
-  mkdir_p target_dir
   Rake.rake_output_message 'Generating javascripts'
+
+  target_dir = "app/assets/javascripts"
+  target_ui_dir = "#{target_dir}/jquery-ui"
+  mkdir_p target_ui_dir
+
   Dir.glob("jquery-ui/ui/*.js").each do |path|
     basename = File.basename(path)
     dep_modules = get_js_dependencies(basename).map(&method(:remove_js_extension))
-    File.open("#{target_dir}/#{basename}", "w") do |out|
+    File.open("#{target_ui_dir}/#{basename}", "w") do |out|
       dep_modules.each do |mod|
-        out.write("//= require #{mod}\n")
+        out.write("//= require jquery-ui/#{mod}\n")
       end
       out.write("\n") unless dep_modules.empty?
       source_code = File.read(path)
@@ -116,7 +127,7 @@ task :javascripts => :submodule do
   # https://github.com/joliss/jquery-ui-rails/issues/9
   Dir.glob("jquery-ui/ui/i18n/*.js").each do |path|
     basename = File.basename(path)
-    File.open("#{target_dir}/#{basename}", "w") do |out|
+    File.open("#{target_ui_dir}/#{basename}", "w") do |out|
       source_code = File.read(path)
       source_code.gsub!('@VERSION', version)
       protect_copyright_notice(source_code)
@@ -124,26 +135,32 @@ task :javascripts => :submodule do
     end
   end
 
-  File.open("#{target_dir}/jquery.ui.effect.all.js", "w") do |out|
-    Dir.glob("jquery-ui/ui/jquery.ui.effect*.js").sort.each do |path|
+  File.open("#{target_ui_dir}/effect.all.js", "w") do |out|
+    Dir.glob("jquery-ui/ui/effect*.js").sort.each do |path|
       asset_name = remove_js_extension(File.basename(path))
-      out.write("//= require #{asset_name}\n")
+      out.write("//= require jquery-ui/#{asset_name}\n")
     end
   end
-  File.open("#{target_dir}/jquery.ui.all.js", "w") do |out|
+  File.open("#{target_dir}/jquery-ui.js", "w") do |out|
     Dir.glob("jquery-ui/ui/*.js").sort.each do |path|
       asset_name = remove_js_extension(File.basename(path))
-      out.write("//= require #{asset_name}\n")
+      out.write("//= require jquery-ui/#{asset_name}\n")
     end
   end
 end
 
 desc "Generate the CSS assets"
 task :stylesheets => :submodule do
-  target_dir = "vendor/assets/stylesheets"
-  mkdir_p target_dir
   Rake.rake_output_message 'Generating stylesheets'
 
+  target_dir = "app/assets/stylesheets"
+  target_ui_dir = "#{target_dir}/jquery-ui"
+  mkdir_p target_ui_dir
+
+  File.open("#{target_dir}/jquery-ui.css", "w") do |out|
+    out.write("//= require jquery-ui/all\n")
+  end
+
   css_dir = "jquery-ui/themes/base"
   Dir.glob("#{css_dir}/*.css").each do |path|
     basename = File.basename(path)
@@ -153,34 +170,33 @@ task :stylesheets => :submodule do
     extra_dependencies = []
     # Is "theme" listed among the dependencies for the matching JS file?
     unless basename =~ /\.(all|base|core)\./
-      dependencies = DEPENDENCY_HASH[basename.sub(/\.css/, '.js')]
-      if dependencies.nil?
-        puts "Warning: No matching JavaScript dependencies found for #{basename}"
-        extra_dependencies << 'jquery.ui.core'
-      else
+      if dependencies = dependency_hash[basename.sub(/\.css/, '.js')]
         dependencies.each do |dependency|
           dependency = dependency.sub(/\.js$/, '')
           dependent_stylesheet = "#{dependency}.css"
           extra_dependencies << dependency if File.exists?("#{css_dir}/#{dependent_stylesheet}")
         end
-        extra_dependencies << 'jquery.ui.theme'
+        extra_dependencies << 'theme'
       end
     end
     extra_dependencies.reverse.each do |dep|
       # Add after first comment block
-      source_code = source_code.sub(/\A((.*?\*\/\n)?)/m, "\\1/*\n *= require #{dep}\n */\n")
+      source_code = source_code.sub(/\A((.*?\*\/\n)?)/m, "\\1/*\n *= require jquery-ui/#{dep}\n */\n")
     end
     # Use "require" instead of @import
     source_code.gsub!(/^@import (.*)$/) { |s|
       m = s.match(/^@import (url\()?"(?<module>[-_.a-zA-Z]+)\.css"\)?;/) \
         or fail "Cannot parse import: #{s}"
-      "/*\n *= require #{m['module']}\n */"
+      "/*\n *= require jquery-ui/#{m['module']}\n */"
     }
     # Be cute: collapse multiple require comment blocks into one
     source_code.gsub!(/^( \*= require .*)\n \*\/(\n+)\/\*\n(?= \*= require )/, '\1\2')
+    source_code.gsub!(/\A(\/\*!.+?\*\/\s)/m, "\\1\n/*\n#{build_image_dependencies(source_code)} */\n\n") unless build_image_dependencies(source_code).empty?
     # Replace hard-coded image URLs with asset path helpers
-    source_code.gsub!(/url\(images\/([-_.a-zA-Z0-9]+)\)/, 'url(<%= image_path("jquery-ui/\1") %>)')
-    File.open("#{target_dir}/#{basename}.erb", "w") do |out|
+    image_re = /url\("?images\/([-_.a-zA-Z0-9]+)"?\)/
+    extname = source_code =~ image_re ? ".erb" : ""
+    source_code.gsub!(image_re, 'url(<%= image_path("jquery-ui/\1") %>)')
+    File.open("#{target_ui_dir}/#{basename}#{extname}", "w") do |out|
       out.write(source_code)
     end
   end
@@ -188,14 +204,30 @@ end
 
 desc "Generate the image assets"
 task :images => :submodule do
-  target_dir = "vendor/assets/images/jquery-ui"
-  mkdir_p target_dir
   Rake.rake_output_message 'Copying images'
-  FileUtils.cp(Dir.glob("jquery-ui/themes/base/images/*.png"), target_dir)
+
+  target_dir = "app/assets/images/jquery-ui"
+  mkdir_p target_dir
+
+  FileUtils.cp(Dir.glob("jquery-ui/themes/base/images/*"), target_dir)
+end
+
+desc "Update Jquery::Ui::Rails::JQUERY_UI_VERSION"
+task :version => :submodule do
+  Rake.rake_output_message "Setting Jquery::Ui::Rails::JQUERY_UI_VERSION = \"#{version}\""
+
+  versionRb = 'lib/jquery/ui/rails/version.rb'
+  versionRbSource = File.read(versionRb)
+  versionDefinition = "JQUERY_UI_VERSION = \"#{version}\""
+  versionRbSource.sub! /JQUERY_UI_VERSION = "[^"]*"/, versionDefinition \
+    or fail "Could not find JQUERY_UI_VERSION in #{versionRb}"
+  File.open(versionRb, 'w') do |out|
+    out.write(versionRbSource)
+  end
 end
 
 desc "Clean and then generate everything (default)"
-task :assets => [:clean, :javascripts, :stylesheets, :images]
+task :assets => [:clean, :javascripts, :stylesheets, :images, :version]
 
 task :build => :assets
 

data/VERSIONS.md

@@ -0,0 +1,36 @@
+# Bundled Versions
+
+| Gem    | jQuery UI |
+|--------|-----------|
+| 5.0.4  | 1.11.3    |
+| 5.0.3  | 1.11.2    |
+| 5.0.2  | 1.11.2    |
+| 5.0.1  | 1.11.1    |
+| 5.0.0  | 1.11.0    |
+| 4.2.1  | 1.10.4    |
+| 4.2.0  | 1.10.3    |
+| 4.1.2  | 1.10.3    |
+| 4.1.1  | 1.10.3    |
+| 4.1.0  | 1.10.3    |
+| 4.0.5  | 1.10.3    |
+| 4.0.4  | 1.10.3    |
+| 4.0.3  | 1.10.3    |
+| 4.0.2  | 1.10.0    |
+| 4.0.1  | 1.10.0    |
+| 4.0.0  | 1.10.0    |
+| 3.0.1  | 1.9.2     |
+| 3.0.0  | 1.9.2     |
+| 2.0.2  | 1.8.24    |
+| 2.0.1  | 1.8.23    |
+| 2.0.0  | 1.8.23    |
+| 1.1.1  | 1.8.23    |
+| 1.1.0  | 1.8.22    |
+| 1.0.0  | 1.8.21    |
+| 0.5.0  | 1.8.21    |
+| 0.4.1  | 1.8.20    |
+| 0.4.0  | 1.8.20    |
+| 0.3.0  | 1.8.19    |
+| 0.2.2  | 1.8.18    |
+| 0.2.1  | 1.8.18    |
+| 0.2.0  | 1.8.17    |
+| 0.1.0  | 1.8.16    |