rack-pipeline 0.0.7 → 0.0.8

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NGMzODZiZDA2MWQwZmI0MjE3OGE1NDc2MGRhMjFhZDgzZjI5MDI5YQ==
-  data.tar.gz: !binary |-
-    YzA0ZGQ1NjU0ODA4YTFlMzcwOTcwYWI3MDBmYWVmN2VhY2M2NDU1NQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    ZDRhYzM1YjRjZDNkZTI3ZTczOWE5NTZhMzM1MTQ1YzUyZTg5Njg5N2YyYjRj
-    NDQ2OTBlODgzY2EzZTQwNTQwZGI4MzM1NjI0ZDk5Nzg4MGU3MGYyMmJjZDI3
-    NTQxOTNmMTMxNTUyZWE1ZjU2NmM0MWQyMmZhMzMwYTcyN2YxNjM=
-  data.tar.gz: !binary |-
-    YWExNzc0YzRhZGNkZTlmZDgxMDMwZDY1MWMwMTM1OWI5NmY4ZjBjN2JhOWI1
-    YWQ2NThjYWFlOThhZDMwYjQ0NDIzMGRmYjFiZTY3NzIxOWQ5MjZiOGViNDNk
-    OTUxMDA4ZjNjZTMyMTVjZWExOTgyZTVjOWRjM2ZhNGQzNTg1OWY=
+SHA1:
+  metadata.gz: 296420a355353f27d4acf162dc4b1190c8929d76
+  data.tar.gz: ab491a3ecd555cb76e354c32bde07ec0928a51f9
+SHA512:
+  metadata.gz: f4ac3afb4cd65c98415dce496c53dcacee63881f0e43ce684551555327d4790122cde98bbc4a4ec2b669947b1161d6969333c96de024c4f05205e42c80ddafe9
+  data.tar.gz: c260d5d346cfbb565a7a88c6031bdfde3b0ee6eb9ae8fcf0853548d054f6d151dc468831bcfdee8a4921e299c2a9580e0795ea252700f3ddffc2ce4851e853de

data/lib/rack-pipeline/base.rb

@@ -15,9 +15,9 @@ module RackPipeline
     STATIC_TYPES  = { '.js' => :js,                      '.css' => :css       }.freeze
     CONTENT_TYPES = { '.js' => 'application/javascript', '.css' => 'text/css' }.freeze
 
-    def assets_for( pipes, type, opts = {} )
+    def assets_for(pipes, type, opts = {})
       Array(pipes).inject([]) do |all,pipe|
-        all += Array( combine? ? "#{pipe}.#{type}" : assets[type][pipe].keys )
+        all += Array(combine? ? "#{pipe}.#{type}" : assets[type][pipe].keys)
       end.compact.uniq
     end
 
@@ -48,7 +48,7 @@ module RackPipeline
     def call(env)
       env['rack-pipeline'] = self
       if file_path = prepare_pipe(env['PATH_INFO'])
-        serve_file( file_path, env['HTTP_IF_MODIFIED_SINCE'] )
+        serve_file(file_path, env['HTTP_IF_MODIFIED_SINCE'])
       else
         @app.call(env)
       end
@@ -59,7 +59,7 @@ module RackPipeline
 
     private
 
-    def serve_file( file, mtime )
+    def serve_file(file, mtime)
       headers = { 'Last-Modified' => File.mtime(file).httpdate }
       if mtime == headers['Last-Modified']
         [304, headers, []]
@@ -73,7 +73,7 @@ module RackPipeline
       raise MustRepopulate
     end
 
-    def static_type( file )
+    def static_type(file)
       if file.kind_of? String
         STATIC_TYPES[file] || STATIC_TYPES[File.extname(file)]
       else
@@ -81,52 +81,53 @@ module RackPipeline
       end
     end
 
-    def content_type( file )
+    def content_type(file)
       CONTENT_TYPES[File.extname(file)] || 'text'
     end
 
-    def prepare_pipe( path_info )
-      file = path_info.sub( /^\/(.*)\??.*$/, '\1' )
+    def prepare_pipe(path_info)
+      file = path_info.sub(/^\/(.*)\??.*$/, '\1')
       type = static_type(file)  or return nil
       unless ready_file = get_or_compile(file, type)
         pipename = File.basename(file, '.*').to_sym
         if assets[type] && assets[type][pipename]
-          ready_file = combine( assets[type][pipename], File.basename(file) )
+          ready_file = combine(assets[type][pipename], File.basename(file))
         end
       end
-      compress ready_file
+      compress(ready_file, ready_file)  if ready_file
     rescue Errno::ENOENT
       raise MustRepopulate
     end
 
-    def get_or_compile( source, type )
+    def get_or_compile(source, type)
       result = nil
       assets[type].each do |pipe,files|
-        result = case files[source]
-        when :raw
-          source
-        when :source
-          compile( source, File.basename(source, '.*') + ".#{type}" )
-        end
+        result =
+          case files[source]
+          when :raw
+            source
+          when :source
+            compile(source, File.basename(source, '.*') + ".#{type}")
+          end
         break  if result
       end
       result
     end
 
-    def file_kind( file )
+    def file_kind(file)
       static_type(file) ? :raw : :source
     end
 
-    def extract_files( globs )
+    def extract_files(globs)
       Array(globs).each_with_object({}) do |glob,all|
         Dir.glob(glob).sort.each do |file|
-          all[file] = file_kind( file )
+          all[file] = file_kind(file)
         end
       end
     end
 
     def populate_pipelines
-      fail( SystemStackError, 'too many RackPipeline generations' )  if @generations > 5
+      fail SystemStackError, 'too many RackPipeline generations'  if @generations > 5
       @generations += 1
       STATIC_TYPES.each do |extname,type|
         pipes = settings[type]

data/lib/rack-pipeline/caching.rb

@@ -3,8 +3,8 @@ 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)}" )
+    def cache_target(source, target)
+      target_path = File.join(settings[:temp], "#{File.basename(target)}.#{calculate_hash(source)}#{File.extname(target)}")
       if File.file?(target_path)
         target_path
       else
@@ -18,18 +18,18 @@ module RackPipeline
         settings[:temp]
       else
         require 'tmpdir'
-        File.join( Dir.tmpdir, 'RackPipeline' )
+        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) ) + '.*' )
+    def cleanup_cache(target)
+      FileUtils.rm Dir.glob(File.join(settings[:temp], File.basename(target)) + '.*')
     end
 
-    def calculate_hash( sources )
-      Digest::MD5.hexdigest(Array(sources).inject(''){ |all,(file,_)| all << "#{file}:#{File.mtime(file)}" })
+    def calculate_hash(sources)
+      Digest::MD5.hexdigest(Array(sources).inject(''){ |all,(file,_)| all << "#{file}:#{File.mtime(file).to_i}" })
     end
   end
 end

data/lib/rack-pipeline/compiling.rb

@@ -1,6 +1,6 @@
 module RackPipeline
   module Compiling
-    def self.process( source, target )
+    def self.process(source, target)
       nil
     end
   end

data/lib/rack-pipeline/compressing.rb

@@ -1,6 +1,6 @@
 module RackPipeline
   module Compressing
-    def self.process( source, target )
+    def self.process(source, target)
       nil
     end
   end

data/lib/rack-pipeline/processing.rb

@@ -1,38 +1,32 @@
+require 'fileutils'
+
 module RackPipeline
   module Processing
     def combine?
       settings[:combine]
     end
 
-    def compress?
-      settings[:compress]
-    end
-
-    def combine( sources, target )
-      cache_target( sources, target ) do |target_path|
+    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"
         end
-        File.write( target_path, body )
+        File.write(target_path, body)
         target_path
       end
     end
 
-    def compress( source )
-      if compress? && defined?(Compressor)
-        Compressor.process source
-      else
-        source
+    def compress(source, target)
+      return source unless settings[:compress] && defined?(Compressor)
+      cache_target(source, target) do |target_path|
+        Compressor.process(source, target_path)
       end
     end
 
-    def compile( source, target )
-      cache_target( source, target ) do |target_path|
-        compiled_file = if defined? Compiler
-          Compiler.process source, target_path
-        end
-        raise LoadError, "compiler for #{source} => #{target}"  unless compiled_file
-        compiled_file
+    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)
       end
     end
   end

data/lib/rack-pipeline/sinatra.rb

@@ -4,17 +4,19 @@ module RackPipeline
       app.use RackPipeline::Base, app.respond_to?(:pipeline) ? app.pipeline : {}
       app.helpers Helpers
     end
+
     module Helpers
-      def pipeline( pipes = [ :app ], types = [ :css, :js ], opts = {} )
+      def pipeline(pipes = [ :app ], types = [ :css, :js ], opts = {})
         Array(types).map do |type|
-          assets = env['rack-pipeline'].assets_for( pipes, type, opts )
+          assets = env['rack-pipeline'].assets_for(pipes, type, opts)
           assets.map do |asset|
-            pipe_tag( type, asset )
+            pipe_tag(type, asset)
           end.join("\n")
         end.join("\n")
       end
 
-      def pipe_tag( type, asset )
+      def pipe_tag(type, asset)
+        asset += cache_buster(asset)
         case type.to_sym
         when :css
           %(<link href="#{request.script_name}/#{asset}" rel="stylesheet">)
@@ -22,6 +24,24 @@ module RackPipeline
           %(<script src="#{request.script_name}/#{asset}"></script>)
         end
       end
+
+      def cache_buster(file)
+        if 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')
+          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}"
+        end
+      end
     end
   end
 end

data/lib/rack-pipeline/version.rb

@@ -1,3 +1,3 @@
 module RackPipeline
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: rack-pipeline
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Igor Bochkariov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-20 00:00:00.000000000 Z
+date: 2014-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   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: minitest
   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: rack-test
   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: awesome_print
   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
@@ -87,8 +87,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -119,17 +119,17 @@ 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: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: A Rack middleware to serve javascript and stylesheet assets for ruby web