jquery-rails-cdn 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c4e6d51db0f60d5e3a26d12c0a2d7b83d70c8d5
-  data.tar.gz: 83f2c3427276ef5b1b8ffc72a7dc05ea458fdfa4
+  metadata.gz: 74f2fc075f341160c003b22d6ac144273772eed7
+  data.tar.gz: e301f983738623f8847385d6dd8d3967960f31ee
 SHA512:
-  metadata.gz: f5e028fdb357b141e94ea66f917bc73e1892082fb337666fb50923fe6d410e17bb9adc184b3bbafb129c857303f8c9b192341eb78857bf429cfbaba032d89c03
-  data.tar.gz: 2261802cf08839060320e21ec4d1820b782c9b8d9b2f0471f3d13f149da7b62dbbace8508ea8a9482cc3433a7d7927b15dba1913bca0a3f605809e73bc8be848
+  metadata.gz: 801acf82ee8c3ddee109a8f63da786c9d4dedee74e0371f4e4a32614a46bae4b4871564e95382ec55c2262e8f1425c4306a1ad5cd179f532020b3fd46d6bca92
+  data.tar.gz: 6816ed13a68305e82d94651b5635d7f8367eb24ade9878169dd1e639c9a4fcc11665d8d06018ef274c4c2aab8ea9c755a9a6305779f3ddc367c9a29f85cd84ca

data/README.md

@@ -27,6 +27,7 @@ On top of that, if you're using asset pipeline, you may have noticed that the ma
 
 Changelog:
 
+* v1.1.0: Support jQuery2. (Thanks to @timurkhafizov)
 * v1.0.0: Options like `defer: true` or `data-turbolinks-eval: false` are allowed to be passed. (Thanks to @mkitt)
 * v0.4.0: Added Cloudflare. (Thanks to @damonmorgan)
 * v0.3.0: Microsoft and Yandex are now always scheme-less. (Thanks to @atipugin)
@@ -82,8 +83,22 @@ on development:
 <script src="/assets/jquery.js?body=1" type="text/javascript"></script>
 ```
 
-If you want to check the production URL, you can pass `:force => true` as an option.
+If you want to check the production URL, you can pass `force: true` as an option.
 
 ```ruby
-jquery_include_tag :google, :force => true
+jquery_include_tag :google, force: true
+```
+
+## jQuery 2
+
+If you want to use jQuery 2, drop the following line in `config/initializers/jquery_cdn.rb`:
+
+```ruby
+Jquery::Rails::Cdn.major_version = 2
+```
+
+and then in `config/application.rb`:
+
+```ruby
+config.assets.precompile += ['jquery2.js']
 ```

data/lib/jquery-rails-cdn.rb

@@ -2,23 +2,35 @@ require 'jquery-rails'
 require 'jquery-rails-cdn/version'
 
 module Jquery::Rails::Cdn
+  mattr_accessor :major_version
+
   module ActionViewExtensions
-    JQUERY_VERSION = Jquery::Rails::JQUERY_VERSION
     OFFLINE = (Rails.env.development? or Rails.env.test?)
     URL = {
-      :google             => "//ajax.googleapis.com/ajax/libs/jquery/#{JQUERY_VERSION}/jquery.min.js",
-      :microsoft          => "//ajax.aspnetcdn.com/ajax/jQuery/jquery-#{JQUERY_VERSION}.min.js",
-      :jquery             => "//code.jquery.com/jquery-#{JQUERY_VERSION}.min.js",
-      :yandex             => "//yandex.st/jquery/#{JQUERY_VERSION}/jquery.min.js",
-      :cloudflare         => "//cdnjs.cloudflare.com/ajax/libs/jquery/#{JQUERY_VERSION}/jquery.min.js"
+      :google      => "//ajax.googleapis.com/ajax/libs/jquery/{JQUERY_VERSION}/jquery.min.js",
+      :microsoft   => "//ajax.aspnetcdn.com/ajax/jQuery/jquery-{JQUERY_VERSION}.min.js",
+      :jquery      => "//code.jquery.com/jquery-{JQUERY_VERSION}.min.js",
+      :yandex      => "//yandex.st/jquery/{JQUERY_VERSION}/jquery.min.js",
+      :cloudflare  => "//cdnjs.cloudflare.com/ajax/libs/jquery/{JQUERY_VERSION}/jquery.min.js"
     }
 
     def jquery_url(name)
-      URL[name]
+      @@jquery_urls ||= begin
+        version = case Jquery::Rails::Cdn.major_version
+        when 1, NilClass
+          Jquery::Rails::JQUERY_VERSION
+        when 2
+          Jquery::Rails::JQUERY_2_VERSION
+        else
+          raise 'invalid :major_version option'
+        end
+        Hash[URL.map{|k,v| [k, v.sub(/\{JQUERY_VERSION\}/, version)] }]
+      end
+      @@jquery_urls[name]
     end
 
     def jquery_include_tag(name, options = {})
-      return javascript_include_tag(:jquery, options) if !options.delete(:force) and OFFLINE
+      return javascript_include_tag(:jquery, options) if OFFLINE && !options.delete(:force)
 
       [ javascript_include_tag(jquery_url(name), options),
         javascript_tag("window.jQuery || document.write(unescape('#{javascript_include_tag(:jquery, options).gsub('<','%3C')}'))")

data/lib/jquery-rails-cdn/version.rb

@@ -1,7 +1,7 @@
 module Jquery
   module Rails
     module Cdn
-      VERSION = '1.0.3'
+      VERSION = '1.1.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jquery-rails-cdn
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Kenn Ejima
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-25 00:00:00.000000000 Z
+date: 2015-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jquery-rails
@@ -58,7 +58,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Add CDN support to jquery-rails