taglib2 0.1.2 → 0.1.3

data/ChangeLog

@@ -1,3 +1,8 @@
+# 0.1.3
+Add File#close methods
+Add Rakefile file to gem package
+
+# 0.1.2
 Add Rakefile.
 Fix a bug that occurs when calling super from a child class of TagLib::File.
 

data/Rakefile

@@ -0,0 +1,112 @@
+# encoding: UTF-8
+=begin
+Copyright 2010 Vincent Carmona
+vinc4mai+taglib@gmail.com
+
+This file is part of ruby-taglib2.
+
+    ruby-taglib2 is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    ruby-taglib2 is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with ruby-taglib2; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+=end
+
+require 'rake/rdoctask'
+require 'rake/testtask'
+
+compat=ENV['COMPAT']=="true"
+
+#Default task
+task :default => :build
+
+#Building
+file "Makefile" => ["extconf.rb"] do
+	extconf="extconf.rb"
+	extconf+=" --compat" if compat
+	ruby(extconf)
+end
+
+desc "Build librairy"
+task :build => "Makefile" do
+  sh("make")
+end
+
+Rake::RDocTask.new do |rd|
+	rd.options << "--exclude" << "extconf.rb"
+	rd.options << "--exclude" << "tests/"
+end
+
+#Testing
+Rake::TestTask.new do |t|
+	t.libs=[]
+	t.test_files=FileList['tests/tests.rb']
+	t.options=" --compat" if compat
+end
+
+#Installing
+
+desc "Install librairy"
+task :install => :build do
+	sh("make install")
+end
+
+#Cleaning
+desc "Remove any temporary products."
+task :clean do
+  sh("make clean") if File.exist?("Makefile")
+end
+
+desc "Remove any generated file."
+task :clobber  do
+  sh("make distclean") if File.exist?("Makefile")
+end
+
+begin
+	require 'rubygems'
+	require 'rake/gempackagetask.rb'
+
+	files=FileList['lib/**/*.rb', "compat/taglib.rb", '*.h', '*.c', 'extconf.rb',
+		'ChangeLog', 'COPYING', 'README', 'Rakefile']
+	ext=FileList["extconf.rb"]
+	rdoc_options=["taglib2.c"]
+
+	def retrieve_version
+		File.open('lib/taglib2.rb'){|f| l=f.readlines}.
+			grep(/VERSION=\[(\d+).*(\d+).*(\d+)\]/){$1+"."+$2+"."+$3}[0]
+	end
+
+	spec=Gem::Specification.new do |s|
+		s.name='taglib2'
+		s.version=retrieve_version
+		s.summary="ruby-taglib2 is a Ruby interface to TagLib, the audio meta-data library. It allows Ruby programs to read and write meta-data of all the audio formats supported by TagLib. It was written because ruby-taglib suffers severals bugs with ruby 1.9."
+		s.author="Vincent Carmona"
+		s.email="vinc4mai@gmail.com"
+		s.rubyforge_project='zik'
+		s.homepage="http://zik.rubyforge.org/ruby-taglib2"
+		s.license="General Public License v2"
+
+		s.files=files.to_a
+		s.extensions=ext.to_a
+
+		s.rdoc_options=rdoc_options
+
+		if ENV['GEM_PRIVATE_KEY']&&ENV['GEM_CERTIFICATE_CHAIN']
+			s.signing_key=ENV['GEM_PRIVATE_KEY']
+			s.cert_chain=ENV['GEM_CERTIFICATE_CHAIN'].split(" ")
+		else
+			$stderr.puts "WARNING: gem will not be signed."
+		end
+	end
+	Rake::GemPackageTask.new(spec){}
+rescue LoadError => e
+	$stderr.puts "WARNING: "+e
+end

data/compat/taglib.rb

@@ -24,10 +24,4 @@ require "taglib2"
 module TagLib
 class BadPath < Exception
 end
-
-class File
-	def close
-		nil
-	end
-end
 end

data/lib/taglib2.rb

@@ -23,5 +23,5 @@ require "taglib2.so"
 
 #:main: TagLib::File
 module TagLib
-VERSION=[0, 1, 2]
+VERSION=[0, 1, 3]
 end

data/taglib2.c

@@ -27,16 +27,18 @@ typedef struct
     TagLib_File *file;
     TagLib_Tag *tag;
     const TagLib_AudioProperties *audio;
+    int closed;
 } tgFileData;
 
 VALUE mTagLib;
-VALUE eBadFile, eBadTag, eBadAudioProperties;
+VALUE eBadFile, eBadTag, eBadAudioProperties, eFileClosed;
 VALUE cFile;
 
 static void
 free_tgFileData(tgFileData *d)
 {
-    taglib_file_free(d->file);
+    if (!d->closed)
+    	taglib_file_free(d->file);
     free(d);
 }
 
@@ -74,6 +76,16 @@ file_audio(VALUE self)
     return d->audio;
 }
 
+void
+file_check_closed(VALUE self)
+{
+	tgFileData *d;
+
+	Data_Get_Struct(self, tgFileData, d);
+	if (d->closed)
+		 rb_raise(eFileClosed, "File closed");
+}
+
 /*:nodoc:*/
 VALUE
 file_alloc(VALUE self)
@@ -83,6 +95,7 @@ file_alloc(VALUE self)
 	data=ALLOC(tgFileData);
     data->tag=NULL;
     data->audio=NULL;
+    data->closed=0;
 	return Data_Wrap_Struct(self, 0, free_tgFileData, data);
 }
 
@@ -126,6 +139,7 @@ file_save(VALUE self)
 {
     tgFileData *data;
 
+    file_check_closed(self);
     Data_Get_Struct(self, tgFileData, data);
     if (taglib_file_save(data->file))
     {
@@ -137,12 +151,27 @@ file_save(VALUE self)
 	}
 }
 
+/*Close audio file*/
+VALUE
+file_close(VALUE self)
+{
+	tgFileData *data;
+
+	Data_Get_Struct(self, tgFileData, data);
+	if (data->closed)
+		return self;
+	taglib_file_free(data->file);
+	data->closed=1;
+	return self;
+}
+
 /*Get track title*/
 VALUE
 file_get_title(VALUE self)
 {
 	VALUE str;
 
+	file_check_closed(self);
 	str=rb_str_new2(taglib_tag_title(file_tag(self)));
 	taglib_tag_free_strings;
     return str;
@@ -157,6 +186,7 @@ Set track title to title
 VALUE
 file_set_title(VALUE self, VALUE title)
 {
+    file_check_closed(self);
     taglib_tag_set_title(file_tag(self), StringValuePtr(title));
     return title;
 }
@@ -167,6 +197,7 @@ file_get_artist(VALUE self)
 {
 	VALUE str;
 
+	file_check_closed(self);
 	str=rb_str_new2(taglib_tag_artist(file_tag(self)));
 	taglib_tag_free_strings;
     return str;
@@ -181,6 +212,7 @@ Set track artist to artist
 VALUE
 file_set_artist(VALUE self, VALUE artist)
 {
+    file_check_closed(self);
     taglib_tag_set_artist(file_tag(self), StringValuePtr(artist));
     return artist;
 }
@@ -191,6 +223,7 @@ file_get_album(VALUE self)
 {
 	VALUE str;
 
+	file_check_closed(self);
 	str=rb_str_new2(taglib_tag_album(file_tag(self)));
 	taglib_tag_free_strings;
     return str;
@@ -205,6 +238,7 @@ Set track album to album
 VALUE
 file_set_album(VALUE self, VALUE album)
 {
+    file_check_closed(self);
     taglib_tag_set_album(file_tag(self), StringValuePtr(album));
     return album;
 }
@@ -215,6 +249,7 @@ file_get_comment(VALUE self)
 {
 	VALUE str;
 
+	file_check_closed(self);
 	str=rb_str_new2(taglib_tag_comment(file_tag(self)));
 	taglib_tag_free_strings;
     return str;
@@ -229,6 +264,7 @@ Set track comment to comment
 VALUE
 file_set_comment(VALUE self, VALUE comment)
 {
+    file_check_closed(self);
     taglib_tag_set_comment(file_tag(self), StringValuePtr(comment));
     return comment;
 }
@@ -239,6 +275,7 @@ file_get_genre(VALUE self)
 {
 	VALUE str;
 
+	file_check_closed(self);
 	str=rb_str_new2(taglib_tag_genre(file_tag(self)));
 	taglib_tag_free_strings;
     return str;
@@ -253,6 +290,7 @@ Set track genre to genre
 VALUE
 file_set_genre(VALUE self, VALUE genre)
 {
+    file_check_closed(self);
     taglib_tag_set_genre(file_tag(self), StringValuePtr(genre));
     return genre;
 }
@@ -261,6 +299,7 @@ file_set_genre(VALUE self, VALUE genre)
 VALUE
 file_get_year(VALUE self)
 {
+    file_check_closed(self);
     return INT2FIX(taglib_tag_year(file_tag(self)));
 }
 
@@ -273,6 +312,7 @@ Set track year to year
 VALUE
 file_set_year(VALUE self, VALUE year)
 {
+    file_check_closed(self);
     taglib_tag_set_year(file_tag(self), NUM2INT(year));
     return year;
 }
@@ -281,6 +321,7 @@ file_set_year(VALUE self, VALUE year)
 VALUE
 file_get_track(VALUE self)
 {
+    file_check_closed(self);
     return INT2FIX(taglib_tag_track(file_tag(self)));
 }
 
@@ -293,6 +334,7 @@ Set track number to number
 VALUE
 file_set_track(VALUE self, VALUE track)
 {
+    file_check_closed(self);
     taglib_tag_set_track(file_tag(self), NUM2INT(track));
     return track;
 }
@@ -301,6 +343,7 @@ file_set_track(VALUE self, VALUE track)
 VALUE
 file_get_length(VALUE self)
 {
+    file_check_closed(self);
     return INT2NUM(taglib_audioproperties_length(file_audio(self)));
 }
 
@@ -308,6 +351,7 @@ file_get_length(VALUE self)
 VALUE
 file_get_bitrate(VALUE self)
 {
+    file_check_closed(self);
     return INT2NUM(taglib_audioproperties_bitrate(file_audio(self)));
 }
 
@@ -315,6 +359,7 @@ file_get_bitrate(VALUE self)
 VALUE
 file_get_samplerate(VALUE self)
 {
+    file_check_closed(self);
     return INT2NUM(taglib_audioproperties_samplerate(file_audio(self)));
 }
 
@@ -322,6 +367,7 @@ file_get_samplerate(VALUE self)
 VALUE
 file_get_channels(VALUE self)
 {
+    file_check_closed(self);
     return INT2NUM(taglib_audioproperties_channels(file_audio(self)));
 }
 
@@ -342,6 +388,7 @@ ruby-taglib2 is a Ruby interface to TagLib, the audio meta-data library.
     eBadFile=rb_define_class_under(mTagLib, "BadFile", rb_eException);
     eBadTag=rb_define_class_under(mTagLib, "BadTag", rb_eException);
     eBadAudioProperties=rb_define_class_under(mTagLib, "BadAudioProperties", rb_eException);
+    eFileClosed=rb_define_class_under(mTagLib, "FileClosed", rb_eException);
 
     rb_define_const(mTagLib, "MPEG", INT2FIX(TagLib_File_MPEG));
     rb_define_const(mTagLib, "OggVorbis", INT2FIX(TagLib_File_OggVorbis));
@@ -358,6 +405,7 @@ ruby-taglib2 is a Ruby interface to TagLib, the audio meta-data library.
     rb_define_alloc_func(cFile, file_alloc);
     rb_define_method(cFile, "initialize", file_init, -1);
     rb_define_method(cFile, "save", file_save, 0);
+    rb_define_method(cFile, "close", file_close, 0);
     rb_define_method(cFile, "title", file_get_title, 0);
     rb_define_method(cFile, "title=", file_set_title, 1);
     rb_define_method(cFile, "artist", file_get_artist, 0);

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: taglib2
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Vincent Carmona
@@ -36,7 +36,7 @@ cert_chain:
   oxzIRXlS
   -----END CERTIFICATE-----
 
-date: 2011-03-10 00:00:00 +01:00
+date: 2011-04-27 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -56,6 +56,7 @@ files:
 - ChangeLog
 - COPYING
 - README
+- Rakefile
 has_rdoc: true
 homepage: http://zik.rubyforge.org/ruby-taglib2
 licenses: