bpm 0.1.4 → 1.0.0.beta.4

data/vendor/sprockets/lib/sprockets/static_asset.rb

@@ -7,6 +7,11 @@ module Sprockets
   # any processing or concatenation. These are typical images and
   # other binary files.
   class StaticAsset < Asset
+    # Define extra attributes to be serialized.
+    def self.serialized_attributes
+      super + %w( content_type mtime length digest )
+    end
+
     def initialize(environment, logical_path, pathname, digest = nil)
       super(environment, logical_path, pathname)
       @digest = digest
@@ -22,11 +27,6 @@ module Sprockets
     # Checks if Asset is fresh by comparing the actual mtime and
     # digest to the inmemory model.
     def fresh?
-      # Check if environment has changed first
-      if environment.digest.hexdigest != environment_hexdigest
-        return false
-      end
-
       # Check current mtime and digest
       dependency_fresh?('path' => pathname, 'mtime' => mtime, 'hexdigest' => digest)
     end
@@ -81,7 +81,6 @@ module Sprockets
         mtime
         length
         digest
-        environment_hexdigest
       end
   end
 end

data/vendor/sprockets/lib/sprockets/static_compilation.rb

@@ -35,10 +35,10 @@ module Sprockets
         files.each do |logical_path|
           if path.is_a?(Regexp)
             # Match path against `Regexp`
-            next unless path.match(logical_path.to_s)
+            next unless path.match(logical_path)
           else
             # Otherwise use fnmatch glob syntax
-            next unless logical_path.fnmatch(path.to_s)
+            next unless File.fnmatch(path.to_s, logical_path)
           end
 
           if asset = find_asset(logical_path)
@@ -59,21 +59,13 @@ module Sprockets
       end
     end
 
-    protected
-      def compute_digest
-        # Add static root to environment digest
-        super.update(static_root.to_s)
-      end
-
     private
       # Get all reachable files in environment path
       def files
         files = Set.new
         paths.each do |base_path|
-          base_pathname = Pathname.new(base_path)
-          Dir["#{base_pathname}/**/*"].each do |filename|
-            logical_path = Pathname.new(filename).relative_path_from(base_pathname)
-            files << attributes_for(logical_path).without_engine_extensions
+          Dir["#{base_path}/**/*"].each do |filename|
+            files << attributes_for(filename).logical_path
           end
         end
         files

data/vendor/sprockets/lib/sprockets/trail.rb

@@ -70,7 +70,8 @@ module Sprockets
     def resolve(logical_path, options = {})
       # If a block is given, preform an iterable search
       if block_given?
-        trail.find(logical_path.to_s, attributes_for(logical_path).index_path, options) do |path|
+        args = attributes_for(logical_path).search_paths + [options]
+        trail.find(*args) do |path|
           yield Pathname.new(path)
         end
       else

data/vendor/sprockets/test/fixtures/default/with_data_uri.css.erb

@@ -0,0 +1,3 @@
+body {
+  background-image: url(<%= asset_data_uri 'blank.gif' %>) no-repeat;
+}

data/vendor/sprockets/test/test_asset.rb

@@ -110,18 +110,12 @@ class StaticAssetTest < Sprockets::TestCase
     assert @asset.fresh?
   end
 
-  test "asset is stale if its environment has changed" do
-    assert @asset.fresh?
-    @env.prepend_path fixture_path('default')
-    assert @asset.stale?
-  end
-
   test "asset is fresh if its mtime is changed but its contents is the same" do
-    filename = fixture_path('asset/POW.png')
+    filename = fixture_path('asset/test-POW.png')
 
     sandbox filename do
       File.open(filename, 'w') { |f| f.write "a" }
-      asset = @env['POW.png']
+      asset = @env['test-POW.png']
 
       assert asset.fresh?
 
@@ -406,13 +400,6 @@ class BundledAssetTest < Sprockets::TestCase
     assert asset("application.js").fresh?
   end
 
-  test "asset is stale if its environment has changed" do
-    asset = asset("application.js")
-    assert asset.fresh?
-    @env.prepend_path fixture_path("default")
-    assert asset.stale?
-  end
-
   test "asset is stale when its contents has changed" do
     filename = fixture_path('asset/test.js')
 
@@ -464,6 +451,125 @@ class BundledAssetTest < Sprockets::TestCase
     end
   end
 
+  test "asset is stale when one of its dependencies is modified" do
+    main = fixture_path('asset/test-main.js')
+    dep  = fixture_path('asset/test-dep.js')
+
+    sandbox main, dep do
+      File.open(main, 'w') { |f| f.write "//= depend_on test-dep\n" }
+      File.open(dep, 'w') { |f| f.write "a;" }
+      asset = @env['test-main.js']
+
+      assert asset.fresh?
+
+      File.open(dep, 'w') { |f| f.write "b;" }
+      mtime = Time.now + 1
+      File.utime(mtime, mtime, dep)
+
+      assert asset.stale?
+    end
+  end
+
+  test "asset is stale when one of its asset dependencies is modified" do
+    main = fixture_path('asset/test-main.js')
+    dep  = fixture_path('asset/test-dep.js')
+
+    sandbox main, dep do
+      File.open(main, 'w') { |f| f.write "//= depend_on_asset test-dep\n" }
+      File.open(dep, 'w') { |f| f.write "a;" }
+      asset = @env['test-main.js']
+
+      assert asset.fresh?
+
+      File.open(dep, 'w') { |f| f.write "b;" }
+      mtime = Time.now + 1
+      File.utime(mtime, mtime, dep)
+
+      assert asset.stale?
+    end
+  end
+
+  test "asset is stale when one of its source files dependencies is modified" do
+    a = fixture_path('asset/test-a.js')
+    b = fixture_path('asset/test-b.js')
+    c = fixture_path('asset/test-c.js')
+
+    sandbox a, b, c do
+      File.open(a, 'w') { |f| f.write "//= require test-b\n" }
+      File.open(b, 'w') { |f| f.write "//= require test-c\n" }
+      File.open(c, 'w') { |f| f.write "c;" }
+      asset_a = @env['test-a.js']
+      asset_b = @env['test-b.js']
+      asset_c = @env['test-c.js']
+
+      assert asset_a.fresh?
+      assert asset_b.fresh?
+      assert asset_c.fresh?
+
+      File.open(c, 'w') { |f| f.write "x;" }
+      mtime = Time.now + 1
+      File.utime(mtime, mtime, c)
+
+      assert asset_a.stale?
+      assert asset_b.stale?
+      assert asset_c.stale?
+    end
+  end
+
+  test "asset is stale when one of its dependency dependencies is modified" do
+    a = fixture_path('asset/test-a.js')
+    b = fixture_path('asset/test-b.js')
+    c = fixture_path('asset/test-c.js')
+
+    sandbox a, b, c do
+      File.open(a, 'w') { |f| f.write "//= require test-b\n" }
+      File.open(b, 'w') { |f| f.write "//= depend_on test-c\n" }
+      File.open(c, 'w') { |f| f.write "c;" }
+      asset_a = @env['test-a.js']
+      asset_b = @env['test-b.js']
+      asset_c = @env['test-c.js']
+
+      assert asset_a.fresh?
+      assert asset_b.fresh?
+      assert asset_c.fresh?
+
+      File.open(c, 'w') { |f| f.write "x;" }
+      mtime = Time.now + 1
+      File.utime(mtime, mtime, c)
+
+      assert asset_a.stale?
+      assert asset_b.stale?
+      assert asset_c.stale?
+    end
+  end
+
+  test "asset is stale when one of its asset dependency dependencies is modified" do
+    a = fixture_path('asset/test-a.js')
+    b = fixture_path('asset/test-b.js')
+    c = fixture_path('asset/test-c.js')
+
+    sandbox a, b, c do
+      File.open(a, 'w') { |f| f.write "//= depend_on_asset test-b\n" }
+      File.open(b, 'w') { |f| f.write "//= depend_on_asset test-c\n" }
+      File.open(c, 'w') { |f| f.write "c;" }
+      asset_a = @env['test-a.js']
+      asset_b = @env['test-b.js']
+      asset_c = @env['test-c.js']
+
+      assert asset_a.fresh?
+      assert asset_b.fresh?
+      assert asset_c.fresh?
+
+      File.open(c, 'w') { |f| f.write "x;" }
+      mtime = Time.now + 1
+      File.utime(mtime, mtime, c)
+
+      assert asset_a.stale?
+      assert asset_b.stale?
+      assert asset_c.stale?
+    end
+  end
+
   test "asset if stale if once of its source files is removed" do
     main = fixture_path('asset/test-main.js')
     dep  = fixture_path('asset/test-dep.js')

data/vendor/sprockets/test/test_asset_attributes.rb

@@ -1,17 +1,63 @@
 require 'sprockets_test'
 
 class TestAssetAttributes < Sprockets::TestCase
-  test "basename with extensions" do
-    assert_equal "empty",
-      pathname("empty").basename_without_extensions.to_s
-    assert_equal "gallery",
-      pathname("gallery.js").basename_without_extensions.to_s
-    assert_equal "application",
-      pathname("application.js.coffee").basename_without_extensions.to_s
-    assert_equal "project",
-      pathname("project.js.coffee.erb").basename_without_extensions.to_s
-    assert_equal "gallery",
-      pathname("gallery.css.erb").basename_without_extensions.to_s
+  test "expand and relativize root" do
+    assert_equal __FILE__,
+      pathname(pathname(__FILE__).relativize_root).expand_root
+  end
+
+  test "search paths" do
+    assert_equal ["index"],
+      pathname("index").search_paths
+    assert_equal ["index.html"],
+      pathname("index.html").search_paths
+    assert_equal ["index.css", "index.less", "index.sass", "index.scss"],
+      pathname("index.css").search_paths
+    assert_equal ["index.js", "index.coffee", "index.jst"],
+      pathname("index.js").search_paths
+    assert_equal ["index.coffee"], pathname("index.coffee").search_paths
+    assert_equal ["index.js.coffee"], pathname("index.js.coffee").search_paths
+
+    assert_equal ["foo", "foo/index"],
+      pathname("foo").search_paths
+    assert_equal ["foo.html", "foo/index.html"],
+      pathname("foo.html").search_paths
+    assert_equal ["foo.js", "foo.coffee", "foo.jst", "foo/index.js", "foo/index.coffee", "foo/index.jst"],
+      pathname("foo.js").search_paths
+    assert_equal ["foo.coffee", "foo/index.coffee"],
+      pathname("foo.coffee").search_paths
+    assert_equal ["foo.js.coffee", "foo/index.js.coffee"],
+      pathname("foo.js.coffee").search_paths
+
+    assert_equal ["foo/bar", "foo/bar/index"], pathname("foo/bar").search_paths
+    assert_equal ["foo/bar.js", "foo/bar.coffee", "foo/bar.jst", "foo/bar/index.js", "foo/bar/index.coffee", "foo/bar/index.jst"],
+      pathname("foo/bar.js").search_paths
+    assert_equal ["foo/bar.coffee", "foo/bar/index.coffee"], pathname("foo/bar.coffee").search_paths
+    assert_equal ["foo/bar.js.coffee", "foo/bar/index.js.coffee"], pathname("foo/bar.js.coffee").search_paths
+
+    assert_equal ["jquery.foo.coffee", "jquery/index.foo.coffee"],
+      pathname("jquery.foo.coffee").search_paths
+    assert_equal ["jquery.foo.js.coffee", "jquery/index.foo.js.coffee"],
+      pathname("jquery.foo.js.coffee").search_paths
+    assert_equal ["jquery.foo.js", "jquery.foo.coffee", "jquery.foo.jst",
+                  "jquery/index.foo.js", "jquery/index.foo.coffee", "jquery/index.foo.jst"],
+      pathname("jquery.foo.js").search_paths
+  end
+
+  test "logical path" do
+    assert_equal nil, pathname(fixture_path("missing/application.js")).logical_path
+
+    assert_equal "application.js", pathname(fixture_path("default/application.js")).logical_path
+    assert_equal "application.css", pathname(fixture_path("default/application.css")).logical_path
+    assert_equal "jquery.foo.min.js", pathname(fixture_path("default/jquery.foo.min.js")).logical_path
+
+    assert_equal "application.js", pathname(fixture_path("default/application.js.erb")).logical_path
+    assert_equal "application.js", pathname(fixture_path("default/application.js.coffee")).logical_path
+    assert_equal "application.css", pathname(fixture_path("default/application.css.scss")).logical_path
+
+    assert_equal "application.js", pathname(fixture_path("default/application.coffee")).logical_path
+    assert_equal "application.css", pathname(fixture_path("default/application.scss")).logical_path
+    assert_equal "hello.js", pathname(fixture_path("default/hello.jst.ejs")).logical_path
   end
 
   test "extensions" do
@@ -27,7 +73,7 @@ class TestAssetAttributes < Sprockets::TestCase
       pathname("gallery.css.erb").extensions
   end
 
-  test "format_extension" do
+  test "format extension" do
     assert_equal nil, pathname("empty").format_extension
     assert_equal ".js", pathname("gallery.js").format_extension
     assert_equal ".js", pathname("application.js.coffee").format_extension
@@ -39,15 +85,17 @@ class TestAssetAttributes < Sprockets::TestCase
     assert_equal ".js", pathname("jquery.min.js").format_extension
     assert_equal ".js", pathname("jquery.tmpl.js").format_extension
     assert_equal ".js", pathname("jquery.tmpl.min.js").format_extension
+
+    env = Sprockets::Environment.new
+    env.register_engine '.ms', Class.new
+    assert_equal nil, env.attributes_for("foo.jst.ms").format_extension
   end
 
-  test "engine_extensions" do
+  test "engine extensions" do
     assert_equal [], pathname("empty").engine_extensions
     assert_equal [], pathname("gallery.js").engine_extensions
-    assert_equal [".coffee"],
-      pathname("application.js.coffee").engine_extensions
-    assert_equal [".coffee", ".erb"],
-      pathname("project.js.coffee.erb").engine_extensions
+    assert_equal [".coffee"], pathname("application.js.coffee").engine_extensions
+    assert_equal [".coffee", ".erb"], pathname("project.js.coffee.erb").engine_extensions
     assert_equal [".erb"], pathname("gallery.css.erb").engine_extensions
     assert_equal [".erb"], pathname("gallery.erb").engine_extensions
     assert_equal [], pathname("jquery.js").engine_extensions
@@ -55,11 +103,14 @@ class TestAssetAttributes < Sprockets::TestCase
     assert_equal [], pathname("jquery.tmpl.min.js").engine_extensions
     assert_equal [".erb"], pathname("jquery.js.erb").engine_extensions
     assert_equal [".erb"], pathname("jquery.min.js.erb").engine_extensions
-    assert_equal [".coffee"],
-      pathname("jquery.min.coffee").engine_extensions
+    assert_equal [".coffee"], pathname("jquery.min.coffee").engine_extensions
+
+    env = Sprockets::Environment.new
+    env.register_engine '.ms', Class.new
+    assert_equal [".jst", ".ms"], env.attributes_for("foo.jst.ms").engine_extensions
   end
 
-  test "content_type" do
+  test "content type" do
     assert_equal "application/octet-stream",
       pathname("empty").content_type
     assert_equal "application/javascript",
@@ -79,8 +130,21 @@ class TestAssetAttributes < Sprockets::TestCase
     end
   end
 
+  test "get path fingerprint" do
+    assert_equal nil, pathname("foo.js").path_fingerprint
+    assert_equal "0aa2105d29558f3eb790d411d7d8fb66",
+      pathname("foo-0aa2105d29558f3eb790d411d7d8fb66.js").path_fingerprint
+  end
+
+  test "inject path fingerprint" do
+    assert_equal "foo-0aa2105d29558f3eb790d411d7d8fb66.js",
+      pathname("foo.js").path_with_fingerprint("0aa2105d29558f3eb790d411d7d8fb66")
+  end
+
   private
     def pathname(path)
-      Sprockets::Environment.new.attributes_for(path)
+      env = Sprockets::Environment.new
+      env.append_path fixture_path("default")
+      env.attributes_for(path)
     end
 end

data/vendor/sprockets/test/test_environment.rb

@@ -67,6 +67,12 @@ module EnvironmentTests
     assert_equal "hello: world\n", context.call("JST['hello']", :name => "world")
   end
 
+  test "asset_data_uri helper" do
+    asset = @env["with_data_uri.css"]
+    assert_equal "body {\n  background-image: url(data:image/gif;base64,R0lGODlhAQABAIAAAP%2F%2F%2FwAAACH5BAAAAAAALAAAAAABAAEAAAICRAEAOw%3D%3D) no-repeat;\n}\n", asset.to_s
+    assert asset.send(:dependency_paths).find { |dependency| dependency["path"] == fixture_path("default/blank.gif") }
+  end
+
   test "lookup mime type" do
     assert_equal "application/javascript", @env.mime_types(".js")
     assert_equal "application/javascript", @env.mime_types("js")
@@ -85,6 +91,8 @@ module EnvironmentTests
       @env.resolve("gallery.js").to_s
     assert_equal fixture_path('default/gallery.js'),
       @env.resolve(Pathname.new("gallery.js")).to_s
+    assert_equal fixture_path('default/coffee/foo.coffee'),
+      @env.resolve("coffee/foo.js").to_s
   end
 
   test "missing file raises an exception" do
@@ -101,6 +109,11 @@ module EnvironmentTests
     assert_equal "var Gallery = {};\n", @env[fixture_path("default/gallery.js")].to_s
   end
 
+  test "find bundled asset with implicit format" do
+    assert_equal "(function() {\n  var foo;\n  foo = 'hello';\n}).call(this);\n",
+      @env["coffee/foo.js"].to_s
+  end
+
   test "find static asset in environment" do
     assert_equal "Hello world\n", @env["hello.txt"].to_s
   end
@@ -295,23 +308,15 @@ class TestEnvironment < Sprockets::TestCase
   end
 
   test "register mime type" do
-    old_digest = @env.digest
     assert !@env.mime_types("jst")
-
     @env.register_mime_type("application/javascript", "jst")
-
     assert_equal "application/javascript", @env.mime_types("jst")
-    assert_not_equal old_digest, @env.digest
   end
 
   test "register bundle processor" do
-    old_digest = @env.digest
     assert !@env.bundle_processors('text/css').include?(WhitespaceCompressor)
-
     @env.register_bundle_processor 'text/css', WhitespaceCompressor
-
     assert @env.bundle_processors('text/css').include?(WhitespaceCompressor)
-    assert_not_equal old_digest, @env.digest
   end
 
   test "unregister custom block preprocessor" do
@@ -338,16 +343,6 @@ class TestEnvironment < Sprockets::TestCase
     assert_equal old_size, @env.bundle_processors('text/css').size
   end
 
-  test "changing css compressor expires old assets" do
-    old_digest = @env.digest
-    assert_equal ".gallery {\n  color: red;\n}\n", @env["gallery.css"].to_s
-
-    @env.css_compressor = WhitespaceCompressor
-
-    assert_equal ".gallery{color:red;}", @env["gallery.css"].to_s
-    assert_not_equal old_digest, @env.digest
-  end
-
   test "setting css compressor to nil clears current compressor" do
     old_digest = @env.digest
     @env.css_compressor = WhitespaceCompressor
@@ -356,16 +351,6 @@ class TestEnvironment < Sprockets::TestCase
     assert_nil @env.css_compressor
   end
 
-  test "changing js compressor expires old assets" do
-    old_digest = @env.digest
-    assert_equal "var Gallery = {};\n", @env["gallery.js"].to_s
-
-    @env.js_compressor = WhitespaceCompressor
-
-    assert_equal "varGallery={};", @env["gallery.js"].to_s
-    assert_not_equal old_digest, @env.digest
-  end
-
   test "setting js compressor to nil clears current compressor" do
     @env.js_compressor = WhitespaceCompressor
     assert @env.js_compressor
@@ -458,7 +443,6 @@ class TestEnvironment < Sprockets::TestCase
   end
 
   test "registering engine adds to the environments extensions" do
-    old_digest = @env.digest
     assert !@env.engines[".foo"]
     assert !@env.extensions.include?(".foo")
 
@@ -466,7 +450,6 @@ class TestEnvironment < Sprockets::TestCase
 
     assert @env.engines[".foo"]
     assert @env.extensions.include?(".foo")
-    assert_not_equal old_digest, @env.digest
   end
 
   test "seperate engines for each instance" do
@@ -486,12 +469,6 @@ class TestEnvironment < Sprockets::TestCase
     @env.unregister_preprocessor('application/javascript', Sprockets::DirectiveProcessor)
     assert_equal "// =require \"notfound\"\n;\n", @env["missing_require.js"].to_s
   end
-
-  test "changing directive preprocessor changes digest" do
-    old_digest = @env.digest
-    @env.unregister_preprocessor('application/javascript', Sprockets::DirectiveProcessor)
-    assert_not_equal old_digest, @env.digest
-  end
 end
 
 class TestIndex < Sprockets::TestCase