m1key_gallery_generator 0.3.5 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c30f0fab4231d867a528769930491b5063b90ac6bb161726d41f1e7a0ad4d91d
-  data.tar.gz: dfac0c54d3019746349638b950ea05bdb51e88483dd646e1c498befab39e15fe
+  metadata.gz: a30358754706ef9405263138b5c0336ad16ac466361ab64acf68ac929647f9e8
+  data.tar.gz: f96b1c652c1b55d90fc403be53bfa39b3c52566b91e1d21e670bb9b3b3e5a420
 SHA512:
-  metadata.gz: d38fa70b36002dccaa9c467e48d05436fd17b438ca46b941e9df5d87cd4c21674e84724616091d74352dbd1cc9a469b34958d2d4f2f5b87df170a6d7e7aee95b
-  data.tar.gz: 5c1acbc7815ec965a5fe5a023c15cb0503e3e9eb0507b2c9b9287cd8986322b46d5f8730036ab038513289b5665edc0bc13589faf64c5218f2aced4ad560b47e
+  metadata.gz: c73d2e4e88ed2bd16640d2756eb7f2fd6ce11e2e165d0b92e0ecde827ea50fd6fd4e8ef75653860ebabdb53c00731365b455e7e3e9f91ef329b64a61fd314863
+  data.tar.gz: 482256bbb2965cfd30882d912e1895c0ece6c6b7df0208ae3bd9e18f0ad324a828dbc3f8bcfe99849e9e3c75c00c81b7231e755ee975712807d064a9dd3d705c

data/README.md

@@ -74,11 +74,11 @@ Build the gem.
 
 Install the gem.
 
-> gem install m1key_gallery_generator-0.3.5.gem
+> gem install m1key_gallery_generator-0.3.8.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.5\bin\console . wait_on_error
+> ruby c:\Ruby34-x64\lib\ruby\gems\3.4.0\gems\m1key_gallery_generator-0.3.8\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.5.gem
+> gem install m1key_gallery_generator-0.3.8.gem
 
 To test gem:
 > irb

data/bin/console

@@ -31,7 +31,7 @@ begin
 
   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.year, viewable_photos, gallery_config.small_print, gallery_config.blurb).
       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
+    attr_reader :title, :map_url, :map_title, :slug, :upload_date, :description, :sources, :year, :photos, :small_print, :blurb
 
     def initialize(yaml_config_file_name)
       puts "Attempting to parse #{yaml_config_file_name} to read gallery configuration..."
@@ -27,6 +27,8 @@ module GalleryGenerator
       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)}]."
 
       @sources = gallery_configuration['sources']
 

data/lib/m1key_gallery_generator/photos_utils.rb

@@ -19,7 +19,7 @@ module GalleryGenerator
       photo_technical_info = photo['technicalInfo']
       photo_metadata = get_metadata_for_image_with_file_name_containing(working_directory, photo_file_name_contains)
 
-      puts "Adding photo with ID [#{photo_id}], title [#{photo_title}], height [#{photo_metadata.height}], description [#{compact(photo['description'])}]..."
+      puts "Adding photo with ID [#{photo_id}], title [#{photo_title}], width [#{photo_metadata.width}], height [#{photo_metadata.height}], description [#{compact(photo['description'])}]..."
       photos.push ViewablePhoto.new(photo_id, photo_title, photo_description, photo_metadata, photo_technical_info)
 
       create_gallery_image(photo_metadata.original_file_name, gallery_config.slug, photo_id, working_directory)
@@ -37,12 +37,13 @@ module GalleryGenerator
     raise "ERROR  No matching photo found for #{file_name_contains}." unless selected_file_name
 
     exif = EXIFR::JPEG.new(File.join(working_directory, selected_file_name))
+    photo_width = exif.width
     photo_height = exif.height
     photo_iso = exif.iso_speed_ratings
     photo_focal_length = exif.focal_length.to_f.round.to_s
     photo_f_number = exif.f_number.to_f
     photo_exposure_time = exif.exposure_time.to_s
-    ViewablePhotoMetadata.new(selected_file_name, photo_height, photo_iso, photo_focal_length, photo_f_number, photo_exposure_time)
+    ViewablePhotoMetadata.new(selected_file_name, photo_width, photo_height, photo_iso, photo_focal_length, photo_f_number, photo_exposure_time)
   end
 
   def create_gallery_image(original_file_name, gallery_slug, photo_id, working_directory)

data/lib/m1key_gallery_generator/template.erb

@@ -5,10 +5,15 @@
   <meta charset="utf-8" />
   <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="<%= title %> &mdash; Photography and art portfolio by Michal Huniewicz" />
+  <meta name="description" content="<%= blurb %>" />
+  <link rel="canonical" href="https://www.m1key.me/photography/<%= 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" />
+  <link rel="dns-prefetch" href="https://fonts.gstatic.com" />
   <link href="https://fonts.googleapis.com/css2?family=Outfit:wght@800;900&display=swap" rel="stylesheet" />
+  <link href="https://fonts.googleapis.com/css2?family=Libre+Baskerville:wght@400;500;600;700&display=swap"
+    rel="preload" as="style" />
   <link href="https://fonts.googleapis.com/css2?family=Libre+Baskerville:wght@400;500;600;700&display=swap"
     rel="stylesheet" />
   <link rel="stylesheet" href="../../styles/base_responsive.css" />
@@ -17,14 +22,14 @@
   <meta property="og:locale" content="en_US" />
   <meta property="og:type" content="website" />
   <meta property="og:title" content="<%= title %> by Michal Huniewicz" />
-  <meta property="og:description" content="<%= title %> &mdash; Photography and Art portfolio by Michal Huniewicz" />
-  <meta property="og:url" content="https://www.m1key.me/" />
+  <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: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="<%= title %> &mdash; Photography and Art portfolio by Michal Huniewicz" />
+  <meta name="twitter:description" content="<%= blurb %>" />
   <meta name="twitter:image" content="https://www.m1key.me/photography/<%= slug %>/<%= slug %>_01.jpg" />
 
   <!-- Breadcrumb structured data for SEO -->
@@ -34,7 +39,14 @@
     "@type": "ImageGallery",
     "name": "<%= title %> by Michal Huniewicz",
     "url": "https://www.m1key.me/photography/<%= slug %>",
+    "datePublished": "<%= upload_date %>",
+    "dateModified": "<%= upload_date %>",
     "author": {
+      "@type": "Person",
+      "name": "Michal Huniewicz",
+      "url": "https://www.m1key.me/"
+    },
+    "publisher": {
       "@type": "Person",
       "name": "Michal Huniewicz"
     },
@@ -42,11 +54,41 @@
   	  {
 	      "@type": "ImageObject",
 	      "contentUrl" : "https://www.m1key.me/photography/<%= slug %>/<%= slug %>_<%= photo.id %>.jpg",
-	      "caption": "<%= photo.title %>"
+	      "caption": "<%= photo.title %>",
+        "width": <%= photo.metadata.width %>,
+        "height": <%= photo.metadata.height %>
 	    }<% if (index + 1) == photos.size %><% else %>,<% end -%>
 	<% end %>
 	  ],
-    "description": "<%= title %> &mdash; Photography and Art portfolio by Michal Huniewicz"
+    "description": "<%= blurb %>",
+    "keywords": "photography, art, portfolio, Michal Huniewicz, m1key.me, <%= title %>"
+  }
+  </script>
+
+  <script type="application/ld+json">
+  {
+    "@context": "https://schema.org",
+    "@type": "BreadcrumbList",
+    "itemListElement": [
+      {
+        "@type": "ListItem",
+        "position": 1,
+        "name": "Home",
+        "item": "https://www.m1key.me/"
+      },
+      {
+        "@type": "ListItem",
+        "position": 2,
+        "name": "Photography",
+        "item": "https://www.m1key.me/photography/"
+      },
+      {
+        "@type": "ListItem",
+        "position": 3,
+        "name": "<%= title %>",
+        "item": "https://www.m1key.me/photography/<%= slug %>"
+      }
+    ]
   }
   </script>
 </head>
@@ -81,13 +123,14 @@
       </a>
       <figcaption class="visually-hidden">Map showing <%= map_title %> location (opens in OpenStreetMap)</figcaption>
     </figure>
-	<% photos.each do |photo| %>
+	<% photos.each_with_index do |photo, index| %>
     <article class="photo" id="<%= photo.id %>">
       <header>
         <h2 class="title"><a href="#<%= photo.id %>" title="Link to this photo"><%= photo.title %></a></h2>
       </header>
       <figure class="image-container">
-        <img src="<%= slug %>_<%= photo.id %>.jpg" alt="<%= photo.title %>" loading="lazy" />
+        <img src="<%= slug %>_<%= photo.id %>.jpg" alt="<%= photo.title %>" <% if index == 0 %>loading="eager" fetchpriority="high"<% else %>loading="lazy"<% end %>
+          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>
@@ -96,7 +139,7 @@
     </article>
 	<% end %>
     <details class="sources" id="sources">
-      <summary>&nbsp;Sources</summary>
+      <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"><%= source %></a></li><% end %>
       </ul>
@@ -118,7 +161,7 @@
         <li><a href="https://www.m1key.me" class="nav-link">M1key.me</a></li>
         <li><a href="https://www.m1key.me/photography/" class="nav-link">Photography</a></li>
         <li><a href="https://www.m1key.me/about_me/" class="nav-link">About me</a></li>
-        <li><a href="https://www.flickr.com/photos/m1key-me/" rel="noopener noreferrer" class="nav-link">Flickr</a></li>
+        <li><a href="https://www.flickr.com/photos/m1key-me/" target="_blank" rel="noopener noreferrer" class="nav-link">Flickr</a></li>
       </ul>
     </nav>
 

data/lib/m1key_gallery_generator/version.rb

@@ -1,3 +1,3 @@
 module M1keyGalleryGenerator
-  VERSION = '0.3.5'
+  VERSION = '0.3.8'
 end

data/lib/m1key_gallery_generator/viewable_gallery.rb

@@ -2,8 +2,8 @@ require_relative 'string_utils'
 
 module GalleryGenerator
   class ViewableGallery
-    attr_reader :title, :description, :slug, :sources, :upload_date, :map_url, :map_title, :year, :photos, :small_print
-    def initialize(title, description, slug, sources, upload_date, map_url, map_title, year, viewable_photos, small_print)
+    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)
       @title = String.new(title)
       @description = description
       @slug = slug
@@ -14,6 +14,7 @@ module GalleryGenerator
       @year = year
       @photos = viewable_photos
       @small_print = small_print
+      @blurb = blurb
     end
 
     def get_binding
@@ -29,7 +30,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.map_title, updated_gallery.year, to_viewable_photos(updated_gallery.photos), updated_gallery.small_print, updated_gallery.blurb)
     end
 
     def to_viewable_photos(mutable_viewable_photos)
@@ -41,7 +42,7 @@ module GalleryGenerator
   end
 
   class MutableViewableGallery
-    attr_accessor :title, :description, :slug, :sources, :upload_date, :map_url, :map_title, :year, :photos, :small_print
+    attr_accessor :title, :description, :slug, :sources, :upload_date, :map_url, :map_title, :year, :photos, :small_print, :blurb
     def initialize(viewable_gallery)
       @title = viewable_gallery.title
       @description = viewable_gallery.description
@@ -53,6 +54,7 @@ module GalleryGenerator
       @year = viewable_gallery.year
       @photos = to_mutable_viewable_photos(viewable_gallery.photos)
       @small_print = viewable_gallery.small_print
+      @blurb = viewable_gallery.blurb
     end
 
     def to_mutable_viewable_photos(viewable_photos)

data/lib/m1key_gallery_generator/viewable_photo_metadata.rb

@@ -1,8 +1,9 @@
 module GalleryGenerator
   class ViewablePhotoMetadata
-    attr_reader :original_file_name, :height, :iso, :focal_length, :f_number, :exposure_time
-    def initialize(original_file_name, height, iso, focal_length, f_number, exposure_time)
+    attr_reader :original_file_name, :width, :height, :iso, :focal_length, :f_number, :exposure_time
+    def initialize(original_file_name, width, height, iso, focal_length, f_number, exposure_time)
       @original_file_name = original_file_name
+      @width = width
       @height = height
       @iso = iso
       @focal_length = focal_length

data/m1key_gallery_generator.gemspec

@@ -23,8 +23,9 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'exifr', '~> 1.4', '>= 1.4.0'
 
-  spec.add_development_dependency 'bundler', '>= 2.4.10'
+  spec.add_development_dependency 'bundler', '~> 2.4', '>= 2.4.10'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'minitest', '~> 5.15'
   spec.add_development_dependency 'rspec', '~> 3.13'
+  spec.add_development_dependency 'fiddle', '~> 1.1.8'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: m1key_gallery_generator
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.8
 platform: ruby
 authors:
 - Michal Huniewicz
@@ -33,6 +33,9 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.4'
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.4.10
@@ -40,6 +43,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.4'
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.4.10
@@ -85,6 +91,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.13'
+- !ruby/object:Gem::Dependency
+  name: fiddle
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.8
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.8
 description: This gem allows you to generate a m1key.me-style gallery based on the
   JPG files in the working directory.
 email: