Hello community, here is the log from the commit of package rubygem-sprockets for openSUSE:Factory checked in at 2015-05-02 21:34:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-04-25 11:25:43.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rubygem-sprockets.new/rubygem-sprockets.changes 2015-05-02 21:34:21.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Apr 28 07:48:46 UTC 2015 - coolo@suse.com + +- updated to version 3.0.3 + no changelog found + +------------------------------------------------------------------- Old: ---- sprockets-3.0.2.gem New: ---- sprockets-3.0.3.gem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-sprockets.spec ++++++ --- /var/tmp/diff_new_pack.ZszobT/_old 2015-05-02 21:34:22.000000000 +0200 +++ /var/tmp/diff_new_pack.ZszobT/_new 2015-05-02 21:34:22.000000000 +0200 @@ -24,7 +24,7 @@ # Name: rubygem-sprockets -Version: 3.0.2 +Version: 3.0.3 Release: 0 %define mod_name sprockets %define mod_full_name %{mod_name}-%{version} ++++++ sprockets-3.0.2.gem -> sprockets-3.0.3.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/errors.rb new/lib/sprockets/errors.rb --- old/lib/sprockets/errors.rb 2015-04-23 07:01:53.000000000 +0200 +++ new/lib/sprockets/errors.rb 2015-04-28 04:24:58.000000000 +0200 @@ -8,5 +8,4 @@ class ConversionError < NotFound; end class FileNotFound < NotFound; end class FileOutsidePaths < NotFound; end - class VersionNotFound < NotFound; end end 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-23 07:01:53.000000000 +0200 +++ new/lib/sprockets/loader.rb 2015-04-28 04:24:58.000000000 +0200 @@ -26,8 +26,13 @@ def load(uri) filename, params = parse_asset_uri(uri) if params.key?(:id) - asset = cache.fetch("asset-uri:#{VERSION}#{uri}") do - load_asset_by_id_uri(uri, filename, params) + unless asset = cache.get("asset-uri:#{VERSION}:#{uri}", true) + id = params.delete(:id) + uri_without_id = build_asset_uri(filename, params) + asset = load_asset_by_uri(uri_without_id, filename, params) + if asset[:id] != id + @logger.warn "Sprockets load error: Tried to find #{uri}, but latest was id #{asset[:id]}" + end end else asset = fetch_asset_from_dependency_cache(uri, filename) do |paths| @@ -45,28 +50,7 @@ end private - def load_asset_by_id_uri(uri, filename, params) - # Internal assertion, should be routed through load_asset_by_uri - unless id = params.delete(:id) - raise ArgumentError, "expected uri to have an id: #{uri}" - end - - uri = build_asset_uri(filename, params) - asset = load_asset_by_uri(uri, filename, params) - - if id && asset[:id] != id - raise VersionNotFound, "could not find specified id: #{uri}##{id}" - end - - asset - end - def load_asset_by_uri(uri, filename, params) - # Internal assertion, should be routed through load_asset_by_id_uri - if params.key?(:id) - raise ArgumentError, "expected uri to have no id: #{uri}" - end - unless file?(filename) raise FileNotFound, "could not find file: #{filename}" end @@ -118,6 +102,7 @@ length: source.bytesize ) else + dependencies << build_file_digest_uri(filename) metadata = { digest: file_digest(filename), length: self.stat(filename).size, @@ -145,11 +130,12 @@ asset[:mtime] = metadata[:dependencies].map { |u| if u.start_with?("file-digest:") s = self.stat(parse_file_digest_uri(u)) - s ? s.mtime.to_i : 1211698800 + s ? s.mtime.to_i : nil else - 1211698800 + nil end - }.max + }.compact.max + asset[:mtime] ||= self.stat(filename).mtime.to_i cache.set("asset-uri:#{VERSION}:#{asset[:uri]}", asset, true) cache.set("asset-uri-digest:#{VERSION}:#{uri}:#{asset[:dependencies_digest]}", asset[:uri], true) 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-23 07:01:53.000000000 +0200 +++ new/lib/sprockets/version.rb 2015-04-28 04:24:58.000000000 +0200 @@ -1,3 +1,3 @@ module Sprockets - VERSION = "3.0.2" + VERSION = "3.0.3" end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/metadata new/metadata --- old/metadata 2015-04-23 07:01:53.000000000 +0200 +++ new/metadata 2015-04-28 04:24:58.000000000 +0200 @@ -1,7 +1,7 @@ --- !ruby/object:Gem::Specification name: sprockets version: !ruby/object:Gem::Version - version: 3.0.2 + version: 3.0.3 platform: ruby authors: - Sam Stephenson @@ -9,7 +9,7 @@ autorequire: bindir: bin cert_chain: [] -date: 2015-04-23 00:00:00.000000000 Z +date: 2015-04-28 00:00:00.000000000 Z dependencies: - !ruby/object:Gem::Dependency name: rack