paperclip-deflater 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b82e5941ea41f9e9d9a7e25a6ffcdd92480cb404
-  data.tar.gz: b8c20ec4807349555c5a7e592761a2b4f13ff7b1
+  metadata.gz: 49bed0decc83cf5c31363c8157336688cad43572
+  data.tar.gz: b7422ea22f63a8bf21734bfbfa97093e325d40c3
 SHA512:
-  metadata.gz: 6d2f11aa0a288acf3929d72bc01a5b728b714a53f645734742876d38a484ea67c64acf1392ef0894573e5c4e7defccf95d863998c6cd89e794255eee7e7c0ed1
-  data.tar.gz: 49e7fc02bd3dc030477a1f615f941e68decc74a5bea6a655b78d5ae98f906122f4be4379afff8ba78649edd9339577b60831e0d9f5ee790783fe8e53b5a18ab8
+  metadata.gz: 3beb013f2adebd189bf8b5e0e9dc162b83c2a29b0caf228bded75a9c04a6b6d52db4847400fc0ba6cd5b374a319cc056d06084ed76b4b5ddbb18ce543272d90c
+  data.tar.gz: 5be6bef8b0bf9b82181195598cc953e3171fd7d950f487270ff4d407a2af4b247f144787f3a8725a35ae3d9c1cae8904efb99f9bc71f64de7d00786c6253538d

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/lib/paperclip-deflater.rb

@@ -1,5 +1 @@
-require 'paperclip/processors/deflater'
-
-Paperclip.configure do |c|
-  c.register_processor :deflater, Paperclip::Processors::Deflater
-end
+require 'paperclip/deflater'

data/lib/paperclip/deflater.rb

@@ -0,0 +1,8 @@
+require 'paperclip'
+require 'paperclip/processors/deflater'
+require 'paperclip/processors/gzip'
+
+Paperclip.configure do |c|
+  c.register_processor :deflater, Paperclip::Processors::Deflater
+  c.register_processor :gzip, Paperclip::Processors::Gzip
+end

data/lib/paperclip/deflater/version.rb

@@ -0,0 +1,5 @@
+module Paperclip
+  module Deflater
+    VERSION = ::File.read(::File.expand_path('../../../../VERSION', __FILE__)).to_s.strip
+  end
+end

data/lib/paperclip/processors/deflater.rb

@@ -1,39 +1,27 @@
-require 'active_model'
-require 'paperclip/processor'
-require 'zlib'
-require 'tempfile'
+require_relative 'deflater_base'
 
 module Paperclip
   module Processors
-    class Deflater < ::Paperclip::Processor
-      VERSION = ::File.read(::File.expand_path('../../../../VERSION', __FILE__)).to_s.strip
-
+    class Deflater < DeflaterBase
       def initialize(file, options = {}, attachment = nil)
         super
-        @format          = @options[:format]
-        @deflate_options    = @options[:deflate_options] || {}
-        @current_format  = File.extname(@file.path)
-        @basename        = File.basename(@file.path, @current_format)
+        @deflate_options = @options[:deflate_options] || {}
       end
 
-      def make
-        src = @file
-
-        should_deflate = @attachment.instance_read(:deflate)
-        return src if should_deflate == false
+      private
 
+      def make_impl
         level       = @deflate_options[:level]
         window_bits = @deflate_options[:window_bits]
         memlevel    = @deflate_options[:memlevel]
         strategy    = @deflate_options[:strategy]
 
-        dst = Tempfile.new([@basename, @format ? ".#{@format}" : ''])
-        dst.binmode
+        dst = create_tempfile
         zd = Zlib::Deflate.new(level, window_bits, memlevel, strategy)
-        dst.write zd.deflate(src.read)
+        dst.write zd.deflate(@file.read)
+        zd.close
         dst.flush
         dst.rewind
-        zd.close
 
         dst
       end

data/lib/paperclip/processors/deflater_base.rb

@@ -0,0 +1,33 @@
+require 'paperclip/processor'
+require 'zlib'
+require 'tempfile'
+
+module Paperclip
+  module Processors
+    class DeflaterBase < ::Paperclip::Processor
+      def initialize(file, options = {}, attachment = nil)
+        super
+        @format          = @options[:format]
+        @current_format  = File.extname(@file.path)
+        @basename        = File.basename(@file.path, @current_format)
+      end
+
+      def make
+        return @file if @attachment.instance_read(:deflate) == false
+        make_impl
+      end
+
+      private
+
+      def make_impl
+        raise NotImplementedError
+      end
+
+      def create_tempfile
+        f = Tempfile.new([@basename, @format ? ".#{@format}" : ''])
+        f.binmode
+        f
+      end
+    end
+  end
+end

data/lib/paperclip/processors/gzip.rb

@@ -0,0 +1,27 @@
+require_relative 'deflater_base'
+
+module Paperclip
+  module Processors
+    class Gzip < DeflaterBase
+      def initialize(file, options = {}, attachment = nil)
+        super
+        @gzip_options = @options[:gzip_options] || {}
+      end
+
+      private
+
+      def make_impl
+        level       = @gzip_options[:level]
+        strategy    = @gzip_options[:strategy]
+
+        dst = create_tempfile
+        gz = Zlib::GzipWriter.new(dst, level, strategy)
+        gz.write(@file.read)
+        gz.close
+        dst.open
+
+        dst
+      end
+    end
+  end
+end

data/paperclip-deflater.gemspec

@@ -1,8 +1,8 @@
-require File.expand_path('../lib/paperclip/processors/deflater', __FILE__)
+require File.expand_path('../lib/paperclip/deflater/version', __FILE__)
 
 Gem::Specification.new do |gem|
   gem.name        = "paperclip-deflater"
-  gem.version     = Paperclip::Processors::Deflater::VERSION
+  gem.version     = Paperclip::Deflater::VERSION
   gem.platform    = Gem::Platform::RUBY
   gem.authors     = ["Daisuke Taniwaki"]
   gem.email       = ["daisuketaniwaki@gmail.com"]

data/spec/fixtures/files/test.txt

@@ -0,0 +1 @@
+test

data/spec/paperclip/processors/deflater_base_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+describe Paperclip::Processors::DeflaterBase do
+  let(:attachment) { double }
+  let(:should_deflate) { true }
+  let(:options) { {} }
+  let(:file) { test_file }
+  subject { Paperclip::Processors::DeflaterBase.new(file, options, attachment) }
+  before do
+    allow(attachment).to receive(:instance_read).with(:deflate).and_return(should_deflate)
+  end
+  describe "#make" do
+    context "deflate setting is false" do
+      let(:should_deflate) { false }
+      it "returns original" do
+        expect(subject.make).to eq(file)
+      end
+    end
+  end
+  describe "private methods" do
+    describe "#make_impl" do
+      it "raises an exception" do
+        expect{ subject.send(:make_impl) }.to raise_error(NotImplementedError)
+      end
+    end
+    describe "create_tempfile" do
+      it "returns a tempfile" do
+        f = subject.send(:create_tempfile)
+        expect(f).to be_a Tempfile
+        expect(f.binmode?).to be true
+      end
+    end
+  end
+end

data/spec/paperclip/processors/deflater_spec.rb

@@ -1,27 +1,22 @@
+# encoding: utf-8
 require 'spec_helper'
 
 describe Paperclip::Processors::Deflater do
   let(:attachment) { double }
   let(:should_deflate) { true }
   let(:options) { {} }
-  let(:file) { Tempfile.new('paperclip-processors-deflater') }
+  let(:file) { test_file }
   subject { Paperclip::Processors::Deflater.new(file, options, attachment) }
   before do
     allow(attachment).to receive(:instance_read).with(:deflate).and_return(should_deflate)
-    file.write 'test'
-    file.rewind
   end
-  it "deflates the file" do
-    dst = subject.make
-    out = File.open(dst.path).read
-    expect(out).to eq("x\x9C")
-  end
-  context "disable deflate" do
-    let(:should_deflate) { false }
-    it "does not deflate the file" do
-      dst = subject.make
-      out = File.open(dst.path).read
-      expect(out).to eq("test")
+  describe "private methods" do
+    describe "#make_impl" do
+      it "deflates the file" do
+        dst = subject.make
+        data = dst.read
+        expect(data.unpack('H*').first).to eq("x\x9C".unpack('H*').first)
+      end
     end
   end
 end

data/spec/paperclip/processors/gzip_spec.rb

@@ -0,0 +1,27 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe Paperclip::Processors::Gzip do
+  let(:attachment) { double }
+  let(:should_deflate) { true }
+  let(:options) { {} }
+  let(:file) { test_file }
+  subject { Paperclip::Processors::Gzip.new(file, options, attachment) }
+  before do
+    allow(attachment).to receive(:instance_read).with(:deflate).and_return(should_deflate)
+  end
+  describe "private methods" do
+    describe "#make_impl" do
+      before do
+        allow(file).to receive(:mtime).and_return(Time.new(2000, 1, 2, 3, 4, 5))
+      end
+      it "deflates the file" do
+        dst = subject.make
+        data = dst.read
+        expect(data[0..3]).to eq("\u001F\x8B\b\u0000")
+        # data[4..7] is modified time and it changes
+        expect(data[8..-1]).to eq("\u0000\u0003+I-.\xE1\u0002\u0000\xC65\xB9;\u0005\u0000\u0000\u0000")
+      end
+    end
+  end
+end

data/spec/support/files.rb

@@ -0,0 +1,4 @@
+# encoding: utf-8
+def test_file
+  File.open(File.expand_path('../../fixtures/files/test.txt', __FILE__), 'r:utf-8')
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paperclip-deflater
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Daisuke Taniwaki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-02 00:00:00.000000000 Z
+date: 2014-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paperclip
@@ -81,10 +81,18 @@ files:
 - Rakefile
 - VERSION
 - lib/paperclip-deflater.rb
+- lib/paperclip/deflater.rb
+- lib/paperclip/deflater/version.rb
 - lib/paperclip/processors/deflater.rb
+- lib/paperclip/processors/deflater_base.rb
+- lib/paperclip/processors/gzip.rb
 - paperclip-deflater.gemspec
+- spec/fixtures/files/test.txt
+- spec/paperclip/processors/deflater_base_spec.rb
 - spec/paperclip/processors/deflater_spec.rb
+- spec/paperclip/processors/gzip_spec.rb
 - spec/spec_helper.rb
+- spec/support/files.rb
 homepage: https://github.com/dtaniwaki/paperclip-deflater
 licenses:
 - MIT
@@ -110,5 +118,9 @@ signing_key:
 specification_version: 4
 summary: Deflate Processor for Paperclip
 test_files:
+- spec/fixtures/files/test.txt
+- spec/paperclip/processors/deflater_base_spec.rb
 - spec/paperclip/processors/deflater_spec.rb
+- spec/paperclip/processors/gzip_spec.rb
 - spec/spec_helper.rb
+- spec/support/files.rb