utopia-gallery 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6248d2e8dbea1cfe4447c80367877e69bf8c0f86
-  data.tar.gz: 7e10b84589fcaab9f56126eebb482b872df2d671
+  metadata.gz: 5be9fa59f72e89a487b5f833b02ff4e9358ebd93
+  data.tar.gz: 38dcd9b0c8b778f03cc2ca1fc4dd86e0c738b6ad
 SHA512:
-  metadata.gz: 29a23954c1afd838b86a27e7da02b64ae11988e1183de7a177c5c9074f8bf1a20db616d245f213dfc64e92d843b8c2ae55139666a9c779986f8605daa2c65884
-  data.tar.gz: d210843e1a7dfefd108d2b2caa6b21c9b5417e5019855810cea54ef75f66acc90620cb1782754c08951aa6522dbbcb0a4e3b81b5adc53852df271465e72e94bc
+  metadata.gz: 4f58a9a8deeb5bcc0c7083d9e8451ec27601c67654d112122959fa826c8117ff1c876af74eee587cd366139f05af15773d9162b9cba9a32d59edcec215adc842
+  data.tar.gz: 195cd55dd865423a767673784768271a19941a5884aaff4d376b0dc033eda0c5eaa92285f1d0c8d490caf28cb42c09f0228a8e7a83e432c97c3dbb9ad1317695

data/.travis.yml

@@ -0,0 +1,47 @@
+language: ruby
+sudo: false
+dist: trusty
+
+addons:
+  apt:
+    packages:
+      - libxml2-dev
+      - gettext
+      - python-dev
+      - liblcms1-dev
+      - libmagickwand-dev
+      - libopenexr-dev
+      - libcfitsio3-dev
+      - gobject-introspection
+      - libgirepository1.0-dev
+      - libgif-dev
+      - libgs-dev
+      - libgsf-1-dev
+      - libmatio-dev
+      - libopenslide-dev
+      - liborc-0.4-dev
+      - libpango1.0-dev
+      - libpoppler-glib-dev
+      - libwebp-dev
+      - libglib2.0-dev
+
+cache:
+  bundler: true
+  directories:
+    - $HOME/vips
+
+before_install:
+- source install-vips.sh
+
+rvm:
+  - 2.2.4
+  - 2.3.2
+  - 2.4.0
+  - jruby-head
+  - ruby-head
+  - rbx-3.65
+matrix:
+  allow_failures:
+    - rvm: rbx-3.65
+    - rvm: ruby-head
+    - rvm: jruby-head

data/README.md

@@ -51,7 +51,9 @@ Add `_photo.xnode` such as:
 	<a href="#{attributes[:src].large}" title="#{attributes[:alt]}">
 		<img src="#{attributes[:src].small}" alt="#{attributes[:alt]}"/>
 	</a>
-	<figcaption>#{attributes[:alt]}</figcaption>
+	<?r if caption = attributes[:alt].caption ?>
+		<figcaption>#{caption}</figcaption>
+	<?r end ?>
 </figure>
 ```
 

data/Rakefile

@@ -1 +1,6 @@
 require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new(:test)
+
+task :default => :test

data/install-vips.sh

@@ -0,0 +1,36 @@
+#!/usr/bin/env bash
+
+export NOKOGIRI_USE_SYSTEM_LIBRARIES=true
+export VIPS_SITE=http://www.vips.ecs.soton.ac.uk/supported
+export VIPS_VERSION_MAJOR=8
+export VIPS_VERSION_MINOR=4
+export VIPS_VERSION_MICRO=5
+export VIPS_VERSION=$VIPS_VERSION_MAJOR.$VIPS_VERSION_MINOR
+export VIPS_VERSION_FULL=$VIPS_VERSION.$VIPS_VERSION_MICRO
+export PATH=$HOME/vips/bin:$PATH
+export LD_LIBRARY_PATH=$HOME/vips/lib:$LD_LIBRARY_PATH
+export PKG_CONFIG_PATH=$HOME/vips/lib/pkgconfig:$PKG_CONFIG_PATH
+export PYTHONPATH=$HOME/vips/lib/python2.7/site-packages:$PYTHONPATH
+export GI_TYPELIB_PATH=$HOME/vips/lib/girepository-1.0:$GI_TYPELIB_PATH
+
+set -e
+
+# do we already have the correct vips built? early exit if yes
+# we could check the configure params as well I guess
+if [ -d "$HOME/vips/bin" ]; then
+	version=$($HOME/vips/bin/vips --version)
+	escaped_version="$VIPS_VERSION_MAJOR\.$VIPS_VERSION_MINOR\.$VIPS_VERSION_MICRO"
+	echo "Need vips-$VIPS_VERSION_FULL"
+	echo "Found $version"
+	if [[ "$version" =~ ^vips-$escaped_version ]]; then
+		echo "Using cached directory"
+		exit 0
+	fi
+fi
+
+rm -rf $HOME/vips
+wget $VIPS_SITE/$VIPS_VERSION/vips-$VIPS_VERSION_FULL.tar.gz
+tar xf vips-$VIPS_VERSION_FULL.tar.gz
+cd vips-$VIPS_VERSION_FULL
+CXXFLAGS=-D_GLIBCXX_USE_CXX11_ABI=0 ./configure --prefix=$HOME/vips $*
+make && make install

data/lib/utopia/gallery/cache.rb

@@ -41,6 +41,14 @@ module Utopia
 				@media.path
 			end
 			
+			def input_path
+				File.join(@media_root, @media.path)
+			end
+			
+			def output_paths
+				@processes.values.collect{|process| output_path_for(process)}
+			end
+			
 			def output_path_for(process)
 				File.join(@cache_root, process.relative_path(@media))
 			end

data/lib/utopia/gallery/container.rb

@@ -31,6 +31,10 @@ module Utopia
 				@filter = filter
 			end
 			
+			attr :root
+			attr :path
+			attr :filter
+			
 			def each
 				return to_enum unless block_given?
 				

data/lib/utopia/gallery/process.rb

@@ -21,6 +21,8 @@
 require 'vips/thumbnail'
 require 'fileutils'
 
+require 'utopia/path'
+
 module Utopia
 	module Gallery
 		class Process
@@ -36,8 +38,25 @@ module Utopia
 				File.join(File.dirname(source_path), @name.to_s, File.basename(source_path))
 			end
 			
-			def fresh?(input_path, output_path)
-				return File.exist?(output_path) && File.mtime(input_path) <= File.mtime(output_path)
+			def self.mtime(path)
+				File.lstat(path).mtime
+			end
+			
+			def self.fresh?(input_path, output_path)
+				# We are not fresh if the output path doesn't exist:
+				return false unless File.exist?(output_path)
+				
+				# We are not fresh if the input is newere than the output:
+				return false if mtime(input_path) > mtime(output_path)
+				
+				# Otherwise, we are so fresh:
+				return true
+			end
+			
+			def self.link(input_path, output_path)
+				# Compute a path to input_path, relative to output_path
+				shortest_path = Utopia::Path.shortest_path(input_path, output_path)
+				FileUtils.ln_s(shortest_path, output_path, force: true)
 			end
 		end
 		
@@ -55,7 +74,7 @@ module Utopia
 				media = cache.media
 				media_path = File.join(cache.media_root, media.path)
 				
-				return if fresh?(media_path, output_path)
+				return if Process.fresh?(media_path, output_path)
 				
 				resizer = locals[:resizer] ||= Vips::Thumbnail::Resizer.new(media_path)
 				
@@ -64,7 +83,7 @@ module Utopia
 				if output_image = resizer.send(@method, @size)
 					output_image.write_to_file output_path, **@options
 				else
-					FileUtils.ln(media_path, output_path)
+					Process.link(media_path, output_path)
 				end
 			end
 		end

data/lib/utopia/gallery/version.rb

@@ -1,5 +1,5 @@
 module Utopia
 	module Gallery
-		VERSION = "2.0.1"
+		VERSION = "2.0.2"
 	end
 end

data/spec/spec_helper.rb

@@ -1,5 +1,5 @@
 
-if ENV['COVERAGE']
+if ENV['COVERAGE'] || ENV['TRAVIS']
 	begin
 		require 'simplecov'
 		

data/spec/utopia/gallery/cache_spec.rb

@@ -18,13 +18,49 @@ RSpec.describe Utopia::Gallery::Cache do
 	let(:container) {Utopia::Gallery::Container.new(pages_root, 'sample_images')}
 	
 	subject{container.collect{|media| described_class.new(pages_root, cache_root, '/_gallery', media, processes)}}
+	let(:output_paths) {subject.collect{|cache| cache.output_paths}.flatten}
 	
 	it "should generate thumbnails" do
+		expect(subject.count).to be == 4
+		expect(output_paths.count).to be == 8
+		
 		subject.each(&:update)
+		
+		output_paths.each do |output_path|
+			expect(File).to be_exist(output_path)
+		end
 	end
 	
 	it "it should be reentrant" do
 		subject.each(&:update)
+		
+		expect{subject.each(&:update)}.to_not raise_error
+	end
+	
+	it "can regeneate out of date media" do
 		subject.each(&:update)
+		
+		sleep(1)
+		
+		subject.each do |cache|
+			# Input path becomes newer than output path:
+			# Exception: If output_path is a hard link to input_path.
+			FileUtils.touch(cache.input_path)
+			
+			# It should no longer be fresh:
+			cache.output_paths.each do |output_path|
+				expect(Utopia::Gallery::Process).to_not be_fresh(cache.input_path, output_path)
+			end
+		end
+		
+		# Regenerate outputs:
+		expect{subject.each(&:update)}.to_not raise_error
+		
+		# Everything should be fresh:
+		subject.each do |cache|
+			cache.output_paths.each do |output_path|
+				expect(Utopia::Gallery::Process).to be_fresh(cache.input_path, output_path)
+			end
+		end
 	end
 end

data/utopia-gallery.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
 	spec.add_dependency "utopia", "~> 2.0"
 	spec.add_dependency "vips-thumbnail"
 	
-	spec.add_development_dependency "bundler", "~> 1.14"
-	spec.add_development_dependency "rake", "~> 10.0"
-	spec.add_development_dependency "rspec", "~> 3.0"
+	spec.add_development_dependency "bundler", "~> 1.4"
+	spec.add_development_dependency "rake", "~> 10.5"
+	spec.add_development_dependency "rspec", "~> 3.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: utopia-gallery
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-24 00:00:00.000000000 Z
+date: 2017-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: utopia
@@ -44,42 +44,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '10.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '10.5'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.5'
 description: 
 email:
 - samuel.williams@oriontransfer.co.nz
@@ -89,9 +89,11 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".travis.yml"
 - Gemfile
 - README.md
 - Rakefile
+- install-vips.sh
 - lib/utopia/gallery.rb
 - lib/utopia/gallery/cache.rb
 - lib/utopia/gallery/container.rb