padrino-pipeline 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c780188a8a746db35ba46d78a7c8c940861c0fc3
-  data.tar.gz: 0a625506df07794e7f75b81ba6f63ab5cb98ceb9
+  metadata.gz: 51355e6890073fe98b47cfd007c47a2a985f8128
+  data.tar.gz: 7a7619821bf844b43092f2401be9a49eac4c2738
 SHA512:
-  metadata.gz: af6ff7d0500ed852640d8a5c7572776a2c21b5557181f304872bc0b83667a0ec02ebc7fe5b10bbc5812be59364567429a67f4a5bf55d08d761b94da7fdf6c73e
-  data.tar.gz: 4d1076133feb2a8a3727196eaf146d570cbbf2030ff48aba906cae12d9c9f07014c8f0340abbdd408cce2f336832047ea8258c998207edfda75ab9abf14ea755
+  metadata.gz: fdfbec1088e7d37651cb4eb31d8eb1c33c9c00c3aedb8caa339625b1813cde24edb24cdf047f03a9c0f28974f0429ddcbd636539cae56e3d79f9342c123156d7
+  data.tar.gz: 08acf1e4d8b5edf4db37161ab1d7b9f31e88ea0a878de87c0e6d13aa0841783f58a3a954b86a1d1e3110866b2cf6cde4c5fb72add47d5ad23a6acc624b730cfc

data/.travis.yml

@@ -6,7 +6,8 @@ install:
 rvm:
   - 1.9.3
   - 2.0.0
-  - jruby-19mode-1.7.4
+  - 2.1.0
+  - jruby-19mode
 branches:
   only:
     - master

data/README.md

@@ -1,17 +1,18 @@
-#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.
+# 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
+## Supported Pipelines
+
 - [sprockets](https://github.com/sstephenson/sprockets)
 - [sinatra-assetpack](https://github.com/rstacruz/sinatra-assetpack)
 
-##Simple Usage
+## Simple Usage
 
 ### Gemfile
 Add to your Gemfile:
@@ -92,7 +93,7 @@ module Example
   end
 end
 ```
-`/my_custom_location` will be the location css assets are served 
+`/my_custom_location` will be the location css assets are served
 e.g. `/my_custom_location/application.css`
 
 ###js_prefix
@@ -107,7 +108,7 @@ module Example
   end
 end
 ```
-`/js` will be the location css assets are served 
+`/js` will be the location css assets are served
 e.g. `/js/application.js`
 
 ## Asset location(path to files) String/Array
@@ -153,23 +154,27 @@ module Example
 end
 ```
 prefixes `/public` to all asset URLs.  Above example will serve assets from:
-- `/public/assets/stylesheets/application.css` 
+- `/public/assets/stylesheets/application.css`
   # => `http://localhost:3000/public/assets/stylesheets/application.css`
-- `/public/assets/javascripts/application.js` 
+- `/public/assets/javascripts/application.js`
   # => `http://localhost:3000/public/assets/javascripts/application.js`
 
 ## Default option values
+
 TODO
 
 ## compile asset rake tasks
-TODO
+
+Add `require 'padrino-pipeline/tasks'` to your Rakefile.
 
 ## Sprocket compiled assets
-`javascript_include_tag` & `stylesheet_link_tag` have been patched to include the hex digest of 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
     class App < Padrino::Application
@@ -181,7 +186,9 @@ e.g. `application-12abc456xyz.js` vs `application.js`
     end
   end
 ```
+
 Will serve /assets/javascripts/application.js as a bundle
 
 ## Sprocket directive require/include/require tree
+
 TODO

data/lib/padrino-pipeline.rb

@@ -4,6 +4,7 @@ require 'padrino-pipeline/compilers/sprockets'
 require 'padrino-pipeline/compilers/asset_pack'
 
 require 'padrino-pipeline/ext/padrino-helpers/asset_tag_helper'
+require 'padrino-pipeline/ext/asset-pack/helpers.rb'
 require 'padrino-pipeline/configuration'
 
 module Padrino

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

@@ -1,5 +1,5 @@
 module Padrino
-  module Pipeline 
+  module Pipeline
     module Compiler
       class Sprockets
         def initialize(config)
@@ -14,7 +14,16 @@ module Padrino
           case type
           when :js  then compile_js
           when :css then compile_css
-          else 
+          else
+            throw RuntimeError, "Can not compile #{type} asset"
+          end
+        end
+
+        def clean(type)
+          case type
+          when :js  then clean_js
+          when :css then clean_css
+          else
             throw RuntimeError, "Can not compile #{type} asset"
           end
         end
@@ -44,16 +53,30 @@ module Padrino
           compile_assets(:js, ['js', 'js.gz'])
         end
 
+        def clean_css
+          clean_assets(:css, ['css', 'css.gz'])
+        end
+
+        def clean_js
+          clean_assets(:js, ['js', 'js.gz'])
+        end
+
         def compile_assets(type, extensions = [])
-          asset  = assets[@config.send("#{type.to_s}_compiled_asset")]
+          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 clean_assets(type, extensions = [])
+          extensions.each do |ext|
+            FileUtils.rm Dir.glob(self.send("#{type.to_s}_output_path") + "application-*.#{ext}")
+          end
+        end
+
         def create_directory(path)
-          FileUtils.mkdir_p(path) unless File.exists?(path)
+          FileUtils.mkdir_p(path)
         end
       end
     end

data/lib/padrino-pipeline/configuration.rb

@@ -32,6 +32,10 @@ module Padrino
         asset_compiler.compile(*args)
       end
 
+      def clean(*args)
+        asset_compiler.clean(*args)
+      end
+
       def app_root
         @app.settings.root
       end
@@ -49,7 +53,8 @@ module Padrino
       end
 
       def serve_compressed?
-        enable_compression || PADRINO_ENV == "production"
+        env = (defined?(PADRINO_ENV) && PADRINO_ENV) || (defined?(RAKE_ENV) && RAKE_ENV)
+        enable_compression || env == "production"
       end
       
       def asset_compiler

data/lib/padrino-pipeline/ext/asset-pack/helpers.rb

@@ -0,0 +1,21 @@
+begin
+  require 'sinatra/assetpack/helpers.rb'
+
+  module Sinatra
+    module AssetPack
+      module Helpers
+
+        alias_method :original_image_path, :image_path
+        def image_path(source)
+          resolve_path(:images, source)
+        end
+
+      end
+    end
+  end
+
+rescue LoadError
+
+end
+
+

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

@@ -30,7 +30,7 @@ module Padrino
         packages            = self.packages
         compression_enabled = @config.serve_compressed?
 
-        @app.assets {
+        @app.assets do
           def mount_asset(prefix, assets)
             [*assets].flatten.each do |asset|
               serve(prefix, :from => asset) if File.exists? asset
@@ -46,8 +46,9 @@ module Padrino
             js_compression  :jsmin
             css_compression :sass
           end
-        }
+        end 
       end
+
     end
   end
 end

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

@@ -10,6 +10,12 @@ namespace :pipeline do
     end
   end
 
+  desc "Compile all assets"
+  task :compile => [:compile_js, :compile_css]
+
+  desc "Clean all assets"
+  task :clean => [:clean_js, :clean_css]
+
   desc "Compile javascript assets"
   task :compile_js do
     load_apps

data/lib/padrino-pipeline/version.rb

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

data/padrino-pipeline.gemspec

@@ -23,12 +23,12 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rdoc_options  = ["--charset=UTF-8"]
 
-  s.add_dependency("padrino-core", "~> 0.11.0")
-  s.add_dependency("padrino-helpers", "~> 0.11.0")
-  s.add_dependency("coffee-script", "~> 2.2.0")
-  s.add_dependency("sass", "~> 3.2.0")
-  s.add_dependency("sprockets", "~> 2.10.0")
-  s.add_dependency("uglifier", "~> 2.1.0")
-
-  s.add_dependency("sinatra-assetpack", "~> 0.3.0")
+  s.add_dependency("padrino-core", ">= 0.11")
+  s.add_dependency("padrino-helpers", ">= 0.11")
+  s.add_dependency("coffee-script", "~> 2.2")
+  s.add_dependency("sass", "~> 3.0")
+  s.add_dependency("uglifier", "~> 2.1")
+  
+  s.add_dependency("sprockets", "~> 2.11")
+  s.add_dependency("sinatra-assetpack", "~> 0.3")
 end

data/test/helpers/helper.rb

@@ -1,7 +1,9 @@
 $:.unshift File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
 $:.unshift File.expand_path(File.join(File.dirname(__FILE__), '..', '..','lib'))
+
 require 'rack/test'
 require 'padrino-helpers'
+require 'padrino-pipeline/ext/padrino-helpers/asset_tag_helper'
 require File.expand_path(File.dirname(__FILE__) + '/mini_shoulda')
 require File.expand_path(File.dirname(__FILE__) + '/../fixtures/sprockets_app/sprockets_app')
 

data/test/helpers/mini_shoulda.rb

@@ -41,4 +41,4 @@ class ColoredIO
   end
 end
 
-MiniTest::Unit.output = ColoredIO.new(MiniTest::Unit.output)
+#MiniTest::Unit.output = ColoredIO.new(MiniTest::Unit.output)

data/test/test_asset_tag.rb

@@ -7,7 +7,6 @@ shared_examples_for :pipeline 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

data/test/test_compression.rb

@@ -4,7 +4,7 @@ shared_examples_for :pipeline do
   describe :asset_compression do
     let(:app) { rack_app }
     before do
-      assets_location =  "#{fixture_path('asset_pack_app')}/assets/"
+      assets_location = "#{fixture_path('asset_pack_app')}/assets/"
       pipeline        = @pipeline
       mock_app do
         register Padrino::Pipeline
@@ -28,6 +28,52 @@ shared_examples_for :pipeline do
 
   end
 end
+
+describe :default_compression do
+  before do
+    class SomeApp < Padrino::Application; end
+    @config = Padrino::Pipeline::Configuration.new(SomeApp)
+
+    @warn_level = $VERBOSE
+    $VERBOSE    = nil
+
+    reset_consts
+  end
+
+  after do
+    $VERBOSE = @warn_level
+  end
+
+  def reset_consts
+    Object.send(:remove_const, :PADRINO_ENV) if defined? PADRINO_ENV
+    Object.send(:remove_const, :RACK_ENV) if defined? RACK_ENV
+  end
+
+  def in_env(env)
+    %w(PADRINO_ENV RAKE_ENV).each do |const|
+      Object.const_set(const, env)
+      yield
+    end
+  end
+
+  it 'serve_compressed? is false for test' do
+    in_env "test" do
+      refute @config.serve_compressed? 
+    end
+  end
+
+  it 'serve_compressed? is false for development' do
+    in_env "development" do
+      refute @config.serve_compressed? 
+    end
+  end
+
+  it 'serve_compressed? is true for production' do
+    in_env "production" do
+      assert @config.serve_compressed? 
+    end
+  end
+end
   
 describe Padrino::Pipeline::Sprockets do
   before { @pipeline = Padrino::Pipeline::Sprockets }
@@ -35,6 +81,6 @@ describe Padrino::Pipeline::Sprockets do
 end
 
 describe Padrino::Pipeline::AssetPack do
-  before { @pipeline = Padrino::Pipeline::AssetPack}
-  it_behaves_like :pipeline
+  before { @pipeline = Padrino::Pipeline::AssetPack }
+  it_behaves_like :pipeline 
 end

data/test/test_css.rb

@@ -6,7 +6,9 @@ shared_examples_for :pipeline do
     before do
       pipeline = @pipeline
       app_root = fixture_path('asset_pack_app')
-      mock_app do
+      base     = Padrino::Application
+      base     = Sinatra::Base if @pipeline == Padrino::Pipeline::AssetPack
+      mock_app(base) do
         set :root, app_root
         register Padrino::Pipeline
         configure_assets{ |c| c.pipeline = pipeline }
@@ -25,13 +27,11 @@ shared_examples_for :pipeline do
     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

data/test/test_images.rb

@@ -6,7 +6,9 @@ shared_examples_for :pipeline do
     before do
       pipeline = @pipeline
       app_root = fixture_path('sprockets_app')
-      mock_app do
+      base     = Padrino::Application
+      base     = Sinatra::Base if @pipeline == Padrino::Pipeline::AssetPack
+      mock_app(base) do
         set :root, app_root
         register Padrino::Pipeline
         configure_assets{ |c| c.pipeline = pipeline }
@@ -25,7 +27,6 @@ shared_examples_for :pipeline do
     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

data/test/test_js.rb

@@ -6,7 +6,9 @@ shared_examples_for :pipeline do
     before do
       pipeline = @pipeline
       app_root = fixture_path('asset_pack_app')
-      mock_app do
+      base     = Padrino::Application
+      base     = Sinatra::Base if @pipeline == Padrino::Pipeline::AssetPack
+      mock_app(base) do
         set :root, app_root
         register Padrino::Pipeline
         configure_assets{ |c| c.pipeline = pipeline }
@@ -31,14 +33,12 @@ shared_examples_for :pipeline do
     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

metadata

@@ -1,113 +1,113 @@
 --- !ruby/object:Gem::Specification
 name: padrino-pipeline
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Sumeet Singh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-04 00:00:00.000000000 Z
+date: 2014-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: padrino-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: '0.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: padrino-helpers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: '0.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: coffee-script
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: sprockets
+  name: uglifier
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: '2.1'
 - !ruby/object:Gem::Dependency
-  name: uglifier
+  name: sprockets
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '2.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '2.11'
 - !ruby/object:Gem::Dependency
   name: sinatra-assetpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: '0.3'
 description: The Padrino asset management system allowing frictionless serving of
   assets
 email: ortuna@gmail.com
@@ -115,8 +115,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -125,6 +125,7 @@ files:
 - lib/padrino-pipeline/compilers/asset_pack.rb
 - lib/padrino-pipeline/compilers/sprockets.rb
 - lib/padrino-pipeline/configuration.rb
+- lib/padrino-pipeline/ext/asset-pack/helpers.rb
 - lib/padrino-pipeline/ext/padrino-helpers/asset_tag_helper.rb
 - lib/padrino-pipeline/pipelines/asset_pack.rb
 - lib/padrino-pipeline/pipelines/sprockets.rb
@@ -168,22 +169,22 @@ licenses: []
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --charset=UTF-8
+- "--charset=UTF-8"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: padrino-pipeline
-rubygems_version: 2.0.3
+rubygems_version: 2.2.0.rc.1
 signing_key: 
 specification_version: 4
 summary: The Padrino asset management system