sprockets 3.6.0 → 3.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1eef394792f4af6343438fcc3666a88ca893348
-  data.tar.gz: 464e323e318b96534f12621a3f1a5dfc9a024425
+  metadata.gz: 395f97699c07aab98cec80882a5e7f3737aaaa6c
+  data.tar.gz: 30beb1d71c6bfa3c26472dc5d9e30a0e9d6a077f
 SHA512:
-  metadata.gz: 446a6718c9ae7f0e94e57672680c7bbb2233855000dd813d3dc1867d0d3c6f12f3dcb43abe21f9a72bfcc05bff7524b9030eb771c342d4ea65fdde1169887f21
-  data.tar.gz: e49c3925afb5988848f46439b1e9c3b5334932e599c13398f0a7a6a312dde2f228c0e679bd8fc898e80dd1861bc4fcfedfd807a9872b91b2af14be210870ab7d
+  metadata.gz: c7f9e96886a62cc1704af19e305beb4e6b1ae49cabcd2c23d3464d91694c1798920e9aba2658a1725e1628a0689d11ea83d03839e5254de21d81a9d13d1423da
+  data.tar.gz: 576f6ecb35fa61eeef7f14c22a8de476f916cd704865185abfd11170375df51058df781b4db57d98f463704ad6cf48b5f7a0af130648bfa5b26d8bac89d4eb2f

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+**3.6.1** (June 17, 2016)
+
+* Some performance improvements.
+
 **3.6.0** (April 6, 2016)
 
 * Add `Manifest#find_sources` to return the source of the compiled assets.

data/lib/sprockets/cache/file_store.rb

@@ -36,7 +36,6 @@ module Sprockets
       #            (default: 1000).
       def initialize(root, max_size = DEFAULT_MAX_SIZE, logger = self.class.default_logger)
         @root     = root
-        @size     = find_caches.inject(0) { |n, (_, stat)| n + stat.size }
         @max_size = max_size
         @gc_size  = max_size * 0.75
         @logger   = logger
@@ -107,11 +106,11 @@ module Sprockets
         # Write data
         PathUtils.atomic_write(path) do |f|
           f.write(raw)
-          @size += f.size unless exists
+          @size = size + f.size unless exists
         end
 
         # GC if necessary
-        gc! if @size > @max_size
+        gc! if size > @max_size
 
         value
       end
@@ -120,7 +119,7 @@ module Sprockets
       #
       # Returns String.
       def inspect
-        "#<#{self.class} size=#{@size}/#{@max_size}>"
+        "#<#{self.class} size=#{size}/#{@max_size}>"
       end
 
       private
@@ -138,6 +137,10 @@ module Sprockets
           }.sort_by { |_, stat| stat.mtime.to_i }
         end
 
+        def size
+          @size ||= compute_size(find_caches)
+        end
+
         def compute_size(caches)
           caches.inject(0) { |sum, (_, stat)| sum + stat.size }
         end

data/lib/sprockets/path_utils.rb

@@ -55,7 +55,9 @@ module Sprockets
       if File.directory?(path)
         entries = Dir.entries(path, :encoding => Encoding.default_internal)
         entries.reject! { |entry|
-          entry =~ /^\.|~$|^\#.*\#$/
+          entry.start_with?(".".freeze) ||
+            (entry.start_with?("#".freeze) && entry.end_with?("#".freeze)) ||
+            entry.end_with?("~".freeze)
         }
         entries.sort!
       else

data/lib/sprockets/uri_tar.rb

@@ -14,10 +14,8 @@ module Sprockets
       @env  = env
       uri   = uri.to_s
       if uri.include?("://".freeze)
-        uri_array = uri.split("://".freeze)
-        @scheme   = uri_array.shift
-        @scheme   << "://".freeze
-        @path     = uri_array.join("".freeze)
+        @scheme, _, @path = uri.partition("://".freeze)
+        @scheme << "://".freeze
       else
         @scheme = "".freeze
         @path   = uri

data/lib/sprockets/utils.rb

@@ -74,16 +74,19 @@ module Sprockets
     def string_end_with_semicolon?(str)
       i = str.size - 1
       while i >= 0
-        c = str[i]
+        c = str[i].ord
         i -= 1
-        if c == "\n" || c == " " || c == "\t"
-          next
-        elsif c != ";"
-          return false
-        else
-          return true
+
+        # Need to compare against the ordinals because the string can be UTF_8 or UTF_32LE encoded
+        # 0x0A == "\n"
+        # 0x20 == " "
+        # 0x09 == "\t"
+        # 0x3B == ";"
+        unless c == 0x0A || c == 0x20 || c == 0x09
+          return c === 0x3B
         end
       end
+
       true
     end
 
@@ -95,11 +98,21 @@ module Sprockets
     #
     # Returns buf String.
     def concat_javascript_sources(buf, source)
-      if buf.bytesize > 0
-        buf << ";" unless string_end_with_semicolon?(buf)
-        buf << "\n" unless buf.end_with?("\n")
+      if source.bytesize > 0
+        buf << source
+
+        # If the source contains non-ASCII characters, indexing on it becomes O(N).
+        # This will lead to O(N^2) performance in string_end_with_semicolon?, so we should use 32 bit encoding to make sure indexing stays O(1)
+        source = source.encode(Encoding::UTF_32LE) unless source.ascii_only?
+
+        if !string_end_with_semicolon?(source)
+          buf << ";\n"
+        elsif source[source.size - 1].ord != 0x0A
+          buf << "\n"
+        end
       end
-      buf << source
+
+      buf
     end
 
     # Internal: Prepends a leading "." to an extension if its missing.

data/lib/sprockets/version.rb

@@ -1,3 +1,3 @@
 module Sprockets
-  VERSION = "3.6.0"
+  VERSION = "3.6.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sprockets
 version: !ruby/object:Gem::Version
-  version: 3.6.0
+  version: 3.6.1
 platform: ruby
 authors:
 - Sam Stephenson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-06 00:00:00.000000000 Z
+date: 2016-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack