image_optim 0.22.1 → 0.23.0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: image_optim
 version: !ruby/object:Gem::Version
-  version: 0.22.1
+  version: 0.23.0
 platform: ruby
 authors:
 - Ivan Kuchin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-21 00:00:00.000000000 Z
+date: 2016-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fspath
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: image_size
   requirement: !ruby/object:Gem::Requirement
@@ -99,6 +99,9 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.2'
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.2.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,6 +109,9 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.2'
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.2.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -141,6 +147,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- .appveyor.yml
 - .gitignore
 - .rubocop.yml
 - .travis.yml
@@ -158,16 +165,19 @@ files:
 - lib/image_optim/bin_resolver/comparable_condition.rb
 - lib/image_optim/bin_resolver/error.rb
 - lib/image_optim/bin_resolver/simple_version.rb
+- lib/image_optim/cache.rb
+- lib/image_optim/cache_path.rb
 - lib/image_optim/cmd.rb
 - lib/image_optim/config.rb
 - lib/image_optim/configuration_error.rb
 - lib/image_optim/handler.rb
 - lib/image_optim/hash_helpers.rb
 - lib/image_optim/image_meta.rb
-- lib/image_optim/image_path.rb
 - lib/image_optim/non_negative_integer_range.rb
+- lib/image_optim/optimized_path.rb
 - lib/image_optim/option_definition.rb
 - lib/image_optim/option_helpers.rb
+- lib/image_optim/path.rb
 - lib/image_optim/railtie.rb
 - lib/image_optim/runner.rb
 - lib/image_optim/runner/glob_helpers.rb
@@ -195,12 +205,17 @@ files:
 - spec/image_optim/bin_resolver/comparable_condition_spec.rb
 - spec/image_optim/bin_resolver/simple_version_spec.rb
 - spec/image_optim/bin_resolver_spec.rb
+- spec/image_optim/cache_path_spec.rb
+- spec/image_optim/cache_spec.rb
 - spec/image_optim/cmd_spec.rb
 - spec/image_optim/config_spec.rb
 - spec/image_optim/handler_spec.rb
 - spec/image_optim/hash_helpers_spec.rb
-- spec/image_optim/image_path_spec.rb
+- spec/image_optim/image_meta_spec.rb
+- spec/image_optim/optimized_path_spec.rb
 - spec/image_optim/option_definition_spec.rb
+- spec/image_optim/option_helpers_spec.rb
+- spec/image_optim/path_spec.rb
 - spec/image_optim/railtie_spec.rb
 - spec/image_optim/runner/glob_helpers_spec.rb
 - spec/image_optim/runner/option_parser_spec.rb
@@ -209,6 +224,7 @@ files:
 - spec/image_optim/worker/pngquant_spec.rb
 - spec/image_optim/worker_spec.rb
 - spec/image_optim_spec.rb
+- spec/images/broken_jpeg
 - spec/images/comparison.png
 - spec/images/decompressed.jpeg
 - spec/images/icecream.gif
@@ -256,7 +272,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: image_optim
-rubygems_version: 2.4.7
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Optimize (lossless compress, optionally lossy) images (jpeg, png, gif, svg)
@@ -266,12 +282,17 @@ test_files:
 - spec/image_optim/bin_resolver/comparable_condition_spec.rb
 - spec/image_optim/bin_resolver/simple_version_spec.rb
 - spec/image_optim/bin_resolver_spec.rb
+- spec/image_optim/cache_path_spec.rb
+- spec/image_optim/cache_spec.rb
 - spec/image_optim/cmd_spec.rb
 - spec/image_optim/config_spec.rb
 - spec/image_optim/handler_spec.rb
 - spec/image_optim/hash_helpers_spec.rb
-- spec/image_optim/image_path_spec.rb
+- spec/image_optim/image_meta_spec.rb
+- spec/image_optim/optimized_path_spec.rb
 - spec/image_optim/option_definition_spec.rb
+- spec/image_optim/option_helpers_spec.rb
+- spec/image_optim/path_spec.rb
 - spec/image_optim/railtie_spec.rb
 - spec/image_optim/runner/glob_helpers_spec.rb
 - spec/image_optim/runner/option_parser_spec.rb
@@ -280,6 +301,7 @@ test_files:
 - spec/image_optim/worker/pngquant_spec.rb
 - spec/image_optim/worker_spec.rb
 - spec/image_optim_spec.rb
+- spec/images/broken_jpeg
 - spec/images/comparison.png
 - spec/images/decompressed.jpeg
 - spec/images/icecream.gif

data/lib/image_optim/image_path.rb

@@ -1,68 +0,0 @@
-require 'fspath'
-require 'image_optim/image_meta'
-
-class ImageOptim
-  # FSPath with additional helpful methods
-  class ImagePath < FSPath
-    # Holds optimized image with reference to original and its size
-    class Optimized < DelegateClass(self)
-      def initialize(path, original_or_size = nil)
-        path = ImagePath.convert(path)
-        __setobj__(path)
-        if original_or_size.is_a?(Integer)
-          @original = path
-          @original_size = original_or_size
-        elsif original_or_size
-          @original = ImagePath.convert(original_or_size)
-          @original_size = @original.size
-        end
-      end
-
-      # Original path, use original_size to get its size as original can be
-      # overwritten
-      attr_reader :original
-
-      # Stored size of original
-      attr_reader :original_size
-    end
-
-    # Get temp path for this file with same extension
-    def temp_path(*args, &block)
-      ext = extname
-      self.class.temp_file_path([basename(ext).to_s, ext], *args, &block)
-    end
-
-    # Copy file to dest preserving attributes
-    def copy(dst)
-      FileUtils.copy_file(self, dst, true)
-    end
-
-    # Atomic replace src with self
-    def replace(src)
-      src = self.class.new(src)
-      src.temp_path(src.dirname) do |temp|
-        src.copy(temp)
-        temp.write(read)
-        temp.rename(src.to_s)
-        unlink
-      end
-    end
-
-    # Get format using ImageSize
-    def format
-      image_meta = ImageMeta.for_path(self)
-      image_meta && image_meta.format
-    end
-
-    # Read binary data
-    def binread
-      open('rb', &:read)
-    end
-
-    # Returns path if it is already an instance of this class otherwise new
-    # instance
-    def self.convert(path)
-      path.is_a?(self) ? path : new(path)
-    end
-  end
-end

data/spec/image_optim/image_path_spec.rb

@@ -1,54 +0,0 @@
-require 'spec_helper'
-require 'image_optim/image_path'
-
-describe ImageOptim::ImagePath do
-  before do
-    stub_const('ImagePath', ImageOptim::ImagePath)
-  end
-
-  describe :convert do
-    it 'returns ImagePath for string' do
-      path = 'a'
-
-      expect(ImagePath.convert(path)).to be_a(ImagePath)
-      expect(ImagePath.convert(path)).to eq(ImagePath.new(path))
-
-      expect(ImagePath.convert(path)).not_to eq(path)
-      expect(ImagePath.convert(path)).not_to be(path)
-    end
-
-    it 'returns ImagePath for Pathname' do
-      pathname = Pathname.new('a')
-
-      expect(ImagePath.convert(pathname)).to be_a(ImagePath)
-      expect(ImagePath.convert(pathname)).to eq(ImagePath.new(pathname))
-
-      expect(ImagePath.convert(pathname)).to eq(pathname)
-      expect(ImagePath.convert(pathname)).not_to be(pathname)
-    end
-
-    it 'returns same instance for ImagePath' do
-      image_path = ImagePath.new('a')
-
-      expect(ImagePath.convert(image_path)).to be_a(ImagePath)
-      expect(ImagePath.convert(image_path)).to eq(ImagePath.new(image_path))
-
-      expect(ImagePath.convert(image_path)).to eq(image_path)
-      expect(ImagePath.convert(image_path)).to be(image_path)
-    end
-  end
-
-  describe :binread do
-    it 'reads binary data' do
-      data = (0..255).to_a.pack('c*')
-
-      path = ImagePath.temp_file_path
-      path.write(data)
-
-      expect(path.binread).to eq(data)
-      if ''.respond_to?(:encoding)
-        expect(path.binread.encoding).to eq(Encoding.find('ASCII-8BIT'))
-      end
-    end
-  end
-end