dropsite 0.3.2 → 0.3.3

data/README.rdoc

@@ -51,9 +51,14 @@ Or you can send me an email: aaronroyer@gmail.com
 
 == Attribution
 
+Default Dropsite theme inspired by github.com
+
+
 Dropsite uses icons from:
 
-famfamfam.com
+famfamfam.com Silk Icons
+
+Yusuke Kamiyamane's Fugue icons (p.yusukekamiyamane.com)
 
 Echo Project (fedorahosted.org/echo-icon-theme/)
 

data/dropsite.gemspec

@@ -1,9 +1,9 @@
 Gem::Specification.new do |s|
   s.name = 'dropsite'
-  s.version = '0.3.2'
+  s.version = '0.3.3'
   s.platform = Gem::Platform::RUBY
 
-  s.description = "creates index pages in your Dropbox public directory"
+  s.description = "Non-invasive Dropbox Public directory index page generator"
   s.summary = "Dropsite creates a site of interlinked file index pages in " +
     "the Public directory of your Dropbox. The site created is minimally " +
     "invasive to your Public directory by only creating one top-level " +

data/lib/dropsite/plugins/image_thumbnails/image_thumbnails.erb

@@ -4,6 +4,15 @@
 def thumb_name(image_file_name)
 	File.basename(image_file_name).sub(/\.\w+$/, '') + '-thumb' + File.extname(image_file_name)
 end
+
+def thumb_link(file_name)
+	if renderer.class::VALID_THUMBNAIL_EXTENSIONS.include? File.extname(file_name).sub(/^\./, '')
+		page_asset_image_tag thumb_name(file_name)
+	else
+		image_tag 'icons/image-large.png'
+	end
+end
+
 def shorten(file_name)
 	if file_name.size < 20
 		file_name
@@ -40,7 +49,7 @@ end
 			<% end %>
 			<% files.sort.each do |file| %>
 				<a class="thumb-link" href="<%= url_for file %>">
-					<%= page_asset_image_tag thumb_name(file.name) %>
+					<%= thumb_link file.name %>
 					<div class="name"><%= shorten file.name %></div>
 				</a>
 			<% end %>

data/lib/dropsite/plugins/image_thumbnails/image_thumbnails.rb

@@ -1,6 +1,8 @@
 require 'fileutils'
 
 class ImageThumbnails < Dropsite::DirRenderer
+  VALID_THUMBNAIL_EXTENSIONS = %w[bmp gif jpeg jpg png tif tiff]
+
   def can_render?(site_dir)
     return false if not thumbnail_generator
     !site_dir.files.empty? && site_dir.files.all? {|e| e.file_type == :image}
@@ -78,13 +80,11 @@ class ImageThumbnails < Dropsite::DirRenderer
   end
 
   def write_default_thumbnail(src_image, site_dir)
-    # Need to figure out what type of file this is to make it work
-    default_thumb = File.join(plugin_assets_dir, 'images', 'icons', "image-large#{File.extname(src_image)}")
-
-    if File.exist? default_thumb
-      FileUtils.cp(default_thumb,File.join(site_dir.page_assets_dir, thumb_file_name(src_image)))
-    else
-      site_dir.error "BUG: no default thumb type exists for files with extension: #{File.extname(src_image)}"
+    # If not a valid extension then no thumbnail needs to be copied in, since at
+    # render time it should not expect it to be there
+    if VALID_THUMBNAIL_EXTENSIONS.include? File.extname(src_image).sub(/^\./, '')
+      default_thumb = File.join(plugin_assets_dir, 'images', 'icons', "image-large#{File.extname(src_image)}")
+      FileUtils.cp(default_thumb, File.join(site_dir.page_assets_dir, thumb_file_name(src_image)))
     end
   end
 end

data/lib/dropsite/site_file.rb

@@ -1,9 +1,14 @@
 module Dropsite
   class SiteFile < SiteItem
     EXTENSIONS = {
-      :image => %w[jpg jpeg gif png],
-      :text => %w[txt],
-      :pdf => %w[pdf]
+      :audio => %w[abs aif aifc aiff au kar m3u mid midi mp1 mp2 mp3 mpa mpega pls smf snd ulw wav],
+      :excel => %w[xls xlsx],
+      :image => %w[art bmp dib gif ief jpe jpeg jpg mac pbm pct pgm pic pict png pnm pnt ppm psd qti qtif ras rgb svg svgz tif tiff wbmp xbm xpm xwd],
+      :pdf => %w[pdf],
+      :ruby => %w[rb rhtml erb],
+      :text => %w[body css etx htc htm html jad java js rtf rtx tsv txt wml wmls],
+      :video => %w[asf asx avi avx dv flv mov movie mp4 mpe mpeg mpg mpv2 qt wmv],
+      :word => %w[doc docx]
     }
 
     attr_accessor :size_in_bytes, :abs_path

data/test/unit/test_image_thumbnails.rb

@@ -0,0 +1,30 @@
+require File.join(File.dirname(__FILE__), '..', 'helper')
+require 'nokogiri'
+
+class TestImageThumbnails < Test::Unit::TestCase
+
+  def test_thumbnail_link
+    sd = SiteDir.new('', [SiteFile.new('pic.jpg')], Site.new('/tmp'))
+    sd.render
+
+    doc = Nokogiri::HTML(sd.content)
+    thumb_links = doc.css('.thumb-link')
+
+    assert_equal 1, thumb_links.size
+    assert_equal 'pic-thumb.jpg', File.basename(thumb_links.first.css('img').first.attribute('src').value)
+  end
+
+  # Test that a default thumbnail is linked for an image type for which a thumbnail
+  # cannot be created
+  def test_non_generateable_thumbnail_link
+    sd = SiteDir.new('', [SiteFile.new('pic.art')], Site.new('/tmp'))
+    sd.render
+
+    doc = Nokogiri::HTML(sd.content)
+    thumb_links = doc.css('.thumb-link')
+
+    assert_equal 1, thumb_links.size
+    assert_equal 'dropsite/dropsite-assets/image_thumbnails/images/icons/image-large.png',
+      thumb_links.first.css('img').first.attribute('src').value
+  end
+end

data/test/unit/test_simple_index.rb

@@ -0,0 +1,30 @@
+require File.join(File.dirname(__FILE__), '..', 'helper')
+require 'nokogiri'
+
+class TestSimpleIndex < Test::Unit::TestCase
+  def test_file_names_and_icons
+    entries = [
+      SiteFile.new('pic.jpg'),
+      SiteFile.new('stuff.pdf'),
+      SiteFile.new('tps-report.doc'),
+    ]
+    sd = SiteDir.new('', entries, Site.new('/tmp'))
+    sd.render
+
+    doc = Nokogiri::HTML(sd.content)
+    entry_rows = doc.css('tr.entry')
+
+    assert_equal entries.size, entry_rows.size
+    assert_file_has_icon 'pic.jpg', 'image', entry_rows
+    assert_file_has_icon 'stuff.pdf', 'pdf', entry_rows
+    assert_file_has_icon 'tps-report.doc', 'word', entry_rows
+  end
+
+  protected
+
+  def assert_file_has_icon(file_name, icon_name, entry_rows)
+    row = entry_rows.find {|er| er.css('a').first.content.strip == file_name}
+    assert_equal "dropsite/dropsite-assets/simple_index/images/icons/#{icon_name}.png",
+      row.css('img').first.attribute('src').value
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dropsite
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Aaron Royer
@@ -15,11 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-27 00:00:00 -05:00
+date: 2011-03-01 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
-description: creates index pages in your Dropbox public directory
+description: Non-invasive Dropbox Public directory index page generator
 email: aaronroyer@gmail.com
 executables: 
 - dropsite
@@ -41,18 +41,24 @@ files:
 - lib/dropsite/plugins/image_thumbnails/assets/images/icons/image-large.jpeg
 - lib/dropsite/plugins/image_thumbnails/assets/images/icons/image-large.jpg
 - lib/dropsite/plugins/image_thumbnails/assets/images/icons/image-large.png
+- lib/dropsite/plugins/image_thumbnails/assets/images/icons/image-large.tif
 - lib/dropsite/plugins/image_thumbnails/assets/images/icons/image-large.tiff
 - lib/dropsite/plugins/image_thumbnails/assets/images/row-bg.png
 - lib/dropsite/plugins/image_thumbnails/image_thumbnails.erb
 - lib/dropsite/plugins/image_thumbnails/image_thumbnails.rb
 - lib/dropsite/plugins/simple_index/assets/css/reset.css
 - lib/dropsite/plugins/simple_index/assets/css/simple_index.css
+- lib/dropsite/plugins/simple_index/assets/images/icons/audio.png
 - lib/dropsite/plugins/simple_index/assets/images/icons/directory.png
+- lib/dropsite/plugins/simple_index/assets/images/icons/excel.png
 - lib/dropsite/plugins/simple_index/assets/images/icons/image.png
 - lib/dropsite/plugins/simple_index/assets/images/icons/pdf.png
+- lib/dropsite/plugins/simple_index/assets/images/icons/ruby.png
 - lib/dropsite/plugins/simple_index/assets/images/icons/script.png
 - lib/dropsite/plugins/simple_index/assets/images/icons/text.png
 - lib/dropsite/plugins/simple_index/assets/images/icons/unknown.png
+- lib/dropsite/plugins/simple_index/assets/images/icons/video.png
+- lib/dropsite/plugins/simple_index/assets/images/icons/word.png
 - lib/dropsite/plugins/simple_index/assets/images/row-bg.png
 - lib/dropsite/plugins/simple_index/simple_index.erb
 - lib/dropsite/plugins/simple_index/simple_index.rb
@@ -77,7 +83,9 @@ files:
 - test/integration/test_process_site_with_thumbnails.rb
 - test/unit/test_application.rb
 - test/unit/test_config_file.rb
+- test/unit/test_image_thumbnails.rb
 - test/unit/test_render_helper.rb
+- test/unit/test_simple_index.rb
 - test/unit/test_site.rb
 - test/unit/test_site_dir.rb
 - test/unit/test_site_file.rb