rack-pack 0.2.1 → 0.2.2

data/.gitignore

@@ -1,4 +1,4 @@
-pkg/*
-*.gem
 .bundle
-Gemfile.lock
+.rvmrc
+pkg/*
+*.gem

data/Gemfile.lock

@@ -0,0 +1,45 @@
+PATH
+  remote: .
+  specs:
+    rack-pack (0.2.2)
+      rack (~> 1.2.1)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activesupport (3.0.1)
+    closure-compiler (0.3.3)
+    diff-lcs (1.1.2)
+    jsmin (1.0.1)
+    oyster (0.9.4)
+    packr (3.1.0)
+      oyster
+    rack (1.2.1)
+    rainpress (1.0)
+    rspec (2.0.1)
+      rspec-core (~> 2.0.1)
+      rspec-expectations (~> 2.0.1)
+      rspec-mocks (~> 2.0.1)
+    rspec-core (2.0.1)
+    rspec-expectations (2.0.1)
+      diff-lcs (>= 1.1.2)
+    rspec-mocks (2.0.1)
+      rspec-core (~> 2.0.1)
+      rspec-expectations (~> 2.0.1)
+    test-construct (1.2.0)
+    yui-compressor (0.9.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activesupport (~> 3.0.0)
+  closure-compiler (~> 0.3.2)
+  jsmin (~> 1.0.1)
+  packr (~> 3.1.0)
+  rack (~> 1.2.1)
+  rack-pack!
+  rainpress (~> 1.0.0)
+  rspec (~> 2.0.0)
+  test-construct (~> 1.2.0)
+  yui-compressor (~> 0.9.1)

data/README.md

@@ -4,7 +4,7 @@ Rack::Pack is a piece of Rack Middleware that packages and optionally compresses
 
 ### Why?
 
-I've tried a dozen different asset packaging solutions including AssetPackager, BundleFu, Jammit,  Sprockets, etc...none of which were quite what I wanted. I didn't need any helpers, controllers, embedded images, rake tasks, or Yaml config files. I just wanted something to take my assets and package them into one file, and you're looking at it.
+I've tried a dozen different asset packaging solutions inlcuding AssetPackager, BundleFu, Jammit,  Sprockets, etc...none of which were quite what I wanted. I didn't need any helpers, controllers, embedded images, rake tasks, or Yaml config files. I just wanted something to take my assets and package them into one file, and you're looking at it.
 
 ## Installation
     
@@ -19,7 +19,6 @@ or in Rails:
     
     # Gemfile
     gem 'rack-pack'
-    
     # config/application.rb
     config.middleware.use Rack::Pack
     
@@ -66,19 +65,22 @@ or in Rails:
 
     # Gemfile
     gem 'jsmin'
-    
     # config/application.rb
     config.middleware.use Rack::Pack
     # would use JSMin
 
 To pass options to the javascript compressor just use the `:js_compressor` option:
 
-    require 'packr'
+    requrie 'packr'
     use Rack::Pack, :js_compression => { :shrink_vars => true }
     
 By default, packages are only compressed in a production environment. If for some reason you want them to always be compressed, pass the `:always_compress` option:
 
     use Rack::Pack, :always_compress => true
+    
+## Advanced Usage
+
+TODO
 
 ## Heroku and other read-only filesystems
 

data/lib/rack/pack.rb

@@ -69,17 +69,17 @@ module Rack
     
     protected
     
-    def update_packages
-      Pack.packages.each_value do |package|
-        package.update if package.stale?
+      def update_packages
+        Pack.packages.each_value do |package|
+          package.update if package.stale?
+        end
+        @updated = true
+      end
+      
+      def skip_update?
+        return false if Pack.options[:always_update]
+        Pack.production? && @updated
       end
-      @updated = true
-    end
-    
-    def skip_update?
-      return false if Pack.options[:always_update]
-      Pack.production? && @updated
-    end
 
     Package.register :js,  Javascript
     Package.register :css, Stylesheet

data/lib/rack/pack/javascript.rb

@@ -19,10 +19,10 @@ module Rack
       
       protected
       
-      def compression_options(defaults = {})
-        return defaults unless Pack.options
-        defaults.merge Pack.options[:js_compression]
-      end
+        def compression_options(defaults = {})
+          return defaults unless Pack.options
+          defaults.merge Pack.options[:js_compression]
+        end
     end
   end
 end

data/lib/rack/pack/package.rb

@@ -38,6 +38,7 @@ module Rack
       end
       
       def compile
+        @size = source_files.size
         compiled = source_files.map(&:read).join
         compiled = compress(compiled) if compress?
         compiled.strip
@@ -49,11 +50,11 @@ module Rack
       
       def stale?
         @source_files = nil
-        source_files? && (file_missing? || source_files_newer?)
+        source_files? && (file_missing? || source_files_added_or_removed? || source_files_newer?)
       end
       
       def source_files
-        @source_files ||= @from.is_a?(Array) ? @from : Pathname.glob(@from)
+        @source_files ||= glob? ? Pathname.glob(@from) : @from
       end
       
       def compress?
@@ -62,21 +63,29 @@ module Rack
       
       protected
       
-      def to_pathname(file)
-        file.is_a?(Pathname) ? file : Pathname.new(file)
-      end
-      
-      def source_files?
-        !source_files.empty?
-      end
-      
-      def file_missing?
-        !file.exist?
-      end
-      
-      def source_files_newer?
-        source_files.map(&:mtime).max > file.mtime
-      end
+        def to_pathname(file)
+          file.is_a?(Pathname) ? file : Pathname.new(file)
+        end
+        
+        def glob?
+          @from.is_a?(String)
+        end
+        
+        def source_files?
+          !source_files.empty?
+        end
+        
+        def file_missing?
+          !file.exist?
+        end
+        
+        def source_files_added_or_removed?
+          glob? && source_files.size != @size
+        end
+        
+        def source_files_newer?
+          source_files.map(&:mtime).max > file.mtime
+        end
     end
   end
 end

data/lib/rack/pack/stylesheet.rb

@@ -13,10 +13,10 @@ module Rack
       
       protected
       
-      def compression_options(defaults = {})
-        return defaults unless Pack.options
-        defaults.merge Pack.options[:css_compression]
-      end
+        def compression_options(defaults = {})
+          return defaults unless Pack.options
+          defaults.merge Pack.options[:css_compression]
+        end
     end
   end
 end

data/lib/rack/pack/version.rb

@@ -1,5 +1,5 @@
 module Rack
   class Pack
-    VERSION = '0.2.1'
+    VERSION = '0.2.2'
   end
 end

data/rack-pack.gemspec

@@ -10,14 +10,14 @@ Gem::Specification.new do |s|
   s.email       = 'me@petebrowne.com'
   s.homepage    = 'http://rubygems.org/gems/rack-pack'
   s.summary     = 'Rack Middleware for packaging assets such as javascripts and stylesheets.'
-  s.description = 'Packages assets such as javascripts and stylesheets using a method inspired by Sass::Plugin. In development mode, the assets are packaged on each request. In production mode, the assets are packaged only one time.'
+  s.description = 'Rack::Pack is a piece of Rack Middleware that packages and optionally compresses assets such as javascripts and stylesheets into single files. In a development environment, assets will be packaged on each request if there have been changes to the source files. In a production environment, assets will only be packaged one time, and only if there have been changes.'
 
   s.required_rubygems_version = '>= 1.3.6'
   s.rubyforge_project         = 'rack-pack'
 
   s.add_dependency             'rack',             '~> 1.2.1'
-  s.add_development_dependency 'rspec',            '~> 2.0.0.beta.20'
-  s.add_development_dependency 'activesupport',    '~> 3.0.0.rc2'
+  s.add_development_dependency 'rspec',            '~> 2.0.0'
+  s.add_development_dependency 'activesupport',    '~> 3.0.0'
   s.add_development_dependency 'test-construct',   '~> 1.2.0'
   s.add_development_dependency 'jsmin',            '~> 1.0.1'
   s.add_development_dependency 'packr',            '~> 3.1.0'

data/spec/rack/pack/javascript_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Rack::Pack::Javascript do
   describe '#compile' do
-    it 'should by default strip the concatenated output' do
+    it 'strips the concatenated output' do
       within_construct do |c|
         c.file 'input-1.js', '   1'
         c.file 'input-2.js', '2   '
@@ -18,7 +18,7 @@ describe Rack::Pack::Javascript do
       end
       
       context 'when JSMin is required' do
-        it 'should compress using JSMin' do
+        it 'compresses using JSMin' do
           reveal_const :JSMin do
             within_construct do |c|
               c.file 'input.js', 'function(number) { return number + 2; }'
@@ -31,7 +31,7 @@ describe Rack::Pack::Javascript do
       end
       
       context 'when packr is required' do
-        it 'should compress using Packr' do
+        it 'compresses using Packr' do
           reveal_const :Packr do
             within_construct do |c|
               c.file 'input.js', '1'
@@ -44,7 +44,7 @@ describe Rack::Pack::Javascript do
       end
       
       context 'when yui/compressor is required' do
-        it 'should compress using YUI::JavaScriptCompressor' do
+        it 'compresses using YUI::JavaScriptCompressor' do
           reveal_const :YUI do
             within_construct do |c|
               c.file 'input.js', '1'
@@ -59,7 +59,7 @@ describe Rack::Pack::Javascript do
       end
       
       context 'when closure-compiler is required' do
-        it 'should compress using Closure::Compiler' do
+        it 'compresses using Closure::Compiler' do
           reveal_const :Closure do
             within_construct do |c|
               c.file 'input.js', '1'

data/spec/rack/pack/package_spec.rb

@@ -14,35 +14,35 @@ describe Rack::Pack::Package do
   end
   
   describe '.register' do
-    it 'will store the package class for the given extension' do
+    it 'stores the package class for the given extension' do
       Rack::Pack::Package.register :mock, MockPackage
       Rack::Pack::Package.mappings['mock'].should == MockPackage
     end
   end
   
   describe '.mappings' do
-    it 'should by default have a Javascript mapping' do
+    it 'has a Javascript mapping' do
       Rack::Pack::Package.mappings['js'].should == Rack::Pack::Javascript
     end
     
-    it 'should by default have a Stylesheet mapping' do
+    it 'has a Stylesheet mapping' do
       Rack::Pack::Package.mappings['css'].should == Rack::Pack::Stylesheet
     end
   end
   
   describe '.[]' do
-    it 'should find the correct package class for the given file' do
+    it 'finds the package class for the given file' do
       Rack::Pack::Package['some/javascript.js'].should == Rack::Pack::Javascript
     end
     
-    it 'should default to the base Package' do
+    it 'defaults to the base Package' do
       Rack::Pack::Package['missing.ext'].should == Rack::Pack::Package
     end
   end
   
   describe '#file' do
     context 'when initialized with a string' do
-      it 'should convert it to a pathname' do
+      it 'converts it to a pathname' do
         package = Rack::Pack::Package.new('hello', [])
         package.file.should == Pathname.new('hello')
       end
@@ -50,14 +50,14 @@ describe Rack::Pack::Package do
   
   describe '#source_files'
     context 'when initialized with an array of strings' do
-      it 'should convert them to pathnames' do
+      it 'converts them to pathnames' do
         package = Rack::Pack::Package.new('', %w(file-1 file-2))
         package.source_files.should =~ [ Pathname.new('file-1'), Pathname.new('file-2') ]
       end
     end
   
     context 'when initialized with a string' do
-      it 'should treat it as a Dir glob' do
+      it 'treats it as a Dir glob' do
         within_construct do |c|
           c.file 'dir/file-1.js'
           c.file 'dir/file-2.js'
@@ -115,7 +115,7 @@ describe Rack::Pack::Package do
     end
     
     context 'when given a glob string' do
-      it 'should check for new files' do
+      it 'checks for new files' do
         within_construct do |c|
           c.file 'directory/file-1'
           
@@ -133,7 +133,7 @@ describe Rack::Pack::Package do
   end
   
   describe '#update' do
-    it 'should combine the files and write it to the output file' do
+    it 'combines the files and writes it to the output file' do
       within_construct do |c|
         to_file = c.file('packed-file', 'Stale Content')
         package = Rack::Pack::Package.new(

data/spec/rack/pack/stylesheet_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Rack::Pack::Stylesheet do
   describe '#compile' do
-    it 'should by default strip the concatenated output' do
+    it 'strips the concatenated output' do
       within_construct do |c|
         c.file 'input-1.css', '   1'
         c.file 'input-2.css', '2   '
@@ -18,7 +18,7 @@ describe Rack::Pack::Stylesheet do
       end
       
       context 'when yui/compressor is required' do
-        it 'should compress using YUI::JavaScriptCompressor' do
+        it 'compresses using YUI::JavaScriptCompressor' do
           reveal_const :YUI do
             within_construct do |c|
               c.file 'input.css', '1'
@@ -33,7 +33,7 @@ describe Rack::Pack::Stylesheet do
       end
       
       context 'when rainpress is required' do
-        it 'should compress using Rainpress' do
+        it 'compresses using Rainpress' do
           reveal_const :Rainpress do
             within_construct do |c|
               c.file 'input.css', '1'

data/spec/rack/pack_spec.rb

@@ -15,7 +15,7 @@ describe Rack::Pack do
   alias_method :request, :request_for
   
   context 'with default settings' do
-    it 'should pack javascripts' do
+    it 'packs javascripts' do
       within_construct do |c|
         c.file 'vendor/javascripts/file-1.js', '1'
         c.file 'javascripts/file-2.js',        '2'
@@ -27,7 +27,7 @@ describe Rack::Pack do
       end
     end
     
-    it 'should pack stylesheets' do
+    it 'packs stylesheets' do
       within_construct do |c|
         c.file 'vendor/stylesheets/file-1.css',  '1'
         c.file 'stylesheets/file-2.css', '2'
@@ -39,7 +39,7 @@ describe Rack::Pack do
       end
     end
     
-    it 'should not compress the packages' do
+    it 'does not compress the packages' do
       reveal_const :JSMin do
         within_construct do |c|
           c.file 'app/javascripts/file.js', '1'
@@ -52,8 +52,8 @@ describe Rack::Pack do
     end
     
     context 'on next request' do
-      context 'with updates' do
-        it 'should re-pack the package' do
+      context 'when files are updated' do
+        it 're-packs the package' do
           within_construct do |c|
             c.file 'app/stylesheets/file-1.css', '1'
             c.file 'app/stylesheets/file-2.css', '2'
@@ -70,8 +70,8 @@ describe Rack::Pack do
         end
       end
     
-      context 'without updates' do
-        it 'should not re-pack the package' do
+      context 'when files are not updated' do
+        it 'does not re-pack the package' do
           within_construct do |c|
             c.file 'app/stylesheets/file-1.css', '1'
             c.file 'app/stylesheets/file-2.css', '2'
@@ -88,10 +88,46 @@ describe Rack::Pack do
         end
       end
     end
+    
+    context 'when files are added' do
+      it 're-packs the package' do
+        within_construct do |c|
+          c.file 'app/stylesheets/file-1.css', '1'
+          c.file 'app/stylesheets/file-2.css', '2'
+          
+          @app = build_app
+          @app.call(request)
+          File.read('public/stylesheets/application.css').should == '12'
+          
+          sleep 1
+          c.file 'app/stylesheets/file-3.css', '3'
+          @app.call(request)
+          File.read('public/stylesheets/application.css').should == '123'
+        end
+      end
+    end
+    
+    context 'when files are removed' do
+      it 're-packs the package' do
+        within_construct do |c|
+          c.file 'app/stylesheets/file-1.css', '1'
+          c.file 'app/stylesheets/file-2.css', '2'
+          
+          @app = build_app
+          @app.call(request)
+          File.read('public/stylesheets/application.css').should == '12'
+          
+          sleep 1
+          FileUtils.rm 'app/stylesheets/file-2.css'
+          @app.call(request)
+          File.read('public/stylesheets/application.css').should == '1'
+        end
+      end
+    end
   end
   
   context 'with some custom packages' do
-    it 'should pack the files' do
+    it 'packs the files' do
       within_construct do |c|
         c.file 'vendor/javascripts/file-1.js', '1'
         c.file 'app/javascripts/file-2.js',    '2'
@@ -104,7 +140,7 @@ describe Rack::Pack do
   end
   
   context 'with :always_compress on' do
-    it 'should compress the packages' do
+    it 'compresses the packages' do
       reveal_const :JSMin do
         within_construct do |c|
           c.file 'app/javascripts/file.js', '1'
@@ -118,7 +154,7 @@ describe Rack::Pack do
   end
   
   context 'with a default package set to nil' do
-    it 'should not pack the files' do
+    it 'does not pack the files' do
       within_construct do |c|
         c.file 'vendor/javascripts/file-1.js', '1'
         
@@ -138,7 +174,7 @@ describe Rack::Pack do
       Object.send(:remove_const, :Rails)
     end
     
-    it 'should pack files only one time' do
+    it 'packs files only one time' do
       within_construct do |c|
         c.file 'app/javascripts/file.js', '1'
         
@@ -152,8 +188,8 @@ describe Rack::Pack do
       end
     end
     
-    context 'with always_update option as true' do
-      it 'should pack the files on each request' do
+    context 'with :always_update on' do
+      it 'packs the files on each request' do
         within_construct do |c|
           c.file 'app/javascripts/file.js', '1'
           
@@ -169,7 +205,7 @@ describe Rack::Pack do
     end
   
     context 'with javascript compression options' do
-      it 'should pass the options to the javascript compressor' do
+      it 'passes the options to the javascript compressor' do
         reveal_const :Packr do
           within_construct do |c|
             c.file 'app/javascripts/file.js', '1'

data/spec/spec_helper.rb

@@ -2,6 +2,7 @@ lib = File.expand_path('../../lib', __FILE__)
 $:.unshift(lib) unless $:.include?(lib)
 
 require 'rubygems'
+require 'fileutils'
 require 'rspec'
 require 'construct'
 # To get 2.weeks.ago syntax...

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rack-pack
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Pete Browne
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-29 00:00:00 -05:00
+date: 2010-11-11 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,14 +40,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 62196427
+        hash: 15
         segments: 
         - 2
         - 0
         - 0
-        - beta
-        - 20
-        version: 2.0.0.beta.20
+        version: 2.0.0
   requirement: *id002
   name: rspec
   prerelease: false
@@ -58,13 +56,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 977940607
+        hash: 7
         segments: 
         - 3
         - 0
         - 0
-        - rc2
-        version: 3.0.0.rc2
+        version: 3.0.0
   requirement: *id003
   name: activesupport
   prerelease: false
@@ -165,7 +162,7 @@ dependencies:
   name: rainpress
   prerelease: false
   type: :development
-description: Packages assets such as javascripts and stylesheets using a method inspired by Sass::Plugin. In development mode, the assets are packaged on each request. In production mode, the assets are packaged only one time.
+description: Rack::Pack is a piece of Rack Middleware that packages and optionally compresses assets such as javascripts and stylesheets into single files. In a development environment, assets will be packaged on each request if there have been changes to the source files. In a production environment, assets will only be packaged one time, and only if there have been changes.
 email: me@petebrowne.com
 executables: []
 
@@ -177,7 +174,7 @@ files:
 - .gitignore
 - .rspec
 - Gemfile
-- LICENSE
+- Gemfile.lock
 - README.md
 - Rakefile
 - lib/rack-pack.rb

data/LICENSE

@@ -1,20 +0,0 @@
-Copyright (c) 2010 Peter Browne
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.