padrino-assets 0.1.0 → 0.2.0

data/CHANGELOG.md

@@ -1,4 +1,9 @@
-# Version History
-
-### 0.1.0 - (January 12, 2012)
+# Version History
+
+### 0.2.0 - (January 17, 2012)
+* The current `request` is now passed to **:assets_host** when a `Proc` is used
+* Added the rake task `assets:compress` for [deflating](http://en.wikipedia.org/wiki/Gzip) assets
+* Basic support for asset minification
+
+### 0.1.0 - (January 12, 2012)
 * Initial release

data/README.md

@@ -28,6 +28,26 @@ map '/assets' do
 end
 ```
 
+By default, Sprockets is configured to load assets from your project's `app/assets` and `lib/assets` directories. Any files stored in these directories are readily available to the included helpers and will be served by the Sprockets middleware.
+
+The following directories are no longer used and will instead be served statically:
+
+* `public/images`
+* `public/stylesheets`
+* `public/javascripts`
+
+Because of this you should now be storing your assets in the following directories:
+
+* `app/assets/images`
+* `app/assets/stylesheets`
+* `app/assets/javascripts`
+
+Should your project need to add additional paths you can do so by adding the following line:
+
+``` ruby
+Padrino::Assets.load_paths << 'path/to/my/assets'
+```
+
 ### Dependencies
 
 * [Padrino-Core](https://github.com/padrino/padrino-framework) and [Padrino-Helpers](https://github.com/padrino/padrino-framework)
@@ -36,7 +56,6 @@ end
 
 ### TODO
 
-* Support for CSS/Javascript minification
 * Additional documentation
 * Tests
 

data/lib/padrino-assets.rb

@@ -15,6 +15,7 @@ module Padrino
       # @example
       #   Padrino::Assets.load_paths << Padrino.root('vendor', '**', 'assets')
       #
+      # @since 0.1.0
       # @api public
       def load_paths
         @_load_paths ||= ['app/assets/**', 'lib/assets/**'].map do |file|
@@ -28,6 +29,7 @@ module Padrino
       # @return [Sprockets::Environment]
       #   Sprockets environment
       #
+      # @since 0.1.0
       # @api public
       def environment
         @_environment
@@ -39,6 +41,7 @@ module Padrino
       # @return [Sprockets::Manifest]
       #   Sprockets manifest
       #
+      # @since 0.1.0
       # @api public
       def manifest
         @_manifest
@@ -51,6 +54,8 @@ module Padrino
         app.set :assets_version,  1.0
         app.set :assets_host,     nil
         app.set :compress_assets, true
+        app.set :js_compressor,   nil
+        app.set :css_compressor,  nil
         app.set :index_assets,    -> { app.environment == :production }
         app.set :manifest_file,   -> { File.join(app.public_folder, app.assets_prefix, 'manifest.json') }
         app.set :precompile_assets,  [ /^.+\.(?!js|css).+$/i, /^application\.(js|css)$/i ]
@@ -66,6 +71,11 @@ module Padrino
                 environment.cache = app.cache
               end
             end
+
+            if app.compress_assets?
+              environment.js_compressor  = app.js_compressor
+              environment.css_compressor = app.css_compressor
+            end
           end
 
           load_paths.each { |path| environment.append_path(path) }

data/lib/padrino-assets/helpers.rb

@@ -74,7 +74,7 @@
       # Returns an HTML image element with given sources and options
       #
       # @overload image(sources, options={})
-      #   @param [String] source
+      #   @param [Array<String>] sources
       #     Sources
       #   @param [Hash] options
       #     HTML options
@@ -206,7 +206,7 @@
 
         if sources.is_a?(Array)
           content_tag(:video, options) do
-            sources.collect { |source| tag(:source, src: asset_path(source)) }.join
+            sources.collect { |source| tag(:source, src: asset_path(source)) }.join("\n")
           end
         else
           tag(:video, options.reverse_merge(src: asset_path(sources)))
@@ -265,7 +265,7 @@
 
         if sources.is_a?(Array)
           content_tag(:audio, options) do
-            sources.collect { |source| tag(:source, src: asset_path(source)) }.join
+            sources.collect { |source| tag(:source, src: asset_path(source)) }.join("\n")
           end
         else
           tag(:audio, options.reverse_merge(src: asset_path(sources)))
@@ -363,9 +363,8 @@
 
       # @private
       def rewrite_asset_host(source)
-        host = settings.assets_host
-        host = host.call(source) if host.respond_to?(:call)
-        host ? "#{host}#{source}" : source
+        host = settings.assets_host rescue settings.assets_host(source, request)
+        host ? host + source : source
       end
     end
   end

data/lib/padrino-assets/version.rb

@@ -1,5 +1,5 @@
 module Padrino
   module Assets
-    VERSION = '0.1.0'
+    VERSION = '0.2.0'
   end
 end

data/lib/tasks/cleanup.rake

@@ -1,8 +1,8 @@
 namespace :assets do
   desc 'Removes backups for existing assets'
   task :cleanup, :quanity do |task, args|
-	  quanity  = args['quanity'] || 2
-	  manifest = Padrino::Assets.manifest
-	  manifest.cleanup(quanity)
+    quanity  = args['quanity'] || 2
+    manifest = Padrino::Assets.manifest
+    manifest.cleanup(quanity)
   end
 end

data/lib/tasks/clobber.rake

@@ -1,7 +1,7 @@
 namespace :assets do
   desc 'Deletes all compiled assets'
   task :clobber do
-	  manifest = Padrino::Assets.manifest
-	  manifest.clobber
+    manifest = Padrino::Assets.manifest
+    manifest.clobber
   end
 end

data/lib/tasks/compress.rake

@@ -1 +1,14 @@
-
+namespace :assets do
+  desc 'Compresses all compiled assets'
+  task :compress do
+    environment = Padrino::Assets.environment
+    manifest = Padrino::Assets.manifest
+
+    manifest.assets.each do |asset, digested_asset|
+      if asset = environment[asset]
+        compressed_asset = File.join(manifest.dir, digested_asset)
+        asset.write_to(compressed_asset + '.gz') if compressed_asset =~ /\.(?:css|html|js|svg|txt|xml)$/
+      end
+    end
+  end
+end

data/lib/tasks/precompile.rake

@@ -21,6 +21,10 @@
           manifest.compile(logical_path)
         end
       end
+
+      if app.compress_assets?
+        Rake::Task['assets:compress'].invoke
+      end
     end
   end
 end

data/padrino-assets.gemspec

@@ -16,8 +16,8 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ['lib']
 
-  s.add_dependency 'sprockets', '~> 2.2.0'
-  
+  s.add_dependency 'sprockets', '~> 2.3.0'
+
   s.add_dependency 'padrino-core'
   s.add_dependency 'padrino-helpers'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-assets
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-12 00:00:00.000000000Z
+date: 2012-01-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets
-  requirement: &8494660 !ruby/object:Gem::Requirement
+  requirement: &9246510 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *8494660
+  version_requirements: *9246510
 - !ruby/object:Gem::Dependency
   name: padrino-core
-  requirement: &8564010 !ruby/object:Gem::Requirement
+  requirement: &9246250 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8564010
+  version_requirements: *9246250
 - !ruby/object:Gem::Dependency
   name: padrino-helpers
-  requirement: &8566720 !ruby/object:Gem::Requirement
+  requirement: &9245990 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8566720
+  version_requirements: *9245990
 description: A plugin for the Padrino web framework which uses Sprockets to manage
   and compile assets
 email: