rack-pack 0.2.2 → 0.3.0

data/.gitignore

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

data/Gemfile

@@ -1,2 +1,2 @@
-source :gemcutter
+source :rubygems
 gemspec

data/LICENSE

@@ -0,0 +1,20 @@
+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.

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 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.
+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.
 
 ## Installation
     
@@ -19,6 +19,7 @@ or in Rails:
     
     # Gemfile
     gem 'rack-pack'
+    
     # config/application.rb
     config.middleware.use Rack::Pack
     
@@ -65,22 +66,19 @@ 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:
 
-    requrie 'packr'
+    require '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/Rakefile

@@ -3,7 +3,7 @@ Bundler::GemHelper.install_tasks
 
 require 'rspec/core'
 require 'rspec/core/rake_task'
-Rspec::Core::RakeTask.new
+RSpec::Core::RakeTask.new
 
 desc 'Open an irb session preloaded with this library'
 task :console do

data/lib/rack/pack.rb

@@ -8,16 +8,36 @@ module Rack
     autoload :Version,    'rack/pack/version'
     
     DEFAULT_OPTIONS = {
-      :public_dir      => 'public',
-      :always_update   => false,
-      :always_compress => false,
-      :js_compression  => {},
-      :css_compression => {}
+      :public_dir           => 'public',
+      :always_update        => false,
+      :always_compress      => false,
+      :js_compression       => {},
+      :css_compression      => {},
+      :environment          => :development,
+      :add_default_packages => true
     }.freeze
     
     class << self
       attr_accessor :packages, :options, :environment
       
+      def configure(options = {})
+        self.packages = {}
+        self.options  = DEFAULT_OPTIONS.dup
+      
+        self.options.each_key do |key|
+          self.options[key] = options.delete(key) if options.key?(key)
+        end
+        
+        unless self.options[:add_default_packages] == false
+          add_package 'javascripts/application.js',  '{vendor,app,.}/javascripts/*.js'
+          add_package 'stylesheets/application.css', '{vendor,app,.}/stylesheets/*.css'
+        end
+      
+        options.each do |to_file, from_files|
+          add_package(to_file, from_files)
+        end
+      end
+      
       def production?
         self.environment.to_s == 'production'
       end
@@ -31,34 +51,27 @@ module Rack
           packages[output_file] = package_class.new(public_output_file, source_files)
         end
       end
+      
+      def update_packages
+        Pack.packages.each_value do |package|
+          package.update if package.stale?
+        end
+      end
     end
     
     def initialize(app, options = {})
       @app = app
+      Pack.configure(options)
       
-      Pack.packages    = {}
-      Pack.options     = DEFAULT_OPTIONS.dup
-      Pack.environment = if defined?(RAILS_ENV)
-        RAILS_ENV # Rails 2
+      # Set environment based on Application environment
+      if defined?(RAILS_ENV)
+        Pack.environment = RAILS_ENV # Rails 2
       elsif defined?(Rails) && defined?(Rails.env)
-        Rails.env # Rails 3
+        Pack.environment = Rails.env # Rails 3
       elsif defined?(app.settings) && defined?(app.settings.environment)
-        app.settings.environment # Sinatra
+        Pack.environment = app.settings.environment # Sinatra
       elsif ENV.key?('RACK_ENV')
-        ENV['RACK_ENV']
-      else
-        :development
-      end
-      
-      Pack.options.each_key do |key|
-        Pack.options[key] = options.delete(key) if options.key?(key)
-      end
-      
-      Pack.add_package 'javascripts/application.js',  '{vendor,app,.}/javascripts/*.js'
-      Pack.add_package 'stylesheets/application.css', '{vendor,app,.}/stylesheets/*.css'
-      
-      options.each do |to_file, from_files|
-        Pack.add_package(to_file, from_files)
+        Pack.environment = ENV['RACK_ENV']
       end
     end
     
@@ -70,9 +83,7 @@ module Rack
     protected
     
       def update_packages
-        Pack.packages.each_value do |package|
-          package.update if package.stale?
-        end
+        Pack.update_packages
         @updated = true
       end
       

data/lib/rack/pack/javascript.rb

@@ -12,6 +12,8 @@ module Rack
           YUI::JavaScriptCompressor.new(options).compress(source)
         elsif defined?(Closure) and defined?(Closure::Compiler)
           Closure::Compiler.new(compression_options).compile(source)
+        elsif defined?(Uglifier)
+          Uglifier.new(compression_options).compile(source)
         else
           source
         end

data/lib/rack/pack/version.rb

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

data/rack-pack.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.authors     = 'Pete Browne'
   s.email       = 'me@petebrowne.com'
-  s.homepage    = 'http://rubygems.org/gems/rack-pack'
+  s.homepage    = 'http://github.com/petebrowne/rack-pack'
   s.summary     = 'Rack Middleware for packaging assets such as javascripts and stylesheets.'
   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.'
 
@@ -16,13 +16,15 @@ Gem::Specification.new do |s|
   s.rubyforge_project         = 'rack-pack'
 
   s.add_dependency             'rack',             '~> 1.2.1'
-  s.add_development_dependency 'rspec',            '~> 2.0.0'
-  s.add_development_dependency 'activesupport',    '~> 3.0.0'
+  s.add_development_dependency 'rspec',            '~> 2.6.0'
+  s.add_development_dependency 'activesupport',    '~> 3.0.7'
+  s.add_development_dependency 'i18n',             '~> 0.5.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'
   s.add_development_dependency 'yui-compressor',   '~> 0.9.1'
   s.add_development_dependency 'closure-compiler', '~> 0.3.2'
+  s.add_development_dependency 'uglifier',         '~> 0.5.3'
   s.add_development_dependency 'rainpress',        '~> 1.0.0'
 
   s.files        = `git ls-files`.split("\n")

data/spec/rack/pack/javascript_spec.rb

@@ -72,6 +72,21 @@ describe Rack::Pack::Javascript do
           end
         end
       end
+      
+      context 'when uglifier is required' do
+        it 'compresses using Uglifier' do
+          reveal_const :Uglifier do
+            within_construct do |c|
+              c.file 'input.js', '1'
+              
+              compressor = double(:uglifier)
+              compressor.should_receive(:compile).with('1').and_return('1')
+              Uglifier.should_receive(:new).with({}).and_return(compressor)
+              Rack::Pack::Javascript.new('output.js', 'input.js').compile
+            end
+          end
+        end
+      end
     end
   end
 end

data/spec/rack/pack_spec.rb

@@ -14,6 +14,66 @@ describe Rack::Pack do
   end
   alias_method :request, :request_for
   
+  describe '.configure' do
+    it 'sets the given options' do
+      Rack::Pack.configure(:public_dir => '_site', :always_compress => true, :environment => :production)
+      Rack::Pack.options.should == {
+        :public_dir           => '_site',
+        :always_update        => false,
+        :always_compress      => true,
+        :js_compression       => {},
+        :css_compression      => {},
+        :environment          => :production,
+        :add_default_packages => true
+      }
+    end
+    
+    it 'adds default packages' do
+      Rack::Pack.configure
+      Rack::Pack.packages['javascripts/application.js'].should be_an_instance_of(Rack::Pack::Javascript)
+      Rack::Pack.packages['stylesheets/application.css'].should be_an_instance_of(Rack::Pack::Stylesheet)
+    end
+    
+    it 'adds given packages' do
+      Rack::Pack.configure('main.js' => %w(vendor/javascripts/file-1.js app/javascripts/file-2.js))
+      Rack::Pack.packages['main.js'].should be_an_instance_of(Rack::Pack::Javascript)
+    end
+    
+    context 'with :add_default_packages => false' do
+      it 'does not add default packages' do
+        Rack::Pack.configure(:add_default_packages => false)
+        Rack::Pack.packages['javascripts/application.js'].should be_nil
+        Rack::Pack.packages['stylesheets/application.css'].should be_nil
+      end
+    end
+  end
+  
+  context '.update_packages' do
+    it 'packs javascripts' do
+      within_construct do |c|
+        c.file 'vendor/javascripts/file-1.js', '1'
+        c.file 'javascripts/file-2.js',        '2'
+        c.file 'javascripts/file-3.js',        '3'
+        
+        Rack::Pack.configure
+        Rack::Pack.update_packages
+        File.read('public/javascripts/application.js').should == '123'
+      end
+    end
+    
+    it 'packs stylesheets' do
+      within_construct do |c|
+        c.file 'vendor/stylesheets/file-1.css',  '1'
+        c.file 'stylesheets/file-2.css', '2'
+        c.file 'stylesheets/file-3.css', '3'
+        
+        Rack::Pack.configure
+        Rack::Pack.update_packages
+        File.read('public/stylesheets/application.css').should == '123'
+      end
+    end
+  end
+  
   context 'with default settings' do
     it 'packs javascripts' do
       within_construct do |c|
@@ -188,7 +248,7 @@ describe Rack::Pack do
       end
     end
     
-    context 'with :always_update on' do
+    context 'with :always_update => true' do
       it 'packs the files on each request' do
         within_construct do |c|
           c.file 'app/javascripts/file.js', '1'

data/spec/spec_helper.rb

@@ -13,11 +13,12 @@ require 'jsmin'
 require 'packr'
 require 'yui/compressor'
 require 'closure-compiler'
+require 'uglifier'
 require 'rainpress'
 require 'rack/pack'
 
 $hidden_consts = {}
-[ :JSMin, :Packr, :YUI, :Closure, :Rainpress ].each do |const|
+[ :JSMin, :Packr, :YUI, :Closure, :Uglifier, :Rainpress ].each do |const|
   $hidden_consts[const] = Object.const_get(const)
   Object.send :remove_const, const
 end

metadata

@@ -2,12 +2,12 @@
 name: rack-pack
 version: !ruby/object:Gem::Version 
   hash: 19
-  prerelease: false
+  prerelease: 
   segments: 
   - 0
-  - 2
-  - 2
-  version: 0.2.2
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Pete Browne
@@ -15,10 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-11 00:00:00 -06:00
-default_executable: 
+date: 2011-05-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  name: rack
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -31,43 +31,59 @@ dependencies:
         - 1
         version: 1.2.1
   requirement: *id001
-  name: rack
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency 
+  name: rspec
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 23
         segments: 
         - 2
+        - 6
         - 0
-        - 0
-        version: 2.0.0
+        version: 2.6.0
   requirement: *id002
-  name: rspec
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
+  name: activesupport
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 9
         segments: 
         - 3
         - 0
-        - 0
-        version: 3.0.0
+        - 7
+        version: 3.0.7
   requirement: *id003
-  name: activesupport
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
+  name: i18n
   version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 0
+        - 5
+        - 0
+        version: 0.5.0
+  requirement: *id004
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency 
+  name: test-construct
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -78,12 +94,12 @@ dependencies:
         - 2
         - 0
         version: 1.2.0
-  requirement: *id004
-  name: test-construct
+  requirement: *id005
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  name: jsmin
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -94,12 +110,12 @@ dependencies:
         - 0
         - 1
         version: 1.0.1
-  requirement: *id005
-  name: jsmin
+  requirement: *id006
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  name: packr
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -110,12 +126,12 @@ dependencies:
         - 1
         - 0
         version: 3.1.0
-  requirement: *id006
-  name: packr
+  requirement: *id007
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  name: yui-compressor
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -126,12 +142,12 @@ dependencies:
         - 9
         - 1
         version: 0.9.1
-  requirement: *id007
-  name: yui-compressor
+  requirement: *id008
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  name: closure-compiler
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -142,12 +158,28 @@ dependencies:
         - 3
         - 2
         version: 0.3.2
-  requirement: *id008
-  name: closure-compiler
+  requirement: *id009
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  name: uglifier
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 0
+        - 5
+        - 3
+        version: 0.5.3
+  requirement: *id010
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency 
+  name: rainpress
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -158,8 +190,7 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  requirement: *id009
-  name: rainpress
+  requirement: *id011
   prerelease: false
   type: :development
 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.
@@ -174,7 +205,7 @@ files:
 - .gitignore
 - .rspec
 - Gemfile
-- Gemfile.lock
+- LICENSE
 - README.md
 - Rakefile
 - lib/rack-pack.rb
@@ -189,8 +220,7 @@ files:
 - spec/rack/pack/stylesheet_spec.rb
 - spec/rack/pack_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
-homepage: http://rubygems.org/gems/rack-pack
+homepage: http://github.com/petebrowne/rack-pack
 licenses: []
 
 post_install_message: 
@@ -221,7 +251,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rack-pack
-rubygems_version: 1.3.7
+rubygems_version: 1.7.1
 signing_key: 
 specification_version: 3
 summary: Rack Middleware for packaging assets such as javascripts and stylesheets.

data/Gemfile.lock

@@ -1,45 +0,0 @@
-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)