libarchive-ruby-swig 0.6.0 → 0.6.2

data/ext/libarchive-ruby-swig/entry.h

@@ -281,11 +281,8 @@ class Entry
     try {
         $action
     } catch(Error &err) {
-        static VALUE c_archive = rb_define_module("Archive");
-        static VALUE e_archive =
-            rb_define_class_under(c_archive, "Error", rb_eStandardError);
-        static VALUE o_except = rb_exc_new2(e_archive, err.what());
-        rb_exc_raise(o_except);
+        Error::ruby_raise(err);
+        SWIG_fail;
     }
 }
 #endif

data/ext/libarchive-ruby-swig/error.cpp

@@ -0,0 +1,30 @@
+/*
+ This file is part of "libarchive-ruby-swig", a simple SWIG wrapper around
+ libarchive.
+
+ Copyright 2011, Tobias Koch <tobias.koch@gmail.com>
+ 
+ libarchive-ruby-swig is licensed under a simplified BSD License. A copy of the
+ license text can be found in the file LICENSE.txt distributed with the source.
+*/
+
+#include <ruby.h>
+#include "error.h"
+
+namespace {
+    VALUE archive_rb_error_class;
+}
+
+void Error::init() throw()
+{
+    VALUE c_archive = rb_define_module("Archive");
+    archive_rb_error_class =
+        rb_define_class_under(c_archive, "Error", rb_eStandardError);
+}
+
+void Error::ruby_raise(const Error &err) throw()
+{
+    VALUE o_except = rb_exc_new2(archive_rb_error_class, err.what());
+    rb_exc_raise(o_except);
+}
+

data/ext/libarchive-ruby-swig/error.h

@@ -11,6 +11,9 @@
 #ifndef CLASS_ARCHIVE_ERROR_H_INCLUDED
 #define CLASS_ARCHIVE_ERROR_H_INCLUDED
 
+/* NOTE: This file is not interpreted by SWIG */
+
+#include <string>
 #include <exception>
 
 class Error: public std::exception
@@ -27,6 +30,9 @@ class Error: public std::exception
             return error_msg.c_str();
         }
 
+        static void init() throw();
+        static void ruby_raise(const Error &err) throw();
+
     private:
 
         std::string error_msg;

data/ext/libarchive-ruby-swig/libarchive.i

@@ -22,6 +22,10 @@
 #include "error.h"
 %}
 
+%init %{
+    Error::init();
+%}
+
 %wrapper %{
 /* --- WRAPPER CODE START --- */
 %}

data/ext/libarchive-ruby-swig/reader.cpp

@@ -36,7 +36,7 @@ Reader::~Reader()
 void Reader::close()
 {
     if(_ar) {
-        archive_read_finish(_ar);
+        archive_read_free(_ar);
         _ar = 0;
     }
 
@@ -53,10 +53,10 @@ Reader *Reader::read_open_filename(const char *filename, const char *cmd, bool r
 
     try {
         if(cmd) {
-            if(archive_read_support_compression_program(ar, cmd) != ARCHIVE_OK)
+            if(archive_read_support_filter_program(ar, cmd) != ARCHIVE_OK)
                 throw 0;
         } else {
-            if(archive_read_support_compression_all(ar) != ARCHIVE_OK)
+            if(archive_read_support_filter_all(ar) != ARCHIVE_OK)
                 throw 0;
         }
 
@@ -73,7 +73,7 @@ Reader *Reader::read_open_filename(const char *filename, const char *cmd, bool r
 
     } catch(...) {
         std::string error_msg = archive_error_string(ar);
-        archive_read_finish(ar);
+        archive_read_free(ar);
         throw Error(error_msg);
     }
 
@@ -90,10 +90,10 @@ Reader *Reader::read_open_memory(const char *string, int length,
 
     try {
         if(cmd) {
-            if(archive_read_support_compression_program(ar, cmd) != ARCHIVE_OK)
+            if(archive_read_support_filter_program(ar, cmd) != ARCHIVE_OK)
                 throw 0;
         } else {
-            if(archive_read_support_compression_all(ar) != ARCHIVE_OK)
+            if(archive_read_support_filter_all(ar) != ARCHIVE_OK)
                 throw 0;
         }
 
@@ -110,7 +110,7 @@ Reader *Reader::read_open_memory(const char *string, int length,
 
     } catch(...) {
         std::string error_msg = archive_error_string(ar);
-        archive_read_finish(ar);
+        archive_read_free(ar);
         free(content);
         throw Error(error_msg);
     }

data/ext/libarchive-ruby-swig/reader.h

@@ -34,11 +34,8 @@ class Reader
     try {
         $action
     } catch(Error &err) {
-        static VALUE c_archive = rb_define_module("Archive");
-        static VALUE e_archive =
-            rb_define_class_under(c_archive, "Error", rb_eStandardError);
-        static VALUE o_except = rb_exc_new2(e_archive, err.what());
-        rb_exc_raise(o_except);
+        Error::ruby_raise(err);
+        SWIG_fail;
     }
 }
 #endif

data/ext/libarchive-ruby-swig/writer.cpp

@@ -35,7 +35,7 @@ Writer::~Writer()
 void Writer::close()
 {
     if(_ar) {
-        archive_write_finish(_ar);
+        archive_write_free(_ar);
         _ar = 0;
     }
 }
@@ -48,7 +48,7 @@ Writer *Writer::write_open_filename(const char *filename,
     std::string error_msg;
     struct archive *ar = archive_write_new();
 
-    archive_write_set_compression_program(ar, cmd);
+    archive_write_add_filter_program(ar, cmd);
     try {
         set_format_helper(ar, format);
 
@@ -58,7 +58,7 @@ Writer *Writer::write_open_filename(const char *filename,
         }
 
     } catch(...) {
-        archive_write_finish(ar);
+        archive_write_free(ar);
         throw;
     }
 
@@ -76,22 +76,22 @@ Writer *Writer::write_open_filename(const char *filename,
 
         switch(compression) {
             case Archive::COMPRESSION_BZIP2:
-                archive_write_set_compression_bzip2(ar);
+                archive_write_add_filter_bzip2(ar);
                 break;
             case Archive::COMPRESSION_COMPRESS:
-                archive_write_set_compression_compress(ar);
+                archive_write_add_filter_compress(ar);
                 break;
             case Archive::COMPRESSION_GZIP:
-                archive_write_set_compression_gzip(ar);
+                archive_write_add_filter_gzip(ar);
                 break;
             case Archive::COMPRESSION_LZMA:
-                archive_write_set_compression_lzma(ar);
+                archive_write_add_filter_lzma(ar);
                 break;
             case Archive::COMPRESSION_NONE:
-                archive_write_set_compression_none(ar);
+                archive_write_add_filter_none(ar);
                 break;
             case Archive::COMPRESSION_XZ:
-                archive_write_set_compression_xz(ar);
+                archive_write_add_filter_xz(ar);
                 break;
             default:
                 error_msg = "unknown or unsupported compression scheme";
@@ -106,7 +106,7 @@ Writer *Writer::write_open_filename(const char *filename,
         }
 
     } catch(...) {
-        archive_write_finish(ar);
+        archive_write_free(ar);
         throw;
     }
 

data/ext/libarchive-ruby-swig/writer.h

@@ -65,11 +65,8 @@ class Writer
     try {
         $action
     } catch(Error &err) {
-        static VALUE c_archive = rb_define_module("Archive");
-        static VALUE e_archive =
-            rb_define_class_under(c_archive, "Error", rb_eStandardError);
-        static VALUE o_except = rb_exc_new2(e_archive, err.what());
-        rb_exc_raise(o_except);
+        Error::ruby_raise(err);
+        SWIG_fail;
     }
 }
 #endif

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: libarchive-ruby-swig
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-12 00:00:00.000000000 Z
+date: 2014-07-01 00:00:00.000000000 Z
 dependencies: []
 description: Ruby bindings to libarchive allowing reading and creation of compressed
   archives in a variety of formats.
@@ -24,6 +24,7 @@ files:
 - ext/libarchive-ruby-swig/stat.h
 - ext/libarchive-ruby-swig/entry.cpp
 - ext/libarchive-ruby-swig/entry.h
+- ext/libarchive-ruby-swig/error.cpp
 - ext/libarchive-ruby-swig/error.h
 - ext/libarchive-ruby-swig/libarchive.i
 - ext/libarchive-ruby-swig/reader.cpp