utopia-gallery 2.0.3 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03fb77bfb663311263c588d8b8f8fe3aaaab4aa0
-  data.tar.gz: 502e44584091b100cd4dcda5b11f49001da757b5
+  metadata.gz: 2d3002edbbeffeaf8c5f2e98f47ec631d8f9fe7d
+  data.tar.gz: fb90b5bdfa8ee4d95223cf418f534179641f8198
 SHA512:
-  metadata.gz: c991284fd407efa94e5f9013446e6a557837c0612e47656a8647ae39e57e47d42bdf993cd2679f5c7a8e39f399fcae9c0c010df6d440cd4ac2773e195ef00443
-  data.tar.gz: 4f33aa3535e26ad29a208154095766354b36c307927cc86537b4d3eb1b25c20a1776c6c36c0f4079b7566f7a2cf3fc7b351302b1bd131832c670907fdfa86a6b
+  metadata.gz: 663e13e7e9359179e0efe47227ee747b7dffa569fa5fad0b01fdaafdd151bc194717c2711ee09d597cb4987d3636082838e6a1f01525b0405f59b610e2c4c744
+  data.tar.gz: 619821213836725b794e66b847ace542a1eb11cdf9846d4cb28837f4c372a6afdec5da6b06941a05e8997f629bdd700d716384cdfb97520e6362ca382bf253f3

data/lib/utopia/gallery/cache.rb

@@ -18,6 +18,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
+require 'trenni/uri'
+
 module Utopia
 	module Gallery
 		class Cache
@@ -37,10 +39,6 @@ module Utopia
 			attr :processes
 			attr :media
 			
-			def to_s
-				@media.path
-			end
-			
 			def input_path
 				File.join(@media_root, @media.path)
 			end
@@ -76,10 +74,19 @@ module Utopia
 				return self
 			end
 			
+			# Original path.
+			def to_s
+				original.to_s
+			end
+			
+			def original
+				Trenni::URI(@media.path)
+			end
+			
 			# This allows dynamic path lookup based on process name, e.g. `cache.small`.
 			def method_missing(name, *args)
 				if process = @processes[name]
-					return source_path_for(process)
+					return Trenni::URI(source_path_for(process))
 				else
 					super
 				end

data/lib/utopia/gallery/process.rb

@@ -32,6 +32,7 @@ module Utopia
 			
 			attr :name
 			
+			# The relative path for the output generated by this process, given a specific input media:
 			def relative_path(media)
 				source_path = media.path
 				
@@ -73,6 +74,28 @@ module Utopia
 			attr :method
 			attr :options
 			
+			def relative_path(media)
+				path = super
+				
+				if path.end_with?(".pdf")
+					path += ".png"
+				end
+				
+				return path
+			end
+			
+			def generate_output(resizer, output_path)
+				if output_image = resizer.send(@method, @size)
+					output_image.write_to_file output_path, **@options
+				else
+					Process.link(resizer.input_path, output_path)
+				end
+			end
+			
+			def resizer_for(media_path)
+				Vips::Thumbnail::Resizer.new(media_path)
+			end
+			
 			def call(cache, locals)
 				output_path = cache.output_path_for(self)
 				media = cache.media
@@ -80,16 +103,36 @@ module Utopia
 				
 				return if Process.fresh?(media_path, output_path)
 				
-				resizer = locals[:resizer] ||= Vips::Thumbnail::Resizer.new(media_path)
+				resizer = locals[:resizer] ||= resizer_for(media_path)
 				
 				FileUtils.mkdir_p(File.dirname(output_path))
 				
+				generate_output(resizer, output_path)
+			end
+		end
+		
+		class ResizeVector < ResizeImage
+			def initialize(*args, extension: ".png", scale: 1, **options)
+				super(*args, **options)
+				@extension = extension
+				@scale = scale
+			end
+			
+			def relative_path(media)
+				super + @extension
+			end
+			
+			def generate_output(resizer, output_path)
 				if output_image = resizer.send(@method, @size)
 					output_image.write_to_file output_path, **@options
 				else
-					Process.link(media_path, output_path)
+					resizer.input_image.write_to_file output_path, **@options
 				end
 			end
+			
+			def resizer_for(media_path)
+				Vips::Thumbnail::Resizer.new(media_path, scale: @scale)
+			end
 		end
 	end
 end

data/lib/utopia/gallery/tags.rb

@@ -68,7 +68,7 @@ module Utopia
 				media_tag_name = state[:tag] || 'img'
 				
 				document.tag('div', class: 'gallery') do
-					container.each do |media|
+					container.sort.each do |media|
 						cache = Cache.new(@media_root, @cache_root, @cache_path, media, @processes).update
 						document.tag(media_tag_name, src: cache, alt: media)
 					end

data/lib/utopia/gallery/version.rb

@@ -1,5 +1,5 @@
 module Utopia
 	module Gallery
-		VERSION = "2.0.3"
+		VERSION = "2.1.0"
 	end
 end

data/spec/utopia/gallery/site/pages/sample_images/gallery.yaml

@@ -0,0 +1,8 @@
+IMG_3340.jpg:
+  order: 0
+IMG_3341.jpg:
+  order: 1
+IMG 3344.jpg:
+  order: 2
+IMG_3351.jpg:
+  order: 3

data/spec/utopia/gallery/site_spec.rb

@@ -35,7 +35,7 @@ describe Utopia::Gallery do
 	it "should generate gallery of sample images" do
 		get "/index"
 		
-		expect(last_response.body).to be == '<div class="gallery"><img src="/sample_images/IMG_3340.jpg" alt="IMG_3340"/><img src="/sample_images/IMG_3341.jpg" alt="IMG_3341"/><img src="/sample_images/IMG_3344.jpg" alt="IMG_3344"/><img src="/sample_images/IMG_3351.jpg" alt="IMG_3351"/></div>'
+		expect(last_response.body).to be == '<div class="gallery"><img src="/sample_images/IMG_3340.jpg" alt="IMG_3340"/><img src="/sample_images/IMG_3341.jpg" alt="IMG_3341"/><img src="/sample_images/IMG+3344.jpg" alt="IMG 3344"/><img src="/sample_images/IMG_3351.jpg" alt="IMG_3351"/></div>'
 	end
 	
 	it "should generate a gallery using the specified tag" do
@@ -54,10 +54,10 @@ describe Utopia::Gallery do
 	<div class="caption">IMG_3341</div>
 </span>
 <span class="photo">
-	<a rel="photos" class="thumbnail" href="/_gallery/sample_images/large/IMG_3344.jpg" title="IMG_3344">
-		<img src="/_gallery/sample_images/small/IMG_3344.jpg" alt="IMG_3344"/>
+	<a rel="photos" class="thumbnail" href="/_gallery/sample_images/large/IMG+3344.jpg" title="IMG 3344">
+		<img src="/_gallery/sample_images/small/IMG+3344.jpg" alt="IMG 3344"/>
 	</a>
-	<div class="caption">IMG_3344</div>
+	<div class="caption">IMG 3344</div>
 </span>
 <span class="photo">
 	<a rel="photos" class="thumbnail" href="/_gallery/sample_images/large/IMG_3351.jpg" title="IMG_3351">

data/utopia-gallery.gemspec

@@ -17,7 +17,8 @@ Gem::Specification.new do |spec|
 	spec.require_paths = ["lib"]
 	
 	spec.add_dependency "utopia", "~> 2.0"
-	spec.add_dependency "vips-thumbnail"
+	spec.add_dependency "trenni", "~> 3.1"
+	spec.add_dependency "vips-thumbnail", "~> 1.1"
 	
 	spec.add_development_dependency "bundler", "~> 1.4"
 	spec.add_development_dependency "rake", "~> 10.5"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: utopia-gallery
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.1.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-26 00:00:00.000000000 Z
+date: 2017-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: utopia
@@ -24,20 +24,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: trenni
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: vips-thumbnail
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -107,10 +121,11 @@ files:
 - spec/utopia/gallery/site/pages/_photo.xnode
 - spec/utopia/gallery/site/pages/gallery.xnode
 - spec/utopia/gallery/site/pages/index.xnode
+- spec/utopia/gallery/site/pages/sample_images/IMG 3344.jpg
 - spec/utopia/gallery/site/pages/sample_images/IMG_3340.jpg
 - spec/utopia/gallery/site/pages/sample_images/IMG_3341.jpg
-- spec/utopia/gallery/site/pages/sample_images/IMG_3344.jpg
 - spec/utopia/gallery/site/pages/sample_images/IMG_3351.jpg
+- spec/utopia/gallery/site/pages/sample_images/gallery.yaml
 - spec/utopia/gallery/site_spec.rb
 - spec/utopia/gallery/site_spec.ru
 - utopia-gallery.gemspec
@@ -145,9 +160,10 @@ test_files:
 - spec/utopia/gallery/site/pages/_photo.xnode
 - spec/utopia/gallery/site/pages/gallery.xnode
 - spec/utopia/gallery/site/pages/index.xnode
+- spec/utopia/gallery/site/pages/sample_images/IMG 3344.jpg
 - spec/utopia/gallery/site/pages/sample_images/IMG_3340.jpg
 - spec/utopia/gallery/site/pages/sample_images/IMG_3341.jpg
-- spec/utopia/gallery/site/pages/sample_images/IMG_3344.jpg
 - spec/utopia/gallery/site/pages/sample_images/IMG_3351.jpg
+- spec/utopia/gallery/site/pages/sample_images/gallery.yaml
 - spec/utopia/gallery/site_spec.rb
 - spec/utopia/gallery/site_spec.ru