middleman-sprockets 3.1.1 → 3.1.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ce87e3c8ce972d2686e3d079b248b0f94b5ca08b
+  data.tar.gz: 1a34db0b97ba8eb0fe3cfb006b46a35896966909
+SHA512:
+  metadata.gz: 1d2d1d467f1d9224e45f2db6ef1cd5f33fc43f73e40b4bad12802fc9c63404411914b269d97c41fc62f9df06dab2d694bae432eded2526c6c8094b260d441dfc
+  data.tar.gz: f83d037bec956e563de8cb9012e0cb14a450fee01d74a5039aad803a62e6d359b5800bccceeff861adcdd4f7a5efeb94b6bc9e9de5aae72527059c8dfa02b1f5

data/.travis.yml

@@ -5,10 +5,10 @@ rvm:
   - jruby-18mode
   - jruby-19mode
 
-script: "bundle exec rake test"
-
 gemfile:
   - Gemfile
-  - Gemfile-3.1
-  
-env: TEST=true
+  - Gemfile-3.0
+
+script: "bundle exec rake test"
+
+env: TEST=true

data/CHANGELOG.md

@@ -1,7 +1,14 @@
 master
 ===
 
-* Compatibility with Middleman 3.1's removal of the middleman-more gem.
+
+3.1.2
+===
+* Fix debug_assets for CSS
+
+3.1.1
+===
+
 * Add sprockets-helpers to the list of dependencies to fix various path-related bugs. #34
 * Patch generated_image_url so that Compass sprites work. middleman/middleman#890.
 * Output .jst, .eco, and .ejs files with a .js extension. middleman/middleman#888.

data/CONTRIBUTING.md

@@ -0,0 +1,43 @@
+# Contributing
+In the spirit of [free software][free-sw], **everyone** is encouraged to help
+improve this project.
+
+[free-sw]: http://www.fsf.org/licensing/essays/free-sw.html
+
+Here are some ways *you* can contribute:
+
+* by using alpha, beta, and prerelease versions
+* by reporting bugs
+* by suggesting new features
+* by writing or editing documentation
+* by writing specifications
+* by writing code ( **no patch is too small** : fix typos, add comments, clean up inconsistent whitespace )
+* by refactoring code
+* by closing [issues][]
+* by reviewing patches
+
+[issues]: https://github.com/middleman/middleman-sprockets/issues
+
+## Submitting an Issue
+We use the [GitHub issue tracker][issues] to track bugs and features. Before
+submitting a bug report or feature request, check to make sure it hasn't
+already been submitted. When submitting a bug report, please include a [Gist][]
+that includes a stack trace and any details that may be necessary to reproduce
+the bug, including your gem version, Ruby version, and operating system.
+Ideally, a bug report should include a pull request with failing specs.
+
+[gist]: https://gist.github.com/
+
+## Submitting a Pull Request
+1. [Fork the repository.][fork]
+2. [Create a topic branch.][branch]
+3. Add specs for your unimplemented feature or bug fix.
+4. Run `bundle exec rake test`. If your specs pass, return to step 3.
+5. Implement your feature or bug fix.
+6. Run `bundle exec rake test`. If your specs fail, return to step 5.
+7. Add, commit, and push your changes.
+8. [Submit a pull request.][pr]
+
+[fork]: http://help.github.com/fork-a-repo/
+[branch]: http://learn.github.com/p/branching.html
+[pr]: http://help.github.com/send-pull-requests/

data/Gemfile

@@ -1,31 +1,34 @@
-source 'https://rubygems.org'
+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
 
-gem "middleman-core", "~> 3.0.13"
-gem "middleman-more", "~> 3.0.13"
-
-# Build and doc tools
-gem "rake",     "~> 10.0.3"
-gem "yard",     "~> 0.8.0"
+gem "rake",     "~> 10.0.3", :require => false
+gem "yard",     "~> 0.8.0", :require => false
 
 # Test tools
-gem "cucumber" 
+gem "cucumber", "~> 1.3.1"
 gem "fivemat"
-gem "aruba"
-gem "builder", "~> 3.0.0"
-gem "rspec"
+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-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 "jquery_mobile_rails", "1.3.0", :require => false
+gem "sprockets", "~> 2.2.1", :require => false
+gem 'rack', '1.4.5', :require => false
 
 gem "ejs", "~> 1.1.1"
 gem "eco", "~> 1.0.0"
-gem "erubis", "~> 2.7.0"
+gem "erubis", "~> 2.7.0"
+
+# Code Quality
+gem "cane", :platforms => [:mri_19, :mri_20], :require => false

data/Gemfile-3.0

@@ -0,0 +1,30 @@
+source "https://rubygems.org"
+
+# Specify your gem's dependencies in middleman-sprockets.gemspec
+gemspec
+
+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

data/{LICENSE → LICENSE.md}

@@ -1,4 +1,4 @@
-Copyright (c) 2012 Thomas Reynolds
+Copyright (c) 2012-2013 Thomas Reynolds
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -17,4 +17,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,49 +1,59 @@
-# middleman-sprockets
+# Middleman-Sprockets
 
-# Install
+`middleman-sprockets` is an extension for the [Middleman] static site generator that allows support for [Sprockets](https://github.com/sstephenson/sprockets) in your assets.
+
+## Installation
+
+If you're just getting started, install the `middleman` gem and generate a new project:
 
 ```
-gem install middleman-sprockets
+gem install middleman
+middleman init MY_PROJECT
 ```
 
-If you already have a Middleman project:
-Add `middleman-sprockets` to your `Gemfile`, and open your `config.rb` and add:
+If you already have a Middleman project: Add `gem "middleman-sprockets"` to your `Gemfile` and run `bundle install`
+
+## Configuration
 
 ```
 activate :sprockets
 ```
 
-# Community
-
-The official community forum is available at:
-
-  http://forum.middlemanapp.com/
+## Build & Dependency Status
 
-# Bug Reports
+[![Gem Version](https://badge.fury.io/rb/middleman-sprockets.png)][gem]
+[![Build Status](https://travis-ci.org/middleman/middleman-sprockets.png)][travis]
+[![Dependency Status](https://gemnasium.com/middleman/middleman-sprockets.png?travis)][gemnasium]
+[![Code Quality](https://codeclimate.com/github/middleman/middleman-sprockets.png)][codeclimate]
 
-GitHub Issues are used for managing bug reports and feature requests. If you run into issues, please search the issues and submit new problems:
+## Community
 
-https://github.com/middleman/middleman-sprockets/issues
+The official community forum is available at: http://forum.middlemanapp.com
 
-The best way to get quick responses to your issues and swift fixes to your bugs is to submit detailed bug reports, include test cases and respond to developer questions in a timely manner. Even better, if you know Ruby, you can submit Pull Requests containing Cucumber Features which describe how your feature should work or exploit the bug you are submitting.
+## Bug Reports
 
-# Build & Dependency Status
+Github Issues are used for managing bug reports and feature requests. If you run into issues, please search the issues and submit new problems: https://github.com/middleman/middleman-sprockets/issues
 
-[![Build Status](http://travis-ci.org/middleman/middleman-sprockets.png)](http://travis-ci.org/middleman/middleman-sprockets)
+The best way to get quick responses to your issues and swift fixes to your bugs is to submit detailed bug reports, include test cases and respond to developer questions in a timely manner. Even better, if you know Ruby, you can submit [Pull Requests](https://help.github.com/articles/using-pull-requests) containing Cucumber Features which describe how your feature should work or exploit the bug you are submitting.
 
-# How to Run Cucumber Tests
+## How to Run Cucumber Tests
 
 1. Checkout Repository: `git clone https://github.com/middleman/middleman-sprockets.git`
 2. Install Bundler: `gem install bundler`
 3. Run `bundle install` inside the project root to install the gem dependencies.
 4. Run test cases: `bundle exec rake test`
 
-# Donate
+## Donate
 
-[![Click here to lend your support to Middleman](https://www.pledgie.com/campaigns/15807.png)](http://www.pledgie.com/campaigns/15807)
+[Click here to lend your support to Middleman](https://spacebox.io/s/4dXbHBorC3)
 
-# License
+## License
 
-Copyright (c) 2012 Thomas Reynolds. MIT Licensed, see [LICENSE] for details.
+Copyright (c) 2012-2013 Thomas Reynolds. MIT Licensed, see [LICENSE] for details.
 
-[LICENSE]: https://github.com/middleman/middleman-blog/blob/master/LICENSE
+[middleman]: http://middlemanapp.com
+[gem]: https://rubygems.org/gems/middleman-sprockets
+[travis]: http://travis-ci.org/middleman/middleman-sprockets
+[gemnasium]: https://gemnasium.com/middleman/middleman-sprockets
+[codeclimate]: https://codeclimate.com/github/middleman/middleman-sprockets
+[LICENSE]: https://github.com/middleman/middleman-sprockets/blob/master/LICENSE.md

data/Rakefile

@@ -7,8 +7,8 @@ require 'middleman-core/version'
 
 Cucumber::Rake::Task.new(:cucumber, 'Run features that should pass') do |t|
   exempt_tags = ["--tags ~@wip"]
-  exempt_tags << "--tags ~@new" unless Middleman::VERSION.start_with? ("3.1")
-  exempt_tags << "--tags ~@old" unless Middleman::VERSION.start_with? ("3.0")
+  exempt_tags << "--tags ~@new " unless Middleman::VERSION.start_with?("3.1")
+  exempt_tags << "--tags ~@old " unless Middleman::VERSION.start_with?("3.0")
   t.cucumber_opts = "--color #{exempt_tags.join(" ")} --strict --format #{ENV['CUCUMBER_FORMAT'] || 'Fivemat'}"
 end
 
@@ -21,6 +21,19 @@ task :doc do
   sh 'bundle exec yard'
 end
 
+begin
+  require 'cane/rake_task'
+
+  desc "Run cane to check quality metrics"
+  Cane::RakeTask.new(:quality) do |cane|
+    cane.no_style = true
+    cane.no_doc = true
+    cane.abc_glob = "lib/middleman-sprockets/**/*.rb"
+  end
+rescue LoadError
+  # warn "cane not available, quality task not provided."
+end
+
 desc "Destroy the sass cache from fixtures in case it messes with results"
 task :destroy_sass_cache do
   Dir["fixtures/*/.sass-cache"].each do |dir|

data/features/asset_hash.feature

@@ -36,7 +36,7 @@ Feature: Assets get a file hash appended to their URL and references to them are
     Given the Server is running at "asset-hash-app"
     When I go to "/"
     Then I should see 'href="stylesheets/site-b7f4d02f.css"'
-    Then I should see 'href="stylesheets/jquery-mobile-9835967d.css"'
+    Then I should see 'href="stylesheets/jquery-mobile-05f64032.css"'
     And I should see 'src="javascripts/application-df677242.js"'
     And I should see 'src="images/100px-5fd6fb90.jpg"'
     When I go to "/subdir/"
@@ -51,7 +51,7 @@ Feature: Assets get a file hash appended to their URL and references to them are
     Then I should see "img.src = '/images/100px-5fd6fb90.jpg'"
     When I go to "/stylesheets/site-b7f4d02f.css"
     Then I should see 'background-image: url("../images/100px-5fd6fb90.jpg")'
-    When I go to "/stylesheets/jquery-mobile-9835967d.css"
+    When I go to "/stylesheets/jquery-mobile-05f64032.css"
     Then I should see 'background-image: url("../images/jquery-mobile/icons-18-white-1681b2cc.png")'
 
   Scenario: Enabling an asset host still produces hashed files and references  

data/lib/middleman-sprockets/extension.rb

@@ -260,7 +260,10 @@ module Middleman::Sprockets
         # loop through all sources and the dependencies and
         # output each as script tag in the correct order
         sources.map do |source|
-          dependencies_paths = sprockets[source].to_a.map do |dependency|
+          source_file_name = source.to_s
+          source_file_name << ".js" unless source_file_name.end_with?(".js")
+
+          dependencies_paths = sprockets[source_file_name].to_a.map do |dependency|
             # if sprockets sees "?body=1" it only gives back the body
             # of the script without the dependencies included
             dependency.logical_path + "?body=1"
@@ -286,7 +289,10 @@ module Middleman::Sprockets
         # output each as script tag in the correct order
         
         sources.map do |source|
-          dependencies_paths = sprockets[source].to_a.map do |dependency|
+          source_file_name = source.to_s
+          source_file_name << ".css" unless source_file_name.end_with?(".css")
+
+          dependencies_paths = sprockets[source_file_name].to_a.map do |dependency|
             # if sprockets sees "?body=1" it only gives back the body
             # of the script without the dependencies included
             dependency.logical_path + "?body=1"
@@ -344,8 +350,10 @@ module Middleman::Sprockets
 
             base_path = path.sub("#{load_path}/", '')
 
-            new_path = File.join(output_dir, base_path)
-            resources_list << ::Middleman::Sitemap::Resource.new(@app.sitemap, new_path.to_s, path.to_s)
+            new_path = File.join(output_dir, base_path).to_s
+
+            next if @app.sitemap.find_resource_by_destination_path(new_path)
+            resources_list << ::Middleman::Sitemap::Resource.new(@app.sitemap, new_path, path.to_s)
           end
         end
       end

data/lib/middleman-sprockets/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module Sprockets
-    VERSION = "3.1.1"
+    VERSION = "3.1.2"
   end
 end

data/middleman-sprockets.gemspec

@@ -3,26 +3,21 @@ $:.push File.expand_path("../lib", __FILE__)
 require "middleman-sprockets/version"
 
 Gem::Specification.new do |s|
-  s.name        = "middleman-sprockets"
-  s.version     = Middleman::Sprockets::VERSION
-  s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Thomas Reynolds"]
-  s.email       = ["me@tdreyno.com"]
-  s.homepage    = "https://github.com/middleman/middleman-sprockets"
-  s.summary     = %q{Sprockets support for Middleman}
+  s.name = "middleman-sprockets"
+  s.version = Middleman::Sprockets::VERSION
+  s.platform = Gem::Platform::RUBY
+  s.authors = ["Thomas Reynolds"]
+  s.email = ["me@tdreyno.com"]
+  s.homepage = "https://github.com/middleman/middleman-sprockets"
+  s.summary = %q{Sprockets support for Middleman}
   s.description = %q{Sprockets support for Middleman}
-
-  s.rubyforge_project = "middleman-sprockets"
-
-  s.files         = `git ls-files -z`.split("\0")
-  s.test_files    = `git ls-files -z -- {fixtures,features}/*`.split("\0")
+  s.license = "MIT"
+  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("sprockets", ["~> 2.1"])
   s.add_dependency("sprockets-sass", ["~> 1.0.0"])
   s.add_dependency("sprockets-helpers", ["~> 1.0.0"])
-
-  # We must depend on padrino-helpers so that middleman-core loads its helpers
-  s.add_dependency("padrino-helpers", ["0.10.7"])
-end
+end

metadata

@@ -1,68 +1,60 @@
 --- !ruby/object:Gem::Specification
 name: middleman-sprockets
 version: !ruby/object:Gem::Version
-  version: 3.1.1
-  prerelease: 
+  version: 3.1.2
 platform: ruby
 authors:
 - Thomas Reynolds
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-12 00:00:00.000000000 Z
+date: 2013-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.14
 - !ruby/object:Gem::Dependency
-  name: sprockets
+  name: middleman-more
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 3.0.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 3.0.14
 - !ruby/object:Gem::Dependency
-  name: sprockets-sass
+  name: sprockets
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '2.1'
 - !ruby/object:Gem::Dependency
-  name: sprockets-helpers
+  name: sprockets-sass
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,27 +62,24 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: padrino-helpers
+  name: sprockets-helpers
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.10.7
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.10.7
+        version: 1.0.0
 description: Sprockets support for Middleman
 email:
 - me@tdreyno.com
@@ -101,9 +90,10 @@ files:
 - .gitignore
 - .travis.yml
 - CHANGELOG.md
+- CONTRIBUTING.md
 - Gemfile
-- Gemfile-3.1
-- LICENSE
+- Gemfile-3.0
+- LICENSE.md
 - README.md
 - Rakefile
 - features/asset_hash-3.0.feature
@@ -204,34 +194,28 @@ files:
 - lib/middleman_extension.rb
 - middleman-sprockets.gemspec
 homepage: https://github.com/middleman/middleman-sprockets
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2326151710291453877
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2326151710291453877
 requirements: []
-rubyforge_project: middleman-sprockets
-rubygems_version: 1.8.24
+rubyforge_project: 
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Sprockets support for Middleman
 test_files:
 - features/asset_hash-3.0.feature

data/Gemfile-3.1

@@ -1,31 +0,0 @@
-source 'https://rubygems.org'
-
-gem "middleman", :github => "middleman/middleman"
-
-# Specify your gem's dependencies in middleman-sprockets.gemspec
-gemspec
-
-# Build and doc tools
-gem "rake",     "~> 10.0.3"
-gem "yard",     "~> 0.8.0"
-
-# Test tools
-gem "cucumber" 
-gem "fivemat"
-gem "aruba"
-gem "builder", "~> 3.0.0"
-gem "rspec"
-
-# 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 'rack', '1.4.5', :require => false
-
-gem "ejs", "~> 1.1.1"
-gem "eco", "~> 1.0.0"
-gem "erubis", "~> 2.7.0"