middleman-sprockets 4.0.0.beta.1 → 4.0.0.rc.1

data/lib/middleman-sprockets/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module Sprockets
-    VERSION = "4.0.0.beta.1"
+    VERSION = "4.0.0.rc.1"
   end
 end

data/middleman-sprockets.gemspec

@@ -15,8 +15,6 @@ 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.3"])
-  s.add_dependency("sprockets", [">= 2.12.1"])
-  s.add_dependency("sprockets-sass", ["~> 1.3.0"])
-  s.add_dependency("sprockets-helpers", ["~> 1.1.0"])
+  s.add_dependency("middleman-core", [">= 4.0.0.rc.1"])
+  s.add_dependency("sprockets", ["~> 3.0"])
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-sprockets
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta.1
+  version: 4.0.0.rc.1
 platform: ruby
 authors:
 - Thomas Reynolds
@@ -10,64 +10,36 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-02 00:00:00.000000000 Z
+date: 2015-09-16 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.3'
+        version: 4.0.0.rc.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: 4.0.0.rc.1
 - !ruby/object:Gem::Dependency
   name: sprockets
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.12.1
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.12.1
-- !ruby/object:Gem::Dependency
-  name: sprockets-sass
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.0
-- !ruby/object:Gem::Dependency
-  name: sprockets-helpers
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '3.0'
 description: Sprockets support for Middleman
 email:
 - me@tdreyno.com
@@ -77,19 +49,16 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .simplecov
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".simplecov"
+- ".travis.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
-- Gemfile-Sprockets3
-- Gemfile-v3
 - LICENSE.md
 - README.md
 - Rakefile
-- features/asset_hash-3.0.feature
 - features/asset_hash.feature
 - features/bower.feature
 - features/jst.feature
@@ -133,6 +102,7 @@ files:
 - fixtures/bower-app/bower_components/underscore/underscore.js
 - fixtures/bower-app/config.rb
 - fixtures/bower-app/source/javascripts/application.js
+- fixtures/bower-app/source/javascripts/import.js
 - fixtures/bower-individual-outputdir-app/bower.json
 - fixtures/bower-individual-outputdir-app/bower_components/underscore/bower.json
 - fixtures/bower-individual-outputdir-app/bower_components/underscore/underscore.js
@@ -149,6 +119,8 @@ files:
 - fixtures/bower-multiple-assets-app/.bowerrc
 - fixtures/bower-multiple-assets-app/bower.json
 - fixtures/bower-multiple-assets-app/config.rb
+- fixtures/bower-multiple-assets-app/source/index.html
+- fixtures/bower-multiple-assets-app/source/javascripts/core.js
 - fixtures/bower-multiple-assets-app/vendor/assets/components/lightbox2/.bower.json
 - fixtures/bower-multiple-assets-app/vendor/assets/components/lightbox2/bower.json
 - fixtures/bower-multiple-assets-app/vendor/assets/components/lightbox2/img/close.png
@@ -162,6 +134,7 @@ files:
 - fixtures/glob-app/source/stylesheets/shared/3rd-party/bootstrap.sass
 - fixtures/glob-app/source/stylesheets/shared/shared.scss
 - fixtures/jquery-mobile-app/config.rb
+- fixtures/jquery-mobile-app/source/javascripts/app.js
 - fixtures/jquery-mobile-app/source/stylesheets/base.css.scss
 - fixtures/long-filenames-app/config.rb
 - fixtures/long-filenames-app/source/images/00000000-0000-0000-0000-000000.svg
@@ -174,14 +147,6 @@ files:
 - fixtures/preview-app/source/stylesheets/main.css.sass
 - fixtures/preview-app/source/stylesheets/main2.css.sass
 - fixtures/preview-app/source/stylesheets/plain.css.sass
-- fixtures/sprockets-app-debug-assets/config.rb
-- fixtures/sprockets-app-debug-assets/source/index.html.erb
-- fixtures/sprockets-app-debug-assets/source/javascripts/dependency1.js
-- fixtures/sprockets-app-debug-assets/source/javascripts/dependency2.js
-- fixtures/sprockets-app-debug-assets/source/javascripts/main.js
-- fixtures/sprockets-app-debug-assets/source/stylesheets/app.css.scss
-- fixtures/sprockets-app-debug-assets/source/stylesheets/dependency1.css
-- fixtures/sprockets-app-debug-assets/source/stylesheets/dependency2.css.scss
 - fixtures/sprockets-app/config.rb
 - fixtures/sprockets-app/source/index.html.erb
 - fixtures/sprockets-app/source/library/css/bootstrap_include.css.scss
@@ -222,6 +187,7 @@ files:
 - fixtures/sprockets-multiple-extensions-app/config.rb
 - fixtures/sprockets-multiple-extensions-app/source/fonts/fontawesome-webfont-source.svg.gz
 - fixtures/sprockets-multiple-extensions-app/source/images/drawing-source.svg
+- fixtures/sprockets-multiple-extensions-app/source/stylesheets/app.css.scss
 - fixtures/sprockets-multiple-extensions-app/vendor/assets/components/font-awesome/fonts/fontawesome-webfont-bower.svg.gz
 - fixtures/sprockets-multiple-extensions-app/vendor/assets/components/jquery/jquery.asdf.asdf.js.min.asdf
 - fixtures/sprockets-multiple-extensions-app/vendor/assets/components/jquery/jquery.min.js
@@ -230,23 +196,15 @@ files:
 - fixtures/sprockets-svg-font-app/source/fonts/fontawesome-webfont-source.svg
 - fixtures/sprockets-svg-font-app/source/fonts/fontawesome-webfont-source.svg.gz
 - fixtures/sprockets-svg-font-app/source/images/drawing-source.svg
+- fixtures/sprockets-svg-font-app/source/stylesheets/app.css.scss
 - fixtures/sprockets-svg-font-app/vendor/assets/components/blub/images/drawing-bower.svg
 - fixtures/sprockets-svg-font-app/vendor/assets/components/font-awesome/fonts/fontawesome-webfont-bower.svg
 - fixtures/sprockets-svg-font-app/vendor/assets/components/font-awesome/fonts/fontawesome-webfont-bower.svg.gz
 - fixtures/sprockets-svg-font-app/vendor/assets/components/font-awesome/fonts/fontawesome-webfont-bower.ttf.gz
 - lib/middleman-sprockets.rb
-- lib/middleman-sprockets/asset.rb
-- lib/middleman-sprockets/asset_tag_helpers.rb
-- lib/middleman-sprockets/config_only_environment.rb
-- lib/middleman-sprockets/environment.rb
 - lib/middleman-sprockets/extension.rb
-- lib/middleman-sprockets/imported_asset.rb
-- lib/middleman-sprockets/sass_function_hack.rb
-- lib/middleman-sprockets/sass_utils.rb
 - lib/middleman-sprockets/version.rb
 - middleman-sprockets.gemspec
-- spec/asset_spec.rb
-- spec/imported_asset_spec.rb
 - spec/spec_helper.rb
 - spec/support/aruba.rb
 - spec/support/rspec.rb
@@ -260,22 +218,21 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Sprockets support for Middleman
 test_files:
-- features/asset_hash-3.0.feature
 - features/asset_hash.feature
 - features/bower.feature
 - features/jst.feature
@@ -319,6 +276,7 @@ test_files:
 - fixtures/bower-app/bower_components/underscore/underscore.js
 - fixtures/bower-app/config.rb
 - fixtures/bower-app/source/javascripts/application.js
+- fixtures/bower-app/source/javascripts/import.js
 - fixtures/bower-individual-outputdir-app/bower.json
 - fixtures/bower-individual-outputdir-app/bower_components/underscore/bower.json
 - fixtures/bower-individual-outputdir-app/bower_components/underscore/underscore.js
@@ -335,6 +293,8 @@ test_files:
 - fixtures/bower-multiple-assets-app/.bowerrc
 - fixtures/bower-multiple-assets-app/bower.json
 - fixtures/bower-multiple-assets-app/config.rb
+- fixtures/bower-multiple-assets-app/source/index.html
+- fixtures/bower-multiple-assets-app/source/javascripts/core.js
 - fixtures/bower-multiple-assets-app/vendor/assets/components/lightbox2/.bower.json
 - fixtures/bower-multiple-assets-app/vendor/assets/components/lightbox2/bower.json
 - fixtures/bower-multiple-assets-app/vendor/assets/components/lightbox2/img/close.png
@@ -348,6 +308,7 @@ test_files:
 - fixtures/glob-app/source/stylesheets/shared/3rd-party/bootstrap.sass
 - fixtures/glob-app/source/stylesheets/shared/shared.scss
 - fixtures/jquery-mobile-app/config.rb
+- fixtures/jquery-mobile-app/source/javascripts/app.js
 - fixtures/jquery-mobile-app/source/stylesheets/base.css.scss
 - fixtures/long-filenames-app/config.rb
 - fixtures/long-filenames-app/source/images/00000000-0000-0000-0000-000000.svg
@@ -360,14 +321,6 @@ test_files:
 - fixtures/preview-app/source/stylesheets/main.css.sass
 - fixtures/preview-app/source/stylesheets/main2.css.sass
 - fixtures/preview-app/source/stylesheets/plain.css.sass
-- fixtures/sprockets-app-debug-assets/config.rb
-- fixtures/sprockets-app-debug-assets/source/index.html.erb
-- fixtures/sprockets-app-debug-assets/source/javascripts/dependency1.js
-- fixtures/sprockets-app-debug-assets/source/javascripts/dependency2.js
-- fixtures/sprockets-app-debug-assets/source/javascripts/main.js
-- fixtures/sprockets-app-debug-assets/source/stylesheets/app.css.scss
-- fixtures/sprockets-app-debug-assets/source/stylesheets/dependency1.css
-- fixtures/sprockets-app-debug-assets/source/stylesheets/dependency2.css.scss
 - fixtures/sprockets-app/config.rb
 - fixtures/sprockets-app/source/index.html.erb
 - fixtures/sprockets-app/source/library/css/bootstrap_include.css.scss
@@ -408,6 +361,7 @@ test_files:
 - fixtures/sprockets-multiple-extensions-app/config.rb
 - fixtures/sprockets-multiple-extensions-app/source/fonts/fontawesome-webfont-source.svg.gz
 - fixtures/sprockets-multiple-extensions-app/source/images/drawing-source.svg
+- fixtures/sprockets-multiple-extensions-app/source/stylesheets/app.css.scss
 - fixtures/sprockets-multiple-extensions-app/vendor/assets/components/font-awesome/fonts/fontawesome-webfont-bower.svg.gz
 - fixtures/sprockets-multiple-extensions-app/vendor/assets/components/jquery/jquery.asdf.asdf.js.min.asdf
 - fixtures/sprockets-multiple-extensions-app/vendor/assets/components/jquery/jquery.min.js
@@ -416,6 +370,7 @@ test_files:
 - fixtures/sprockets-svg-font-app/source/fonts/fontawesome-webfont-source.svg
 - fixtures/sprockets-svg-font-app/source/fonts/fontawesome-webfont-source.svg.gz
 - fixtures/sprockets-svg-font-app/source/images/drawing-source.svg
+- fixtures/sprockets-svg-font-app/source/stylesheets/app.css.scss
 - fixtures/sprockets-svg-font-app/vendor/assets/components/blub/images/drawing-bower.svg
 - fixtures/sprockets-svg-font-app/vendor/assets/components/font-awesome/fonts/fontawesome-webfont-bower.svg
 - fixtures/sprockets-svg-font-app/vendor/assets/components/font-awesome/fonts/fontawesome-webfont-bower.svg.gz

data/Gemfile-Sprockets3

@@ -1,36 +0,0 @@
-source "https://rubygems.org"
-
-gem "middleman-core", :github => "middleman/middleman", :branch => "v3-stable"
-
-# Specify your gem's dependencies in middleman-sprockets.gemspec
-gemspec
-
-gem "rake", "~> 10.0.3", :require => false
-gem "yard", "~> 0.8.0", :require => false
-
-gem "sprockets", "3.0.0.beta.10"
-gem 'sprockets-helpers', path: '~/Sites/sprockets-helpers'
-gem 'sprockets-sass', path: '~/Sites/sprockets-sass'
-
-# Test tools
-gem "cucumber"
-gem "fivemat", "~> 1.2.1"
-gem "aruba"
-gem "rspec", "~> 3.0"
-gem "builder", "~> 3.0"
-gem "simplecov"
-
-# For actual tests
-# Make sure to lock down the versions of the asset gems
-# so they don't cause asset hashes to change.
-gem "railties", "~> 4.1"
-gem "jquery-rails", "3.1.0", :require => false
-gem "bootstrap-sass", "3.1.1.0", :require => false
-gem "jquery_mobile_rails", "1.4.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/Gemfile-v3

@@ -1,36 +0,0 @@
-source "https://rubygems.org"
-
-gem "middleman-core", :github => "middleman/middleman", :branch => "v3-stable"
-
-# Specify your gem's dependencies in middleman-sprockets.gemspec
-gemspec
-
-gem "rake", "~> 10.0.3", :require => false
-gem "yard", "~> 0.8.0", :require => false
-
-# gem "sprockets", "3.0.0.beta.3"
-# gem 'sprockets-helpers', path: '~/Sites/sprockets-helpers'
-# gem 'sprockets-sass', path: '~/Sites/sprockets-sass'
-
-# Test tools
-gem "cucumber"
-gem "fivemat", "~> 1.2.1"
-gem "aruba"
-gem "rspec", "~> 3.0"
-gem "builder", "~> 3.0"
-gem "simplecov"
-
-# For actual tests
-# Make sure to lock down the versions of the asset gems
-# so they don't cause asset hashes to change.
-gem "railties", "~> 4.1"
-gem "jquery-rails", "3.1.0", :require => false
-gem "bootstrap-sass", "3.1.1.0", :require => false
-gem "jquery_mobile_rails", "1.4.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/features/asset_hash-3.0.feature

@@ -1,105 +0,0 @@
-@old
-Feature: Assets get a file hash appended to their URL and references to them are updated
-  Scenario: Hashed-asset files are produced, and HTML, CSS, and JavaScript gets rewritten to reference the new files
-    Given a successfully built app at "asset-hash-app"
-    When I cd to "build"
-    Then the following files should exist:
-      | index.html |
-      | images/100px-1242c368.png |
-      | images/100px-5fd6fb90.jpg |
-      | images/100px-5fd6fb90.gif |
-      | javascripts/application-df677242.js |
-      | stylesheets/site-570b0b7d.css |
-      | index.html |
-      | subdir/index.html |
-      | other/index.html |
-    And the following files should not exist:
-      | images/100px.png |
-      | images/100px.jpg |
-      | images/100px.gif |
-      | javascripts/application.js |
-      | stylesheets/site.css |
-      
-    And the file "javascripts/application-df677242.js" should contain "img.src = '/images/100px-5fd6fb90.jpg'"
-    And the file "stylesheets/site-570b0b7d.css" should contain 'background-image: url("../images/100px-5fd6fb90.jpg")'
-    And the file "index.html" should contain 'href="stylesheets/site-570b0b7d.css"'
-    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-570b0b7d.css"'
-    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-570b0b7d.css"'
-    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-570b0b7d.css"'
-    Then I should see 'href="stylesheets/jquery-mobile-044da59f.css"'
-    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-570b0b7d.css"'
-    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-570b0b7d.css"'
-    And I should see 'src="../javascripts/application-df677242.js"'
-    And I should see 'src="../images/100px-5fd6fb90.jpg"'
-    When I go to "/javascripts/application-df677242.js"
-    Then I should see "img.src = '/images/100px-5fd6fb90.jpg'"
-    When I go to "/stylesheets/site-570b0b7d.css"
-    Then I should see 'background-image: url("../images/100px-5fd6fb90.jpg")'
-    When I go to "/stylesheets/jquery-mobile-044da59f.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  
-    Given the Server is running at "asset-hash-host-app"
-    When I go to "/"
-    Then I should see 'href="http://middlemanapp.com/stylesheets/site-72c69c91.css"'
-    And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg"'
-    When I go to "/subdir/"
-    Then I should see 'href="http://middlemanapp.com/stylesheets/site-72c69c91.css"'
-    And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg"'
-    When I go to "/other/"
-    Then I should see 'href="http://middlemanapp.com/stylesheets/site-72c69c91.css"'
-    And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg"'
-
-  Scenario: The asset hash should change when a SASS partial changes
-    Given the Server is running at "asset-hash-app"
-    And the file "source/stylesheets/_partial.sass" has the contents
-      """
-      body
-        font-size: 14px
-      """
-    When I go to "/partials/"
-    Then I should see 'href="../stylesheets/uses_partials-423a00f7.css'
-    And wait a second
-    And the file "source/stylesheets/_partial.sass" has the contents
-      """
-      body
-        font-size: 18px !important
-      """
-    When I go to "/partials/"
-    Then I should see 'href="../stylesheets/uses_partials-e8c3d4eb.css'
-
-  Scenario: The asset hash should change when a Javascript partial changes
-    Given the Server is running at "asset-hash-app"
-    And the file "source/javascripts/sprockets_sub.js" has the contents
-      """
-      function sprockets_sub_function() { }
-      """
-    When I go to "/partials/"
-    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 wait a second
-    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-5121d891.js'
-    When I go to "/javascripts/sprockets_base-5121d891.js"
-    Then I should see "sprockets_sub2_function"