taglib-ruby 0.3.0 → 0.3.1

data/CHANGES.md

@@ -1,6 +1,12 @@
 Changes in Releases of taglib-ruby
 ==================================
 
+## 0.3.1 (2012-01-22)
+
+* Fix ObjectPreviouslyDeleted exception after calling
+  TagLib::ID3v2::Tag#add_frame (#8)
+* Make installation under MacPorts work out of the box (#7)
+
 ## 0.3.0 (2012-01-02)
 
 * Add support for Ogg Vorbis

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2010, 2011 Robin Stocker
+Copyright (c) 2010-2012 Robin Stocker
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -149,7 +149,7 @@ License
 taglib-ruby is distributed under the MIT License,
 see LICENSE.txt for details.
 
-Copyright (c) 2010, 2011 Robin Stocker.
+Copyright (c) 2010-2012 Robin Stocker.
 
 [taglib]: http://developer.kde.org/~wheeler/taglib.html
 [flattr-img]: http://api.flattr.com/button/flattr-badge-large.png

data/ext/extconf_common.rb

@@ -1,3 +1,7 @@
+# Default opt dirs to help mkmf find taglib
+configure_args = "--with-opt-dir=/usr/local:/opt/local:/sw "
+ENV['CONFIGURE_ARGS'] = configure_args + ENV.fetch('CONFIGURE_ARGS', "")
+
 require 'mkmf'
 
 def error msg

data/ext/taglib_id3v2/taglib_id3v2.i

@@ -78,7 +78,14 @@ VALUE taglib_id3v2_framelist_to_ruby_array(TagLib::ID3v2::FrameList *list) {
 }
 %apply TagLib::ID3v2::FrameList & { const TagLib::ID3v2::FrameList & };
 
-%apply SWIGTYPE *DISOWN { TagLib::ID3v2::Frame *frame };
+%typemap(in, noblock=1) TagLib::ID3v2::Frame * (int res = 0) {
+  res = SWIG_ConvertPtr($input, %as_voidptrptr(&$1), $descriptor, SWIG_POINTER_DISOWN | %convertptr_flags);
+  if (!SWIG_IsOK(res)) {
+    %argument_fail(res, "$type", $symname, $argnum);
+  }
+  SWIG_RubyUnlinkObjects($1);
+  SWIG_RubyRemoveTracking($1);
+}
 %ignore TagLib::ID3v2::Tag::removeFrame(Frame *, bool);
 %include <taglib/id3v2tag.h>
 %clear TagLib::ID3v2::Frame *;

data/ext/taglib_id3v2/taglib_id3v2_wrap.cxx

@@ -3388,7 +3388,8 @@ _wrap_Tag_add_frame(int argc, VALUE *argv, VALUE self) {
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "TagLib::ID3v2::Frame *","addFrame", 2, argv[0] ));
   }
-  SWIG_RubyUnlinkObjects(SWIG_as_voidptr(arg2));
+  SWIG_RubyUnlinkObjects(arg2);
+  SWIG_RubyRemoveTracking(arg2);
   (arg1)->addFrame(arg2);
   return Qnil;
 fail:
@@ -3416,7 +3417,8 @@ _wrap_Tag_remove_frame(int argc, VALUE *argv, VALUE self) {
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "TagLib::ID3v2::Frame *","removeFrame", 2, argv[0] ));
   }
-  SWIG_RubyUnlinkObjects(SWIG_as_voidptr(arg2));
+  SWIG_RubyUnlinkObjects(arg2);
+  SWIG_RubyRemoveTracking(arg2);
   (arg1)->removeFrame(arg2);
   return Qnil;
 fail:

data/lib/taglib/version.rb

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

data/taglib-ruby.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "taglib-ruby"
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Robin Stocker"]
-  s.date = "2012-01-02"
+  s.date = "2012-01-22"
   s.description = "Ruby interface for the taglib C++ library.\n\nIn contrast to other libraries, this one wraps the C++ API using SWIG,\nnot only the minimal C API. This means that all tags can be accessed.\n"
   s.email = "robin@nibor.org"
   s.extensions = ["ext/taglib_base/extconf.rb", "ext/taglib_mpeg/extconf.rb", "ext/taglib_id3v1/extconf.rb", "ext/taglib_id3v2/extconf.rb", "ext/taglib_ogg/extconf.rb", "ext/taglib_vorbis/extconf.rb"]

data/test/test_id3v2_memory.rb

@@ -67,6 +67,16 @@ class TestID3v2Memory < Test::Unit::TestCase
       end
     end
 
+    should "not throw when adding frame via Tag.add_frame" do
+      tcom = TagLib::ID3v2::TextIdentificationFrame.new('TCOM', TagLib::String::Latin1)
+      tcom.text = "Some composer"
+      @tag.add_frame tcom
+      # the following leads to an ObjectPreviouslyDeleted error (see Issue #8)
+      assert_nothing_raised do
+        @tag.frame_list.find{ |fr| 'TCOM' == fr.frame_id }
+      end
+    end
+
     teardown do
       if @file
         @file.close

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: taglib-ruby
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-02 00:00:00.000000000 Z
+date: 2012-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
-  requirement: &18528240 !ruby/object:Gem::Requirement
+  requirement: &15279760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '0.7'
   type: :development
   prerelease: false
-  version_requirements: *18528240
+  version_requirements: *15279760
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &18527040 !ruby/object:Gem::Requirement
+  requirement: &15277940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '2.11'
   type: :development
   prerelease: false
-  version_requirements: *18527040
+  version_requirements: *15277940
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &18525980 !ruby/object:Gem::Requirement
+  requirement: &15274780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *18525980
+  version_requirements: *15274780
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &18525180 !ruby/object:Gem::Requirement
+  requirement: &15426340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *18525180
+  version_requirements: *15426340
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &18524140 !ruby/object:Gem::Requirement
+  requirement: &15424280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '0.7'
   type: :development
   prerelease: false
-  version_requirements: *18524140
+  version_requirements: *15424280
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &18523500 !ruby/object:Gem::Requirement
+  requirement: &15421060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *18523500
+  version_requirements: *15421060
 - !ruby/object:Gem::Dependency
   name: guard-test
-  requirement: &18522720 !ruby/object:Gem::Requirement
+  requirement: &15515540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,7 +87,7 @@ dependencies:
         version: 0.4.0
   type: :development
   prerelease: false
-  version_requirements: *18522720
+  version_requirements: *15515540
 description: ! 'Ruby interface for the taglib C++ library.
 
 
@@ -200,7 +200,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1593774999472274460
+      hash: -3440148928620656920
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: