carrierwave-imagesorcery 0.0.3 → 0.0.4

data/.gitignore

@@ -3,7 +3,6 @@
 .bundle
 .config
 .yardoc
-Gemfile.lock
 InstalledFiles
 _yardoc
 coverage
@@ -15,3 +14,5 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+
+.DS_Store

data/.travis.yml

@@ -0,0 +1,17 @@
+language: ruby
+rvm:
+ - 1.8.7
+ - 1.9.2
+ - 1.9.3
+ - ruby-head
+ - jruby
+ - rbx
+ - ree
+
+before_install:
+ - sudo apt-get update -qq
+ - sudo apt-get install -qq -y imagemagick
+
+matrix:
+  allow_failures:
+    - rvm: ruby-head

data/Gemfile.lock

@@ -0,0 +1,43 @@
+PATH
+  remote: .
+  specs:
+    carrierwave-imagesorcery (0.0.3)
+      carrierwave
+      image_sorcery
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (3.2.9)
+      activesupport (= 3.2.9)
+      builder (~> 3.0.0)
+    activesupport (3.2.9)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    builder (3.0.4)
+    carrierwave (0.7.1)
+      activemodel (>= 3.2.0)
+      activesupport (>= 3.2.0)
+    diff-lcs (1.1.3)
+    i18n (0.6.1)
+    image_sorcery (1.0.7)
+    multi_json (1.5.0)
+    rake (10.0.3)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.2)
+    rspec-expectations (2.12.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.12.1)
+    subexec (0.2.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  carrierwave-imagesorcery!
+  rake (~> 10.0.2)
+  rspec (~> 2.12.0)
+  subexec (~> 0.2.2)

data/README.md

@@ -2,6 +2,9 @@
 
 Additional processing to use [ImageSorcery](https://github.com/EricR/image_sorcery) into [CarrierWave](https://github.com/jnicklas/carrierwave).
 
+[![Build Status](https://travis-ci.org/WaYdotNET/carrierwave-imagesorcery.png)](https://travis-ci.org/WaYdotNET/carrierwave-imagesorcery)
+[![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/WaYdotNET/carrierwave-imagesorcery)
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/carrierwave-imagesorcery.gemspec

@@ -10,7 +10,9 @@ Gem::Specification.new do |gem|
 
   gem.extra_rdoc_files = ["README.md"]
   gem.rdoc_options = ["--main"]
-  gem.add_development_dependency "rspec"
+  gem.add_development_dependency 'rspec', '~> 2.12.0'
+  gem.add_development_dependency 'rake','~> 10.0.2'
+  gem.add_development_dependency 'subexec', '~> 0.2.2'
 
   gem.add_dependency 'carrierwave'
   gem.add_dependency 'image_sorcery'

data/lib/carrierwave-imagesorcery/image_sorcery.rb

@@ -155,8 +155,18 @@ module CarrierWave
       cache_stored_file! if !cached?
       image = Sorcery.new current_path
       image = yield(image)
+
+      replace_file(image.file) if !image.is_a?(Hash) && image.filename_changed?
+
+      image
     rescue RuntimeError, StandardError => e
       raise CarrierWave::ProcessingError , I18n.translate(:"errors.messages.imagesorcery_processing_error", :e => e)
     end
+
+    private
+
+    def replace_file(file)
+      FileUtils.move Dir.glob(file).first, current_path
+    end
   end
 end

data/lib/carrierwave-imagesorcery/version.rb

@@ -1,5 +1,5 @@
 module CarrierWave
   module ImageSorcery
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

data/spec/lib/carrierwave-imagesorcery/image_sorcery_spec.rb

@@ -20,13 +20,13 @@ describe CarrierWave::ImageSorcery do
   end
 
   after do
-    FileUtils.rm(file_path('landscape_copy.jpg'))
+    FileUtils.rm([file_path('landscape_copy.jpg'), file_path('landscape_copy.png')], :force => true)
   end
 
   describe "#convert" do
     it "should convert from one format to another" do
-      @instance.convert('foo.png')
-      img = Sorcery.new file_path('foo.png')
+      @instance.convert('png')
+      img = Sorcery.new @instance.current_path
       img.identify.should =~ /PNG/
     end
   end

data/spec/spec_helper.rb

@@ -1,6 +1,4 @@
 require 'rubygems' unless defined? Gem
-# require 'minitest' if RUBY_VERSION < "1.9"
-
 # we need the actual library file
 # require_relative '../lib/ms_translate'
 # For Ruby < 1.9.3, use this instead of require_relative
@@ -8,13 +6,11 @@ require 'bundler/setup'
 require 'carrierwave'
 
 require(File.expand_path('../../lib/carrierwave-imagesorcery', __FILE__))
-require 'minitest/autorun'
-
 
 def file_path(*paths)
   File.expand_path(File.join(File.dirname(__FILE__), 'fixtures', *paths))
 end
 
 def check_dimension(x, y)
-  {:x => "#{x}", :y => "#{y}"}
+  {:x => x, :y => y}
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-imagesorcery
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,56 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-23 00:00:00.000000000 Z
+date: 2012-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.12.0
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 10.0.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 10.0.2
+- !ruby/object:Gem::Dependency
+  name: subexec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.2.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.2.2
 - !ruby/object:Gem::Dependency
   name: carrierwave
   requirement: !ruby/object:Gem::Requirement
@@ -68,7 +100,9 @@ extra_rdoc_files:
 - README.md
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -77,7 +111,6 @@ files:
 - lib/carrierwave-imagesorcery/image_sorcery.rb
 - lib/carrierwave-imagesorcery/version.rb
 - spec/fixtures/landscape.jpg
-- spec/lib/carrierwave-imagesorcery/image_sorcery.rb
 - spec/lib/carrierwave-imagesorcery/image_sorcery_spec.rb
 - spec/spec_helper.rb
 homepage: http://www.waydotnet.com
@@ -101,13 +134,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: ImageSorcery carrierwave processor
 test_files:
 - spec/fixtures/landscape.jpg
-- spec/lib/carrierwave-imagesorcery/image_sorcery.rb
 - spec/lib/carrierwave-imagesorcery/image_sorcery_spec.rb
 - spec/spec_helper.rb
 has_rdoc: 

data/spec/lib/carrierwave-imagesorcery/image_sorcery.rb

@@ -1,111 +0,0 @@
-# # require_relative '../../spec_helper'
-# # For Ruby < 1.9.3, use this instead of require_relative
-require (File.expand_path('./../../../spec_helper', __FILE__))
-
-describe CarrierWave::ImageSorcery do
-
-  before do
-    @klass = Class.new do
-      include CarrierWave::ImageSorcery
-    end
-    @instance = @klass.new
-    FileUtils.cp(file_path('landscape.jpg'), file_path('landscape_copy.jpg'))
-    @instance.stub(:current_path).and_return(file_path('landscape_copy.jpg'))
-    @instance.stub(:cached?).and_return true
-  end
-
-  after do
-    FileUtils.rm(file_path('landscape_copy.jpg'))
-  end
-
-  describe "#convert" do
-    it "should convert from one format to another" do
-      @instance.convert('foo.png')
-      # img = ::MiniMagick::Image.open(@instance.current_path)
-      img = Sorcery.new @istance.current_path
-      identify= img.identify
-      identify.should =~ /PNG/
-    end
-  end
-
-  describe '#resize_to_fill' do
-    it "should resize the image to exactly the given dimensions" do
-      @instance.resize_to_fill(200, 200)
-      @instance.should have_dimensions(200, 200)
-    end
-
-    it "should scale up the image if it smaller than the given dimensions" do
-      @instance.resize_to_fill(1000, 1000)
-      @instance.should have_dimensions(1000, 1000)
-    end
-  end
-
-  describe '#resize_and_pad' do
-    it "should resize the image to exactly the given dimensions" do
-      @instance.resize_and_pad(200, 200)
-      @instance.should have_dimensions(200, 200)
-    end
-
-    it "should scale up the image if it smaller than the given dimensions" do
-      @instance.resize_and_pad(1000, 1000)
-      @instance.should have_dimensions(1000, 1000)
-    end
-
-    it "should pad with white" do
-      @instance.resize_and_pad(200, 200)
-      image = ::MiniMagick::Image.open(@instance.current_path)
-      x, y = 0, 0
-      color = image.run_command("convert", "#{image.escaped_path}[1x1+#{x}+#{y}]", "-depth 8", "txt:").split("\n")[1]
-      color.should include('#FFFFFF')
-    end
-
-  end
-
-  describe '#resize_to_fit' do
-    it "should resize the image to fit within the given dimensions" do
-      @instance.resize_to_fit(200, 200)
-      @instance.should have_dimensions(200, 150)
-    end
-
-    it "should scale up the image if it smaller than the given dimensions" do
-      @instance.resize_to_fit(1000, 1000)
-      @instance.should have_dimensions(1000, 750)
-    end
-  end
-
-  describe '#resize_to_limit' do
-    it "should resize the image to fit within the given dimensions" do
-      @instance.resize_to_limit(200, 200)
-      @instance.should have_dimensions(200, 150)
-    end
-
-    it "should not scale up the image if it smaller than the given dimensions" do
-      @instance.resize_to_limit(1000, 1000)
-      @instance.should have_dimensions(640, 480)
-    end
-  end
-
-  describe "test errors" do
-    context "invalid image file" do
-      before do
-        File.open(@instance.current_path, 'w') do |f|
-          f.puts "bogus"
-        end
-      end
-
-      it "should fail to process a non image file" do
-        lambda {@instance.resize_to_limit(200, 200)}.should raise_exception(CarrierWave::ProcessingError, /^Failed to manipulate with MiniMagick, maybe it is not an image\? Original Error:/)
-      end
-
-      it "should use I18n" do
-        change_locale_and_store_translations(:nl, :errors => {
-          :messages => {
-            :mini_magick_processing_error => "Kon bestand niet met MiniMagick bewerken, misschien is het geen beeld bestand? MiniMagick foutmelding: %{e}"
-          }
-        }) do
-          lambda {@instance.resize_to_limit(200, 200)}.should raise_exception(CarrierWave::ProcessingError, /^Kon bestand niet met MiniMagick bewerken, misschien is het geen beeld bestand\? MiniMagick foutmelding:/)
-        end
-      end
-    end
-  end
-end