webp-ffi 0.1.4 → 0.1.5

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v0.1.5
+
+* Code cleanup
+
 ## v0.1.4
 
 * Added decode options

data/lib/webp/version.rb

@@ -1,3 +1,3 @@
 module WebP
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/lib/webp/webp.rb

@@ -29,18 +29,18 @@ module WebP
     
     # encode
     def encode(input_file, output_file, options = {})
-      options_obj = Options.new options
-      res = C.webp_encode(input_file, output_file, options_obj.encode_pointer)
-      raise EncoderError, ENCODER_ERRORS[res - 1] unless 0 == res
-      return true
+      unless 0 == (encode_res = C.webp_encode(input_file, output_file, init_options_object(options).encode_pointer))
+        raise EncoderError, ENCODER_ERRORS[encode_res - 1]
+      end
+      true
     end
     
     # decode
     def decode(input_file, output_file, options = {})
-      options_obj = Options.new options
-      res = C.webp_decode(input_file, output_file, options_obj.decode_pointer)
-      raise DecoderError, DECODER_ERRORS[res - 1] unless 0 == res
-      return true
+      unless 0 == (decode_res = C.webp_decode(input_file, output_file, init_options_object(options).decode_pointer))
+        raise DecoderError, DECODER_ERRORS[decode_res - 1]
+      end
+      true
     end
     
     private
@@ -53,5 +53,9 @@ module WebP
       pointers
     end
     
+    def init_options_object(options)
+      Options.new options
+    end
+    
   end
 end

data/spec/webp_ffi_spec.rb

@@ -36,9 +36,9 @@ describe WebP do
   end
   after :all do
     @out_dir = File.expand_path(File.join(File.dirname(__FILE__), "../tmp/"))
-    #Dir["#{@out_dir}/*{.png,.webp}"].each do |file|
-    #  File.delete(file) rescue nil
-    #end
+    Dir["#{@out_dir}/*{.png,.webp}"].each do |file|
+      File.delete(file) rescue nil
+    end
   end
 
   it "calculate plus 100 by test_c (verify C)" do
@@ -117,7 +117,7 @@ describe WebP do
         it "#{image}.png image" do
           in_filename = File.expand_path(File.join(File.dirname(__FILE__), "factories/#{image}.png"))
           out_filename = File.expand_path(File.join(@out_dir, "#{image}.invpng.webp"))
-          expect { WebP.encode(in_filename, out_filename, crop_w: 30000) }.to raise_error WebP::EncoderError
+          expect { WebP.encode(in_filename, out_filename, crop_w: 30000) }.to raise_error WebP::EncoderError, /crop/i
         end
       end
     end
@@ -161,16 +161,16 @@ describe WebP do
         it "#{image}.png image" do
           in_filename = File.expand_path(File.join(File.dirname(__FILE__), "factories/#{image}.png"))
           out_filename = File.expand_path(File.join(@out_dir, "#{image}.invpng.webp"))
-          expect { WebP.decode(in_filename, out_filename) }.to raise_error WebP::DecoderError
+          expect { WebP.decode(in_filename, out_filename) }.to raise_error WebP::DecoderError, /invalid webp/i
         end
       end
     end
     context "raise DecoderError on invalid options" do
       factories[:png].each do |image|
         it "#{image}.png image" do
-          in_filename = File.expand_path(File.join(File.dirname(__FILE__), "factories/#{image}.png"))
-          out_filename = File.expand_path(File.join(@out_dir, "#{image}.invpng.webp"))
-          expect { WebP.decode(in_filename, out_filename, crop_w: 30000) }.to raise_error WebP::DecoderError
+          in_filename = File.expand_path(File.join(File.dirname(__FILE__), "factories/#{image}.webp"))
+          out_filename = File.expand_path(File.join(@out_dir, "#{image}.png"))
+          expect { WebP.decode(in_filename, out_filename, crop_w: 30000) }.to raise_error WebP::DecoderError, /decoding failed/i
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: webp-ffi
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -149,7 +149,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2620577611088835367
+      hash: -4206358326221874067
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -158,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2620577611088835367
+      hash: -4206358326221874067
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25