riiif 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0bb1c35a0544e1cf55ab8af94b47ba48edcb6de
-  data.tar.gz: a591cfb9fe134db6b9ab8e68ca20b4d6008e859d
+  metadata.gz: 47aafb94ed533ae1769ddcd23095d428079b28df
+  data.tar.gz: 9aaec28c8c55fd8e936b4d192e31bbe66a39f228
 SHA512:
-  metadata.gz: 69e0af123b2b0d0bf47f7c8c156bb58f88fa48f8534ce3b15a3b30c24b214acbfc832d238fbf7bf7afbd71b3df6898d91d0756ecb462f45d7cc6e032c28e0a5a
-  data.tar.gz: 9fe0ca382348abcb23fc7f5b684a125b14116d96a98fdfc62e13b11644c7907f69e1035c90ef2735c1c9ef8a8bc79fc0f81c95a4349a2bc56d6935c0c14eb039
+  metadata.gz: 7b034b617360e62f487907b1395bef2641f130678729461d23410f48106674516d674a08e1d2a9a814d72d64ec2bcccdefa21a5099f8e6baee93bb304b714cd1
+  data.tar.gz: ed2a2ce3187f8c4f8227cdfcded3d177614d07bdeea331a125737180ed56f0fb0fbaa23e881b02d05a845b65b0638844d6fe265e3a31acc628332a346522b272

data/.rubocop_todo.yml

@@ -11,7 +11,7 @@
 Lint/AssignmentInCondition:
   Exclude:
     - 'app/models/riiif/file.rb'
-    - 'app/models/riiif/image.rb'
+    - 'app/services/riiif/option_decoder.rb'
     - 'lib/riiif/http_file_resolver.rb'
 
 # Offense count: 1

data/app/controllers/riiif/images_controller.rb

@@ -120,7 +120,7 @@ module Riiif
           CONTEXT => CONTEXT_URI,
           ID => request.original_url.sub('/info.json', ''),
           PROTOCOL => PROTOCOL_URI,
-          PROFILE => [LEVEL1, 'formats' => model::OUTPUT_FORMATS]
+          PROFILE => [LEVEL1, 'formats' => OptionDecoder::OUTPUT_FORMATS]
         }
       end
   end

data/app/models/riiif/image.rb

@@ -17,7 +17,6 @@ require_dependency 'riiif/size/imagemagick/percent_decoder'
 require_dependency 'riiif/size/imagemagick/width_decoder'
 
 module Riiif
-  # rubocop:disable Metrics/ClassLength
   class Image
     extend Deprecation
 
@@ -37,8 +36,6 @@ module Riiif
       end
     end
 
-    OUTPUT_FORMATS = %w(jpg png).freeze
-
     attr_reader :id
 
     # @param [String] id The identifier of the file to be looked up.
@@ -62,7 +59,7 @@ module Riiif
       key = Image.cache_key(id, cache_opts)
 
       cache.fetch(key, compress: true, expires_in: Image.expires_in) do
-        file.extract(decode_options!(args))
+        file.extract(OptionDecoder.decode(args, info))
       end
     end
 
@@ -89,75 +86,5 @@ module Riiif
         'riiif:' + Digest::MD5.hexdigest(str)
       end
     end
-
-    private
-
-      ##
-      # @param [ActiveSupport::HashWithIndifferentAccess] options
-      # @return [Transformation]
-      def decode_options!(options)
-        raise ArgumentError, "You must provide a format. You provided #{options}" unless options[:format]
-        validate_format!(options[:format])
-        Riiif::Transformation.new(decode_region(options.delete(:region)),
-                                  decode_size(options.delete(:size)),
-                                  decode_quality(options[:quality]),
-                                  decode_rotation(options[:rotation]),
-                                  options[:format])
-      end
-
-      def decode_quality(quality)
-        return if quality.nil? || %w(default color).include?(quality)
-        return quality if %w(bitonal grey).include?(quality)
-        raise InvalidAttributeError, "Unsupported quality: #{quality}"
-      end
-
-      def decode_rotation(rotation)
-        return if rotation.nil? || rotation == '0'
-        begin
-          Float(rotation)
-        rescue ArgumentError
-          raise InvalidAttributeError, "Unsupported rotation: #{rotation}"
-        end
-      end
-
-      def validate_format!(format)
-        raise InvalidAttributeError, "Unsupported format: #{format}" unless OUTPUT_FORMATS.include?(format)
-      end
-
-      def decode_region(region)
-        if region.nil? || region == 'full'
-          Riiif::Region::Imagemagick::FullDecoder.new.decode
-        elsif md = /^pct:(\d+),(\d+),(\d+),(\d+)$/.match(region)
-          Riiif::Region::Imagemagick::PercentageDecoder
-            .new(info, md[1], md[2], md[3], md[4]).decode
-        elsif md = /^(\d+),(\d+),(\d+),(\d+)$/.match(region)
-          Riiif::Region::Imagemagick::AbsoluteDecoder.new(md[1], md[2], md[3], md[4]).decode
-        elsif region == 'square'
-          Riiif::Region::Imagemagick::SquareDecoder.new(info).decode
-        else
-          raise InvalidAttributeError, "Invalid region: #{region}"
-        end
-      end
-
-      # rubocop:disable Metrics/PerceivedComplexity
-      def decode_size(size)
-        if size.nil? || size == 'full'
-          Riiif::Size::Imagemagick::FullDecoder.new.decode
-        elsif md = /^,(\d+)$/.match(size)
-          Riiif::Size::Imagemagick::HeightDecoder.new(md[1]).decode
-        elsif md = /^(\d+),$/.match(size)
-          Riiif::Size::Imagemagick::WidthDecoder.new(md[1]).decode
-        elsif md = /^pct:(\d+(.\d+)?)$/.match(size)
-          Riiif::Size::Imagemagick::PercentDecoder.new(md[1]).decode
-        elsif md = /^(\d+),(\d+)$/.match(size)
-          Riiif::Size::Imagemagick::AbsoluteDecoder.new(md[1], md[2]).decode
-        elsif md = /^!(\d+),(\d+)$/.match(size)
-          Riiif::Size::Imagemagick::BestFitDecoder.new(md[1], md[2]).decode
-        else
-          raise InvalidAttributeError, "Invalid size: #{size}"
-        end
-      end
-    # rubocop:enable Metrics/PerceivedComplexity
   end
-  # rubocop:enable Metrics/ClassLength
 end

data/app/models/riiif/image_information.rb

@@ -1,5 +1,3 @@
-require 'deprecation'
-
 module Riiif
   # This is the result of calling the Riiif.image_info service. It stores the height & width
   class ImageInformation

data/app/services/riiif/option_decoder.rb

@@ -0,0 +1,88 @@
+module Riiif
+  # Decodes the URL parameters into a Transformation object
+  class OptionDecoder
+    OUTPUT_FORMATS = %w(jpg png).freeze
+
+    # a helper method for instantiating the OptionDecoder
+    # @param [ActiveSupport::HashWithIndifferentAccess] options
+    # @param [ImageInformation] image_info
+    def self.decode(options, image_info)
+      new(options, image_info).decode
+    end
+
+    # @param [ActiveSupport::HashWithIndifferentAccess] options
+    # @param [ImageInformation] image_info
+    def initialize(options, image_info)
+      @options = options
+      @image_info = image_info
+    end
+
+    attr_reader :image_info
+
+    ##
+    # @return [Transformation]
+    def decode
+      raise ArgumentError, "You must provide a format. You provided #{@options}" unless @options[:format]
+      validate_format!(@options[:format])
+      Riiif::Transformation.new(decode_region(@options.delete(:region)),
+                                decode_size(@options.delete(:size)),
+                                decode_quality(@options[:quality]),
+                                decode_rotation(@options[:rotation]),
+                                @options[:format])
+    end
+
+    def decode_quality(quality)
+      return if quality.nil? || %w(default color).include?(quality)
+      return quality if %w(bitonal grey).include?(quality)
+      raise InvalidAttributeError, "Unsupported quality: #{quality}"
+    end
+
+    def decode_rotation(rotation)
+      return if rotation.nil? || rotation == '0'
+      begin
+        Float(rotation)
+      rescue ArgumentError
+        raise InvalidAttributeError, "Unsupported rotation: #{rotation}"
+      end
+    end
+
+    def validate_format!(format)
+      raise InvalidAttributeError, "Unsupported format: #{format}" unless OUTPUT_FORMATS.include?(format)
+    end
+
+    def decode_region(region)
+      if region.nil? || region == 'full'
+        Riiif::Region::Imagemagick::FullDecoder.new.decode
+      elsif md = /^pct:(\d+),(\d+),(\d+),(\d+)$/.match(region)
+        Riiif::Region::Imagemagick::PercentageDecoder
+          .new(image_info, md[1], md[2], md[3], md[4]).decode
+      elsif md = /^(\d+),(\d+),(\d+),(\d+)$/.match(region)
+        Riiif::Region::Imagemagick::AbsoluteDecoder.new(md[1], md[2], md[3], md[4]).decode
+      elsif region == 'square'
+        Riiif::Region::Imagemagick::SquareDecoder.new(image_info).decode
+      else
+        raise InvalidAttributeError, "Invalid region: #{region}"
+      end
+    end
+
+    # rubocop:disable Metrics/PerceivedComplexity
+    def decode_size(size)
+      if size.nil? || size == 'full'
+        Riiif::Size::Imagemagick::FullDecoder.new.decode
+      elsif md = /^,(\d+)$/.match(size)
+        Riiif::Size::Imagemagick::HeightDecoder.new(md[1]).decode
+      elsif md = /^(\d+),$/.match(size)
+        Riiif::Size::Imagemagick::WidthDecoder.new(md[1]).decode
+      elsif md = /^pct:(\d+(.\d+)?)$/.match(size)
+        Riiif::Size::Imagemagick::PercentDecoder.new(md[1]).decode
+      elsif md = /^(\d+),(\d+)$/.match(size)
+        Riiif::Size::Imagemagick::AbsoluteDecoder.new(md[1], md[2]).decode
+      elsif md = /^!(\d+),(\d+)$/.match(size)
+        Riiif::Size::Imagemagick::BestFitDecoder.new(md[1], md[2]).decode
+      else
+        raise InvalidAttributeError, "Invalid size: #{size}"
+      end
+    end
+    # rubocop:enable Metrics/PerceivedComplexity
+  end
+end

data/lib/riiif/abstract_file_system_resolver.rb

@@ -1,4 +1,3 @@
-require 'deprecation'
 module Riiif
   class AbstractFileSystemResolver
     extend Deprecation

data/lib/riiif/engine.rb

@@ -4,5 +4,9 @@ module Riiif
 
     # How long to cache the tiles for.
     config.cache_duration_in_days = 3
+
+    config.action_dispatch.rescue_responses.merge!(
+      'Riiif::ImageNotFoundError' => :not_found
+    )
   end
 end

data/lib/riiif/version.rb

@@ -1,3 +1,3 @@
 module Riiif
-  VERSION = '1.6.0'.freeze
+  VERSION = '1.7.0'.freeze
 end

data/lib/riiif.rb

@@ -1,4 +1,5 @@
 require 'riiif/version'
+require 'deprecation'
 require 'riiif/engine'
 module Riiif
   extend ActiveSupport::Autoload

data/spec/models/riiif/image_spec.rb

@@ -72,14 +72,14 @@ RSpec.describe Riiif::Image do
   end
 
   describe '#render' do
+    before do
+      allow(Riiif::CommandRunner).to receive(:execute)
+        .with("identify -format %hx%w #{filename}[0]").and_return('131x175')
+    end
+
     describe 'region' do
       subject(:render) { image.render(region: region, format: 'png') }
 
-      before do
-        allow(Riiif::CommandRunner).to receive(:execute)
-          .with("identify -format %hx%w #{filename}[0]").and_return('131x175')
-      end
-
       context 'when specifing full size' do
         let(:region) { 'full' }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: riiif
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-07 00:00:00.000000000 Z
+date: 2017-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -180,6 +180,7 @@ files:
 - app/services/riiif/command_runner.rb
 - app/services/riiif/image_magick_info_extractor.rb
 - app/services/riiif/imagemagick_command_factory.rb
+- app/services/riiif/option_decoder.rb
 - app/services/riiif/region/imagemagick/absolute_decoder.rb
 - app/services/riiif/region/imagemagick/full_decoder.rb
 - app/services/riiif/region/imagemagick/percentage_decoder.rb