simple_magick 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8721a16bca3964f1c9b62ecff896d1c3b51bfaf3
-  data.tar.gz: 7b5e87b257feca6d8ad365d463ab99b8cb361539
+  metadata.gz: 84cec9598f800ccc7f0fdde507e3e4bbf6d7f016
+  data.tar.gz: 332b6a270e80603d51a87e32350f92d59a963bdd
 SHA512:
-  metadata.gz: 19a617f50e2f1583c82d4f22c95069b0dc4402c2eac8e128f900eb54c8eb2d6fcbbe9b1f4151f323db10fe92d7ff06b01c1da32292201055ab9cd214ca89b5e3
-  data.tar.gz: e28ac9c440dcd50b3ea36b1c1a8f62cf8884a68bb4ae8ac677d1e0719a55ca17875fb868fb65b42b452aec2d458e7ecf1aa0a28b25315ca42eb0f4e5d02df4bd
+  metadata.gz: bdc31d9e883b830815eb7aea1ad211b63e274d58d6617895340aa3bf2297ae49ea74c0f6e5d66296a4d85eb7febbeaa460195b0b6ba9f7ec02925a94c3fc66fd
+  data.tar.gz: 2caf687984ace41542c206c90368bed7bb6bd29d539c7c9da03ef7702ea6c1d22920fb5ef0c13c667b8049770e6fa72e79f2ab8a2a9bec72fb3a86a34fa4d792

data/README.md

@@ -14,7 +14,7 @@ requirements ImageMagick(use mogrify command)
 
 Add this line to your application's Gemfile:
 
-    gem 'simple_magick', github: 'sugamasao/simple_magick'
+    gem 'simple_magick'
 
 And then execute:
 

data/Rakefile

@@ -1 +1,45 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
+require 'pathname'
+
+desc 'generate SimpleMagick DATA of mogrify option'
+task :generate_option do |t|
+  version_string = `mogrify -version`
+  version_line   = version_string.split("\n").first
+  version_line   =~ /\AVersion:\s(.+\s.+\s.+\s.+\s)/
+  version        = $1
+
+  options_string = `mogrify`
+  options = options_string.split("\n").map { |line|
+    if line.strip =~ /\A-(\w.+?)\s/
+      $1
+    end
+  }.compact.sort
+
+  image_magick = ''
+  image_magick << <<EOS
+module SimpleMagick
+
+  # Don't manually modified!! (generate by $ rake generate_option)
+  # Generate Date #{Time.now}
+  # ImageMagick Version: #{version}
+  module ImageMagick
+    EXEC = 'mogrify'
+
+    OPTIONS = %w(
+EOS
+  options.each_slice(5) do |opt|
+    image_magick << opt.join(' ')
+    image_magick << "\n"
+  end
+  image_magick << <<EOS
+    )
+  end
+end
+EOS
+
+  image_magick_path = Pathname(__dir__).join('lib', 'simple_magick', 'image_magick.rb').expand_path
+  File.open(image_magick_path, 'w') do |file|
+    file.puts image_magick
+  end
+  puts "Generate File ImageMagick Options. (#{image_magick_path})"
+end

data/lib/simple_magick.rb

@@ -1,4 +1,5 @@
 require 'simple_magick/version'
+require 'simple_magick/image_magick'
 require 'fileutils'
 require 'open3'
 require 'shellwords'
@@ -10,7 +11,7 @@ module SimpleMagick
   # @note Windows Not Supported
   # @return [Boolean] find mogrify command is true
   def self.imagemagick_installed?
-    !`which mogrify`.split("\n").first.nil?
+    !`which #{ImageMagick::EXEC}`.split("\n").first.nil?
   end
 
   # Convert Image Class.
@@ -25,22 +26,13 @@ module SimpleMagick
     def initialize(source_path, verbose = false)
       @source_path = source_path
       @verbose     = verbose
-      @command     = ['mogrify']
+      @command     = [ImageMagick::EXEC]
     end
 
-    # @param [String] size resize size
-    def resize(size)
-      @command << "-resize #{command_escape(size)}"
-    end
-
-    # @param [String] num image quality
-    def quality(num)
-      @command << "-quality #{command_escape(num)}"
-    end
-
-    # @param [String] string define string.
-    def define(string)
-      @command << "-define #{command_escape(string)}"
+    # set option
+    def method_missing(method, *args)
+      super unless ImageMagick::OPTIONS.include? method.to_s
+      __send__(:additional_option, method.to_s, args[0])
     end
 
     # use other options.
@@ -63,11 +55,11 @@ module SimpleMagick
         puts "[INFO] #{command}" if @verbose
         stdout, stderr, status = Open3.capture3(command)
       rescue SystemCallError => e
-        raise ConvertError.new("mogrify error. exec command => [#{command}], Error Detail => [#{e.message}]")
+        raise ConvertError.new("#{ImageMagick::EXEC} error. exec command => [#{command}], Error Detail => [#{e.message}]")
       end
 
       unless status.success?
-        raise ConvertError.new("mogrify error. exec command => [#{command}], stdout => [#{stdout}], stderr => [#{stderr}]")
+        raise ConvertError.new("#{ImageMagick::EXEC} error. exec command => [#{command}], stdout => [#{stdout}], stderr => [#{stderr}]")
       end
     end
 

data/lib/simple_magick/image_magick.rb

@@ -0,0 +1,62 @@
+module SimpleMagick
+
+  # Don't manually modified!! (generate by $ rake generate_option)
+  # Generate Date 2014-03-11 23:34:56 +0900
+  # ImageMagick Version: ImageMagick 6.8.7-7 Q16 x86_64 2013-11-27 
+  module ImageMagick
+    EXEC = 'mogrify'
+
+    OPTIONS = %w(
+adaptive-blur adaptive-resize adaptive-sharpen adjoin affine
+affinity alpha alpha annotate antialias
+append attenuate authenticate auto-gamma auto-level
+auto-orient background bench bias black-threshold
+blue-primary blue-shift blur border bordercolor
+bordercolor brightness-contrast caption cdl cdl
+channel charcoal chop clamp clip
+clip-mask clip-path clut coalesce color-matrix
+colorize colors colorspace combine comment
+compare complex compose composite compress
+contrast contrast-stretch convolve crop cycle
+debug decipher decipher deconstruct define
+delay delete density depth deskew
+despeckle direction display dispose distort
+distribute-cache dither draw duplicate edge
+emboss encipher encipher encoding endian
+enhance equalize evaluate evaluate-sequence extent
+extract family features features fft
+fill filter flatten flatten flip
+floodfill flop font format frame
+function function fuzz fx gamma
+gaussian-blur geometry gravity grayscale green-primary
+hald-clut help help identify ift
+implode insert intensity intent interlace
+interline-spacing interpolate interword-spacing kerning label
+lat layers layers level level-colors
+limit linear-stretch liquid-rescale list log
+loop magnify mask matte mattecolor
+median mode modulate monitor monochrome
+morph morphology morphology mosaic motion-blur
+negate noise normalize opaque ordered-dither
+orient page paint path perceptible
+ping pointsize polaroid poly posterize
+precision preview print process profile
+quality quantize quiet radial-blur raise
+random-threshold red-primary regard-warnings region remap
+render repage resample resize respect-parentheses
+reverse roll rotate sample sampling-factor
+scale scene seed segment selective-blur
+separate sepia-tone set shade shadow
+sharpen shave shear sigmoidal-contrast size
+sketch smush solarize sparse-color splice
+spread statistic stretch strip stroke
+strokewidth style swap swirl synchronize
+taint texture threshold thumbnail tile
+tile-offset tint transform transparent transparent-color
+transpose transverse treedepth trim type
+undercolor unique-colors units unsharp verbose
+version view vignette virtual-pixel wave
+weight white-point white-threshold write
+    )
+  end
+end

data/lib/simple_magick/version.rb

@@ -1,3 +1,3 @@
 module SimpleMagick
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

data/simple_magick.gemspec

@@ -23,4 +23,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "yard"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "simplecov"
+  spec.add_development_dependency "pry"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_magick
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - sugamasao
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-08 00:00:00.000000000 Z
+date: 2014-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Simple ImageMagick Wrapper.
 email:
 - sugamasao@gmail.com
@@ -96,6 +110,7 @@ files:
 - benchmark/Gemfile
 - benchmark/benchmark.rb
 - lib/simple_magick.rb
+- lib/simple_magick/image_magick.rb
 - lib/simple_magick/version.rb
 - simple_magick.gemspec
 - spec/assets/sample.jpg