libarchive-ruby-swig 0.5.8 → 0.5.9

data/ext/libarchive-ruby-swig/extconf.rb

@@ -11,7 +11,8 @@
 require 'mkmf'
 
 unless have_header('archive.h') && \
-  have_library('archive', 'archive_read_open_filename')
+  have_library('archive', 'archive_read_open_filename') &&
+  have_library('archive', 'archive_read_support_format_raw')
   $stderr.write "Libarchive development files not found.\n"
   exit 1
 end

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

@@ -47,7 +47,7 @@ void Reader::close()
 }
 
 
-Reader *Reader::read_open_filename(const char *filename, const char *cmd) 
+Reader *Reader::read_open_filename(const char *filename, const char *cmd, bool raw) 
 {
     struct archive *ar = archive_read_new();
 
@@ -60,8 +60,13 @@ Reader *Reader::read_open_filename(const char *filename, const char *cmd)
                 throw 0;
         }
 
-        if(archive_read_support_format_all(ar) != ARCHIVE_OK)
-            throw 0;
+        if(raw) {
+            if(archive_read_support_format_raw(ar) != ARCHIVE_OK)
+                throw 0;
+        } else {
+            if(archive_read_support_format_all(ar) != ARCHIVE_OK)
+                throw 0;
+        }
 
         if(archive_read_open_filename(ar, filename, 1024) != ARCHIVE_OK)
             throw 0;
@@ -77,7 +82,7 @@ Reader *Reader::read_open_filename(const char *filename, const char *cmd)
 
 
 Reader *Reader::read_open_memory(const char *string, int length,
-    const char *cmd)
+    const char *cmd, bool raw)
 {
     struct archive *ar = archive_read_new();
     char *content = (char*) malloc(length);
@@ -92,8 +97,13 @@ Reader *Reader::read_open_memory(const char *string, int length,
                 throw 0;
         }
 
-        if(archive_read_support_format_all(ar) != ARCHIVE_OK)
-            throw 0;
+        if(raw) {
+            if(archive_read_support_format_raw(ar) != ARCHIVE_OK)
+                throw 0;
+        } else {
+            if(archive_read_support_format_all(ar) != ARCHIVE_OK)
+                throw 0;
+        }
 
         if(archive_read_open_memory(ar, (void*) content, length) != ARCHIVE_OK)
             throw 0;

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

@@ -45,17 +45,17 @@ class Reader
 
 #ifdef SWIG
 %feature("autodoc", "Use <code>Archive::read_open_filename</code> instead") read_open_filename;
-%newobject read_open_filename(const char *filename, const char *cmd);
+%newobject read_open_filename(const char *filename, const char *cmd = 0, bool raw = false);
 %feature("autodoc", "Use <code>Archive::read_open_memory</code> instead") read_open_memory;
-%newobject read_open_memory(const char *string, int length, const char *cmd);
+%newobject read_open_memory(const char *string, int length, const char *cmd = 0, bool raw = false);
 %feature("autodoc", "Returns the next Entry meta data object in the Archive") next_header;
 %newobject next_header();
 #endif
 
         static Reader *read_open_filename(const char *filename,
-            const char *cmd = 0);
+            const char *cmd = 0, bool raw = false);
         static Reader *read_open_memory(const char *string, int length,
-            const char *cmd = 0);
+            const char *cmd = 0, bool raw = false);
 
         Entry *next_header();
         VALUE read_data_helper(int len);

data/lib/libarchive_rs.rb

@@ -161,12 +161,12 @@ module Archive
   #
   # Returns a Reader instance.
   #
-  def self.read_open_filename(filename, cmd = nil)
+  def self.read_open_filename(filename, cmd = nil, raw = false)
     unless cmd.nil?
       cmd = locate_cmd(cmd)
     end
 
-    ar = Reader.read_open_filename(filename, cmd)
+    ar = Reader.read_open_filename(filename, cmd, raw)
  
     if block_given?
       yield ar
@@ -184,12 +184,12 @@ module Archive
   #
   # Returns a Reader instance.
   #
-  def self.read_open_memory(string, cmd = nil)
+  def self.read_open_memory(string, cmd = nil, raw = false)
     unless cmd.nil?
       cmd = locate_cmd(cmd)
     end
 
-    ar = Reader.read_open_memory(string, cmd)
+    ar = Reader.read_open_memory(string, cmd, raw)
 
     if block_given?
       yield ar

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: libarchive-ruby-swig
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 5
-  - 8
-  version: 0.5.8
+  - 9
+  version: 0.5.9
 platform: ruby
 authors: 
 - Tobias Koch
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-09 00:00:00 +03:00
+date: 2012-06-09 00:00:00 +03:00
 default_executable: 
 dependencies: []