jquery-rails 1.0.19 → 2.0.1

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 2.0.1 (28 February 2012)
+
+  - Fixed Rails 3.2 dependency issue
+
+## 2.0 (20 December 2011)
+
+  - Minimum dependency set to Rails 3.2
+
 ## 1.0.19 (26 November 2011)
 
   - Updated to jQuery 1.7.1

data/Gemfile

@@ -2,8 +2,3 @@ source :gemcutter
 
 # Specify your gem's dependencies in jquery-rails.gemspec
 gemspec
-# Rails is already being pulled in through gemspec
-# gem "rails", :git => "git://github.com/rails/rails.git"
-gem "rack", :git => "git://github.com/rack/rack.git"
-gem "sprockets", :git => "git://github.com/sstephenson/sprockets.git"
-gem "i18n", "0.6.0beta1"

data/Gemfile.lock

@@ -1,100 +1,62 @@
-GIT
-  remote: git://github.com/rack/rack.git
-  revision: a9beb476b27914794743d0677b327d5bafb5e8a3
-  specs:
-    rack (1.2.1)
-
-GIT
-  remote: git://github.com/sstephenson/sprockets.git
-  revision: c4800417792744c11eb1fb888bbe9a3a82859952
-  specs:
-    sprockets (2.0.0.beta.2)
-      hike (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.0)
-
 PATH
   remote: .
   specs:
-    jquery-rails (1.0.17)
-      railties (~> 3.0)
+    jquery-rails (2.0.0)
+      railties (>= 3.2.0, < 5.0)
       thor (~> 0.14)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    abstract (1.0.0)
-    actionmailer (3.0.5)
-      actionpack (= 3.0.5)
-      mail (~> 2.2.15)
-    actionpack (3.0.5)
-      activemodel (= 3.0.5)
-      activesupport (= 3.0.5)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.4)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.13)
-      rack-test (~> 0.5.7)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.5)
-      activesupport (= 3.0.5)
-      builder (~> 2.1.2)
-      i18n (~> 0.4)
-    activerecord (3.0.5)
-      activemodel (= 3.0.5)
-      activesupport (= 3.0.5)
-      arel (~> 2.0.2)
-      tzinfo (~> 0.3.23)
-    activeresource (3.0.5)
-      activemodel (= 3.0.5)
-      activesupport (= 3.0.5)
-    activesupport (3.0.5)
-    arel (2.0.10)
-    builder (2.1.2)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    hike (1.0.0)
-    i18n (0.6.0beta1)
-    mail (2.2.19)
-      activesupport (>= 2.3.6)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.17.2)
-    polyglot (0.3.3)
-    rack-mount (0.6.14)
-      rack (>= 1.0.0)
-    rack-test (0.5.7)
+    actionpack (3.2.1)
+      activemodel (= 3.2.1)
+      activesupport (= 3.2.1)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.1)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.1)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.1.2)
+    activemodel (3.2.1)
+      activesupport (= 3.2.1)
+      builder (~> 3.0.0)
+    activesupport (3.2.1)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    builder (3.0.0)
+    erubis (2.7.0)
+    hike (1.2.1)
+    i18n (0.6.0)
+    journey (1.0.3)
+    json (1.6.5)
+    multi_json (1.1.0)
+    rack (1.4.1)
+    rack-cache (1.1)
+      rack (>= 0.4)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.0.5)
-      actionmailer (= 3.0.5)
-      actionpack (= 3.0.5)
-      activerecord (= 3.0.5)
-      activeresource (= 3.0.5)
-      activesupport (= 3.0.5)
-      bundler (~> 1.0)
-      railties (= 3.0.5)
-    railties (3.0.5)
-      actionpack (= 3.0.5)
-      activesupport (= 3.0.5)
+    railties (3.2.1)
+      actionpack (= 3.2.1)
+      activesupport (= 3.2.1)
+      rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
-      thor (~> 0.14.4)
+      rdoc (~> 3.4)
+      thor (~> 0.14.6)
     rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    sprockets (2.1.2)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
     thor (0.14.6)
-    tilt (1.3)
-    treetop (1.4.10)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.31)
+    tilt (1.3.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0.0)
-  i18n (= 0.6.0beta1)
   jquery-rails!
-  rack!
-  rails (~> 3.0)
-  sprockets!

data/jquery-rails.gemspec

@@ -14,12 +14,10 @@ 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", "< 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/}
   s.require_path = 'lib'
-end
+end

data/lib/jquery/rails.rb

@@ -1,12 +1,8 @@
+require 'jquery/rails/engine'
+require 'jquery/rails/version'
+
 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/version'
   end
 end

data/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

data/lib/jquery/rails/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jquery-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.19
+  version: 2.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,25 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-26 00:00:00.000000000Z
+date: 2012-02-28 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &2153566560 !ruby/object:Gem::Requirement
+  requirement: &70131012506520 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+    - - <
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153566560
+  version_requirements: *70131012506520
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2153566080 !ruby/object:Gem::Requirement
+  requirement: &70131012534720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,29 +35,7 @@ dependencies:
         version: '0.14'
   type: :runtime
   prerelease: false
-  version_requirements: *2153566080
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: &2153565620 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :development
-  prerelease: false
-  version_requirements: *2153565620
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: &2153565120 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: *2153565120
+  version_requirements: *70131012534720
 description: This gem provides jQuery and the jQuery-ujs driver for your Rails 3 application.
 email:
 - andre@arko.net
@@ -75,7 +56,6 @@ files:
 - lib/jquery/assert_select.rb
 - lib/jquery/rails.rb
 - lib/jquery/rails/engine.rb
-- lib/jquery/rails/railtie.rb
 - lib/jquery/rails/version.rb
 - spec/lib/jquery-rails_spec.rb
 - spec/spec_helper.rb
@@ -104,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: jquery-rails
-rubygems_version: 1.8.11
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Use jQuery with Rails 3

data/lib/jquery/rails/railtie.rb

@@ -1,25 +0,0 @@
-# Configure Rails 3.0 to use public/javascripts/jquery et al
-module Jquery
-  module Rails
-
-    class Railtie < ::Rails::Railtie
-      config.before_configuration do
-        require "jquery/assert_select" if ::Rails.env.test?
-
-        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?
-        else
-          jq_defaults = ::Rails.env.production? ? %w(jquery.min) : %w(jquery)
-        end
-
-        # Merge the jQuery scripts, remove the Prototype defaults and finally add 'jquery_ujs'
-        # at the end, because load order is important
-        config.action_view.javascript_expansions[:defaults] -= PROTOTYPE_JS + ['rails']
-        config.action_view.javascript_expansions[:defaults] |= jq_defaults
-        config.action_view.javascript_expansions[:defaults] << 'jquery_ujs'
-      end
-    end
-
-  end
-end