photish 0.3.3 → 0.3.4

data/lib/photish/config/file_config_location.rb

@@ -3,8 +3,8 @@ module Photish
     class FileConfigLocation
       FILE_NAME = 'config.yml'
 
-      def initialize(site_dir)
-        @site_dir = site_dir
+      def initialize(config_dir)
+        @config_dir = config_dir
       end
 
       def path
@@ -13,10 +13,10 @@ module Photish
 
       private
 
-      attr_reader :site_dir
+      attr_reader :config_dir
 
       def directory
-        site_dir || Dir.pwd
+        config_dir || Dir.pwd
       end
 
       def config_file_name

data/lib/photish/gallery/album.rb

@@ -1,10 +1,10 @@
 module Photish
   module Gallery
     class Album
-      include Photish::Gallery::Traits::Urlable
-      include Photish::Gallery::Traits::Albumable
-      include Photish::Gallery::Traits::Metadatable
-      include Photish::Gallery::Traits::Breadcrumbable
+      include Traits::Urlable
+      include Traits::Albumable
+      include Traits::Metadatable
+      include Traits::Breadcrumbable
       include Photish::Plugin::Pluginable
 
       delegate :qualities,
@@ -25,8 +25,8 @@ module Photish
         @photos ||= Dir.entries(path)
                        .reject { |file| ['.', '..'].include?(file) }
                        .map    { |file| File.join(path, file) }
-                       .reject { |file| !File.file?(file) }
-                       .reject { |file| !FileMagic.new(FileMagic::MAGIC_MIME).file(file).match(formats) }
+                       .reject { |file| !File.file?(file) ||
+                                          !image_format?(file) }
                        .map    { |file| Photo.new(self, file) }
       end
 
@@ -41,6 +41,14 @@ module Photish
 
       alias_method :base_url_name, :name
 
+      def image_format?(file)
+        extension = File.extname(file).split('.').last.try(:downcase)
+        return if extension.nil?
+        MIME::Types.type_for(extension).any? do
+          |mime| mime.to_s.match(formats)
+        end
+      end
+
       def album_class
         self.class
       end

data/lib/photish/gallery/collection.rb

@@ -1,10 +1,10 @@
 module Photish
   module Gallery
     class Collection
-      include Photish::Gallery::Traits::Urlable
-      include Photish::Gallery::Traits::Albumable
-      include Photish::Gallery::Traits::Metadatable
-      include Photish::Gallery::Traits::Breadcrumbable
+      include Traits::Urlable
+      include Traits::Albumable
+      include Traits::Metadatable
+      include Traits::Breadcrumbable
       include Photish::Plugin::Pluginable
 
       attr_reader :qualities,
@@ -29,11 +29,11 @@ module Photish
         Photish::Plugin::Type::Collection
       end
 
-      def all_url_paths
-        @all_url_paths ||= [url_path,
-                            all_albums.map(&:url_path),
-                            all_photos.map(&:url_path),
-                            all_images.map(&:url_path)].flatten
+      def all_url_parts
+        @all_url_parts ||= [url_parts,
+                            all_albums.map(&:url_parts),
+                            all_photos.map(&:url_parts),
+                            all_images.map(&:url_parts)].flatten(1)
       end
 
       private

data/lib/photish/gallery/image.rb

@@ -1,7 +1,7 @@
 module Photish
   module Gallery
     class Image
-      include Photish::Gallery::Traits::Urlable
+      include Traits::Urlable
       include Photish::Plugin::Pluginable
 
       delegate :name,
@@ -36,7 +36,7 @@ module Photish
       alias_method :base_url_name, :name
 
       def url_end
-        "#{slugify(basename)}-#{slugify(quality_name)}#{extension}"
+        @url_end ||= "#{slugify(basename)}-#{slugify(quality_name)}#{extension}"
       end
 
       def basename

data/lib/photish/gallery/photo.rb

@@ -1,9 +1,9 @@
 module Photish
   module Gallery
     class Photo
-      include Photish::Gallery::Traits::Urlable
-      include Photish::Gallery::Traits::Metadatable
-      include Photish::Gallery::Traits::Breadcrumbable
+      include Traits::Urlable
+      include Traits::Metadatable
+      include Traits::Breadcrumbable
       include Photish::Plugin::Pluginable
 
       delegate :qualities,

data/lib/photish/gallery/traits/breadcrumbable.rb

@@ -3,17 +3,13 @@ module Photish
     module Traits
       module Breadcrumbable
         def breadcrumbs
-          doc = Nokogiri::HTML::DocumentFragment.parse("")
-          Nokogiri::HTML::Builder.with(doc) do |doc|
-            doc.ul(class: 'breadcrumbs') {
-              parents_and_me.each_with_index do |level, index|
-                doc.li(class: crumb_class(index)) {
-                  doc.a(level.name, href: level.url)
-                }
-              end
-            }
+          html = "<ul class=\"breadcrumbs\">"
+          parents_and_me.each_with_index do |level, index|
+            html << "<li class=\"" << crumb_class(index) << "\">"
+            html << "<a href=\"" << level.url << "\">" << level.name << "</a>"
+            html << "</li>"
           end
-          doc.to_html
+          html << "</ul>"
         end
 
         def parents_and_me
@@ -24,13 +20,12 @@ module Photish
         private
 
         def crumb_class(index)
-          crumb_class = []
-          crumb_class << 'breadcrumb'
-          crumb_class << "crumb-#{index}"
-          crumb_class << 'crumb-first' if index == 0
-          crumb_class << 'crumb-last' if index == (parents_and_me.count - 1)
-          crumb_class << 'crumb-only' if parents_and_me.count == 1
-          crumb_class.join(' ')
+          crumb_class = 'breadcrumb'
+          crumb_class << ' crumb-' << index.to_s
+          crumb_class << ' crumb-first' if index == 0
+          crumb_class << ' crumb-last' if index == (parents_and_me.count - 1)
+          crumb_class << ' crumb-only' if parents_and_me.count == 1
+          crumb_class
         end
       end
     end

data/lib/photish/gallery/traits/urlable.rb

@@ -21,11 +21,7 @@ module Photish
         private
 
         def host
-          @host ||= normalized_host || ''
-        end
-
-        def normalized_host
-          url_info.host.try(:chomp, '/')
+          @host ||= url_info.host || ''
         end
 
         def slugify(word)

data/lib/photish/log/logger.rb

@@ -11,6 +11,7 @@ module Photish
 
       def setup_logging(config)
         return if setup_complete
+
         setup_color_scheme if colorize?(config)
         setup_stdout_output if output_to_stdout?(config)
         setup_file_output if output_to_file?(config)
@@ -22,7 +23,7 @@ module Photish
       private
 
       def logging_level(config)
-        config.logging.level.to_sym
+        config.logging.level.try(:to_sym)
       end
 
       def colorize?(config)
@@ -55,7 +56,7 @@ module Photish
         stdout_appender = Logging.appenders.stdout(
           'stdout',
           layout: Logging.layouts.pattern(
-            pattern: '[%d] %-5l %c: %m\n',
+            pattern: '[%d][%p][%t] %-5l %c: %m\n',
             color_scheme: 'bright'
           )
         )
@@ -67,7 +68,7 @@ module Photish
         file_appender = Logging.appenders.file(
            'log/photish.log',
            layout: Logging.layouts.pattern(
-              pattern: '[%d] %-5l %c: %m\n',
+              pattern: '[%d][%p][%t] %-5l %c: %m\n',
            )
         )
         Logging.logger.root.add_appenders(file_appender)

data/lib/photish/plugin/repository.rb

@@ -1,39 +1,63 @@
 module Photish
   module Plugin
-    module Repository
+    class Repository
+      include Singleton
+
       class << self
         def reload(log, site_dir)
-          log.info "Loading plugins..."
-          Dir[File.join(site_dir, '_plugins', '*.rb')].each do |file|
-            load file
-          end
-
-          all_plugins.each do |plugin|
-            log.info "Found plugin #{plugin}"
-          end
+          self.instance.reload(log, site_dir)
         end
 
         def plugins_for(type)
-          all_plugins.reject { |m| !m.is_for?(type) }
+          self.instance.plugins_for(type)
         end
 
-        def all_plugins
-          Photish::Plugin.constants.map    { |m| constantize(m) }
-                                   .reject { |m| ignored_modules.include?(m) }
+        def loaded?
+          self.instance.loaded?
         end
-        
-        private
+      end
 
-        def ignored_modules
-          [Photish::Plugin::Repository,
-           Photish::Plugin::Pluginable,
-           Photish::Plugin::Type]
+      def reload(log, site_dir)
+        log.info "Loading plugins..."
+        Dir[File.join(site_dir, '_plugins', '*.rb')].each do |file|
+          load file
         end
 
-        def constantize(symbol)
-          Kernel.const_get("Photish::Plugin::#{symbol}")
+        @all_plugins = nil
+
+        all_plugins.each do |plugin|
+          log.info "Found plugin #{plugin}"
         end
       end
+
+      def plugins_for(type)
+        all_plugins.reject { |m| !m.is_for?(type) }
+      end
+
+      def all_plugins
+        @all_plugins ||= constants.map    { |m| constantize(m) }
+                                  .reject { |m| ignored_modules.include?(m) }
+      end
+
+      def loaded?
+        @all_plugins.present?
+      end
+
+      private
+
+      def constants
+        Photish::Plugin.constants
+      end
+
+      def ignored_modules
+        [Photish::Plugin::Repository,
+         Photish::Plugin::Pluginable,
+         Photish::Plugin::Type]
+      end
+
+      def constantize(symbol)
+        Kernel.const_get("Photish::Plugin::#{symbol}")
+      end
     end
   end
 end

data/lib/photish/render/image_conversion.rb

@@ -1,30 +1,20 @@
 module Photish
   module Render
     class ImageConversion
-      def initialize(output_dir, max_workers)
+      def initialize(output_dir, worker_index, version_hash, threads)
         @output_dir = output_dir
-        @max_workers = max_workers
+        @worker_index = worker_index
+        @version_hash = version_hash
+        @threads = threads
         @log = Logging.logger[self]
       end
 
       def render(images)
-        image_queue = to_queue(images)
-
-        log.info "Rendering #{images.count} images across #{max_workers} threads"
+        log.info "Rendering #{images.count} images across #{threads} threads"
 
         change_manifest.preload
-        workers = (0...max_workers).map do
-          Thread.new do
-            begin
-              while image = image_queue.pop(true)
-                convert(image) if changed?(image.url_path, image.path)
-              end
-            rescue ThreadError => e
-              log.info "Expected exception, queue is empty #{e.class} \"#{e.message}\" #{e.backtrace.join("\n")}"
-            end
-          end
-        end
-        workers.map(&:join)
+        threads = spawn_thread_instances(to_queue(images))
+        threads.map(&:join)
         flush_to_disk
       end
 
@@ -32,16 +22,32 @@ module Photish
 
       attr_reader :output_dir,
                   :log,
-                  :max_workers
+                  :worker_index,
+                  :version_hash,
+                  :threads
 
       delegate :record,
                :changed?,
                :flush_to_disk,
+               :preload,
                to: :change_manifest
 
+      def spawn_thread_instances(image_queue)
+        (0...threads).map do
+          Thread.new { process_images(image_queue) }
+        end
+      end
+
+      def process_images(image_queue)
+        while !image_queue.empty?
+          image = image_queue.pop
+          convert(image) if changed?(image.url_path, image.path)
+        end
+      end
+
       def to_queue(images)
         image_queue = Queue.new
-        Array(images).each { |image| image_queue << image }
+        Array(images).shuffle.each { |image| image_queue << image }
         image_queue
       end
 
@@ -69,7 +75,9 @@ module Photish
       end
 
       def change_manifest
-        @change_manifest ||= ChangeManifest.new(output_dir)
+        @change_manifest ||= Cache::Manifest.new(output_dir,
+                                                 worker_index,
+                                                 version_hash)
       end
     end
   end

data/lib/photish/render/site.rb

@@ -1,58 +1,44 @@
 module Photish
   module Render
     class Site
-      def initialize(templates, site_dir, output_dir, max_workers)
-        @templates = templates
-        @site_dir = site_dir
-        @output_dir = output_dir
-        @max_workers = max_workers
+      def initialize(config)
+        @config = config
       end
 
       def all_for(collection)
-        delete_unknown_files(collection.all_url_paths)
+        delete_unknown_files(collection.all_url_parts)
         move_non_ignored_site_contents
-
         collection_template.render(collection)
-        album_template.render(collection.all_albums)
-        photo_template.render(collection.all_photos)
-
-        image_conversion.render(collection.all_images)
       end
 
       private
 
-      attr_reader :templates,
-                  :site_dir,
-                  :output_dir,
-                  :max_workers
+      attr_reader :config
 
-      def delete_unknown_files(expected_url_paths)
-        files_to_delete = Dir["#{output_dir}/**/*"].select do |f|
-          relative_file_path = f.gsub(/#{output_dir}\/?/, '')
-          File.file?(f) && expected_url_paths.exclude?(relative_file_path)
-        end
-        FileUtils.rm_rf(files_to_delete)
-      end
+      delegate :templates,
+               :site_dir,
+               :output_dir,
+               :worker_index,
+               to: :config
 
       def move_non_ignored_site_contents
         FileUtils.mkdir_p(output_dir)
         FileUtils.cp_r(non_ignored_site_contents, output_dir)
       end
 
-      def image_conversion
-        Photish::Render::ImageConversion.new(output_dir, max_workers)
-      end
-
-      def album_template
-        Photish::Render::Page.new(layout_file, template_album_file, output_dir)
-      end
-
-      def photo_template
-        Photish::Render::Page.new(layout_file, template_photo_file, output_dir)
+      def delete_unknown_files(url_parts)
+        do_not_delete = Set.new(url_parts.map { |url| File.join(output_dir, url) }
+                                         .map(&:to_s))
+        files_to_delete = Dir["#{output_dir}/**/*"].select do |f|
+          File.file?(f) && !do_not_delete.include?(f)
+        end
+        FileUtils.rm_rf(files_to_delete)
       end
 
       def collection_template
-        Photish::Render::Page.new(layout_file, template_collection_file, output_dir)
+        Page.new(layout_file,
+                 template_collection_file,
+                 output_dir)
       end
 
       def non_ignored_site_contents
@@ -67,14 +53,6 @@ module Photish
         File.join(site_dir, templates_dir, templates.collection)
       end
 
-      def template_album_file
-        File.join(site_dir,  templates_dir, templates.album)
-      end
-
-      def template_photo_file
-        File.join(site_dir, templates_dir, templates.photo)
-      end
-
       def templates_dir
         '_templates'
       end

data/lib/photish/render/site_worker.rb

@@ -0,0 +1,80 @@
+module Photish
+  module Render
+    class SiteWorker
+      def initialize(config, version_hash)
+        @config = config
+        @version_hash = version_hash
+      end
+
+      def all_for(collection)
+        tasks(collection).shuffle.each(&:call)
+      end
+
+      private
+
+      attr_reader :config,
+                  :version_hash
+
+      delegate :templates,
+               :site_dir,
+               :output_dir,
+               :workers,
+               :threads,
+               :worker_index,
+               to: :config
+
+      def tasks(collection)
+        [
+          ->{ album_template.render(subset(collection.all_albums))   },
+          ->{ photo_template.render(subset(collection.all_photos))   },
+          ->{ image_conversion.render(subset(collection.all_images)) },
+        ]
+      end
+
+      def subset(items)
+        worker_index_zeroed.step(items.count, workers)
+                           .map { |i| items[i] }
+                           .compact
+      end
+
+      def image_conversion
+        ImageConversion.new(output_dir,
+                            worker_index,
+                            version_hash,
+                            threads)
+      end
+
+      def album_template
+        Page.new(layout_file,
+                 template_album_file,
+                 output_dir)
+      end
+
+      def photo_template
+        Page.new(layout_file,
+                 template_photo_file,
+                 output_dir)
+      end
+
+      def layout_file
+        File.join(site_dir, templates_dir, templates.layout)
+      end
+
+      def template_album_file
+        File.join(site_dir,  templates_dir, templates.album)
+      end
+
+      def template_photo_file
+        File.join(site_dir, templates_dir, templates.photo)
+      end
+
+      def templates_dir
+        '_templates'
+      end
+
+      def worker_index_zeroed
+        worker_index - 1
+      end
+    end
+  end
+end

data/lib/photish/version.rb

@@ -1,3 +1,3 @@
 module Photish
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

data/lib/photish.rb

@@ -10,16 +10,20 @@ require 'webrick'
 require 'listen'
 require 'yaml'
 require 'thor'
-require 'filemagic'
 require 'recursive_open_struct'
 require 'cgi'
 require 'facter'
+require 'mime-types'
+require 'thread'
+require 'thwait'
+require 'slim'
 
 # Photish
 require 'photish/plugin/type'
 require 'photish/plugin/pluginable'
 require 'photish/plugin/repository'
 require 'photish/command/base'
+require 'photish/command/worker'
 require 'photish/command/generate'
 require 'photish/command/host'
 require 'photish/command/init'
@@ -43,8 +47,10 @@ require 'photish/gallery/image'
 require 'photish/gallery/collection'
 require 'photish/render/page'
 require 'photish/render/site'
+require 'photish/render/site_worker'
 require 'photish/render/image_conversion'
-require 'photish/render/change_manifest'
+require 'photish/cache/manifest'
+require 'photish/cache/manifest_db_file'
 require 'photish/rake/task'
 require 'photish/version'
 

data/photish.gemspec

@@ -27,13 +27,12 @@ Gem::Specification.new do |spec|
   spec.add_dependency "slim", "~> 3.0"
   spec.add_dependency "tilt", "~> 2.0"
   spec.add_dependency "mini_magick", "~> 4.3"
-  spec.add_dependency "ruby-filemagic", "~> 0.7"
   spec.add_dependency "mini_exiftool", "~> 2.5"
   spec.add_dependency "recursive-open-struct", "~> 1.0"
-  spec.add_dependency "nokogiri", "~> 1.6"
   spec.add_dependency "logging", "~> 2.0"
   spec.add_dependency "listen", "~> 3.0"
   spec.add_dependency "facter", "~> 2.4"
+  spec.add_dependency "mime-types", "~> 3.0"
 
   spec.add_development_dependency "anemone", "~> 0.7"
   spec.add_development_dependency "bundler", "~> 1.10"