middleman-sprockets 3.1.4 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22a7558fe43af9f7b1da64e136c4e63f8eb0549b
-  data.tar.gz: 73eb77c9e9aa5a2a35b0cebaf0f99f70ee1b1a88
+  metadata.gz: c368bc22bab155dbb04fa6a767a432d80a2e70bc
+  data.tar.gz: d02e8b1fc0c0964520f1378f01dd7ea5135c2753
 SHA512:
-  metadata.gz: 498a939675d06c4d03d0efc07156dd16f093a7584d5ecb676702727a816d24811c7a981922c554beadf2d5cd659380be44e6b6a084ce7a9aa20ec1b3f2ed988b
-  data.tar.gz: 332722b8eb4b809452ad54626b662b6da8d4e06a2c1dffffd2ab31d6d99379844e78b4881e6ea53c37ecab5eb282e42116c832d3c958872fd7dd57b0a9ac70be
+  metadata.gz: 7d239a855d5ff1606ecf6b6090417f4e807eb1a99692f5f345147e9bdab300df6dd39c47ede15418f488d6278723b6a97226b418ed5a34589dbc16e7a356a596
+  data.tar.gz: b6c0e40d4378056862f11a9cccbbeabe4e29b442a0b1bfd7b4a28b542c77511f89f15b50d1e64688c887ad0a0b533e53f96e9370dc10d6f0ac742c2793e4061a

data/.travis.yml

@@ -1,14 +1,8 @@
 rvm:
-  - 1.8.7
   - 1.9.3
   - 2.0.0
-  - jruby-18mode
   - jruby-19mode
 
-gemfile:
-  - Gemfile
-  - Gemfile-3.0
-
 script: "bundle exec rake test"
 
 env: TEST=true

data/Gemfile

@@ -1,7 +1,6 @@
 source "https://rubygems.org"
 
 gem "middleman-core", :github => "middleman/middleman"
-gem "middleman-more", :github => "middleman/middleman"
 
 # Specify your gem's dependencies in middleman-sprockets.gemspec
 gemspec
@@ -32,8 +31,3 @@ gem "erubis", "~> 2.7.0"
 
 # Code Quality
 gem "cane", :platforms => [:mri_19, :mri_20], :require => false
-
-# Cross-templating language block fix for Ruby 1.8
-platforms :mri_18 do
-  gem "ruby18_source_location"
-end

data/features/sprockets.feature

@@ -101,7 +101,7 @@ Feature: Sprockets
     When I go to "/library/css/sprockets_base2.css"
     Then I should see "hello"
 
-Scenario: Sprockets inline Images with asset_path and image_path helpers
+  Scenario: Sprockets inline Images with asset_path and image_path helpers
     Given the Server is running at "sprockets-images-app"
     When I go to "/"
     Then I should see 'src="/library/images/cat.jpg"'
@@ -110,3 +110,20 @@ Scenario: Sprockets inline Images with asset_path and image_path helpers
     Then I should get a response with status "200"
     When I go to "/library/images/cat-2.jpg"
     Then I should get a response with status "200"
+
+  Scenario: Assets built through import_asset are built with wrong extension
+    Given a successfully built app at "sprockets-app"
+    When I cd to "build"
+    # generated file is /library/css/vendored.css.scss
+    Then a file named "library/css/vendored.css" should exist
+    # generated file is /library/css/coffee.js.coffee
+    Then a file named "library/js/coffee.js" should exist
+
+  Scenario: Vendor assets get wrong extension
+    Given the Server is running at "sprockets-app"
+    # generated file is /library/css/vendored.css.scss
+    When I go to "/library/css/vendored.css"
+    And I should see 'background: brown;'
+    # generated file is /library/js/coffee.js.coffee
+    When I go to "/library/js/coffee.js"
+    And I should see 'return console.log("bar");'

data/fixtures/sprockets-app/config.rb

@@ -1,2 +1,7 @@
 set :js_dir, "library/js"
-set :css_dir, "library/css"
+set :css_dir, "library/css"
+
+after_configuration do
+  sprockets.import_asset "vendored.css"
+  sprockets.import_asset "coffee.js"
+end

data/fixtures/sprockets-app/vendor/assets/javascripts/coffee.js.coffee

@@ -0,0 +1,2 @@
+foo = ->
+  console.log "bar"

data/fixtures/sprockets-app/vendor/assets/stylesheets/vendored.css.scss

@@ -0,0 +1,4 @@
+$color: brown;
+body {
+  background: $color;
+}

data/lib/middleman-sprockets.rb

@@ -1,5 +1,4 @@
 require "middleman-core"
-require "middleman-more"
 
 Middleman::Extensions.register(:sprockets) do
   require "middleman-sprockets/extension"

data/lib/middleman-sprockets/extension.rb

@@ -367,11 +367,10 @@ module Middleman::Sprockets
             next unless export_all || imported_assets.include?(path)
 
             base_path = path.sub("#{load_path}/", '')
-
-            new_path = File.join(output_dir, base_path).to_s
+            new_path = @app.sitemap.extensionless_path(File.join(output_dir, base_path))
 
             next if @app.sitemap.find_resource_by_destination_path(new_path)
-            resources_list << ::Middleman::Sitemap::Resource.new(@app.sitemap, new_path, path.to_s)
+            resources_list << ::Middleman::Sitemap::Resource.new(@app.sitemap, new_path.to_s, path.to_s)
           end
         end
       end

data/lib/middleman-sprockets/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module Sprockets
-    VERSION = "3.1.4"
+    VERSION = "3.2.0"
   end
 end

data/middleman-sprockets.gemspec

@@ -15,8 +15,7 @@ Gem::Specification.new do |s|
   s.files = `git ls-files -z`.split("\0")
   s.test_files = `git ls-files -z -- {fixtures,features}/*`.split("\0")
   s.require_paths = ["lib"]
-  s.add_dependency("middleman-core", [">= 3.0.14"])
-  s.add_dependency("middleman-more", [">= 3.0.14"])
+  s.add_dependency("middleman-core", ["~> 3.2"])
   s.add_dependency("sprockets", ["~> 2.1"])
   s.add_dependency("sprockets-sass", ["~> 1.0.0"])
   s.add_dependency("sprockets-helpers", ["~> 1.0.0"])

metadata

@@ -1,43 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: middleman-sprockets
 version: !ruby/object:Gem::Version
-  version: 3.1.4
+  version: 3.2.0
 platform: ruby
 authors:
 - Thomas Reynolds
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-22 00:00:00.000000000 Z
+date: 2013-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 3.0.14
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 3.0.14
-- !ruby/object:Gem::Dependency
-  name: middleman-more
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.14
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.14
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: sprockets
   requirement: !ruby/object:Gem::Requirement
@@ -92,7 +78,6 @@ files:
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
-- Gemfile-3.0
 - LICENSE.md
 - README.md
 - Rakefile
@@ -187,7 +172,9 @@ files:
 - fixtures/sprockets-app/source/library/js/sprockets_base.js
 - fixtures/sprockets-app/source/library/js/sprockets_sub.js
 - fixtures/sprockets-app/source/library/js/vendored_include.js
+- fixtures/sprockets-app/vendor/assets/javascripts/coffee.js.coffee
 - fixtures/sprockets-app/vendor/assets/javascripts/vendored_js.js
+- fixtures/sprockets-app/vendor/assets/stylesheets/vendored.css.scss
 - fixtures/sprockets-app2/config.rb
 - fixtures/sprockets-app2/data/test.yml
 - fixtures/sprockets-app2/data/test2.json
@@ -327,7 +314,9 @@ test_files:
 - fixtures/sprockets-app/source/library/js/sprockets_base.js
 - fixtures/sprockets-app/source/library/js/sprockets_sub.js
 - fixtures/sprockets-app/source/library/js/vendored_include.js
+- fixtures/sprockets-app/vendor/assets/javascripts/coffee.js.coffee
 - fixtures/sprockets-app/vendor/assets/javascripts/vendored_js.js
+- fixtures/sprockets-app/vendor/assets/stylesheets/vendored.css.scss
 - fixtures/sprockets-app2/config.rb
 - fixtures/sprockets-app2/data/test.yml
 - fixtures/sprockets-app2/data/test2.json

data/Gemfile-3.0

@@ -1,32 +0,0 @@
-source "https://rubygems.org"
-
-# Specify your gem's dependencies in middleman-sprockets.gemspec
-gemspec
-
-gem "middleman", "~> 3.0.0"
-
-gem "rake",     "~> 10.0.3", :require => false
-gem "yard",     "~> 0.8.0", :require => false
-
-# Test tools
-gem "cucumber", "~> 1.3.1"
-gem "fivemat"
-gem "aruba",    "~> 0.5.1"
-gem "rspec",    "~> 2.12"
-gem "builder",  "~> 3.0.0"
-
-# For actual tests
-# Make sure to lock down the versions of the asset gems
-# so they don't cause asset hashes to change.
-gem "jquery-rails", "2.2.1", :require => false
-gem "bootstrap-sass", "2.3.1.0", :require => false
-
-gem "jquery_mobile_rails", "1.3.0", :require => false
-gem "sprockets", "~> 2.2.1", :require => false
-
-gem "ejs", "~> 1.1.1"
-gem "eco", "~> 1.0.0"
-gem "erubis", "~> 2.7.0"
-
-# Code Quality
-gem "cane", :platforms => [:mri_19, :mri_20], :require => false