mojo_magick 0.5.7 → 0.6.0
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.
- checksums.yaml +4 -4
- data/.circleci/config.yml +24 -0
- data/.github/dependabot.yml +8 -0
- data/.rubocop-common.yml +99 -0
- data/.rubocop-performance.yml +2 -0
- data/.rubocop-rspec.yml +33 -0
- data/.rubocop.yml +10 -0
- data/Gemfile +6 -1
- data/Gemfile.lock +51 -12
- data/README.md +17 -3
- data/Rakefile +15 -6
- data/examples/animated_gif.rb +11 -13
- data/examples/composite.rb +11 -13
- data/init.rb +1 -1
- data/lib/image_magick/fonts.rb +6 -6
- data/lib/initializers/hash.rb +4 -4
- data/lib/mojo_magick.rb +40 -39
- data/lib/mojo_magick/command_status.rb +1 -1
- data/lib/mojo_magick/opt_builder.rb +15 -24
- data/lib/mojo_magick/util/parser.rb +5 -42
- data/lib/mojo_magick/version.rb +1 -1
- data/mojo_magick.gemspec +20 -16
- data/test/fixtures/roll with it.jpg +0 -0
- data/test/font_test.rb +5 -5
- data/test/fonts_test.rb +1 -1
- data/test/mojo_magick_test.rb +58 -53
- data/test/opt_builder_test.rb +40 -40
- data/test/parser_test.rb +4 -4
- data/test/test_helper.rb +8 -6
- metadata +57 -10
- data/lib/image_magick/resource_limits.rb +0 -91
- data/test/resource_limits_test.rb +0 -49
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: cdb2b6563318eaf003552e04cafaba99adf014b716ac750a4c0b1ca3f0c8323c
|
4
|
+
data.tar.gz: ed67fde557f5c57d3f507586a8ecef00c3c1dc918cf38b0cf35af42c0d9972b3
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: eef7bf4734a8874370a005308cfea49d0cc060417da11e234fb2d6c69136bb5ea5d428f1f95fdbefe80e71ab1140191cc18e9dce113683d30835f4e089744e60
|
7
|
+
data.tar.gz: ffbadc0a11cce5222848142a3f148c5d0a034923892791ff321c7591cb00f5b117309a6996cf57bf3456f422a819729601c8f9cbd16c71d8c0517b8927f7f2d0
|
@@ -0,0 +1,24 @@
|
|
1
|
+
version: 2.1
|
2
|
+
orbs:
|
3
|
+
ruby: circleci/ruby@1.1.2
|
4
|
+
|
5
|
+
jobs:
|
6
|
+
build:
|
7
|
+
docker:
|
8
|
+
- image: circleci/ruby:2.6.6-browsers
|
9
|
+
executor: ruby/default
|
10
|
+
steps:
|
11
|
+
- checkout
|
12
|
+
- run:
|
13
|
+
name: Which bundler?
|
14
|
+
command: bundle -v
|
15
|
+
- ruby/install-deps
|
16
|
+
- run:
|
17
|
+
name: install imagemagick
|
18
|
+
command: sudo apt-get install imagemagick ghostscript
|
19
|
+
- run:
|
20
|
+
name: tests
|
21
|
+
command: bundle exec rake
|
22
|
+
- run:
|
23
|
+
name: audit
|
24
|
+
command: bundle exec bundle-audit update && bundle exec bundle-audit check
|
data/.rubocop-common.yml
ADDED
@@ -0,0 +1,99 @@
|
|
1
|
+
AllCops:
|
2
|
+
NewCops: enable
|
3
|
+
DisplayCopNames: true
|
4
|
+
DisplayStyleGuide: true
|
5
|
+
Exclude:
|
6
|
+
- "bin/*"
|
7
|
+
- "db/schema.rb"
|
8
|
+
- "lib/templates/**/*"
|
9
|
+
- "**/node_modules/**/*"
|
10
|
+
- "tmp/**/*"
|
11
|
+
- "vendor/**/*"
|
12
|
+
- "log/**/*"
|
13
|
+
|
14
|
+
Layout/CaseIndentation:
|
15
|
+
Enabled: false
|
16
|
+
|
17
|
+
Layout/FirstArrayElementIndentation:
|
18
|
+
EnforcedStyle: consistent
|
19
|
+
|
20
|
+
Layout/HashAlignment:
|
21
|
+
Enabled: false
|
22
|
+
|
23
|
+
Layout/LineLength:
|
24
|
+
Max: 120
|
25
|
+
|
26
|
+
Layout/MultilineMethodCallIndentation:
|
27
|
+
EnforcedStyle: indented
|
28
|
+
|
29
|
+
Lint/AmbiguousBlockAssociation:
|
30
|
+
Enabled: false
|
31
|
+
|
32
|
+
Lint/ScriptPermission:
|
33
|
+
Exclude:
|
34
|
+
- "Rakefile"
|
35
|
+
|
36
|
+
Metrics/AbcSize:
|
37
|
+
Max: 35
|
38
|
+
Exclude:
|
39
|
+
- "spec/**/*"
|
40
|
+
|
41
|
+
Metrics/BlockLength:
|
42
|
+
CountComments: false
|
43
|
+
Max: 50
|
44
|
+
Exclude:
|
45
|
+
- "config/**/*"
|
46
|
+
- "spec/**/*"
|
47
|
+
|
48
|
+
Metrics/ClassLength:
|
49
|
+
Max: 250
|
50
|
+
Exclude:
|
51
|
+
- "spec/**/*"
|
52
|
+
|
53
|
+
Metrics/MethodLength:
|
54
|
+
Max: 25
|
55
|
+
Exclude:
|
56
|
+
- "db/migrate/*"
|
57
|
+
- "spec/**/*"
|
58
|
+
|
59
|
+
Naming/PredicateName:
|
60
|
+
Enabled: false
|
61
|
+
|
62
|
+
Security/YAMLLoad:
|
63
|
+
Enabled: false
|
64
|
+
|
65
|
+
Style/BarePercentLiterals:
|
66
|
+
EnforcedStyle: percent_q
|
67
|
+
|
68
|
+
Style/BlockDelimiters:
|
69
|
+
EnforcedStyle: braces_for_chaining
|
70
|
+
|
71
|
+
Style/Documentation:
|
72
|
+
Enabled: false
|
73
|
+
|
74
|
+
Style/EmptyMethod:
|
75
|
+
EnforcedStyle: expanded
|
76
|
+
|
77
|
+
Style/FrozenStringLiteralComment:
|
78
|
+
EnforcedStyle: never
|
79
|
+
|
80
|
+
Style/Lambda:
|
81
|
+
EnforcedStyle: literal
|
82
|
+
|
83
|
+
Style/ModuleFunction:
|
84
|
+
EnforcedStyle: extend_self
|
85
|
+
|
86
|
+
Style/MutableConstant:
|
87
|
+
Enabled: false
|
88
|
+
|
89
|
+
Style/PreferredHashMethods:
|
90
|
+
Enabled: false
|
91
|
+
|
92
|
+
Style/StringLiterals:
|
93
|
+
EnforcedStyle: double_quotes
|
94
|
+
|
95
|
+
Style/StringLiteralsInInterpolation:
|
96
|
+
EnforcedStyle: double_quotes
|
97
|
+
|
98
|
+
Style/TernaryParentheses:
|
99
|
+
EnforcedStyle: require_parentheses_when_complex
|
data/.rubocop-rspec.yml
ADDED
@@ -0,0 +1,33 @@
|
|
1
|
+
# Request and system specs by definition do not test specific classes/modules,
|
2
|
+
# so they are excluded from following the `describe ClassOrModule` rule.
|
3
|
+
RSpec/DescribeClass:
|
4
|
+
Exclude:
|
5
|
+
- "spec/features/**/*"
|
6
|
+
- "spec/requests/**/*"
|
7
|
+
- "spec/system/**/*"
|
8
|
+
|
9
|
+
# Prefer short examples but allow some flexibility (up to 12 lines). System
|
10
|
+
# specs are excluded from this cop because they often involve many sequential
|
11
|
+
# steps, and forcing these to be shorter can make them harder to follow.
|
12
|
+
RSpec/ExampleLength:
|
13
|
+
Max: 12 # Default is 5
|
14
|
+
Exclude:
|
15
|
+
- "spec/features/**/*"
|
16
|
+
- "spec/system/**/*"
|
17
|
+
|
18
|
+
# If an `it` block does not have a description (i.e. the example relies on
|
19
|
+
# RSpec magic to infer the description), then prefer it use the `is_expected`
|
20
|
+
# syntax instead of `expect(subject)`, like this:
|
21
|
+
# it { is_expected.to be_truthy }
|
22
|
+
RSpec/ImplicitSubject:
|
23
|
+
EnforcedStyle: single_statement_only
|
24
|
+
|
25
|
+
# Ideal BDD is to have one `expect` per example (so that each specification can
|
26
|
+
# have corresponding documentation in the form of an `it` block), but we allow
|
27
|
+
# some flexibility (up to 3). System specs are often long capybara flows with
|
28
|
+
# many expectations, so we exclude them from this cop.
|
29
|
+
RSpec/MultipleExpectations:
|
30
|
+
Max: 3 # Default is 1
|
31
|
+
Exclude:
|
32
|
+
- "spec/features/**/*"
|
33
|
+
- "spec/system/**/*"
|
data/.rubocop.yml
ADDED
data/Gemfile
CHANGED
data/Gemfile.lock
CHANGED
@@ -1,34 +1,73 @@
|
|
1
1
|
PATH
|
2
2
|
remote: .
|
3
3
|
specs:
|
4
|
-
mojo_magick (0.
|
4
|
+
mojo_magick (0.6.0)
|
5
5
|
|
6
6
|
GEM
|
7
7
|
remote: https://rubygems.org/
|
8
8
|
specs:
|
9
|
-
|
10
|
-
|
11
|
-
|
9
|
+
ast (2.4.1)
|
10
|
+
bundle-audit (0.1.0)
|
11
|
+
bundler-audit
|
12
|
+
bundler-audit (0.7.0.1)
|
13
|
+
bundler (>= 1.2.0, < 3)
|
14
|
+
thor (>= 0.18, < 2)
|
15
|
+
diff-lcs (1.4.4)
|
16
|
+
docile (1.3.5)
|
17
|
+
io-console (0.5.7)
|
18
|
+
irb (1.3.2)
|
19
|
+
reline (>= 0.1.5)
|
12
20
|
minitest (5.14.2)
|
13
|
-
|
14
|
-
|
21
|
+
parallel (1.19.2)
|
22
|
+
parser (2.7.2.0)
|
23
|
+
ast (~> 2.4.1)
|
24
|
+
rainbow (3.0.0)
|
25
|
+
rake (13.0.1)
|
26
|
+
regexp_parser (1.8.2)
|
27
|
+
reline (0.2.2)
|
28
|
+
io-console (~> 0.5)
|
29
|
+
rexml (3.2.4)
|
30
|
+
rspec-expectations (3.10.0)
|
15
31
|
diff-lcs (>= 1.2.0, < 2.0)
|
16
|
-
rspec-support (~> 3.
|
17
|
-
rspec-support (3.
|
18
|
-
|
32
|
+
rspec-support (~> 3.10.0)
|
33
|
+
rspec-support (3.10.0)
|
34
|
+
rubocop (1.1.0)
|
35
|
+
parallel (~> 1.10)
|
36
|
+
parser (>= 2.7.1.5)
|
37
|
+
rainbow (>= 2.2.2, < 4.0)
|
38
|
+
regexp_parser (>= 1.8)
|
39
|
+
rexml
|
40
|
+
rubocop-ast (>= 1.0.1)
|
41
|
+
ruby-progressbar (~> 1.7)
|
42
|
+
unicode-display_width (>= 1.4.0, < 2.0)
|
43
|
+
rubocop-ast (1.1.1)
|
44
|
+
parser (>= 2.7.1.5)
|
45
|
+
rubocop-performance (1.8.1)
|
46
|
+
rubocop (>= 0.87.0)
|
47
|
+
rubocop-ast (>= 0.4.0)
|
48
|
+
ruby-progressbar (1.10.1)
|
49
|
+
simplecov (0.21.2)
|
19
50
|
docile (~> 1.1)
|
20
|
-
|
21
|
-
|
22
|
-
simplecov-html (0.
|
51
|
+
simplecov-html (~> 0.11)
|
52
|
+
simplecov_json_formatter (~> 0.1)
|
53
|
+
simplecov-html (0.12.3)
|
54
|
+
simplecov_json_formatter (0.1.2)
|
55
|
+
thor (1.0.1)
|
56
|
+
unicode-display_width (1.7.0)
|
23
57
|
|
24
58
|
PLATFORMS
|
25
59
|
ruby
|
26
60
|
|
27
61
|
DEPENDENCIES
|
62
|
+
bundle-audit
|
63
|
+
bundler
|
64
|
+
irb
|
28
65
|
minitest
|
29
66
|
mojo_magick!
|
30
67
|
rake
|
31
68
|
rspec-expectations
|
69
|
+
rubocop
|
70
|
+
rubocop-performance
|
32
71
|
simplecov
|
33
72
|
|
34
73
|
BUNDLED WITH
|
data/README.md
CHANGED
@@ -18,11 +18,11 @@ Using it
|
|
18
18
|
Add to your Gemfile
|
19
19
|
|
20
20
|
gem 'mojo_magick'
|
21
|
-
|
21
|
+
|
22
22
|
Require it in your ruby code
|
23
23
|
|
24
24
|
require 'mojo_magick'
|
25
|
-
|
25
|
+
|
26
26
|
Go to town! Check out a couple of simple [examples, here](examples/)
|
27
27
|
|
28
28
|
Examples
|
@@ -197,7 +197,7 @@ Availablility
|
|
197
197
|
Contributions
|
198
198
|
=============
|
199
199
|
|
200
|
-
Got a fix? Got a feature?
|
200
|
+
Got a fix? Got a feature?
|
201
201
|
|
202
202
|
* fork it
|
203
203
|
* make a branch (named appropriately)
|
@@ -211,6 +211,20 @@ in the new code
|
|
211
211
|
|
212
212
|
Recent Changes
|
213
213
|
==============
|
214
|
+
#### Version 0.6.0
|
215
|
+
|
216
|
+
* general cleanup and update gems - ready for ImageMagick 7
|
217
|
+
* dumped resource limit handling
|
218
|
+
* PR #29, #30
|
219
|
+
|
220
|
+
#### Version 0.5.6
|
221
|
+
|
222
|
+
* add `get_format` method to help with quoted source file
|
223
|
+
|
224
|
+
#### Version 0.5.5
|
225
|
+
|
226
|
+
* Refactor raw_command into execute! and execute methods so that for cases where we don't care about exit status, it can be easily ignored
|
227
|
+
|
214
228
|
#### Version 0.5.4
|
215
229
|
|
216
230
|
* Include image magick commandline failure from raw_command (on failure)
|
data/Rakefile
CHANGED
@@ -1,13 +1,22 @@
|
|
1
|
-
require
|
2
|
-
require
|
1
|
+
require "rubygems"
|
2
|
+
require "simplecov"
|
3
|
+
require "rake/testtask"
|
3
4
|
|
4
|
-
task default:
|
5
|
-
|
6
|
-
|
5
|
+
task default: [:test]
|
6
|
+
|
7
|
+
Rake::TestTask.new do |t|
|
8
|
+
t.libs = ["minitest"]
|
9
|
+
t.test_files = Dir.glob(File.join(File.dirname(__FILE__), "test/*_test.rb"))
|
10
|
+
t.verbose = true
|
7
11
|
end
|
8
12
|
|
9
|
-
desc
|
13
|
+
desc "Build gem"
|
10
14
|
task :build do
|
11
15
|
`rm mojo_magick-*.gem`
|
12
16
|
puts `gem build mojo_magick.gemspec`
|
13
17
|
end
|
18
|
+
|
19
|
+
desc "Release"
|
20
|
+
task release: :build do
|
21
|
+
puts `gem push mojo_magick-*.gem`
|
22
|
+
end
|
data/examples/animated_gif.rb
CHANGED
@@ -1,21 +1,19 @@
|
|
1
1
|
#!/usr/bin/env ruby
|
2
|
-
|
2
|
+
require "mojo_magick"
|
3
3
|
|
4
|
-
|
5
|
-
|
6
|
-
MojoMagick.convert(nil, 'animated.gif') do |c|
|
7
|
-
c.size '200x200'
|
4
|
+
MojoMagick.convert(nil, "animated.gif") do |c|
|
5
|
+
c.size "200x200"
|
8
6
|
c.delay 100
|
9
7
|
c.image_block do # first layer
|
10
|
-
c.background
|
11
|
-
c.fill
|
12
|
-
c.gravity
|
13
|
-
c.label
|
8
|
+
c.background "blue"
|
9
|
+
c.fill "white"
|
10
|
+
c.gravity "northwest"
|
11
|
+
c.label "NW"
|
14
12
|
end
|
15
13
|
c.image_block do # second layer
|
16
|
-
c.background
|
17
|
-
c.fill
|
18
|
-
c.gravity
|
19
|
-
c.label
|
14
|
+
c.background "transparent"
|
15
|
+
c.fill "red"
|
16
|
+
c.gravity "southeast"
|
17
|
+
c.label "SE"
|
20
18
|
end
|
21
19
|
end
|
data/examples/composite.rb
CHANGED
@@ -1,22 +1,20 @@
|
|
1
1
|
#!/usr/bin/env ruby
|
2
|
-
|
2
|
+
require "mojo_magick"
|
3
3
|
|
4
|
-
|
5
|
-
|
6
|
-
MojoMagick.convert(nil, 'composite_out.png') do |c|
|
7
|
-
c.size '200x200'
|
4
|
+
MojoMagick.convert(nil, "composite_out.png") do |c|
|
5
|
+
c.size "200x200"
|
8
6
|
c.delay 100
|
9
7
|
c.image_block do # first layer
|
10
|
-
c.background
|
11
|
-
c.fill
|
12
|
-
c.gravity
|
13
|
-
c.label
|
8
|
+
c.background "blue"
|
9
|
+
c.fill "white"
|
10
|
+
c.gravity "northwest"
|
11
|
+
c.label "NW"
|
14
12
|
end
|
15
13
|
c.image_block do # second layer
|
16
|
-
c.background
|
17
|
-
c.fill
|
18
|
-
c.gravity
|
19
|
-
c.label
|
14
|
+
c.background "transparent"
|
15
|
+
c.fill "red"
|
16
|
+
c.gravity "southeast"
|
17
|
+
c.label "SE"
|
20
18
|
end
|
21
19
|
c.composite
|
22
20
|
end
|
data/init.rb
CHANGED
@@ -1 +1 @@
|
|
1
|
-
require File.expand_path(File.join(File.dirname(__FILE__),
|
1
|
+
require File.expand_path(File.join(File.dirname(__FILE__), "lib", "mojo_magick"))
|
data/lib/image_magick/fonts.rb
CHANGED
@@ -3,12 +3,12 @@ module ImageMagick
|
|
3
3
|
def get_fonts
|
4
4
|
@parser ||= MojoMagick::Util::Parser.new
|
5
5
|
raw_fonts = begin
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
6
|
+
raw_command("identify", "-list font")
|
7
|
+
rescue Exception => e
|
8
|
+
puts e
|
9
|
+
puts "Failed to execute font list with raw_command - trying straight up execute"
|
10
|
+
`convert -list font`
|
11
|
+
end
|
12
12
|
@parser.parse_fonts(raw_fonts)
|
13
13
|
end
|
14
14
|
end
|