imagesite 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9847456e9f09a34685b280eac7b1641503748c2f
-  data.tar.gz: 8ce00674ffc29fd2396ad83579013fd06cfeef75
+  metadata.gz: ed224931ca3f5cafd8d61186e53d5d39fa845567
+  data.tar.gz: baf5c6faf497d6078523ec02774c5bac0b5c1c3d
 SHA512:
-  metadata.gz: bc70aa627c8626ed4e16b01f3587f892c360a337a7c93c43d029c63c344529683af45c997cb94fd94dc64f94d9b909b90e120b321cc5d50f2126298b44954df8
-  data.tar.gz: fca68b6b51df32ea3cf0fd70600b6679a93ad62ae1d6372b0c746588a0ea46fd0160f1d914f0dd09f55fdb34a0ebb665411efce32f326756e19e8f217e8fd44f
+  metadata.gz: c765e86c80c2dd9eea7611087fd64b5ba46393b4a18f4211df4eb4d31fbfb9058a50e205fffb05fd95a7cc64f8b5e2446063ddd2e725b842fa0787d7b229d19a
+  data.tar.gz: 3797d234b9be31b8c8a33deabda90e7327aa7818ff32d078509eb8a114f91899e9a64a584e606860474dbb12a647a97d0476b5423d272de9ba73a95aed6ea0a6

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    imagesite (1.0.0)
+    imagesite (1.0.2)
       erubis (>= 2.7.0)
-      exifr (>= 1.2.4)
+      exifr (>= 1.3.3)
       image_science (>= 1.3.0)
       xmp (>= 0.2.0)
 
@@ -13,50 +13,50 @@ GEM
     RubyInline (3.12.4)
       ZenTest (~> 4.3)
     ZenTest (4.11.1)
-    addressable (2.4.0)
-    capybara (2.7.1)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
+    capybara (2.16.1)
       addressable
-      mime-types (>= 1.16)
+      mini_mime (>= 0.1.3)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    diff-lcs (1.2.5)
+    diff-lcs (1.3)
     docile (1.1.5)
     erubis (2.7.0)
-    exifr (1.2.4)
+    exifr (1.3.3)
     image_science (1.3.0)
       RubyInline (~> 3.9)
-    json (1.8.3)
-    mime-types (3.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
+    json (2.1.0)
+    mini_mime (1.0.0)
     nokogiri (1.5.11)
-    rack (1.5.5)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rake (0.9.6)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.2)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
+    public_suffix (2.0.5)
+    rack (1.6.8)
+    rack-test (0.7.0)
+      rack (>= 1.0, < 3)
+    rake (12.3.0)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.0)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
-    simplecov (0.11.2)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.0)
+    simplecov (0.15.1)
       docile (~> 1.1.0)
-      json (~> 1.8)
+      json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
+    simplecov-html (0.10.2)
     xmp (0.2.0)
       nokogiri (~> 1.5.0)
-    xpath (2.0.0)
+    xpath (2.1.0)
       nokogiri (~> 1.3)
 
 PLATFORMS
@@ -64,11 +64,14 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (>= 1.12.5)
-  capybara (>= 2.7.1)
+  capybara (>= 2.16.1)
   imagesite!
-  rake (>= 0.9.6)
-  rspec (>= 3.5.0)
-  simplecov (>= 0.11.2)
+  public_suffix (~> 2.0)
+  rack (~> 1.6)
+  rack-test (~> 0.7.0)
+  rake (>= 12.3.0)
+  rspec (>= 3.7.0)
+  simplecov (>= 0.15.1)
 
 BUNDLED WITH
-   1.12.5
+   1.16.0

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 Dave Schweisguth
+Copyright (c) 2016-2017 Dave Schweisguth
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -18,11 +18,14 @@ If not, you may be able to install a newer Ruby on your Mac to use with imagesit
 
 ## Installation
 
-If you're using the Ruby that comes with OS X,
+- Install [FreeImage](http://freeimage.sourceforge.net/).
+  The easiest way to do that is probably with [homebrew](http://brew.sh/) or 
+  [MacPorts](https://www.macports.org/).
+- If you're using the Ruby that comes with OS X,
 
-    $ sudo gem install imagesite
+      $ sudo gem install imagesite
 
-If you're using a Ruby that you installed yourself, `sudo` may or may not be appropriate.
+    If you're using a Ruby that you installed yourself, `sudo` may or may not be appropriate.
 
 ## Usage
 

data/imagesite.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = 'imagesite'
-  spec.version       = '1.0.1'
+  spec.version       = '1.0.2'
   spec.author        = 'Dave Schweisguth'
   spec.email         = 'dave@schweisguth.org'
 
@@ -15,15 +15,21 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '~> 2.0'
 
-  spec.add_runtime_dependency 'exifr', '>= 1.2.4'
+  spec.add_runtime_dependency 'exifr', '>= 1.3.3'
   spec.add_runtime_dependency 'xmp', '>= 0.2.0'
   spec.add_runtime_dependency 'image_science', '>= 1.3.0'
   spec.add_runtime_dependency 'erubis', '>= 2.7.0'
 
   spec.add_development_dependency 'bundler', '>= 1.12.5'
-  spec.add_development_dependency 'rake', '>= 0.9.6'
-  spec.add_development_dependency 'rspec', '>= 3.5.0'
-  spec.add_development_dependency 'capybara', '>= 2.7.1'
-  spec.add_development_dependency 'simplecov', '>= 0.11.2'
+  spec.add_development_dependency 'rake', '>= 12.3.0'
+  spec.add_development_dependency 'rspec', '>= 3.7.0'
+  spec.add_development_dependency 'capybara', '>= 2.16.1'
+  spec.add_development_dependency 'simplecov', '>= 0.15.1'
+
+  # The following are not directly required by this gem but are directly or indirectly required by capybara.
+  # They are here so they can be constrained to versions compatible with the lowest supported version of Ruby.
+  spec.add_development_dependency 'public_suffix', '~> 2.0'
+  spec.add_development_dependency 'rack', '~> 1.6' # required by capybara
+  spec.add_development_dependency 'rack-test', '~> 0.7.0' # required by capybara
 
 end

data/lib/image_site/image.rb

@@ -1,7 +1,7 @@
 require 'fileutils'
 require 'image_science'
 require 'xmp'
-require 'exifr'
+require 'exifr/jpeg'
 require_relative 'model'
 
 module ImageSite
@@ -52,7 +52,7 @@ module ImageSite
     end
 
     def tags
-      xmp && xmp.dc && xmp.dc.subject || []
+      xmp && xmp.dc && xmp.dc.respond_to?(:subject) && xmp.dc.subject || []
     end
 
     def relative_html

data/lib/image_site/options.rb

@@ -5,12 +5,13 @@ module ImageSite
     DEFAULT_COLUMNS = 4
     DEFAULT_ROWS = 10
 
-    attr_reader :title, :columns, :rows, :parent_link_text, :output_dir, :files
+    attr_reader :title, :columns, :rows, :descriptions_on_index_pages, :parent_link_text, :output_dir, :files
 
     def initialize
       @title = nil
       @columns = DEFAULT_COLUMNS
       @rows = DEFAULT_ROWS
+      @descriptions_on_index_pages = false
       @parent_link_text = nil
       @output_dir = nil
     end
@@ -28,6 +29,9 @@ module ImageSite
         op.on('-r ROWS', "The number of rows of photos on each index page (default #{DEFAULT_ROWS})") do |rows|
           @rows = rows.to_i
         end
+        op.on('-d', "Descriptions are included on index pages") do
+          @descriptions_on_index_pages = true
+        end
         op.on('-p PARENT_LINK_TEXT', "The text of the link to ../ on the last index page") do |parent_link_text|
           @parent_link_text = parent_link_text
         end

data/template/index.html.erb

@@ -56,6 +56,9 @@
           <td>
             <a href="<%= image.relative_html %>"><img alt="<%= image.title %>" src="<%= image.relative_thumbnail %>"></a><br/>
             <%= image.title %>
+            <% if options.descriptions_on_index_pages %>
+              <br/><%= image.description %>
+            <% end %>
           </td>
         <% end %>
       </tr>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imagesite
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Dave Schweisguth
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-01 00:00:00.000000000 Z
+date: 2017-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: exifr
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.2.4
+        version: 1.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.2.4
+        version: 1.3.3
 - !ruby/object:Gem::Dependency
   name: xmp
   requirement: !ruby/object:Gem::Requirement
@@ -86,56 +86,98 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.9.6
+        version: 12.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.9.6
+        version: 12.3.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 3.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 3.7.0
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 2.7.1
+        version: 2.16.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 2.7.1
+        version: 2.16.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.15.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.15.1
+- !ruby/object:Gem::Dependency
+  name: public_suffix
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.0
 description: OS X's iPhoto software had a feature that exported photos to a static
   web site. iPhoto was discontinued in 2015. Its replacement, Photos, does not have
   that feature. imagesite approximates that feature.