Permalink
Browse files

Revert "Merge branch '2.x'"

This reverts commit 0b73c93, reversing
changes made to cc5a169.
  • Loading branch information...
1 parent 0b73c93 commit 8d2a455fcf99dd2d2d20a340eddb251c09f975b3 @josh josh committed Feb 26, 2014
Showing with 7 additions and 12 deletions.
  1. +0 −4 README.md
  2. +0 −1 lib/sprockets/asset_attributes.rb
  3. +1 −1 lib/sprockets/base.rb
  4. +1 −1 lib/sprockets/version.rb
  5. +5 −5 test/test_asset_attributes.rb
View
4 README.md
@@ -380,10 +380,6 @@ submit a pull request.
* Default digest changed to SHA1. To continue using MD5.
`env.digest_class = Digest::MD5`.
-**2.11.0** (February 19, 2014)
-
-* Support for `.bower.json`
-
**2.10.0** (May 24, 2013)
* Support for `bower.json`
View
1 lib/sprockets/asset_attributes.rb
@@ -24,7 +24,6 @@ def search_paths
# optimization: bower.json can only be nested one level deep
if !path_without_extension.to_s.index('/')
- paths << path_without_extension.join(".bower.json").to_s
paths << path_without_extension.join("bower.json").to_s
end
View
2 lib/sprockets/base.rb
@@ -130,7 +130,7 @@ def resolve(logical_path, options = {})
args = attributes_for(logical_path).search_paths + [options]
@trail.find(*args) do |path|
pathname = Pathname.new(path)
- if %w( .bower.json bower.json ).include?(pathname.basename.to_s)
+ if pathname.basename.to_s == "bower.json"
bower = json_decode(pathname.read)
case bower['main']
when String
View
2 lib/sprockets/version.rb
@@ -1,3 +1,3 @@
module Sprockets
- VERSION = "2.11.0"
+ VERSION = "2.10.1"
end
View
10 test/test_asset_attributes.rb
@@ -2,17 +2,17 @@
class TestAssetAttributes < Sprockets::TestCase
test "search paths" do
- assert_equal ["index.js", "index/.bower.json", "index/bower.json"],
+ assert_equal ["index.js", "index/bower.json"],
pathname("index.js").search_paths
- assert_equal ["foo.js", "foo/.bower.json", "foo/bower.json", "foo/index.js"],
+ assert_equal ["foo.js", "foo/bower.json", "foo/index.js"],
pathname("foo.js").search_paths
- assert_equal ["foo", "foo/.bower.json", "foo/bower.json", "foo/index"],
+ assert_equal ["foo", "foo/bower.json", "foo/index"],
pathname("foo").search_paths
assert_equal ["foo/bar.js", "foo/bar/index.js"],
pathname("foo/bar.js").search_paths
- assert_equal ["jquery.foo.js", "jquery.foo/.bower.json", "jquery.foo/bower.json", "jquery.foo/index.js"],
+ assert_equal ["jquery.foo.js", "jquery.foo/bower.json", "jquery.foo/index.js"],
pathname("jquery.foo.js").search_paths
- assert_equal ["jquery.foo", "jquery.foo/.bower.json", "jquery.foo/bower.json", "jquery.foo/index"],
+ assert_equal ["jquery.foo", "jquery.foo/bower.json", "jquery.foo/index"],
pathname("jquery.foo").search_paths
end

0 comments on commit 8d2a455

Please sign in to comment.