jquery-rails 0.2.4 → 0.2.5

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.2.5 (4 November 2010)
+
+Bugfix:
+
+  - Download JQuery Rails UJS via HTTPS since Github is now HTTPS only
+
 ## 0.2.4 (16 October 2010)
 
 Features:

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    jquery-rails (0.2.3)
+    jquery-rails (0.2.4)
       rails (~> 3.0)
+      thor (~> 0.14.4)
 
 GEM
   remote: http://rubygems.org/
@@ -41,11 +42,12 @@ GEM
     crack (0.1.8)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    i18n (0.4.1)
-    mail (2.2.7)
+    i18n (0.4.2)
+    mail (2.2.9)
       activesupport (>= 2.3.6)
-      mime-types
-      treetop (>= 1.4.5)
+      i18n (~> 0.4.1)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
     mime-types (1.16)
     polyglot (0.3.1)
     rack (1.2.1)
@@ -67,8 +69,8 @@ GEM
       rake (>= 0.8.4)
       thor (~> 0.14.0)
     rake (0.8.7)
-    rspec (1.3.0)
-    thor (0.14.3)
+    rspec (1.3.1)
+    thor (0.14.4)
     treetop (1.4.8)
       polyglot (>= 0.3.1)
     tzinfo (0.3.23)
@@ -84,4 +86,5 @@ DEPENDENCIES
   jquery-rails!
   rails (~> 3.0)
   rspec (~> 1.3)
+  thor (~> 0.14.4)
   webmock (~> 1.4.0)

data/jquery-rails.gemspec

@@ -15,6 +15,7 @@ Gem::Specification.new do |s|
   s.rubyforge_project         = "jquery-rails"
 
   s.add_dependency "rails", "~> 3.0"
+  s.add_dependency "thor",  "~>0.14.4"
   s.add_development_dependency "bundler", "~> 1.0.0"
   s.add_development_dependency "rspec",   "~> 1.3"
   s.add_development_dependency "webmock", "~> 1.4.0"

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

@@ -31,7 +31,7 @@ module Jquery
 
       def download_ujs_driver
         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"
+        get "https://github.com/rails/jquery-ujs/raw/master/src/rails.js", "public/javascripts/rails.js"
       end
 
     private

data/lib/jquery-rails/version.rb

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

data/spec/lib/jquery-rails_spec.rb

@@ -14,12 +14,36 @@ describe "The jQuery-Rails railtie" do
     get_js_defaults("custom").should == ["foo", "bar", "baz"].inspect
   end
 
-  def get_js_defaults(name, env = "production")
-    dir = File.expand_path("../../support/#{name}_app", __FILE__)
+  it "ouputs with .js extensions in production" do
+    get_javascript_include_tag("default").should =~ /jquery.min.js/
+  end
+
+  it "outputs with .js extensions in development" do
+    get_javascript_include_tag("default", "development").should =~ /jquery.js/
+  end
+
+
+  # Helper methods
+
+  def get_js_defaults(app, env = "production")
+    cmd = "Rails.application.config.action_view.
+      javascript_expansions[:defaults]"
+    run(app, cmd, env)
+  end
+
+  def get_javascript_include_tag(app, env = "production")
+    cmd = "Rails.application.config.action_controller.
+      each{|k,v| ActionController::Base.helpers.config[k]=v} &&
+      ActionController::Base.helpers.javascript_include_tag(:defaults)"
+    run(app, cmd, env)
+  end
+
+  def run(app, expr, env)
+    dir = File.expand_path("../../support/#{app}_app", __FILE__)
     Dir.chdir(dir) do
-      `bundle install --local`
-      `rails runner -e #{env} 'puts Rails.application.config.action_view.
-        javascript_expansions[:defaults].inspect'`.chomp
+      `bundle check || bundle install --local`
+      cmd = "rails runner -e #{env} 'puts #{expr}.inspect'"
+      `#{cmd}`.chomp
     end
   end
 

data/spec/support/custom_app/Gemfile

@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
-gem 'rails', '3.0.0'
+gem 'rails', '~>3.0'
 gem 'jquery-rails', :path => "../../.."
 
 # Bundle edge Rails instead:

data/spec/support/default_app/Gemfile

@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
-gem 'rails', '3.0.0'
+gem 'rails', '~>3.0'
 gem 'jquery-rails', :path => "../../.."
 
 # Bundle edge Rails instead:

data/spec/support/default_app/config.ru

@@ -1,4 +1,4 @@
 # This file is used by Rack-based servers to start the application.
 
 require ::File.expand_path('../config/environment',  __FILE__)
-run CustomApp::Application
+run DefaultApp::Application

data/spec/support/default_app/config/application.rb

@@ -6,7 +6,7 @@ require 'rails/all'
 # you've limited to :test, :development, or :production.
 Bundler.require(:default, Rails.env) if defined?(Bundler)
 
-module CustomApp
+module DefaultApp
   class Application < Rails::Application
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers

data/spec/support/default_app/config/environment.rb

@@ -2,4 +2,4 @@
 require File.expand_path('../application', __FILE__)
 
 # Initialize the rails application
-CustomApp::Application.initialize!
+DefaultApp::Application.initialize!

data/spec/support/default_app/config/environments/development.rb

@@ -1,4 +1,4 @@
-CustomApp::Application.configure do
+DefaultApp::Application.configure do
   # Settings specified here will take precedence over those in config/environment.rb
 
   # In the development environment your application's code is reloaded on

data/spec/support/default_app/config/environments/production.rb

@@ -1,4 +1,4 @@
-CustomApp::Application.configure do
+DefaultApp::Application.configure do
   # Settings specified here will take precedence over those in config/environment.rb
 
   # The production environment is meant for finished, "live" apps.

data/spec/support/default_app/config/environments/test.rb

@@ -1,4 +1,4 @@
-CustomApp::Application.configure do
+DefaultApp::Application.configure do
   # Settings specified here will take precedence over those in config/environment.rb
 
   # The test environment is used exclusively to run your application's

data/spec/support/default_app/config/routes.rb

@@ -1,4 +1,4 @@
-CustomApp::Application.routes.draw do
+DefaultApp::Application.routes.draw do
   # The priority is based upon order of creation:
   # first created -> highest priority.
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jquery-rails
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 2
-  - 4
-  version: 0.2.4
+  - 5
+  version: 0.2.5
 platform: ruby
 authors: 
 - "Andr\xC3\xA9 Arko"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-16 00:00:00 -07:00
+date: 2010-11-04 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -34,9 +34,25 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: bundler
+  name: thor
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 47
+        segments: 
+        - 0
+        - 14
+        - 4
+        version: 0.14.4
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -48,11 +64,11 @@ dependencies:
         - 0
         version: 1.0.0
   type: :development
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -63,11 +79,11 @@ dependencies:
         - 3
         version: "1.3"
   type: :development
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: webmock
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -79,7 +95,7 @@ dependencies:
         - 0
         version: 1.4.0
   type: :development
-  version_requirements: *id004
+  version_requirements: *id005
 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
@@ -127,6 +143,14 @@ files:
 - spec/support/default_app/config/environments/production.rb
 - spec/support/default_app/config/environments/test.rb
 - spec/support/default_app/config/routes.rb
+- spec/support/default_app/public/javascripts/application.js
+- spec/support/default_app/public/javascripts/controls.js
+- spec/support/default_app/public/javascripts/dragdrop.js
+- spec/support/default_app/public/javascripts/effects.js
+- spec/support/default_app/public/javascripts/jquery.js
+- spec/support/default_app/public/javascripts/jquery.min.js
+- spec/support/default_app/public/javascripts/prototype.js
+- spec/support/default_app/public/javascripts/rails.js
 - spec/support/default_app/script/rails
 has_rdoc: true
 homepage: http://rubygems.org/gems/jquery-rails