photish 0.3.11 → 0.4.0

data/lib/photish/plugin/core/exifable.rb

@@ -0,0 +1,15 @@
+module Photish
+  module Plugin
+    module Core
+      module Exifable
+        def self.is_for?(type)
+          Photish::Plugin::Type::Photo == type
+        end
+
+        def exif
+          @exif ||= MiniExiftool.new(path)
+        end
+      end
+    end
+  end
+end

data/lib/photish/plugin/core/metadatable.rb

@@ -0,0 +1,27 @@
+module Photish
+  module Plugin
+    module Core
+      module Metadatable
+        def self.is_for?(type)
+          [
+            Photish::Plugin::Type::Collection,
+            Photish::Plugin::Type::Album,
+            Photish::Plugin::Type::Photo,
+            Photish::Plugin::Type::Page,
+          ].include?(type)
+        end
+
+        def metadata
+          return unless File.exist?(metadata_file)
+          @metadata ||= RecursiveOpenStruct.new(YAML.load_file(metadata_file))
+        end
+
+        private
+
+        def metadata_file
+          File.join(dirname, basename_without_extension + '.yml')
+        end
+      end
+    end
+  end
+end

data/lib/photish/plugin/repository.rb

@@ -5,7 +5,7 @@ module Photish
       include Log::Loggable
 
       def reload(config)
-        log.info "Loading plugins..."
+        log.debug "Loading plugins..."
 
         load_each_plugin_file(config.site_dir)
         require_each_explicit_plugin(config.plugins)
@@ -21,22 +21,18 @@ module Photish
         @all_plugins ||= constants + sub_constants
       end
 
-      def loaded?
-        @all_plugins.present?
-      end
-
       private
 
       def require_each_explicit_plugin(plugins)
         plugins.each do |plugin|
-          log.info "Requiring config explicit plugin, #{plugin}"
+          log.debug "Requiring config explicit plugin, #{plugin}"
           require plugin
         end
       end
 
       def load_each_plugin_constant
         all_plugins.each do |plugin|
-          log.info "Found plugin #{plugin}"
+          log.debug "Found plugin #{plugin}"
         end
       end
 

data/lib/photish/plugin/type.rb

@@ -6,6 +6,7 @@ module Photish
       module Photo;      end
       module Image;      end
       module Deploy;     end
+      module Page;      end
     end
   end
 end

data/lib/photish/render/{image_conversion.rb → image.rb}

@@ -1,36 +1,40 @@
 module Photish
   module Render
-    class ImageConversion
+    class Image
       include Log::Loggable
 
-      def initialize(output_dir, worker_index, version_hash, threads)
-        @output_dir = output_dir
-        @worker_index = worker_index
+      def initialize(config, version_hash)
+        @config = config
         @version_hash = version_hash
-        @threads = threads
       end
 
       def render(images)
-        log.info "Rendering #{images.count} images across #{threads} threads"
+        log.debug "Rendering #{images.count} images across #{threads} threads"
 
-        cache.preload
+        cache_load_from_disk
         threads = spawn_thread_instances(to_queue(images))
         threads.map(&:join)
-        flush_to_disk
+        cache_flush_to_disk
       end
 
       private
 
-      attr_reader :output_dir,
-                  :worker_index,
-                  :version_hash,
-                  :threads
+      attr_reader :config,
+                  :version_hash
+
+      delegate :output_dir,
+               :worker_index,
+               :threads,
+               :soft_failure,
+               :workers,
+               to: :config
 
       delegate :record,
                :changed?,
                :flush_to_disk,
-               :preload,
-               to: :cache
+               :load_from_disk,
+               to: :cache,
+               prefix: true
 
       def spawn_thread_instances(image_queue)
         (0...threads).map do
@@ -42,11 +46,18 @@ module Photish
 
       def process_images(image_queue)
         while !image_queue.empty?
-          image = image_queue.pop
-          convert(image) if changed?(image.url_path, image.path)
+          process_next_image(image_queue)
         end
       end
 
+      def process_next_image(image_queue)
+        image = image_queue.pop
+        convert(image) if cache_changed?(image.url_path, image.path)
+      rescue Errno::ENOENT
+        log.warn "Image not found #{image.path}"
+        raise unless soft_failure
+      end
+
       def to_queue(images)
         image_queue = Queue.new
         Array(images).shuffle.each { |image| image_queue << image }
@@ -56,7 +67,7 @@ module Photish
       def convert(image)
         create_parent_directories(image)
         convert_with_imagemagick(image)
-        record(image.url_path, image.path)
+        cache_record(image.url_path, image.path)
       end
 
       def convert_with_imagemagick(image)
@@ -64,8 +75,12 @@ module Photish
           convert << image.path
           convert.merge!(image.quality_params)
           convert << output_path(image)
-          log.info "Performing image conversion #{convert.command}"
+          log.debug "Performing image conversion #{convert.command}"
         end
+      rescue MiniMagick::Error => e
+        log.warn "Error occured while converting"
+        log.warn e
+        raise unless soft_failure
       end
 
       def output_path(image)
@@ -78,6 +93,7 @@ module Photish
 
       def cache
         @cache ||= Cache::Manifest.new(output_dir,
+                                       workers,
                                        worker_index,
                                        version_hash)
       end

data/lib/photish/render/{site_worker.rb → model.rb}

@@ -1,6 +1,6 @@
 module Photish
   module Render
-    class SiteWorker
+    class Model
       def initialize(config, version_hash)
         @config = config
         @version_hash = version_hash
@@ -19,7 +19,6 @@ module Photish
                :site_dir,
                :output_dir,
                :workers,
-               :threads,
                :worker_index,
                to: :config
 
@@ -28,6 +27,7 @@ module Photish
           ->{ album_template.render(subset(collection.all_albums))   },
           ->{ photo_template.render(subset(collection.all_photos))   },
           ->{ image_conversion.render(subset(collection.all_images)) },
+          ->{ page_template.render(subset(collection.all_pages))     },
         ]
       end
 
@@ -38,22 +38,23 @@ module Photish
       end
 
       def image_conversion
-        ImageConversion.new(output_dir,
-                            worker_index,
-                            version_hash,
-                            threads)
+        Image.new(config, version_hash)
       end
 
       def album_template
-        Page.new(layout_file,
-                 template_album_file,
-                 output_dir)
+        Template.new(layout_file,
+                     template_album_file,
+                     output_dir)
+      end
+
+      def page_template
+        Page.new(layout_file, output_dir)
       end
 
       def photo_template
-        Page.new(layout_file,
-                 template_photo_file,
-                 output_dir)
+        Template.new(layout_file,
+                     template_photo_file,
+                     output_dir)
       end
 
       def layout_file

data/lib/photish/render/page.rb

@@ -3,54 +3,43 @@ module Photish
     class Page
       include Log::Loggable
 
-      def initialize(layout_file, template_file, output_dir)
+      def initialize(layout_file, output_dir)
         @layout_file = layout_file
-        @template_file = template_file
         @output_dir = output_dir
       end
 
-      def render(models)
-        return template_missing unless File.exist?(template_file)
-        render_all(models)
+      def render(pages)
+        render_all(pages)
       end
 
       private
 
-      attr_reader :template_file,
-                  :layout_file,
+      attr_reader :layout_file,
                   :output_dir
 
-      def render_all(models)
-        Array(models).each do |model|
-          rendered_model = render_template_and_layout(model)
-          output_model_file = relative_to_output_dir(model.url_parts)
-          output_model_dir = relative_to_output_dir(model.base_url_parts)
+      def render_all(pages)
+        Array(pages).each do |page|
+          rendered_model = render_with_layout(page)
+          output_model_file = relative_to_output_dir(page.url_parts)
+          output_model_dir = relative_to_output_dir(page.base_url_parts)
 
-          log.info "Rendering #{model.url} with template #{template_file} to #{output_model_file}"
+          log.debug "Rendering #{page.url} to #{output_model_file}"
 
           FileUtils.mkdir_p(output_model_dir)
           File.write(output_model_file, rendered_model)
         end
       end
 
-      def template_missing
-        log.info "Template not found #{template_file}, skipping rendering"
-      end
-
       def relative_to_output_dir(url_parts)
         File.join(output_dir, url_parts)
       end
 
-      def render_template_and_layout(model)
-        layout.render(model) do
-          template.render(model)
+      def render_with_layout(page)
+        layout.render(page) do
+          Tilt.new(page.path).render(page)
         end
       end
 
-      def template
-        @template ||= Tilt.new(template_file)
-      end
-
       def layout
         @layout ||= Tilt.new(layout_file)
       end

data/lib/photish/render/site.rb

@@ -51,9 +51,9 @@ module Photish
       end
 
       def collection_template
-        Page.new(layout_file,
-                 template_collection_file,
-                 output_dir)
+        Template.new(layout_file,
+                     template_collection_file,
+                     output_dir)
       end
 
       def non_ignored_site_contents

data/lib/photish/render/template.rb

@@ -0,0 +1,59 @@
+module Photish
+  module Render
+    class Template
+      include Log::Loggable
+
+      def initialize(layout_file, template_file, output_dir)
+        @layout_file = layout_file
+        @template_file = template_file
+        @output_dir = output_dir
+      end
+
+      def render(models)
+        return template_missing unless File.exist?(template_file)
+        render_all(models)
+      end
+
+      private
+
+      attr_reader :template_file,
+                  :layout_file,
+                  :output_dir
+
+      def render_all(models)
+        Array(models).each do |model|
+          rendered_model = render_template_and_layout(model)
+          output_model_file = relative_to_output_dir(model.url_parts)
+          output_model_dir = relative_to_output_dir(model.base_url_parts)
+
+          log.debug "Rendering #{model.url} with template #{template_file} to #{output_model_file}"
+
+          FileUtils.mkdir_p(output_model_dir)
+          File.write(output_model_file, rendered_model)
+        end
+      end
+
+      def template_missing
+        log.debug "Template not found #{template_file}, skipping rendering"
+      end
+
+      def relative_to_output_dir(url_parts)
+        File.join(output_dir, url_parts)
+      end
+
+      def render_template_and_layout(model)
+        layout.render(model) do
+          template.render(model)
+        end
+      end
+
+      def template
+        @template ||= Tilt.new(template_file)
+      end
+
+      def layout
+        @layout ||= Tilt.new(layout_file)
+      end
+    end
+  end
+end

data/lib/photish/version.rb

@@ -1,3 +1,3 @@
 module Photish
-  VERSION = "0.3.11"
+  VERSION = "0.4.0"
 end

data/lib/photish.rb

@@ -21,8 +21,8 @@ require 'open3'
 # Photish
 require 'photish/log/loggable'
 require 'photish/log/formatter'
-require 'photish/log/log_setup'
-require 'photish/log/access_log'
+require 'photish/log/setup'
+require 'photish/log/io'
 require 'photish/log/safe_block'
 require 'photish/plugin/type'
 require 'photish/plugin/pluginable'
@@ -34,26 +34,29 @@ require 'photish/command/host'
 require 'photish/command/init'
 require 'photish/command/deploy'
 require 'photish/cli/interface'
-require 'photish/config/image_extension'
 require 'photish/config/default_config'
 require 'photish/config/file_config'
-require 'photish/config/file_config_location'
-require 'photish/config/app_settings'
-require 'photish/core_plugin/build_url'
-require 'photish/core_plugin/breadcrumb'
+require 'photish/config/settings'
+require 'photish/plugin/core/build_url'
+require 'photish/plugin/core/breadcrumb'
+require 'photish/plugin/core/metadatable'
+require 'photish/plugin/core/exifable'
 require 'photish/gallery/traits/urlable'
 require 'photish/gallery/traits/albumable'
-require 'photish/gallery/traits/metadatable'
+require 'photish/gallery/traits/fileable'
 require 'photish/gallery/photo'
+require 'photish/gallery/page'
 require 'photish/gallery/album'
 require 'photish/gallery/image'
 require 'photish/gallery/collection'
+require 'photish/render/template'
 require 'photish/render/page'
 require 'photish/render/site'
-require 'photish/render/site_worker'
-require 'photish/render/image_conversion'
+require 'photish/render/model'
+require 'photish/render/image'
+require 'photish/cache/db_file'
 require 'photish/cache/manifest'
-require 'photish/cache/manifest_db_file'
+require 'photish/cache/repository'
 require 'photish/rake/task'
 require 'photish/version'
 

data/photish.gemspec

@@ -44,4 +44,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec-html-matchers"
   spec.add_development_dependency "metric_fu"
   spec.add_development_dependency "photish-plugin-sshdeploy"
+  spec.add_development_dependency "awesome_print"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: photish
 version: !ruby/object:Gem::Version
-  version: 0.3.11
+  version: 0.4.0
 platform: ruby
 authors:
 - Henry Lawson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-27 00:00:00.000000000 Z
+date: 2016-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -304,6 +304,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |-
   Photish is a simple, convention based (but
     configurable) static photo site generator.
@@ -317,6 +331,7 @@ files:
 - ".codeclimate.yml"
 - ".csslintrc"
 - ".gitignore"
+- ".pryrc"
 - ".rspec"
 - ".rubocop.yml"
 - ".simplecov"
@@ -336,6 +351,7 @@ files:
 - lib/photish/assets/barebones/site/_templates/layout.slim
 - lib/photish/assets/barebones/site/styles/basic.css
 - lib/photish/assets/config.yml
+- lib/photish/assets/example/photos/Big Dogs/Custom Template Page.slim
 - lib/photish/assets/example/photos/Big Dogs/Tired Dogs.jpg
 - lib/photish/assets/example/photos/Big Dogs/Winking Dog.jpg
 - lib/photish/assets/example/photos/Small Dogs/Fluffy Dogs/Exhausted Dogs.jpg
@@ -356,8 +372,9 @@ files:
 - lib/photish/assets/example/site/images/crumbs.gif
 - lib/photish/assets/example/site/styles/basic.css
 - lib/photish/assets/gitignore
+- lib/photish/cache/db_file.rb
 - lib/photish/cache/manifest.rb
-- lib/photish/cache/manifest_db_file.rb
+- lib/photish/cache/repository.rb
 - lib/photish/cli/interface.rb
 - lib/photish/command/base.rb
 - lib/photish/command/deploy.rb
@@ -365,34 +382,35 @@ files:
 - lib/photish/command/host.rb
 - lib/photish/command/init.rb
 - lib/photish/command/worker.rb
-- lib/photish/config/app_settings.rb
 - lib/photish/config/default_config.rb
 - lib/photish/config/file_config.rb
-- lib/photish/config/file_config_location.rb
-- lib/photish/config/image_extension.rb
-- lib/photish/core_plugin/breadcrumb.rb
-- lib/photish/core_plugin/build_url.rb
+- lib/photish/config/settings.rb
 - lib/photish/gallery/album.rb
 - lib/photish/gallery/collection.rb
 - lib/photish/gallery/image.rb
+- lib/photish/gallery/page.rb
 - lib/photish/gallery/photo.rb
 - lib/photish/gallery/traits/albumable.rb
-- lib/photish/gallery/traits/breadcrumbable.rb
-- lib/photish/gallery/traits/metadatable.rb
+- lib/photish/gallery/traits/fileable.rb
 - lib/photish/gallery/traits/urlable.rb
-- lib/photish/log/access_log.rb
 - lib/photish/log/formatter.rb
-- lib/photish/log/log_setup.rb
+- lib/photish/log/io.rb
 - lib/photish/log/loggable.rb
 - lib/photish/log/safe_block.rb
+- lib/photish/log/setup.rb
+- lib/photish/plugin/core/breadcrumb.rb
+- lib/photish/plugin/core/build_url.rb
+- lib/photish/plugin/core/exifable.rb
+- lib/photish/plugin/core/metadatable.rb
 - lib/photish/plugin/pluginable.rb
 - lib/photish/plugin/repository.rb
 - lib/photish/plugin/type.rb
 - lib/photish/rake/task.rb
-- lib/photish/render/image_conversion.rb
+- lib/photish/render/image.rb
+- lib/photish/render/model.rb
 - lib/photish/render/page.rb
 - lib/photish/render/site.rb
-- lib/photish/render/site_worker.rb
+- lib/photish/render/template.rb
 - lib/photish/version.rb
 - photish.gemspec
 homepage: https://github.com/henrylawson/photish

data/lib/photish/cache/manifest_db_file.rb

@@ -1,36 +0,0 @@
-module Photish
-  module Cache
-    class ManifestDbFile
-      def initialize(output_dir)
-        @output_dir = output_dir
-      end
-
-      def concat_db_files(workers)
-        changes = (1..workers).inject({}) do |accumulator, worker_index|
-          file = worker_db_file(worker_index)
-          accumulator.merge!(YAML.load_file(file)) if File.exist?(file)
-          accumulator
-        end
-        File.open(db_file, 'w') { |f| f.write(changes.to_yaml) }
-      end
-
-      def clear
-        FileUtils.rm_rf(db_file)
-      end
-
-      def db_file
-        FileUtils.mkdir_p(output_dir)
-        File.join(output_dir, '.changes.yml')
-      end
-
-      def worker_db_file(index)
-        FileUtils.mkdir_p(output_dir)
-        File.join(output_dir, ".changes.#{index}.yml")
-      end
-
-      private
-
-      attr_reader :output_dir
-    end
-  end
-end

data/lib/photish/config/app_settings.rb

@@ -1,57 +0,0 @@
-module Photish
-  module Config
-    class AppSettings
-      def initialize(runtime_config)
-        @runtime_config = symbolize(runtime_config)
-      end
-
-      def config
-        @config ||= RecursiveOpenStruct.new(prioritized_config)
-      end
-
-      def version_hash
-        @version_hash ||= Digest::MD5.hexdigest(sensitive_config.to_json)
-      end
-
-      private
-
-      attr_reader :runtime_config
-
-      def prioritized_config
-        {}.deep_merge(default_config)
-          .deep_merge(file_config)
-          .deep_merge(runtime_config)
-          .deep_merge(derived_config)
-      end
-
-      def sensitive_config
-        prioritized_config.slice('qualities')
-      end
-
-      def derived_config
-        {
-          config_file_location: config_file_location
-        }
-      end
-
-      def file_config
-        symbolize(FileConfig.new(config_file_location)
-                                            .hash)
-      end
-
-      def default_config
-        symbolize(DefaultConfig.new.hash)
-      end
-
-      def config_file_location
-        FileConfigLocation.new(runtime_config[:config_dir])
-                          .path
-      end
-
-      def symbolize(hash)
-        (hash || {})
-          .deep_symbolize_keys
-      end
-    end
-  end
-end