middleman-sprockets 3.5.0 → 4.0.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f72f296a723b4ff315df8ae5613bebd5a7338a5
-  data.tar.gz: 23a9b9ea030bdc0dc0de50d17614896ac1e2cbaf
+  metadata.gz: 4a5cfa3e7f4b70073f96f63ddd743b58e0eacfb4
+  data.tar.gz: 389aa16cf984e6e88a1a465e5527204c690ffd8d
 SHA512:
-  metadata.gz: 6edd63315b2d4ffc601ce01fa4fe8a54595b5e9c4d70691552195fce9f754b9ac07af4f07e78d98132c1e884b5f8b8ee6dea711a90f7f705241fc6f259dca324
-  data.tar.gz: 0f51a95dba5ea25569b8a6a6e140d73b7f615c936a595e2d098c51db9b4606775e575f17d7bf3ce8f61340546adf6ef86a4be7342fea61b96af6c979cf2eda2d
+  metadata.gz: 3cb8e1bf9c4e31e8ace0cbb46aa86d401f7de990daa9a91047d74cbc788a15b8c66c55aef6df2c5d9819c5cb53fa8f73f5a65e27815b903c07bc6fc864a3c282
+  data.tar.gz: bd56bcd29857afb30ba1632e5d79b0dc0fd8b11f6333cb4f5a8b93c170d816ccc0a0d4b8c58607b84a3064ae47603b208b76f047161aaff77d3463fe71c7e24c

data/.travis.yml

@@ -1,21 +1,24 @@
-language: ruby
-cache: bundler
-sudo: false
-env: TEST=true
-
 rvm:
-  - 2.0.0
-  - 2.1
-  - 2.2.5
-  - 2.3.1
   - ruby-head
+  - jruby-head
+  - jruby-19mode
+  - 2.2
+  - 2.1
+  - 2.0
+os:
+  - linux
+  - osx
+matrix:
+  fast_finish: true
+  allow_failures:
+    - rvm: ruby-head
+    - rvm: jruby-19mode
+    - rvm: jruby-head
 
 gemfile:
   - Gemfile
+  - Gemfile-v3
 
 script: "bundle exec rake test"
 
-matrix:
-  fast_finish: true
-  allow_failures:
-    - rvm: ruby-head
+env: TEST=true

data/CHANGELOG.md

@@ -1,8 +1,3 @@
-3.5.0
-===
-
-* Allow ignoring paths from imported gems [@zach-capalbo](https://github.com/middleman/middleman-sprockets/pull/118)
-
 3.4.2
 ===
 

data/Gemfile

@@ -1,6 +1,7 @@
 source "https://rubygems.org"
 
-gem "middleman-core", :github => "middleman/middleman", :branch => "v3-stable"
+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
@@ -8,9 +9,14 @@ 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", "~> 2.0"
-gem "aruba", "~> 0.10.0"
+gem "cucumber"
+gem "fivemat", "~> 1.2.1"
+gem "aruba"
 gem "rspec", "~> 3.0"
 gem "builder", "~> 3.0"
 gem "simplecov"
@@ -18,7 +24,7 @@ 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.0"
+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
@@ -26,7 +32,6 @@ gem "jquery_mobile_rails", "1.4.1", :require => false
 gem "ejs", "~> 1.1.1"
 gem "eco", "~> 1.0.0"
 gem "erubis", "~> 2.7.0"
-gem "pry-byebug"
 
 # Code Quality
 gem "cane", :platforms => [:mri_19, :mri_20], :require => false

data/Gemfile-Sprockets3

@@ -0,0 +1,36 @@
+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

@@ -0,0 +1,36 @@
+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/README.md

@@ -71,14 +71,6 @@ Be careful if you are using `bower`-components which place their assets in
 need to use the `#import_asset`-call with the block to place it in the correct
 directory.
 
-**Ignoring imported assets**
-
-Sometimes you may not wish to include all assets from an asset gem. For example lets take the jquery-mobile gem, it includes a bunch of images that you may not want included in your build. Pass a regex to match the path to `sprockets.ignore_path`. Like, `append_path`, you may add multiple.
-
-```ruby
-sprockets.ignore_path /jquery\-mobile/
-```
-
 ## Build & Dependency Status
 
 [![Gem Version](https://badge.fury.io/rb/middleman-sprockets.png)][gem]

data/Rakefile

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

data/features/sprockets.feature

@@ -107,9 +107,9 @@ 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 the status code should be "200"
+    Then I should get a response with status "200"
     When I go to "/library/images/cat-2.jpg"
-    Then the status code should be "200"
+    Then I should get a response with status "200"
 
   Scenario: Assets built through import_asset are built with the right extension
     Given a successfully built app at "sprockets-app"

data/features/sprockets_gems.feature

@@ -45,7 +45,7 @@ Feature: Sprockets Gems
   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 the status code should be "404"
+    Then I should get a response with status "404"
 
   Scenario: JS/CSS from gems can be declared to be accessible
     Given a fixture app "jquery-mobile-app"
@@ -57,11 +57,11 @@ Feature: Sprockets Gems
       """
     And the Server is running at "jquery-mobile-app"
     When I go to "/javascripts/jquery.mobile.js"
-    Then the status code should be "200"
+    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 the status code should be "200"
+    Then I should get a response with status "200"

data/features/step_definitions/server_steps.rb

@@ -1,16 +1,7 @@
-Given /^wait a second$/ do
-  sleep(1)
-end
-
-Given /^binding\.pry$/ do
-  require "pry"
-  binding.pry
+Then /^I should get a response with status "(.*?)"$/ do |status|
+  (@last_response || @browser.last_response).status.should == status.to_i
 end
 
-Then /^the sitemap should not include "([^\"]*)"$/ do |path|
-  expect( @server_inst.sitemap.resources.map(&:url) ).not_to include path
+Given /^wait a second$/ do
+  sleep(1)
 end
-
-Then /^the sitemap should include "([^\"]*)"$/ do |path|
-  expect( @server_inst.sitemap.resources.map(&:url) ).to include path
-end

data/lib/middleman-sprockets/config_only_environment.rb

@@ -9,13 +9,11 @@ module Middleman
       attr_reader :imported_assets
       attr_reader :appended_paths
       attr_reader :prepended_paths
-      attr_reader :ignored_paths
 
       def initialize(options={})
         @imported_assets = []
         @appended_paths = []
         @prepended_paths = []
-        @ignored_paths = []
       end
 
       def method_missing?(method)
@@ -47,10 +45,6 @@ module Middleman
       def prepend_path(path)
         @prepended_paths << path
       end
-
-      def ignore_path(path)
-        @ignored_paths << path
-      end
     end
   end
 end

data/lib/middleman-sprockets/environment.rb

@@ -25,7 +25,7 @@ module Middleman
         # By default, sprockets has no cache! Give it an in-memory one using a Hash
         # There is also a Sprockets::Cache::FileStore option, but it is fraught with cache-invalidation
         # peril, so we choose not to use it.
-        @cache = {}
+        @cache = FakeCache.new
 
         enhance_context_class!
 
@@ -225,7 +225,11 @@ module Middleman
         # Fix https://github.com/sstephenson/sprockets/issues/533
         if resource && File.basename(resource.path) == 'bower.json'
           file = ::Rack::File.new nil
-          file.path = resource.source_file
+          file.path = if resource.source_file.is_a? String
+            resource.source_file
+          else
+            resource.source_file[:full_path]
+          end
           response = file.serving({})
           response[1]['Content-Type'] = resource.content_type
           return response
@@ -252,6 +256,38 @@ module Middleman
 
         @app.sitemap.rebuild_resource_list!(:sprockets_import_asset)
       end
+
+      # Sprocket 3 API change :(
+      def files_in_paths(load_paths)
+        if self.respond_to?(:each_entry)
+          load_paths.flat_map do |path|
+            output = []
+
+            self.each_entry(path).each do |p|
+              output << [p, path]
+            end
+
+            output
+          end
+        else
+          logical_paths.map do |_, path|
+            found_path = load_paths.find do |load_path|
+              path.start_with?(load_path)
+            end
+
+            if found_path
+              [Pathname(path), found_path]
+            else
+              nil
+            end
+          end.reject(&:nil?)
+        end
+      end
+    end
+
+    class FakeCache < Hash
+      alias_method :_get, :[]
+      alias_method :_set, :[]=
     end
   end
 end

data/lib/middleman-sprockets/extension.rb

@@ -18,6 +18,8 @@ class Sprockets::Sass::SassTemplate
   end
 end
 
+IS_V4 = ::Middleman::Extension.respond_to? :expose_to_config
+
 # Sprockets extension
 module Middleman
   class SprocketsExtension < Extension
@@ -25,6 +27,11 @@ module Middleman
 
     attr_reader :environment
 
+    if IS_V4
+      expose_to_config sprockets: :environment
+      expose_to_template sprockets: :environment
+    end
+
     # This module gets mixed into both the Middleman instance and the Middleman class,
     # so that it's available in config.rb
     module SprocketsAccessor
@@ -44,22 +51,28 @@ module Middleman
       # Start out with a stub environment that can only be configured (paths and such)
       @environment = ::Middleman::Sprockets::ConfigOnlyEnvironment.new
 
-      # v4
-      if app.respond_to? :add_to_config_context
-        app.add_to_config_context :sprockets, &method(:environment)
-      else
-        app.send :include, SprocketsAccessor
-      end
+      # v3
+      app.send :include, SprocketsAccessor if !IS_V4
     end
 
     helpers do
-      include SprocketsAccessor
+      include SprocketsAccessor if !IS_V4
       include ::Middleman::Sprockets::AssetTagHelpers
     end
 
     def after_configuration
-      ::Tilt.register ::Sprockets::EjsTemplate, 'ejs'
-      ::Tilt.register ::Sprockets::EcoTemplate, 'eco'
+      begin
+        require 'ejs'
+        ::Tilt.register ::Sprockets::EjsTemplate, 'ejs'
+      rescue LoadError
+      end
+
+      begin
+        require 'eco'
+        ::Tilt.register ::Sprockets::EcoTemplate, 'eco'
+      rescue LoadError
+      end
+
       ::Tilt.register ::Sprockets::JstProcessor, 'jst'
 
       if app.respond_to?(:template_extensions)
@@ -75,7 +88,6 @@ module Middleman
       @environment = ::Middleman::Sprockets::Environment.new(app, :debug_assets => debug_assets)
       config_environment.apply_to_environment(@environment)
 
-      @config_environment = config_environment
       append_paths_from_gems
       import_images_and_fonts_from_gems
 
@@ -99,13 +111,14 @@ module Middleman
       environment.prune_imported_assets!
       environment.imported_assets.each do |imported_asset|
         asset = Middleman::Sprockets::Asset.new @app, imported_asset.logical_path, environment
+
         if imported_asset.output_path
           destination = imported_asset.output_path
         else
           destination = @app.sitemap.extensionless_path( asset.destination_path.to_s )
         end
 
-        next if @app.sitemap.find_resource_by_destination_path destination.to_s
+        # next if @app.sitemap.find_resource_by_destination_path destination.to_s
 
         resource = ::Middleman::Sitemap::Resource.new( @app.sitemap, destination.to_s, asset.source_path.to_s )
         resource.add_metadata options: { sprockets: { logical_path: imported_asset.logical_path }}
@@ -145,16 +158,14 @@ module Middleman
     end
 
     def import_images_and_fonts_from_gems
-      environment.paths
-          .reject { |p| p.start_with?(app.source_dir) }
-          .reject { |p| @config_environment.ignored_paths.any?{|r| r.match(p)}}
+      valid_paths = environment.paths
+          .reject { |p| p.start_with?(app.source_dir.to_s) }
           .select { |p| p.end_with?('images') || p.end_with?('fonts') }
-          .each do |load_path|
-        environment.each_entry(load_path) do |path|
-          if path.file? && !path.basename.to_s.start_with?('_')
-            logical_path = path.sub /^#{load_path}/, ''
-            environment.imported_assets << Middleman::Sprockets::ImportedAsset.new(logical_path)
-          end
+
+      environment.files_in_paths(valid_paths).each do |(path, load_path)|
+        if path.file? && !path.basename.to_s.start_with?('_')
+          logical_path = path.sub /^#{load_path}/, ''
+          environment.imported_assets << Middleman::Sprockets::ImportedAsset.new(logical_path)
         end
       end
     end

data/lib/middleman-sprockets/version.rb

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

data/middleman-sprockets.gemspec

@@ -16,7 +16,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-core", [">= 3.3"])
-  s.add_dependency("sprockets", ["~> 2.12.1"])
+  s.add_dependency("sprockets", [">= 2.12.1"])
   s.add_dependency("sprockets-sass", ["~> 1.3.0"])
   s.add_dependency("sprockets-helpers", ["~> 1.1.0"])
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-sprockets
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 4.0.0.beta.1
 platform: ruby
 authors:
 - Thomas Reynolds
@@ -10,62 +10,62 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-20 00:00:00.000000000 Z
+date: 2015-05-02 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'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.3'
 - !ruby/object:Gem::Dependency
   name: sprockets
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.12.1
   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
 description: Sprockets support for Middleman
@@ -77,20 +77,21 @@ 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/ignore_imported_paths.feature
 - features/jst.feature
 - features/long_filenames.feature
 - features/sass_globs.feature
@@ -259,17 +260,17 @@ 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: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Sprockets support for Middleman
@@ -277,7 +278,6 @@ test_files:
 - features/asset_hash-3.0.feature
 - features/asset_hash.feature
 - features/bower.feature
-- features/ignore_imported_paths.feature
 - features/jst.feature
 - features/long_filenames.feature
 - features/sass_globs.feature

data/features/ignore_imported_paths.feature

@@ -1,19 +0,0 @@
-Feature: Ignoring Imported Assets
-  Background: App with imported assets ignoring some of them
-    Given a fixture app "sprockets-app"
-    And a file named "config.rb" with:
-      """
-      set :js_dir,  "library/js"
-      set :css_dir, "library/css"
-
-      sprockets.ignore_path /jquery/
-      """
-    And the Server is running
-
-  Scenario: Imported jquery assets are not in the sitemap (but others are)
-    Then the sitemap should not include "/images/jquery-mobile/ajax-loader.gif"
-    And the sitemap should include "/fonts/bootstrap/glyphicons-halflings-regular.eot"
-
-  Scenario: Assets from imported gem can still be required
-    When I go to "/library/js/jquery_include.js"
-    Then I should see "window.jQuery ="