jquery-rails 0.2.3 → 0.2.4

data/.gitignore

@@ -1,3 +1,4 @@
 pkg/*
 tmp
 spec/support/*/Gemfile.lock
+spec/support/*/public/javascripts

data/CHANGELOG.md

@@ -1,3 +1,20 @@
+## 0.2.4 (16 October 2010)
+
+Features:
+
+  - Updated to use the new jQuery 1.4.3 by default, with the IE .live() bug fixed
+  - Always download the newest 1.x release of jQuery UI
+  - Try to install unknown versions of jQuery, with fallback to the default
+  - Print informative messages in the correct Generator style
+
+## 0.2.3 (13 October 2010)
+
+Features:
+
+  - Support Edge Rails 3.1 by depending on Rails ~>3.0
+  - Add Sam Ruby's assert_select_jquery test helper method
+  - Use jquery.min only in production (and not in the test env)
+
 ## 0.2.2 (8 October 2010)
 
 Feature:

data/Gemfile.lock

@@ -0,0 +1,87 @@
+PATH
+  remote: .
+  specs:
+    jquery-rails (0.2.3)
+      rails (~> 3.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    abstract (1.0.0)
+    actionmailer (3.0.1)
+      actionpack (= 3.0.1)
+      mail (~> 2.2.5)
+    actionpack (3.0.1)
+      activemodel (= 3.0.1)
+      activesupport (= 3.0.1)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.4.1)
+      rack (~> 1.2.1)
+      rack-mount (~> 0.6.12)
+      rack-test (~> 0.5.4)
+      tzinfo (~> 0.3.23)
+    activemodel (3.0.1)
+      activesupport (= 3.0.1)
+      builder (~> 2.1.2)
+      i18n (~> 0.4.1)
+    activerecord (3.0.1)
+      activemodel (= 3.0.1)
+      activesupport (= 3.0.1)
+      arel (~> 1.0.0)
+      tzinfo (~> 0.3.23)
+    activeresource (3.0.1)
+      activemodel (= 3.0.1)
+      activesupport (= 3.0.1)
+    activesupport (3.0.1)
+    addressable (2.2.2)
+    arel (1.0.1)
+      activesupport (~> 3.0.0)
+    builder (2.1.2)
+    crack (0.1.8)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
+    i18n (0.4.1)
+    mail (2.2.7)
+      activesupport (>= 2.3.6)
+      mime-types
+      treetop (>= 1.4.5)
+    mime-types (1.16)
+    polyglot (0.3.1)
+    rack (1.2.1)
+    rack-mount (0.6.13)
+      rack (>= 1.0.0)
+    rack-test (0.5.6)
+      rack (>= 1.0)
+    rails (3.0.1)
+      actionmailer (= 3.0.1)
+      actionpack (= 3.0.1)
+      activerecord (= 3.0.1)
+      activeresource (= 3.0.1)
+      activesupport (= 3.0.1)
+      bundler (~> 1.0.0)
+      railties (= 3.0.1)
+    railties (3.0.1)
+      actionpack (= 3.0.1)
+      activesupport (= 3.0.1)
+      rake (>= 0.8.4)
+      thor (~> 0.14.0)
+    rake (0.8.7)
+    rspec (1.3.0)
+    thor (0.14.3)
+    treetop (1.4.8)
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.23)
+    webmock (1.4.0)
+      addressable (>= 2.2.2)
+      crack (>= 0.1.7)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.0.0)
+  jquery-rails!
+  rails (~> 3.0)
+  rspec (~> 1.3)
+  webmock (~> 1.4.0)

data/Rakefile

@@ -1,10 +1,10 @@
 require 'bundler'
 Bundler::GemHelper.install_tasks
 
-require "rspec/core/rake_task"
+require "spec/rake/spectask"
 desc "Run all examples"
-RSpec::Core::RakeTask.new(:spec) do |t|
+Spec::Rake::SpecTask.new(:spec) do |t|
   t.ruby_opts  = ['-r test/unit']
-  t.rspec_opts = %w[--color]
+  t.spec_opts = %w[--color]
 end
 task :default => :spec

data/jquery-rails.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |s|
   s.add_dependency "rails", "~> 3.0"
   s.add_development_dependency "bundler", "~> 1.0.0"
   s.add_development_dependency "rspec",   "~> 1.3"
+  s.add_development_dependency "webmock", "~> 1.4.0"
 
   s.files        = `git ls-files`.split("\n")
   s.executables  = `git ls-files`.split("\n").select{|f| f =~ /^bin/}

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

@@ -1,11 +1,10 @@
 module Jquery
   module Generators
     class InstallGenerator < ::Rails::Generators::Base
-      desc "This generator downloads and installs jQuery, jQuery-ujs HEAD, and (optionally) jQuery UI 1.8.4"
-      class_option :ui, :type => :boolean, :default => false, :desc => "Whether to Include JQueryUI"
-      class_option :version, :type => :string, :default => "1.4.1", :desc => "Which version of JQuery to fetch"
-      @@versions = %w( 1.4.2 1.4.1 1.4.0 1.3.2 1.3.1 1.3.0 1.2.6 )
-
+      desc "This generator downloads and installs jQuery, jQuery-ujs HEAD, and (optionally) the newest jQuery UI"
+      class_option :ui, :type => :boolean, :default => false, :desc => "Include jQueryUI"
+      class_option :version, :type => :string, :default => "1.4.3", :desc => "Which version of jQuery to fetch"
+      @@default_version = "1.4.3"
 
       def remove_prototype
         %w(controls.js dragdrop.js effects.js prototype.js).each do |js|
@@ -14,27 +13,34 @@ module Jquery
       end
 
       def download_jquery
-        # Downloading latest jQuery
-        if @@versions.include?(options.version)
-          puts "Fetching JQuery version #{options.version}!"
-          get "http://ajax.googleapis.com/ajax/libs/jquery/#{options.version}/jquery.min.js", "public/javascripts/jquery.min.js"
-          get "http://ajax.googleapis.com/ajax/libs/jquery/#{options.version}/jquery.js", "public/javascripts/jquery.js"
-        else
-          puts "JQuery #{options.version} is invalid; fetching #{@@versions[1]} instead."
-          get "http://ajax.googleapis.com/ajax/libs/jquery/#{@@versions[1]}/jquery.min.js", "public/javascripts/jquery.min.js"
-          get "http://ajax.googleapis.com/ajax/libs/jquery/#{@@versions[1]}/jquery.js", "public/javascripts/jquery.js"
-        end
+        say_status("fetching", "jQuery (#{options.version})", :green)
+        get_jquery(options.version)
+      rescue OpenURI::HTTPError
+        say_status("warning", "could not find jQuery (#{options.version})", :yellow)
+        say_status("fetching", "jQuery (#{@@default_version})", :green)
+        get_jquery(@@default_version)
+      end
 
-        # Downloading latest jQueryUI minified
-        get "http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.4/jquery-ui.min.js", "public/javascripts/jquery-ui.min.js" if options.ui?
-        get "http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.4/jquery-ui.js", "public/javascripts/jquery-ui.js" if options.ui?
+      def download_jquery_ui
+        if options.ui?
+          say_status("fetching", "jQuery UI (latest 1.x release)", :green)
+          get "http://ajax.googleapis.com/ajax/libs/jqueryui/1/jquery-ui.js",     "public/javascripts/jquery-ui.js"
+          get "http://ajax.googleapis.com/ajax/libs/jqueryui/1/jquery-ui.min.js", "public/javascripts/jquery-ui.min.js"
+        end
       end
 
       def download_ujs_driver
-        # Downloading latest jQuery drivers
+        say_status("fetching", "jQuery UJS adapter (github HEAD)", :green)
         get "http://github.com/rails/jquery-ujs/raw/master/src/rails.js", "public/javascripts/rails.js"
       end
 
+    private
+
+      def get_jquery(version)
+        get "http://ajax.googleapis.com/ajax/libs/jquery/#{version}/jquery.js",     "public/javascripts/jquery.js"
+        get "http://ajax.googleapis.com/ajax/libs/jquery/#{version}/jquery.min.js", "public/javascripts/jquery.min.js"
+      end
+
     end
   end
 end

data/lib/jquery-rails/version.rb

@@ -1,5 +1,5 @@
 module Jquery
   module Rails
-    VERSION = "0.2.3"
+    VERSION = "0.2.4"
   end
 end

data/spec/lib/generators/jquery/install_generator_spec.rb

@@ -9,19 +9,42 @@ class Jquery::Generators::InstallGeneratorTest < Rails::Generators::TestCase
   tests Jquery::Generators::InstallGenerator
   arguments []
 
-  setup :prepare_destination
+  before(:each) do
+    prepare_destination
+    @response = {:body => "abc", :status => 200}
+    stub_request(:get, /ajax.googleapis.com|github.com/).to_return(@response)
+  end
+
+  it "should remove prototype" do
+    run_generator
+    %w(controls.js dragdrop.js effects.js prototype.js).each { |js| assert_no_file "public/javascripts/#{js}" }
+  end
+
+  it "should install the rails ujs shim" do
+    run_generator
+    assert_file "public/javascripts/rails.js"
+  end
 
   it "should install jquery" do
     run_generator
+    %w(jquery.min.js jquery.js).each { |js| assert_file "public/javascripts/#{js}" }
+  end
 
-    %w(jquery.min.js jquery.js rails.js).each { |js| assert_file "public/javascripts/#{js}" }
-    %w(controls.js dragdrop.js effects.js prototype.js).each { |js| assert_no_file "public/javascripts/#{js}" }
+  it "should install old jquery versions" do
+    run_generator %w(--version 1.4.2)
+    %w(jquery.min.js jquery.js).each { |js| assert_file "public/javascripts/#{js}" }
+  end
+
+  it "should try to install unknown jquery versions with fallback" do
+    stub_request(:get, /ajax.googleapis.com/).
+      to_return(:status => 404, :body => "No").
+      to_return(@response)
+    run_generator %w(--version 100.0)
+    %w(jquery.min.js jquery.js).each { |js| assert_file "public/javascripts/#{js}" }
   end
 
   it "should install jquery-ui when asked" do
     run_generator %w(--ui)
-
-    %w(jquery.min.js jquery.js jquery-ui.min.js jquery-ui.js rails.js).each { |js| assert_file "public/javascripts/#{js}" }
-    %w(controls.js dragdrop.js effects.js prototype.js).each { |js| assert_no_file "public/javascripts/#{js}" }
+    %w(jquery-ui.min.js jquery-ui.js).each { |js| assert_file "public/javascripts/#{js}" }
   end
 end

data/spec/spec_helper.rb

@@ -1,4 +1,11 @@
-# Setup for generator tests
+# Set up RSpec
+require 'webmock/rspec'
+
+Spec::Runner.configure do |config|
+  config.include WebMock::API
+end
+
+# Set up generator tests
 require 'rails/all'
 require 'rails/generators'
 require 'rails/generators/test_case'
@@ -18,3 +25,5 @@ Rails.application.config.root = Rails.root
 # Call configure to load the settings from
 # Rails.application.config.generators to Rails::Generators
 Rails::Generators.configure!
+
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jquery-rails
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - "Andr\xC3\xA9 Arko"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-13 00:00:00 -07:00
+date: 2010-10-16 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -64,6 +64,22 @@ dependencies:
         version: "1.3"
   type: :development
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: webmock
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 4
+        - 0
+        version: 1.4.0
+  type: :development
+  version_requirements: *id004
 description: This gem provides a Rails generator to install jQuery and the jQuery-ujs driver into your Rails 3 application, and then have them included automatically instead of Prototype.
 email: 
 - andre@arko.net
@@ -77,6 +93,7 @@ files:
 - .gitignore
 - CHANGELOG.md
 - Gemfile
+- Gemfile.lock
 - README.md
 - Rakefile
 - jquery-rails.gemspec