sinatra-bundles 0.1.1 → 0.1.2

data/README.md

@@ -20,7 +20,11 @@ Assuming you have the following files in public:
     ./javascripts/lightbox.js
     ./javascripts/blog.js
 
-You can bundle these files in your app like this:
+You can bundle these files in your app like this. First, install the gem
+
+    % [sudo] gem install sinatra-bundles
+
+And include it in your app:
 
     require 'sinatra'
     require 'sinatra/bundles'
@@ -32,6 +36,8 @@ You can bundle these files in your app like this:
       'sinatra-bundles rocks!'
     end
 
+That sinatra is version 0.10.1, so you'll have to grab it from source and install it that way, since it's not out yet.
+
 Then in your view, you can use the view helpers to insert the proper script tags:
 
     = javascript_bundle_include_tag(:all)
@@ -79,7 +85,11 @@ Check out the code for my blog for a real example: [darkblog on github](http://g
 What you Need
 -------------
 
-sinatra >= 0.10.1 (edge)
+    sinatra >= 0.10.1 (edge)
+    packr
+    rainpress
+
+packr and rainpress are dependencies, but sinatra isn't, since version 0.10.1 isn't out yet, and you have to download the source manually.
 
 Note on Patches/Pull Requests
 -----------------------------

data/Rakefile

@@ -12,8 +12,7 @@ begin
     gem.authors = ['Daniel Huckstep']
     gem.add_dependency 'rainpress', '>= 0'
     gem.add_dependency 'packr', '>= 0'
-    # Wait until you can get this normally
-    # gem.add_dependency 'sinatra', '>= 0.10.1'
+    gem.add_dependency 'sinatra', '>= 1.0.a'
     gem.add_development_dependency 'rspec', '>= 1.2.9'
     gem.add_development_dependency 'rack-test', '>= 0.5.3'
     gem.add_development_dependency 'yard', '>= 0'

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/sinatra/bundles.rb

@@ -44,7 +44,7 @@ module Sinatra
       # @param [String] name The name of a bundle
       # @return [String] The HTML that can be inserted into the doc
       def to_html(name)
-        "<link type='text/css' href='/stylesheets/bundle_#{name}.css#{@app.stamp_bundles ? "?#{stamp}" : ''}' rel='stylesheet' media='screen' />"
+        "<link type='text/css' href='/stylesheets/bundles/#{name}.css#{@app.stamp_bundles ? "?#{stamp}" : ''}' rel='stylesheet' media='screen' />"
       end
 
     protected
@@ -74,7 +74,7 @@ module Sinatra
       # @param [String] name The name of a bundle
       # @return [String] The HTML that can be inserted into the doc
       def to_html(name)
-        "<script type='text/javascript' src='/javascripts/bundle_#{name}.js#{@app.stamp_bundles ? "?#{stamp}" : ''}'></script>"
+        "<script type='text/javascript' src='/javascripts/bundles/#{name}.js#{@app.stamp_bundles ? "?#{stamp}" : ''}'></script>"
       end
 
     protected
@@ -153,14 +153,14 @@ module Sinatra
 
       app.helpers(Helpers)
 
-      app.get('/stylesheets/bundle_:bundle.css') do |bundle|
+      app.get('/stylesheets/bundles/:bundle.css') do |bundle|
         content_type('text/css')
         headers['Vary'] = 'Accept-Encoding'
         expires(options.bundle_cache_time, :public, :must_revalidate) if options.cache_bundles
         options.stylesheet_bundles[bundle.intern]
       end
 
-      app.get('/javascripts/bundle_:bundle.js') do |bundle|
+      app.get('/javascripts/bundles/:bundle.js') do |bundle|
         content_type('text/javascript; charset=utf-8')
         headers['Vary'] = 'Accept-Encoding'
         expires(options.bundle_cache_time, :public, :must_revalidate) if options.cache_bundles

data/sinatra-bundles.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra-bundles}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Daniel Huckstep"]
-  s.date = %q{2010-01-13}
+  s.date = %q{2010-02-07}
   s.description = %q{Bundle CSS and Javascript assets to a single file, compress, and cache them for snappier web experiences.}
   s.email = %q{darkhelmet@darkhelmetlive.com}
   s.extra_rdoc_files = [
@@ -109,12 +109,14 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rainpress>, [">= 0"])
       s.add_runtime_dependency(%q<packr>, [">= 0"])
+      s.add_runtime_dependency(%q<sinatra>, [">= 1.0.a"])
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_development_dependency(%q<rack-test>, [">= 0.5.3"])
       s.add_development_dependency(%q<yard>, [">= 0"])
     else
       s.add_dependency(%q<rainpress>, [">= 0"])
       s.add_dependency(%q<packr>, [">= 0"])
+      s.add_dependency(%q<sinatra>, [">= 1.0.a"])
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_dependency(%q<rack-test>, [">= 0.5.3"])
       s.add_dependency(%q<yard>, [">= 0"])
@@ -122,6 +124,7 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<rainpress>, [">= 0"])
     s.add_dependency(%q<packr>, [">= 0"])
+    s.add_dependency(%q<sinatra>, [">= 1.0.a"])
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
     s.add_dependency(%q<rack-test>, [">= 0.5.3"])
     s.add_dependency(%q<yard>, [">= 0"])

data/spec/sinatra-bundles_spec.rb

@@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 require 'app'
 require 'production_app'
 
-describe 'SinatraBundles' do
+describe 'sinatra-bundles' do
   def app(env = :test)
     case env
     when :production
@@ -85,28 +85,28 @@ describe 'SinatraBundles' do
       app.new.instance_eval do
         options.disable(:stamp_bundles)
         javascript_bundle_include_tag(:test)
-      end.should == "<script type='text/javascript' src='/javascripts/bundle_test.js'></script>"
+      end.should == "<script type='text/javascript' src='/javascripts/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
         javascript_bundle_include_tag(:test)
-      end.should == "<script type='text/javascript' src='/javascripts/bundle_test.js?#{js_stamp(%w(test1 test2))}'></script>"
+      end.should == "<script type='text/javascript' src='/javascripts/bundles/test.js?#{js_stamp(%w(test1 test2))}'></script>"
     end
 
     it 'should serve bundles' do
-      get "/javascripts/bundle_test.js"
+      get "/javascripts/bundles/test.js"
       last_response.should be_ok
     end
 
     it 'should concat files in order with newlines including one at the end' do
-      get '/javascripts/bundle_test.js'
+      get '/javascripts/bundles/test.js'
       last_response.body.should == @scripts.map { |path| File.read(path) }.join("\n") + "\n"
     end
 
     it 'should set cache headers' do
       app.enable(:cache_bundles)
-      get '/javascripts/bundle_test.js'
+      get '/javascripts/bundles/test.js'
       last_response.should be_ok
       last_response.headers['Vary'].should == 'Accept-Encoding'
       last_response.headers['Cache-Control'].should == 'public, must-revalidate, max-age=31536000'
@@ -124,28 +124,28 @@ describe 'SinatraBundles' do
       app.new.instance_eval do
         options.disable(:stamp_bundles)
         stylesheet_bundle_link_tag(:test)
-      end.should == "<link type='text/css' href='/stylesheets/bundle_test.css' rel='stylesheet' media='screen' />"
+      end.should == "<link type='text/css' href='/stylesheets/bundles/test.css' rel='stylesheet' media='screen' />"
     end
 
     it 'should stamp bundles with the timestamp of the newest file in the bundle' do
       app.new.instance_eval do
         stylesheet_bundle_link_tag(:test)
-      end.should == "<link type='text/css' href='/stylesheets/bundle_test.css?#{css_stamp(%w(test1 test2))}' rel='stylesheet' media='screen' />"
+      end.should == "<link type='text/css' href='/stylesheets/bundles/test.css?#{css_stamp(%w(test1 test2))}' rel='stylesheet' media='screen' />"
     end
 
     it 'should serve bundles' do
-      get "/stylesheets/bundle_test.css"
+      get "/stylesheets/bundles/test.css"
       last_response.should be_ok
     end
 
     it 'should concat files in order with newlines including one at the end' do
-      get '/stylesheets/bundle_test.css'
+      get '/stylesheets/bundles/test.css'
       last_response.body.should == @styles.map { |path| File.read(path) }.join("\n") + "\n"
     end
 
     it 'should set cache headers' do
       app.enable(:cache_bundles)
-      get '/stylesheets/bundle_test.css'
+      get '/stylesheets/bundles/test.css'
       last_response.should be_ok
       last_response.headers['Vary'].should == 'Accept-Encoding'
       last_response.headers['Cache-Control'].should == 'public, must-revalidate, max-age=31536000'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra-bundles
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Daniel Huckstep
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-13 00:00:00 -07:00
+date: 2010-02-07 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,6 +32,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: sinatra
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.0.a
+    version: 
 - !ruby/object:Gem::Dependency 
   name: rspec
   type: :development