lib/dragonfly_libvips/plugin.rb in dragonfly_libvips-2.1.3 vs lib/dragonfly_libvips/plugin.rb in dragonfly_libvips-2.2.0

@@ -1,53 +1,33 @@
 require 'dragonfly_libvips/analysers/image_properties'
 require 'dragonfly_libvips/processors/encode'
+require 'dragonfly_libvips/processors/extract_area'
 require 'dragonfly_libvips/processors/rotate'
 require 'dragonfly_libvips/processors/thumb'
 
 module DragonflyLibvips
   class Plugin
     def call(app, _opts = {})
       # Analysers
       app.add_analyser :image_properties, DragonflyLibvips::Analysers::ImageProperties.new
 
-      app.add_analyser :width do |content|
-        content.analyse(:image_properties)['width']
+      %w[ width
+          height
+          xres
+          yres
+          format
+      ].each do |name|
+        app.add_analyser(name) { |c| c.analyse(:image_properties)[name] }
       end
 
-      app.add_analyser :height do |content|
-        content.analyse(:image_properties)['height']
-      end
+      app.add_analyser(:aspect_ratio) { |c| c.analyse(:width).to_f / c.analyse(:height).to_f }
+      app.add_analyser(:portrait) { |c| c.analyse(:aspect_ratio) < 1.0 }
+      app.add_analyser(:landscape) { |c| !c.analyse(:portrait) }
 
-      app.add_analyser :xres do |content|
-        content.analyse(:image_properties)['xres']
-      end
-
-      app.add_analyser :yres do |content|
-        content.analyse(:image_properties)['yres']
-      end
-
-      app.add_analyser :format do |content|
-        content.analyse(:image_properties)['format']
-      end
-
-      app.add_analyser :aspect_ratio do |content|
-        attrs = content.analyse(:image_properties)
-        attrs['width'].to_f / attrs['height']
-      end
-
-      app.add_analyser :portrait do |content|
-        attrs = content.analyse(:image_properties)
-        attrs['width'] <= attrs['height']
-      end
-
-      app.add_analyser :landscape do |content|
-        !content.analyse(:portrait)
-      end
-
-      app.add_analyser :image do |content|
+      app.add_analyser(:image) do |c|
         begin
-          content.analyse(:image_properties).key?('format')
+          c.analyse(:image_properties).key?('format')
         rescue ::Vips::Error
           false
         end
       end
 
@@ -56,9 +36,10 @@
       app.define(:landscape?) { landscape }
       app.define(:image?) { image }
 
       # Processors
       app.add_processor :encode, Processors::Encode.new
+      app.add_processor :extract_area, Processors::ExtractArea.new
       app.add_processor :thumb, Processors::Thumb.new
       app.add_processor :rotate, Processors::Rotate.new
     end
   end
 end