sinatra-bundles 0.5.2 → 0.5.3

data/Gemfile

@@ -1,3 +1,2 @@
 source 'http://rubygems.org'
-
-gemspec
+gemspec

data/Gemfile.1.2

@@ -0,0 +1,3 @@
+source 'http://rubygems.org'
+gemspec
+gem 'sinatra', '1.2'

data/Gemfile.1.3

@@ -0,0 +1,3 @@
+source 'http://rubygems.org'
+gemspec
+gem 'sinatra', '1.3'

data/Gemfile.lock

@@ -1,27 +1,27 @@
 PATH
   remote: .
   specs:
-    sinatra-bundles (0.5.1)
+    sinatra-bundles (0.5.2)
       packr (~> 3.1.0)
       rack (~> 1.0)
       rainpress (~> 1.0)
-      sinatra (~> 1.0)
+      sinatra (~> 1.2)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    columnize (0.3.3)
-    diff-lcs (1.1.2)
-    linecache (0.45)
-    oyster (0.9.4)
-    packr (3.1.0)
-      oyster
-    rack (1.3.0)
-    rack-test (0.6.0)
+    diff-lcs (1.1.3)
+    oyster (0.9.5)
+    packr (3.1.1)
+      oyster (>= 0.9.5)
+    rack (1.3.5)
+    rack-protection (1.1.4)
+      rack
+    rack-test (0.6.1)
       rack (>= 1.0)
     rainpress (1.0)
-    rake (0.9.2)
-    require_relative (1.0.2)
+    rake (0.9.2.2)
+    require_relative (1.0.3)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)
       rspec-expectations (~> 2.6.0)
@@ -30,25 +30,20 @@ GEM
     rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
-    ruby-debug (0.10.4)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.4.0)
-    ruby-debug-base (0.10.4)
-      linecache (>= 0.3)
-    sinatra (1.2.6)
-      rack (~> 1.1)
-      tilt (< 2.0, >= 1.2.2)
-    tilt (1.3.2)
-    yard (0.7.2)
+    sinatra (1.3.1)
+      rack (>= 1.3.4, ~> 1.3)
+      rack-protection (>= 1.1.2, ~> 1.1)
+      tilt (>= 1.3.3, ~> 1.3)
+    tilt (1.3.3)
+    yard (0.7.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  rack-test (>= 0.5.3)
+  rack-test (~> 0.6.0)
   rake
   require_relative
-  rspec (~> 2.6)
-  ruby-debug
+  rspec (~> 2.6.0)
   sinatra-bundles!
   yard

data/Rakefile

@@ -1,7 +1,6 @@
 require 'rubygems'
 require 'bundler'
 require 'date'
-require 'ruby-debug'
 
 #############################################################################
 #

data/lib/sinatra/bundles.rb

@@ -1,7 +1,7 @@
 module Sinatra
   # Main Bundles Module
   module Bundles
-    Version = '0.5.2'
+    Version = '0.5.3'
 
     mypath = File.dirname(__FILE__)
     autoload :Helpers, "#{mypath}/bundles/helpers"
@@ -62,7 +62,7 @@ module Sinatra
       end
 
       app.get(%r{/#{Regexp.quote(app.javascripts)}/bundles/(\w+)(?:/(\d+))?\.js}) do |bundle, stamp| # Don't really care about the stamp.
-        content_type('text/javascript')
+        content_type('application/javascript')
         headers['Vary'] = 'Accept-Encoding'
         if settings.cache_bundles
           expires(settings.bundle_cache_time, :public, :must_revalidate)

data/lib/sinatra/bundles/bundle.rb

@@ -21,17 +21,14 @@ module Sinatra
       def files
         @files ||= @names.map do |f|
           full_path = path(f)
-          if File.file?(full_path)
-            f
-          else
-            ext = File.extname(full_path)
-            Dir[full_path].map do |file|
-              if File.exists?(file)
-                file.chomp(ext).gsub("#{root}/", '')
-              end
+          next f if File.file?(full_path)
+          ext = File.extname(full_path)
+          Dir[full_path].sort.map do |file|
+            if File.exists?(file)
+              file.chomp(ext).gsub("#{root}/", '')
             end
           end
-        end.flatten.uniq
+        end.flatten.compact.uniq
       end
 
       # Since we pass Bundles back as the body,
@@ -82,6 +79,10 @@ module Sinatra
 
     private
 
+      def public_folder
+        @public ||= @app.respond_to?(:public_folder) ? @app.public_folder : @app.public
+      end
+
       def options_hash
         {
           :compress => @app.compress_bundles,
@@ -94,7 +95,7 @@ module Sinatra
       #
       # @return [Integer] The timestamp of the bundle
       def stamp
-        files.map { |f| File.mtime(path(f)) }.sort.last.to_i
+        files.map { |f| File.mtime(path(f)) }.max.to_i
       end
     end
   end

data/lib/sinatra/bundles/javascript_bundle.rb

@@ -23,7 +23,7 @@ module Sinatra
 
       # The root of these bundles, for path purposes
       def root
-        @root ||= File.join(@app.public, @app.javascripts)
+        @root ||= File.join(public_folder, @app.javascripts)
       end
 
     protected

data/lib/sinatra/bundles/stylesheet_bundle.rb

@@ -25,7 +25,7 @@ module Sinatra
 
       # The root of these bundles, for path purposes
       def root
-        @root ||= File.join(@app.public, @app.stylesheets)
+        @root ||= File.join(public_folder, @app.stylesheets)
       end
 
     protected

data/sinatra-bundles.gemspec

@@ -15,8 +15,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'sinatra-bundles'
-  s.version           = '0.5.2'
-  s.date              = '2011-06-18'
+  s.version           = '0.5.3'
+  s.date              = '2011-10-30'
 
   ## Make sure your summary is short. The description may be as long
   ## as you like.
@@ -39,15 +39,14 @@ Gem::Specification.new do |s|
   s.add_dependency('rainpress', ['~> 1.0'])
   s.add_dependency('packr', ['~> 3.1.0'])
   s.add_dependency('rack', ['~> 1.0'])
-  s.add_dependency('sinatra', ['~> 1.0'])
+  s.add_dependency('sinatra', ['~> 1.2'])
 
   ## List your development dependencies here. Development dependencies are
   ## those that are only needed during development
-  s.add_development_dependency('rspec', ['~> 2.6'])
-  s.add_development_dependency('rack-test', ['>= 0.5.3'])
+  s.add_development_dependency('rspec', ['~> 2.6.0'])
+  s.add_development_dependency('rack-test', ['~> 0.6.0'])
   s.add_development_dependency('yard')
   s.add_development_dependency('rake')
-  s.add_development_dependency('ruby-debug')
   s.add_development_dependency('require_relative')
 
   ## Leave this section as-is. It will be automatically generated from the
@@ -56,6 +55,8 @@ Gem::Specification.new do |s|
   # = MANIFEST =
   s.files = %w[
     Gemfile
+    Gemfile.1.2
+    Gemfile.1.3
     Gemfile.lock
     LICENSE
     README.md

data/spec/public/javascripts/test2.js

@@ -1,5 +1,5 @@
 function goodbye(name) {
-  alert('Hello, ' + name);
+  alert('Goodbye, ' + name);
 }
 
 goodbye('Bob');

data/spec/sinatra-bundles_spec.rb

@@ -9,15 +9,17 @@ require 'base_app'
 describe 'sinatra-bundles' do
   def app(env = :test)
     case env
-    when :production
-      ProductionApp
-    when :custom
-      CustomApp
-    else
-      TestApp
+    when :production then ProductionApp
+    when :custom then CustomApp
+    else TestApp
     end
   end
 
+  def get_base_app(a)
+    return a if a.is_a?(Sinatra::Base)
+    get_base_app(a.instance_eval { @app })
+  end
+
   def stamp(type, ext, names)
     names.map do |name|
       File.expand_path(File.join(File.dirname(__FILE__), 'public', type, "#{name}.#{ext}"))
@@ -86,37 +88,30 @@ describe 'sinatra-bundles' do
     end
 
     it 'should create a tag without a stamp if stamps are disabled' do
-      app.new.instance_eval do
-        @app.instance_eval do
-          settings.disable(:stamp_bundles)
-          javascript_bundle_include_tag(:test)
-        end
+      get_base_app(app.new).instance_eval do
+        settings.disable(:stamp_bundles)
+        javascript_bundle_include_tag(:test)
       end.should == "<script type='text/javascript' src='/javascripts/bundles/test.js'></script>"
     end
 
     it 'should create cusomized tag if path is CUSTOM' do
-      app(:custom).new.instance_eval do
-        @app.instance_eval do
-          settings.disable(:stamp_bundles)
-          javascript_bundle_include_tag(:test)
-        end
+      get_base_app(app(:custom).new).instance_eval do
+        settings.disable(:stamp_bundles)
+        javascript_bundle_include_tag(:test)
       end.should == "<script type='text/javascript' src='/s/js/bundles/test.js'></script>"
     end
 
     it 'should stamp bundles with the timestamp of the newest file in the bundle' do
-      app.new.instance_eval do
-        @app.instance_eval do
-          javascript_bundle_include_tag(:test)
-        end
+      get_base_app(app.new).instance_eval do
+        javascript_bundle_include_tag(:test)
       end.should == "<script type='text/javascript' src='/javascripts/bundles/test/#{js_stamp(%w(eval test1 test2))}.js'></script>"
     end
 
     it 'should serve bundles' do
-      get '/javascripts/bundles/test.js'
       # Bogus stamp
       get '/javascripts/bundles/test/987654.js'
       last_response.should be_ok
-      last_response.headers['Content-Type'].should == 'text/javascript;charset=utf-8'
+      last_response.headers['Content-Type'].should == 'application/javascript;charset=utf-8'
     end
 
     it 'should concat files in order with newlines including one at the end' do
@@ -130,7 +125,7 @@ describe 'sinatra-bundles' do
       last_response.should be_ok
       last_response.headers['Vary'].should == 'Accept-Encoding'
       last_response.headers['Cache-Control'].should == 'public, must-revalidate, max-age=31536000'
-      last_response.headers['Etag'].should == '"4f647cfd3ab71800da1b0d0b127e2cd4"'
+      last_response.headers['Etag'].should == '"02e4d9bd148e31bb3dc4fdc1c1d7037e"'
     end
 
     it 'should not shrink vars on javascript files that use eval' do
@@ -146,7 +141,7 @@ describe 'sinatra-bundles' do
       get '/javascripts/bundles/test2.js'
       last_response.should be_ok
       last_response.body.include?('eval').should be_false
-      last_response.body.should == @scripts.reject { |s| s.match(/eval|splat/) }.sort.map { |path| File.read(path) }.join("\n") + "\n"
+      last_response.body.should == @scripts.reject { |s| s.match(/eval|splat/) }.map { |path| File.read(path) }.join("\n") + "\n"
     end
 
     it 'should handle the all scripts wildcard' do
@@ -193,11 +188,9 @@ describe 'sinatra-bundles' do
     end
 
     it 'should return a path' do
-      app.new.instance_eval do
-        @app.instance_eval do
-          settings.disable(:stamp_bundles)
-          settings.javascript_bundles[:test].to_path
-        end
+      get_base_app(app.new).instance_eval do
+        settings.disable(:stamp_bundles)
+        settings.javascript_bundles[:test].to_path
       end.should == '/javascripts/bundles/test.js'
     end
 
@@ -237,44 +230,34 @@ describe 'sinatra-bundles' do
     end
 
     it 'should create a tag without a stamp if stamps are disabled' do
-      app.new.instance_eval do
-        @app.instance_eval do
-          settings.disable(:stamp_bundles)
-          stylesheet_bundle_link_tag(:test)
-        end
+      get_base_app(app.new).instance_eval do
+        settings.disable(:stamp_bundles)
+        stylesheet_bundle_link_tag(:test)
       end.should == "<link type='text/css' href='/stylesheets/bundles/test.css' rel='stylesheet' media='all' />"
     end
 
     it 'should create a tag without a stamp if stamps are disabled CUSTOM' do
-      app(:custom).new.instance_eval do
-        @app.instance_eval do
-          settings.disable(:stamp_bundles)
-          stylesheet_bundle_link_tag(:test)
-        end
+      get_base_app(app(:custom).new).instance_eval do
+        settings.disable(:stamp_bundles)
+        stylesheet_bundle_link_tag(:test)
       end.should == "<link type='text/css' href='/s/css/bundles/test.css' rel='stylesheet' media='all' />"
     end
 
     it 'should stamp bundles with the timestamp of the newest file in the bundle' do
-      app.new.instance_eval do
-        @app.instance_eval do
-          stylesheet_bundle_link_tag(:test)
-        end
+      get_base_app(app.new).instance_eval do
+        stylesheet_bundle_link_tag(:test)
       end.should == "<link type='text/css' href='/stylesheets/bundles/test/#{css_stamp(%w(test1 test2))}.css' rel='stylesheet' media='all' />"
     end
 
     it 'should create a tag with default media attribute set to all' do
-      app.new.instance_eval do
-        @app.instance_eval do
-          stylesheet_bundle_link_tag(:test)
-        end
+      get_base_app(app.new).instance_eval do
+        stylesheet_bundle_link_tag(:test)
       end.include?("media='all'").should be_true
     end
 
     it 'should create a tag with specified media attributes' do
-      app.new.instance_eval do
-        @app.instance_eval do
-          stylesheet_bundle_link_tag(:test, [:screen, :print])
-        end
+      get_base_app(app.new).instance_eval do
+        stylesheet_bundle_link_tag(:test, [:screen, :print])
       end.include?("media='screen, print'").should be_true
     end
 
@@ -335,11 +318,9 @@ describe 'sinatra-bundles' do
     end
 
     it 'should return a path' do
-      app.new.instance_eval do
-        @app.instance_eval do
-          settings.disable(:stamp_bundles)
-          settings.stylesheet_bundles[:test].to_path
-        end
+      get_base_app(app.new).instance_eval do
+        settings.disable(:stamp_bundles)
+        settings.stylesheet_bundles[:test].to_path
       end.should == '/stylesheets/bundles/test.css'
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra-bundles
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 5
-  - 2
-  version: 0.5.2
+  - 3
+  version: 0.5.3
 platform: ruby
 authors: 
 - Daniel Huckstep
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-18 00:00:00 -06:00
+date: 2011-10-30 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -72,11 +72,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 11
         segments: 
         - 1
-        - 0
-        version: "1.0"
+        - 2
+        version: "1.2"
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -87,11 +87,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 23
         segments: 
         - 2
         - 6
-        version: "2.6"
+        - 0
+        version: 2.6.0
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -100,14 +101,14 @@ dependencies:
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 7
         segments: 
         - 0
-        - 5
-        - 3
-        version: 0.5.3
+        - 6
+        - 0
+        version: 0.6.0
   type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
@@ -139,7 +140,7 @@ dependencies:
   type: :development
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: ruby-debug
+  name: require_relative
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
@@ -152,20 +153,6 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: require_relative
-  prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id010
 description: Bundle CSS and Javascript assets to a single file, compress, and cache them for snappier web experiences.
 email: darkhelmet@darkhelmetlive.com
 executables: []
@@ -176,6 +163,8 @@ extra_rdoc_files: []
 
 files: 
 - Gemfile
+- Gemfile.1.2
+- Gemfile.1.3
 - Gemfile.lock
 - LICENSE
 - README.md