image_size 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82a7fbf13124c2d0472d5da0f7d210ef83519dcde8927ec9db13954cf3f3d44c
-  data.tar.gz: 5b77e47649b9632ec16b882397d367343d61750884ab9642170150ec43f9895c
+  metadata.gz: c0fa25bd1e135ab32ca6314351395d6244da802b7ab2e2453e4693a144ec59d8
+  data.tar.gz: 3132376fd6fb5e06230a72682c9129d7d5429513552a07ec1bd2086333eb4866
 SHA512:
-  metadata.gz: f1e666a5911f31b8b3d44cf94ab3223621561026f6701e43e8db39e3d36761641a6f8122cdcd9bff18740a50679ebec593de7b73dd5ea36309d4688f7926f29e
-  data.tar.gz: 6322a3aa7488e76f2cd26ef0eb83492269165ba4948a2f888bf935d48ccba86d20f0fb306252ed0dc1af5e5adce11442edb70586331b40070fec866d46ae36e1
+  metadata.gz: eab18d5faae61455ed10c9a7a63eab394b0de1c6c808db0c5337ee8b87904f725ae6b55b1019c3da743171421a7401bc64b36bacc228be3b87e0d7de46338a25
+  data.tar.gz: d3009f25b1a73e0b9ae22c20e078e428869cc3cb79c7f7691b1886360a7aa5d75d0aa537643b65037d11d00dddba24104e68255489967ed4c6e030f0c78d6b60

data/.rubocop.yml

@@ -54,6 +54,9 @@ Style/IfUnlessModifier:
 Style/ParallelAssignment:
   Enabled: false
 
+Style/SafeNavigation:
+  Enabled: false
+
 Style/TrailingCommaInArrayLiteral:
   EnforcedStyleForMultiline: comma
 

data/.travis.yml

@@ -1,24 +1,24 @@
 sudo: false
 language: ruby
 before_install:
-  - gem update bundler
+  - gem install bundler || gem install bundler --version '< 2'
 rvm:
   - '1.8.7-p371'
   - '1.9.3-p551'
   - '2.0.0-p648'
   - '2.1.10'
   - '2.2.10'
-  - '2.3.7'
-  - '2.4.4'
-  - '2.5.1'
-  - 'jruby-9.0.5.0'
+  - '2.3.8'
+  - '2.4.6'
+  - '2.5.5'
+  - '2.6.3'
   - 'jruby-9.1.9.0'
 script: bundle exec rspec
 matrix:
   include:
     - env: RUBOCOP=✓
-      rvm: '2.4.4'
+      rvm: '2.6.3'
       script: bundle exec rubocop
     - env: CHECK_RUBIES=✓
-      rvm: '2.4.4'
+      rvm: '2.6.3'
       script: bundle exec travis_check_rubies

data/CHANGELOG.markdown

@@ -2,6 +2,10 @@
 
 ## unreleased
 
+## v2.0.1 (2019-05-17)
+
+* Adapt to frozen string literals [@toy](https://github.com/toy)
+
 ## v2.0.0 (2018-05-01)
 
 * Allow any class responding to `read` and `eof?` to be passed to `ImageSize` [@toy](https://github.com/toy)

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gemspec

data/image_size.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'image_size'
-  s.version     = '2.0.0'
+  s.version     = '2.0.1'
   s.summary     = %q{Measure image size using pure Ruby}
   s.description = %q{Measure following file dimensions: apng, bmp, cur, gif, jpeg, ico, mng, pbm, pcx, pgm, png, ppm, psd, swf, tiff, xbm, xpm, webp}
   s.homepage    = "http://github.com/toy/#{s.name}"
@@ -11,13 +11,20 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = s.name
 
+  s.metadata = {
+    'bug_tracker_uri'   => "https://github.com/toy/#{s.name}/issues",
+    'changelog_uri'     => "https://github.com/toy/#{s.name}/blob/master/CHANGELOG.markdown",
+    'documentation_uri' => "https://www.rubydoc.info/gems/#{s.name}/#{s.version}",
+    'source_code_uri'   => "https://github.com/toy/#{s.name}",
+  }
+
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = %w[lib]
 
   s.add_development_dependency 'rspec', '~> 3.0'
-  if RUBY_VERSION >= '2.1'
-    s.add_development_dependency 'rubocop', '~> 0.55'
+  if RUBY_VERSION >= '2.2'
+    s.add_development_dependency 'rubocop', '~> 0.59'
   end
 end

data/lib/image_size.rb

@@ -1,4 +1,5 @@
 # encoding: BINARY
+# frozen_string_literal: true
 
 require 'stringio'
 
@@ -24,7 +25,7 @@ class ImageSize
       else
         raise ArgumentError, "expected data as String or an object responding to read and eof?, got #{data_or_io.class}"
       end
-      @data = ''
+      @data = String.new # not frozen
     end
 
     CHUNK = 1024
@@ -32,6 +33,7 @@ class ImageSize
       while !@io.eof? && @data.length < offset + length
         data = @io.read(CHUNK)
         break unless data
+
         data.force_encoding(@data.encoding) if data.respond_to?(:encoding)
         @data << data
       end
@@ -59,6 +61,7 @@ class ImageSize
     ir = ImageReader.new(data)
     @format = detect_format(ir)
     return unless @format
+
     @width, @height = send("size_of_#{@format}", ir)
   end
 
@@ -80,7 +83,7 @@ class ImageSize
 
 private
 
-  SVG_R = /<svg\b([^>]*)>/
+  SVG_R = /<svg\b([^>]*)>/.freeze
   def detect_format(ir)
     head = ir[0, 1024]
     case
@@ -127,6 +130,7 @@ private
     unless ir[12, 4] == 'MHDR'
       raise FormatError, 'MHDR not in place for MNG'
     end
+
     ir[16, 8].unpack('NN')
   end
 
@@ -134,6 +138,7 @@ private
     unless ir[12, 4] == 'IHDR'
       raise FormatError, 'IHDR not in place for PNG'
     end
+
     ir[16, 8].unpack('NN')
   end
   alias_method :size_of_apng, :size_of_png
@@ -158,6 +163,7 @@ private
       if JPEG_CODE_CHECK.include?(code)
         return ir[offset + 1, 4].unpack('nn').reverse
       end
+
       offset += length - 2
     end
   end
@@ -199,6 +205,7 @@ private
       if data.length != length
         raise FormatError, 'XPM size not found'
       end
+
       length += 1024
     end
     [$1.to_i, $2.to_i]
@@ -222,10 +229,12 @@ private
     until width && height
       ifd = ir[offset, 12]
       raise FormatError, 'Reached end of directory entries in TIFF' if ifd.nil? || offset > num_dirent
+
       tag, type = ifd.unpack(endian2b * 2)
       offset += 12
 
       next if packspec[type].nil?
+
       value = ifd[8, 4].unpack(packspec[type])[0]
       case tag
       when 0x0100
@@ -259,6 +268,7 @@ private
     dpi = self.class.dpi
     [attributes['width'], attributes['height']].map do |length|
       next unless length
+
       pixels = case length.downcase.strip[/(?:em|ex|px|in|cm|mm|pt|pc|%)\z/]
       when 'em', 'ex', '%' then nil
       when 'in' then length.to_f * dpi

data/spec/image_size_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rspec'
 require 'image_size'
 require 'tempfile'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: image_size
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Keisuke Minami
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-01 00:00:00.000000000 Z
+date: 2019-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.55'
+        version: '0.59'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.55'
+        version: '0.59'
 description: 'Measure following file dimensions: apng, bmp, cur, gif, jpeg, ico, mng,
   pbm, pcx, pgm, png, ppm, psd, swf, tiff, xbm, xpm, webp'
 email: 
@@ -82,7 +82,11 @@ files:
 homepage: http://github.com/toy/image_size
 licenses:
 - Ruby
-metadata: {}
+metadata:
+  bug_tracker_uri: https://github.com/toy/image_size/issues
+  changelog_uri: https://github.com/toy/image_size/blob/master/CHANGELOG.markdown
+  documentation_uri: https://www.rubydoc.info/gems/image_size/2.0.1
+  source_code_uri: https://github.com/toy/image_size
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -98,8 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: image_size
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Measure image size using pure Ruby