simple_magick 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84cec9598f800ccc7f0fdde507e3e4bbf6d7f016
-  data.tar.gz: 332b6a270e80603d51a87e32350f92d59a963bdd
+  metadata.gz: 17a0ccf6b375a6d032c7cea168ce30867532580e
+  data.tar.gz: acb2eab7b0dc8713ecea07d4f1d391245d2ec4f4
 SHA512:
-  metadata.gz: bdc31d9e883b830815eb7aea1ad211b63e274d58d6617895340aa3bf2297ae49ea74c0f6e5d66296a4d85eb7febbeaa460195b0b6ba9f7ec02925a94c3fc66fd
-  data.tar.gz: 2caf687984ace41542c206c90368bed7bb6bd29d539c7c9da03ef7702ea6c1d22920fb5ef0c13c667b8049770e6fa72e79f2ab8a2a9bec72fb3a86a34fa4d792
+  metadata.gz: 47228979a88460103432c84276653da6b27ea284f95035fd05bb3dcf5d060ef9ead0ed36204e9bfad93de18dd67817f574a30d892887c1c18a165452206c8465
+  data.tar.gz: 215efe784a35af263a9c2e486a98fa332451cc51b7d2d3d7d8283b847af5bd214f84e3d3d0ecfd7165b14f5f24fb93050ff0ed21292e2ed37c7e3ec71a0c28f7

data/.gitignore

@@ -1,9 +1,12 @@
 *.gem
 *.rbc
+*.DS_Store
 .bundle
 .idea
 .config
 .yardoc
+.*.un~
+.*.swp
 Gemfile.lock
 InstalledFiles
 _yardoc
@@ -13,7 +16,8 @@ lib/bundler/man
 pkg
 rdoc
 spec/reports
+spec/assets/result
 test/tmp
 test/version_tmp
 tmp
-bench/tmp
+bench/tmp

data/README.md

@@ -1,4 +1,4 @@
-# SimpleMagick
+# SimpleMagick [![Code Climate](https://codeclimate.com/github/sugamasao/simple_magick.png)](https://codeclimate.com/github/sugamasao/simple_magick)
 
 SimpleMagick is Ultra Simple ImageMagick Wrapper.
 

data/lib/simple_magick.rb

@@ -1,5 +1,6 @@
 require 'simple_magick/version'
 require 'simple_magick/image_magick'
+require 'simple_magick/utility'
 require 'fileutils'
 require 'open3'
 require 'shellwords'
@@ -11,7 +12,7 @@ module SimpleMagick
   # @note Windows Not Supported
   # @return [Boolean] find mogrify command is true
   def self.imagemagick_installed?
-    !`which #{ImageMagick::EXEC}`.split("\n").first.nil?
+    !`which #{ImageMagick::EXEC}`.split("\n").first.nil? unless Utility.windows?
   end
 
   # Convert Image Class.
@@ -35,16 +36,19 @@ module SimpleMagick
       __send__(:additional_option, method.to_s, args[0])
     end
 
-    # use other options.
+    # use options.
     # @param [String] option option name
     # @param [String] value option value. default = ''
     def additional_option(option, value = '')
-      @command << "-#{command_escape(option)} #{command_escape(value)}".strip
+      value = value.strip
+      @command << %Q(-#{option}).strip
+      @command.last << %Q( "#{value}") unless value.empty?
+      @command
     end
 
     # run ImageMagick.
     # @param [String] destination_path output image path
-    # @return [Void]
+    # @return [String] execute command
     # @raise [SimpleMagick::ConvertError] mogrify command fail.
     def convert!(destination_path)
       file_copy(destination_path)
@@ -61,6 +65,8 @@ module SimpleMagick
       unless status.success?
         raise ConvertError.new("#{ImageMagick::EXEC} error. exec command => [#{command}], stdout => [#{stdout}], stderr => [#{stderr}]")
       end
+
+      command
     end
 
     private
@@ -85,15 +91,12 @@ module SimpleMagick
     # @param [String] destination_path create image path
     # @return [String] command String.
     def create_command(command, destination_path)
-      command << Shellwords.escape(destination_path)
+      if Utility.windows?
+        command << destination_path
+      else
+        command << Shellwords.escape(destination_path)
+      end
       command.join(' ')
     end
-
-    # option string to CLI Escape.
-    # @return [String] escaped string
-    def command_escape(value)
-      string_value = value.to_s.strip
-      Shellwords.escape(string_value) unless string_value.empty?
-    end
   end
 end

data/lib/simple_magick/utility.rb

@@ -0,0 +1,9 @@
+module SimpleMagick
+  # Utility methods
+  class Utility
+    # @return [Boolean] true is Windows
+    def self.windows?
+      !!RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/
+    end
+  end
+end

data/lib/simple_magick/version.rb

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

data/spec/simple_magick_spec.rb

@@ -16,7 +16,7 @@ describe SimpleMagick do
 
         it 'set option and value' do
           image = SimpleMagick::Image.new(asset_path)
-          expect(image.additional_option('type', 'Grayscale').last).to eq '-type Grayscale'
+          expect(image.additional_option('type', 'Grayscale').last).to eq '-type "Grayscale"'
         end
 
         it 'set only option' do
@@ -57,7 +57,60 @@ describe SimpleMagick do
         end
       end
 
+      context 'create command remove ShellEscape and quote option' do
+        context '#3 draw option filed' do
+          let(:asset_path) { File.join(__dir__, 'assets', 'sample.jpg') }
+          let(:result_path) { File.join(__dir__, 'assets', 'result', 'resize.jpg') }
+
+          before do
+            result_dir = File.dirname(result_path)
+            FileUtils.rm_r(result_dir) if File.directory?(result_dir)
+          end
+
+          it 'draw option Success' do
+            image = SimpleMagick::Image.new(asset_path)
+            image.draw 'stroke #0000ff stroke-width 2 fill-opacity 0.0 rectangle 10,10 100,100'
+            image.convert! result_path
+            expect(File).to be_file(result_path)
+          end
+        end
+
+        context '#2 Windows filename type 8.1 filed(only windows)' do
+          let(:asset_path) { File.join(__dir__, 'assets', 'sample.jpg') }
+          let(:result_path) { File.join(__dir__, 'assets', 'result', 'AAA123~1.jpg') }
+
+          context 'Windows OS' do
+            before do
+              result_dir = File.dirname(result_path)
+              FileUtils.rm_r(result_dir) if File.directory?(result_dir)
+              SimpleMagick::Utility.stub(:windows?) { true }
+            end
+
+            it 'convert! success' do
+              image = SimpleMagick::Image.new(asset_path)
+              image.resize '150x'
+              expect(image.convert!(result_path).split(' ').last).to eq result_path
+              expect(File).to be_file(result_path)
+            end
+          end
+
+          context 'Not Windows OS' do
+            before do
+              result_dir = File.dirname(result_path)
+              FileUtils.rm_r(result_dir) if File.directory?(result_dir)
+              SimpleMagick::Utility.stub(:windows?) { false }
+            end
+
+            it 'convert! success' do
+              image = SimpleMagick::Image.new(asset_path)
+              image.resize '150x'
+              expect(image.convert!(result_path).split(' ').last).to eq Shellwords.escape(result_path)
+              expect(File).to be_file(result_path)
+            end
+          end
+        end
+      end
     end
   end
 
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_magick
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - sugamasao
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-11 00:00:00.000000000 Z
+date: 2014-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -111,6 +111,7 @@ files:
 - benchmark/benchmark.rb
 - lib/simple_magick.rb
 - lib/simple_magick/image_magick.rb
+- lib/simple_magick/utility.rb
 - lib/simple_magick/version.rb
 - simple_magick.gemspec
 - spec/assets/sample.jpg
@@ -136,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Simple ImageMagick Wrapper.