sinatra-bundles 0.3.0 → 0.4.0

data/.gitignore

@@ -21,3 +21,4 @@ doc
 .yardoc
 
 ## PROJECT::SPECIFIC
+.bundle/

data/.rvmrc

@@ -0,0 +1 @@
+rvm use ree@bundles

data/Gemfile

@@ -0,0 +1,14 @@
+source 'http://rubygems.org'
+
+gem 'rainpress'
+gem 'packr'
+gem 'rack', '>= 1.0'
+gem 'sinatra', '>= 1.0'
+
+group :development do
+  gem 'rspec', '>= 1.2.9'
+  gem 'rack-test', '>= 0.5.3'
+  gem 'yard'
+  gem 'jeweler'
+  gem 'ruby-debug'
+end

data/Gemfile.lock

@@ -0,0 +1,44 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    columnize (0.3.1)
+    gemcutter (0.6.1)
+    git (1.2.5)
+    jeweler (1.4.0)
+      gemcutter (>= 0.1.0)
+      git (>= 1.2.5)
+      rubyforge (>= 2.0.0)
+    json_pure (1.4.5)
+    linecache (0.43)
+    oyster (0.9.4)
+    packr (3.1.0)
+      oyster
+    rack (1.2.1)
+    rack-test (0.5.4)
+      rack (>= 1.0)
+    rainpress (1.0)
+    rspec (1.3.0)
+    ruby-debug (0.10.3)
+      columnize (>= 0.1)
+      ruby-debug-base (~> 0.10.3.0)
+    ruby-debug-base (0.10.3)
+      linecache (>= 0.3)
+    rubyforge (2.0.4)
+      json_pure (>= 1.1.7)
+    sinatra (1.0)
+      rack (>= 1.0)
+    yard (0.5.8)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  jeweler
+  packr
+  rack (>= 1.0)
+  rack-test (>= 0.5.3)
+  rainpress
+  rspec (>= 1.2.9)
+  ruby-debug
+  sinatra (>= 1.0)
+  yard

data/Rakefile

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'rake'
+require 'bundler'
 
 begin
   require 'jeweler'
@@ -10,13 +11,7 @@ begin
     gem.email = 'darkhelmet@darkhelmetlive.com'
     gem.homepage = 'http://github.com/darkhelmet/sinatra-bundles'
     gem.authors = ['Daniel Huckstep']
-    gem.add_dependency 'rainpress', '>= 0'
-    gem.add_dependency 'packr', '>= 0'
-    gem.add_dependency 'rack', '>= 1.0'
-    gem.add_dependency 'sinatra', '>= 1.0'
-    gem.add_development_dependency 'rspec', '>= 1.2.9'
-    gem.add_development_dependency 'rack-test', '>= 0.5.3'
-    gem.add_development_dependency 'yard', '>= 0'
+    gem.add_bundler_dependencies
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/lib/sinatra/bundles/bundle.rb

@@ -8,33 +8,34 @@ module Sinatra
     class Bundle
       include Enumerable
 
-      def initialize(app, files = nil)
+      def initialize(app, names = nil)
         @app = app
-        @files = []
-        files ||= ['**/*']
-        files.each do |f|
+        @names = names || ['**/*']
+
+        etag if @app.warm_bundle_cache
+      end
+
+      def files
+        @files ||= @names.map do |f|
           full_path = path(f)
           if File.file?(full_path)
-            @files << f
+            f
           else
             ext = File.extname(full_path)
-            Dir[full_path].each do |file|
+            Dir[full_path].map do |file|
               if File.exists?(file)
-                file.chomp!(ext).gsub!("#{root}/", '')
-                @files << file
+                file.chomp(ext).gsub("#{root}/", '')
               end
             end
           end
-        end
-        @files.uniq!
-        etag if @app.warm_bundle_cache
+        end.flatten.uniq
       end
 
       # Since we pass Bundles back as the body,
       # this follows Rack standards and supports an each method
       # to yield parts of the body, in our case, the files.
       def each
-        @files.each do |f|
+        files.each do |f|
           content = File.read(path(f))
           content = compress(content) if @app.compress_bundles
           # Include a new line to prevent weirdness at file boundaries
@@ -66,14 +67,23 @@ module Sinatra
       def rebundle
         @content = nil
         @etag = nil
+        @files = nil
         @options_hash = options_hash.hash
       end
 
+      # Set the root path for this bundle
+      def root=(path)
+        @root = path
+        rebundle
+      end
+
     private
+
       def options_hash
         {
           :compress => @app.compress_bundles,
-          :stamp => stamp
+          :stamp => stamp,
+          :root => root
         }
       end
 
@@ -81,8 +91,8 @@ 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)) }.sort.last.to_i
       end
     end
   end
-end
+end

data/lib/sinatra/bundles/javascript_bundle.rb

@@ -14,13 +14,13 @@ module Sinatra
         "<script type='text/javascript' src='#{src}'></script>"
       end
 
-    protected
-
       # The root of these bundles, for path purposes
       def root
-        File.join(@app.public, @app.javascripts)
+        @root ||= File.join(@app.public, @app.javascripts)
       end
 
+    protected
+
       # Compress Javascript
       #
       # @param [String] js The Javascript to compress

data/lib/sinatra/bundles/stylesheet_bundle.rb

@@ -15,13 +15,13 @@ module Sinatra
         "<link type='text/css' href='#{href}' rel='stylesheet' media='#{media}' />"
       end
 
-    protected
-
       # The root of these bundles, for path purposes
       def root
-        File.join(@app.public, @app.stylesheets)
+        @root ||= File.join(@app.public, @app.stylesheets)
       end
 
+    protected
+
       # Compress CSS
       #
       # @param [String] css The CSS to compress

data/sinatra-bundles.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra-bundles}
-  s.version = "0.3.0"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Daniel Huckstep"]
-  s.date = %q{2010-07-01}
+  s.date = %q{2010-08-08}
   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 = [
@@ -19,6 +19,9 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
      ".gitignore",
+     ".rvmrc",
+     "Gemfile",
+     "Gemfile.lock",
      "LICENSE",
      "README.md",
      "Rakefile",
@@ -31,6 +34,9 @@ Gem::Specification.new do |s|
      "sinatra-bundles.gemspec",
      "spec/app.rb",
      "spec/custom_app.rb",
+     "spec/extension_app.rb",
+     "spec/other_public/css/test.css",
+     "spec/other_public/javascripts/test.js",
      "spec/production_app.rb",
      "spec/public/javascripts/eval.js",
      "spec/public/javascripts/splat/splat.js",
@@ -50,6 +56,7 @@ Gem::Specification.new do |s|
   s.test_files = [
     "spec/app.rb",
      "spec/custom_app.rb",
+     "spec/extension_app.rb",
      "spec/production_app.rb",
      "spec/sinatra-bundles_spec.rb",
      "spec/spec_helper.rb"
@@ -67,6 +74,8 @@ Gem::Specification.new do |s|
       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"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<ruby-debug>, [">= 0"])
     else
       s.add_dependency(%q<rainpress>, [">= 0"])
       s.add_dependency(%q<packr>, [">= 0"])
@@ -75,6 +84,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_dependency(%q<rack-test>, [">= 0.5.3"])
       s.add_dependency(%q<yard>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<ruby-debug>, [">= 0"])
     end
   else
     s.add_dependency(%q<rainpress>, [">= 0"])
@@ -84,6 +95,8 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
     s.add_dependency(%q<rack-test>, [">= 0.5.3"])
     s.add_dependency(%q<yard>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<ruby-debug>, [">= 0"])
   end
 end
 

data/spec/extension_app.rb

@@ -0,0 +1,11 @@
+class ExtensionApp < Sinatra::Base
+  configure do
+    set(:environment, :test)
+    set(:root, File.dirname(__FILE__))
+  end
+
+  register Sinatra::Bundles
+
+  stylesheet_bundle(:test, %w(test)).root = File.join(File.dirname(__FILE__), 'other_public', 'css')
+  javascript_bundle(:test, %w(test)).root = File.join(File.dirname(__FILE__), 'other_public', 'javascripts')
+end

data/spec/other_public/css/test.css

@@ -0,0 +1,3 @@
+#test {
+  color: white;
+}

data/spec/other_public/javascripts/test.js

@@ -0,0 +1 @@
+alert('foo');

data/spec/sinatra-bundles_spec.rb

@@ -3,6 +3,7 @@ require 'fileutils'
 require 'app'
 require 'production_app'
 require 'custom_app'
+require 'extension_app'
 
 describe 'sinatra-bundles' do
   def app(env = :test)
@@ -172,6 +173,16 @@ describe 'sinatra-bundles' do
       FileUtils.touch(app.javascript_bundles[:test].instance_eval { path(@files.first) })
       app.javascript_bundles[:test].needs_rebundle?.should be_true
     end
+
+    it 'should be able to set the root path for a bundle' do
+      def app
+        ExtensionApp
+      end
+
+      get '/javascripts/bundles/test.js'
+      last_response.should be_ok
+      last_response.body.should == "alert('foo');\n"
+    end
   end
 
   context 'stylesheet bundles' do
@@ -257,5 +268,15 @@ describe 'sinatra-bundles' do
       FileUtils.touch(app.stylesheet_bundles[:test].instance_eval { path(@files.first) })
       app.stylesheet_bundles[:test].needs_rebundle?.should be_true
     end
+
+    it 'should accept a root path for a bundle' do
+      def app
+        ExtensionApp
+      end
+
+      get '/stylesheets/bundles/test.css'
+      last_response.should be_ok
+      last_response.body.should == "#test {\n  color: white;\n}\n"
+    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra-bundles
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 3
+  - 4
   - 0
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Daniel Huckstep
@@ -15,13 +15,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-01 00:00:00 -06:00
+date: 2010-08-08 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rainpress
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  name: rainpress
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -30,12 +31,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id001
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
-  name: packr
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  type: :runtime
+  name: packr
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -44,12 +45,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id002
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
-  name: rack
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  type: :runtime
+  name: rack
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -59,12 +60,12 @@ dependencies:
         - 1
         - 0
         version: "1.0"
-  type: :runtime
-  version_requirements: *id003
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
-  name: sinatra
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  type: :runtime
+  name: sinatra
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -74,12 +75,12 @@ dependencies:
         - 1
         - 0
         version: "1.0"
-  type: :runtime
-  version_requirements: *id004
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  type: :development
+  name: rspec
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -90,12 +91,12 @@ dependencies:
         - 2
         - 9
         version: 1.2.9
-  type: :development
-  version_requirements: *id005
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
-  name: rack-test
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  type: :development
+  name: rack-test
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -106,12 +107,26 @@ dependencies:
         - 5
         - 3
         version: 0.5.3
-  type: :development
-  version_requirements: *id006
+  requirement: *id006
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
   name: yard
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id007
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  type: :development
+  name: jeweler
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -120,8 +135,21 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id008
+- !ruby/object:Gem::Dependency 
+  prerelease: false
   type: :development
-  version_requirements: *id007
+  name: ruby-debug
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id009
 description: Bundle CSS and Javascript assets to a single file, compress, and cache them for snappier web experiences.
 email: darkhelmet@darkhelmetlive.com
 executables: []
@@ -134,6 +162,9 @@ extra_rdoc_files:
 files: 
 - .document
 - .gitignore
+- .rvmrc
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -146,6 +177,9 @@ files:
 - sinatra-bundles.gemspec
 - spec/app.rb
 - spec/custom_app.rb
+- spec/extension_app.rb
+- spec/other_public/css/test.css
+- spec/other_public/javascripts/test.js
 - spec/production_app.rb
 - spec/public/javascripts/eval.js
 - spec/public/javascripts/splat/splat.js
@@ -193,6 +227,7 @@ summary: Easy asset bundling for sinatra
 test_files: 
 - spec/app.rb
 - spec/custom_app.rb
+- spec/extension_app.rb
 - spec/production_app.rb
 - spec/sinatra-bundles_spec.rb
 - spec/spec_helper.rb