padrino-pipeline 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ae583739b857e66675c501c51fb349afe552eb7
-  data.tar.gz: 6401ed2ffbe33dba531735a533f79b15b911e411
+  metadata.gz: 14f082abda1188fbc0576b04796503d7067fa9c6
+  data.tar.gz: bc74e3d743a9fc243caeaf39b911d6b008463da0
 SHA512:
-  metadata.gz: a3b001b81d9e56971e911575aaa4faec94da4859db068ceef9b52863bc576c9cb2e2af3ad8094edb5017f0dc4d3cc232ba1c35dadba5079359991b9004f92af1
-  data.tar.gz: 015dc113ce5d617544322d968807d5236e641c6041590e940e15b4881f71b6d5fd624094c4b8124a6c7e9e76fafd1ec8699a4247cead44b68d6300502796f137
+  metadata.gz: c923aab61e2b1c0a04143993cb9fe42114df3a2de17f8120ce4ab6c61354b0119dbeefab02674c6ee290463448d5372fa6abfd408dbab41d3dfc65d1a420dfbd
+  data.tar.gz: 52eb92c79db4d701ba3d7313e6d9f4cc5f32fc5fd4e04adc7ecbb89da72b58bd80a6d8fdfe4497d003eea9003d3f4075ab12e94dcdb960b6c722ee7163b69539

data/.travis.yml

@@ -8,7 +8,7 @@ rvm:
   - 1.9.3
   - 2.0.0
   - rbx-18mode
-  - jruby-19mode
+  - jruby-19mode-1.7.4
 branches:
   only:
     - master

data/Gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 gemspec 
 gem "rake"
-gem "nokogiri",  "~> 1.5.10"
+(RUBY_VERSION < "1.9") ? gem("nokogiri",  "~> 1.5.10") : gem("nokogiri",  "~> 1.6")
 
 group :test do
   gem "webrat",    ">= 0.5.1"

data/README.md

@@ -82,7 +82,18 @@ The following options can be set
 TODO
 
 ## Asset pack packages
-TODO
+```ruby
+  module Example
+    class App < Padrino::Application
+      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
+  end
+```
+Will serve /assets/javascripts/application.js as a bundle
 
 ## Sprocket directive require/include/require tree
 TODO

data/lib/padrino-pipeline/configuration.rb

@@ -0,0 +1,44 @@
+module Padrino
+  module Pipeline
+    class Configuration
+
+      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
+
+      def initialize(app)
+        @app          = app
+        @packages     = []
+        @image_prefix = '/assets/images'
+        @js_prefix    = '/assets/javascripts'
+        @css_prefix   = '/assets/stylesheets'
+
+        @image_assets = "#{app_root}/assets/images"
+        @js_assets    = "#{app_root}/assets/javascripts"
+        @css_assets   = "#{app_root}/assets/stylesheets"
+      end
+
+      def app_root
+        @app.settings.root
+      end
+
+      def image_prefix
+        "#{prefix || ''}#{@image_prefix}"
+      end
+
+      def js_prefix
+        "#{prefix || ''}#{@js_prefix}"
+      end
+
+      def css_prefix
+        "#{prefix || ''}#{@css_prefix}"
+      end
+
+      def serve_compressed?
+        enable_compression || PADRINO_ENV == "production"
+      end
+
+    end
+  end
+end

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

@@ -1,10 +1,8 @@
 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
@@ -24,9 +22,10 @@ module Padrino
       end
 
       def setup_pipeline
-        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
+        js_prefix, css_prefix, image_prefix = @config.js_prefix, @config.css_prefix, @config.image_prefix
+        js_assets, css_assets, image_assets = @config.js_assets, @config.css_assets, @config.image_assets
+        packages            = self.packages
+        compression_enabled = @config.serve_compressed?
 
         @app.assets {
           def mount_asset(prefix, assets)
@@ -41,10 +40,11 @@ module Padrino
           mount_asset css_prefix,   css_assets
           mount_asset image_prefix, image_assets
 
-          packages.each { |package| send(package.shift, *package) } 
-
-          js_compression  :uglify
-          css_compression :simple
+          packages.each { |package| send(package.shift, *package) }
+          if compression_enabled
+            js_compression  :uglify
+            css_compression :sass
+          end
         }
       end
     end

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

@@ -1,11 +1,9 @@
 require 'sprockets'
 require 'uglifier'
-require 'padrino-pipeline/pipelines/common'
 
 module Padrino
   module Pipeline 
     class Sprockets
-      include Padrino::Pipeline::Common
 
       def initialize(app, config)
         @app       = app
@@ -16,23 +14,26 @@ module Padrino
 
       private
       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    = @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]
+        image_assets = @config.image_assets.kind_of?(Array) ? @config.image_assets : [@config.image_assets]
         js_assets + css_assets + image_assets
       end
 
       def setup_sprockets
         paths.each { |path| @app.settings.assets.append_path path }
-        mount_js_assets    js_prefix 
-        mount_css_assets   css_prefix
-        mount_image_assets image_prefix
+        mount_js_assets    @config.js_prefix 
+        mount_css_assets   @config.css_prefix
+        mount_image_assets @config.image_prefix
       end
 
       def setup_enviroment
         @app.set :serve_assets, true
         @app.set :assets, ::Sprockets::Environment.new
-        @app.settings.assets.js_compressor  = Uglifier.new(:mangle => true)
+        if @config.serve_compressed?
+          @app.settings.assets.js_compressor   = Uglifier.new(:mangle => true)
+          @app.settings.assets.css_compressor  = :sass
+        end
       end
 
       def mount_image_assets(prefix)

data/lib/padrino-pipeline/version.rb

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

data/lib/padrino-pipeline.rb

@@ -1,7 +1,7 @@
 require 'padrino-pipeline/pipelines/sprockets'
 require 'padrino-pipeline/pipelines/asset_pack'
 require 'padrino-pipeline/ext/padrino-helpers/asset_tag_helper'
-require 'ostruct'
+require 'padrino-pipeline/configuration'
 
 module Padrino
   ##
@@ -9,8 +9,7 @@ module Padrino
   module Pipeline
 
     def configure_assets(&block)
-      assets = OpenStruct.new
-      assets.packages = []
+      assets = Padrino::Pipeline::Configuration.new(self)
       yield assets if block_given?
       assets.pipeline.new(self, assets)
     end

data/test/api/test_compression.rb

@@ -0,0 +1,40 @@
+require File.expand_path(File.dirname(__FILE__) + '/../extra/helper')
+
+shared_examples_for 'A Pipeline' do
+  describe 'compression' do
+    let(:app) { rack_app }
+    before do
+      assets_location =  "#{fixture_path('asset_pack_app')}/assets/"
+      pipeline        = @pipeline
+      mock_app do
+        register Padrino::Pipeline
+        configure_assets do |config|
+          config.pipeline   = pipeline
+          config.css_assets = "#{assets_location}/stylesheets"
+          config.js_assets  = "#{assets_location}/javascripts"
+        end
+      end
+    end
+
+    it 'should not compress css in development mode' do
+      get '/assets/stylesheets/app.css'
+      assert_match "body {\n", last_response.body
+    end
+
+    it 'should not compress js in development mode' do
+      get '/assets/javascripts/app.js'
+      assert_match "function test() {\n", last_response.body
+    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_css.rb

@@ -21,7 +21,7 @@ shared_examples_for 'A Pipeline' do
     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
+      assert_match ".content", last_response.body
     end
 
     it 'can not get a file other than .css' do

data/test/fixtures/asset_pack_app/assets/javascripts/app.js

@@ -1 +1,4 @@
 var mainApp = true;
+function test() {
+  
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: padrino-pipeline
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Sumeet Singh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-11 00:00:00.000000000 Z
+date: 2013-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: padrino-core
@@ -136,12 +136,13 @@ files:
 - README.md
 - Rakefile
 - lib/padrino-pipeline.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/common.rb
 - lib/padrino-pipeline/pipelines/sprockets.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
@@ -194,6 +195,7 @@ 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

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

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