middleman-sprockets 3.4.2 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1697d1fc6a0d15e0a0972225640f0bde0c508ed
-  data.tar.gz: 8dbea3b68dd39c3bc585a6dc8ca5c83d45970a0b
+  metadata.gz: 0f72f296a723b4ff315df8ae5613bebd5a7338a5
+  data.tar.gz: 23a9b9ea030bdc0dc0de50d17614896ac1e2cbaf
 SHA512:
-  metadata.gz: bc617d09a4cb8807e82cb4bee1df19500cc46f2c9a49b6663dd93495cd6d7707d7368f0acadae0c6e274f211025e0703e3ff211266501c0b89fe8162719f33a6
-  data.tar.gz: 83c8ee6dce12439c9a6209c8bddfd3741b786b34665bfb8013ee8d70d87d57a63243d4e958a797fe2d6349ec19be4dab30978b6776caaeb7ef6806c6af3f955a
+  metadata.gz: 6edd63315b2d4ffc601ce01fa4fe8a54595b5e9c4d70691552195fce9f754b9ac07af4f07e78d98132c1e884b5f8b8ee6dea711a90f7f705241fc6f259dca324
+  data.tar.gz: 0f51a95dba5ea25569b8a6a6e140d73b7f615c936a595e2d098c51db9b4606775e575f17d7bf3ce8f61340546adf6ef86a4be7342fea61b96af6c979cf2eda2d

data/.travis.yml

@@ -1,16 +1,21 @@
+language: ruby
+cache: bundler
+sudo: false
+env: TEST=true
+
 rvm:
-  - 1.9.3
   - 2.0.0
-  - 2.1.1
-  - 2.1.2
-  - jruby-19mode
+  - 2.1
+  - 2.2.5
+  - 2.3.1
+  - ruby-head
 
 gemfile:
   - Gemfile
 
 script: "bundle exec rake test"
 
-env: TEST=true
-
 matrix:
-  fast_finish: true
+  fast_finish: true
+  allow_failures:
+    - rvm: ruby-head

data/CHANGELOG.md

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

data/Gemfile

@@ -9,9 +9,8 @@ gem "rake", "~> 10.0.3", :require => false
 gem "yard", "~> 0.8.0", :require => false
 
 # Test tools
-gem "cucumber"
-gem "fivemat", "~> 1.2.1"
-gem "aruba"
+gem "cucumber", "~> 2.0"
+gem "aruba", "~> 0.10.0"
 gem "rspec", "~> 3.0"
 gem "builder", "~> 3.0"
 gem "simplecov"
@@ -27,6 +26,7 @@ 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/README.md

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

data/features/ignore_imported_paths.feature

@@ -0,0 +1,19 @@
+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 ="

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 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"

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 I should get a response with status "404"
+    Then the status code should be "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 I should get a response with status "200"
+    Then the status code should be "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"
+    Then the status code should be "200"

data/features/step_definitions/server_steps.rb

@@ -1,7 +1,16 @@
-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
+
+Given /^binding\.pry$/ do
+  require "pry"
+  binding.pry
+end
+
+Then /^the sitemap should not include "([^\"]*)"$/ do |path|
+  expect( @server_inst.sitemap.resources.map(&:url) ).not_to include path
+end
+
+Then /^the sitemap should include "([^\"]*)"$/ do |path|
+  expect( @server_inst.sitemap.resources.map(&:url) ).to include path
+end

data/lib/middleman-sprockets/asset.rb

@@ -37,6 +37,10 @@ module Middleman
         asset.pathname
       end
 
+      def exist?
+        File.exist?(asset.pathname)
+      end
+
       def type
         @type ||= if is_image?
                     :image

data/lib/middleman-sprockets/config_only_environment.rb

@@ -9,11 +9,13 @@ 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)
@@ -45,6 +47,10 @@ 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

@@ -1,3 +1,5 @@
+require "middleman-sprockets/asset"
+
 module Middleman
   module Sprockets
     # Generic Middleman Sprockets env
@@ -55,6 +57,18 @@ module Middleman
         end
       end
 
+      # Make sure all the defined imported assets still exist
+      def prune_imported_assets!
+        @imported_assets = @imported_assets.select do |a|
+          begin
+            a = Middleman::Sprockets::Asset.new(@app, a.logical_path, self)
+            a.exist?
+          rescue
+            false
+          end
+        end
+      end
+
       # Add our own customizations to the Sprockets context class
       def enhance_context_class!
         app = @app
@@ -234,7 +248,7 @@ module Middleman
         args << asset_logical_path
         args << determine_output_dir if block_given?
 
-        imported_assets << ImportedAsset.new(*args)
+        @imported_assets << ImportedAsset.new(*args)
 
         @app.sitemap.rebuild_resource_list!(:sprockets_import_asset)
       end

data/lib/middleman-sprockets/extension.rb

@@ -75,6 +75,7 @@ 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
 
@@ -95,6 +96,7 @@ module Middleman
     def manipulate_resource_list(resources)
       resources_list = []
 
+      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
@@ -143,8 +145,11 @@ module Middleman
     end
 
     def import_images_and_fonts_from_gems
-      trusted_paths = environment.paths.select { |p| p.end_with?('images') || p.end_with?('fonts') }
-      trusted_paths.each do |load_path|
+      environment.paths
+          .reject { |p| p.start_with?(app.source_dir) }
+          .reject { |p| @config_environment.ignored_paths.any?{|r| r.match(p)}}
+          .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}/, ''

data/lib/middleman-sprockets/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module Sprockets
-    VERSION = "3.4.2"
+    VERSION = "3.5.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-sprockets
 version: !ruby/object:Gem::Version
-  version: 3.4.2
+  version: 3.5.0
 platform: ruby
 authors:
 - Thomas Reynolds
@@ -10,62 +10,62 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-25 00:00:00.000000000 Z
+date: 2016-09-20 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,10 +77,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .simplecov
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".simplecov"
+- ".travis.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
@@ -90,6 +90,7 @@ 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
@@ -258,17 +259,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'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Sprockets support for Middleman
@@ -276,6 +277,7 @@ 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