padrino-pipeline 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9eb1b49916318fbeb59d6b2f7b44382eaaa7a10
-  data.tar.gz: da6aa8f8a18ef8c9df137f719d2110d769016b03
+  metadata.gz: 9ae583739b857e66675c501c51fb349afe552eb7
+  data.tar.gz: 6401ed2ffbe33dba531735a533f79b15b911e411
 SHA512:
-  metadata.gz: f4325db977da9487c2e10572e7516a7cfc748e9bc0a47200ce7e84ef1805b0dadec2c1c10468e9bd43206634f02a0f25d2b9219dc0c59757c48d5d6317bfba00
-  data.tar.gz: beee248b82501aac96ea301bc223492c799e93e62dde8a50853f61da5a960f659b1374693f2ba529e5a2d390792728476f5103d3ddcdde65750e8107318b1ab7
+  metadata.gz: a3b001b81d9e56971e911575aaa4faec94da4859db068ceef9b52863bc576c9cb2e2af3ad8094edb5017f0dc4d3cc232ba1c35dadba5079359991b9004f92af1
+  data.tar.gz: 015dc113ce5d617544322d968807d5236e641c6041590e940e15b4881f71b6d5fd624094c4b8124a6c7e9e76fafd1ec8699a4247cead44b68d6300502796f137

data/.gitignore

@@ -1,2 +1,3 @@
 Gemfile.lock
 .sass-cache
+pkg/*

data/Gemfile

@@ -2,6 +2,7 @@ source 'https://rubygems.org'
 
 gemspec 
 gem "rake"
+gem "nokogiri",  "~> 1.5.10"
 
 group :test do
   gem "webrat",    ">= 0.5.1"

data/README.md

@@ -1,60 +1,88 @@
-[![Build Status](https://travis-ci.org/Ortuna/padrino-assets.png?branch=master)](https://travis-ci.org/Ortuna/padrino-assets)
-[![Code Climate](https://codeclimate.com/github/Ortuna/padrino-assets.png)](https://codeclimate.com/github/Ortuna/padrino-assets)
- 
-#padrino-assets
-This is an early version and work in progress for padrino pipeline
-
-#Usage
-include in your padrino project
+#Padrino Pipeline
+Padrino Pipeline is a gem for [Padrino](http://www.padrinorb.com).  It provides 
+a unified way to use several different asset management systems.
+
+[![Build Status](https://travis-ci.org/Ortuna/padrino-pipeline.png?branch=master)](https://travis-ci.org/Ortuna/padrino-pipeline)
+[![Code Climate](https://codeclimate.com/github/Ortuna/padrino-pipeline.png)](https://codeclimate.com/github/Ortuna/padrino-pipeline)
+[![Dependency Status](https://gemnasium.com/Ortuna/padrino-pipeline.png)](https://gemnasium.com/Ortuna/padrino-pipeline)
+
+
+##Supported Pipelines
+- [Sprockets](https://github.com/sstephenson/sprockets)
+- [sinatra-assetpack](https://github.com/rstacruz/sinatra-assetpack)
+
+##Simple Usage
+
+### Gemfile
+Add to your Gemfile:
 ```ruby
-gem 'padrino-assets', :github => 'Ortuna/padrino-assets'
+gem 'padrino-pipeline'
 ```
 
-##Basic usage
+These examples examples setup a pipeline with defaulted options(see default options):
 
+### Sprockets pipeline
 ```ruby
-module Ortuna
+module Example
   class App < Padrino::Application
-    register Padrino::Assets
-    configure_assets do |assets|
-      assets.pipeline = Padrino::Assets::Sprockets
+    register Padrino::Pipeline
+    configure_assets do |config|
+      config.pipeline = Padrino::Pipeline::Sprockets
     end
   end
 end
 ```
 
-This should default app/assets/javascripts and app/assets/stylesheets to be served
-from http://localhost:3000/assets/javascripts and http://localhost:3000/assets/styleseets
-
-##Usage with options
+### Sinatra AssetPack pipeline
 ```ruby
-module Ortuna
+module Example
   class App < Padrino::Application
-    register Padrino::Assets
+    register Padrino::Pipeline
+    configure_assets do |config|
+      config.pipeline = Padrino::Pipeline::AssetPack
+    end
+  end
+end
+```
 
-    configure_assets do |assets|
-      assets.pipeline = Padrino::Assets::Sprockets
-      assets.paths = ['assets/javascripts', 'assets/stylesheets'] # defaults to assets/stylesheets
-      assets.js_prefix = '/custom/location'   # defaults to /assets/javascripts
-      assets.css_prefix = '/custom/stylesheets'   # defaults to /assets/stylesheets
+## Options
+Certain options can be configured to change the behavior of the pipelines.
+These options should be used within the configure_assets block.
 
-      assets.prefix = '/trunk' #general prefix, /trunk/assets/javascripts/xyz.js
+for example:
+```ruby
+module Example
+  class App < Padrino::Application
+    register Padrino::Pipeline
+    configure_assets do |config|
+      config.pipeline = Padrino::Pipeline::AssetPack
+      config.css_prefix = '/xyz'
     end
   end
 end
 ```
 
-visit `http://localhost:3000/custom/location/app.js` will map to the file
-app/assets/javascripts/app.js
+The following options can be set
 
-visit `http://localhost:3000/custom/stylesheets/main.css` will map to the file
-app/assets/stylesheets/main.css
+### Pipeline
+- #pipeline
 
-use sprockets helpers like you would:
-```javascript
-//= require stuff
-function stuff() {
+### Assets URI(mounting location) String
+- #css_prefix
+- #js_prefix
 
-}
-```
+### Asset location(path to files) String/Array
+- #css_assets
+- #js_assets
+
+### Prefix prepend this prefix before all assets
+- #prefix
+
+### Default option values
+TODO
+
+## Asset pack packages
+TODO
 
+## Sprocket directive require/include/require tree
+TODO

data/lib/padrino-pipeline.rb

@@ -1,5 +1,6 @@
 require 'padrino-pipeline/pipelines/sprockets'
 require 'padrino-pipeline/pipelines/asset_pack'
+require 'padrino-pipeline/ext/padrino-helpers/asset_tag_helper'
 require 'ostruct'
 
 module Padrino

data/lib/padrino-pipeline/pipelines/asset_pack.rb

@@ -1,8 +1,11 @@
 require 'sinatra/assetpack' unless defined? Sinatra::AssetPack
+require 'padrino-pipeline/pipelines/common'
 
 module Padrino
   module Pipeline
     class AssetPack
+      include Padrino::Pipeline::Common
+
       def initialize(app, config)
         @app    = app
         @config = config
@@ -10,22 +13,6 @@ module Padrino
         setup_pipeline
       end
 
-      def js_prefix
-        (@config.prefix || '') + (@config.js_prefix  || '/assets/javascripts')
-      end
-
-      def css_prefix
-        (@config.prefix || '') + (@config.css_prefix || '/assets/stylesheets')
-      end
-
-      def js_assets
-        @config.js_assets || 'assets/javascripts'
-      end
-
-      def css_assets
-        @config.css_assets || 'assets/stylesheets'
-      end
-
       def packages
         @config.packages  || []
       end
@@ -37,13 +24,22 @@ module Padrino
       end
 
       def setup_pipeline
-        js_prefix, css_prefix   = self.js_prefix, self.css_prefix
-        js_assets, css_assets   = self.js_assets, self.css_assets
-        packages                = self.packages
+        js_prefix, css_prefix, image_prefix = self.js_prefix, self.css_prefix, self.image_prefix
+        js_assets, css_assets, image_assets = self.js_assets, self.css_assets, self.image_assets
+        packages = self.packages
 
         @app.assets {
-          serve js_prefix, :from => js_assets
-          serve css_prefix,:from => css_assets
+          def mount_asset(prefix, assets)
+            if assets.respond_to?(:each)
+              assets.each {|asset| serve prefix, :from => asset} 
+            else
+              serve prefix, :from => assets
+            end
+          end
+
+          mount_asset js_prefix,    js_assets
+          mount_asset css_prefix,   css_assets
+          mount_asset image_prefix, image_assets
 
           packages.each { |package| send(package.shift, *package) } 
 

data/lib/padrino-pipeline/pipelines/common.rb

@@ -0,0 +1,35 @@
+module Padrino
+  module Pipeline
+    module Common
+
+      def app_root
+        @app.settings.root
+      end
+
+      def js_assets
+        @config.js_assets  || "#{app_root}/assets/javascripts"
+      end
+
+      def css_assets
+        @config.css_assets || "#{app_root}/assets/stylesheets"
+      end
+
+      def image_assets
+        @config.image_assets || "#{app_root}/assets/images"
+      end
+
+      def image_prefix
+        (@config.prefix || '') + (@config.image_prefix || '/assets/images')
+      end
+
+      def js_prefix
+        (@config.prefix || '') + (@config.js_prefix  || '/assets/javascripts')
+      end
+
+      def css_prefix
+        (@config.prefix || '') + (@config.css_prefix || '/assets/stylesheets')
+      end
+
+    end
+  end
+end

data/lib/padrino-pipeline/pipelines/sprockets.rb

@@ -1,31 +1,32 @@
 require 'sprockets'
 require 'uglifier'
-require 'padrino-pipeline/ext/padrino-helpers/asset_tag_helper'
+require 'padrino-pipeline/pipelines/common'
 
 module Padrino
   module Pipeline 
     class Sprockets
+      include Padrino::Pipeline::Common
+
       def initialize(app, config)
-        @app    = app
-        @config = config
+        @app       = app
+        @config    = config
         setup_enviroment
         setup_sprockets
       end
 
       private
-      def app_root
-        @app.settings.root
-      end
-
-      def default_paths
-        ["#{app_root}/assets/javascripts", "#{app_root}/assets/stylesheets"]
+      def paths
+        js_assets  = self.js_assets.kind_of?(Array) ? self.js_assets : [self.js_assets]
+        css_assets = self.css_assets.kind_of?(Array) ? self.css_assets : [self.css_assets]
+        image_assets = self.image_assets.kind_of?(Array) ? self.image_assets : [self.image_assets]
+        js_assets + css_assets + image_assets
       end
 
       def setup_sprockets
-        @config.paths ||= default_paths
-        @config.paths.each { |path| @app.settings.assets.append_path path }
-        mount_js_assets  (@config.prefix || '') + (@config.js_prefix  || '/assets/javascripts')
-        mount_css_assets (@config.prefix || '') + (@config.css_prefix || '/assets/stylesheets')
+        paths.each { |path| @app.settings.assets.append_path path }
+        mount_js_assets    js_prefix 
+        mount_css_assets   css_prefix
+        mount_image_assets image_prefix
       end
 
       def setup_enviroment
@@ -34,14 +35,18 @@ module Padrino
         @app.settings.assets.js_compressor  = Uglifier.new(:mangle => true)
       end
 
+      def mount_image_assets(prefix)
+        mount_assets(:prefix => prefix)
+      end
+
       def mount_js_assets(prefix)
-        mount_assets(:prefix => prefix, 
+        mount_assets(:prefix => prefix,
                      :extension => "js",
                      :content_type => "application/javascript")
       end
 
       def mount_css_assets(prefix)
-        mount_assets(:prefix => prefix, 
+        mount_assets(:prefix => prefix,
                      :extension => "css",
                      :content_type => "text/css")
       end
@@ -50,9 +55,10 @@ module Padrino
         prefix       = options[:prefix]
         extension    = options[:extension]
         content_type = options[:content_type]
-        @app.get "#{prefix}/:file.#{extension}" do
-          content_type(content_type)
-          settings.assets["#{params[:file]}.#{extension}"] || not_found
+        @app.get "#{prefix}/:path.:ext" do |path, ext|
+          return not_found if (extension && ext != extension)
+          content_type(content_type || Rack::Mime::MIME_TYPES[".#{ext}"])
+          settings.assets["#{path}.#{ext}"] || not_found
         end
       end
 

data/lib/padrino-pipeline/version.rb

@@ -1,5 +1,5 @@
 module Padrino
   module Pipeline
-    VERSION = '0.2.0'
+    VERSION = '0.2.1'
   end
 end

data/test/api/test_css.rb

@@ -0,0 +1,104 @@
+require File.expand_path(File.dirname(__FILE__) + '/../extra/helper')
+
+shared_examples_for 'A Pipeline' do
+  describe 'default options' do
+    let(:app) { rack_app }
+    before do
+      pipeline = @pipeline
+      app_root = fixture_path('asset_pack_app')
+      mock_app do
+        set :root, app_root
+        register Padrino::Pipeline
+        configure_assets{ |c| c.pipeline = pipeline }
+      end
+    end
+
+    it 'can get a stylesheet file' do
+      get '/assets/stylesheets/app.css'
+      assert_equal 200, last_response.status
+    end
+
+    it 'makes sure that sass is compiled' do
+      get '/assets/stylesheets/default.css'
+      assert_equal 200, last_response.status
+      assert_match ".content {\n  display: none; }\n", last_response.body
+    end
+
+    it 'can not get a file other than .css' do
+      skip if @pipeline == Padrino::Pipeline::AssetPack #http_router issue :(
+      get '/assets/stylesheets/default.scss'
+      assert_equal 404, last_response.status
+    end
+
+    it 'gives 404 for unknown files' do
+      skip if @pipeline == Padrino::Pipeline::AssetPack #http_router issue :(
+      get '/assets/stylesheets/omg.css'
+      assert_equal 404, last_response.status
+    end
+  end
+
+
+  describe 'custom options' do
+    let(:app) { rack_app }
+    before do
+      @assets_location =  "#{fixture_path('asset_pack_app')}/assets/stylesheets"
+    end
+
+    it 'get CSS asset from a custom location' do
+      assets_location = @assets_location
+      pipeline        = @pipeline
+      mock_app do
+        register Padrino::Pipeline
+        configure_assets do |assets| 
+          assets.pipeline  = pipeline
+          assets.css_assets = assets_location
+        end
+      end
+
+      get '/assets/stylesheets/app.css'
+      assert_equal 200, last_response.status
+    end
+
+    it 'get CSS asset from custom location(Array)' do
+      assets_location = @assets_location
+      pipeline        = @pipeline
+      mock_app do
+        register Padrino::Pipeline
+        configure_assets do |assets|
+          assets.pipeline  = pipeline
+          assets.css_assets = ['some/unknown/source', assets_location]
+          assets.css_prefix = '/custom/location'
+        end
+      end  
+      get '/custom/location/app.css'
+      assert_equal 200, last_response.status
+    end
+  
+    it 'get CSS asset form custom URI' do
+      assets_location = @assets_location
+      pipeline        = @pipeline
+      mock_app do
+        register Padrino::Pipeline
+        configure_assets do |assets|
+          assets.pipeline  = pipeline
+          assets.css_assets = assets_location
+          assets.css_prefix = '/custom/location'
+        end
+      end#mock-app
+      get '/custom/location/app.css'
+      assert_equal 200, last_response.status
+    end
+  end
+end
+
+describe Padrino::Pipeline::Sprockets do
+  before { @pipeline = Padrino::Pipeline::Sprockets }
+  it_behaves_like 'A Pipeline'
+end
+
+describe Padrino::Pipeline::AssetPack do
+  before { @pipeline = Padrino::Pipeline::AssetPack}
+  it_behaves_like 'A Pipeline'
+end
+
+

data/test/api/test_images.rb

@@ -0,0 +1,113 @@
+require File.expand_path(File.dirname(__FILE__) + '/../extra/helper')
+
+shared_examples_for 'A Pipeline' do
+  describe 'default options' do
+    let(:app) { rack_app }
+    before do
+      pipeline = @pipeline
+      app_root = fixture_path('sprockets_app')
+      mock_app do
+        set :root, app_root
+        register Padrino::Pipeline
+        configure_assets{ |c| c.pipeline = pipeline }
+      end
+
+    end
+
+    it 'can get an image' do
+      get '/assets/images/glass.png' 
+      assert_equal 200, last_response.status
+    end
+
+    it 'should have the right content type' do
+      get '/assets/images/glass.png' 
+      assert_equal 'image/png', last_response.content_type
+    end
+
+    it 'gives 404 for unkown image files' do
+      skip if @pipeline == Padrino::Pipeline::AssetPack #http_router issue :(
+      get '/assets/images/unkown.png'
+      assert_equal 404, last_response.status
+    end
+  end
+
+  describe 'custom options' do
+    let(:app) { rack_app }
+    before do
+      @assets_location =  "#{fixture_path('sprockets_app')}/assets/images"
+    end
+
+    it 'get image asset from a custom location' do
+      assets_location = @assets_location
+      pipeline        = @pipeline
+      mock_app do
+        register Padrino::Pipeline
+        configure_assets do |assets| 
+          assets.pipeline     = pipeline
+          assets.image_assets = assets_location
+        end
+      end
+
+      get '/assets/images/glass.png'
+      assert_equal 200, last_response.status
+    end
+
+    it 'get image asset from a custom location(Array)' do
+      assets_location = @assets_location
+      pipeline        = @pipeline
+      mock_app do
+        register Padrino::Pipeline
+        configure_assets do |assets| 
+          assets.pipeline     = pipeline
+          assets.image_assets = ['some/unkown/place', assets_location]
+        end
+      end
+
+      get '/assets/images/glass.png'
+      assert_equal 200, last_response.status
+    end
+
+    it 'get image asset form custom URI' do
+      assets_location = @assets_location
+      pipeline        = @pipeline
+      mock_app do
+        register Padrino::Pipeline
+        configure_assets do |assets|
+          assets.pipeline  = pipeline
+          assets.image_assets = assets_location
+          assets.image_prefix = '/custom/location'
+        end
+      end#mock-app
+      get '/custom/location/glass.png'
+      assert_equal 200, last_response.status
+    end
+
+    it 'get image asset form custom prefix' do
+      assets_location = @assets_location
+      pipeline        = @pipeline
+      mock_app do
+        register Padrino::Pipeline
+        configure_assets do |assets|
+          assets.pipeline  = pipeline
+          assets.image_assets = assets_location
+          assets.prefix  = '/custom'
+        end
+      end#mock-app
+      get '/custom/assets/images/glass.png'
+      assert_equal 200, last_response.status
+    end
+   
+  end
+end
+
+describe Padrino::Pipeline::Sprockets do
+  before { @pipeline = Padrino::Pipeline::Sprockets }
+  it_behaves_like 'A Pipeline'
+end
+
+describe Padrino::Pipeline::AssetPack do
+  before { @pipeline = Padrino::Pipeline::AssetPack}
+  it_behaves_like 'A Pipeline'
+end
+
+

data/test/api/test_js.rb

@@ -0,0 +1,111 @@
+require File.expand_path(File.dirname(__FILE__) + '/../extra/helper')
+
+shared_examples_for 'A Pipeline' do
+  describe 'default options' do
+    let(:app) { rack_app }
+    before do
+      pipeline = @pipeline
+      app_root = fixture_path('asset_pack_app')
+      mock_app do
+        set :root, app_root
+        register Padrino::Pipeline
+        configure_assets{ |c| c.pipeline = pipeline }
+      end
+    end
+
+    it 'GET a basic JS file' do
+      get '/assets/javascripts/app.js'
+      assert_equal 200, last_response.status
+      assert_match 'var mainApp', last_response.body
+    end
+
+    it 'GET a coffee script file' do
+      get '/assets/javascripts/coffee.js'
+      assert_equal 200, last_response.status
+      assert_match 'coffee', last_response.body
+    end
+
+    it 'is the right content type' do
+      get '/assets/javascripts/app.js'
+      assert_match 'application/javascript', last_response.content_type
+    end
+
+    it 'can not get a file other than .js' do
+      skip if @pipeline == Padrino::Pipeline::AssetPack #http_router issue :(
+      get '/assets/javscripts/coffee.coffee'
+      assert_equal 404, last_response.status
+    end
+
+
+    it 'gives 404 for unknown JS file' do
+      skip if @pipeline == Padrino::Pipeline::AssetPack #http_router issue :(
+      get '/assets/javascripts/doesnotexist.js'
+      assert_equal 404, last_response.status
+    end
+  end
+
+
+  describe 'custom options' do
+    let(:app) { rack_app }
+    before do
+      @assets_location =  "#{fixture_path('asset_pack_app')}/assets/javascripts"
+    end
+
+    it 'get JS asset from a custom location' do
+      assets_location = @assets_location
+      pipeline        = @pipeline
+      mock_app do
+        register Padrino::Pipeline
+        configure_assets do |assets| 
+          assets.pipeline  = pipeline
+          assets.js_assets = assets_location
+        end
+      end
+
+      get '/assets/javascripts/app.js'
+      assert_equal 200, last_response.status
+    end
+
+    it 'get JS asset from custom location(Array)' do
+      assets_location = @assets_location
+      pipeline        = @pipeline
+      mock_app do
+        register Padrino::Pipeline
+        configure_assets do |assets|
+          assets.pipeline  = pipeline
+          assets.js_assets = ['some/unknown/source', assets_location]
+          assets.js_prefix = '/custom/location'
+        end
+      end  
+      get '/custom/location/app.js'
+      assert_equal 200, last_response.status
+    end
+  
+    it 'get JS asset form custom URI' do
+      assets_location = @assets_location
+      pipeline        = @pipeline
+      mock_app do
+        register Padrino::Pipeline
+        configure_assets do |assets|
+          assets.pipeline  = pipeline
+          assets.js_assets = assets_location
+          assets.js_prefix = '/custom/location'
+        end
+      end#mock-app
+      get '/custom/location/app.js'
+      assert_equal 200, last_response.status
+    end
+  end
+end
+
+describe Padrino::Pipeline::Sprockets do
+  before { @pipeline = Padrino::Pipeline::Sprockets }
+  it_behaves_like 'A Pipeline'
+end
+
+describe Padrino::Pipeline::AssetPack do
+  before { @pipeline = Padrino::Pipeline::AssetPack}
+  it_behaves_like 'A Pipeline'
+end
+
+

data/test/api/test_other.rb

@@ -0,0 +1,47 @@
+require File.expand_path(File.dirname(__FILE__) + '/../extra/helper')
+
+shared_examples_for 'A Pipeline' do
+  describe 'non-default options' do
+    let(:app) { rack_app }
+    before do
+      @assets_location =  "#{fixture_path('asset_pack_app')}/assets/javascripts"
+    end
+
+    it 'knows that assets should be served' do
+      pipeline = @pipeline
+      mock_app do
+        register Padrino::Pipeline
+        configure_assets {|c| c.pipeline  = pipeline}
+      end
+      
+      assert_equal true, @app.serve_assets?
+    end
+
+    it 'can set a general prefix for all asset types' do
+      assets_location = @assets_location
+      pipeline        = @pipeline
+      mock_app do
+        register Padrino::Pipeline
+        configure_assets do |assets|
+          assets.pipeline  = pipeline
+          assets.js_assets = assets_location
+          assets.prefix    = '/trunk'
+        end
+      end
+
+      get '/trunk/assets/javascripts/app.js'
+      assert_equal 200, last_response.status
+    end
+  end
+end
+
+
+describe Padrino::Pipeline::Sprockets do
+  before { @pipeline = Padrino::Pipeline::Sprockets }
+  it_behaves_like 'A Pipeline'
+end
+
+describe Padrino::Pipeline::AssetPack do
+  before { @pipeline = Padrino::Pipeline::AssetPack}
+  it_behaves_like 'A Pipeline'
+end

data/test/extra/helper.rb

@@ -28,6 +28,27 @@ class MiniTest::Spec
   end
 end
 
+MiniTest::Spec.class_eval do
+  def self.shared_examples
+    @shared_examples ||= {}
+  end
+end
+
+module MiniTest::Spec::SharedExamples
+  def shared_examples_for(desc, &block)
+    MiniTest::Spec.shared_examples[desc] = block
+  end
+ 
+  def it_behaves_like(desc)
+    self.instance_eval do
+      MiniTest::Spec.shared_examples[desc].call
+    end
+  end
+end
+ 
+Object.class_eval { include(MiniTest::Spec::SharedExamples) }
+
+
 module Webrat
   module Logging
     def logger # @private

data/test/fixtures/asset_pack_app/asset_pack_app.rb

@@ -22,10 +22,10 @@ class AssetsAppAssetPackCustom < BaseApp
   configure_assets do |config|
     config.pipeline   = Padrino::Pipeline::AssetPack
     config.js_prefix  = '/meow/javascripts'
-    config.js_assets  = '/assets/js' 
+    config.js_assets  = 'assets/js' 
     
     config.css_prefix  = '/meow/stylesheets'
-    config.css_assets  = '/assets/css' 
+    config.css_assets  = 'assets/css' 
   end
 end
 

data/test/sprockets/test_asset_tag.rb

@@ -12,8 +12,8 @@ describe 'Asset tags' do
         register Padrino::Pipeline
         register Padrino::Helpers
         configure_assets do |assets| 
-          assets.pipeline = Padrino::Pipeline::Sprockets
-          assets.paths    = [assets_location]
+          assets.pipeline  = Padrino::Pipeline::Sprockets
+          assets.js_assets = [assets_location]
         end
         get('/') { render :erb, "<%= javascript_include_tag 'app.js' %>" }
       end

data/test/sprockets/test_js.rb

@@ -4,76 +4,11 @@ require File.expand_path(File.dirname(__FILE__) + '/../fixtures/sprockets_app/sp
 
 describe 'Javascripts' do
   let(:app) { AssetsAppSprockets }
-  context 'for coffeescript assets' do
-    it 'can get a coffeescript' do
-      get '/assets/javascripts/coffee.js'
-      assert_equal 200, last_response.status
-    end
-
-    it 'is compiled' do 
-      get '/assets/javascripts/coffee.js'
-      assert_match 'a="yes"', last_response.body
+  context 'for //= require' do
+    it 'picks up require statements' do
+      get '/assets/javascripts/app.js'
+      assert_match 'var in_second_file;', last_response.body
     end
   end
-
-  context 'for javascript assets' do
-    it 'can retrieve a js asset by file name' do
-      get '/assets/javascripts/unrequired.js'
-      assert_match 'var unrequired;', last_response.body
-    end
-
-    it 'is the right content type' do
-      get '/assets/javascripts/unrequired.js'
-      assert_match 'application/javascript', last_response.content_type
-    end
-
-    it 'shows a 404 for unkown assets' do
-      get '/assets/javascripts/xyz.js'
-      assert_not_equal 200, last_response.status
-    end
-
-    context 'for //= require' do
-      it 'picks up require statements' do
-        get '/assets/javascripts/app.js'
-        assert_match 'var in_second_file;', last_response.body
-      end
-    end
-
-    context 'for custom options' do
-      let(:app) { rack_app }
-      before do
-      @assets_location =  "#{fixture_path('sprockets_app')}/assets/javascripts"
-      end
-
-      it '#append_asset_path' do
-        assets_location = @assets_location
-        mock_app do
-          register Padrino::Pipeline
-          configure_assets do |assets| 
-            assets.pipeline = Padrino::Pipeline::Sprockets
-            assets.paths    = [assets_location]
-          end
-        end
-
-        get '/assets/javascripts/app.js'
-        assert_match 'var in_second_file', last_response.body
-      end
-
-      it '#js_prefix mounts assets to the correct spot' do
-        assets_location = @assets_location
-        mock_app do
-          register Padrino::Pipeline
-          configure_assets do |assets|
-            assets.pipeline  = Padrino::Pipeline::Sprockets
-            assets.paths     = [assets_location]
-            assets.js_prefix = '/custom/location'
-          end
-        end#mock-app
-        get '/custom/location/app.js'
-        assert_match 'var in_second_file', last_response.body
-        assert_equal 200, last_response.status
-      end
-
-    end#context
-  end#context
+ 
 end#describe

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: padrino-pipeline
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Sumeet Singh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-08 00:00:00.000000000 Z
+date: 2013-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: padrino-core
@@ -138,11 +138,14 @@ files:
 - lib/padrino-pipeline.rb
 - lib/padrino-pipeline/ext/padrino-helpers/asset_tag_helper.rb
 - lib/padrino-pipeline/pipelines/asset_pack.rb
+- lib/padrino-pipeline/pipelines/common.rb
 - lib/padrino-pipeline/pipelines/sprockets.rb
 - lib/padrino-pipeline/version.rb
 - padrino-pipeline.gemspec
-- test/asset_pack/test_css.rb
-- test/asset_pack/test_js.rb
+- test/api/test_css.rb
+- test/api/test_images.rb
+- test/api/test_js.rb
+- test/api/test_other.rb
 - test/asset_pack/test_packages.rb
 - test/extra/helper.rb
 - test/extra/mini_shoulda.rb
@@ -165,8 +168,6 @@ files:
 - test/fixtures/sprockets_app/assets/stylesheets/second_file.css
 - test/fixtures/sprockets_app/sprockets_app.rb
 - test/sprockets/test_asset_tag.rb
-- test/sprockets/test_assets.rb
-- test/sprockets/test_css.rb
 - test/sprockets/test_js.rb
 homepage: http://www.padrinorb.com
 licenses: []
@@ -193,8 +194,10 @@ signing_key:
 specification_version: 4
 summary: The Padrino asset management system
 test_files:
-- test/asset_pack/test_css.rb
-- test/asset_pack/test_js.rb
+- test/api/test_css.rb
+- test/api/test_images.rb
+- test/api/test_js.rb
+- test/api/test_other.rb
 - test/asset_pack/test_packages.rb
 - test/extra/helper.rb
 - test/extra/mini_shoulda.rb
@@ -217,7 +220,5 @@ test_files:
 - test/fixtures/sprockets_app/assets/stylesheets/second_file.css
 - test/fixtures/sprockets_app/sprockets_app.rb
 - test/sprockets/test_asset_tag.rb
-- test/sprockets/test_assets.rb
-- test/sprockets/test_css.rb
 - test/sprockets/test_js.rb
 has_rdoc: 

data/test/asset_pack/test_css.rb

@@ -1,33 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/../extra/helper')
-require File.expand_path(File.dirname(__FILE__) + '/../fixtures/asset_pack_app/asset_pack_app')
-
-describe 'AssetPack Stylesheets' do
-  let(:app) { AssetsAppAssetPack }
-
-  it 'can get a stylesheet file' do
-    get '/assets/stylesheets/app.css'
-    assert_equal 200, last_response.status
-  end
-
-  it 'makes sure that sass is compiled' do
-    get '/assets/stylesheets/default.css'
-    assert_equal 200, last_response.status
-    assert_match ".content {\n  display: none; }\n", last_response.body
-  end
-
-  it 'gives 404 for unknown files' do
-    get '/assets/stylesheets/omg.css'
-    assert_equal 404, last_response.status
-  end
-
-  context 'for non-defualt options' do
-    let(:app) { AssetsAppAssetPackCustom }
-
-    it 'can serve from another stylesheets path' do
-      get '/meow/stylesheets/meow.css'
-      assert_equal 200, last_response.status
-      assert_match '.meow', last_response.body 
-    end
-
-  end
-end

data/test/asset_pack/test_js.rb

@@ -1,33 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/../extra/helper')
-require File.expand_path(File.dirname(__FILE__) + '/../fixtures/asset_pack_app/asset_pack_app')
-
-describe 'AssetPack Javascripts' do
-  let(:app) { AssetsAppAssetPack }
-
-  it 'can get a javascript file' do
-    get '/assets/javascripts/app.js'
-    assert_equal 200, last_response.status
-    assert_match 'var mainApp = true;', last_response.body
-  end
-
-  it 'makes sure that coffeescript is compiled' do
-    get '/assets/javascripts/coffee.js'
-    assert_equal 200, last_response.status
-    assert_match 'coffee = true', last_response.body
-  end
-
-  it 'gives 404 for unknown files' do
-    get '/assets/javascripts/omg.js'
-    assert_equal 404, last_response.status
-  end
-
-  context 'for non-defualt options' do
-    let(:app) { AssetsAppAssetPackCustom }
-
-    it 'can serve from another javascript path' do
-      get '/meow/javascripts/myapp.js'
-      assert_equal 200, last_response.status
-    end
-
-  end
-end

data/test/sprockets/test_assets.rb

@@ -1,40 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/../extra/helper')
-
-describe Padrino::Pipeline do
-  let(:app) { AssetsAppSprockets }
-
-  context 'for application behavior' do
-    it 'knows that assets should be served' do
-      assert_equal app.serve_assets?, true
-    end
-
-    it 'detects the root location of the running app' do
-      app_path = fixture_path('sprockets_app')
-      assert_equal app_path, app.root
-    end
-  end
-
-  context 'general options' do
-    let(:app) { rack_app }
-    
-    before do
-     @assets_location = "#{fixture_path('sprockets_app')}/assets/javascripts"
-    end
-
-    it 'can set a general prefix for all asset types' do
-      assets_location = @assets_location
-      mock_app do
-        register Padrino::Pipeline
-        configure_assets do |assets|
-          assets.pipeline = Padrino::Pipeline::Sprockets
-          assets.paths    = [assets_location]
-          assets.prefix   = '/trunk'
-        end
-      end
-
-      get '/trunk/assets/javascripts/app.js'
-      assert_equal 200, last_response.status
-    end
-  end
-
-end#describe

data/test/sprockets/test_css.rb

@@ -1,68 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/../extra/helper')
-
-describe 'Stylesheets' do
-  let(:app) { AssetsAppSprockets }
-
-  context 'for css assets' do
-    it 'can retrieve an css asset by file name' do
-      get '/assets/stylesheets/application.css'
-      assert_equal 200, last_response.status
-    end
-
-    it 'is the right content type' do
-      get '/assets/stylesheets/application.css'
-      assert_match 'text/css', last_response.content_type
-    end    
-
-    it 'works with directives' do
-      get '/assets/stylesheets/application.css'
-      assert_match '.home {', last_response.body
-    end
- 
-    context 'for SASS assets' do
-
-      it 'can retrieve a .scss asset by file name' do
-        get '/assets/stylesheets/sass.css'
-        assert_match 'body .div', last_response.body
-      end
-
-    end
-
-    context 'for custom options' do
-      let(:app) { rack_app }
-      before do
-        @assets_location = "#{fixture_path('sprockets_app')}/assets/stylesheets"
-      end
-
-      it 'can modify the default asset path by configuration' do
-        assets_location = "#{fixture_path('sprockets_app')}/assets/other"
-        mock_app do
-          register Padrino::Pipeline
-          configure_assets do |assets|
-            assets.pipeline = Padrino::Pipeline::Sprockets
-            assets.paths    = [assets_location]
-          end
-        end
-
-        get '/assets/stylesheets/other.css'
-        assert_equal 200, last_response.status
-      end
-
-      it 'can modify the default css prefix by configuration' do
-        assets_location = @assets_location
-        mock_app do
-          register Padrino::Pipeline
-          configure_assets do |assets|
-            assets.pipeline = Padrino::Pipeline::Sprockets
-            assets.paths      = [assets_location]
-            assets.css_prefix = '/myassets/items'
-          end
-        end
-
-        get '/myassets/items/application.css'
-        assert_equal 200, last_response.status
-      end
-
-    end #context
-  end #context
-end #describe