rack-pipeline 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7655da8b8d058c860f8952d72eb270802ea248f
-  data.tar.gz: b65170c885f0feff182cbbd60797a84a265511c5
+  metadata.gz: fbe84807caa12bb5e61db1e0265cf6738773dfe8
+  data.tar.gz: 2b32c7ca07cc0a78ca28d2dc26ee64513ee13cc6
 SHA512:
-  metadata.gz: 9bfae2e463038c6953805f4fd5b4ae86e9bda65b7c4bef3dba33fbe4ec66aac19051b85945bd60ce3c13dfec2ca1fb3e21678433cb47a538c37c821417ed1f5d
-  data.tar.gz: 9f4b2f11106557b550fa51c6d39acf2bfcb039a5f04a14569d888b4062352f610762d8275b26dbffe5e85a7c831c7fed247021dbcfb931209e6fe88417e25ec6
+  metadata.gz: 85882ed222c507c7b341cdb7d4d35cf98f738761356f217d3772bd43b308d6b853c9862ee574a4f530f963168978dfc974895659e19b23cd046fcc070e4e1547
+  data.tar.gz: bd1791e0b871da0f89779b36336cb5c2a1f70c176d563de0bbdd54676d1f8c20815cccedaaaec4d25363951cefda73706d2c437b02471fb0bde838bab25f800e

data/lib/rack-pipeline/base.rb

@@ -17,7 +17,7 @@ module RackPipeline
 
     def assets_for(pipes, type, opts = {})
       Array(pipes).inject([]) do |all,pipe|
-        all += Array(combine? ? "#{pipe}.#{type}" : assets[type][pipe].keys)
+        all += Array(settings[:combine] ? "#{pipe}.#{type}" : assets[type][pipe].keys)
       end.compact.uniq
     end
 
@@ -87,9 +87,9 @@ module RackPipeline
     end
 
     def prepare_pipe(path_info)
-      file = path_info.sub(/^\/(.*)\??.*$/, '\1')
+      file = path_info.start_with?('/') ? path_info[1..-1] : path_info
       type = static_type(file)  or return nil
-      unless ready_file = get_or_compile(file, type)
+      unless ready_file = prepare_file(file, type)
         pipename = File.basename(file, '.*').to_sym
         if assets[type] && assets[type][pipename]
           ready_file = combine(assets[type][pipename], File.basename(file))
@@ -100,30 +100,25 @@ module RackPipeline
       raise MustRepopulate
     end
 
-    def get_or_compile(source, type)
-      result = nil
+    def prepare_file(source, type)
       assets[type].each do |pipe,files|
-        result =
-          case files[source]
-          when :raw
-            source
-          when :source
-            compile(source, File.basename(source, '.*') + ".#{type}")
-          end
-        break  if result
+        case files[source]
+        when :raw
+          return source
+        when :source
+          return compile(source, File.basename(source, '.*') + ".#{type}")
+        end
       end
-      result
+      nil
     end
 
     def file_kind(file)
       static_type(file) ? :raw : :source
     end
 
-    def extract_files(globs)
-      Array(globs).each_with_object({}) do |glob,all|
-        Dir.glob(glob).sort.each do |file|
-          all[file] = file_kind(file)
-        end
+    def glob_files(dirs)
+      Dir.glob(dirs).sort.each_with_object({}) do |file,all|
+        all[file] = file_kind(file)
       end
     end
 
@@ -133,8 +128,8 @@ module RackPipeline
       STATIC_TYPES.each do |extname,type|
         pipes = settings[type]
         assets[type] = {}
-        pipes.each do |pipe, globs|
-          assets[type][pipe] = extract_files(globs)
+        pipes.each do |pipe, dirs|
+          assets[type][pipe] = glob_files(dirs)
         end
       end
     end

data/lib/rack-pipeline/compiling.rb

@@ -1,7 +1,23 @@
 module RackPipeline
   module Compiling
     def self.process(source, target)
-      nil
+      ext = File.extname source
+      if compiler = compilers[ext]
+        require compiler[1]
+        Compiling.const_get(compiler[0]).process(source, target)
+      else
+        fail LoadError, "no compiler for #{source} => #{target}"
+      end
+    end
+
+    def self.register(ext, klass, feature)
+      compilers[ext] = [klass, feature]
+    end
+
+    def self.compilers
+      @compilers ||= {}
     end
   end
 end
+
+RackPipeline::Compiling.register '.coffee', 'CoffeeScript', 'rack-pipeline/compiling/coffee-script'

data/lib/rack-pipeline/compiling/coffee-script.rb

@@ -0,0 +1,13 @@
+require 'coffee-script'
+
+module RackPipeline
+  module Compiling
+    module CoffeeScript
+      def self.process(source, target)
+        compiled = ::CoffeeScript.compile File.read(source)
+        File.write(target, compiled)
+        target
+      end
+    end
+  end
+end

data/lib/rack-pipeline/compressing.rb

@@ -1,7 +1,24 @@
 module RackPipeline
   module Compressing
     def self.process(source, target)
-      nil
+      ext = File.extname source
+      if compressor = compressors[ext]
+        require compressor[1]
+        Compressing.const_get(compressor[0]).process(source, target)
+      else
+        warn "no compressor found for #{source}"
+        source
+      end
+    end
+
+    def self.register(ext, klass, feature)
+      compressors[ext] = [klass, feature]
+    end
+
+    def self.compressors
+      @compressors ||= {}
     end
   end
 end
+
+RackPipeline::Compressing.register '.js', 'Uglifier', 'rack-pipeline/compressing/uglifier'

data/lib/rack-pipeline/compressing/uglifier.rb

@@ -0,0 +1,13 @@
+require 'uglifier'
+
+module RackPipeline
+  module Compressing
+    module Uglifier
+      def self.process(source, target)
+        compiled = ::Uglifier.compile File.read(source)
+        File.write(target, compiled)
+        target
+      end
+    end
+  end
+end

data/lib/rack-pipeline/processing.rb

@@ -2,14 +2,10 @@ require 'fileutils'
 
 module RackPipeline
   module Processing
-    def combine?
-      settings[:combine]
-    end
-
     def combine(sources, target)
       cache_target(sources, target) do |target_path|
         body = sources.inject('') do |all,(source,kind)|
-          all << File.read(get_or_compile(source, static_type(target))).encode('utf-8') + "\n\n"
+          all << "/* #{source} */\n\n" + File.read(prepare_file(source, static_type(target))).encode('utf-8') + "\n\n"
         end
         File.write(target_path, body)
         target_path
@@ -17,16 +13,15 @@ module RackPipeline
     end
 
     def compress(source, target)
-      return source unless settings[:compress] && defined?(Compressor)
+      return source unless settings[:compress]
       cache_target(source, target) do |target_path|
-        Compressor.process(source, target_path)
+        Compressing.process(source, target_path)
       end
     end
 
     def compile(source, target)
-      fail LoadError, "no compiler for #{source} => #{target}" unless defined?(Compiler)
       cache_target(source, target) do |target_path|
-        Compiler.process(source, target_path)
+        Compiling.process(source, target_path)
       end
     end
   end

data/lib/rack-pipeline/version.rb

@@ -1,3 +1,3 @@
 module RackPipeline
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

data/rack-pipeline.gemspec

@@ -22,4 +22,10 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'minitest'
   spec.add_development_dependency 'rack-test'
   spec.add_development_dependency 'awesome_print'
+
+  # compiling
+  spec.add_development_dependency 'coffee-script'
+
+  # compressing
+  spec.add_development_dependency 'uglifier'
 end

data/test/assets/javascripts/coffee.coffee

@@ -0,0 +1 @@
+a = (x) -> x * x

data/test/rack-pipeline_base_test.rb

@@ -4,7 +4,12 @@ require 'rack-pipeline/base'
 
 describe RackPipeline::Base do
   SETTINGS_1 = {}
-  SETTINGS_2 = {}
+  SETTINGS_2 = {
+    :compress => true,
+    :js => {
+      :coffee => 'assets/**/*.coffee',
+    }
+  }
 
   before do
     Dir.chdir File.dirname(__FILE__)
@@ -56,6 +61,11 @@ describe RackPipeline::Base do
     response.headers['Content-Type'].must_include 'application/javascript'
   end
 
+  it 'should properly compile and compress coffeescript' do
+    response = @r2.get('/coffee.js')
+    response.body.must_include '=function('
+  end
+
   after do
     FileUtils.rm_r( File.join( Dir.tmpdir, 'RackPipeline' ) )
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-pipeline
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Igor Bochkariov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-01 00:00:00.000000000 Z
+date: 2014-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: coffee-script
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: uglifier
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Asset pipeline for ruby Rack
 email:
 - ujifgc@gmail.com
@@ -97,13 +125,16 @@ files:
 - lib/rack-pipeline/base.rb
 - lib/rack-pipeline/caching.rb
 - lib/rack-pipeline/compiling.rb
+- lib/rack-pipeline/compiling/coffee-script.rb
 - lib/rack-pipeline/compressing.rb
+- lib/rack-pipeline/compressing/uglifier.rb
 - lib/rack-pipeline/processing.rb
 - lib/rack-pipeline/sinatra.rb
 - lib/rack-pipeline/version.rb
 - rack-pipeline.gemspec
 - test/assets/javascripts/a.js
 - test/assets/javascripts/b.js
+- test/assets/javascripts/coffee.coffee
 - test/assets/stylesheets/a.css
 - test/assets/stylesheets/b.css
 - test/minitest_helper.rb
@@ -129,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A Rack middleware to serve javascript and stylesheet assets for ruby web
@@ -137,6 +168,7 @@ summary: A Rack middleware to serve javascript and stylesheet assets for ruby we
 test_files:
 - test/assets/javascripts/a.js
 - test/assets/javascripts/b.js
+- test/assets/javascripts/coffee.coffee
 - test/assets/stylesheets/a.css
 - test/assets/stylesheets/b.css
 - test/minitest_helper.rb