mini_magick 4.6.0 → 4.6.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of mini_magick might be problematic. Click here for more details.

Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/lib/mini_magick/image/info.rb +3 -1
  3. data/lib/mini_magick/shell.rb +3 -1
  4. data/lib/mini_magick/version.rb +1 -1
  5. metadata +4 -4
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 45a32b5c2e6bb0323abe49c1d5c3cb5bd7378f3e
4
- data.tar.gz: 430c76ab6de8661491e42bcb21a9ba21d9239e97
3
+ metadata.gz: b4a0a556ff59b381d54bd9baeef89aa7ccaab8e5
4
+ data.tar.gz: 11a3549176fa09ed8afc3751cbd64d1b2a3aceb8
5
5
  SHA512:
6
- metadata.gz: a989fdcfa50a2317ce292c04724be10928f01e834c17f6b529646c16ab855be3d2bbcc3d1a929662bf327c7e8e77387a994b42bfa6ad5e159e09237492e9495e
7
- data.tar.gz: 4f42cff0e866f24e8bfbd36e2121487424ba7f96a433ddefe3c5edaab70976531bf8bb15ba267eb6ef8d4bf359e752351d74b0416b1a57a2f15e5a84ff3ec1cd
6
+ metadata.gz: 3d55ad85c6fefd00cbe9cceabaa158eafb096384309e5baaf7133df542d6ff5273f8e17bed5ec7c5163ebe5fa110635835cb52fc453d045158164f734581aa5a
7
+ data.tar.gz: 9c50eeddd1c9e4393522754679f4b2ba4db953a375568c2c26dab4c9958a56b89feb404d930a2ce30fd37fdd82d88ec85256f3c5df9553964524ceea474a3948
data/lib/mini_magick/image/info.rb CHANGED
@@ -160,7 +160,9 @@ module MiniMagick
160
160
  convert << "json:"
161
161
  end
162
162
 
163
- JSON.parse(json).fetch("image")
163
+ data = JSON.parse(json)
164
+ data = data.fetch(0) if data.is_a?(Array)
165
+ data.fetch("image")
164
166
  )
165
167
  end
166
168
 
data/lib/mini_magick/shell.rb CHANGED
@@ -52,9 +52,11 @@ module MiniMagick
52
52
  pid, stdin, stdout, stderr = POSIX::Spawn.popen4(*command)
53
53
  [stdin, stdout, stderr].each(&:binmode)
54
54
  stdin.write(options[:stdin].to_s)
55
+ out = stdout.read
56
+ err = stderr.read
55
57
  Process.waitpid(pid)
56
58
 
57
- [stdout.read, stderr.read, $?]
59
+ [out, err, $?]
58
60
  end
59
61
 
60
62
  def log(command, &block)
data/lib/mini_magick/version.rb CHANGED
@@ -9,7 +9,7 @@ module MiniMagick
9
9
  module VERSION
10
10
  MAJOR = 4
11
11
  MINOR = 6
12
- TINY = 0
12
+ TINY = 1
13
13
  PRE = nil
14
14
 
15
15
  STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: mini_magick
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.6.0
4
+ version: 4.6.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Corey Johnson
@@ -13,7 +13,7 @@ authors:
13
13
  autorequire:
14
14
  bindir: bin
15
15
  cert_chain: []
16
- date: 2016-12-03 00:00:00.000000000 Z
16
+ date: 2017-02-12 00:00:00.000000000 Z
17
17
  dependencies:
18
18
  - !ruby/object:Gem::Dependency
19
19
  name: rake
@@ -35,14 +35,14 @@ dependencies:
35
35
  requirements:
36
36
  - - "~>"
37
37
  - !ruby/object:Gem::Version
38
- version: 3.1.0
38
+ version: 3.5.0
39
39
  type: :development
40
40
  prerelease: false
41
41
  version_requirements: !ruby/object:Gem::Requirement
42
42
  requirements:
43
43
  - - "~>"
44
44
  - !ruby/object:Gem::Version
45
- version: 3.1.0
45
+ version: 3.5.0
46
46
  - !ruby/object:Gem::Dependency
47
47
  name: posix-spawn
48
48
  requirement: !ruby/object:Gem::Requirement