m1key_gallery_generator 0.3.8 → 0.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a30358754706ef9405263138b5c0336ad16ac466361ab64acf68ac929647f9e8
-  data.tar.gz: f96b1c652c1b55d90fc403be53bfa39b3c52566b91e1d21e670bb9b3b3e5a420
+  metadata.gz: 9a05edfc5a9ca0d7c63469789151df09ad2e0b25361906e2ce65029e356cdf15
+  data.tar.gz: d61e9e6d030bcc057875952485eaddd87e939a2d3a2081d56137d4789f65ecbb
 SHA512:
-  metadata.gz: c73d2e4e88ed2bd16640d2756eb7f2fd6ce11e2e165d0b92e0ecde827ea50fd6fd4e8ef75653860ebabdb53c00731365b455e7e3e9f91ef329b64a61fd314863
-  data.tar.gz: 482256bbb2965cfd30882d912e1895c0ece6c6b7df0208ae3bd9e18f0ad324a828dbc3f8bcfe99849e9e3c75c00c81b7231e755ee975712807d064a9dd3d705c
+  metadata.gz: f9315fd151a474dfcb8e210c848b9f07bb5246ec546fb60ea0e3e1531f6104351b8c2b7a68f89689d86295d016af364797ed29105fccfccf5b5fd39dc821d9d7
+  data.tar.gz: 0f74dd1dfb2e798d657d81e40464db66081d39bdc77decf36dab6c08c43bd680316711155757af1350f92dd39010f6927a2d34f8a0357b47661416925b969aea

data/README.md

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

data/bin/console

@@ -2,6 +2,7 @@
 
 require 'm1key_gallery_generator'
 require 'erb'
+require 'htmlentities'
 
 Encoding.default_external = Encoding::UTF_8
 
@@ -31,7 +32,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.blurb).
+    gallery_config.year, viewable_photos, gallery_config.small_print, gallery_config.blurb, gallery_config.genre).
       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
 
     def initialize(yaml_config_file_name)
       puts "Attempting to parse #{yaml_config_file_name} to read gallery configuration..."
@@ -28,7 +28,13 @@ module GalleryGenerator
       @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,7 +38,7 @@
     "@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 %>",
     "author": {
@@ -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>
@@ -133,7 +133,7 @@
           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>
@@ -141,13 +141,13 @@
     <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"><%= source %></a></li><% end %>
+		    <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>
 
     <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.8'
+  VERSION = '0.3.10'
 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, :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
+    def initialize(title, description, slug, sources, upload_date, map_url, map_title, year, viewable_photos, small_print, blurb, genre)
       @title = String.new(title)
       @description = description
       @slug = slug
@@ -15,6 +15,7 @@ module GalleryGenerator
       @photos = viewable_photos
       @small_print = small_print
       @blurb = blurb
+      @genre = genre
     end
 
     def get_binding
@@ -30,7 +31,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)
     end
 
     def to_viewable_photos(mutable_viewable_photos)
@@ -42,7 +43,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
     def initialize(viewable_gallery)
       @title = viewable_gallery.title
       @description = viewable_gallery.description
@@ -55,6 +56,7 @@ module GalleryGenerator
       @photos = to_mutable_viewable_photos(viewable_gallery.photos)
       @small_print = viewable_gallery.small_print
       @blurb = viewable_gallery.blurb
+      @genre = viewable_gallery.genre
     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.8
+  version: 0.3.10
 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: