rack-combobot 0.2.1 → 0.2.2

data/.gitignore

@@ -1,2 +1,3 @@
 .DS_Store
 *.gem
+Gemfile.lock

data/README.md

@@ -31,10 +31,14 @@ config.middleware.use 'Rack::Combobot', :root => "#{Rails.root}/public"
 
 ### Expires header
 
-Add expires header by like so
+Add expires header
 
 ```ruby
 config.middleware.use 'Rack::Combobot', :root => "#{Rails.root}/public", :expires => Time.gm(2020)
 ```
 
 To bust the cache, simple add a unique string to your request like so `/combobot/BUSTINGSRING?script1.js&script2.js`.
+
+### Without query string
+
+If you environment doesn't allow having the file names in the query string (Like on CloudFront). Combobot will accept the file names as part of the url, but they have to start with `&`.

data/lib/rack/combobot.rb

@@ -24,16 +24,17 @@ module Rack
 
     # rack request handler
     def call(env)
-      if Rack::Request.new(env).path =~ /^\/combobot/
-        combine(env)
+      request = Rack::Request.new(env)
+
+      if request.path =~ /^\/combobot/
+        combine(request)
       else
         @app.call(env)
       end
     end
 
-    def combine(env)
-      params      = env["QUERY_STRING"]
-      file_names  = params.split("&")
+    def combine(request)
+      file_names = extract_file_names_from_request(request)
 
       return not_found if file_names.empty?
 
@@ -48,6 +49,20 @@ module Rack
       end
     end
 
+    def extract_file_names_from_request(request)
+      path = request.path
+      file_names = request.query_string
+
+      if file_names == '' && path =~ /.js|.css/
+        file_names = path.split('&')
+        file_names.slice!(0)
+      else
+        file_names = file_names.split("&")
+      end
+
+      file_names
+    end
+
     def create_headers(extension)
       headers = {"Content-Type" => MIME_TYPES[extension]}
 

data/rack-combobot.gemspec

@@ -4,7 +4,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "rack-combobot"
-  s.version     = "0.2.1"
+  s.version     = "0.2.2"
   s.authors     = ["Simon Højberg", "Christopher Meiklejohn"]
   s.email       = ["r.hackr@gmail.com", "christopher.meiklejohn@gmail.com"]
   s.homepage    = "https://github.com/hojberg/rack-combobot"

data/spec/lib/rack/combobot_spec.rb

@@ -12,7 +12,9 @@ describe Rack::Combobot do
   end
 
   # request helpers
-  let(:combobot_request)        { { 'PATH_INFO' => '/combobot' } }
+  let(:combobot_request)        { { 'PATH_INFO' => '/combobot' }                                      }
+  let(:no_querystring_request)  { { 'PATH_INFO' => '/combobot/&js1.js&js2.js' }                       }
+  let(:no_querystring_request_with_slash)  { { 'PATH_INFO' => '/combobot/cachebuster/&subdir/js1.js&subdir/js2.js' } }
   let(:combobot_js_request)     { combobot_request.merge({ "QUERY_STRING" => "js1.js&js2.js" })       }
   let(:combobot_css_request)    { combobot_request.merge({ "QUERY_STRING" => "css1.css&css2.css" })   }
   let(:combobot_404_request)    { combobot_request.merge({ "QUERY_STRING" => "js3.js&js4.js" })       }
@@ -40,6 +42,16 @@ describe Rack::Combobot do
     it "combines css" do
       @app.call(combobot_css_request).must_equal(combobot_css_response)
     end
+
+    describe 'without query string' do
+      it "combines javascript" do
+        @app.call(no_querystring_request).must_equal(combobot_js_response)
+      end
+
+      it 'combines without / in file names' do
+        @app.call(no_querystring_request_with_slash).must_equal(combobot_js_response)
+      end
+    end
   end
 
   describe 'error handling' do

data/spec/public/subdir/js1.js

@@ -0,0 +1 @@
+function lorem() { return "a"; }

data/spec/public/subdir/js2.js

@@ -0,0 +1 @@
+function ipsum() { return "b"; }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-combobot
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-22 00:00:00.000000000 Z
+date: 2012-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2168961680 !ruby/object:Gem::Requirement
+  requirement: &2152864840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2168961680
+  version_requirements: *2152864840
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &2168961240 !ruby/object:Gem::Requirement
+  requirement: &2152864400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2168961240
+  version_requirements: *2152864400
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &2168960820 !ruby/object:Gem::Requirement
+  requirement: &2152863980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168960820
+  version_requirements: *2152863980
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &2168960400 !ruby/object:Gem::Requirement
+  requirement: &2152863560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168960400
+  version_requirements: *2152863560
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &2168959980 !ruby/object:Gem::Requirement
+  requirement: &2152863140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168959980
+  version_requirements: *2152863140
 - !ruby/object:Gem::Dependency
   name: guard-minitest
-  requirement: &2168959560 !ruby/object:Gem::Requirement
+  requirement: &2152862720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,7 +77,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168959560
+  version_requirements: *2152862720
 description: combines assets to server 1 file
 email:
 - r.hackr@gmail.com
@@ -90,7 +90,6 @@ files:
 - .rbenv-version
 - .travis.yml
 - Gemfile
-- Gemfile.lock
 - Guardfile
 - README.md
 - Rakefile
@@ -106,6 +105,8 @@ files:
 - spec/public/css2.css
 - spec/public/js1.js
 - spec/public/js2.js
+- spec/public/subdir/js1.js
+- spec/public/subdir/js2.js
 - spec/spec_helper.rb
 homepage: https://github.com/hojberg/rack-combobot
 licenses: []
@@ -138,4 +139,6 @@ test_files:
 - spec/public/css2.css
 - spec/public/js1.js
 - spec/public/js2.js
+- spec/public/subdir/js1.js
+- spec/public/subdir/js2.js
 - spec/spec_helper.rb

data/Gemfile.lock

@@ -1,32 +0,0 @@
-PATH
-  remote: .
-  specs:
-    rack-combobot (0.2.0)
-      rack
-      rake
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    ffi (1.0.11)
-    guard (0.10.0)
-      ffi (>= 0.5.0)
-      thor (~> 0.14.6)
-    guard-minitest (0.5.0)
-      guard (~> 0.4)
-    minitest (2.10.0)
-    rack (1.4.0)
-    rack-test (0.6.1)
-      rack (>= 1.0)
-    rake (0.9.2.2)
-    thor (0.14.6)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  guard
-  guard-minitest
-  minitest
-  rack-combobot!
-  rack-test