tubemp 0.5.0 → 0.6.0

data/lib/thumbnail.rb

@@ -31,9 +31,13 @@ class Thumbnail
     self
   end
 
-  def add_overlay(filename)
+  def add_overlay
+    @filename_parts << "overlay"
+
+    filename = File.join(Dir.pwd, "assets","overlay.png")
+    # Fallback to asset packaged with gem
+    filename = GEMDIR.join("assets", "overlay.png") unless File.exists? filename
     @images << Magick::ImageList.new(filename)[0]
-    @filename_parts << File.basename(filename, ".*")
 
     self
   end

data/lib/tubemp.rb

@@ -7,8 +7,10 @@ require 'thumbnail.rb'
 
 include ERB::Util
 
+GEMDIR = Pathname.new(File.expand_path(File.join(File.dirname(__FILE__), '..')))
+
 class Tubemp < Sinatra::Application
-  this_dir = Pathname.new(File.dirname(__FILE__))
+  this_dir = GEMDIR.join("lib")
   set :views,  this_dir.join("views")
   set :public_folder, this_dir.join("public")
 

data/lib/youtube.rb

@@ -30,7 +30,7 @@ class YouTube
 
   def valid?
     parse
-    not @meta.nil?
+    not @meta.title.nil?
   end
 
   def id
@@ -68,7 +68,7 @@ class YouTube
       tmpfile.close
 
       thumbs["basic"]   = Thumbnail.new(id, tmpfile).write
-      thumbs["overlay"] = Thumbnail.new(id, tmpfile).add_overlay(File.join(File.dirname(__FILE__), "..", "assets","overlay.png")).write(@uri)
+      thumbs["overlay"] = Thumbnail.new(id, tmpfile).add_overlay.write(@uri)
     ensure
       images = nil
       tmpfile.unlink

data/spec/thumbnail_spec.rb

@@ -19,9 +19,9 @@ describe Thumbnail do
     end
 
     it 'should include overlay filenames in filename' do
-      @thumbnail.add_overlay @tmpfile #contains the name "thumb"
+      @thumbnail.add_overlay
       @thumbnail.write
-      File.should exist(File.join(@container, "#{@id}_thumb.png"))
+      File.should exist(File.join(@container, "#{@id}_overlay.png"))
     end
 
     it 'should be chainable' do
@@ -67,7 +67,7 @@ describe Thumbnail do
     before do
       @overlay_name = File.join("assets", "overlay.png")
       @expected = Magick::ImageList.new(@overlay_name)[0]
-      @thumbnail.add_overlay @overlay_name
+      @thumbnail.add_overlay
     end
 
     it 'should add files to ImageList stack' do
@@ -80,8 +80,23 @@ describe Thumbnail do
     end
 
     it 'should be chainable' do
-      @thumbnail.add_overlay(@overlay_name).should be_kind_of(Thumbnail)
+      @thumbnail.add_overlay.should be_kind_of(Thumbnail)
     end
+
+    it 'should prefer an overlay-image from current dir' do
+      assets_dir = File.join("/", "tmp", "assets")
+      FileUtils.mkdir_p(assets_dir)
+      FileUtils.cp(File.join("assets", "overlay.png"), File.join(assets_dir, "overlay.png"))
+      Dir.stub(:pwd).and_return("/tmp")
+
+      @thumbnail.add_overlay
+      # Don't know how to fetch the current_filename or Filename from Magick::Image
+      #  so using #inspect and regexing that.
+      @thumbnail.images.last.inspect.should match %r{/tmp/assets/overlay\.png .*}
+
+      FileUtils.rm_r(assets_dir)
+    end
+
   end
 
   describe "uri_path" do

data/spec/youtube_spec.rb

@@ -83,7 +83,9 @@ describe YouTube do
 
   describe "invalid-ID" do
     before do
-      VideoInfo.stub(:get).and_return nil
+      info = mock(VideoInfo)
+      info.stub(:title).and_return nil
+      VideoInfo.stub(:get).and_return info
       @yt = YouTube.new("INVALID")
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tubemp
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-09 00:00:00.000000000 Z
+date: 2013-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra