piccle 0.1.0.rc1 → 0.1.1.pre

data/lib/piccle/streams/keyword_stream.rb

@@ -10,7 +10,8 @@ class Piccle::Streams::KeywordStream < Piccle::Streams::BaseStream
   def data_for(photo)
     result = { namespace => {
                :friendly_name => "By Topic",
-               :interesting => true
+               :interesting => true,
+               :min_for_nav => 2
              }}
     photo.keywords.each do |kw|
       result[namespace][slugify(kw.name)] = { friendly_name: kw.name, interesting: true, photos: [photo.md5] }

data/lib/piccle/streams/person_stream.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+# Browse photos by person.
+class Piccle::Streams::PersonStream < Piccle::Streams::BaseStream
+  def namespace
+    "by-person"
+  end
+
+  def data_for(photo)
+    result = { namespace => { :friendly_name => "By Person", :interesting => true, :min_for_nav => 2 } }
+    photo.people.each do |person|
+      result[namespace][slugify(person.name)] = { friendly_name: person.name, interesting: true, photos: [photo.md5] }
+    end
+    result
+  end
+end

data/lib/piccle/version.rb

@@ -1,3 +1,3 @@
 module Piccle
-  VERSION = "0.1.0.rc1"
+  VERSION = "0.1.1.pre"
 end

data/templates/_header.handlebars.slim

@@ -2,6 +2,7 @@ head
   meta charset="utf-8"
   meta name="viewport" content="width=device-width, initial-scale=1"
   title Photography by {{site_metadata.author_name}}
+  meta name="description" content="{{page_description}}"
   link rel="stylesheet" href="{{include_prefix}}css/normalize.css"
   link rel="stylesheet" href="{{include_prefix}}css/default.css"
   link rel="icon" href="{{include_prefix}}icons/favicon.ico"
@@ -14,14 +15,17 @@ head
     {{#if canonical}}
     <link rel="canonical" href="{{include_prefix}}{{canonical}}" />
     {{/if}}
-    {{#if prev_link}}
-    <link rel="prev" href="{{include_prefix}}{{prev_link}}" />
+    {{#if prev_link}} {{! Previous and next links don't need the include prefix; they're always in the current directory. }}
+    <link rel="prev" href="{{prev_link}}" />
     {{/if}}
     {{#if next_link}}
-    <link rel="next" href="{{include_prefix}}{{next_link}}" />
+    <link rel="next" href="{{next_link}}" />
     {{/if}}
     {{#if site_url}}
-    <link rel="alternate" type="application/atom+xml" href="{{include_prefix}}/feed.atom" title="All photos">
+    <link rel="alternate" type="application/atom+xml" href="{{include_prefix}}feed.atom" title="All photos" />
+    {{#if selector}}
+    <link rel="alternate" type="application/atom+xml" href="{{include_prefix}}{{join selector '/'}}/feed.atom" title="{{open_graph.title}}" />
+    {{/if}}
     {{/if}}
     {{#if open_graph}}
     <meta property="og:type" content="website" />

data/templates/index.html.handlebars.slim

@@ -1,36 +1,78 @@
 doctype html
-html
+html lang="en"
   == Piccle::TemplateHelpers.render_partial "header"
 
   body.photos_index
     header
-      |
-        {{#if selector}}
-          <h1><a href="{{include_prefix}}index.html">Photography by {{site_metadata.author_name}}</a></h1>
-        {{else}}
-          <h1>Photography by {{site_metadata.author_name}}</a></h1>
-        {{/if}}
+      | <h1><a href="{{include_prefix}}index.html">Photography by {{site_metadata.author_name}}</a></h1>
       == Piccle::TemplateHelpers.render_partial "breadcrumbs"
     main
       == Piccle::TemplateHelpers.render_partial "navigation"
 
-      .photos
+      #photos
         |
           {{#each photos as |photo|}}
             {{#if (lookup ../event_ends photo.hash)}}
               {{#with (lookup ../event_ends hash)}}
-                <p class="event_block event_end"><a href="{{../include_prefix}}{{join selector '/'}}/index.html">{{name}}</a></p>
+                {{#if collapsed}} {{! Collapsed events don't show photos, only an initial end tile. }}
+                  <p class="event_block collapsed" style="background-image: url('{{../include_prefix}}{{join selector '/'}}/quilt.jpg');">
+                    <a href="{{../include_prefix}}{{join selector '/'}}/index.html">{{name}}</a>
+                  </p>
+                {{else}} {{! Not collapsed, show the photo here }}
+                  <p class="event_block event_end">
+                    <a href="{{../include_prefix}}{{join selector '/'}}/index.html">{{name}}</a>
+                  </p>
+                  <a href="{{../include_prefix}}{{../selector_path}}{{photo.hash}}.html#photo">
+                    <img class="thumbnail" src="{{../include_prefix}}images/thumbnails/{{photo.hash}}.{{photo.file_name}}" alt="{{photo.title}}" width="#{Piccle::THUMBNAIL_SIZE}" height="#{Piccle::THUMBNAIL_SIZE}" />
+                  </a>
+                {{/if}}
               {{/with}}
+            {{else}} {{! Not an event end tile, always show the photo }}
+              <a href="{{../include_prefix}}{{../selector_path}}{{photo.hash}}.html#photo">
+                <img class="thumbnail" src="{{../include_prefix}}images/thumbnails/{{photo.hash}}.{{photo.file_name}}" alt="{{photo.title}}" width="#{Piccle::THUMBNAIL_SIZE}" height="#{Piccle::THUMBNAIL_SIZE}" />
+              </a>
             {{/if}}
-            <a href="{{../include_prefix}}{{../selector_path}}{{photo.hash}}.html#photo">
-              <img class="thumbnail" src="{{../include_prefix}}images/thumbnails/{{photo.hash}}.{{photo.file_name}}" alt="{{photo.title}}" />
-            </a>
             {{#if (lookup ../event_starts photo.hash)}}
               {{#with (lookup ../event_starts hash)}}
-                <p class="event_block event_start"><a href="{{../include_prefix}}{{join selector '/'}}/index.html">{{name}}</a></p>
+                {{#unless collapsed}}
+                  <p class="event_block event_start"><a href="{{../include_prefix}}{{join selector '/'}}/index.html">{{name}}</a></p>
+                {{/unless}}
               {{/with}}
             {{/if}}
           {{/each}}
 
+    |
+      {{#if pagination}}
+      <div class="pagination">
+        {{#unless pagination.is_first_page}}
+          {{#if selector}}
+            <a href="{{include_prefix}}{{join selector '/'}}/{{pagination.previous_page_name}}.html#photos">&laquo;&nbsp;Previous</a>
+          {{else}}
+            <a href="{{include_prefix}}{{pagination.previous_page_name}}.html#photos">&laquo;&nbsp;Previous</a>
+          {{/if}}
+        {{/unless}}
+        <ol>
+          {{#each pagination.pages}}
+            {{#if this.is_current}}
+              <li class="current">{{this.label}}</li>
+            {{else}}
+              {{#if selector}}
+                <li><a href="{{include_prefix}}{{join selector '/'}}/{{this.page_name}}.html#photos">{{this.label}}</a></li>
+              {{else}}
+                <li><a href="{{include_prefix}}{{this.page_name}}.html#photos">{{this.label}}</a></li>
+              {{/if}}
+            {{/if}}
+          {{/each}}
+        </ol>
+        {{#unless pagination.is_last_page}}
+          {{#if selector}}
+            <a href="{{include_prefix}}{{join selector '/'}}/{{pagination.next_page_name}}.html#photos">Next&nbsp;&raquo;</a>
+          {{else}}
+            <a href="{{include_prefix}}{{pagination.next_page_name}}.html#photos">Next&nbsp;&raquo;</a>
+          {{/if}}
+        {{/unless}}
+      </div>
+      {{/if}}
+
     == Piccle::TemplateHelpers.render_partial "footer"
 

data/templates/show.html.handlebars.slim

@@ -1,64 +1,66 @@
-== Piccle::TemplateHelpers.render_partial "header"
+doctype html
+html lang="en"
+  == Piccle::TemplateHelpers.render_partial "header"
 
-body.photo_show
-  header
-    h1
-      a href="{{include_prefix}}index.html" Photography by {{site_metadata.author_name}}
-    == Piccle::TemplateHelpers.render_partial "breadcrumbs"
-  main#photo
-    h2
-      | {{photo.title}}
-    .photo_with_pagination
-      | {{#if prev_link}}
-        <a class="navigation_arrow" href="{{include_prefix}}{{prev_link}}#photo">&laquo;</a>
-        {{else}}
-        <span class="navigation_arrow">&nbsp;</span>
+  body.photo_show
+    header
+      h1
+        a href="{{include_prefix}}index.html" Photography by {{site_metadata.author_name}}
+      == Piccle::TemplateHelpers.render_partial "breadcrumbs"
+    main#photo
+      h2
+        | {{photo.title}}
+      .photo_with_pagination
+        | {{#if prev_link}}
+          <a class="navigation_arrow" href="{{include_prefix}}{{prev_link}}#photo">&laquo;</a>
+          {{else}}
+          <span class="navigation_arrow">&nbsp;</span>
+          {{/if}}
+        img src="{{include_prefix}}images/photos/{{photo.hash}}.{{photo.file_name}}"
+        | {{#if next_link}}
+          <a class="navigation_arrow" href="{{include_prefix}}{{next_link}}#photo">&raquo;</a>
+          {{else}}
+          <span class="navigation_arrow">&nbsp;</span>
+          {{/if}}
+
+      p.description
+        | {{photo.description}}
+      p.settings
+        | {{#if camera_link}}
+          <a href="{{include_prefix}}{{camera_link.link}}">{{camera_link.friendly_name}}</a>{{/if}}{{#if photo.focal_length}}, {{photo.focal_length}}{{/if}}{{#if photo.aperture}}, f/{{photo.aperture}}{{/if}}{{#if photo.shutter_speed}}, {{photo.shutter_speed}}{{/if}}{{#if photo.iso}}, ISO {{photo.iso}}{{/if}}.
+      | {{#if photo.taken_at}}
+          <p class="date">
+            {{#if day_link}}<a href="{{include_prefix}}{{day_link.link}}">{{day_link.friendly_name}}</a>{{/if}}
+            {{#if month_link}}<a href="{{include_prefix}}{{month_link.link}}">{{month_link.friendly_name}}</a>, {{/if}}
+            {{#if year_link}}<a href="{{include_prefix}}{{year_link.link}}">{{year_link.friendly_name}}</a>.{{/if}}
+          </p>
         {{/if}}
-      img src="{{include_prefix}}images/photos/{{photo.hash}}.{{photo.file_name}}"
-      | {{#if next_link}}
-        <a class="navigation_arrow" href="{{include_prefix}}{{next_link}}#photo">&raquo;</a>
-        {{else}}
-        <span class="navigation_arrow">&nbsp;</span>
+        {{#if photo.has_location}}
+          <ul class="location">
+            {{#if city_link}}<li><a href="{{include_prefix}}{{city_link.link}}">{{city_link.friendly_name}}</a></li>{{/if}}
+            {{#if state_link}}<li><a href="{{include_prefix}}{{state_link.link}}">{{state_link.friendly_name}}</a></li>{{/if}}
+            {{#if country_link}}<li><a href="{{include_prefix}}{{country_link.link}}">{{country_link.friendly_name}}</a></li>{{/if}}
+          </ul>
         {{/if}}
 
-    p.description
-      | {{photo.description}}
-    p.settings
-      | {{#if camera_link}}
-        <a href="{{include_prefix}}{{camera_link.link}}">{{camera_link.friendly_name}}</a>{{/if}}{{#if photo.focal_length}}, {{photo.focal_length}}{{/if}}{{#if photo.aperture}}, f/{{photo.aperture}}{{/if}}{{#if photo.shutter_speed}}, {{photo.shutter_speed}}{{/if}}{{#if photo.iso}}, ISO {{photo.iso}}{{/if}}.
-    | {{#if photo.taken_at}}
-        <p class="date">
-          {{#if day_link}}<a href="{{include_prefix}}{{day_link.link}}">{{day_link.friendly_name}}</a>{{/if}}
-          {{#if month_link}}<a href="{{include_prefix}}{{month_link.link}}">{{month_link.friendly_name}}</a>, {{/if}}
-          {{#if year_link}}<a href="{{include_prefix}}{{year_link.link}}">{{year_link.friendly_name}}</a>.{{/if}}
-        </p>
-      {{/if}}
-      {{#if photo.has_location}}
-        <ul class="location">
-          {{#if city_link}}<li><a href="{{include_prefix}}{{city_link.link}}">{{city_link.friendly_name}}</a></li>{{/if}}
-          {{#if state_link}}<li><a href="{{include_prefix}}{{state_link.link}}">{{state_link.friendly_name}}</a></li>{{/if}}
-          {{#if country_link}}<li><a href="{{include_prefix}}{{country_link.link}}">{{country_link.friendly_name}}</a></li>{{/if}}
-        </ul>
-      {{/if}}
+      | {{#if keywords}}
+          <div class="keywords">
+            {{#each keywords as |keyword|}}
+              <a href="{{../include_prefix}}{{keyword.link}}">{{keyword.friendly_name}}</a>
+            {{/each}}
+          </div>
+        {{/if}}
 
-    | {{#if keywords}}
-        <div class="keywords">
-          {{#each keywords as |keyword|}}
-            <a href="{{../include_prefix}}{{keyword.link}}">{{keyword.friendly_name}}</a>
+      .streams
+        |
+          {{#each substreams as |stream|}}
+          <section>
+            <h2>{{stream.title}}</h2>
+            <div class="stream">
+        == Piccle::TemplateHelpers.render_partial "substream"
+        |
+            </div>
+          </section>
           {{/each}}
-        </div>
-      {{/if}}
-
-    .streams
-      |
-        {{#each substreams as |stream|}}
-        <section>
-          <h2>{{stream.title}}</h2>
-          <div class="stream">
-      == Piccle::TemplateHelpers.render_partial "substream"
-      |
-          </div>
-        </section>
-        {{/each}}
 
-== Piccle::TemplateHelpers.render_partial "footer"
+  == Piccle::TemplateHelpers.render_partial "footer"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: piccle
 version: !ruby/object:Gem::Version
-  version: 0.1.0.rc1
+  version: 0.1.1.pre
 platform: ruby
 authors:
 - Alex Pounds
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-28 00:00:00.000000000 Z
+date: 2021-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -260,12 +260,11 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - Gemfile
+- LICENSE.md
 - NOTES.md
 - README.md
 - Rakefile
-- agpl-3.0.md
 - assets/css/default.css
 - assets/css/normalize.css
 - assets/icons/android-chrome-192x192.png
@@ -282,6 +281,8 @@ files:
 - db/migrations/003_create_keywords_and_join_table.rb
 - db/migrations/004_add_focal_length.rb
 - db/migrations/005_create_locations.rb
+- db/migrations/006_create_people_and_join_table.rb
+- db/migrations/007_add_indexes.rb
 - js-renderer/handlebars.min-v4.7.6.js
 - js-renderer/renderer.js
 - lib/piccle.rb
@@ -292,6 +293,7 @@ files:
 - lib/piccle/js_renderer.rb
 - lib/piccle/models/keyword.rb
 - lib/piccle/models/location.rb
+- lib/piccle/models/person.rb
 - lib/piccle/models/photo.rb
 - lib/piccle/parser.rb
 - lib/piccle/quilt_generator.rb
@@ -303,6 +305,7 @@ files:
 - lib/piccle/streams/event_stream.rb
 - lib/piccle/streams/keyword_stream.rb
 - lib/piccle/streams/location_stream.rb
+- lib/piccle/streams/person_stream.rb
 - lib/piccle/template_helpers.rb
 - lib/piccle/version.rb
 - lib/tasks/development.rake

data/.travis.yml

@@ -1,5 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-  - 2.3.0
-before_install: gem install bundler -v 1.13.2