m1key_gallery_generator 0.3.9 → 0.3.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: adc553b9cc6d516831f8013922a725efec39124c421eab37b26657da3353dd6a
-  data.tar.gz: 6c0391edc647d872df0d877b9071678f324b35ec52f267d01dd8a7a8c3902dcb
+  metadata.gz: '08442ae82a99eb2c9253cd9d0ff798a48cf004627394b1d752473e56f672ce76'
+  data.tar.gz: 953a20a23228155023d61c7a3f0d72d094635c797eadde1b312e65c7c9cdda47
 SHA512:
-  metadata.gz: 6fe8d82b5187d4511a773aad9c153603838caadfb5e572b79766e7ee3ff38b4130aa4eeb75e38e0c7685e89e98ff6169b6f50aca996191caf89bb348297d02b1
-  data.tar.gz: aa17a99e8ec793d444e7557c36cc995c24f00e1b5c7874ff0cf73447d5997b1d6ce30f8b89ed438a7bb69a842f8d7708f108c0110dc42038b96cdd4c48fd91d0
+  metadata.gz: c1e8f7322aa6036c60856aee438ec1766c3cf29f01608a370c330aa4602558c9d863062537e89e06f8c02216cacb988a4eba43d4d2f48607b766e990c8206faa
+  data.tar.gz: 890eef5203fe474eb0048e3ba9810c46051da6ef3b5f787e58a44871f7d57434f6ddd381c22fefdb2dd985a5acbecad33b557e1bfbe37d9041f5203d50a61721

data/README.md

@@ -74,11 +74,11 @@ Build the gem.
 
 Install the gem.
 
-> gem install m1key_gallery_generator-0.3.9.gem
+> gem install m1key_gallery_generator-0.3.12.gem
 
 In your gallery directory, have a file called generate.bat that looks like this:
 
-> ruby c:\Ruby34-x64\lib\ruby\gems\3.4.0\gems\m1key_gallery_generator-0.3.9\bin\console . wait_on_error
+> ruby c:\Ruby34-x64\lib\ruby\gems\3.4.0\gems\m1key_gallery_generator-0.3.12\bin\console . wait_on_error
 
 ## Development
 
@@ -95,7 +95,7 @@ To build gem:
 > gem build m1key_gallery_generator.gemspec
 
 To install gem:
-> gem install m1key_gallery_generator-0.3.9.gem
+> gem install m1key_gallery_generator-0.3.12.gem
 
 To test gem:
 > irb

data/bin/console

@@ -2,6 +2,8 @@
 
 require 'm1key_gallery_generator'
 require 'erb'
+require 'htmlentities'
+require 'date'
 
 Encoding.default_external = Encoding::UTF_8
 
@@ -28,10 +30,14 @@ begin
   viewable_photos = photos_config_into_viewable_photos(working_directory, gallery_config)
 
   puts 'Creating viewable gallery...'
-
+  update_date = gallery_config.update_date
+  if update_date.to_s == ''
+    update_date = Date.today.strftime('%Y-%m-%d')
+  end
   gallery = ViewableGallery.new(gallery_config.title, gallery_config.description, gallery_config.slug,
     gallery_config.sources, gallery_config.upload_date, gallery_config.map_url, gallery_config.map_title,
-    gallery_config.year, viewable_photos, gallery_config.small_print, gallery_config.blurb).
+    gallery_config.year, viewable_photos, gallery_config.small_print, gallery_config.blurb, gallery_config.genre,
+    update_date).
       update_using(
       add_tabs_before_every_description_line(3),
       add_links_to_descriptions,

data/lib/m1key_gallery_generator/gallery_config.rb

@@ -5,7 +5,7 @@ require_relative 'console_utils'
 module GalleryGenerator
   class GalleryConfig
 
-    attr_reader :title, :map_url, :map_title, :slug, :upload_date, :description, :sources, :year, :photos, :small_print, :blurb
+    attr_reader :title, :map_url, :map_title, :slug, :upload_date, :description, :sources, :year, :photos, :small_print, :blurb, :genre, :update_date
 
     def initialize(yaml_config_file_name)
       puts "Attempting to parse #{yaml_config_file_name} to read gallery configuration..."
@@ -23,12 +23,20 @@ module GalleryGenerator
       puts "Gallery slug is [#{@slug}]."
       @upload_date = gallery_configuration['upload_date']
       puts "Gallery upload date is [#{@upload_date}]."
+      @update_date = gallery_configuration['update_date']
+      puts "Gallery updated date is [#{@update_date}]."
       @description = gallery_configuration['description']
       puts "Gallery description is [#{compact(@description)}]."
       @small_print = gallery_configuration['small_print']
       puts "Small print is [#{@small_print}]."
       @blurb = gallery_configuration['blurb']
-      puts "Gallery description is [#{compact(@blurb)}]."
+      puts "Gallery blurb is [#{compact(@blurb)}]."
+      if gallery_configuration['genre'] == nil
+        @genre = 'photography'
+      else
+        @genre = gallery_configuration['genre']
+      end
+      puts "Gallery genre is [#{compact(@genre)}]."
 
       @sources = gallery_configuration['sources']
 

data/lib/m1key_gallery_generator/template.erb

@@ -6,7 +6,7 @@
   <meta name="viewport" content="width=device-width,initial-scale=1" />
   <title><%= title %> &mdash; Photography and Art Portfolio by Michal Huniewicz</title>
   <meta name="description" content="<%= blurb %>" />
-  <link rel="canonical" href="https://www.m1key.me/photography/<%= slug %>" />
+  <link rel="canonical" href="https://www.m1key.me/<%= genre %>/<%= slug %>" />
   <link rel="preconnect" href="https://fonts.googleapis.com" />
   <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
   <link rel="dns-prefetch" href="https://fonts.googleapis.com" />
@@ -23,14 +23,14 @@
   <meta property="og:type" content="website" />
   <meta property="og:title" content="<%= title %> by Michal Huniewicz" />
   <meta property="og:description" content="<%= blurb %>" />
-  <meta property="og:url" content="https://www.m1key.me/photography/<%= slug %>" />
-  <meta property="og:image" content="https://www.m1key.me/photography/<%= slug %>/<%= slug %>_01.jpg" />
+  <meta property="og:url" content="https://www.m1key.me/<%= genre %>/<%= slug %>" />
+  <meta property="og:image" content="https://www.m1key.me/<%= genre %>/<%= slug %>/<%= slug %>_01.jpg" />
   <meta property="og:image:alt" content="<%= title %> by Michal Huniewicz" />
 
   <meta name="twitter:card" content="summary_large_image" />
   <meta name="twitter:title" content="<%= title %> by Michal Huniewicz" />
   <meta name="twitter:description" content="<%= blurb %>" />
-  <meta name="twitter:image" content="https://www.m1key.me/photography/<%= slug %>/<%= slug %>_01.jpg" />
+  <meta name="twitter:image" content="https://www.m1key.me/<%= genre %>/<%= slug %>/<%= slug %>_01.jpg" />
 
   <!-- Breadcrumb structured data for SEO -->
   <script type="application/ld+json">
@@ -38,9 +38,9 @@
     "@context": "https://schema.org",
     "@type": "ImageGallery",
     "name": "<%= title %> by Michal Huniewicz",
-    "url": "https://www.m1key.me/photography/<%= slug %>",
+    "url": "https://www.m1key.me/<%= genre %>/<%= slug %>",
     "datePublished": "<%= upload_date %>",
-    "dateModified": "<%= upload_date %>",
+    "dateModified": "<%= update_date %>",
     "author": {
       "@type": "Person",
       "name": "Michal Huniewicz",
@@ -52,9 +52,9 @@
     },
     "image": [<% photos.each_with_index do |photo, index| %>
   	  {
-	      "@type": "ImageObject",
-	      "contentUrl" : "https://www.m1key.me/photography/<%= slug %>/<%= slug %>_<%= photo.id %>.jpg",
-	      "caption": "<%= photo.title %>",
+        "@type": "ImageObject",
+        "contentUrl" : "https://www.m1key.me/<%= genre %>/<%= slug %>/<%= slug %>_<%= photo.id %>.jpg",
+        "caption": "<%= HTMLEntities.new.decode(photo.title) %>",
         "width": <%= photo.metadata.width %>,
         "height": <%= photo.metadata.height %>
 	    }<% if (index + 1) == photos.size %><% else %>,<% end -%>
@@ -79,14 +79,14 @@
       {
         "@type": "ListItem",
         "position": 2,
-        "name": "Photography",
-        "item": "https://www.m1key.me/photography/"
+        "name": "<%= genre.capitalize %>",
+        "item": "https://www.m1key.me/<%= genre %>/"
       },
       {
         "@type": "ListItem",
         "position": 3,
-        "name": "<%= title %>",
-        "item": "https://www.m1key.me/photography/<%= slug %>"
+        "name": "<%= HTMLEntities.new.decode(title) %>",
+        "item": "https://www.m1key.me/<%= genre %>/<%= slug %>"
       }
     ]
   }
@@ -98,7 +98,7 @@
   <main class="bigger-container">
     <nav class="navigation" aria-label="Gallery navigation">
       <ul>
-        <li><a href="../" class="nav-link">&lt; Back to Photography</a></li>
+        <li><a href="../" class="nav-link">&lt; Back to <%= genre.capitalize %></a></li>
         <li><a href="../../" class="nav-link">&lt;&lt; Back to M1key.me</a></li>
       </ul>
     </nav>
@@ -112,7 +112,7 @@
 <%= description -%>
 <% if small_print.to_s != '' %>
       <p><%= small_print -%></p><% end %>
-      <p class="smallprint">Uploaded on: <%= upload_date %>.</p>
+      <p class="smallprint">Uploaded on: <%= upload_date %>. Updated on: <%= update_date %>.</p>
     </section>
 
     <figure class="map">
@@ -133,21 +133,23 @@
           width="<%= photo.metadata.width %>" height="<%= photo.metadata.height %>" />
         <figcaption>
           <span class="description"><%= photo.description %></span>
-          <span class="technical">ISO <%= photo.metadata.iso %>, <%= photo.metadata.focal_length %>mm, f/<%= photo.metadata.f_number %>, <%= photo.metadata.exposure_time %>s.<% if photo.technical_info.to_s != '' %> <%= photo.technical_info %><% end %></span>
+          <% if photo.metadata.iso.to_s != '' %><span class="technical">ISO <%= photo.metadata.iso %>, <%= photo.metadata.focal_length %>mm, f/<%= photo.metadata.f_number %>, <%= photo.metadata.exposure_time %>s.<% if photo.technical_info.to_s != '' %> <%= photo.technical_info %><% end %></span><% end %>
         </figcaption>
       </figure>
     </article>
-	<% end %>
+	<% end -%>
+  <% if sources %>
     <details class="sources" id="sources">
       <summary>Sources</summary>
       <ul class="smallprint"><% sources.each_with_index do |source, index| %>
 		    <li><%= index + 1 %>: <a href="<%= source %>" rel="noopener noreferrer" class="nav-link"><% if source.length > 100 %><%= source[0..50] %>[...]<%= source[-30..-1] %><% else %><%= source %><% end -%></a></li><% end %>
       </ul>
     </details>
-
+  <% end -%>
+  
     <nav class="navigation" aria-label="Gallery navigation bottom">
       <ul>
-        <li><a href="../" class="nav-link">&lt; Back to Photography</a></li>
+        <li><a href="../" class="nav-link">&lt; Back to <%= genre.capitalize %></a></li>
         <li><a href="../../" class="nav-link">&lt;&lt; Back to M1key.me</a></li>
       </ul>
     </nav>

data/lib/m1key_gallery_generator/version.rb

@@ -1,3 +1,3 @@
 module M1keyGalleryGenerator
-  VERSION = '0.3.9'
+  VERSION = '0.3.12'
 end

data/lib/m1key_gallery_generator/viewable_gallery.rb

@@ -2,19 +2,21 @@ require_relative 'string_utils'
 
 module GalleryGenerator
   class ViewableGallery
-    attr_reader :title, :description, :slug, :sources, :upload_date, :map_url, :map_title, :year, :photos, :small_print, :blurb
-    def initialize(title, description, slug, sources, upload_date, map_url, map_title, year, viewable_photos, small_print, blurb)
+    attr_reader :title, :description, :slug, :sources, :upload_date, :map_url, :map_title, :year, :photos, :small_print, :blurb, :genre, :update_date
+    def initialize(title, description, slug, sources, upload_date, map_url, map_title, year, viewable_photos, small_print, blurb, genre, update_date)
       @title = String.new(title)
       @description = description
       @slug = slug
       @sources = sources
       @upload_date = upload_date
+      @update_date = update_date
       @map_url = map_url
       @map_title = map_title
       @year = year
       @photos = viewable_photos
       @small_print = small_print
       @blurb = blurb
+      @genre = genre
     end
 
     def get_binding
@@ -30,7 +32,7 @@ module GalleryGenerator
 
       ViewableGallery.new(updated_gallery.title, updated_gallery.description, updated_gallery.slug,
           updated_gallery.sources, updated_gallery.upload_date, updated_gallery.map_url,
-          updated_gallery.map_title, updated_gallery.year, to_viewable_photos(updated_gallery.photos), updated_gallery.small_print, updated_gallery.blurb)
+          updated_gallery.map_title, updated_gallery.year, to_viewable_photos(updated_gallery.photos), updated_gallery.small_print, updated_gallery.blurb, updated_gallery.genre, updated_gallery.update_date)
     end
 
     def to_viewable_photos(mutable_viewable_photos)
@@ -42,7 +44,7 @@ module GalleryGenerator
   end
 
   class MutableViewableGallery
-    attr_accessor :title, :description, :slug, :sources, :upload_date, :map_url, :map_title, :year, :photos, :small_print, :blurb
+    attr_accessor :title, :description, :slug, :sources, :upload_date, :map_url, :map_title, :year, :photos, :small_print, :blurb, :genre, :update_date
     def initialize(viewable_gallery)
       @title = viewable_gallery.title
       @description = viewable_gallery.description
@@ -55,6 +57,8 @@ module GalleryGenerator
       @photos = to_mutable_viewable_photos(viewable_gallery.photos)
       @small_print = viewable_gallery.small_print
       @blurb = viewable_gallery.blurb
+      @genre = viewable_gallery.genre
+      @update_date = viewable_gallery.update_date
     end
 
     def to_mutable_viewable_photos(viewable_photos)

data/m1key_gallery_generator.gemspec

@@ -28,4 +28,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'minitest', '~> 5.15'
   spec.add_development_dependency 'rspec', '~> 3.13'
   spec.add_development_dependency 'fiddle', '~> 1.1.8'
+  spec.add_development_dependency 'htmlentities', '~> 4.4.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: m1key_gallery_generator
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.3.12
 platform: ruby
 authors:
 - Michal Huniewicz
@@ -105,6 +105,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.8
+- !ruby/object:Gem::Dependency
+  name: htmlentities
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.4.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.4.2
 description: This gem allows you to generate a m1key.me-style gallery based on the
   JPG files in the working directory.
 email: