paperclip-phantom_svg 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9efdd038a6daecb6203d76e224b785829405b4bb
-  data.tar.gz: 2df4de80642c5d9d2f3c2ffabe7d3539d69caf2f
+  metadata.gz: 7e1843db2fa77ceef0ba71b38627b03f7a902aa6
+  data.tar.gz: a30ce72166aeb26cff5a7f2d352e98310097fa52
 SHA512:
-  metadata.gz: 664b0ad911a3610819d70c82269cef16a53053a674e449ebd90d7bbbbce82646964677c960f8d012ff9bcba2eb7cc8ec45463f62a7d59ebb6e599275c7986478
-  data.tar.gz: 5dce0b4bebf5c8bfc912220939095fdfef986d4d8d1631ac654ba72748c41817170bfe1861ac34ee3d876c8513de42077190159ee25bca2cc07f2da15537da12
+  metadata.gz: 5316bd6167e7fa9272b124576ec870edfc355ac5feac3259d963b5d7386bc9dcad2f1d6d0f61a78eaea5263f26316747522b4b00c3d66b4fe93f4a0886b91359
+  data.tar.gz: e9df85e9760f755de359d24fca6bfcc3d9443595a2c0b96fddb9b131f815f5f9aeb937de5b38d2453f0c767585c6c86aa5dee3d7f87f79b69c064dd66be4eb30

data/lib/paperclip_processors/phantom_processor.rb

@@ -7,43 +7,42 @@ module Paperclip
     attr_accessor :format, :height, :width, :dst
     def initialize(file, options = {}, attachment = nil)
       super
-      @src = file
-      @options = options
-      @format = options[:format] || :svg
-      @height = options[:height] || 64
-      @width = options[:width] || 64
-      @attachment = attachment
+      @format = options.fetch(:format, :svg)
+      @height = options.fetch(:height, 64)
+      @width = options.fetch(:width, 64)
+
       @base_name = File.basename(@file.path, '.*')
-      @ouput_name = options[:output_name] || @base_name
+      @ouput_name = options.fetch(:output_name, @base_name)
       @svg = Phantom::SVG::Base.new(@file.path)
     end
 
     def make
-      Paperclip.log "[PhantomSVG] Making #{@output_name}" if @whiny
-      case @format
-      when :svg
-        return _create_svg
-      when :png
-        return _create_png
+      case @format.to_sym
+      when  :svg then _create_svg
+      when  :png then _create_png
+      else
+        raise 'Format not supported'
       end
     end
 
     private
 
     def _create_svg
-      @dst = Tempfile.new([@output_name, '.svg'])
-      Paperclip.log "[PhantomSVG] Creating SVG #{@output_name}" if @whiny
-      @svg.save_svg(dst.path)
-      @dst
+      @dst = Tempfile.new([@output_name, '.svg']).tap do |file|
+        Paperclip.log "[PhantomSVG] Creating SVG #{@output_name}" if @whiny
+        @svg.height = @height if @height
+        @svg.width = @width if @width
+        @svg.save_svg(file.path)
+      end
     end
 
     def _create_png
-      @dst = Tempfile.new([@output_name, '.png'])
-      Paperclip.log "[PhantomSVG] Creating SVG #{@output_name} @ #{@height}x#{@width}" if @whiny
-      @svg.height = @height if @height
-      @svg.width = @width if @width
-      @svg.save_apng(@dst.path)
-      @dst
+      @dst = Tempfile.new([@output_name, '.png']).tap do |file|
+        Paperclip.log "[PhantomSVG] Creating SVG #{@output_name} @ #{@height}x#{@width}" if @whiny
+        @svg.height = @height if @height
+        @svg.width = @width if @width
+        @svg.save_apng(file.path)
+      end
     end
   end
 end

data/paperclip-phantom_svg.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.platform      = Gem::Platform::RUBY
   s.name          = 'paperclip-phantom_svg'
-  s.version       = '0.0.1'
+  s.version       = '0.0.2'
   s.license       = 'LGPL-3.0'
   s.summary       = 'SVG and Raster (primarily PNG) conerters for Paperclip' \
                     ' that don\'t suck so much.'

data/spec/paperclip-phantom_svg_spec.rb

@@ -30,7 +30,7 @@ describe Paperclip::PhantomProcessor do
         processor = Paperclip::PhantomProcessor.new(svg_source, test_options_svg)
         expect(processor.make).to be_an_instance_of(Paperclip::Tempfile)
         expect(File).to exist(processor.dst.path)
-      end 
+      end
     end
 
     describe '.make({format: :png, height: 128, width: 128})' do
@@ -38,7 +38,7 @@ describe Paperclip::PhantomProcessor do
         processor = Paperclip::PhantomProcessor.new(svg_source, test_options_png)
         expect(processor.make).to be_an_instance_of(Paperclip::Tempfile)
         expect(File).to exist(processor.dst.path)
-      end 
+      end
     end
 
     describe '.make({format: :png, height: 64})' do
@@ -46,7 +46,7 @@ describe Paperclip::PhantomProcessor do
         processor = Paperclip::PhantomProcessor.new(svg_source, test_options_png_h)
         expect(processor.make).to be_an_instance_of(Paperclip::Tempfile)
         expect(File).to exist(processor.dst.path)
-      end 
+      end
     end
   end
   
@@ -56,7 +56,7 @@ describe Paperclip::PhantomProcessor do
         processor = Paperclip::PhantomProcessor.new(png_source, test_options_svg)
         expect(processor.make).to be_an_instance_of(Paperclip::Tempfile)
         expect(File).to exist(processor.dst.path)
-      end 
+      end
     end
 
     describe '.make({format: :png, height: 128, width: 128})' do
@@ -64,7 +64,7 @@ describe Paperclip::PhantomProcessor do
         processor = Paperclip::PhantomProcessor.new(png_source, test_options_png)
         expect(processor.make).to be_an_instance_of(Paperclip::Tempfile)
         expect(File).to exist(processor.dst.path)
-      end 
+      end
     end
 
     describe '.make({format: :png, height: 64})' do
@@ -72,7 +72,7 @@ describe Paperclip::PhantomProcessor do
         processor = Paperclip::PhantomProcessor.new(png_source, test_options_png_h)
         expect(processor.make).to be_an_instance_of(Paperclip::Tempfile)
         expect(File).to exist(processor.dst.path)
-      end 
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paperclip-phantom_svg
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Rei Kagetsuki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-15 00:00:00.000000000 Z
+date: 2014-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paperclip