padrino-pipeline 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14f082abda1188fbc0576b04796503d7067fa9c6
-  data.tar.gz: bc74e3d743a9fc243caeaf39b911d6b008463da0
+  metadata.gz: c780188a8a746db35ba46d78a7c8c940861c0fc3
+  data.tar.gz: 0a625506df07794e7f75b81ba6f63ab5cb98ceb9
 SHA512:
-  metadata.gz: c923aab61e2b1c0a04143993cb9fe42114df3a2de17f8120ce4ab6c61354b0119dbeefab02674c6ee290463448d5372fa6abfd408dbab41d3dfc65d1a420dfbd
-  data.tar.gz: 52eb92c79db4d701ba3d7313e6d9f4cc5f32fc5fd4e04adc7ecbb89da72b58bd80a6d8fdfe4497d003eea9003d3f4075ab12e94dcdb960b6c722ee7163b69539
+  metadata.gz: af6ff7d0500ed852640d8a5c7572776a2c21b5557181f304872bc0b83667a0ec02ebc7fe5b10bbc5812be59364567429a67f4a5bf55d08d761b94da7fdf6c73e
+  data.tar.gz: 4d1076133feb2a8a3727196eaf146d570cbbf2030ff48aba906cae12d9c9f07014c8f0340abbdd408cce2f336832047ea8258c998207edfda75ab9abf14ea755

data/.travis.yml

@@ -4,10 +4,8 @@ install:
   - gem update --system
   - bundle update
 rvm:
-  - 1.8.7
   - 1.9.3
   - 2.0.0
-  - rbx-18mode
   - jruby-19mode-1.7.4
 branches:
   only:

data/Gemfile

@@ -5,7 +5,6 @@ gem "rake"
 (RUBY_VERSION < "1.9") ? gem("nokogiri",  "~> 1.5.10") : gem("nokogiri",  "~> 1.6")
 
 group :test do
-  gem "webrat",    ">= 0.5.1"
   gem "rack-test", ">= 0.5.0"
   gem "minitest",  "~> 4.0"
 end

data/README.md

@@ -8,7 +8,7 @@ a unified way to use several different asset management systems.
 
 
 ##Supported Pipelines
-- [Sprockets](https://github.com/sstephenson/sprockets)
+- [sprockets](https://github.com/sstephenson/sprockets)
 - [sinatra-assetpack](https://github.com/rstacruz/sinatra-assetpack)
 
 ##Simple Usage
@@ -62,25 +62,113 @@ module Example
 end
 ```
 
-The following options can be set
 
-### Pipeline
-- #pipeline
+## Pipeline
+```ruby
+module Example
+  class App < Padrino::Application
+    register Padrino::Pipeline
+    configure_assets do |config|
+      config.pipeline = Padrino::Pipeline::AssetPack
+    end
+  end
+end
+```
+
+`config.pipeline = Padrino::Pipeline::AssetPack`
+`config.pipeline = Padrino::Pipeline::Sprockets`
 
-### Assets URI(mounting location) String
-- #css_prefix
-- #js_prefix
+## Assets URI(mounting location) String
 
-### Asset location(path to files) String/Array
-- #css_assets
-- #js_assets
+###css_prefix
+```ruby
+module Example
+  class App < Padrino::Application
+    register Padrino::Pipeline
+    configure_assets do |config|
+      config.pipeline = Padrino::Pipeline::Sprockets
+      config.css_prefix = '/my_custom_location'
+    end
+  end
+end
+```
+`/my_custom_location` will be the location css assets are served 
+e.g. `/my_custom_location/application.css`
 
-### Prefix prepend this prefix before all assets
-- #prefix
+###js_prefix
+```ruby
+module Example
+  class App < Padrino::Application
+    register Padrino::Pipeline
+    configure_assets do |config|
+      config.pipeline = Padrino::Pipeline::Sprockets
+      config.js_prefix = '/js'
+    end
+  end
+end
+```
+`/js` will be the location css assets are served 
+e.g. `/js/application.js`
 
-### Default option values
+## Asset location(path to files) String/Array
+###css_assets
+```ruby
+module Example
+  class App < Padrino::Application
+    register Padrino::Pipeline
+    configure_assets do |config|
+      config.pipeline = Padrino::Pipeline::Sprockets
+      config.css_assets = '/path/to/stylesheets'
+    end
+  end
+end
+```
+`/path/to/stylesheets` will be served at the css_prefix(default: /assets/stylesheets)
+
+###js_assets
+```ruby
+module Example
+  class App < Padrino::Application
+    register Padrino::Pipeline
+    configure_assets do |config|
+      config.pipeline = Padrino::Pipeline::Sprockets
+      config.js_assets = '/path/to/javascripts'
+    end
+  end
+end
+```
+`/path/to/javascripts` will be served at the js_prefix(default: /assets/javascripts)
+
+## Prefix prepend this prefix before all assets
+###prefix
+```ruby
+module Example
+  class App < Padrino::Application
+    register Padrino::Pipeline
+    configure_assets do |config|
+      config.pipeline = Padrino::Pipeline::Sprockets
+      config.prefix = '/public'
+    end
+  end
+end
+```
+prefixes `/public` to all asset URLs.  Above example will serve assets from:
+- `/public/assets/stylesheets/application.css` 
+  # => `http://localhost:3000/public/assets/stylesheets/application.css`
+- `/public/assets/javascripts/application.js` 
+  # => `http://localhost:3000/public/assets/javascripts/application.js`
+
+## Default option values
+TODO
+
+## compile asset rake tasks
 TODO
 
+## Sprocket compiled assets
+`javascript_include_tag` & `stylesheet_link_tag` have been patched to include the hex digest of compiled assets.
+if the assets do not exist a fresh copy will be served via the normal asset URL.
+e.g. `application-12abc456xyz.js` vs `application.js`
+
 ## Asset pack packages
 ```ruby
   module Example

data/lib/padrino-pipeline.rb

@@ -1,5 +1,8 @@
 require 'padrino-pipeline/pipelines/sprockets'
 require 'padrino-pipeline/pipelines/asset_pack'
+require 'padrino-pipeline/compilers/sprockets'
+require 'padrino-pipeline/compilers/asset_pack'
+
 require 'padrino-pipeline/ext/padrino-helpers/asset_tag_helper'
 require 'padrino-pipeline/configuration'
 
@@ -7,11 +10,12 @@ module Padrino
   ##
   # Add public api docs here
   module Pipeline
-
+    
     def configure_assets(&block)
-      assets = Padrino::Pipeline::Configuration.new(self)
-      yield assets if block_given?
-      assets.pipeline.new(self, assets)
+      config = Padrino::Pipeline::Configuration.new(self)
+      yield config if block_given?
+      config.pipeline = config.pipeline.new(self, config)
+      set :pipeline, config
     end
 
   end

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

@@ -0,0 +1,9 @@
+module Padrino
+  module Pipeline 
+    module Compiler
+      class AssetPack 
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,61 @@
+module Padrino
+  module Pipeline 
+    module Compiler
+      class Sprockets
+        def initialize(config)
+          @config = config
+        end
+
+        def compile(type)
+          create_directory(@config.compiled_output)
+          create_directory("#{@config.compiled_output}/#{@config.js_compiled_output}")
+          create_directory("#{@config.compiled_output}/#{@config.css_compiled_output}")
+          return unless @config.app
+          case type
+          when :js  then compile_js
+          when :css then compile_css
+          else 
+            throw RuntimeError, "Can not compile #{type} asset"
+          end
+        end
+
+        def js_output_path(file_name = '')
+          output_path(@config.js_compiled_output).join(file_name)
+        end
+
+        def css_output_path(file_name = '')
+          output_path(@config.css_compiled_output).join(file_name)
+        end
+
+        private
+        def assets
+          @config.app.assets
+        end
+
+        def output_path(directory_name)
+          output_path = Pathname.new(@config.compiled_output).join(directory_name)
+        end
+
+        def compile_css
+          compile_assets(:css, ['css', 'css.gz'])
+        end
+
+        def compile_js
+          compile_assets(:js, ['js', 'js.gz'])
+        end
+
+        def compile_assets(type, extensions = [])
+          asset  = assets[@config.send("#{type.to_s}_compiled_asset")]
+          extensions.each do |ext|
+            output_path = self.send("#{type.to_s}_output_path", "application-#{asset.digest}.#{ext}")
+            asset.write_to output_path
+          end
+        end
+
+        def create_directory(path)
+          FileUtils.mkdir_p(path) unless File.exists?(path)
+        end
+      end
+    end
+  end
+end

data/lib/padrino-pipeline/configuration.rb

@@ -5,7 +5,9 @@ module Padrino
       attr_accessor :pipeline,   :packages,  :prefix 
       attr_accessor :css_prefix, :js_prefix, :image_prefix 
       attr_accessor :css_assets, :js_assets, :image_assets
-      attr_accessor :enable_compression
+      attr_accessor :js_compiled_output, :css_compiled_output, :compiled_output
+      attr_accessor :js_compiled_asset,  :css_compiled_asset
+      attr_accessor :enable_compression, :app
 
       def initialize(app)
         @app          = app
@@ -17,6 +19,17 @@ module Padrino
         @image_assets = "#{app_root}/assets/images"
         @js_assets    = "#{app_root}/assets/javascripts"
         @css_assets   = "#{app_root}/assets/stylesheets"
+
+        @compiled_output     = "#{app_root}/public"
+        @js_compiled_output  = "javascripts"
+        @css_compiled_output = "stylesheets"
+
+        @js_compiled_asset  = 'application.js'
+        @css_compiled_asset = 'application.css'
+      end
+
+      def compile(*args)
+        asset_compiler.compile(*args)
       end
 
       def app_root
@@ -38,7 +51,20 @@ module Padrino
       def serve_compressed?
         enable_compression || PADRINO_ENV == "production"
       end
+      
+      def asset_compiler
+        @asset_compiler ||= match_compiler.new(self)
+      end
+
+      private
+      def pipeline_class 
+        @pipeline.class.name
+      end
 
+      def match_compiler
+        pipeline_type  = pipeline_class.split('::').last
+        "Padrino::Pipeline::Compiler::#{pipeline_type}".constantize
+      end
     end
   end
 end

data/lib/padrino-pipeline/ext/padrino-helpers/asset_tag_helper.rb

@@ -1,11 +1,80 @@
+require 'padrino-helpers'
+
 module Padrino
   module Helpers
     module AssetTagHelpers
 
-      # alias :original_asset_path :asset_path
-      # def asset_path(kind, source)
-      #   original_asset_path(kind, source)
-      # end
+      def pipeline_asset_folder_name(kind)
+        pipeline = settings.pipeline
+        case kind
+        when :css    then pipeline.css_prefix
+        when :js     then pipeline.js_prefix
+        when :images then pipeline.image_prefix
+        else kind.to_s
+        end
+      end
+
+      alias_method :original_asset_folder_name, :asset_folder_name
+      alias_method :asset_folder_name, :pipeline_asset_folder_name
+
+      alias_method :original_javascript_include_tag, :javascript_include_tag
+      def javascript_include_tag(*sources)
+        options = sources.extract_options!.symbolize_keys
+        options.reverse_merge!(:type => 'text/javascript')
+        sources.flatten.map { |source|
+          content_tag(:script, nil, options.reverse_merge(:src => resolve_js_path(source)))
+        }.join("\n").html_safe
+      end
+
+      alias_method :original_stylesheet_link_tag, :stylesheet_link_tag
+      def stylesheet_link_tag(*sources)
+        options = sources.extract_options!.symbolize_keys
+        options.reverse_merge!(:media => 'screen', :rel => 'stylesheet', :type => 'text/css')
+        sources.flatten.map { |source|
+          tag(:link, options.reverse_merge(:href => asset_path(:css, resolve_css_path(source))))
+        }.join("\n").html_safe
+      end
+
+      private
+      def resolve_css_path(source)
+        resolve_path(:css, source)
+      end
+
+      def resolve_js_path(source)
+        resolve_path(:js, source)
+      end
+
+      def resolve_path(type, source)
+        digested_source       = digested_source(source)
+        digested_source_path  = digested_source_path(type, digested_source)
+        File.exists?(digested_source_path) ? asset_path(type, digested_source) : asset_path(type, source)
+      end
+
+      ##
+      # Get the full path of the digested_source
+      def digested_source_path(type, digested_source)
+        #hackzor
+        settings.pipeline.asset_compiler.send("#{type.to_s}_output_path", digested_source)
+      rescue
+        ''
+      end
+
+      ##
+      # Add the hex digest to the source path
+      def digested_source(source)
+        digest = asset_digest(source)
+        parts  = source.split('.')
+        (parts[0...parts.count-1]).join('.') << "-#{digest}.#{parts.last}"
+      end
+
+      ##
+      # Get the hex digest for a particular asset
+      def asset_digest(source)
+        return '' unless defined? settings
+        return '' unless settings.respond_to?(:assets)
+        return '' unless settings.assets.respond_to?(:[])
+        settings.assets[source] && settings.assets[source].digest
+      end
 
     end #AssetTagHelpers
   end #Helpers

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

@@ -1,10 +1,9 @@
-require 'sinatra/assetpack' unless defined? Sinatra::AssetPack
-
 module Padrino
   module Pipeline
     class AssetPack
 
       def initialize(app, config)
+        require_libraries
         @app    = app
         @config = config
         setup_enviroment
@@ -16,6 +15,10 @@ module Padrino
       end
 
       private
+      def require_libraries
+        require 'sinatra/assetpack'
+      end
+
       def setup_enviroment
         @app.set :serve_assets, true
         @app.register Sinatra::AssetPack
@@ -29,20 +32,18 @@ module Padrino
 
         @app.assets {
           def mount_asset(prefix, assets)
-            if assets.respond_to?(:each)
-              assets.each {|asset| serve prefix, :from => asset} 
-            else
-              serve prefix, :from => assets
+            [*assets].flatten.each do |asset|
+              serve(prefix, :from => asset) if File.exists? asset
             end
           end
 
-          mount_asset js_prefix,    js_assets
-          mount_asset css_prefix,   css_assets
-          mount_asset image_prefix, image_assets
+          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) }
           if compression_enabled
-            js_compression  :uglify
+            js_compression  :jsmin
             css_compression :sass
           end
         }

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

@@ -1,11 +1,9 @@
-require 'sprockets'
-require 'uglifier'
-
 module Padrino
   module Pipeline 
     class Sprockets
 
       def initialize(app, config)
+        require_libraries
         @app       = app
         @config    = config
         setup_enviroment
@@ -13,6 +11,10 @@ module Padrino
       end
 
       private
+      def require_libraries
+        %w[sprockets uglifier].each { |package| require package }
+      end
+
       def paths
         js_assets    = @config.js_assets.kind_of?(Array)    ? @config.js_assets    : [@config.js_assets]
         css_assets   = @config.css_assets.kind_of?(Array)   ? @config.css_assets   : [@config.css_assets]

data/lib/padrino-pipeline/tasks.rb

@@ -0,0 +1,9 @@
+begin
+  require 'padrino-core/tasks'
+  ##
+  # Allows tasks to be added to the client Padrino application
+  if defined? Padrino::Tasks
+    Padrino::Tasks.files.concat(Dir["#{File.dirname(__FILE__)}/tasks/**/*.rb"])
+  end
+rescue LoadError
+end

data/lib/padrino-pipeline/tasks/pipeline_tasks.rb

@@ -0,0 +1,37 @@
+namespace :pipeline do
+  def load_apps
+    require File.expand_path('config/boot.rb', Rake.application.original_dir)
+  end
+
+  def send_to_pipeline(method, *args) 
+    Padrino.mounted_apps.each do |mounted_app|
+      app = mounted_app.app_obj
+      app.pipeline.send(method, *args) if app.pipeline?
+    end
+  end
+
+  desc "Compile javascript assets"
+  task :compile_js do
+    load_apps
+    send_to_pipeline(:compile, :js)
+  end
+
+  desc "Compile CSS assets"
+  task :compile_css do
+    load_apps
+    send_to_pipeline(:compile, :css)
+  end
+
+  desc "Clean javascipt assets"
+  task :clean_js do
+    load_apps
+    send_to_pipeline(:clean, :js)
+  end
+
+  desc "Clean CSS assets"
+  task :clean_css do
+    load_apps
+    send_to_pipeline(:clean, :css)
+  end
+
+end

data/lib/padrino-pipeline/version.rb

@@ -1,5 +1,5 @@
 module Padrino
   module Pipeline
-    VERSION = '0.2.2'
+    VERSION = '0.3.0'
   end
 end

data/padrino-pipeline.gemspec

@@ -2,6 +2,7 @@
 # encoding: utf-8
 
 require File.expand_path("../lib/padrino-pipeline/version.rb", __FILE__)
+require File.expand_path("../lib/padrino-pipeline/tasks.rb", __FILE__)
 
 Gem::Specification.new do |s|
   s.name = "padrino-pipeline"
@@ -16,7 +17,7 @@ Gem::Specification.new do |s|
   s.date = Time.now.strftime("%Y-%m-%d")
 
   s.extra_rdoc_files = Dir["*.rdoc"]
-  s.files         = `git ls-files`.split("\n")
+  s.files         = `git ls-files`.split("\n") | Dir.glob("{lib}/**/*")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
@@ -29,6 +30,5 @@ Gem::Specification.new do |s|
   s.add_dependency("sprockets", "~> 2.10.0")
   s.add_dependency("uglifier", "~> 2.1.0")
 
-  s.add_dependency("sinatra-assetpack", "~> 0.2.0")
-  s.add_dependency("padrino-core", "~> 0.11.0")
+  s.add_dependency("sinatra-assetpack", "~> 0.3.0")
 end

data/test/fixtures/asset_pack_app/asset_pack_app.rb

@@ -29,4 +29,15 @@ class AssetsAppAssetPackCustom < BaseApp
   end
 end
 
+class CustomPackagesAppDev < BaseApp
+  configure_assets do |config|
+    config.pipeline   = Padrino::Pipeline::AssetPack
+    
+    config.packages << [:js, :application, '/assets/javascripts/application.js', ['/assets/javascripts/*']]
+    config.packages << [:css, :application, '/assets/stylesheets/application.css', ['/assets/stylesheets/*']]
+
+  end
+
+end
+
 Padrino.load!

data/test/fixtures/sprockets_app/assets/javascripts/application.js

@@ -0,0 +1,2 @@
+//= require second_js_file
+//= require coffee

data/test/fixtures/sprockets_app/assets/javascripts/coffee.js.coffee

@@ -1 +1,3 @@
 cf = 'yes'
+coffee_method ->
+  true;

data/test/fixtures/sprockets_app/assets/javascripts/second_js_file.js

@@ -1 +1,2 @@
 var in_second_file;
+function in_second_file(){}

data/test/fixtures/sprockets_app/assets/stylesheets/application.css

@@ -1 +1,2 @@
 //= require second_file
+//= require sass

data/test/{extra → helpers}/helper.rb

@@ -1,17 +1,13 @@
-require File.join(File.dirname(__FILE__), 'mini_shoulda')
-require File.join(File.dirname(__FILE__), '..' , 'fixtures', 'sprockets_app', 'sprockets_app')
-
+$:.unshift File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
+$:.unshift File.expand_path(File.join(File.dirname(__FILE__), '..', '..','lib'))
 require 'rack/test'
-require 'webrat'
 require 'padrino-helpers'
+require File.expand_path(File.dirname(__FILE__) + '/mini_shoulda')
+require File.expand_path(File.dirname(__FILE__) + '/../fixtures/sprockets_app/sprockets_app')
 
 class MiniTest::Spec
   include Rack::Test::Methods
-  include Webrat::Methods
-  include Webrat::Matchers
-
-  Webrat.configure { |config| config.mode = :rack }
-
+  
   def mock_app(base=Padrino::Application, &block)
     @app = Sinatra.new(base, &block)
     @app.set :logging, false
@@ -48,13 +44,8 @@ end
  
 Object.class_eval { include(MiniTest::Spec::SharedExamples) }
 
-
-module Webrat
-  module Logging
-    def logger # @private
-      @logger = nil
-    end
-  end
+# Asserts that a file matches the pattern
+def assert_match_in_file(pattern, file)
+  assert File.exist?(file), "File '#{file}' does not exist!"
+  assert_match pattern, File.read(file)
 end
-
-

data/test/pipelines/asset_pack/test_packages.rb

@@ -0,0 +1,31 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../helpers/helper')
+require File.expand_path(File.dirname(__FILE__) + '/../../fixtures/asset_pack_app/asset_pack_app')
+
+describe :asset_pack_packages do
+  context :custom_package do
+    let(:app) { CustomPackagesAppDev }
+
+    it 'can serve a js asset pack' do
+      get '/assets/javascripts/app.js' 
+      assert_equal 200, last_response.status
+      assert_match 'mainApp', last_response.body
+    end
+
+    it 'can serve a css asset pack' do
+      get '/assets/stylesheets/app.css'
+      assert_equal 200, last_response.status
+      assert_match 'body', last_response.body
+    end
+
+    it 'can get application.js' do
+      get '/assets/javascripts/application.js'
+      assert_equal 200, last_response.status
+    end
+
+    it 'can get application.css' do
+      get '/assets/stylesheets/application.css'
+      assert_equal 200, last_response.status
+    end
+
+  end
+end

data/test/pipelines/sprockets/test_compiler.rb

@@ -0,0 +1,131 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../helpers/helper')
+require 'ostruct'
+
+describe Padrino::Pipeline::Compiler::Sprockets do
+  before do
+    @asset_path   = "#{fixture_path('sprockets_app')}/assets"
+    @public_path  = "#{fixture_path('sprockets_app')}/public"
+  end
+
+  after do
+    FileUtils.rm_rf @public_path
+  end
+
+  it 'creates a directory to put compiled assets' do
+    config   = OpenStruct.new(compiled_output: @public_path)
+    compiler = Padrino::Pipeline::Compiler::Sprockets.new(config)
+
+    compiler.compile(:js)
+    assert_equal true, File.exists?(@public_path)
+  end
+
+  it 'raises exception on incorrect compile type' do
+    skip
+    config   = OpenStruct.new( compiled_output: @public_path)
+    compiler = Padrino::Pipeline::Compiler::Sprockets.new(config)
+
+    assert_throws(RuntimeError) {  compiler.compile(:somehting) }
+  end
+
+  it 'creates the correct directory for javascripts' do
+    config_hash = { compiled_output: @public_path,  js_compiled_output: 'javascripts' }
+    config   = OpenStruct.new(config_hash)
+    compiler = Padrino::Pipeline::Compiler::Sprockets.new(config).compile(:js)
+    assert_equal true, File.exists?("#{@public_path}/javascripts")
+
+    config_hash = { compiled_output: @public_path,  js_compiled_output: 'javascripts-compiled' }
+    config   = OpenStruct.new(config_hash)
+    compiler = Padrino::Pipeline::Compiler::Sprockets.new(config).compile(:js)
+    assert_equal true, File.exists?("#{@public_path}/javascripts-compiled")
+  end
+
+  it 'creates the correct directory for stylesheets' do
+    config_hash = { compiled_output: @public_path,  css_compiled_output: 'stylesheets' }
+    config   = OpenStruct.new(config_hash)
+    compiler = Padrino::Pipeline::Compiler::Sprockets.new(config).compile(:css)
+    assert_equal true, File.exists?("#{@public_path}/stylesheets")
+
+    config_hash = { compiled_output: @public_path,  css_compiled_output: 'stylesheets-compiled' }
+    config   = OpenStruct.new(config_hash)
+    compiler = Padrino::Pipeline::Compiler::Sprockets.new(config).compile(:js)
+    assert_equal true, File.exists?("#{@public_path}/stylesheets-compiled")
+  end  
+
+  it 'cleans '
+
+  describe 'Custom compiler settings' do
+    let(:app) { rack_app }
+    before do 
+      asset_path, public_path = @asset_path, @public_path
+      mock_app do
+        register Padrino::Pipeline
+        register Padrino::Helpers
+
+        configure_assets do |assets|
+          assets.pipeline        = Padrino::Pipeline::Sprockets
+          assets.js_assets       = "#{asset_path}/javascripts"
+          assets.css_assets      = "#{asset_path}/stylesheets"
+          assets.compiled_output = "#{public_path}"
+        end
+
+        get('/js') { render :erb, "<%= javascript_include_tag 'application.js' %>" }
+        get('/css') { render :erb, "<%= stylesheet_link_tag 'application.css' %>" }
+      end
+    end
+
+    after { FileUtils.rm_rf "#{@public_path}/javascripts" }
+
+    context 'asset_tags' do
+      it 'should return javascript with the correct digest' do
+        @app.pipeline.compile :js
+
+        digest = @app.assets['application.js'].digest
+        get '/js'
+        assert_match "/assets/javascripts/application-#{digest}.js", last_response.body
+      end
+
+      it 'should return stylesheet with the correct digest' do
+        @app.pipeline.compile :css
+        digest = @app.assets['application.css'].digest
+        get '/css'
+        assert_match "/assets/stylesheets/application-#{digest}.css", last_response.body
+      end
+    end
+
+    context 'javascripts' do
+      it 'should compile application.js and application.js.gz' do
+        @app.pipeline.compile :js
+
+        digest = @app.assets['application.js'].digest
+        assert_equal true, File.exists?("#{@public_path}/javascripts/application-#{digest}.js")
+        assert_equal true, File.exists?("#{@public_path}/javascripts/application-#{digest}.js.gz")
+      end
+
+      it 'should compile files included in the manifest' do
+        @app.pipeline.compile :js
+
+        digest = @app.assets['application.js'].digest
+        assert_match_in_file 'function in_second_file()', "#{@public_path}/javascripts/application-#{digest}.js"
+        assert_match_in_file 'coffee_method', "#{@public_path}/javascripts/application-#{digest}.js"
+      end
+    end
+
+    context 'stylesheets' do
+      it 'should compile application.css and application.css.gz' do
+        @app.pipeline.compile :css
+
+        digest = @app.assets['application.css'].digest
+        assert_equal true, File.exists?("#{@public_path}/stylesheets/application-#{digest}.css")
+        assert_equal true, File.exists?("#{@public_path}/stylesheets/application-#{digest}.css.gz")
+      end
+
+      it 'should compile files included in the manifest' do
+        @app.pipeline.compile :css
+
+        digest = @app.assets['application.css'].digest
+        assert_match_in_file '.home', "#{@public_path}/stylesheets/application-#{digest}.css"
+        assert_match_in_file '.div', "#{@public_path}/stylesheets/application-#{digest}.css"
+      end
+    end
+  end
+end

data/test/{sprockets → pipelines/sprockets}/test_js.rb

@@ -1,8 +1,8 @@
-require File.expand_path(File.dirname(__FILE__) + '/../extra/helper')
-require File.expand_path(File.dirname(__FILE__) + '/../fixtures/sprockets_app/sprockets_app')
+require File.expand_path(File.dirname(__FILE__) + '/../../helpers/helper')
+require File.expand_path(File.dirname(__FILE__) + '/../../fixtures/sprockets_app/sprockets_app')
 
 
-describe 'Javascripts' do
+describe :sprockets_javascript do
   let(:app) { AssetsAppSprockets }
   context 'for //= require' do
     it 'picks up require statements' do
@@ -11,4 +11,4 @@ describe 'Javascripts' do
     end
   end
  
-end#describe
+end

data/test/test_asset_tag.rb

@@ -0,0 +1,52 @@
+require File.expand_path(File.dirname(__FILE__) + '/helpers/helper')
+
+shared_examples_for :pipeline do
+  describe :asset_tags do
+
+    context 'asset tags for #js #css #image' do
+      let(:app) { rack_app }
+      before :each do
+        assets_location = "#{fixture_path('sprockets_app')}/assets/javascripts"
+        public_path     = "#{fixture_path('sprockets_app')}/public"
+        pipeline = @pipeline
+        mock_app do
+          register Padrino::Pipeline
+          register Padrino::Helpers
+          configure_assets do |assets| 
+            assets.pipeline  = pipeline
+            assets.js_assets = [assets_location]
+          end
+          get('/js')    { render :erb, "<%= javascript_include_tag 'app.js' %>" }
+          get('/css')   { render :erb, "<%= stylesheet_link_tag 'app.css' %>" }
+          get('/image') { render :erb, "<%= image_tag 'image.png' %>" }
+        end  
+      end
+
+      it 'can use the default javascript_include_tag to resolve JS asset' do
+        get '/js'
+        assert_match '/assets/javascripts/app.js', last_response.body
+      end
+
+      it 'can use the default stylesheet_link_tag to resolve css asset' do
+        get '/css'
+        assert_match '/assets/stylesheets/app.css', last_response.body
+      end
+
+      it 'can use the default image_tag to resolve img asset' do
+        get '/image'
+        assert_match '/assets/images/image.png', last_response.body
+      end
+
+    end
+  end
+end
+
+describe Padrino::Pipeline::Sprockets do
+  before { @pipeline = Padrino::Pipeline::Sprockets }
+  it_behaves_like :pipeline
+end
+
+describe Padrino::Pipeline::AssetPack do
+  before { @pipeline = Padrino::Pipeline::AssetPack}
+  it_behaves_like :pipeline
+end

data/test/test_compiler.rb

@@ -0,0 +1,18 @@
+require File.expand_path(File.dirname(__FILE__) + '/helpers/helper')
+
+describe :configuration do
+  it 'can find the correct compiler' do
+    class SomeApp < Padrino::Application; end
+    config = Padrino::Pipeline::Configuration.new(SomeApp)
+
+    config.pipeline = Padrino::Pipeline::Sprockets.new(SomeApp, config)
+    assert_equal Padrino::Pipeline::Compiler::Sprockets, config.send(:match_compiler)
+
+    config.pipeline = Padrino::Pipeline::AssetPack.new(SomeApp, config)
+    assert_equal Padrino::Pipeline::Compiler::AssetPack, config.send(:match_compiler)
+
+    # config.pipeline = nil
+    # assert_equal nil, config.send(:match_compiler)
+  end
+
+end

data/test/{api/test_compression.rb → test_compression.rb}

@@ -1,7 +1,7 @@
-require File.expand_path(File.dirname(__FILE__) + '/../extra/helper')
+require File.expand_path(File.dirname(__FILE__) + '/helpers/helper')
 
-shared_examples_for 'A Pipeline' do
-  describe 'compression' do
+shared_examples_for :pipeline do
+  describe :asset_compression do
     let(:app) { rack_app }
     before do
       assets_location =  "#{fixture_path('asset_pack_app')}/assets/"
@@ -31,10 +31,10 @@ end
   
 describe Padrino::Pipeline::Sprockets do
   before { @pipeline = Padrino::Pipeline::Sprockets }
-  it_behaves_like 'A Pipeline'
+  it_behaves_like :pipeline
 end
 
 describe Padrino::Pipeline::AssetPack do
   before { @pipeline = Padrino::Pipeline::AssetPack}
-  it_behaves_like 'A Pipeline'
+  it_behaves_like :pipeline
 end

data/test/{api/test_css.rb → test_css.rb}

@@ -1,6 +1,6 @@
-require File.expand_path(File.dirname(__FILE__) + '/../extra/helper')
+require File.expand_path(File.dirname(__FILE__) + '/helpers/helper')
 
-shared_examples_for 'A Pipeline' do
+shared_examples_for :pipeline do
   describe 'default options' do
     let(:app) { rack_app }
     before do
@@ -93,12 +93,12 @@ end
 
 describe Padrino::Pipeline::Sprockets do
   before { @pipeline = Padrino::Pipeline::Sprockets }
-  it_behaves_like 'A Pipeline'
+  it_behaves_like :pipeline
 end
 
 describe Padrino::Pipeline::AssetPack do
   before { @pipeline = Padrino::Pipeline::AssetPack}
-  it_behaves_like 'A Pipeline'
+  it_behaves_like :pipeline
 end
 
 

data/test/{api/test_images.rb → test_images.rb}

@@ -1,6 +1,6 @@
-require File.expand_path(File.dirname(__FILE__) + '/../extra/helper')
+require File.expand_path(File.dirname(__FILE__) + '/helpers/helper')
 
-shared_examples_for 'A Pipeline' do
+shared_examples_for :pipeline do
   describe 'default options' do
     let(:app) { rack_app }
     before do
@@ -102,12 +102,12 @@ end
 
 describe Padrino::Pipeline::Sprockets do
   before { @pipeline = Padrino::Pipeline::Sprockets }
-  it_behaves_like 'A Pipeline'
+  it_behaves_like :pipeline
 end
 
 describe Padrino::Pipeline::AssetPack do
   before { @pipeline = Padrino::Pipeline::AssetPack}
-  it_behaves_like 'A Pipeline'
+  it_behaves_like :pipeline
 end
 
 

data/test/{api/test_js.rb → test_js.rb}

@@ -1,6 +1,6 @@
-require File.expand_path(File.dirname(__FILE__) + '/../extra/helper')
+require File.expand_path(File.dirname(__FILE__) + '/helpers/helper')
 
-shared_examples_for 'A Pipeline' do
+shared_examples_for :pipeline do
   describe 'default options' do
     let(:app) { rack_app }
     before do
@@ -100,12 +100,12 @@ end
 
 describe Padrino::Pipeline::Sprockets do
   before { @pipeline = Padrino::Pipeline::Sprockets }
-  it_behaves_like 'A Pipeline'
+  it_behaves_like :pipeline
 end
 
 describe Padrino::Pipeline::AssetPack do
   before { @pipeline = Padrino::Pipeline::AssetPack}
-  it_behaves_like 'A Pipeline'
+  it_behaves_like  :pipeline
 end
 
 

data/test/{api/test_other.rb → test_other.rb}

@@ -1,6 +1,6 @@
-require File.expand_path(File.dirname(__FILE__) + '/../extra/helper')
+require File.expand_path(File.dirname(__FILE__) + '/helpers/helper')
 
-shared_examples_for 'A Pipeline' do
+shared_examples_for :pipeline do
   describe 'non-default options' do
     let(:app) { rack_app }
     before do
@@ -38,10 +38,10 @@ end
 
 describe Padrino::Pipeline::Sprockets do
   before { @pipeline = Padrino::Pipeline::Sprockets }
-  it_behaves_like 'A Pipeline'
+  it_behaves_like :pipeline
 end
 
 describe Padrino::Pipeline::AssetPack do
   before { @pipeline = Padrino::Pipeline::AssetPack}
-  it_behaves_like 'A Pipeline'
+  it_behaves_like :pipeline
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: padrino-pipeline
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Sumeet Singh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-18 00:00:00.000000000 Z
+date: 2013-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: padrino-core
@@ -100,28 +100,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.0
-- !ruby/object:Gem::Dependency
-  name: padrino-core
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.11.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.3.0
 description: The Padrino asset management system allowing frictionless serving of
   assets
 email: ortuna@gmail.com
@@ -136,20 +122,16 @@ files:
 - README.md
 - Rakefile
 - lib/padrino-pipeline.rb
+- lib/padrino-pipeline/compilers/asset_pack.rb
+- lib/padrino-pipeline/compilers/sprockets.rb
 - lib/padrino-pipeline/configuration.rb
 - lib/padrino-pipeline/ext/padrino-helpers/asset_tag_helper.rb
 - lib/padrino-pipeline/pipelines/asset_pack.rb
 - lib/padrino-pipeline/pipelines/sprockets.rb
+- lib/padrino-pipeline/tasks.rb
+- lib/padrino-pipeline/tasks/pipeline_tasks.rb
 - lib/padrino-pipeline/version.rb
 - padrino-pipeline.gemspec
-- test/api/test_compression.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
 - test/fixtures/asset_pack_app/asset_pack_app.rb
 - test/fixtures/asset_pack_app/assets/css/meow.css
 - test/fixtures/asset_pack_app/assets/javascripts/app.js
@@ -160,6 +142,7 @@ files:
 - test/fixtures/asset_pack_app/assets/stylesheets/default.scss
 - test/fixtures/sprockets_app/assets/images/glass.png
 - test/fixtures/sprockets_app/assets/javascripts/app.js
+- test/fixtures/sprockets_app/assets/javascripts/application.js
 - test/fixtures/sprockets_app/assets/javascripts/coffee.js.coffee
 - test/fixtures/sprockets_app/assets/javascripts/second_js_file.js
 - test/fixtures/sprockets_app/assets/javascripts/unrequired.js
@@ -168,8 +151,18 @@ files:
 - test/fixtures/sprockets_app/assets/stylesheets/sass.scss
 - 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_js.rb
+- test/helpers/helper.rb
+- test/helpers/mini_shoulda.rb
+- test/pipelines/asset_pack/test_packages.rb
+- test/pipelines/sprockets/test_compiler.rb
+- test/pipelines/sprockets/test_js.rb
+- test/test_asset_tag.rb
+- test/test_compiler.rb
+- test/test_compression.rb
+- test/test_css.rb
+- test/test_images.rb
+- test/test_js.rb
+- test/test_other.rb
 homepage: http://www.padrinorb.com
 licenses: []
 metadata: {}
@@ -190,19 +183,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: padrino-pipeline
-rubygems_version: 2.0.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: The Padrino asset management system
 test_files:
-- test/api/test_compression.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
 - test/fixtures/asset_pack_app/asset_pack_app.rb
 - test/fixtures/asset_pack_app/assets/css/meow.css
 - test/fixtures/asset_pack_app/assets/javascripts/app.js
@@ -213,6 +198,7 @@ test_files:
 - test/fixtures/asset_pack_app/assets/stylesheets/default.scss
 - test/fixtures/sprockets_app/assets/images/glass.png
 - test/fixtures/sprockets_app/assets/javascripts/app.js
+- test/fixtures/sprockets_app/assets/javascripts/application.js
 - test/fixtures/sprockets_app/assets/javascripts/coffee.js.coffee
 - test/fixtures/sprockets_app/assets/javascripts/second_js_file.js
 - test/fixtures/sprockets_app/assets/javascripts/unrequired.js
@@ -221,6 +207,15 @@ test_files:
 - test/fixtures/sprockets_app/assets/stylesheets/sass.scss
 - 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_js.rb
-has_rdoc: 
+- test/helpers/helper.rb
+- test/helpers/mini_shoulda.rb
+- test/pipelines/asset_pack/test_packages.rb
+- test/pipelines/sprockets/test_compiler.rb
+- test/pipelines/sprockets/test_js.rb
+- test/test_asset_tag.rb
+- test/test_compiler.rb
+- test/test_compression.rb
+- test/test_css.rb
+- test/test_images.rb
+- test/test_js.rb
+- test/test_other.rb

data/test/asset_pack/test_packages.rb

@@ -1,61 +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 Packages' do
-  let(:app) { rack_app }
-
-  context 'for javascripts' do
-    it 'can serve an asset pack' do
-      mock_app do
-        register Padrino::Pipeline
-        configure_assets do |config|
-          config.pipeline   = Padrino::Pipeline::AssetPack
-          config.packages << [:js, :application, '/assets/javascripts/application.js', ['/assets/javascripts/*.js']]
-        end
-      end
-      get '/assets/javascripts/application.js' 
-      assert_equal 200, last_response.status
-    end
-
-    it 'can serve an asset pack from a non-standard location' do
-      mock_app do
-        register Padrino::Pipeline
-        configure_assets do |config|
-          config.pipeline   = Padrino::Pipeline::AssetPack
-          config.js_prefix  = '/meow/javascripts'
-          config.packages << [:js, :application, '/meow/javascripts/application.js', ['/assets/javascripts/*.js']]
-        end
-      end
-      get '/meow/javascripts/application.js' 
-      assert_equal 200, last_response.status
-    end
-  end
-
-  context 'for stylesheets' do
-    it 'can serve an asset pack' do
-      mock_app do
-        register Padrino::Pipeline
-        configure_assets do |config|
-          config.pipeline   = Padrino::Pipeline::AssetPack
-          config.packages << [:css, :application, '/assets/stylesheets/application.css', ['/assets/stylesheets/*.css']]
-        end
-      end
-      get '/assets/stylesheets/application.css' 
-      assert_equal 200, last_response.status
-    end
-
-    it 'can serve an asset pack from a non-standard location' do
-      mock_app do
-        register Padrino::Pipeline
-        configure_assets do |config|
-          config.pipeline   = Padrino::Pipeline::AssetPack
-          config.js_prefix  = '/meow/stylesheets'
-          config.packages << [:css, :application, '/meow/stylesheets/application.css', ['/assets/stylesheets/*.css']]
-        end
-      end
-      get '/meow/stylesheets/application.css' 
-      assert_equal 200, last_response.status
-    end
-  end
-
-end

data/test/sprockets/test_asset_tag.rb

@@ -1,27 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/../extra/helper')
-
-describe 'Asset tags' do
-
-  context 'javascript_include_tag' do
-    let(:app) { rack_app }
-
-    it 'can use the default javascript_include_tag to resolve JS asset' do
-      skip
-      assets_location = "#{fixture_path('sprockets_app')}/assets/javascripts"
-      mock_app do
-        register Padrino::Pipeline
-        register Padrino::Helpers
-        configure_assets do |assets| 
-          assets.pipeline  = Padrino::Pipeline::Sprockets
-          assets.js_assets = [assets_location]
-        end
-        get('/') { render :erb, "<%= javascript_include_tag 'app.js' %>" }
-      end
-
-      get '/'
-      assert_equal '/assets/javascripts/app.js', last_response.body
-    end
-
-  end
-end
-