middleman-sprockets 3.3.6 → 3.3.7

data/lib/middleman-sprockets/asset.rb

@@ -3,14 +3,7 @@ module Middleman
   module Sprockets
     # Asset 
     class Asset
-
-      private
-
-      attr_reader :relative_source_path, :base_name, :destination_directory, :source_directory
-
-      public
-
-      attr_reader :source_path
+      attr_reader :source_path, :relative_source_path, :base_name, :destination_directory, :source_directory
 
       # Create instance
       #
@@ -24,12 +17,12 @@ module Middleman
 
         fail ArgumentError, 'Missing argument source_directory' unless source_directory
 
-        @source_directory     = source_directory
+        @source_directory = source_directory
 
-        @source_path          = Pathname.new(source_path)
+        @source_path = Pathname.new(source_path)
         @relative_source_path = @source_path.relative_path_from(Pathname.new(source_directory))
-        @base_name            = @source_path.basename
-        @import_it            = false
+        @base_name = @source_path.basename
+        @import_it = false
       end
 
       # Should the asset imported?
@@ -58,7 +51,7 @@ module Middleman
       def destination_path
         return @destination_path if @destination_path
 
-        fail ::Sprockets::FileNotFound, "Couldn't find an appropriate output directory for '#{destination_directory}' - halting because it was explicitly requested via 'import_asset'" unless destination_directory
+        fail ::Sprockets::FileNotFound, "Couldn't find an appropriate output directory for '#{source_path}'. Halting because it was explicitly requested via 'import_asset'" unless destination_directory
 
         destination_directory + relative_source_path
       end
@@ -105,17 +98,17 @@ module Middleman
       end
 
       def type
-        if is_in_images_directory? or is_image?
-          :image
-        elsif is_in_scripts_directory? or is_script?
-          :script
-        elsif is_in_stylesheets_directory? or is_stylesheet?
-          :stylesheet
-        elsif is_in_fonts_directory? or is_font?
-          :font
-        else
-          :unknown
-        end
+        @type ||= if is_image?
+                    :image
+                  elsif is_script?
+                    :script
+                  elsif is_stylesheet?
+                    :stylesheet
+                  elsif is_font?
+                    :font
+                  else
+                    :unknown
+                  end
       end
 
       def file?
@@ -123,7 +116,7 @@ module Middleman
       end
 
       def partial?
-        base_name.start_with? '_'
+        base_name.to_s.start_with? '_'
       end
 
       # Is it a valid asset
@@ -142,42 +135,66 @@ module Middleman
       end
 
       def extname
-        source_path.extname
+        source_path.basename.to_s[/(\.[^.]+)/]
       end
 
-      def has_real_path?(path)
-        real_path == path
+      def is_image?
+        is_image_by_path? || (is_image_by_extension? && !is_font_by_path?)
       end
 
-      def is_in_images_directory?
-        source_directory.end_with?('images', 'img') 
+      def is_image_by_path?
+        source_directory.to_s.end_with?('images') ||
+        source_directory.to_s.end_with?('img') ||
+        source_path.dirname.to_s.end_with?('images') ||
+        source_path.dirname.to_s.end_with?('img')
       end
+      alias_method :is_in_images_directory?, :is_image_by_path?
 
-      def is_in_fonts_directory?
-        source_directory.end_with?('fonts') 
+      def is_image_by_extension?
+        has_extname? *%w(.gif .png .jpg .jpeg .webp .svg .svgz)
       end
 
-      def is_in_scripts_directory?
-        source_directory.end_with?('javascripts', 'js')
+      def is_stylesheet?
+        is_stylesheet_by_path? || is_stylesheet_by_extension?
       end
 
-      def is_in_stylesheets_directory?
-        source_directory.end_with?('stylesheets', 'css') 
+      def is_stylesheet_by_extension?
+        has_extname? *%w(.css .sass .scss .styl .less)
       end
 
-      def is_image?
-        has_extname?('.gif', '.png', '.jpg', '.jpeg', '.svg', '.svg.gz')
+      def is_stylesheet_by_path?
+        source_directory.to_s.end_with?('stylesheets') ||
+        source_directory.to_s.end_with?('css') ||
+        source_path.dirname.to_s.end_with?('stylesheets') ||
+        source_path.dirname.to_s.end_with?('css')
       end
 
-      def is_stylesheet?
-        has_extname?('.css', '.sass', '.scss', '.styl', '.less')
+      def is_font?
+        is_font_by_path? || is_font_by_extension?
       end
 
-      def is_font?
-        has_extname?('.ttf', '.woff', '.eot', '.otf')
+      def is_font_by_path?
+        source_directory.to_s.end_with?('fonts') ||
+        source_path.dirname.to_s.end_with?('fonts')
+      end
+      alias_method :is_in_fonts_directory?, :is_font_by_path?
+
+      def is_font_by_extension?
+        has_extname? *%w(.ttf .woff .eot .otf .svg .svgz)
       end
 
       def is_script?
+        is_script_by_path? || is_script_by_extension?
+      end
+
+      def is_script_by_path?
+        source_directory.to_s.end_with?('javascripts') ||
+        source_directory.to_s.end_with?('js') ||
+        source_path.dirname.to_s.end_with?('javascripts') ||
+        source_path.dirname.to_s.end_with?('js')
+      end
+
+      def is_script_by_extension?
         has_extname?('.js', '.coffee')
       end
     end

data/lib/middleman-sprockets/asset_list.rb

@@ -2,12 +2,8 @@
 module Middleman
   module Sprockets
     class AssetList
-      private
-
       attr_reader :assets
 
-      public
-
       def initialize(assets = [])
         @assets = Array(assets)
       end

data/lib/middleman-sprockets/extension.rb

@@ -1,6 +1,5 @@
 require "sprockets"
 require "sprockets-sass"
-require "middleman-sprockets/pathname_extensions"
 require "middleman-sprockets/asset"
 require "middleman-sprockets/imported_asset"
 require "middleman-sprockets/asset_list"

data/lib/middleman-sprockets/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module Sprockets
-    VERSION = "3.3.6"
+    VERSION = "3.3.7"
   end
 end

data/spec/asset_spec.rb

@@ -10,6 +10,11 @@ RSpec.describe Asset do
       asset = Asset.new('/source/path/to/images/image.xz', source_directory: '/source/path/to/images')
       expect(asset).to have_type :image
     end
+
+    it 'finds type by double extension' do
+      asset = Asset.new('/source/path/to/image.png.xz', source_directory: '/source/path/to')
+      expect(asset).to have_type :image
+    end
   end
 
   context '#import?, #import_it' do
@@ -112,5 +117,4 @@ RSpec.describe Asset do
       end
     end
   end
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-sprockets
 version: !ruby/object:Gem::Version
-  version: 3.3.6
+  version: 3.3.7
 platform: ruby
 authors:
 - Thomas Reynolds
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-04 00:00:00.000000000 Z
+date: 2014-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
@@ -211,6 +211,15 @@ files:
 - fixtures/sprockets-images-app/source/index.html.erb
 - fixtures/sprockets-images-app/source/library/images/cat.jpg
 - fixtures/sprockets-images-app/vendor/assets/images/cat-2.jpg
+- fixtures/sprockets-svg-font-app/bower.json
+- fixtures/sprockets-svg-font-app/config.rb
+- 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/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_list.rb
@@ -219,7 +228,6 @@ files:
 - lib/middleman-sprockets/environment.rb
 - lib/middleman-sprockets/extension.rb
 - lib/middleman-sprockets/imported_asset.rb
-- lib/middleman-sprockets/pathname_extensions.rb
 - lib/middleman-sprockets/sass_function_hack.rb
 - lib/middleman-sprockets/version.rb
 - middleman-sprockets.gemspec
@@ -378,4 +386,13 @@ test_files:
 - fixtures/sprockets-images-app/source/index.html.erb
 - fixtures/sprockets-images-app/source/library/images/cat.jpg
 - fixtures/sprockets-images-app/vendor/assets/images/cat-2.jpg
+- fixtures/sprockets-svg-font-app/bower.json
+- fixtures/sprockets-svg-font-app/config.rb
+- 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/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
 has_rdoc: 

data/lib/middleman-sprockets/pathname_extensions.rb

@@ -1,10 +0,0 @@
-# encoding: utf-8
-class Pathname
-  def start_with?(*paths)
-    to_s.start_with?(*paths)
-  end
-
-  def end_with?(*paths)
-    to_s.end_with?(*paths)
-  end
-end