middleman-sprockets 3.3.4 → 3.3.6

data/lib/middleman-sprockets/imported_asset.rb

@@ -0,0 +1,57 @@
+# encoding: utf-8
+module Middleman
+  module Sprockets
+    # ImportedAsset 
+    class ImportedAsset
+      attr_reader :logical_path, :output_path, :real_path
+
+      # Create instance
+      #
+      # @param [Pathname] logical_path
+      #   The logical path to the asset given in config.rb
+      #
+      # @param [proc] output_dir
+      #   An individual output directory for that particular asset
+      def initialize(logical_path, determine_output_path = proc { nil })
+        @logical_path = Pathname.new(logical_path)
+        @output_path  = if output_path = determine_output_path.call(@logical_path)
+                          Pathname.new(output_path)
+                        else
+                          nil
+                        end
+      end
+
+      # Resolve logical path to real path
+      # 
+      # @param [#resolve] resolver
+      #   The objects which is able to resolve a logical path
+      def resolve_path_with(resolver)
+        @real_path = resolver.resolve(logical_path)
+
+        raise ::Sprockets::FileNotFound, "Couldn't find asset '#{logical_path}'" if real_path == nil || real_path == ''
+      end
+
+      # String representation of asset
+      #
+      # @return [String]
+      #   The logical path as string
+      def to_s
+        logical_path.to_s
+      end
+
+      # Does the given patch matches asset
+      # 
+      # @param [Pathname] path
+      #   The path to be checked
+      def match?(path)
+        has_real_path? path
+      end
+
+      private
+
+      def has_real_path?(path)
+        real_path == path
+      end
+    end
+  end
+end

data/lib/middleman-sprockets/pathname_extensions.rb

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

data/lib/middleman-sprockets/version.rb

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

data/spec/asset_list_spec.rb

@@ -0,0 +1,38 @@
+# encoding: utf-8
+
+RSpec.describe AssetList do
+  context '#add' do
+    it 'adds an asset to the list' do
+      asset = instance_double 'Middleman::Sprockets::Asset'
+      list  = AssetList.new
+
+      expect {
+        list << asset
+      }.not_to raise_error
+    end
+  end
+  context '#lookup' do
+    it 'finds an asset in list' do
+      asset = instance_double 'Middleman::Sprockets::Asset'
+      expect(asset).to receive(:source_path).and_return 'path/to/source'
+      expect(asset).to receive(:match?).and_return true
+
+      list  = AssetList.new
+      list << asset
+
+      expect(list.lookup(asset)).to be asset
+    end
+
+    it 'supports a block which gets the found asset passed' do
+      asset = instance_double 'Middleman::Sprockets::Asset'
+      allow(asset).to receive(:source_path).and_return 'path/to/source'
+      expect(asset).to receive(:destination_path=).with 'path/to/source'
+      expect(asset).to receive(:match?).and_return true
+
+      list  = AssetList.new
+      list << asset
+
+      list.lookup(asset) { |candidate, found_asset| found_asset.destination_path = found_asset.source_path }
+    end
+  end
+end

data/spec/asset_spec.rb

@@ -0,0 +1,116 @@
+# encoding: utf-8
+RSpec.describe Asset do
+  context '#has_type?' do
+    it 'finds type by extension' do
+      asset = Asset.new('/source/path/to/image.png', source_directory: '/source/path/to')
+      expect(asset).to have_type :image
+    end
+
+    it 'finds type by path' do
+      asset = Asset.new('/source/path/to/images/image.xz', source_directory: '/source/path/to/images')
+      expect(asset).to have_type :image
+    end
+  end
+
+  context '#import?, #import_it' do
+    it 'fails if file does not exist' do
+      in_current_dir do
+        base_path = File.expand_path('source/path/to')
+        file_path = File.expand_path('source/path/to/image.xz')
+
+        asset = Asset.new(file_path, source_directory: base_path)
+
+        expect(asset).not_to be_import
+      end
+    end
+
+    it 'succeeds if import it is set' do
+      in_current_dir do
+        base_path = File.expand_path('source/path/to')
+        file_path = File.expand_path('source/path/to/image.xz')
+        write_file file_path, 'asdf'
+
+        asset = Asset.new(file_path, source_directory: base_path)
+        asset.import_it
+
+        expect(asset).to be_import
+      end
+    end
+
+    it 'succeeds if is in trusted directory images' do
+      in_current_dir do
+        base_path = File.expand_path('source/path/to/images')
+        file_path = File.expand_path('source/path/to/images/image.xz')
+        write_file file_path, 'asdf'
+
+        asset = Asset.new(file_path, source_directory: base_path)
+
+        expect(asset).to be_import
+      end
+    end
+  end
+
+  context '#destination_path, #destination_path=, #destination_directory' do
+    it 'returns @destination_path if set' do
+      in_current_dir do
+        base_path = File.expand_path('source/path/to/images')
+        file_path = File.expand_path('source/path/to/images/image.xz')
+
+        asset = Asset.new(file_path, source_directory: base_path)
+        asset.destination_path = 'asdf/image.xz'
+
+        expect(asset.destination_path).to eq Pathname.new('asdf/image.xz')
+      end
+    end
+
+    it 'builds path based on destination_directory and relative file path' do
+      in_current_dir do
+        base_path = File.expand_path('source/path/to/images')
+        file_path = File.expand_path('source/path/to/images/image.xz')
+
+        asset = Asset.new(file_path, source_directory: base_path)
+        asset.destination_directory = '/images'
+
+        expect(asset.destination_path.to_s).to eq '/images/image.xz'
+      end
+    end
+
+    it 'fails if destination_directory and @destination_path are not set' do
+      in_current_dir do
+        base_path = File.expand_path('source/path/to/images')
+        file_path = File.expand_path('source/path/to/images/image.xz')
+
+        asset = Asset.new(file_path, source_directory: base_path)
+
+        expect { 
+          asset.destination_path
+        }.to raise_error ::Sprockets::FileNotFound
+      end
+    end
+  end
+
+  context '#match?' do
+    it 'success if source path is equal' do
+      in_current_dir do
+        base_path = File.expand_path('source/path/to')
+        file_path = File.expand_path('source/path/to/images/image.xz')
+
+        asset1 = Asset.new(file_path, source_directory: base_path)
+
+        expect(asset1).to be_match file_path
+      end
+    end
+
+    it 'fails if source path is not equal' do
+      in_current_dir do
+        base_path = File.expand_path('source/path/to')
+        file_path = File.expand_path('source/path/to/images/image.xz')
+
+        asset1 = Asset.new(file_path, source_directory: base_path)
+
+        expect(asset1).not_to be_match 'asdf'
+      end
+    end
+  end
+
+end

data/spec/imported_asset_spec.rb

@@ -0,0 +1,72 @@
+# encoding: utf-8
+RSpec.describe ImportedAsset do
+  context '#output_path' do
+    it 'uses block as second argument on initialize to get path' do
+      asset = ImportedAsset.new 'source/to/asset/image.png', proc { 'hello/world.png' }
+
+      expect(asset.output_path.to_s).to eq 'hello/world.png'
+    end
+  end
+
+  context '#resolve_path_with' do
+    it 'resolves path' do
+      in_current_dir do
+        relative_path = 'source/path/to/image.xz'
+        file_path = File.expand_path(relative_path)
+
+        resolver = double('Environment')
+        expect(resolver).to receive(:resolve).with(Pathname.new(relative_path)).and_return file_path 
+
+        asset = ImportedAsset.new relative_path
+        asset.resolve_path_with resolver
+      end
+    end
+
+    it 'raises an error if path could not be resolved' do
+      in_current_dir do
+        relative_path = 'source/path/to/image.xz'
+
+        resolver = double('Environment')
+        allow(resolver).to receive(:resolve).with(Pathname.new(relative_path)).and_return nil
+
+        asset = ImportedAsset.new relative_path
+
+        expect {
+          asset.resolve_path_with resolver
+        }.to raise_error ::Sprockets::FileNotFound
+      end
+    end
+  end
+
+  context '#match?' do
+    it 'succeeds if real path matches' do
+      in_current_dir do
+        relative_path = 'source/path/to/image.xz'
+        file_path = File.expand_path(relative_path)
+
+        resolver = double('Environment')
+        allow(resolver).to receive(:resolve).and_return file_path
+
+        asset = ImportedAsset.new relative_path
+        asset.resolve_path_with resolver
+
+        expect(asset).to be_match file_path
+      end
+    end
+
+    it 'fails if does not match' do
+      in_current_dir do
+        relative_path = 'source/path/to/image.xz'
+        file_path = File.expand_path(relative_path)
+
+        resolver = double('Environment')
+        allow(resolver).to receive(:resolve).and_return file_path + 'fail'
+
+        asset = ImportedAsset.new relative_path
+        asset.resolve_path_with resolver
+
+        expect(asset).not_to be_match file_path
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,16 @@
+# encoding: utf-8
+$LOAD_PATH << File.expand_path('../../lib', __FILE__)
+
+require 'simplecov'
+SimpleCov.command_name 'rspec'
+SimpleCov.start
+
+# Pull in all of the gems including those in the `test` group
+require 'bundler'
+Bundler.require :default, :test, :development
+
+require 'middleman-sprockets/extension'
+
+Dir.glob(File.expand_path('../support/*', __FILE__)).each { |f| require_relative f }
+
+include Middleman::Sprockets

data/spec/support/aruba.rb

@@ -0,0 +1,18 @@
+# encoding: utf-8
+require 'aruba/api'
+
+module Middleman
+  module Sprockets
+    module SpecHelper
+      include ::Aruba::Api
+    end
+  end
+end
+
+RSpec.configure do |config|
+  config.before(:each) do
+    clean_current_dir
+  end
+
+  config.include Middleman::Sprockets::SpecHelper
+end

data/spec/support/rspec.rb

@@ -0,0 +1,17 @@
+# encoding: utf-8
+RSpec.configure do |config|
+  config.filter_run :focus
+  config.run_all_when_everything_filtered = true
+
+  config.order = :random
+  Kernel.srand config.seed
+
+  config.expect_with :rspec do |expectations|
+    expectations.syntax = :expect
+  end
+
+  config.mock_with :rspec do |mocks|
+    mocks.syntax = :expect
+    mocks.verify_partial_doubles = true
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-sprockets
 version: !ruby/object:Gem::Version
-  version: 3.3.4
+  version: 3.3.6
 platform: ruby
 authors:
 - Thomas Reynolds
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-30 00:00:00.000000000 Z
+date: 2014-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
@@ -78,6 +78,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
+- .simplecov
 - .travis.yml
 - CHANGELOG.md
 - CONTRIBUTING.md
@@ -129,6 +131,16 @@ files:
 - fixtures/bower-app/bower_components/underscore/underscore.js
 - fixtures/bower-app/config.rb
 - fixtures/bower-app/source/javascripts/application.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
+- fixtures/bower-individual-outputdir-app/config.rb
+- fixtures/bower-individual-outputdir-app/source/javascripts/application.js
+- fixtures/bower-individual-outputdir-app/vendor/assets/components/lightbox2/.bower.json
+- fixtures/bower-individual-outputdir-app/vendor/assets/components/lightbox2/bower.json
+- fixtures/bower-individual-outputdir-app/vendor/assets/components/lightbox2/img/close.png
+- fixtures/bower-individual-outputdir-app/vendor/assets/components/lightbox2/js/lightbox.js
+- fixtures/bower-individual-outputdir-app/vendor/assets/components/lightbox2/package.json
 - fixtures/bower-json-app/config.rb
 - fixtures/bower-json-app/source/javascripts/application.js.coffee
 - fixtures/bower-json-app/source/javascripts/bower.json
@@ -200,13 +212,23 @@ files:
 - fixtures/sprockets-images-app/source/library/images/cat.jpg
 - fixtures/sprockets-images-app/vendor/assets/images/cat-2.jpg
 - lib/middleman-sprockets.rb
+- lib/middleman-sprockets/asset.rb
+- lib/middleman-sprockets/asset_list.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/pathname_extensions.rb
 - lib/middleman-sprockets/sass_function_hack.rb
 - lib/middleman-sprockets/version.rb
 - middleman-sprockets.gemspec
+- spec/asset_list_spec.rb
+- spec/asset_spec.rb
+- spec/imported_asset_spec.rb
+- spec/spec_helper.rb
+- spec/support/aruba.rb
+- spec/support/rspec.rb
 homepage: https://github.com/middleman/middleman-sprockets
 licenses:
 - MIT
@@ -276,6 +298,16 @@ test_files:
 - fixtures/bower-app/bower_components/underscore/underscore.js
 - fixtures/bower-app/config.rb
 - fixtures/bower-app/source/javascripts/application.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
+- fixtures/bower-individual-outputdir-app/config.rb
+- fixtures/bower-individual-outputdir-app/source/javascripts/application.js
+- fixtures/bower-individual-outputdir-app/vendor/assets/components/lightbox2/.bower.json
+- fixtures/bower-individual-outputdir-app/vendor/assets/components/lightbox2/bower.json
+- fixtures/bower-individual-outputdir-app/vendor/assets/components/lightbox2/img/close.png
+- fixtures/bower-individual-outputdir-app/vendor/assets/components/lightbox2/js/lightbox.js
+- fixtures/bower-individual-outputdir-app/vendor/assets/components/lightbox2/package.json
 - fixtures/bower-json-app/config.rb
 - fixtures/bower-json-app/source/javascripts/application.js.coffee
 - fixtures/bower-json-app/source/javascripts/bower.json