gallerize 0.1 → 0.2

data/bin/gallerize

@@ -12,4 +12,4 @@ end
 
 Trollop::die :output, "is required" if options[:output].nil?
 
-Gallerizer.new(options[:name], options[:output], options[:theme]).generate
+Gallerizer.new(options[:name], options[:output], options[:theme]).gallerize

data/lib/gallerizer.rb

@@ -3,6 +3,7 @@ require 'fileutils'
 require 'rubygems'
 require 'rmagick'
 require 'natural_sort_kernel'
+require File.join(File.dirname(__FILE__), 'image')
 
 class Gallerizer
   include FileUtils
@@ -12,34 +13,8 @@ class Gallerizer
     @output_path = output_path
     @theme_path = File.join(File.dirname(__FILE__), "..", "themes", theme)
   end
-
-  def resize(image, size, square = false)
-    thumb_file_path = File.join(@output_path, "thumbs", File.basename(image, ".jpg") << "_#{size}.jpg")
   
-    unless File.exists?(thumb_file_path)
-      file = Magick::Image::read(image).first
-    
-      if square
-        file.resize_to_fill!(size, size)
-      else
-        file.resize_to_fit!(size, size)
-      end
-
-      file.write(thumb_file_path){ self.quality = (size <= 250 ? 70 : 95) }
-    end
-  
-    File.basename(thumb_file_path)
-  end
-
-  def next_image(i)
-    @images.size - 1 != i ? @images[i + 1] : nil
-  end
-
-  def previous_image(i)
-    i != 0 ? @images[i - 1] : nil
-  end
-  
-  def generate
+  def gallerize
     # Create necessary output paths
     mkdir_p([@output_path, File.join(@output_path, "thumbs"), File.join(@output_path, "show"), File.join(@output_path, "resources")])
 
@@ -47,8 +22,9 @@ class Gallerizer
     cp_r(File.join(@theme_path, "resources/."), File.join(@output_path, "resources"))
 
     # Gather images
-    @images = Dir["*.jpg"].natural_sort
-
+    image_paths = Dir["*.jpg"].natural_sort
+    @images = image_paths.collect { |image_path| Image.new(image_paths.index(image_path), File.expand_path(image_path), @output_path) }
+    
     # Load templates
     index_template = ERB.new(File.open(File.join(@theme_path, "index.html.erb")) { |f| f.read })
     show_template = ERB.new(File.open(File.join(@theme_path, "show.html.erb")) { |f| f.read })
@@ -57,8 +33,11 @@ class Gallerizer
     File.open(File.join(@output_path, "index.html"), "w") { |f| f.write(index_template.result(binding)) }
 
     # Create show pages
-    @images.each_with_index do |image, i|
-      File.open(File.join(@output_path, "show", "#{i}.html"), "w") { |f| f.write(show_template.result(binding)) }
+    @images.each do |image|
+      previous_image = (image.id != 0 ? @images[image.id - 1] : nil)
+      next_image = (@images.size - 1 != image.id ? @images[image.id + 1] : nil)
+      
+      File.open(File.join(@output_path, "show", "#{image.id}.html"), "w") { |f| f.write(show_template.result(binding)) }
     end
   end
 end

data/lib/image.rb

@@ -0,0 +1,38 @@
+class Image
+  attr_reader :id, :path
+  
+  def initialize(id, path, output_path)
+    @id = id
+    @path = path
+    @output_path = output_path
+  end
+  
+  def basename
+    File.basename(@path)
+  end
+  
+  def resize(size, square = false)
+    thumb_file_path = File.join(@output_path, "thumbs", File.basename(@path, ".jpg") << "_#{size}.jpg")
+  
+    unless File.exists?(thumb_file_path)
+      file = Magick::Image::read(@path).first
+    
+      if square
+        file.resize_to_fill!(size, size)
+      else
+        file.resize_to_fit!(size, size)
+      end
+
+      file.write(thumb_file_path){ self.quality = (size <= 200 ? 75 : 95) }
+      
+      # Free memory
+      file.destroy!
+    end
+  
+    File.join("thumbs", File.basename(thumb_file_path))
+  end
+  
+  def to_s
+    basename
+  end
+end

data/themes/default/index.html.erb

@@ -15,8 +15,8 @@
         <h1><%= @name %></h1>
       </header>
       <section class="yui-cssbase">
-        <% @images.each_with_index do |image, i| %>
-          <div class="item"><a href="show/<%= i %>.html"><img src="thumbs/<%= resize(image, 150, true) %>" height="150" width="150" /></a></div>
+        <% @images.each do |image| %>
+          <div class="item"><a href="show/<%= image.id %>.html"><img src="<%= image.resize(150, true) %>" height="150" width="150" /></a></div>
         <% end %>
       </section>
     </div>

data/themes/default/resources/screen.css

@@ -13,6 +13,11 @@ body {
   padding: 2em;
 }
 
+#container {
+  margin: 0 auto;
+  width: 675px;
+}
+
 h1 {
   color: #777;
   font-size: 400%;
@@ -22,7 +27,7 @@ h1 {
 
 .item {
   float: left;
-  margin: 0 1.5em 1.5em 0;
+  margin: 0 15px 15px 0;
 }
 
 .item img {

data/themes/default/show.html.erb

@@ -15,9 +15,9 @@
         <h1><%= @name %></h1>
       </header>
       <section class="yui-cssbase">
-        <img src="../thumbs/<%= resize(image, 800) %>" />
-        <% if previous_image(i) %><a href="<%= i - 1 %>.html"><img src="../thumbs/<%= resize(previous_image(i), 75, true)%>" /></a><% end %>
-        <% if next_image(i) %><a href="<%= i + 1 %>.html"><img src="../thumbs/<%= resize(next_image(i), 75, true)%>" /></a><% end %>
+        <img src="../<%= image.resize(675) %>" />
+        <% if previous_image %><a href="<%= previous_image.id %>.html"><img src="../<%= previous_image.resize(75, true)%>" /></a><% end %>
+        <% if next_image %><a href="<%= next_image.id %>.html"><img src="../<%= next_image.resize(75, true)%>" /></a><% end %>
       </section>
     </div>
   </body>

metadata

@@ -4,8 +4,8 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  version: "0.1"
+  - 2
+  version: "0.2"
 platform: ruby
 authors: 
 - Nick Chapman
@@ -67,8 +67,9 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/gallerizer.rb
 - bin/gallerize
+- lib/gallerizer.rb
+- lib/image.rb
 - themes/default/index.html.erb
 - themes/default/resources/screen.css
 - themes/default/show.html.erb