rack-jquery 2.1.0 → 2.2.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 1f8217e954299f15d500ed1770ab57c6cbad54be
+  data.tar.gz: df41cb37dd2e07665172fe992c7cc46a24f9ba3d
+SHA512:
+  metadata.gz: 6ac69ec9553d8e9338a42563b5938018fbec02ba1a89391a8c22f9a8967e37d47d88867f3b2fb9aafdc9bb6a54bdb4d43d8b9f8dde1749a4da885272931101f5
+  data.tar.gz: f43e2244312b1b1c68fd11a6de4aad6185d7ed0cdecee78af8f6881ab0ba259d49937e18bda93e00b554237671bc8669486e1ff1eab6ecb32c31afed211d6e6d

data/.gitignore

@@ -8,6 +8,7 @@ InstalledFiles
 _yardoc
 coverage
 doc/
+docs/
 lib/bundler/man
 pkg
 rdoc
@@ -17,4 +18,7 @@ test/version_tmp
 tmp
 .rbx/
 .rspec
+bin/
 vendor/ruby/
+vendor.noindex/ruby/
+.DS_Store

data/.travis.yml

@@ -1,11 +1,21 @@
 language: ruby
 rvm:
-  - 1.9.2
-  - 1.9.3
   - 2.0.0
+  - 2.1.0
+  - 2.2.2
+  - jruby-19mode # JRuby in 1.9 mode
+  - rbx
+  - ruby-head
+  - jruby-head
 
 # whitelist
 branches:
   only:
     - master
     - develop
+
+matrix:
+  allow_failures:
+    - rvm: jruby-head
+    - rvm: ruby-head
+    - rvm: rbx

data/CHANGES.md

@@ -1,5 +1,22 @@
 # CH CH CH CHANGES #
 
+## Wednesday the 2nd of September 2015, v2.2.1 ##
+
+* Fixed typo that was leading to bug. Organisation set by `use` statement would be ignored in `cdn`. Introduced by commit 801a5a13a. Clarified spec for it.
+* Fixed a different bug that also made setting organisation to `false` via the `use` statement to be ignored.
+* Don't give coverage of the vendor.noindex directory.
+
+----
+
+
+## Tuesday the 1st of September 2015, v2.2.0 ##
+
+* Google's CDN now serves v2.1.0 of JQuery, changes for that.
+* Added debug and organisation :false options for `cdn`, I want to be able to use the fallback in development.
+
+----
+
+
 ## Monday the 27th of January 2014, v2.1.0 ##
 
 * Can pass `:raise` as an option to both `use` and `cdn` so that an exception is raised if the chosen organisation isn't running the current version of jQuery on its CDN. It will just warn otherwise.

data/Gemfile

@@ -18,7 +18,7 @@ end
 group :development do
   gem "wirble"
   gem "pry"
-  gem "pry-nav"
+  gem "pry-byebug"
   gem "yard"
   gem "maruku"
 end

data/lib/rack/jquery.rb

@@ -15,7 +15,7 @@ module Rack
     module CDN
 
       # Script tags for the Media Temple CDN
-      MEDIA_TEMPLE = "http://code.jquery.com/#{JQUERY_FILE_NAME}"
+      MEDIA_TEMPLE = "//code.jquery.com/#{JQUERY_FILE_NAME}"
 
       # Script tags for the Google CDN
       GOOGLE = "//ajax.googleapis.com/ajax/libs/jquery/#{JQUERY_VERSION}/jquery.min.js"
@@ -28,11 +28,14 @@ module Rack
 
     end
 
+    # path to the fallback script
+    FALLBACK_PATH = "/js/#{JQUERY_FILE_NAME}"
+
     # This javascript checks if the jQuery object has loaded. If not, that most likely means the CDN is unreachable, so it uses the local minified jQuery.
     FALLBACK = <<STR
 <script type="text/javascript">
   if (typeof jQuery == 'undefined') {
-    document.write(unescape("%3Cscript src='/js/#{JQUERY_FILE_NAME}' type='text/javascript'%3E%3C/script%3E"))
+    document.write(unescape("%3Cscript src='#{FALLBACK_PATH}' type='text/javascript'%3E%3C/script%3E"))
   };
 </script>
 STR
@@ -59,40 +62,56 @@ STR
     #   Rack::JQuery.cdn env
     #
     #   # Choose the organisation
-    #
-    #   # Choose the organisation
     #   Rack::JQuery.cdn env, :organisation => :cloudflare
     #
+    #   # Choose to use the fallback path instead
+    #   Rack::JQuery.cdn env, :organisation => false
+    #
     #   # Raise an error if the organisation doesn't
     #   # support this version of jQuery
     #   Rack::JQuery.cdn env, :raise => true
     #
+    #   # Use the unminified version from the CDN
+    #   Rack::JQuery.cdn env, :debug => true
     def self.cdn( env, options={}  )
       if env.nil? || env.has_key?(:organisation)
         fail ArgumentError, "The Rack::JQuery.cdn method needs the Rack environment passed to it, or at the very least, an empty hash."
       end
 
-      organisation =  options[:organisation] ||
-                        env["rack.jquery.organisation"] ||
-                        :media_temple
+
+      organisation =  options[:organisation]
+      if organisation.nil? # because false is valid
+        organisation =  env["rack.jquery.organisation"].nil? ?
+                          :media_temple :
+                          env["rack.jquery.organisation"]
+      end
 
       raise = raiser?( env, options )
 
-      script = case organisation
-        when :media_temple
-          CDN::MEDIA_TEMPLE
-        when :microsoft
-          CDN::MICROSOFT
-        when :cloudflare
-          CDN::CLOUDFLARE
-        when :google
-          meth = raise ? :fail : :warn
-          send meth, "#{organisation.to_s.gsub('_', ' ').capitalize}'s #{WARNING}" 
-          CDN::GOOGLE
-        else
-          CDN::MEDIA_TEMPLE
+      unless organisation == false
+        script_src = 
+          case organisation
+            when :media_temple
+              CDN::MEDIA_TEMPLE
+            when :microsoft
+              CDN::MICROSOFT
+            when :cloudflare
+              CDN::CLOUDFLARE
+            when :google
+#               meth = raise ? :fail : :warn
+#               send meth, "#{organisation.to_s.gsub('_', ' ').capitalize}'s #{WARNING}" 
+              CDN::GOOGLE
+            else
+              CDN::MEDIA_TEMPLE
+            end
+          
+        debug = options.fetch :debug, false
+  
+        script_src = "#{script_src[0..-7]}js" if debug
+        "<script src='#{script_src}'></script>\n#{FALLBACK}"
+      else
+        "<script src='#{FALLBACK_PATH}'></script>"
       end
-      "<script src='#{script}'></script>\n#{FALLBACK}"
     end
 
 
@@ -119,7 +138,7 @@ STR
     #   use Rack::JQuery, :organisation => :cloudflare
     #
     #   # Raise if CDN does not support this version of the jQuery library.
-    #   use Rack::JQuery, :raise => :true
+    #   use Rack::JQuery, :raise => true
     def initialize( app, options={} )
       @app, @options  = app, DEFAULT_OPTIONS.merge(options)
       @http_path_to_jquery = ::File.join @options[:http_path], JQUERY_FILE_NAME

data/lib/rack/jquery/version.rb

@@ -2,7 +2,7 @@ module Rack
   class JQuery
     
     # the version of this library
-    VERSION = "2.1.0"
+    VERSION = "2.2.1"
 
     # the version of jQuery it supports.
     JQUERY_VERSION = "2.1.0"

data/rack-jquery.gemspec

@@ -20,6 +20,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.2"
   spec.add_development_dependency "rake"
-  spec.add_dependency("rack")
+  spec.add_dependency("rack", "~> 1.5.0")
   spec.add_dependency("rack-jquery-helpers")
 end

data/spec/rack_jquery_spec.rb

@@ -65,27 +65,63 @@ describe "The class methods" do
   context "#cdn" do
     let(:env) { {} }
     subject { Rack::JQuery.cdn env, :organisation => organisation }
-
+    let(:expected) { "<script src='#{src}'></script>\n#{Rack::JQuery::FALLBACK}" }
+    let(:unminified) { "#{src[0..-7]}js" }
     context "Given the organisation option" do
       context "of nil (the default)" do
         let(:organisation) { nil }
-        it { should == "<script src='#{Rack::JQuery::CDN::MEDIA_TEMPLE}'></script>\n#{Rack::JQuery::FALLBACK}" }
+        let(:src){ Rack::JQuery::CDN::MEDIA_TEMPLE }
+        it { should == expected }
+        context "and debug" do
+          subject { Rack::JQuery.cdn env, :organisation => organisation, :debug => true }
+          it { should_not include expected }
+          it { should include unminified }
+        end
       end
       context "of :google" do
         let(:organisation) { :google }
-        it { should == "<script src='#{Rack::JQuery::CDN::GOOGLE}'></script>\n#{Rack::JQuery::FALLBACK}" }
+        let(:src){ Rack::JQuery::CDN::GOOGLE }
+        it { should == expected }
+        context "and debug" do
+          subject { Rack::JQuery.cdn env, :organisation => organisation, :debug => true }
+          it { should_not include expected }
+          it { should include unminified }
+        end
       end
       context "of :microsoft" do
         let(:organisation) { :microsoft }
-        it { should == "<script src='#{Rack::JQuery::CDN::MICROSOFT}'></script>\n#{Rack::JQuery::FALLBACK}" }
+        let(:src){ Rack::JQuery::CDN::MICROSOFT }
+        it { should == expected }
+        context "and debug" do
+          subject { Rack::JQuery.cdn env, :organisation => organisation, :debug => true }
+          it { should_not include expected }
+          it { should include unminified }
+        end
       end
       context "of :media_temple" do
         let(:organisation) { :media_temple }
-        it { should == "<script src='#{Rack::JQuery::CDN::MEDIA_TEMPLE}'></script>\n#{Rack::JQuery::FALLBACK}" }
+        let(:src){ Rack::JQuery::CDN::MEDIA_TEMPLE }
+        it { should == expected }
+        context "and debug" do
+          subject { Rack::JQuery.cdn env, :organisation => organisation, :debug => true }
+          it { should_not include expected }
+          it { should include unminified }
+        end
       end
       context "of :cloudflare" do
         let(:organisation) { :cloudflare }
-        it { should == "<script src='#{Rack::JQuery::CDN::CLOUDFLARE}'></script>\n#{Rack::JQuery::FALLBACK}" }
+        let(:src){ Rack::JQuery::CDN::CLOUDFLARE }
+        it { should == expected }
+        context "and debug" do
+          subject { Rack::JQuery.cdn env, :organisation => organisation, :debug => true }
+          it { should_not include expected }
+          it { should include unminified }
+        end
+      end
+      context "of false" do
+        let(:organisation) { false }
+        let(:expected) { "<script src='/js/#{Rack::JQuery::JQUERY_FILE_NAME}'></script>"}
+        it { should == expected }
       end
     end
 
@@ -119,44 +155,55 @@ describe "Inserting the CDN" do
       it_should_behave_like "Any route"
     end
     context "Google CDN" do
-      context "With :raise set to false (the default)" do
+      context "With :raise set" do
         let(:expected) { Rack::JQuery::CDN::GOOGLE }
-        before do
-          get "/google-cdn"
+        context "to false (the default)" do
+          before do
+            get "/google-cdn"
+          end
+          it_should_behave_like "Any route"
+          subject { last_response.body }
+          it { should include expected }
         end
-        it_should_behave_like "Any route"
-        subject { last_response.body }
-        it { should include expected }
-      end
-      context "With :raise set to true" do
-        context "via `use`" do
-          let(:app) {
-            Sinatra.new do
-              use Rack::JQuery, :raise => true
-              get "/google-cdn" do
-                Rack::JQuery.cdn( env, :organisation => :google )
+        context "to true" do
+          context "via `use`" do
+            let(:app) {
+              Sinatra.new do
+                use Rack::JQuery, :raise => true
+                get "/google-cdn" do
+                  Rack::JQuery.cdn( env, :organisation => :google )
+                end
               end
+            }
+            # it "should raise error as it's not supported for this version" do
+  #             expect { get "/google-cdn" }.to raise_error
+  #           end
+            before do
+              get "/google-cdn"
             end
-          }
-          it "should raise error as it's not supported for this version" do
-            expect { get "/google-cdn" }.to raise_error
+            it_should_behave_like "Any route"
+            subject { last_response.body }
+            it { should include expected }
           end
-#           it { should include expected }
-        end
-        context "via the method options" do
-          let(:app) {
-            Sinatra.new do
-              use Rack::JQuery, :raise => false
-              get "/google-cdn" do
-                Rack::JQuery.cdn( env, :organisation => :google, :raise => true )
+          context "via the method options" do
+            let(:app) {
+              Sinatra.new do
+                use Rack::JQuery
+                get "/google-cdn" do
+                  Rack::JQuery.cdn( env, :organisation => :google, :raise => true )
+                end
               end
+            }
+#             it "should raise error as it's not supported for this version" do
+#               expect { subject }.to raise_error
+#             end
+            before do
+              get "/google-cdn"
             end
-          }
-          subject { get "/google-cdn" }
-          it "should raise error as it's not supported for this version" do
-            expect { subject }.to raise_error
+            it_should_behave_like "Any route"
+            subject { last_response.body }
+            it { should include expected }
           end
-#           it { should include expected }
         end
       end
     end
@@ -184,6 +231,9 @@ describe "Inserting the CDN" do
       end
       it_should_behave_like "Any route"
       subject { last_response.body }
+      # The cloudflare CDN is specified in the app
+      # via the `use` statement, so it will be the one
+      # picked when unspecified via `cdn`
       let(:expected) { Rack::JQuery::CDN::CLOUDFLARE }
       it { should include expected }
     end
@@ -206,9 +256,16 @@ describe "Inserting the CDN" do
       it_should_behave_like "Any route"
     end
     context "Google CDN" do
-      it "Should fail" do
-        expect { get "/google-cdn" }.to raise_error
+#       it "Should fail" do
+#         expect { get "/google-cdn" }.to raise_error
+#       end
+      before do
+        get "/google-cdn"
       end
+      it_should_behave_like "Any route"
+      subject { last_response.body }
+      let(:expected) { Rack::JQuery::CDN::GOOGLE }
+      it { should include expected }
     end
     context "Microsoft CDN" do
       before do

data/spec/spec_helper.rb

@@ -8,6 +8,7 @@ Spec_dir = File.expand_path( File.dirname __FILE__ )
 require 'simplecov'
 SimpleCov.start do
   add_filter "/vendor/"
+  add_filter "/vendor.noindex/"
   add_filter "/bin/"
   add_filter "/spec/"
 end

metadata

@@ -1,78 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: rack-jquery
 version: !ruby/object:Gem::Version
-  version: 2.1.0
-  prerelease: 
+  version: 2.2.1
 platform: ruby
 authors:
 - Iain Barnett
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-27 00:00:00.000000000 Z
+date: 2015-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: rack-jquery-helpers
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: jQuery CDN script tags and fallback in one neat package. Current version
@@ -83,8 +74,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGES.md
 - Gemfile
 - JQUERY-LICENCE.txt
@@ -103,27 +94,26 @@ files:
 homepage: https://github.com/yb66/rack-jquery
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: The description says it all.
 test_files:
 - spec/rack_jquery_spec.rb