Merge pull request #4 from kitsched/old-pr-22

Add dirname to Converter.

lib/japr/asset.rb

@@ -1,10 +1,11 @@
 module JAPR
   class Asset
-    def initialize(content, filename)
+    def initialize(content, filename, dirname = '.')
       @content = content
       @filename = filename
+      @dirname = dirname
     end
 
-    attr_accessor :content, :filename, :output_path
+    attr_accessor :content, :filename, :dirname, :output_path
   end
 end

lib/japr/converter.rb

@@ -6,6 +6,7 @@ def initialize(asset)
       @content = asset.content
       @type = File.extname(asset.filename).downcase
       @converted = convert
+      @dirname = asset.dirname
     end
 
     def converted

lib/japr/pipeline.rb

@@ -106,8 +106,9 @@ def process
     # Collect assets based on manifest
     def collect
       @assets = YAML.load(@manifest).map! do |path|
+        full_path = File.join(@source, path)
         File.open(File.join(@source, path)) do |file|
-          JAPR::Asset.new(file.read, File.basename(path))
+          JAPR::Asset.new(file.read, File.basename(path), File.dirname(full_path))
         end
       end
       rescue Exception => e
@@ -182,7 +183,7 @@ def compress
     def gzip
       @assets.map! do |asset|
         gzip_content = Zlib::Deflate.deflate(asset.content)
-        [asset, JAPR::Asset.new(gzip_content, "#{asset.filename}.gz")]
+        [asset, JAPR::Asset.new(gzip_content, "#{asset.filename}.gz", asset.dirname)]
       end.flatten!
     end
 

spec/converter_spec.rb

@@ -16,6 +16,7 @@
       before do
         asset.expect(:content, 'foo')
         asset.expect(:filename, 'bar.baz')
+        asset.expect(:dirname, '.')
       end
 
       subject { Converter.new(asset) }
@@ -51,6 +52,7 @@
       before do
         asset.expect(:content, 'unconverted')
         asset.expect(:filename, 'some_filename.foo')
+        asset.expect(:dirname, '/some/path')
       end
 
       subject { TestConverter.new(asset) }