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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a5cfa3e7f4b70073f96f63ddd743b58e0eacfb4
-  data.tar.gz: 389aa16cf984e6e88a1a465e5527204c690ffd8d
+  metadata.gz: 29e65d83fd264d3f669643e448e574c58bdb9094
+  data.tar.gz: b4e9eb5247e49d154ffb882a4e35a09a6f06062f
 SHA512:
-  metadata.gz: 3cb8e1bf9c4e31e8ace0cbb46aa86d401f7de990daa9a91047d74cbc788a15b8c66c55aef6df2c5d9819c5cb53fa8f73f5a65e27815b903c07bc6fc864a3c282
-  data.tar.gz: bd56bcd29857afb30ba1632e5d79b0dc0fd8b11f6333cb4f5a8b93c170d816ccc0a0d4b8c58607b84a3064ae47603b208b76f047161aaff77d3463fe71c7e24c
+  metadata.gz: 5ffc84a66db9426edab185bc9d2058545e9c76214ce2b6f4ff9cdd5bd47ba86a7f2130d36e09ee0b1ae859f020081bc7f7c3e9ec274811db0a19790c4985c5ba
+  data.tar.gz: bcc58588ae01b813edf13e9290949a16c50b664ce8689b2f91b5a4170bafc1f0f56c1461f6cd6d54a9e07030833a8cb9ce7e43e74242b1f78c5a6e544bfe046c

data/.travis.yml

@@ -2,22 +2,21 @@ rvm:
   - ruby-head
   - jruby-head
   - jruby-19mode
-  - 2.2
+  - 2.2.2
   - 2.1
   - 2.0
 os:
   - linux
   - osx
+sudo: false
 matrix:
   fast_finish: true
   allow_failures:
     - rvm: ruby-head
     - rvm: jruby-19mode
     - rvm: jruby-head
-
 gemfile:
   - Gemfile
-  - Gemfile-v3
 
 script: "bundle exec rake test"
 

data/Gemfile

@@ -1,30 +1,26 @@
 source "https://rubygems.org"
 
-gem "middleman-core", :github => "middleman/middleman", :branch => "master"
-gem "middleman-cli", :github => "middleman/middleman", :branch => "master"
-
 # 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 "middleman-cli", github: "middleman/middleman", branch: "master"
+gem "middleman-core", github: "middleman/middleman", branch: "master"
 
-# gem "sprockets", "3.0.0.beta.3"
-# gem 'sprockets-helpers', path: '~/Sites/sprockets-helpers'
-# gem 'sprockets-sass', path: '~/Sites/sprockets-sass'
+# Build and doc tools
+gem 'rake', '~> 10.3', require: false
+gem 'yard', '~> 0.8', require: false
 
 # Test tools
-gem "cucumber"
-gem "fivemat", "~> 1.2.1"
-gem "aruba"
-gem "rspec", "~> 3.0"
-gem "builder", "~> 3.0"
-gem "simplecov"
+gem 'pry', '~> 0.10', group: :development, require: false
+gem 'pry-byebug'
+gem 'aruba', '~> 0.7.4', require: false
+gem 'rspec', '~> 3.0', require: false
+gem 'cucumber', '~> 2.0', require: false
 
 # 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 "railties", "~> 4.2.0"
 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
@@ -34,4 +30,7 @@ gem "eco", "~> 1.0.0"
 gem "erubis", "~> 2.7.0"
 
 # Code Quality
-gem "cane", :platforms => [:mri_19, :mri_20], :require => false
+gem 'rubocop', '~> 0.24', require: false
+gem 'simplecov', '~> 0.9', require: false
+gem 'coveralls', '~> 0.8', require: false
+gem 'codeclimate-test-reporter', '~> 0.3', require: false, group: :test

data/README.md

@@ -13,64 +13,6 @@ middleman init MY_PROJECT
 
 If you already have a Middleman project: Add `gem "middleman-sprockets"` to your `Gemfile` and run `bundle install`
 
-## Configuration
-<a name="configuration"></a>
-
-```
-activate :sprockets
-```
-
-## Usage
-
-If you want to use, `middleman-sprockets` you need to configure it first - See
-[Configuration](#configuration). If you want to use `middleman-sprockets` with
-bower, you need to import assets first. The path is relative to your
-`bower`-directory.
-
-```
-sprockets.import_asset <path>
-```
-
-Given `vendor/assets/components` as `bower`-directory and `jquery` as
-component-name, you would import the `jquery` production version with:
-
-```
-sprockets.append_path 'vendor/assets/components'
-sprockets.import_asset 'jquery/dist/jquery'
-```
-
-If you tell `sprockets` just about the name of the component, it will make thos
-files available which are given in the `main`-section of the `bower.json`-file.
-
-```
-sprockets.append_path 'vendor/assets/components'
-sprockets.import_asset 'jquery'
-```
-
-If you need to tell `sprockets` to use an individual output path for your
-asset, you can pass `#import_asset` a block. This block gets the logical path
-as
-[`Pathname`](http://rdoc.info/stdlib/pathname/frames)
-and needs to return the relative output path for the asset as `String` or
-`Pathname`.
-
-```
-sprockets.append_path 'vendor/assets/components'
-
-# return logical path
-sprockets.import_asset 'jquery/dist/jquery' do |logical_path|
-  # => prefix/jquery/dist/jquery
-  Pathname.new('prefix') + logical_path
-end
-```
-
-Be careful if you are using `bower`-components which place their assets in
-*non-standard*-directories. Fonts should be placed in `fonts`, Stylesheets in
-`stylesheets` or `css`, JavaScript-files in `javascripts` or `js` and images in
-`images`. If you have got a `svg`-font in a *non*-standard-directory you might
-need to use the `#import_asset`-call with the block to place it in the correct
-directory.
-
 ## Build & Dependency Status
 
 [![Gem Version](https://badge.fury.io/rb/middleman-sprockets.png)][gem]

data/Rakefile

@@ -8,9 +8,7 @@ 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")
-  t.cucumber_opts = "--color #{exempt_tags.join(" ")} --strict --format #{ENV['CUCUMBER_FORMAT'] || 'Fivemat'}"
+  t.cucumber_opts = "--color #{exempt_tags.join(" ")} --strict"
 end
 
 RSpec::Core::RakeTask.new(:spec) do |t|
@@ -28,19 +26,6 @@ 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

@@ -1,4 +1,3 @@
-@new
 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"
@@ -9,7 +8,7 @@ Feature: Assets get a file hash appended to their URL and references to them are
       | images/100px-5fd6fb90.jpg |
       | images/100px-5fd6fb90.gif |
       | javascripts/application-df677242.js |
-      | stylesheets/site-b7f4d02f.css |
+      | stylesheets/site-2f4798cc.css |
       | index.html |
       | subdir/index.html |
       | other/index.html |
@@ -21,14 +20,14 @@ Feature: Assets get a file hash appended to their URL and references to them are
       | stylesheets/site.css |
       
     And the file "javascripts/application-df677242.js" should contain "img.src = '/images/100px-5fd6fb90.jpg'"
-    And the file "stylesheets/site-b7f4d02f.css" should contain 'background-image: url("../images/100px-5fd6fb90.jpg")'
-    And the file "index.html" should contain 'href="stylesheets/site-b7f4d02f.css"'
+    And the file "stylesheets/site-2f4798cc.css" should contain 'background-image: url(../images/100px-5fd6fb90.jpg)'
+    And the file "index.html" should contain 'href="stylesheets/site-2f4798cc.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-b7f4d02f.css"'
+    And the file "subdir/index.html" should contain 'href="../stylesheets/site-2f4798cc.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-b7f4d02f.css"'
+    And the file "other/index.html" should contain 'href="../stylesheets/site-2f4798cc.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"'
     

data/features/bower.feature

@@ -21,13 +21,13 @@ Feature: Bower
   Scenario: Assets can be added to the build with import_asset from bower dir
     Given a successfully built app at "bower-app"
     When I cd to "build"
-    Then a file named "javascripts/underscore/underscore.js" should exist
+    Then a file named "assets/underscore/underscore.js" should exist
 
   Scenario: Multiple assets can be added to the build with import_asset from bower dir and are placed in the correct directory
     Given a successfully built app at "bower-multiple-assets-app"
     When I cd to "build"
-    Then a file named "images/lightbox2/img/close.png" should exist
-    Then a file named "javascripts/lightbox2/js/lightbox.js" should exist
+    Then a file named "assets/lightbox2/img/close.png" should exist
+    Then a file named "assets/lightbox2/js/lightbox.js" should exist
 
   Scenario: Assets which haven't been imported don't appear in output directory
     Given a successfully built app at "bower-multiple-assets-app"
@@ -37,6 +37,6 @@ Feature: Bower
   Scenario: Assets can have an individual output directory
     Given a successfully built app at "bower-individual-outputdir-app"
     When I cd to "build"
-    Then a file named "underscore.js" should exist
-    And a file named "hello_world/lightbox2/img/close.png" should exist
-    And a file named "javascripts/lightbox2/js/lightbox.js" should exist
+    Then a file named "assets/underscore/underscore.js" should exist
+    And a file named "assets/lightbox2/img/close.png" should exist
+    And a file named "assets/lightbox2/js/lightbox.js" should exist

data/features/sprockets.feature

@@ -30,46 +30,6 @@ Feature: Sprockets
     When I go to "/javascripts/multiple_engines.js"
     Then I should see "Hello One"
 
-  Scenario: Sprockets JS should only contain body when requested
-    Given the Server is running at "sprockets-app2"
-    When I go to "/javascripts/sprockets_base.js?body=1"
-    Then I should see "base"
-    And I should not see "sprockets_sub_function"
-
-  Scenario: Script tags should be provided individually while debugging assets
-    Given the Server is running at "sprockets-app-debug-assets"
-    When I go to "/index.html"
-    Then I should see "data-name"
-    Then I should see 'src="/javascripts/dependency2.js?body=1"'
-    Then I should see 'src="/javascripts/dependency1.js?body=1"'
-    Then I should see 'src="/javascripts/main.js?body=1"'
-
-  Scenario: External script tags should not be changed
-    Given the Server is running at "sprockets-app-debug-assets"
-    When I go to "/index.html"
-    Then I should see 'src="//domain.com/script.js"'
-    Then I should see 'src="http://domain.com/script.js"'
-    Then I should see 'src="https://domain.com/script.js"'
-
- Scenario: Sprockets CSS should only contain body when requested
-    Given the Server is running at "sprockets-app-debug-assets"
-    When I go to "/stylesheets/app.css?body=1"
-    Then I should see "body"
-
-  Scenario: Stylesheets tags should be provided individually while debugging assets
-    Given the Server is running at "sprockets-app-debug-assets"
-    When I go to "/index.html"
-    Then I should see 'href="/stylesheets/app.css?body=1"'
-    Then I should see 'href="/stylesheets/dependency1.css?body=1"'
-    Then I should see 'href="/stylesheets/dependency2.css?body=1"'
-
-  Scenario: External stylesheet tags should not be changed
-    Given the Server is running at "sprockets-app-debug-assets"
-    When I go to "/index.html"
-    Then I should see 'href="//domain.com/styles.css"'
-    Then I should see 'href="http://domain.com/styles.css"'
-    Then I should see 'href="https://domain.com/styles.css"'
-
   Scenario: Multiple engine files should build correctly
     Given a successfully built app at "sprockets-app2"
     When I cd to "build"
@@ -107,54 +67,42 @@ Feature: Sprockets
     Then I should see 'src="/library/images/cat.jpg"'
     And I should see 'src="/library/images/cat-2.jpg"'
     When I go to "/library/images/cat.jpg"
-    Then I should get a response with status "200"
+    Then the status code should be "200"
     When I go to "/library/images/cat-2.jpg"
-    Then I should get a response with status "200"
+    Then the status code should be "200"
 
   Scenario: Assets built through import_asset are built with the right extension
     Given a successfully built app at "sprockets-app"
     When I cd to "build"
     # source file is /library/css/vendored.css.scss
-    Then a file named "library/css/vendored.css" should exist
+    Then a file named "assets/vendored.css" should exist
     # source file is /library/css/coffee.js.coffee
-    Then a file named "library/js/coffee.js" should exist
+    Then a file named "assets/coffee.js" should exist
 
   Scenario: Vendor assets get right extension
     Given the Server is running at "sprockets-app"
     # source file is /library/css/vendored.css.scss
-    When I go to "/library/css/vendored.css"
+    When I go to "/assets/vendored.css"
     And I should see 'background: brown;'
     # source file is /library/js/coffee.js.coffee
-    When I go to "/library/js/coffee.js"
+    When I go to "/assets/coffee.js"
     And I should see 'return console.log("bar");'
 
   Scenario: Assets built through import_asset are built with the right extension
     Given a successfully built app at "sprockets-svg-font-app"
     When I cd to "build"
-    Then a file named "fonts/font-awesome/fonts/fontawesome-webfont-bower.svg" should exist
-    Then a file named "fonts/font-awesome/fonts/fontawesome-webfont-bower.svg.gz" should exist
-    Then a file named "fonts/font-awesome/fonts/fontawesome-webfont-bower.ttf.gz" should exist
+    Then a file named "assets/font-awesome/fonts/fontawesome-webfont-bower.svg" should exist
+    Then a file named "assets/font-awesome/fonts/fontawesome-webfont-bower.svg.gz" should exist
+    Then a file named "assets/font-awesome/fonts/fontawesome-webfont-bower.ttf.gz" should exist
     Then a file named "fonts/fontawesome-webfont-source.svg" should exist
     Then a file named "fonts/fontawesome-webfont-source.svg.gz" should exist
     Then a file named "images/fontawesome-webfont-source.svg" should not exist
     Then a file named "images/drawing-source.svg" should exist
-    Then a file named "images/blub/images/drawing-bower.svg" should exist
+    Then a file named "assets/blub/images/drawing-bower.svg" should exist
 
   Scenario: Assets with multiple extensions
     Given a successfully built app at "sprockets-multiple-extensions-app"
     When I cd to "build"
-    Then a file named "fonts/font-awesome/fonts/fontawesome-webfont-bower.svg.gz" should exist
-    Then a file named "javascripts/jquery/jquery.min.js" should exist
-    Then a file named "javascripts/jquery/jquery.asdf.asdf.js.min.asdf" should exist
-
-  Scenario: Imported Asset matches multiple sprockets paths
-    Given a successfully built app at "sprockets-imported-assets-match-multiple-paths-app"
-    When I cd to "build"
-    Then a file named "assets/css/test.css" should exist
-    And a file named "assets/css/css/test.css" should not exist
-
-  Scenario: Imported Asset has a different 'asset type' directory than in config
-    Given a successfully built app at "sprockets-imported-asset-path-conflicts-app"
-    When I cd to "build"
-    Then a file named "assets/css/test.css" should exist
-    And a file named "assets/css/stylesheets/test.css" should not exist
+    Then a file named "assets/font-awesome/fonts/fontawesome-webfont-bower.svg.gz" should exist
+    Then a file named "assets/jquery/jquery.min.js" should exist
+    Then a file named "assets/jquery/jquery.asdf.asdf.js.min.asdf" should exist

data/features/sprockets_gems.feature

@@ -22,15 +22,15 @@ Feature: Sprockets Gems
   Scenario: Proper reference to images from a gem, in preview
     Given the Server is running at "jquery-mobile-app"
     When I go to "/stylesheets/base.css"
-    Then I should see 'url("/images/jquery-mobile/ajax-loader.gif")'
+    Then I should see 'url("/assets/jquery-mobile/ajax-loader.gif")'
 
   Scenario: Proper reference to images from a gem, in build
     Given a successfully built app at "jquery-mobile-app"
     When I cd to "build"
     Then the following files should exist:
       | stylesheets/base.css |
-      | images/jquery-mobile/ajax-loader.gif |
-    And the file "stylesheets/base.css" should contain 'url("/images/jquery-mobile/ajax-loader.gif")'
+      | assets/jquery-mobile/ajax-loader.gif |
+    And the file "stylesheets/base.css" should contain 'url(/assets/jquery-mobile/ajax-loader.gif)'
 
   Scenario: Same thing, but with :relative_assets on
     Given a fixture app "jquery-mobile-app"
@@ -40,28 +40,9 @@ Feature: Sprockets Gems
       """
     Given the Server is running at "jquery-mobile-app"
     When I go to "/stylesheets/base.css"
-    Then I should see 'url("../images/jquery-mobile/ajax-loader.gif")'
-
-  Scenario: JS/CSS from gems aren't aumatically in the site
-    Given the Server is running at "jquery-mobile-app"
-    When I go to "/javascripts/jquery.mobile.js"
-    Then I should get a response with status "404"
+    Then I should see 'url("../assets/jquery-mobile/ajax-loader.gif")'
 
   Scenario: JS/CSS from gems can be declared to be accessible
-    Given a fixture app "jquery-mobile-app"
-    Given a file named "config.rb" with:
-      """
-      after_configuration do
-        sprockets.import_asset 'jquery.mobile'
-      end
-      """
-    And the Server is running at "jquery-mobile-app"
-    When I go to "/javascripts/jquery.mobile.js"
-    Then I should get a response with status "200"
-
-  Scenario: JS/CSS from gems are accessible when debugging assets and they are required
-    Given the Server is running at "sprockets-app-debug-assets"
-    And the Server is running at "sprockets-app-debug-assets"
-    When I go to "/index.html"
-    When I go to "/javascripts/bootstrap/alert.js?body=1"
-    Then I should get a response with status "200"
+    Given the Server is running at "jquery-mobile-app"
+    When I go to "/assets/jquery.mobile.js"
+    Then the status code should be "200"

data/features/step_definitions/server_steps.rb

@@ -1,7 +1,3 @@
-Then /^I should get a response with status "(.*?)"$/ do |status|
-  (@last_response || @browser.last_response).status.should == status.to_i
-end
-
 Given /^wait a second$/ do
   sleep(1)
 end

data/fixtures/asset-paths-app/config.rb

@@ -1,4 +1 @@
-# Until Middleman is fixed to load Sprockets before config.rb, we have to do this
-after_configuration do
-  sprockets.append_path "#{root}/derp/javascripts/"
-end
+sprockets.append_path "#{root}/derp/javascripts/"

data/fixtures/bower-app/config.rb

@@ -1,3 +1 @@
 sprockets.append_path File.join(root, 'bower_components')
-
-sprockets.import_asset 'underscore/underscore'

data/fixtures/bower-app/source/javascripts/application.js

@@ -1 +1 @@
-//= require underscore/underscore
+//= require underscore/underscore

data/fixtures/bower-app/source/javascripts/import.js

@@ -0,0 +1 @@
+//= link underscore/underscore

data/fixtures/bower-individual-outputdir-app/config.rb

@@ -1,6 +1,2 @@
 sprockets.append_path File.join(root, 'bower_components')
-
 sprockets.append_path File.join(root, 'vendor/assets/components')
-sprockets.import_asset('underscore/underscore.js') { 'underscore.js' }
-sprockets.import_asset('lightbox2/img/close.png') { |logical_path| Pathname.new('hello_world') + logical_path }
-sprockets.import_asset('lightbox2/js/lightbox.js')