middleman-sprockets 3.0.6 → 3.0.8

data/.travis.yml

@@ -2,6 +2,7 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
+  - 2.0.0
   - jruby-18mode
   - jruby-19mode
 
@@ -11,5 +12,6 @@ env: TEST=true
 
 matrix:
   allow_failures:
+    - rvm: 2.0.0
     - rvm: jruby-18mode
     - rvm: jruby-19mode

data/Gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source 'https://rubygems.org'
 
 git "git://github.com/middleman/middleman.git", :branch => "3.0-stable" do
   gem "middleman"
@@ -9,24 +9,18 @@ end
 # Specify your gem's dependencies in middleman-blog.gemspec
 gemspec
 
-group :development do
-  gem "rake",     "~> 0.9.2"
-  gem "rdoc",     "~> 3.9"
-  gem "yard",     "~> 0.8.0"
-  gem "pry"
-  gem "pry-debugger"
-end
+# Build and doc tools
+gem "rake",     "~> 10.0.3"
+gem "yard",     "~> 0.8.0"
 
-group :test do
-  gem "cucumber", "~> 1.2.0"
-  gem "fivemat"
-  gem "aruba",    "~> 0.4.11"
-  gem "rspec",    "~> 2.7"
+# Test tools
+gem "cucumber", "~> 1.2.1"
+gem "fivemat",  "~> 1.1.0"
+gem "aruba",    "~> 0.5.1"
+gem "rspec",    "~> 2.12"
 
-  # For actual tests
-  gem "jquery-rails", "~> 2.0.1"
-  # gem "bootstrap-rails", "0.0.5"
-  # gem "zurb-foundation"
-  gem "ejs"
-  gem "eco"
-end
+# For actual tests
+gem "jquery-rails", "2.0.1"
+gem "ejs", "~> 1.1.1"
+gem "eco", "~> 1.0.0"
+gem "erubis", "~> 2.7.0"

data/features/asset_hash.feature

@@ -7,7 +7,7 @@ Feature: Assets get a file hash appended to their and references to them are upd
       | images/100px-1242c368.png |
       | images/100px-5fd6fb90.jpg |
       | images/100px-5fd6fb90.gif |
-      | javascripts/application-1d8d5276.js |
+      | javascripts/application-df677242.js |
       | stylesheets/site-50eaa978.css |
       | index.html |
       | subdir/index.html |
@@ -19,33 +19,33 @@ Feature: Assets get a file hash appended to their and references to them are upd
       | javascripts/application.js |
       | stylesheets/site.css |
       
-    And the file "javascripts/application-1d8d5276.js" should contain "img.src = '/images/100px-5fd6fb90.jpg'"
+    And the file "javascripts/application-df677242.js" should contain "img.src = '/images/100px-5fd6fb90.jpg'"
     And the file "stylesheets/site-50eaa978.css" should contain "background-image: url('../images/100px-5fd6fb90.jpg')"
     And the file "index.html" should contain 'href="stylesheets/site-50eaa978.css"'
-    And the file "index.html" should contain 'src="javascripts/application-1d8d5276.js"'
+    And the file "index.html" should contain 'src="javascripts/application-df677242.js"'
     And the file "index.html" should contain 'src="images/100px-5fd6fb90.jpg"'
     And the file "subdir/index.html" should contain 'href="../stylesheets/site-50eaa978.css"'
-    And the file "subdir/index.html" should contain 'src="../javascripts/application-1d8d5276.js"'
+    And the file "subdir/index.html" should contain 'src="../javascripts/application-df677242.js"'
     And the file "subdir/index.html" should contain 'src="../images/100px-5fd6fb90.jpg"'
     And the file "other/index.html" should contain 'href="../stylesheets/site-50eaa978.css"'
-    And the file "other/index.html" should contain 'src="../javascripts/application-1d8d5276.js"'
+    And the file "other/index.html" should contain 'src="../javascripts/application-df677242.js"'
     And the file "other/index.html" should contain 'src="../images/100px-5fd6fb90.jpg"'
     
   Scenario: Hashed assets work in preview server
     Given the Server is running at "asset-hash-app"
     When I go to "/"
     Then I should see 'href="stylesheets/site-50eaa978.css"'
-    And I should see 'src="javascripts/application-1d8d5276.js"'
+    And I should see 'src="javascripts/application-df677242.js"'
     And I should see 'src="images/100px-5fd6fb90.jpg"'
     When I go to "/subdir/"
     Then I should see 'href="../stylesheets/site-50eaa978.css"'
-    And I should see 'src="../javascripts/application-1d8d5276.js"'
+    And I should see 'src="../javascripts/application-df677242.js"'
     And I should see 'src="../images/100px-5fd6fb90.jpg"'
     When I go to "/other/"
     Then I should see 'href="../stylesheets/site-50eaa978.css"'
-    And I should see 'src="../javascripts/application-1d8d5276.js"'
+    And I should see 'src="../javascripts/application-df677242.js"'
     And I should see 'src="../images/100px-5fd6fb90.jpg"'
-    When I go to "/javascripts/application-1d8d5276.js"
+    When I go to "/javascripts/application-df677242.js"
     Then I should see "img.src = '/images/100px-5fd6fb90.jpg'"
     When I go to "/stylesheets/site-50eaa978.css"
     Then I should see "background-image: url('../images/100px-5fd6fb90.jpg')"
@@ -89,14 +89,14 @@ Feature: Assets get a file hash appended to their and references to them are upd
       function sprockets_sub_function() { }
       """
     When I go to "/partials/"
-    Then I should see 'src="../javascripts/sprockets_base-095c3f3f.js'
-    When I go to "/javascripts/sprockets_base-095c3f3f.js"
+    Then I should see 'src="../javascripts/sprockets_base-0252a861.js'
+    When I go to "/javascripts/sprockets_base-0252a861.js"
     Then I should see "sprockets_sub_function"
     And the file "source/javascripts/sprockets_sub.js" has the contents
       """
       function sprockets_sub2_function() { }
       """
     When I go to "/partials/"
-    Then I should see 'src="../javascripts/sprockets_base-095c3f3f.js'
-    When I go to "/javascripts/sprockets_base-095c3f3f.js"
+    Then I should see 'src="../javascripts/sprockets_base-5121d891.js'
+    When I go to "/javascripts/sprockets_base-5121d891.js"
     Then I should see "sprockets_sub2_function"

data/features/support/env.rb

@@ -1,6 +1,5 @@
-require 'pry'
-
 PROJECT_ROOT_PATH = File.dirname(File.dirname(File.dirname(__FILE__)))
 require "middleman-core"
 require "middleman-core/step_definitions"
-require File.join(PROJECT_ROOT_PATH, 'lib', 'middleman-sprockets')
+require File.join(PROJECT_ROOT_PATH, 'lib', 'middleman-sprockets')
+require "erubis"

data/lib/middleman-sprockets/extension.rb

@@ -76,10 +76,20 @@ module Middleman::Sprockets
 
       # Make the app context available to Sprockets
       context_class.send(:define_method, :app) { app }
+
       context_class.class_eval do
+        # Find the Middleman-compatible version of this file's path
+        def mm_path
+          @mm_path ||= app.sitemap.file_to_path(pathname.to_s)
+        end
+
         def method_missing(*args)
           name = args.first
           if app.respond_to?(name)
+            # Set the middleman application current path, since it won't
+            # be set if the request came in through Sprockets and helpers
+            # won't work without it.
+            app.current_path = mm_path unless app.current_path
             app.send(*args)
           else
             super
@@ -102,7 +112,10 @@ module Middleman::Sprockets
       end if app.respond_to?(:js_assets_paths)
 
       # Stylus support 
-      ::Stylus.setup(self, app.styl) if defined?(::Stylus)
+      if defined?(::Stylus)
+        require 'stylus/sprockets'
+        ::Stylus.setup(self, app.styl)
+      end
     end
 
     # Override Sprockets' default digest function to *not*
@@ -137,7 +150,7 @@ module Middleman::Sprockets
     # splits up script dependencies in individual files when
     # configuration variable :debug_assets is set to true
     def javascript_include_tag(*sources)
-      if respond_to?(:debug_assets) && debug_assets
+      if respond_to?(:debug_assets) && debug_assets && !build?
         options = sources.extract_options!.symbolize_keys
 
         # loop through all sources and the dependencies and
@@ -150,7 +163,7 @@ module Middleman::Sprockets
           end
 
           super(dependencies_paths, options)
-        end.join("")
+        end.join("").gsub("body=1.js", "body=1")
       else
         super
       end

data/lib/middleman-sprockets/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module Sprockets
-    VERSION = "3.0.6"
+    VERSION = "3.0.8"
   end
 end

data/lib/middleman-sprockets.rb

@@ -1,7 +1,20 @@
 require "middleman-core"
 require "middleman-more"
 
+module Rails
+  def self.env 
+    Class.new do
+      def test?
+        false
+      end
+    end.new
+  end
+
+  class Engine
+  end
+end unless defined? Rails
+
 Middleman::Extensions.register(:sprockets) do
   require "middleman-sprockets/extension"
   Middleman::Sprockets
-end
+end

data/middleman-sprockets.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -z -- {fixtures,features}/*`.split("\0")
   s.require_paths = ["lib"]
   
-  s.add_dependency("middleman-more", [">= 3.0.1"])
+  s.add_dependency("middleman-more", [">= 3.0.11"])
   s.add_dependency("sprockets", ["~> 2.1", "< 2.5"])
-  s.add_dependency("sprockets-sass", ["~> 0.9.0"])
+  s.add_dependency("sprockets-sass", ["~> 0.9.1"])
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-sprockets
 version: !ruby/object:Gem::Version
-  version: 3.0.6
+  version: 3.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-27 00:00:00.000000000 Z
+date: 2013-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-more
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: 3.0.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: 3.0.11
 - !ruby/object:Gem::Dependency
   name: sprockets
   requirement: !ruby/object:Gem::Requirement
@@ -56,7 +56,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -64,7 +64,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.9.1
 description: Sprockets support for Middleman
 email:
 - me@tdreyno.com
@@ -181,7 +181,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2105704701769058929
+      hash: -2287386190982778371
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -190,10 +190,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2105704701769058929
+      hash: -2287386190982778371
 requirements: []
 rubyforge_project: middleman-sprockets
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Sprockets support for Middleman