flickr_offline_gallery 0.0.2 → 0.0.3

data/flickr_offline_gallery.gemspec

@@ -20,5 +20,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.4"
   spec.add_development_dependency "rake"
-  spec.add_dependency "flickraw"
+  spec.add_runtime_dependency "flickraw"
+  spec.add_runtime_dependency "httparty"
 end

data/lib/flickr_offline_gallery/flickr_a_p_i.rb

@@ -0,0 +1,23 @@
+module FlickrOfflineGallery
+  class FlickrAPI
+    def self.instance
+      @instance ||= FlickRaw::Flickr.new
+    end
+
+    def self.get_photoset(photoset_id)
+      instance.photosets.getPhotos(:photoset_id => photoset_id).to_hash
+    end
+
+    def self.get_photo_info(photo_id)
+      instance.photos.getInfo(:photo_id => photo_id).to_hash
+    end
+
+    def self.get_photo_sizes(photo_id)
+      instance.photos.getSizes(:photo_id => photo_id).to_a
+    end
+
+  end
+end
+
+# No thanks Flickraw. Not even once.
+undef flickr

data/lib/flickr_offline_gallery/gallery_generator.rb

@@ -0,0 +1,26 @@
+module FlickrOfflineGallery
+
+  class GalleryGenerator
+
+    def initialize(photoset)
+      @photoset = photoset
+    end
+
+    def render_photoset(size)
+      download_images(size)
+      render_photo_pages
+      PhotosetIndexPage.new(@photoset).write
+    end
+
+    def download_images(size = "medium_800")
+      PhotosetDownloader.new(@photoset, size).download
+    end
+
+    def render_photo_pages
+      @photoset.photos.each do |photo|
+        PhotoPage.new(photo).write
+      end
+    end
+  end
+
+end

data/lib/flickr_offline_gallery/path_manager.rb

@@ -0,0 +1,37 @@
+module FlickrOfflineGallery
+  class PathManager
+
+    attr_reader :base_path
+
+    def initialize(base_path, slug)
+      @base_path = base_path
+      @slug     = slug
+    end
+
+    def photo_output_path
+      File.join(base_path, @slug)
+    end
+
+    def index_page
+      "#{photo_output_path}.html"
+    end
+
+    def full_path_for(photo_id, extension)
+      File.join(photo_output_path, filename_for_photo(photo_id, extension))
+    end
+
+    def relative_path_for(photo_id, extension)
+      File.join(@slug, filename_for_photo(photo_id, extension))
+    end
+
+    def filename_for_photo(photo_id, extension)
+      "#{photo_id}.#{extension}"
+    end
+
+    def back_to_index
+      "../#{@slug}.html"
+    end
+
+  end
+
+end

data/lib/flickr_offline_gallery/photo.rb

@@ -1,46 +1,53 @@
 module FlickrOfflineGallery
   class Photo
+    include VerbosePuts
 
-    attr_reader :id, :secret, :set
-
-    def initialize(horrible_flickraw_response_junk, photoset_id = nil)
+    def initialize(horrible_flickraw_response_junk, args = {})
+      @path_manager = args[:path_manager]
       @id = horrible_flickraw_response_junk["id"]
-      @secret = horrible_flickraw_response_junk["secret"]
-      @set = photoset_id
+      @photoset_id = args[:photoset_id]
       eager_load
-      puts "Fetched data about photo #{title}"
+      verbose_puts %(Fetched data about photo #{@id}: "#{title}")
     end
 
     def title
       info.title
     end
 
-    def date
-      @date ||= DateTime.parse(info.dates["taken"])
-    end
-
     def url
-      if set
-        "#{base_url}in/set-#{set}"
+      if @photoset_id
+        "#{base_url}in/set-#{@photoset_id}"
       else
         base_url
       end
     end
 
+    def base_url
+      @base_url ||= info.urls.find{|u| u["type"] == "photopage"}["_content"]
+    end
+
     def img_filename
-      "#{id}.jpg"
+      @path_manager.filename_for_photo(@id, :jpg)
     end
 
-    def local_jpg_path
-      "#{::FlickrOfflineGallery::Variables.slug}/#{img_filename}"
+    def full_jpg_path
+      @path_manager.full_path_for(@id, :jpg)
     end
 
-    def local_html_path
-      local_jpg_path.sub(/\.jpg$/, ".html")
+    def full_html_path
+      @path_manager.full_path_for(@id, :html)
     end
 
-    def base_url
-      @base_url ||= info.urls.find{|u| u["type"] == "photopage"}["_content"]
+    def relative_jpg_path
+      @path_manager.relative_path_for(@id, :jpg)
+    end
+
+    def relative_html_path
+      @path_manager.relative_path_for(@id, :html)
+    end
+
+    def back_to_index_url
+      @path_manager.back_to_index
     end
 
     def sizes
@@ -59,11 +66,11 @@ module FlickrOfflineGallery
     end
 
     def info
-      @info ||= OpenStruct.new(flickr.photos.getInfo(:photo_id => @id).to_hash)
+      @info ||= OpenStruct.new(FlickrAPI.get_photo_info(@id))
     end
 
     def raw_sizes
-      @raw_sizes ||= flickr.photos.getSizes :photo_id => @id
+      @raw_sizes ||= FlickrAPI.get_photo_sizes(@id)
     end
 
   end

data/lib/flickr_offline_gallery/photo_page.rb

@@ -0,0 +1,23 @@
+module FlickrOfflineGallery
+  class PhotoPage < TemplateRenderer
+
+    def initialize(photo)
+      @photo = photo
+      super("photo")
+    end
+
+    def render
+      render_erb(:back_to_index_page => @photo.back_to_index_url,
+            :image_url => @photo.img_filename,
+            :sizes => @photo.sizes,
+            :photo_page_url => @photo.url,
+            :title => @photo.title,
+            :author => @photo.author)
+    end
+
+    def write
+      write_file(@photo.full_html_path)
+    end
+
+  end
+end

data/lib/flickr_offline_gallery/photo_size.rb

@@ -1,8 +1,13 @@
 module FlickrOfflineGallery
-  class PhotoSize < OpenStruct
-    # attrs: label, width, height, source
-    def initialize(horrible_flickraw_response_junk)
-      super(horrible_flickraw_response_junk.to_hash)
+  class PhotoSize
+
+    attr_reader :label, :width, :height, :url
+
+    def initialize(flickraw_response)
+      @label  = flickraw_response.label
+      @height = flickraw_response.height
+      @width  = flickraw_response.width
+      @url = flickraw_response.source
     end
 
     def key

data/lib/flickr_offline_gallery/photo_sizes.rb

@@ -1,15 +1,19 @@
 module FlickrOfflineGallery
-  class PhotoSizes < OpenStruct
-    # commont attrs: large  large_1600  large_2048  large_square  medium  medium_640  medium_800  original  small  small_320  square  thumbnail
+  class PhotoSizes
+
     def initialize(raw_sizes)
-      super Hash[raw_sizes.map do |s|
-        size = PhotoSize.new(s)
-        [size.key, size] 
-      end]
+       @sizes = Hash[raw_sizes.map do |s|
+         size = PhotoSize.new(s)
+         [size.key, size]
+       end]
+    end
+
+    def [](key)
+      @sizes[key.to_s]
     end
 
     def each
-      to_h.values.each do |value|
+      @sizes.values.each do |value|
         yield(value)
       end
     end

data/lib/flickr_offline_gallery/photoset.rb

@@ -1,8 +1,12 @@
 module FlickrOfflineGallery
   class Photoset
-    def initialize(photoset_id)
+
+    include VerbosePuts
+
+    def initialize(photoset_id, args = {})
       @photoset_id = photoset_id
-      ::FlickrOfflineGallery::Variables.slug = slug
+      @output_base_path = args[:output_path] || "."
+      eager_load
     end
 
     def username
@@ -14,19 +18,36 @@ module FlickrOfflineGallery
     end
 
     def slug
-      title.downcase.gsub(/[^a-z0-9]/, "-").gsub(/-+/, "-")
+      title.downcase.tr_s("^a-z0-9", "-")
     end
 
     def photos
       raise "photoset has more than 500 images and I'm too lazy to handle that right now" if info.pages > 1
-      puts "Initializing photoset... " unless @photos
-      @photos ||= info.photo.map { |raw_response| Photo.new(raw_response, @photoset_id) }.tap{ puts "Finished initializing photoset!"}
+     verbose_puts "Initializing photoset... " unless @photos
+      @photos ||= info.photo.map do |raw_response|
+        Photo.new(raw_response,
+                  :photoset_id => @photoset_id,
+                  :path_manager => path_manager)
+      end.tap{ verbose_puts "Finished initializing photoset!" }
+    end
+
+    def index_page_filename
+      path_manager.index_page
     end
 
     private
 
+    def path_manager
+      PathManager.new(@output_base_path, slug)
+    end
+
+    def eager_load
+      info
+      photos
+    end
+
     def info
-      @info ||= OpenStruct.new(flickr.photosets.getPhotos(:photoset_id => @photoset_id).to_hash)
+      @info ||= OpenStruct.new(FlickrAPI.get_photoset(@photoset_id))
     end
   end
 end

data/lib/flickr_offline_gallery/photoset_downloader.rb

@@ -1,5 +1,9 @@
+require 'httparty'
 module FlickrOfflineGallery
   class PhotosetDownloader
+
+    include VerbosePuts
+
     def initialize(photoset, size)
       @photoset = photoset
       @size = size
@@ -7,14 +11,13 @@ module FlickrOfflineGallery
 
     def download
       photos.each do |photo|
-        url = photo.sizes[@size].source
-        local_path = photo.local_jpg_path
+        url = photo.sizes[@size].url
+        local_path = photo.full_jpg_path
         FileUtils.mkdir_p(File.dirname(local_path))
 
         unless File.exist?(local_path)
-          #TODO: this is lazy, so sue me
-          `curl --location -so "#{local_path}" "#{url}"`
-          puts "Downloaded #{local_path}"
+          download_file(url, local_path)
+         verbose_puts "Downloaded #{local_path}"
         end
       end
     end
@@ -25,5 +28,18 @@ module FlickrOfflineGallery
       @photoset.photos
     end
 
+    def download_file(url, destination)
+      resp = http_get(url)
+      File.open(destination, "wb") do |file|
+        file.write(resp.body)
+      end
+    end
+
+    def http_get(url)
+      response = HTTParty.get(url)
+      raise "unhandled response code: #{response.code}" unless response.code == 200
+      response
+    end
+
   end
 end

data/lib/flickr_offline_gallery/photoset_index_page.rb

@@ -0,0 +1,17 @@
+module FlickrOfflineGallery
+  class PhotosetIndexPage < TemplateRenderer
+
+    def initialize(photoset)
+      @photoset = photoset
+      super("photoset")
+    end
+
+    def render
+      render_erb(:photoset => @photoset, :photos => @photoset.photos, :size => "medium")
+    end
+
+    def write
+      write_file(@photoset.index_page_filename)
+    end
+  end
+end

data/lib/flickr_offline_gallery/template_renderer.rb

@@ -0,0 +1,42 @@
+module FlickrOfflineGallery
+  class TemplateRenderer
+
+    include VerbosePuts
+
+    def initialize(template)
+      @template = template
+    end
+
+    def template_path
+      File.expand_path("../../../erb/#{@template}.html.erb",__FILE__)
+    end
+
+    def template_directory
+      File.expand_path("../../../erb/", __FILE__)
+    end
+
+    def template_contents
+      raise "Unknown template: #{template_path}" unless File.exist?(template_path)
+      @template_content ||= File.read(template_path)
+    end
+
+    def render_erb(locals)
+      ERB.new(template_contents).result(OpenStruct.new(locals).instance_eval { binding })
+    end
+
+    def render
+      raise "not implemented"
+    end
+
+    def write
+      raise "not implemented"
+    end
+
+    def write_file(filename)
+      File.open(filename, 'w') do |file|
+        file.write render
+      end
+      verbose_puts "Wrote out #{filename}"
+    end
+  end
+end

data/lib/flickr_offline_gallery/verbose_puts.rb

@@ -0,0 +1,8 @@
+module FlickrOfflineGallery
+  module VerbosePuts
+    def verbose_puts(string)
+      puts(string) if ENV["VERBOSE"]
+      string
+    end
+  end
+end

data/lib/flickr_offline_gallery/version.rb

@@ -1,3 +1,3 @@
 module FlickrOfflineGallery
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/flickr_offline_gallery.rb

@@ -3,52 +3,19 @@ require 'erb'
 require 'fileutils'
 
 require "flickr_offline_gallery/version"
+require "flickr_offline_gallery/verbose_puts"
+require "flickr_offline_gallery/path_manager"
 require "flickr_offline_gallery/photo_size"
 require "flickr_offline_gallery/photo_sizes"
 require "flickr_offline_gallery/photo"
 require "flickr_offline_gallery/photoset"
 require "flickr_offline_gallery/photoset_downloader"
+require "flickr_offline_gallery/flickr_a_p_i"
+require "flickr_offline_gallery/template_renderer"
+require "flickr_offline_gallery/photo_page"
+require "flickr_offline_gallery/photoset_index_page"
+require "flickr_offline_gallery/gallery_generator"
 
 module FlickrOfflineGallery
-  class Variables
-    class << self
-      attr_accessor :slug
-    end
-  end
 
-  def self.download(photoset, size = "medium_800")
-    PhotosetDownloader.new(photoset, size).download
-  end
-
-  def self.render_photoset(photoset, size)
-    download(photoset, size)
-    render_photo_pages(photoset)
-    render_photoset_index_page(photoset)
-  end
-
-  def self.render_photoset_index_page(photoset)
-    File.open("#{photoset.slug}.html", "w") do |f|
-      f.write render_erb("photoset", :photoset => photoset, :photos => photoset.photos, :size => "medium")
-    end
-    puts "#{photoset.slug}.html"
-  end
-
-  def self.render_photo_pages(photoset)
-    photoset.photos.each do |p|
-      render_photo_page(p)
-    end
-  end
-
-  def self.render_photo_page(photo)
-    File.open(photo.local_html_path, "w") do |f|
-      f.write render_erb("photo", :source => photo.img_filename, :sizes => photo.sizes, :photo_url => photo.url, :title => photo.title, :author => photo.author)
-    end
-    puts "Rendered #{photo.local_html_path}"
-  end
-
-  def self.render_erb(template, locals)
-    full_template_path = File.expand_path("../../erb/#{template}.html.erb",__FILE__)
-    raise "unknown template: #{full_template_path}" unless File.exist?(full_template_path)
-    ERB.new(File.read(full_template_path)).result(OpenStruct.new(locals).instance_eval { binding })
-  end
 end