smartcropper 0.6.1 → 0.7.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YWUzYmVjMThjYjkyOGFlYTVkMzBlYzU3YmVmMjExMzBiOTlkMjYxNw==
+  data.tar.gz: !binary |-
+    YmMyNWFjMGM0NzAyNTAyMDM3NGU3ZDMzZDQ3NDQxOTYzYWY2NWNmYg==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    YmViZmU3NTY4YzVmNmQ5YjJmYmM3ZTkzZTM3YzRmZGVmNzE2YWFkODRhODNj
+    YjE5Y2E4MTQzMmM5MzFlMjcwYmE3ZDI2YWM1MmY5NDRhMTI3Njc5YjJkNjNk
+    ZWZmMDZhM2JlMDM2Nzg1NTQzZGJkNGQ3YjNjOGE3OWViYWFkMTQ=
+  data.tar.gz: !binary |-
+    MGZiZDMyNGI5NTJkODY2ZWQ0ZWY0MTM2ZDMyZjY3ZjUxMGE5ZmZiZmYzNWRj
+    NjBkOTg4ZTEwODg2MWJiNzE2NzVhMTYyNzcwODk2Njk3OWFiNjdiMzUyMTAy
+    MzgyMjFhZjNmYmEzNjc0NjJjMDU4NjJmNDliZDgyYjlkMzA5ZWM=

data/Gemfile

@@ -1,15 +1,3 @@
-source "http://rubygems.org"
-# Add dependencies required to use your gem here.
-# Example:
-#   gem "activesupport", ">= 2.3.5"
+source "https://rubygems.org"
 
-gem "rmagick"
-
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
-group :development do
-  gem "shoulda", ">= 0"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.5.2"
-  gem "rcov", ">= 0"
-end
+gemspec

data/Gemfile.lock

@@ -1,22 +1,48 @@
+PATH
+  remote: .
+  specs:
+    smartcropper (0.6.1)
+      rmagick (> 2.11.0)
+
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    git (1.2.5)
-    jeweler (1.5.2)
-      bundler (~> 1.0.0)
-      git (>= 1.2.5)
-      rake
+    activesupport (4.0.0)
+      i18n (~> 0.6, >= 0.6.4)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    atomic (1.1.10)
+    diff-lcs (1.2.4)
+    i18n (0.6.4)
+    minitest (4.7.5)
+    multi_json (1.7.7)
     rake (0.8.7)
-    rcov (0.9.9)
-    rmagick (2.13.1)
-    shoulda (2.11.3)
+    rmagick (2.13.2)
+    rspec (2.14.0)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.2)
+    rspec-expectations (2.14.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.1)
+    shoulda (3.5.0)
+      shoulda-context (~> 1.0, >= 1.0.1)
+      shoulda-matchers (>= 1.4.1, < 3.0)
+    shoulda-context (1.1.4)
+    shoulda-matchers (2.2.0)
+      activesupport (>= 3.0.0)
+    thread_safe (0.1.0)
+      atomic
+    tzinfo (0.3.37)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0.0)
-  jeweler (~> 1.5.2)
-  rcov
-  rmagick
+  rake
+  rspec
   shoulda
+  smartcropper!

data/README.md

@@ -17,7 +17,7 @@ File *uploaders/attachement_uploader.rb*:
 
     def smart_crop_and_scale(width, height)
       manipulate! do |img|
-        img = CropToelie.new(img)
+        img = SmartCropper.new(img)
         img = img.smart_crop_and_scale(width, height)
         img = yield(img) if block_given?
         img
@@ -48,8 +48,12 @@ File *uploaders/attachement_uploader.rb*:
 2011-04-18: Limit to N steps, instead of step_size.
 2011-04-16: Introduce tests and a profiler script, to profile performance.
 
-## Todo
-Improved algorythm: first @image.scale by F, investigate the entropy on that, most-interesting square by factor F is to-be-cropped area.
+## Roadmap
+
+1. Refactoring: It must be cleaned up. There is a lot of smelly code, fat methods and DRY.
+1. Performance: I want to make it smarter when cropping (really) large images.
+1. Improve slicing. The results are okay-ish when merely squaring images, but lack when you cut tiny areas from a large image.
+1. Release 1.0.0
 
 ## Copyright
 

data/Rakefile

@@ -2,6 +2,7 @@
 
 require 'rubygems'
 require 'bundler'
+
 begin
   Bundler.setup(:default, :development)
 rescue Bundler::BundlerError => e
@@ -9,25 +10,6 @@ rescue Bundler::BundlerError => e
   $stderr.puts "Run `bundle install` to install missing gems"
   exit e.status_code
 end
-require 'rake'
-
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "smartcropper"
-  gem.homepage = "http://github.com/berkes/smartcropper"
-  gem.license = "GPL"
-  gem.summary = %Q{Content aware cropper.}
-  gem.description = %Q{Crops images based on entropy: leaving the most interesting part intact. Don't expect this to be a replacement for human cropping, it is an algorythm and not an extremely smart one at that :). Best results achieved in combination with scaling: the cropping is then only used to square the image, cutting off the least interesting part. The trimming simply chops off te edge that is least interesting, and continues doing so, untill it reached the requested size.}
-  gem.email = "ber@webschuur.com"
-  gem.authors = ["Bèr Kessels"]
-  # Include your dependencies below. Runtime dependencies are required when using your gem,
-  # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
-  
-  gem.add_runtime_dependency 'rmagick', '> 2.11.0'
-  #  gem.add_development_dependency 'rspec', '> 1.2.3'
-end
-Jeweler::RubygemsDotOrgTasks.new
 
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
@@ -35,14 +17,6 @@ Rake::TestTask.new(:test) do |test|
   test.pattern = 'test/**/test_*.rb'
   test.verbose = true
 end
-
-require 'rcov/rcovtask'
-Rcov::RcovTask.new do |test|
-  test.libs << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-
 task :default => :test
 
 require 'rake/rdoctask'

data/VERSION

@@ -1 +1 @@
-0.6.1
+0.7.0

data/lib/smartcropper.rb

@@ -2,7 +2,7 @@ require 'RMagick'
 class SmartCropper
   include Magick
 
-  attr_accessor :orig
+  attr_accessor :image
   attr_accessor :steps
 
   # Create a new SmartCropper object from a ImageList single image object.
@@ -14,7 +14,7 @@ class SmartCropper
     @steps  = 10
 
     # Preprocess image.
-    @image = @image.quantize
+    @quantized_image = @image.quantize
 
     # Prepare some often-used internal variables.
     @rows = @image.rows
@@ -83,8 +83,8 @@ class SmartCropper
         while (width > requested_x)
           slice_width = [(width - requested_x), step_size].min
 
-          left_entropy  = entropy_slice(@image, left, 0, slice_width, bottom)
-          right_entropy = entropy_slice(@image, (right - slice_width), 0, slice_width, bottom)
+          left_entropy  = entropy_slice(@quantized_image, left, 0, slice_width, bottom)
+          right_entropy = entropy_slice(@quantized_image, (right - slice_width), 0, slice_width, bottom)
 
           #remove the slice with the least entropy
           if left_entropy < right_entropy
@@ -100,8 +100,8 @@ class SmartCropper
         while (height > requested_y)
           slice_height = [(height - step_size), step_size].min
 
-          top_entropy    = entropy_slice(@image, 0, top, @columns, slice_height)
-          bottom_entropy = entropy_slice(@image, 0, (bottom - slice_height), @columns, slice_height)
+          top_entropy    = entropy_slice(@quantized_image, 0, top, @columns, slice_height)
+          bottom_entropy = entropy_slice(@quantized_image, 0, (bottom - slice_height), @columns, slice_height)
 
           #remove the slice with the least entropy
           if top_entropy < bottom_entropy

data/smartcropper.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{smartcropper}
-  s.version = "0.6.1"
+  s.version = "0.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bèr Kessels"]
@@ -17,8 +17,6 @@ Gem::Specification.new do |s|
     "README.md"
   ]
   s.files = [
-    ".document",
-    ".rvmrc",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",
@@ -33,38 +31,10 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.5.2}
   s.summary = %q{Content aware image cropping in Ruby and Carrierwave}
-  s.test_files = [
-    "test/helper.rb",
-    "test/profiler.rb",
-    "test/test_croptoelie.rb",
-    "test/fixtures/*"
-  ]
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
+  s.test_files = `git ls-files test`.split("\n")
+  s.add_dependency(%q<rmagick>, ["> 2.11.0"])
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rmagick>, [">= 0"])
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
-      s.add_runtime_dependency(%q<rmagick>, ["> 2.11.0"])
-    else
-      s.add_dependency(%q<rmagick>, [">= 0"])
-      s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_dependency(%q<rcov>, [">= 0"])
-      s.add_dependency(%q<rmagick>, ["> 2.11.0"])
-    end
-  else
-    s.add_dependency(%q<rmagick>, [">= 0"])
-    s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-    s.add_dependency(%q<rcov>, [">= 0"])
-    s.add_dependency(%q<rmagick>, ["> 2.11.0"])
-  end
+  s.add_development_dependency('rake', [">= 0"])
+  s.add_development_dependency('rspec', [">= 0"])
+  s.add_development_dependency('shoulda', [">= 0"])
 end
-

data/test/test_croptoelie.rb

@@ -59,6 +59,12 @@ class TestSmartcropper < Test::Unit::TestCase
     assert_equal([19, 19], size)
   end
 
+  should "return original image, not quantized" do
+    img = SmartCropper.new(@image)
+    assert_equal(img.image, @image)
+  end
+
+
   ###########################################################################
   #                   Images reported to fail by issue #5                   #
   ###########################################################################

metadata

@@ -1,36 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: smartcropper
 version: !ruby/object:Gem::Version
-  version: 0.6.1
-  prerelease: 
+  version: 0.7.0
 platform: ruby
 authors:
 - Bèr Kessels
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-28 00:00:00.000000000 Z
+date: 2011-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmagick
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ! '>'
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ! '>'
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.11.0
 - !ruby/object:Gem::Dependency
-  name: shoulda
+  name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,47 +34,27 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rcov
+  name: shoulda
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -86,33 +62,12 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rmagick
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>'
-      - !ruby/object:Gem::Version
-        version: 2.11.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>'
-      - !ruby/object:Gem::Version
-        version: 2.11.0
 description: ! 'Crops images based on entropy: leaving the most interesting part intact.
-  Don''t expect this to be a replacement for human cropping, it is an algorythm and
-  not an extremely smart one at that :). Best results achieved in combination with
-  scaling: the cropping is then only used to square the image, cutting off the least
-  interesting part. The trimming simply chops off te edge that is least interesting,
-  and continues doing so, untill it reached the requested size.'
+  Usefull for automatic cropping or resizing of images. '
 email: ber@webschuur.com
 executables: []
 extensions: []
@@ -120,15 +75,14 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.md
 files:
-- .document
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
 - VERSION
-- lib/smartcropper.rb
 - smartcropper.gemspec
+- lib/smartcropper.rb
 - test/fixtures/20x20.png
 - test/fixtures/entropyish.png
 - test/fixtures/entropyish.txt
@@ -139,35 +93,39 @@ files:
 - test/helper.rb
 - test/profiler.rb
 - test/test_croptoelie.rb
-homepage: http://github.com/berkes/smartcropper
+homepage: http://berk.es/smartcropper
 licenses:
 - GPL
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -779265411
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
-summary: Content aware cropper.
+specification_version: 4
+summary: Content aware image cropping in Ruby and Carrierwave
 test_files:
+- test/fixtures/20x20.png
+- test/fixtures/entropyish.png
+- test/fixtures/entropyish.txt
+- test/fixtures/errors/flo-rida.png
+- test/fixtures/errors/hollywood-undead.jpg
+- test/fixtures/errors/maroon-5.jpg
+- test/fixtures/errors/yo-gotti.jpg
 - test/helper.rb
 - test/profiler.rb
 - test/test_croptoelie.rb
+has_rdoc: 

data/.document

@@ -1,5 +0,0 @@
-lib/**/*.rb
-bin/*
-- 
-features/**/*.feature
-LICENSE.txt