photish 0.3.7 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 125c4f61ed920f3303888da575fa87f975fe5813
-  data.tar.gz: 6685345ee7ac7085e485a6a1864d279a22dc4888
+  metadata.gz: 8435b70f34daef14e185370d7c8ca195a75db071
+  data.tar.gz: cac3fce5cea64da66e1b301d62ce05b9d2bfd482
 SHA512:
-  metadata.gz: 693d4dc6fd824f4cc97d331ae9aa8d12bd861ba2fbb163ddd6dc5147535dc9359f4153e6a46fb7cd1c667322934bbb6d2a2862bc7add6232933576c28e0aa84d
-  data.tar.gz: 793b9d2339104e6d21afd6aa6461de5c792cfac64cec41c8e18d18602c88821eec8934f151682d9158a6f01d0975fe92d634cee078380f2228df59fcfdee69f4
+  metadata.gz: 7143bed97bb665456b9a353bc9f71a063a63f34006e578221d363e36be99491d30a001428a37ea7894e76b47b0cc65c4bd8f1e1920657d6915713edf777e2cb9
+  data.tar.gz: 63f6237a0547672589eec634fd2fab52b343b9c8c6790a5547a57db14bc65b9e9e79de24c3b4454501f168b87af555ec1e8f78737c6e8be8ec57ea13c7cad4c6

data/README.md

@@ -28,6 +28,12 @@ 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.
 
+## Photish in the Wild
+
+1. [Photish Montage](https://foinq.com/photish-montage/index.html) - A quick
+   mockup to show what can be done with Photish. [Source
+   here](https://github.com/henrylawson/photish-montage).
+
 ## Getting Started
 
 It is strongly recommended to read through the [Installation](#installation)
@@ -337,11 +343,7 @@ the file extension will change. By default the template engine is
 
 `site/_templates/layout.{type}`
 
-The layout template is the base layout for all the other templates. The
-`collection`, `album` and `photo` templates will be rendered inside this
-layout. The layout template **must** include the `yield` statement to bind the
-sub template inside it. Below is an example [Slim](http://slim-lang.com/)
-template, the other templates will be bound where the `yield` statement is:
+Example:
 
 ```slim
 doctype html
@@ -352,10 +354,27 @@ html
     == yield
 ```
 
+The layout template is the base layout for all the other templates. The
+`collection`, `album` and `photo` templates will be rendered inside this
+layout. The layout template **must** include the `yield` statement to bind the
+sub template inside it. Below is an example [Slim](http://slim-lang.com/)
+template, the other templates will be bound where the `yield` statement is:
+
 ##### Collection Template
 
 `site/_templates/collection.{type}`
 
+Example:
+
+```slim
+h1 Photo Collection
+- albums.each do |album|
+  div.album
+    div.album-title
+      a href=album.url
+        | #{album.name}
+```
+
 The collection template becomes the `index.html` for the root of the website.
 
 This template is passed the
@@ -375,6 +394,20 @@ all_images          | an array of all child [Images](https://github.com/henrylaw
 
 `site/_templates/album.{type}`
 
+Example:
+
+```slim
+h1 Album
+h2
+  a href=url
+    | #{name}
+div.album-photos
+  - photos.each do |photo|
+    div.album-photo
+      a href=photo.url title=photo.name
+        img src=photo.images.find{ |i|i.quality_name=='Low' }.url alt=photo.name
+```
+
 For each folder in the `photos` directory, a slugified album folder is created
 with an `index.html` in it.
 
@@ -396,6 +429,20 @@ all_images          | an array of all child [Images](https://github.com/henrylaw
 
 `site/_templates/photo.{type}`
 
+Example:
+
+```slim
+h1 Photo
+h2
+  a href=url
+    | #{name}
+  div.album-photos
+    - images.each do |image|
+      div.album-photo
+        a href=image.url title=image.name
+          img src=image.url alt=image.quality_name
+```
+
 For each image in an Albums directory, a slugified photo folder is created
 with an `index.html` in it.
 

data/TODO.md

@@ -2,8 +2,19 @@
 
 ## In Progress
 
+1. Url and base are broken during template/image creation
+1. Solve problem for explicit urls mentioned in templates (that need host/base)
+1. Need to have parameters to change on deploy
+1. During Host command nullify url options to work on host
+1. Deploy README content
+1. Extract the SSH deploy to gem
+
 ## Backlog
 
+1. Empty folders exist in output dir after orig removed and regeneration has happened
+1. Worker can die when large folders moved mid generation
+1. Changing convert items does not trigger regeneration but changing name does
+1. Templates with exif data, super slow
 1. Plugin as a gem to deploy to github pages, netlify, amazon s3
 1. Custom template rendering outside of `_templates` folder using `page.{type}`
 1. Proper asset pipeline for CSS
@@ -14,3 +25,4 @@
 1. Provide generic way to override config from arguments to allow for host name
    override on deploy etc.
 1. Video transcoding and template rendering
+1. Demo sites with better design

data/lib/photish/assets/example/site/_plugins/tmpdir_deploy.rb

@@ -5,7 +5,7 @@ class Photish::Plugin::TmpdirDeploy
     @log = log
   end
 
-  def deploy
+  def deploy_site
     tmpdir = Dir.mktmpdir
     FileUtils.cp_r(config.output_dir, tmpdir)
 

data/lib/photish/command/deploy.rb

@@ -5,10 +5,10 @@ module Photish
         load_all_plugins
         log.info "Requested engine: #{engine}"
 
-        return no_engine_found unless engine
+        return no_engine_found unless engine && engine_class
 
         log.info "Deploying with engine #{engine_class}"
-        engine_class.new(config, log).deploy
+        engine_class.new(config, log).deploy_site
       end
 
       private

data/lib/photish/config/app_settings.rb

@@ -18,10 +18,10 @@ module Photish
       attr_reader :runtime_config
 
       def prioritized_config
-        {}.merge(default_config)
-          .merge(file_config)
-          .merge(runtime_config)
-          .merge(derived_config)
+        {}.deep_merge(default_config)
+          .deep_merge(file_config)
+          .deep_merge(runtime_config)
+          .deep_merge(derived_config)
       end
 
       def sensitive_config

data/lib/photish/log/formatter.rb

@@ -9,8 +9,6 @@ module Photish
         LogLine.new(@color, severity, datetime, progname, msg).format
       end
 
-      private
-
       class LogLine
         def initialize(color, severity, datetime, progname, msg)
           @color = color

data/lib/photish/log/safe_block.rb

@@ -4,11 +4,10 @@ module Photish
       def handle_errors(name)
         begin
           yield
-          @runtime_error_occured = false
-        rescue Exception => e
-          log.fatal "#{name} died due to exception"
+        rescue ScriptError, SignalException, StandardError, SystemExit => e
+          log.fatal "#{name} died due to #{e.class.name}"
           log.fatal e unless e.kind_of?(SystemExit)
-          Thread.list.each(&:kill) 
+          Thread.list.each(&:kill)
           exit(1)
         end
       end

data/lib/photish/version.rb

@@ -1,3 +1,3 @@
 module Photish
-  VERSION = "0.3.7"
+  VERSION = "0.3.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: photish
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors:
 - Henry Lawson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-25 00:00:00.000000000 Z
+date: 2015-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor