rack-pipeline 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fbe84807caa12bb5e61db1e0265cf6738773dfe8
-  data.tar.gz: 2b32c7ca07cc0a78ca28d2dc26ee64513ee13cc6
+  metadata.gz: afe6a32a4e33df67af9184d8bb6776045d3a6311
+  data.tar.gz: cac12bca3ebd20ca96821e4fd81b2a403dccecb3
 SHA512:
-  metadata.gz: 85882ed222c507c7b341cdb7d4d35cf98f738761356f217d3772bd43b308d6b853c9862ee574a4f530f963168978dfc974895659e19b23cd046fcc070e4e1547
-  data.tar.gz: bd1791e0b871da0f89779b36336cb5c2a1f70c176d563de0bbdd54676d1f8c20815cccedaaaec4d25363951cefda73706d2c437b02471fb0bde838bab25f800e
+  metadata.gz: 4f695115376ef74ff9a39b81a09a491f04f4a0864884e96fa91bd19841f3c19cce7bb90d78406e04f88200be3d95bcb397bfe4c1dc35fd67cbeebe311aa43c02
+  data.tar.gz: 2382d1ef620099cc3d677caa5e7a4794a938d67a124e082218fcb52a58ee420d93b77ac9acc8e62684bdca5478f28c8ac888a55287ad77841204cf9494541d03

data/lib/rack-pipeline/base.rb

@@ -37,7 +37,7 @@ module RackPipeline
         },
       }
       @settings.merge!(args.pop)  if args.last.kind_of?(Hash)
-      create_temp_directory
+      ensure_temp_directory
       populate_pipelines
       @app = app
     end
@@ -47,6 +47,7 @@ module RackPipeline
     end
 
     def call(env)
+      @env = env
       env['rack-pipeline'] = self
       if file_path = prepare_pipe(env['PATH_INFO'])
         serve_file(file_path, env['HTTP_IF_MODIFIED_SINCE'])
@@ -60,15 +61,26 @@ module RackPipeline
 
     private
 
+    def busted?
+      result = settings[:bust_cache] && @busted
+      @busted = false
+      result
+    end
+
     def serve_file(file, mtime)
       headers = { 'Last-Modified' => File.mtime(file).httpdate }
       if mtime == headers['Last-Modified']
         [304, headers, []]
       else
-        body = File.read file
-        headers['Content-Type'] = "#{content_type(file)}; charset=#{body.encoding.to_s}"
-        headers['Content-Length'] = File.size(file).to_s
-        [200, headers, [body]]
+        if busted?
+          headers['Location'] = "#{@env['PATH_INFO']}?#{File.mtime(file).to_i}"
+          [302, headers, []]
+        else
+          body = File.read file
+          headers['Content-Type'] = "#{content_type(file)}; charset=#{body.encoding.to_s}"
+          headers['Content-Length'] = File.size(file).to_s
+          [200, headers, [body]]
+        end
       end
     rescue Errno::ENOENT
       raise MustRepopulate
@@ -95,7 +107,7 @@ module RackPipeline
           ready_file = combine(assets[type][pipename], File.basename(file))
         end
       end
-      compress(ready_file, ready_file)  if ready_file
+      compress(ready_file, File.basename(ready_file))  if ready_file
     rescue Errno::ENOENT
       raise MustRepopulate
     end
@@ -116,9 +128,11 @@ module RackPipeline
       static_type(file) ? :raw : :source
     end
 
-    def glob_files(dirs)
-      Dir.glob(dirs).sort.each_with_object({}) do |file,all|
-        all[file] = file_kind(file)
+    def glob_files(globs)
+      Array(globs).each_with_object({}) do |glob,all|
+        Dir.glob(glob).sort.each do |file|
+          all[file] = file_kind(file)
+        end
       end
     end
 

data/lib/rack-pipeline/caching.rb

@@ -4,32 +4,37 @@ require 'fileutils'
 module RackPipeline
   module Caching
     def cache_target(source, target)
-      target_path = File.join(settings[:temp], "#{File.basename(target)}.#{calculate_hash(source)}#{File.extname(target)}")
+      ensure_temp_directory
+      caller_method = caller.first[/`([^']*)'/, 1]
+      extname = File.extname(target)
+      target_filename = File.basename(target).sub(/[0-9a-f]{32}\./,'').chomp(extname) << '.' << caller_method
+      target_path = File.join(settings[:temp], target_filename + '.' << calculate_hash(source) << extname)
       if File.file?(target_path)
         target_path
       else
-        cleanup_cache(target)
+        cleanup_cache(target_filename << '.*' << extname)
         yield target_path
       end
     end
 
-    def create_temp_directory
-      temp = if settings[:temp]
-        settings[:temp]
-      else
+    def ensure_temp_directory
+      temp = settings[:temp]
+      return temp if temp.kind_of?(String) && File.directory?(temp)
+      unless temp
         require 'tmpdir'
-        File.join(Dir.tmpdir, 'RackPipeline')
+        temp = File.join(Dir.tmpdir, 'RackPipeline')
       end
       FileUtils.mkdir_p temp
       settings[:temp] = temp
     end
 
     def cleanup_cache(target)
-      FileUtils.rm Dir.glob(File.join(settings[:temp], File.basename(target)) + '.*')
+      @busted = true
+      FileUtils.rm Dir.glob(File.join(settings[:temp], target))
     end
 
     def calculate_hash(sources)
-      Digest::MD5.hexdigest(Array(sources).inject(''){ |all,(file,_)| all << "#{file}:#{File.mtime(file).to_i}" })
+      Digest::MD5.hexdigest(Array(sources).inject(''){ |all,(file,_)| all << file << File.mtime(file).to_i.to_s })
     end
   end
 end

data/lib/rack-pipeline/compressing.rb

@@ -1,3 +1,5 @@
+require 'fileutils'
+
 module RackPipeline
   module Compressing
     def self.process(source, target)
@@ -7,7 +9,8 @@ module RackPipeline
         Compressing.const_get(compressor[0]).process(source, target)
       else
         warn "no compressor found for #{source}"
-        source
+        FileUtils.cp source, target
+        target
       end
     end
 

data/lib/rack-pipeline/processing.rb

@@ -5,7 +5,7 @@ module RackPipeline
     def combine(sources, target)
       cache_target(sources, target) do |target_path|
         body = sources.inject('') do |all,(source,kind)|
-          all << "/* #{source} */\n\n" + File.read(prepare_file(source, static_type(target))).encode('utf-8') + "\n\n"
+          all << "/*!\n * #{source}\n */\n\n" + File.read(prepare_file(source, static_type(target))).encode('utf-8') + "\n\n"
         end
         File.write(target_path, body)
         target_path

data/lib/rack-pipeline/sinatra.rb

@@ -6,13 +6,13 @@ module RackPipeline
     end
 
     module Helpers
-      def pipeline(pipes = [ :app ], types = [ :css, :js ], opts = {})
+      def pipeline(pipes = [ :app ], types = [ :css, :js ], options = {})
         bust_cache = respond_to?(:settings) && settings.respond_to?(:pipeline) && settings.pipeline[:bust_cache]
-        pipeline_object = env['rack-pipeline']
+        @pipeline_object = env['rack-pipeline']
         Array(types).map do |type|
-          assets = pipeline_object.assets_for(pipes, type, opts)
+          assets = @pipeline_object.assets_for(pipes, type, options)
           assets.map do |asset|
-            pipe_tag(type, asset, bust_cache)
+            pipe_tag(type, asset + options[:postfix].to_s, bust_cache)
           end.join("\n")
         end.join("\n")
       end
@@ -28,20 +28,18 @@ module RackPipeline
       end
 
       def cache_buster(file)
-        if File.file?(file)
+        compress = respond_to?(:settings) && settings.respond_to?(:pipeline) && settings.pipeline[:compress]
+        if !compress && File.file?(file)
           "?#{File.mtime(file).to_i}"
         else
-          temp = if respond_to?(:settings) && settings.respond_to?(:pipeline) && settings.pipeline[:temp]
-            settings.pipeline[:temp]
-          else
-            require 'tmpdir'
-            File.join(Dir.tmpdir, 'RackPipeline')
+          temp = @pipeline_object.ensure_temp_directory
+          max_mtime = 0
+          Dir.glob(File.join(temp, File.basename(file,'.*') << '.*' << File.extname(file))).each do |cached_file|
+            mtime = File.mtime(cached_file).to_i
+            max_mtime = mtime if mtime > max_mtime
           end
-          mtimes = []
-          Dir.glob(File.join(temp,file+'.*')).each do |cached_file|
-            mtimes << File.mtime(cached_file).to_i
-          end
-          "?#{mtimes.max || Time.now.to_i}"
+          max_mtime = Time.now.to_i if max_mtime == 0
+          "?#{max_mtime}"
         end
       end
     end

data/lib/rack-pipeline/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-pipeline
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Igor Bochkariov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-09 00:00:00.000000000 Z
+date: 2014-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler