photish 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10d4377b58ca8abfc533f024d63b08ac42ad2843
-  data.tar.gz: bbc4d59536dfcfe2bc92880963a32a9f77988b3e
+  metadata.gz: 837da75e8c5426ba38888369dc28eaa433e5162c
+  data.tar.gz: 8678a47a42f4b7e49ec3faae98130ada68e742e6
 SHA512:
-  metadata.gz: e1a165687012458bda29b180ea140faca11d1978d7eb9f8353c1863c95cd9aa7d761959e4c1a46c6a637e2c62e98adf860a33c6ce2ae98e0fe33f716cb180d75
-  data.tar.gz: b83864d828fac5f6878df88cd99061c585ba286f1b5fb809af1fc7a3ceb8486bcbd81da73c787a83090d470f1b7c2304235a1e4213892f15897b5ea22549a1d3
+  metadata.gz: f5fb8362d0d569a7f2f7c13edcd86259112cc062714f64a30602d3d00aaf7e6efde8bf0f5753a72a7f92447702b67d823085c363e445defddee223d98341374d
+  data.tar.gz: e5309014399f150ee267288433e363206b6b9356c4f6c7fbe28d9a61f9cbdd00112d0cb01017a890b6e7c946bd8488d12f2f2e37a04f1ca5987cdd1d539f5bad

data/README.md

@@ -21,6 +21,13 @@ information, Photish creates a complete static website that can be hosted on an
 [NGINX](http://nginx.org/), [Apache HTTP Server](https://httpd.apache.org/), or
 even on [Github Pages](https://pages.github.com/).
 
+Photish has been created with speed and efficiency in mind. Threads are used
+to parallelize image transcoding to achieve maximum utilization of your CPU
+during generation. A cache file is then used to ensure that unless the image
+has changed, it is not needlessly regenerated. This results in a responsive
+and fast local development environment, making it easy to perfect the design
+of your photo based website without having to wait for regeneration.
+
 ## Getting Started
 
 It is strongly recommended to read through the [Installation](#installation)

data/lib/photish/command/generate.rb

@@ -2,9 +2,7 @@ module Photish
   module Command
     class Generate < Base
       def run
-        log_important_config_values
         load_all_plugins
-        log_album_and_photo_names
         render_whole_site
         log.info 'Site generation completed successfully'
       end
@@ -24,19 +22,6 @@ module Photish
         Photish::Plugin::Repository.reload(log, site_dir)
       end
 
-      def log_important_config_values
-        log.info "Photo directory: #{photo_dir}"
-        log.info "Site directory: #{site_dir}"
-        log.info "Output directory: #{output_dir}"
-      end
-
-      def log_album_and_photo_names
-        collection.albums.each do |album|
-          log.info album.name
-          log.info album.photos.map(&:name)
-        end
-      end
-
       def render_whole_site
         Photish::Render::Site.new(templates,
                                   site_dir,

data/lib/photish/gallery/collection.rb

@@ -30,10 +30,10 @@ module Photish
       end
 
       def all_url_paths
-        [url_path,
-         all_albums.map(&:url_path),
-         all_photos.map(&:url_path),
-         all_images.map(&:url_path)].flatten
+        @all_url_paths ||= [url_path,
+                            all_albums.map(&:url_path),
+                            all_photos.map(&:url_path),
+                            all_images.map(&:url_path)].flatten
       end
 
       private

data/lib/photish/gallery/photo.rb

@@ -21,11 +21,11 @@ module Photish
       end
 
       def images
-        qualities.map { |quality| Photish::Gallery::Image.new(self, path, quality) }
+        @images ||= qualities.map { |quality| Photish::Gallery::Image.new(self, path, quality) }
       end
 
       def exif
-        MiniExiftool.new(path)
+        @exif ||= MiniExiftool.new(path)
       end
 
       def plugin_type

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

@@ -11,19 +11,19 @@ module Photish
         end
 
         def all_albums
-          albums.map { |album| [album] + album.all_albums }
-                .flatten
+          @all_albums ||= albums.map { |album| [album] + album.all_albums }
+                                .flatten
         end
 
         def all_photos
-          all_albums.map(&:photos)
-                    .concat(self.try(:photos) || [])
-                    .flatten
+          @all_photos ||= all_albums.map(&:photos)
+                                    .concat(self.try(:photos) || [])
+                                    .flatten
         end
 
         def all_images
-          all_photos.map(&:images)
-                    .flatten
+          @all_images ||= all_photos.map(&:images)
+                                    .flatten
         end
       end
     end

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

@@ -17,7 +17,8 @@ module Photish
         end
 
         def parents_and_me
-          [parent.try(:parents_and_me), self].flatten.compact
+          @parents_and_me ||= [parent.try(:parents_and_me),
+                               self].flatten.compact
         end
 
         private

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

@@ -4,7 +4,7 @@ module Photish
       module Metadatable
         def metadata
           return unless File.exist?(metadata_file)
-          RecursiveOpenStruct.new(YAML.load_file(metadata_file))
+          @metadata ||= RecursiveOpenStruct.new(YAML.load_file(metadata_file))
         end
 
         private

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

@@ -3,25 +3,25 @@ module Photish
     module Traits
       module Urlable
         def url
-          [host, url_parts].flatten.join('/')
+          @url ||= [host, url_parts].flatten.join('/')
         end
 
         def url_path
-          url_parts.join('/')
+          @url_path ||= url_parts.join('/')
         end
 
         def url_parts
-          base_url_parts + [url_end]
+          @url_parts ||= base_url_parts + [url_end]
         end
 
         def base_url_parts
-          parent.base_url_parts + [slugify(base_url_name)]
+          @base_url_parts ||= parent.base_url_parts + [slugify(base_url_name)]
         end
 
         private
 
         def host
-          normalized_host || ''
+          @host ||= normalized_host || ''
         end
 
         def normalized_host

data/lib/photish/render/change_manifest.rb

@@ -3,34 +3,43 @@ module Photish
     class ChangeManifest
       def initialize(output_dir)
         @output_dir = output_dir
+        @dirty = false
       end
 
       def record(key, file_path = nil)
-        db[key] = md5_of_file(file_path || key)
+        @dirty = true
+        db[key] = checksum_of_file(file_path || key)
       end
 
       def changed?(key, file_path = nil)
-        md5_of_file(file_path || key) != old_md5_of_file(key)
+        checksum_of_file(file_path || key) != old_checksum_of_file(key)
       end
 
       def flush_to_disk
+        return unless dirty
         File.open(db_file, 'w') { |f| f.write((db || {}).to_yaml) }
       end
 
+      def preload
+        db
+      end
+
       private
 
-      attr_reader :output_dir
+      attr_reader :output_dir,
+                  :dirty
 
-      def md5_of_file(file_path)
+      def checksum_of_file(file_path)
         Digest::MD5.file(file_path).hexdigest
       end
-      
-      def old_md5_of_file(file_path)
+
+      def old_checksum_of_file(file_path)
         db[file_path]
       end
 
       def db
-        @db ||= File.exist?(db_file) ? YAML.load_file(db_file) : {}
+        return @db if @db
+        @db = File.exist?(db_file) ? YAML.load_file(db_file) : {}
       end
 
       def db_file

data/lib/photish/render/image_conversion.rb

@@ -10,8 +10,9 @@ module Photish
       def render(images)
         image_queue = to_queue(images)
 
-        log.info "Rendering #{images.count} across #{max_workers} threads"
+        log.info "Rendering #{images.count} images across #{max_workers} threads"
 
+        change_manifest.preload
         workers = (0...max_workers).map do
           Thread.new do
             begin

data/lib/photish/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: photish
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Henry Lawson