Hello community, here is the log from the commit of package rubygem-sprockets for openSUSE:Factory checked in at 2015-05-11 19:39:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-sprockets (Old) and /work/SRC/openSUSE:Factory/.rubygem-sprockets.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rubygem-sprockets" Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-sprockets/rubygem-sprockets.changes 2015-05-02 21:34:21.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rubygem-sprockets.new/rubygem-sprockets.changes 2015-05-11 19:49:24.000000000 +0200 @@ -1,0 +2,6 @@ +Mon May 11 04:29:31 UTC 2015 - coolo@suse.com + +- updated to version 3.1.0 + no changelog found + +------------------------------------------------------------------- Old: ---- sprockets-3.0.3.gem New: ---- sprockets-3.1.0.gem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-sprockets.spec ++++++ --- /var/tmp/diff_new_pack.8vkQOV/_old 2015-05-11 19:49:25.000000000 +0200 +++ /var/tmp/diff_new_pack.8vkQOV/_new 2015-05-11 19:49:25.000000000 +0200 @@ -24,7 +24,7 @@ # Name: rubygem-sprockets -Version: 3.0.3 +Version: 3.1.0 Release: 0 %define mod_name sprockets %define mod_full_name %{mod_name}-%{version} ++++++ sprockets-3.0.3.gem -> sprockets-3.1.0.gem ++++++ Files old/checksums.yaml.gz and new/checksums.yaml.gz differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/sprockets/cache.rb new/lib/sprockets/cache.rb --- old/lib/sprockets/cache.rb 2015-04-28 04:24:58.000000000 +0200 +++ new/lib/sprockets/cache.rb 2015-05-10 21:29:32.000000000 +0200 @@ -60,7 +60,7 @@ # cache - A compatible backend cache store instance. def initialize(cache = nil, logger = self.class.default_logger) @cache_wrapper = get_cache_wrapper(cache) - @fetch_cache = Cache::MemoryStore.new(4096) + @fetch_cache = Cache::MemoryStore.new(1024) @logger = logger end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/sprockets/closure_compressor.rb new/lib/sprockets/closure_compressor.rb --- old/lib/sprockets/closure_compressor.rb 2015-04-28 04:24:58.000000000 +0200 +++ new/lib/sprockets/closure_compressor.rb 2015-05-10 21:29:32.000000000 +0200 @@ -1,4 +1,5 @@ require 'sprockets/autoload' +require 'sprockets/digest_utils' module Sprockets # Public: Closure Compiler minifier. @@ -35,19 +36,11 @@ def initialize(options = {}) @compiler = Autoload::Closure::Compiler.new(options) - @cache_key = [ - self.class.name, - Autoload::Closure::VERSION, - Autoload::Closure::COMPILER_VERSION, - VERSION, - options - ].freeze + @cache_key = "#{self.class.name}:#{Autoload::Closure::VERSION}:#{Autoload::Closure::COMPILER_VERSION}:#{VERSION}:#{DigestUtils.digest(options)}".freeze end def call(input) - input[:cache].fetch(@cache_key + [input[:data]]) do - @compiler.compile(input[:data]) - end + @compiler.compile(input[:data]) end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/sprockets/coffee_script_processor.rb new/lib/sprockets/coffee_script_processor.rb --- old/lib/sprockets/coffee_script_processor.rb 2015-04-28 04:24:58.000000000 +0200 +++ new/lib/sprockets/coffee_script_processor.rb 2015-05-10 21:29:32.000000000 +0200 @@ -12,12 +12,12 @@ VERSION = '1' def self.cache_key - @cache_key ||= [name, Autoload::CoffeeScript::Source.version, VERSION].freeze + @cache_key ||= "#{name}:#{Autoload::CoffeeScript::Source.version}:#{VERSION}".freeze end def self.call(input) data = input[:data] - input[:cache].fetch(self.cache_key + [data]) do + input[:cache].fetch([self.cache_key, data]) do Autoload::CoffeeScript.compile(data) end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/sprockets/digest_utils.rb new/lib/sprockets/digest_utils.rb --- old/lib/sprockets/digest_utils.rb 2015-04-28 04:24:58.000000000 +0200 +++ new/lib/sprockets/digest_utils.rb 2015-05-10 21:29:32.000000000 +0200 @@ -129,13 +129,10 @@ # Internal: Generate a "named information" URI for use in the `integrity` # attribute of an asset tag as per the subresource integrity specification. # - # digest - The String byte digest of the asset content. - # content_type - The content-type the asset will be served with. This *must* - # be accurate if provided. Otherwise, subresource integrity - # will block the loading of the asset. + # digest - The String byte digest of the asset content. # # Returns a String or nil if hash algorithm is incompatible. - def integrity_uri(digest, content_type = nil) + def integrity_uri(digest) case digest when Digest::Base digest_class = digest.class @@ -147,9 +144,7 @@ end if hash_name = NI_HASH_ALGORITHMS[digest_class] - uri = "ni:///#{hash_name};#{pack_urlsafe_base64digest(digest)}" - uri << "?ct=#{content_type}" if content_type - uri + "#{hash_name}-#{pack_base64digest(digest)}" end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/sprockets/eco_processor.rb new/lib/sprockets/eco_processor.rb --- old/lib/sprockets/eco_processor.rb 2015-04-28 04:24:58.000000000 +0200 +++ new/lib/sprockets/eco_processor.rb 2015-05-10 21:29:32.000000000 +0200 @@ -12,7 +12,7 @@ VERSION = '1' def self.cache_key - @cache_key ||= [name, Autoload::Eco::Source::VERSION, VERSION].freeze + @cache_key ||= "#{name}:#{Autoload::Eco::Source::VERSION}:#{VERSION}".freeze end # Compile template data with Eco compiler. @@ -24,7 +24,7 @@ # def self.call(input) data = input[:data] - input[:cache].fetch(cache_key + [data]) do + input[:cache].fetch([cache_key, data]) do Autoload::Eco.compile(data) end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/sprockets/ejs_processor.rb new/lib/sprockets/ejs_processor.rb --- old/lib/sprockets/ejs_processor.rb 2015-04-28 04:24:58.000000000 +0200 +++ new/lib/sprockets/ejs_processor.rb 2015-05-10 21:29:32.000000000 +0200 @@ -11,7 +11,7 @@ VERSION = '1' def self.cache_key - @cache_key ||= [name, VERSION].freeze + @cache_key ||= "#{name}:#{VERSION}".freeze end # Compile template data with EJS compiler. @@ -23,7 +23,7 @@ # def self.call(input) data = input[:data] - input[:cache].fetch(cache_key + [data]) do + input[:cache].fetch([cache_key, data]) do Autoload::EJS.compile(data) end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/sprockets/legacy.rb new/lib/sprockets/legacy.rb --- old/lib/sprockets/legacy.rb 2015-04-28 04:24:58.000000000 +0200 +++ new/lib/sprockets/legacy.rb 2015-05-10 21:29:32.000000000 +0200 @@ -128,6 +128,12 @@ cache.set(key, value) end + def normalize_logical_path(path) + dirname, basename = File.split(path) + path = dirname if basename == 'index' + path + end + private # Deprecated: Seriously. def matches_filter(filters, logical_path, filename) @@ -297,6 +303,16 @@ str !~ /\*|\*\*|\?|\[|\]|\{|\}/ end + def self.compute_alias_logical_path(path) + dirname, basename = File.split(path) + extname = File.extname(basename) + if File.basename(basename, extname) == 'index' + "#{dirname}#{extname}" + else + nil + end + end + # Deprecated: Filter logical paths in environment. Useful for selecting what # files you want to compile. # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/sprockets/loader.rb new/lib/sprockets/loader.rb --- old/lib/sprockets/loader.rb 2015-04-28 04:24:58.000000000 +0200 +++ new/lib/sprockets/loader.rb 2015-05-10 21:29:32.000000000 +0200 @@ -62,7 +62,6 @@ end logical_path, file_type, engine_extnames, _ = parse_path_extnames(logical_path) - logical_path = normalize_logical_path(logical_path) name = logical_path if pipeline = params[:pipeline] @@ -119,7 +118,7 @@ content_type: type, source: source, metadata: metadata, - integrity: integrity_uri(metadata[:digest], type), + integrity: integrity_uri(metadata[:digest]), dependencies_digest: digest(resolve_dependencies(metadata[:dependencies])) } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/sprockets/manifest.rb new/lib/sprockets/manifest.rb --- old/lib/sprockets/manifest.rb 2015-04-28 04:24:58.000000000 +0200 +++ new/lib/sprockets/manifest.rb 2015-05-10 21:29:32.000000000 +0200 @@ -169,6 +169,10 @@ } assets[asset.logical_path] = asset.digest_path + if alias_logical_path = self.class.compute_alias_logical_path(asset.logical_path) + assets[alias_logical_path] = asset.digest_path + end + target = File.join(dir, asset.digest_path) if File.exist?(target) @@ -230,9 +234,9 @@ # Sort by timestamp Time.parse(attrs['mtime']) }.reverse.each_with_index.drop_while { |(_, attrs), index| - age = [0, Time.now - Time.parse(attrs['mtime'])].max + _age = [0, Time.now - Time.parse(attrs['mtime'])].max # Keep if under age or within the count limit - age < age || index < count + _age < age || index < count }.each { |(path, _), _| # Remove old assets remove(path) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/sprockets/resolve.rb new/lib/sprockets/resolve.rb --- old/lib/sprockets/resolve.rb 2015-04-28 04:24:58.000000000 +0200 +++ new/lib/sprockets/resolve.rb 2015-05-10 21:29:32.000000000 +0200 @@ -151,12 +151,6 @@ accepts end - def normalize_logical_path(path) - dirname, basename = File.split(path) - path = dirname if basename == 'index' - path - end - def path_matches(load_path, logical_name, logical_basename) dirname = File.dirname(File.join(load_path, logical_name)) candidates = dirname_matches(dirname, logical_basename) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/sprockets/sass_compressor.rb new/lib/sprockets/sass_compressor.rb --- old/lib/sprockets/sass_compressor.rb 2015-04-28 04:24:58.000000000 +0200 +++ new/lib/sprockets/sass_compressor.rb 2015-05-10 21:29:32.000000000 +0200 @@ -1,4 +1,5 @@ require 'sprockets/autoload' +require 'sprockets/digest_utils' module Sprockets # Public: Sass CSS minifier. @@ -34,26 +35,17 @@ attr_reader :cache_key def initialize(options = {}) - @options = options - @cache_key = [ - self.class.name, - Autoload::Sass::VERSION, - VERSION, - options - ].freeze + @options = { + syntax: :scss, + cache: false, + read_cache: false, + style: :compressed + }.merge(options).freeze + @cache_key = "#{self.class.name}:#{Autoload::Sass::VERSION}:#{VERSION}:#{DigestUtils.digest(options)}".freeze end def call(input) - data = input[:data] - input[:cache].fetch(@cache_key + [data]) do - options = { - syntax: :scss, - cache: false, - read_cache: false, - style: :compressed - }.merge(@options) - Autoload::Sass::Engine.new(data, options).render - end + Autoload::Sass::Engine.new(input[:data], @options).render end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/sprockets/sass_processor.rb new/lib/sprockets/sass_processor.rb --- old/lib/sprockets/sass_processor.rb 2015-04-28 04:24:58.000000000 +0200 +++ new/lib/sprockets/sass_processor.rb 2015-05-10 21:29:32.000000000 +0200 @@ -44,12 +44,7 @@ # def initialize(options = {}, &block) @cache_version = options[:cache_version] - @cache_key = [ - self.class.name, - VERSION, - Autoload::Sass::VERSION, - @cache_version - ].freeze + @cache_key = "#{self.class.name}:#{VERSION}:#{Autoload::Sass::VERSION}:#{@cache_version}".freeze @functions = Module.new do include Functions diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/sprockets/uglifier_compressor.rb new/lib/sprockets/uglifier_compressor.rb --- old/lib/sprockets/uglifier_compressor.rb 2015-04-28 04:24:58.000000000 +0200 +++ new/lib/sprockets/uglifier_compressor.rb 2015-05-10 21:29:32.000000000 +0200 @@ -1,4 +1,5 @@ require 'sprockets/autoload' +require 'sprockets/digest_utils' module Sprockets # Public: Uglifier/Uglify compressor. @@ -44,20 +45,11 @@ end @uglifier = Autoload::Uglifier.new(options) - - @cache_key = [ - self.class.name, - Autoload::Uglifier::VERSION, - VERSION, - options - ].freeze + @cache_key = "#{self.class.name}:#{Autoload::Uglifier::VERSION}:#{VERSION}:#{DigestUtils.digest(options)}".freeze end def call(input) - data = input[:data] - input[:cache].fetch(@cache_key + [data]) do - @uglifier.compile(data) - end + @uglifier.compile(input[:data]) end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/sprockets/uri_utils.rb new/lib/sprockets/uri_utils.rb --- old/lib/sprockets/uri_utils.rb 2015-04-28 04:24:58.000000000 +0200 +++ new/lib/sprockets/uri_utils.rb 2015-05-10 21:29:32.000000000 +0200 @@ -17,9 +17,6 @@ # # pipeline - String name of pipeline. # - # encoding - A content encoding such as "gzip" or "deflate". NOT a charset - # like "utf-8". - # module URIUtils extend self diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/sprockets/version.rb new/lib/sprockets/version.rb --- old/lib/sprockets/version.rb 2015-04-28 04:24:58.000000000 +0200 +++ new/lib/sprockets/version.rb 2015-05-10 21:29:32.000000000 +0200 @@ -1,3 +1,3 @@ module Sprockets - VERSION = "3.0.3" + VERSION = "3.1.0" end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/sprockets/yui_compressor.rb new/lib/sprockets/yui_compressor.rb --- old/lib/sprockets/yui_compressor.rb 2015-04-28 04:24:58.000000000 +0200 +++ new/lib/sprockets/yui_compressor.rb 2015-05-10 21:29:32.000000000 +0200 @@ -1,4 +1,5 @@ require 'sprockets/autoload' +require 'sprockets/digest_utils' module Sprockets # Public: YUI compressor. @@ -35,12 +36,7 @@ def initialize(options = {}) @options = options - @cache_key = [ - self.class.name, - Autoload::YUI::Compressor::VERSION, - VERSION, - options - ].freeze + @cache_key = "#{self.class.name}:#{Autoload::YUI::Compressor::VERSION}:#{VERSION}:#{DigestUtils.digest(options)}".freeze end def call(input) @@ -48,15 +44,9 @@ case input[:content_type] when 'application/javascript' - key = @cache_key + [input[:content_type], input[:data]] - input[:cache].fetch(key) do - Autoload::YUI::JavaScriptCompressor.new(@options).compress(data) - end + Autoload::YUI::JavaScriptCompressor.new(@options).compress(data) when 'text/css' - key = @cache_key + [input[:content_type], input[:data]] - input[:cache].fetch(key) do - Autoload::YUI::CssCompressor.new(@options).compress(data) - end + Autoload::YUI::CssCompressor.new(@options).compress(data) else data end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/metadata new/metadata --- old/metadata 2015-04-28 04:24:58.000000000 +0200 +++ new/metadata 2015-05-10 21:29:32.000000000 +0200 @@ -1,7 +1,7 @@ --- !ruby/object:Gem::Specification name: sprockets version: !ruby/object:Gem::Version - version: 3.0.3 + version: 3.1.0 platform: ruby authors: - Sam Stephenson @@ -9,7 +9,7 @@ autorequire: bindir: bin cert_chain: [] -date: 2015-04-28 00:00:00.000000000 Z +date: 2015-05-10 00:00:00.000000000 Z dependencies: - !ruby/object:Gem::Dependency name: rack