taglib-ruby 0.5.0-x86-mingw32 → 0.5.1-x86-mingw32

data/CHANGES.md

@@ -1,6 +1,12 @@
 Changes in Releases of taglib-ruby
 ==================================
 
+## 0.5.1 (2012-06-16)
+
+* Fix crashes (segfault) with nil arguments, e.g. with `tag.title = nil`
+* Document TagLib::MPEG::File#save and TagLib::MPEG::File#strip (#11)
+* Update TagLib of binary gem for Windows to 1.7.2
+
 ## 0.5.0 (2012-04-15)
 
 * Add support for FLAC

data/docs/taglib/base.rb

@@ -116,6 +116,15 @@ module TagLib
 
   # @abstract Base class for files, see subclasses.
   class File
+
+    # Save the file and the associated tags.
+    #
+    # See subclasses, as some provide more control over what is saved.
+    #
+    # @return [Boolean] whether saving was successful
+    def save
+    end
+
     # Closes the file and releases all objects that were read from the
     # file (basically everything from the TagLib namespace).
     #

data/docs/taglib/mpeg.rb

@@ -8,6 +8,12 @@ module TagLib::MPEG
   #   end
   #
   class File < TagLib::File
+    NoTags  = 0x0000
+    ID3v1   = 0x0001
+    ID3v2   = 0x0002
+    APE     = 0x0004
+    AllTags = 0xffff
+
     # {include:TagLib::FileRef.open}
     #
     # @param (see #initialize)
@@ -55,6 +61,33 @@ module TagLib::MPEG
     # @return [TagLib::MPEG::Properties]
     def audio_properties
     end
+
+    # Save the file and the associated tags.
+    #
+    # @param [Integer] tags
+    #   The tag types to save (see constants), e.g.
+    #   {TagLib::MPEG::File::ID3v2}. To specify more than one tag type,
+    #   or them together using `|`, e.g.
+    #   `TagLib::MPEG::File::ID3v1 | TagLib::MPEG::File::ID3v2`.
+    # @param [Boolean] strip_others
+    #   true if tag types other than the specified ones should be
+    #   stripped from the file
+    # @return [Boolean] whether saving was successful
+    def save(tags=TagLib::MPEG::File::AllTags, strip_others=true)
+    end
+
+    # Strip the specified tags from the file. Note that this directly
+    # updates the file, a call to save afterwards is not necessary
+    # (closing the file is necessary as always, though).
+    #
+    # @param [Integer] tags
+    #   The tag types to strip (see constants), e.g.
+    #   {TagLib::MPEG::File::ID3v2}. To specify more than one tag type,
+    #   or them together using `|`, e.g.
+    #   `TagLib::MPEG::File::ID3v1 | TagLib::MPEG::File::ID3v2`.
+    # @return [Boolean] whether stripping was successful
+    def strip(tags=TagLib::MPEG::File::AllTags)
+    end
   end
 
   # Audio properties for MPEG files.

data/ext/extconf_common.rb

@@ -11,8 +11,12 @@ end
 
 dir_config('tag')
 
-if not have_library('stdc++')
-  error "You must have libstdc++ installed."
+# When compiling statically, -lstdc++ would make the resulting .so to
+# have a dependency on an external libstdc++ instead of the static one.
+unless $LDFLAGS.split(" ").include?("-static-libstdc++")
+  if not have_library('stdc++')
+    error "You must have libstdc++ installed."
+  end
 end
 
 if not have_library('tag')

data/ext/taglib_base/includes.i

@@ -39,7 +39,11 @@ VALUE taglib_bytevector_to_ruby_string(const TagLib::ByteVector &byteVector) {
 }
 
 TagLib::ByteVector ruby_string_to_taglib_bytevector(VALUE s) {
-  return TagLib::ByteVector(RSTRING_PTR(s), RSTRING_LEN(s));
+  if (NIL_P(s)) {
+    return TagLib::ByteVector::null;
+  } else {
+    return TagLib::ByteVector(RSTRING_PTR(s), RSTRING_LEN(s));
+  }
 }
 
 VALUE taglib_string_to_ruby_string(const TagLib::String & string) {
@@ -53,7 +57,11 @@ VALUE taglib_string_to_ruby_string(const TagLib::String & string) {
 }
 
 TagLib::String ruby_string_to_taglib_string(VALUE s) {
-  return TagLib::String(RSTRING_PTR(CONVERT_TO_UTF8(s)), TagLib::String::UTF8);
+  if (NIL_P(s)) {
+    return TagLib::String::null;
+  } else {
+    return TagLib::String(RSTRING_PTR(CONVERT_TO_UTF8(s)), TagLib::String::UTF8);
+  }
 }
 
 VALUE taglib_string_list_to_ruby_array(const TagLib::StringList & list) {
@@ -67,6 +75,9 @@ VALUE taglib_string_list_to_ruby_array(const TagLib::StringList & list) {
 
 TagLib::StringList ruby_array_to_taglib_string_list(VALUE ary) {
   TagLib::StringList result = TagLib::StringList();
+  if (NIL_P(ary)) {
+    return result;
+  }
   for (long i = 0; i < RARRAY_LEN(ary); i++) {
     VALUE e = RARRAY_PTR(ary)[i];
     TagLib::String s = ruby_string_to_taglib_string(e);

data/ext/taglib_base/taglib_base_wrap.cxx

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.5
+ * Version 2.0.8
  * 
  * This file is not intended to be easily readable and contains a number of 
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -1843,7 +1843,7 @@ static VALUE mTagLib;
 #define SWIG_RUBY_THREAD_END_BLOCK
 
 
-#define SWIGVERSION 0x020005 
+#define SWIGVERSION 0x020008 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -1883,7 +1883,11 @@ VALUE taglib_bytevector_to_ruby_string(const TagLib::ByteVector &byteVector) {
 }
 
 TagLib::ByteVector ruby_string_to_taglib_bytevector(VALUE s) {
-  return TagLib::ByteVector(RSTRING_PTR(s), RSTRING_LEN(s));
+  if (NIL_P(s)) {
+    return TagLib::ByteVector::null;
+  } else {
+    return TagLib::ByteVector(RSTRING_PTR(s), RSTRING_LEN(s));
+  }
 }
 
 VALUE taglib_string_to_ruby_string(const TagLib::String & string) {
@@ -1897,7 +1901,11 @@ VALUE taglib_string_to_ruby_string(const TagLib::String & string) {
 }
 
 TagLib::String ruby_string_to_taglib_string(VALUE s) {
-  return TagLib::String(RSTRING_PTR(CONVERT_TO_UTF8(s)), TagLib::String::UTF8);
+  if (NIL_P(s)) {
+    return TagLib::String::null;
+  } else {
+    return TagLib::String(RSTRING_PTR(CONVERT_TO_UTF8(s)), TagLib::String::UTF8);
+  }
 }
 
 VALUE taglib_string_list_to_ruby_array(const TagLib::StringList & list) {
@@ -1911,6 +1919,9 @@ VALUE taglib_string_list_to_ruby_array(const TagLib::StringList & list) {
 
 TagLib::StringList ruby_array_to_taglib_string_list(VALUE ary) {
   TagLib::StringList result = TagLib::StringList();
+  if (NIL_P(ary)) {
+    return result;
+  }
   for (long i = 0; i < RARRAY_LEN(ary); i++) {
     VALUE e = RARRAY_PTR(ary)[i];
     TagLib::String s = ruby_string_to_taglib_string(e);
@@ -2052,7 +2063,7 @@ SWIG_ruby_failed(void)
 } 
 
 
-/*@SWIG:/usr/local/share/swig/2.0.5/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/usr/local/share/swig/2.0.8/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2ULONG(VALUE *args)
 {
   VALUE obj = args[0];
@@ -2104,7 +2115,7 @@ SWIG_From_bool  (bool value)
 }
 
 
-/*@SWIG:/usr/local/share/swig/2.0.5/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/usr/local/share/swig/2.0.8/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args)
 {
   VALUE obj = args[0];

data/ext/taglib_flac/taglib_flac_wrap.cxx

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.5
+ * Version 2.0.8
  * 
  * This file is not intended to be easily readable and contains a number of 
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -1850,7 +1850,7 @@ static VALUE mFLAC;
 #define SWIG_RUBY_THREAD_END_BLOCK
 
 
-#define SWIGVERSION 0x020005 
+#define SWIGVERSION 0x020008 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -1891,7 +1891,11 @@ VALUE taglib_bytevector_to_ruby_string(const TagLib::ByteVector &byteVector) {
 }
 
 TagLib::ByteVector ruby_string_to_taglib_bytevector(VALUE s) {
-  return TagLib::ByteVector(RSTRING_PTR(s), RSTRING_LEN(s));
+  if (NIL_P(s)) {
+    return TagLib::ByteVector::null;
+  } else {
+    return TagLib::ByteVector(RSTRING_PTR(s), RSTRING_LEN(s));
+  }
 }
 
 VALUE taglib_string_to_ruby_string(const TagLib::String & string) {
@@ -1905,7 +1909,11 @@ VALUE taglib_string_to_ruby_string(const TagLib::String & string) {
 }
 
 TagLib::String ruby_string_to_taglib_string(VALUE s) {
-  return TagLib::String(RSTRING_PTR(CONVERT_TO_UTF8(s)), TagLib::String::UTF8);
+  if (NIL_P(s)) {
+    return TagLib::String::null;
+  } else {
+    return TagLib::String(RSTRING_PTR(CONVERT_TO_UTF8(s)), TagLib::String::UTF8);
+  }
 }
 
 VALUE taglib_string_list_to_ruby_array(const TagLib::StringList & list) {
@@ -1919,6 +1927,9 @@ VALUE taglib_string_list_to_ruby_array(const TagLib::StringList & list) {
 
 TagLib::StringList ruby_array_to_taglib_string_list(VALUE ary) {
   TagLib::StringList result = TagLib::StringList();
+  if (NIL_P(ary)) {
+    return result;
+  }
   for (long i = 0; i < RARRAY_LEN(ary); i++) {
     VALUE e = RARRAY_PTR(ary)[i];
     TagLib::String s = ruby_string_to_taglib_string(e);
@@ -1983,7 +1994,7 @@ SWIG_ruby_failed(void)
 } 
 
 
-/*@SWIG:/usr/local/share/swig/2.0.5/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/usr/local/share/swig/2.0.8/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args)
 {
   VALUE obj = args[0];

data/ext/taglib_id3v1/taglib_id3v1_wrap.cxx

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.5
+ * Version 2.0.8
  * 
  * This file is not intended to be easily readable and contains a number of 
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -1838,7 +1838,7 @@ static VALUE mID3v1;
 #define SWIG_RUBY_THREAD_END_BLOCK
 
 
-#define SWIGVERSION 0x020005 
+#define SWIGVERSION 0x020008 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -1874,7 +1874,11 @@ VALUE taglib_bytevector_to_ruby_string(const TagLib::ByteVector &byteVector) {
 }
 
 TagLib::ByteVector ruby_string_to_taglib_bytevector(VALUE s) {
-  return TagLib::ByteVector(RSTRING_PTR(s), RSTRING_LEN(s));
+  if (NIL_P(s)) {
+    return TagLib::ByteVector::null;
+  } else {
+    return TagLib::ByteVector(RSTRING_PTR(s), RSTRING_LEN(s));
+  }
 }
 
 VALUE taglib_string_to_ruby_string(const TagLib::String & string) {
@@ -1888,7 +1892,11 @@ VALUE taglib_string_to_ruby_string(const TagLib::String & string) {
 }
 
 TagLib::String ruby_string_to_taglib_string(VALUE s) {
-  return TagLib::String(RSTRING_PTR(CONVERT_TO_UTF8(s)), TagLib::String::UTF8);
+  if (NIL_P(s)) {
+    return TagLib::String::null;
+  } else {
+    return TagLib::String(RSTRING_PTR(CONVERT_TO_UTF8(s)), TagLib::String::UTF8);
+  }
 }
 
 VALUE taglib_string_list_to_ruby_array(const TagLib::StringList & list) {
@@ -1902,6 +1910,9 @@ VALUE taglib_string_list_to_ruby_array(const TagLib::StringList & list) {
 
 TagLib::StringList ruby_array_to_taglib_string_list(VALUE ary) {
   TagLib::StringList result = TagLib::StringList();
+  if (NIL_P(ary)) {
+    return result;
+  }
   for (long i = 0; i < RARRAY_LEN(ary); i++) {
     VALUE e = RARRAY_PTR(ary)[i];
     TagLib::String s = ruby_string_to_taglib_string(e);
@@ -2009,7 +2020,7 @@ SWIG_ruby_failed(void)
 } 
 
 
-/*@SWIG:/usr/local/share/swig/2.0.5/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/usr/local/share/swig/2.0.8/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args)
 {
   VALUE obj = args[0];
@@ -2065,7 +2076,7 @@ SWIG_From_unsigned_SS_int  (unsigned int value)
 }
 
 
-/*@SWIG:/usr/local/share/swig/2.0.5/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/usr/local/share/swig/2.0.8/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2ULONG(VALUE *args)
 {
   VALUE obj = args[0];

data/ext/taglib_id3v2/taglib_id3v2_wrap.cxx

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.5
+ * Version 2.0.8
  * 
  * This file is not intended to be easily readable and contains a number of 
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -1861,7 +1861,7 @@ static VALUE mID3v2;
 #define SWIG_RUBY_THREAD_END_BLOCK
 
 
-#define SWIGVERSION 0x020005 
+#define SWIGVERSION 0x020008 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -1911,7 +1911,11 @@ VALUE taglib_bytevector_to_ruby_string(const TagLib::ByteVector &byteVector) {
 }
 
 TagLib::ByteVector ruby_string_to_taglib_bytevector(VALUE s) {
-  return TagLib::ByteVector(RSTRING_PTR(s), RSTRING_LEN(s));
+  if (NIL_P(s)) {
+    return TagLib::ByteVector::null;
+  } else {
+    return TagLib::ByteVector(RSTRING_PTR(s), RSTRING_LEN(s));
+  }
 }
 
 VALUE taglib_string_to_ruby_string(const TagLib::String & string) {
@@ -1925,7 +1929,11 @@ VALUE taglib_string_to_ruby_string(const TagLib::String & string) {
 }
 
 TagLib::String ruby_string_to_taglib_string(VALUE s) {
-  return TagLib::String(RSTRING_PTR(CONVERT_TO_UTF8(s)), TagLib::String::UTF8);
+  if (NIL_P(s)) {
+    return TagLib::String::null;
+  } else {
+    return TagLib::String(RSTRING_PTR(CONVERT_TO_UTF8(s)), TagLib::String::UTF8);
+  }
 }
 
 VALUE taglib_string_list_to_ruby_array(const TagLib::StringList & list) {
@@ -1939,6 +1947,9 @@ VALUE taglib_string_list_to_ruby_array(const TagLib::StringList & list) {
 
 TagLib::StringList ruby_array_to_taglib_string_list(VALUE ary) {
   TagLib::StringList result = TagLib::StringList();
+  if (NIL_P(ary)) {
+    return result;
+  }
   for (long i = 0; i < RARRAY_LEN(ary); i++) {
     VALUE e = RARRAY_PTR(ary)[i];
     TagLib::String s = ruby_string_to_taglib_string(e);
@@ -2062,7 +2073,7 @@ SWIG_ruby_failed(void)
 } 
 
 
-/*@SWIG:/usr/local/share/swig/2.0.5/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/usr/local/share/swig/2.0.8/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2ULONG(VALUE *args)
 {
   VALUE obj = args[0];
@@ -2161,7 +2172,7 @@ SWIG_AsCharPtrAndSize(VALUE obj, char** cptr, size_t* psize, int *alloc)
 
 
 
-/*@SWIG:/usr/local/share/swig/2.0.5/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/usr/local/share/swig/2.0.8/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args)
 {
   VALUE obj = args[0];
@@ -2306,7 +2317,7 @@ SWIG_From_float  (float value)
 #include <float.h>
 
 
-/*@SWIG:/usr/local/share/swig/2.0.5/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/usr/local/share/swig/2.0.8/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2DBL(VALUE *args)
 {
   VALUE obj = args[0];

data/ext/taglib_mpeg/taglib_mpeg_wrap.cxx

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.5
+ * Version 2.0.8
  * 
  * This file is not intended to be easily readable and contains a number of 
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -1848,7 +1848,7 @@ static VALUE mMPEG;
 #define SWIG_RUBY_THREAD_END_BLOCK
 
 
-#define SWIGVERSION 0x020005 
+#define SWIGVERSION 0x020008 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -1889,7 +1889,11 @@ VALUE taglib_bytevector_to_ruby_string(const TagLib::ByteVector &byteVector) {
 }
 
 TagLib::ByteVector ruby_string_to_taglib_bytevector(VALUE s) {
-  return TagLib::ByteVector(RSTRING_PTR(s), RSTRING_LEN(s));
+  if (NIL_P(s)) {
+    return TagLib::ByteVector::null;
+  } else {
+    return TagLib::ByteVector(RSTRING_PTR(s), RSTRING_LEN(s));
+  }
 }
 
 VALUE taglib_string_to_ruby_string(const TagLib::String & string) {
@@ -1903,7 +1907,11 @@ VALUE taglib_string_to_ruby_string(const TagLib::String & string) {
 }
 
 TagLib::String ruby_string_to_taglib_string(VALUE s) {
-  return TagLib::String(RSTRING_PTR(CONVERT_TO_UTF8(s)), TagLib::String::UTF8);
+  if (NIL_P(s)) {
+    return TagLib::String::null;
+  } else {
+    return TagLib::String(RSTRING_PTR(CONVERT_TO_UTF8(s)), TagLib::String::UTF8);
+  }
 }
 
 VALUE taglib_string_list_to_ruby_array(const TagLib::StringList & list) {
@@ -1917,6 +1925,9 @@ VALUE taglib_string_list_to_ruby_array(const TagLib::StringList & list) {
 
 TagLib::StringList ruby_array_to_taglib_string_list(VALUE ary) {
   TagLib::StringList result = TagLib::StringList();
+  if (NIL_P(ary)) {
+    return result;
+  }
   for (long i = 0; i < RARRAY_LEN(ary); i++) {
     VALUE e = RARRAY_PTR(ary)[i];
     TagLib::String s = ruby_string_to_taglib_string(e);
@@ -2058,7 +2069,7 @@ SWIG_ruby_failed(void)
 } 
 
 
-/*@SWIG:/usr/local/share/swig/2.0.5/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/usr/local/share/swig/2.0.8/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args)
 {
   VALUE obj = args[0];

data/ext/taglib_ogg/taglib_ogg_wrap.cxx

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.5
+ * Version 2.0.8
  * 
  * This file is not intended to be easily readable and contains a number of 
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -1840,7 +1840,7 @@ static VALUE mOgg;
 #define SWIG_RUBY_THREAD_END_BLOCK
 
 
-#define SWIGVERSION 0x020005 
+#define SWIGVERSION 0x020008 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -1878,7 +1878,11 @@ VALUE taglib_bytevector_to_ruby_string(const TagLib::ByteVector &byteVector) {
 }
 
 TagLib::ByteVector ruby_string_to_taglib_bytevector(VALUE s) {
-  return TagLib::ByteVector(RSTRING_PTR(s), RSTRING_LEN(s));
+  if (NIL_P(s)) {
+    return TagLib::ByteVector::null;
+  } else {
+    return TagLib::ByteVector(RSTRING_PTR(s), RSTRING_LEN(s));
+  }
 }
 
 VALUE taglib_string_to_ruby_string(const TagLib::String & string) {
@@ -1892,7 +1896,11 @@ VALUE taglib_string_to_ruby_string(const TagLib::String & string) {
 }
 
 TagLib::String ruby_string_to_taglib_string(VALUE s) {
-  return TagLib::String(RSTRING_PTR(CONVERT_TO_UTF8(s)), TagLib::String::UTF8);
+  if (NIL_P(s)) {
+    return TagLib::String::null;
+  } else {
+    return TagLib::String(RSTRING_PTR(CONVERT_TO_UTF8(s)), TagLib::String::UTF8);
+  }
 }
 
 VALUE taglib_string_list_to_ruby_array(const TagLib::StringList & list) {
@@ -1906,6 +1914,9 @@ VALUE taglib_string_list_to_ruby_array(const TagLib::StringList & list) {
 
 TagLib::StringList ruby_array_to_taglib_string_list(VALUE ary) {
   TagLib::StringList result = TagLib::StringList();
+  if (NIL_P(ary)) {
+    return result;
+  }
   for (long i = 0; i < RARRAY_LEN(ary); i++) {
     VALUE e = RARRAY_PTR(ary)[i];
     TagLib::String s = ruby_string_to_taglib_string(e);
@@ -1969,7 +1980,7 @@ SWIG_ruby_failed(void)
 } 
 
 
-/*@SWIG:/usr/local/share/swig/2.0.5/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/usr/local/share/swig/2.0.8/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2ULONG(VALUE *args)
 {
   VALUE obj = args[0];
@@ -2092,7 +2103,7 @@ SWIG_From_unsigned_SS_int  (unsigned int value)
 }
 
 
-/*@SWIG:/usr/local/share/swig/2.0.5/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/usr/local/share/swig/2.0.8/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args)
 {
   VALUE obj = args[0];

data/ext/taglib_vorbis/taglib_vorbis_wrap.cxx

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.5
+ * Version 2.0.8
  * 
  * This file is not intended to be easily readable and contains a number of 
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -1844,7 +1844,7 @@ static VALUE mVorbis;
 #define SWIG_RUBY_THREAD_END_BLOCK
 
 
-#define SWIGVERSION 0x020005 
+#define SWIGVERSION 0x020008 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -1882,7 +1882,11 @@ VALUE taglib_bytevector_to_ruby_string(const TagLib::ByteVector &byteVector) {
 }
 
 TagLib::ByteVector ruby_string_to_taglib_bytevector(VALUE s) {
-  return TagLib::ByteVector(RSTRING_PTR(s), RSTRING_LEN(s));
+  if (NIL_P(s)) {
+    return TagLib::ByteVector::null;
+  } else {
+    return TagLib::ByteVector(RSTRING_PTR(s), RSTRING_LEN(s));
+  }
 }
 
 VALUE taglib_string_to_ruby_string(const TagLib::String & string) {
@@ -1896,7 +1900,11 @@ VALUE taglib_string_to_ruby_string(const TagLib::String & string) {
 }
 
 TagLib::String ruby_string_to_taglib_string(VALUE s) {
-  return TagLib::String(RSTRING_PTR(CONVERT_TO_UTF8(s)), TagLib::String::UTF8);
+  if (NIL_P(s)) {
+    return TagLib::String::null;
+  } else {
+    return TagLib::String(RSTRING_PTR(CONVERT_TO_UTF8(s)), TagLib::String::UTF8);
+  }
 }
 
 VALUE taglib_string_list_to_ruby_array(const TagLib::StringList & list) {
@@ -1910,6 +1918,9 @@ VALUE taglib_string_list_to_ruby_array(const TagLib::StringList & list) {
 
 TagLib::StringList ruby_array_to_taglib_string_list(VALUE ary) {
   TagLib::StringList result = TagLib::StringList();
+  if (NIL_P(ary)) {
+    return result;
+  }
   for (long i = 0; i < RARRAY_LEN(ary); i++) {
     VALUE e = RARRAY_PTR(ary)[i];
     TagLib::String s = ruby_string_to_taglib_string(e);
@@ -1973,7 +1984,7 @@ SWIG_ruby_failed(void)
 } 
 
 
-/*@SWIG:/usr/local/share/swig/2.0.5/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/usr/local/share/swig/2.0.8/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args)
 {
   VALUE obj = args[0];

data/lib/taglib/version.rb

@@ -2,7 +2,7 @@ module TagLib
   module Version
     MAJOR = 0
     MINOR = 5
-    PATCH = 0
+    PATCH = 1
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')

data/tasks/ext.rake

@@ -7,9 +7,10 @@ tmp = "#{Dir.pwd}/tmp/#{plat}"
 toolchain_file = "#{Dir.pwd}/ext/win.cmake"
 install_dir = "#{tmp}/install"
 install_dll = "#{install_dir}/bin/libtag.dll"
-$cross_config_options = ["--with-opt-dir=#{install_dir}"]
+ldflags = "-static-libgcc -static-libstdc++"
+$cross_config_options = [%(--with-opt-dir=#{install_dir} --with-ldflags="#{ldflags}")]
 
-taglib_version = '1.7.1'
+taglib_version = '1.7.2'
 taglib = "taglib-#{taglib_version}"
 taglib_url = "http://cloud.github.com/downloads/taglib/taglib/#{taglib}.tar.gz"
 # WITH_MP4, WITH_ASF only needed with taglib 1.7, will be default in 1.8
@@ -57,8 +58,8 @@ task :taglib => [install_dll]
 
 file install_dll => ["#{tmp}/#{taglib}"] do
   chdir "#{tmp}/#{taglib}" do
-    sh "cmake -DCMAKE_INSTALL_PREFIX=#{install_dir} -DCMAKE_TOOLCHAIN_FILE=#{toolchain_file} #{taglib_options}"
-    sh "make"
+    sh %(cmake -DCMAKE_INSTALL_PREFIX=#{install_dir} -DCMAKE_TOOLCHAIN_FILE=#{toolchain_file} -DCMAKE_SHARED_LINKER_FLAGS="#{ldflags}" #{taglib_options})
+    sh "make VERBOSE=1"
     sh "make install"
   end
 end

data/test/id3v2_frames_test.rb

@@ -41,6 +41,10 @@ class TestID3v2Frames < Test::Unit::TestCase
       assert_equal TagLib::ID3v2::UserTextIdentificationFrame, txxx.class
     end
 
+    should "not fail for nil String" do
+      assert_equal [], @tag.frame_list(nil)
+    end
+
     should "be removable" do
       assert_equal 11, @tag.frame_list.size
       tit2 = @tag.frame_list('TIT2').first

data/test/id3v2_write_test.rb

@@ -8,6 +8,12 @@ class TestID3v2Write < Test::Unit::TestCase
   OUTPUT_FILE = "test/data/output.mp3"
   PICTURE_FILE = "test/data/globe_east_540.jpg"
 
+  def reloaded
+    TagLib::MPEG::File.open(OUTPUT_FILE, false) do |file|
+      yield file
+    end
+  end
+
   context "TagLib::MPEG::File" do
     setup do
       FileUtils.cp SAMPLE_FILE, OUTPUT_FILE
@@ -19,6 +25,39 @@ class TestID3v2Write < Test::Unit::TestCase
       success = @file.strip
       assert success
       assert_nil @file.id3v2_tag
+      @file.close
+      @file = nil
+
+      reloaded do |file|
+        assert_equal true, file.id3v1_tag.empty?
+        assert_equal true, file.id3v2_tag.empty?
+      end
+    end
+
+    should "be able to save only ID3v2 tag" do
+      assert_not_nil @file.id3v2_tag
+      assert_not_nil @file.id3v1_tag
+      @file.save(TagLib::MPEG::File::ID3v2)
+      @file.close
+      @file = nil
+
+      reloaded do |file|
+        id3v1_tag = file.id3v1_tag
+        id3v2_tag = file.id3v2_tag
+
+        # TagLib always creates the tags
+        assert_not_nil id3v1_tag
+        assert_not_nil id3v2_tag
+
+        assert_equal true, file.id3v1_tag.empty?
+        assert_equal false, file.id3v2_tag.empty?
+      end
+    end
+
+    should "be able to set fields to nil" do
+      tag = @file.id3v2_tag
+      tag.title = nil
+      assert_equal [], tag.frame_list('TIT2')
     end
 
     context "with a fresh tag" do
@@ -72,6 +111,12 @@ class TestID3v2Write < Test::Unit::TestCase
         assert success
       end
 
+      should "not fail when field_list is nil" do
+        tit2 = TagLib::ID3v2::TextIdentificationFrame.new("TIT2", TagLib::String::UTF8)
+        tit2.field_list = nil
+        assert_equal [], tit2.field_list
+      end
+
       if HAVE_ENCODING
         should "be able to set unicode fields" do
           # Hello, Unicode Snowman (not in Latin1)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: taglib-ruby
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
   prerelease: 
 platform: x86-mingw32
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-15 00:00:00.000000000 Z
+date: 2012-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &13930840 !ruby/object:Gem::Requirement
+  requirement: &20593060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *13930840
+  version_requirements: *20593060
 - !ruby/object:Gem::Dependency
   name: rake-compiler
-  requirement: &13930200 !ruby/object:Gem::Requirement
+  requirement: &20592500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '0.8'
   type: :development
   prerelease: false
-  version_requirements: *13930200
+  version_requirements: *20592500
 - !ruby/object:Gem::Dependency
   name: shoulda-context
-  requirement: &13929340 !ruby/object:Gem::Requirement
+  requirement: &20592000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *13929340
+  version_requirements: *20592000
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &13928020 !ruby/object:Gem::Requirement
+  requirement: &20591280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: '0.7'
   type: :development
   prerelease: false
-  version_requirements: *13928020
+  version_requirements: *20591280
 description: ! 'Ruby interface for the taglib C++ library, for reading and writing
 
   meta-data (tags) of many audio formats.
@@ -183,7 +183,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3527393592601875683
+      hash: -2354278842585131059
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -192,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3527393592601875683
+      hash: -2354278842585131059
 requirements:
 - taglib (libtag1-dev in Debian/Ubuntu, taglib-devel in Fedora/RHEL)
 rubyforge_project: