carrierwave-processing 0.0.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c9a94a24df430088e2085fe3bedcea17277689e
-  data.tar.gz: 1c356228b5cb59e6abf9415ec87d1bcd05cad95d
+  metadata.gz: 692153452bc341564f11b2a70cdbc033c160fdd7
+  data.tar.gz: 9e60ff3332b29d57d6300750602bbcc5c94bba41
 SHA512:
-  metadata.gz: 5ed8e1b6e403b9b4587df8404294144864e901ccf17768a2160395d8703e6bbf8d59db5bc55e18ce5243a7bf597cb7ad5f39a73b6bcb29544ea853b86bbb7893
-  data.tar.gz: d52906ce12f210314eccaed7ee3302e14371ee9c6cc8a5c2dfef6d3ca52366e4925cebe46b7331a5e6a3ba274bdd1267947387383e6d01649fc04f80561b82c5
+  metadata.gz: 8956fa5709c9c8aab3bed8c7dfc7e269b8ce4f253ff6b22bdb25aacf6af5ab48d2813d2e5eabdb52f91b975b95cc83e748f844d9c655fb683eab38972e63f964
+  data.tar.gz: 1d89786ba670ff71e99facdd6178a4139c939e6e3b445fb0a277ee28f00aa4ac89f1949c4ab9da9558b4da1c74994a96c48e0b75801350a4a2ab5a986e799daa

data/.gitignore

@@ -4,6 +4,8 @@
 .config
 .yardoc
 .rvmrc
+.ruby-version
+.ruby-gemset
 Gemfile.lock
 InstalledFiles
 _yardoc
@@ -16,3 +18,5 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+spec/uploads
+uploads

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--format documentation

data/.travis.yml

@@ -0,0 +1,6 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - 2.1.0
+  - jruby-19mode

data/README.md

@@ -1,5 +1,7 @@
 # CarrierWave::Processing
 
+[![Travis CI](https://secure.travis-ci.org/fxposter/carrierwave-processing.png)](http://travis-ci.org/fxposter/carrierwave-processing)
+
 Additional processing support for MiniMagick and RMagick. These are processors that I've been using in multiple projects so I decided to extract those as a gem.
 
 ## Installation
@@ -30,6 +32,7 @@ To use those, you should include specified module (RMagick or MiniMagick) into y
       process :quality => 90 # Set JPEG/MIFF/PNG compression level (0-100)
       process :convert => 'png'
       process :colorspace => :rgb # Set colorspace to rgb or cmyk
+      process :blur => [0, 8] #reduce image noise and reduce detail levels [radius,sigma]
 
       def filename
         super.chomp(File.extname(super)) + '.png'

data/Rakefile

@@ -1,2 +1,8 @@
 #!/usr/bin/env rake
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec) do |spec|
+end
+
+task :default => :spec

data/carrierwave-processing.gemspec

@@ -16,4 +16,8 @@ Gem::Specification.new do |gem|
   gem.version       = CarrierWave::Processing::VERSION
 
   gem.add_dependency 'carrierwave'
+  gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'rspec', '~> 3.0.0.beta1'
+  gem.add_development_dependency 'mini_magick'
+  gem.add_development_dependency 'rmagick' if RUBY_PLATFORM != 'java'
 end

data/lib/carrierwave-processing/mini_magick.rb

@@ -2,6 +2,9 @@ module CarrierWave
   module Processing
     module MiniMagick
       # Strips out all embedded information from the image
+      #
+      #   process :strip
+      #
       def strip
         manipulate! do |img|
           img.strip
@@ -11,6 +14,9 @@ module CarrierWave
       end
 
       # Reduces the quality of the image to the percentage given
+      #
+      #   process :quality => 90
+      #
       def quality(percentage)
         manipulate! do |img|
           img.quality(percentage.to_s)
@@ -20,23 +26,37 @@ module CarrierWave
       end
 
       # Sets the colorspace of the image to the specified value.
-      # 
-      #   process :rgb # force rgb
-      #   process :cmyk # force cmyk
-      # 
+      #
+      #   process :colorspace => :rgb # force rgb
+      #   process :colorspace => :cmyk # force cmyk
+      #
       def colorspace(cs)
         manipulate! do |img|
-          case cs.to_sym
-          when :rgb
-            img.colorspace = "RGBColorspace"
-          when :cmyk
-            img.colorspace = "CMYKColorspace"
+          img.combine_options do |c|
+            case cs.to_sym
+            when :rgb
+              c.colorspace "sRGB"
+            when :cmyk
+              c.colorspace "CMYK"
+            end
           end
           img = yield(img) if block_given?
           img
         end
       end
 
+      # reduce image noise and reduce detail levels
+      #
+      #   process :blur => [0, 8]
+      #
+      def blur(radius, sigma)
+        manipulate! do |img|
+          img.blur "#{radius}x#{sigma}"
+          img = yield(img) if block_given?
+          img
+        end
+      end
+
     end
   end
 end

data/lib/carrierwave-processing/rmagick.rb

@@ -2,6 +2,9 @@ module CarrierWave
   module Processing
     module RMagick
       # Strips out all embedded information from the image
+      #
+      #   process :strip
+      #
       def strip
         manipulate! do |img|
           img.strip!
@@ -11,6 +14,9 @@ module CarrierWave
       end
 
       # Reduces the quality of the image to the percentage given
+      #
+      #   process :quality => 90
+      #
       def quality(percentage)
         manipulate! do |img|
           img.write(current_path){ self.quality = percentage }
@@ -20,10 +26,10 @@ module CarrierWave
       end
 
       # Sets the colorspace of the image to the specified value.
-      # 
-      #   process :rgb # force rgb
-      #   process :cmyk # force cmyk
-      # 
+      #
+      #   process :colorspace => :rgb # force rgb
+      #   process :colorspace => :cmyk # force cmyk
+      #
       def colorspace(cs)
         manipulate! do |img|
           case cs.to_sym
@@ -37,6 +43,19 @@ module CarrierWave
         end
       end
 
+
+      # reduce image noise and reduce detail levels
+      #
+      #   process :blur => [0, 8]
+      #
+      def blur(radius, sigma)
+        manipulate! do |img|
+          img = img.blur_image(radius, sigma)
+          img = yield(img) if block_given?
+          img
+        end
+      end
+
     end
   end
 end

data/lib/carrierwave-processing/version.rb

@@ -1,5 +1,5 @@
 module CarrierWave
   module Processing
-    VERSION = '0.0.2'
+    VERSION = '1.0.0'
   end
 end

data/spec/integration/carrierwave_processing_spec.rb

@@ -0,0 +1,106 @@
+require 'carrierwave'
+require 'carrierwave-processing'
+
+require 'spec_helper'
+
+working_module_names = (RUBY_PLATFORM == 'java' ? %w[MiniMagick] : %w[RMagick MiniMagick])
+
+working_module_names.each do |module_name|
+  describe CarrierWave::Processing.const_get(module_name) do
+    before do
+      FileUtils.rm_rf(fixture_path('uploads'))
+    end
+
+    it 'strips image metadata' do
+      uploader = uploader_for(module_name) {
+        process :strip
+      }
+
+      expect(exif(fixture_path('little_foxes.jpg'), 'Artist')).not_to be_empty
+
+      open_fixture 'little_foxes.jpg' do |file|
+        uploader.store!(file)
+      end
+
+      expect(exif(uploader.store_path, 'Artist')).to be_empty
+    end
+
+    it 'reduces image quality' do
+      uploader = uploader_for(module_name) {
+        process :quality => 50
+      }
+
+      open_fixture 'little_foxes.jpg' do |file|
+        uploader.store!(file)
+      end
+
+      expect(File.size(uploader.store_path)).to be < File.size(fixture_path('little_foxes.jpg'))
+    end
+
+    it 'changes image colorspace to CMYK' do
+      uploader = uploader_for(module_name) {
+        process :colorspace => :cmyk
+      }
+
+      expect(colorspace(fixture_path('little_foxes.jpg'))).to include('RGB')
+
+      open_fixture 'little_foxes.jpg' do |file|
+        uploader.store!(file)
+      end
+
+      expect(colorspace(uploader.store_path)).to eq('CMYK')
+    end
+
+    it 'changes image colorspace to sRGB' do
+      uploader = uploader_for(module_name) {
+        process :colorspace => :rgb
+      }
+
+      expect(colorspace(fixture_path('little_foxes_cmyk.jpg'))).to eq('CMYK')
+
+      open_fixture 'little_foxes_cmyk.jpg' do |file|
+        uploader.store!(file)
+      end
+
+      expect(colorspace(uploader.store_path)).to include('RGB')
+    end
+
+    it 'blurs image' do
+      uploader = uploader_for(module_name) {
+        process :blur => [5, 5]
+      }
+
+      open_fixture 'little_foxes.jpg' do |file|
+        uploader.store!(file)
+      end
+
+      expect(File.size(uploader.store_path)).to be < File.size(fixture_path('little_foxes.jpg'))
+    end
+  end
+end
+
+describe CarrierWave::Processing do
+  before do
+    FileUtils.rm_rf(fixture_path('uploads'))
+  end
+
+  it 'produces the same transformations for all modules' do
+    uploaders = working_module_names.map { |module_name|
+      uploader_for(module_name) {
+        process :strip
+        process :quality => 90
+        process :blur => [0, 2]
+        process :colorspace => :cmyk
+      }
+    }
+
+    uploaders.each do |uploader|
+      open_fixture 'little_foxes.jpg' do |file|
+        uploader.store!(file)
+      end
+    end
+
+    files = uploaders.map { |uploader| File.open(uploader.store_path, 'rb', &:read) }
+    expect(files).to be_all { |file| file == files[0] }
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,41 @@
+require 'fileutils'
+
+module Helpers
+  def fixture_path(filename)
+    File.expand_path(File.join('..', 'fixtures', filename), __FILE__)
+  end
+
+  def open_fixture(filename, &block)
+    File.open(fixture_path(filename), &block)
+  end
+
+  def exif(path, field)
+    `identify -format %[exif:#{field}] #{path}`.chomp
+  end
+
+  def colorspace(path)
+    `identify -verbose #{path} | grep 'Colorspace'`.chomp.split(':').last.strip
+  end
+
+  def uploader_for(module_name, &block)
+    Class.new(CarrierWave::Uploader::Base) {
+      include Helpers
+      include CarrierWave.const_get(module_name)
+      include CarrierWave::Processing.const_get(module_name)
+
+      instance_eval(&block)
+
+      define_method :store_dir do
+        File.expand_path(File.join('..', 'uploads'), __FILE__)
+      end
+
+      define_method :filename do
+        "#{module_name}#{File.extname(super())}" if original_filename.present?
+      end
+    }.new
+  end
+end
+
+RSpec.configure do |config|
+  config.include Helpers
+end

metadata

@@ -1,27 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-processing
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Pavel Forkert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-14 00:00:00.000000000 Z
+date: 2014-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  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'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.0.beta1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.0.beta1
+- !ruby/object:Gem::Dependency
+  name: mini_magick
+  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'
+- !ruby/object:Gem::Dependency
+  name: rmagick
+  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: Additional processing support for MiniMagick and RMagick
@@ -31,7 +87,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -41,6 +99,10 @@ files:
 - lib/carrierwave-processing/mini_magick.rb
 - lib/carrierwave-processing/rmagick.rb
 - lib/carrierwave-processing/version.rb
+- spec/fixtures/little_foxes.jpg
+- spec/fixtures/little_foxes_cmyk.jpg
+- spec/integration/carrierwave_processing_spec.rb
+- spec/spec_helper.rb
 homepage: https://github.com/fxposter/carrierwave-processing
 licenses: []
 metadata: {}
@@ -50,18 +112,23 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Additional processing support for MiniMagick and RMagick
-test_files: []
+test_files:
+- spec/fixtures/little_foxes.jpg
+- spec/fixtures/little_foxes_cmyk.jpg
+- spec/integration/carrierwave_processing_spec.rb
+- spec/spec_helper.rb
+has_rdoc: