mb-discid 0.1.4 → 0.1.5

data/CHANGES

@@ -1,5 +1,10 @@
 = Changelog
 
+== 0.1.5 (2011-07-02)
+* Added binding for get_webservice_url()
+* Add lib path detection, allows out-of-the-box install when your
+  libdiscid is in /usr/local (Matt Patterson)
+
 == 0.1.4 (2009-11-19)
 * Fixed calling +read+ method without argument
 
@@ -26,4 +31,4 @@
 == 0.1.0 (2007-06-02)
 * Initial release
 
-$Id: CHANGES 301 2009-11-19 11:39:31Z phw $
+$Id: CHANGES 333 2011-07-02 13:41:07Z phw $

data/README

@@ -7,7 +7,7 @@ to find the release entry for your CD in the MusicBrainz database.
 
 == Requirements
 * Ruby >= 1.8.6
-* libdiscid >= 0.1.0
+* libdiscid >= 0.2.2
 
 == Installation
 Before installing rdiscid make sure you have libdiscid installed. See
@@ -51,4 +51,4 @@ MB-DiscID is Copyright (c) 2007 Philipp Wolfer.
 It is free softare distributed under a BSD style license. See
 LICENSE[link:files/LICENSE.html] for details.
 
-$Id: README 298 2009-11-19 09:26:45Z phw $
+$Id: README 315 2010-06-14 21:30:06Z phw $

data/Rakefile

@@ -1,4 +1,4 @@
-# $Id: Rakefile 300 2009-11-19 11:31:42Z phw $
+# $Id: Rakefile 330 2011-07-02 13:12:30Z phw $
 # Copyright (c) 2007, Philipp Wolfer
 # All rights reserved.
 # See LICENSE for permissions.
@@ -17,7 +17,7 @@ end
 # Packaging tasks: -------------------------------------------------------
 
 PKG_NAME     = 'mb-discid'
-PKG_VERSION  = '0.1.4'
+PKG_VERSION  = '0.1.5'
 PKG_SUMMARY  = 'Ruby bindings for libdiscid.'
 PKG_AUTHOR   = 'Philipp Wolfer'
 PKG_EMAIL    = 'phw@rubyforge.org'
@@ -50,7 +50,7 @@ spec = Gem::Specification.new do |spec|
     spec.extensions << 'ext/extconf.rb'
     spec.required_ruby_version = ">= 1.8.6"
   end
-  spec.requirements << 'libdiscid (http://musicbrainz.org/doc/libdiscid)'
+  spec.requirements << 'libdiscid >= 0.2.2 (http://musicbrainz.org/doc/libdiscid)'
   spec.require_paths = ['lib', 'ext']
   spec.autorequire = spec.name
   spec.description = PKG_DESCRIPTION

data/examples/discid.rb

@@ -9,7 +9,11 @@
 # Example:
 #  ./discid.rb /dev/dvd
 #
-# $Id: discid.rb 201 2008-02-13 14:59:48Z phw $
+# $Id: discid.rb 312 2010-06-14 21:04:14Z phw $
+
+# Just make sure we can run this example from the command
+# line even if RBrainz is not yet installed properly.
+$: << 'lib/' << 'ext/' << '../ext/' << '../lib/'
 
 require 'mb-discid'
 
@@ -55,3 +59,4 @@ end
 # Print a submission URL that can be used to submit
 # the disc ID to MusicBrainz.org.
 puts "\nSubmit via #{disc.submission_url}"
+puts "\nWebservice #{disc.webservice_url}"

data/ext/extconf.rb

@@ -1,8 +1,54 @@
 #!/usr/bin/env ruby
-# $Id: extconf.rb 68 2007-06-03 14:12:21Z phw $
+# $Id: extconf.rb 329 2011-07-02 12:49:58Z phw $
 
 require 'mkmf'
 
+LIBDIR = Config::CONFIG['libdir']
+INCLUDEDIR = Config::CONFIG['includedir']
+
+$CFLAGS << " #{ENV["CFLAGS"]}"
+$LIBS << " #{ENV["LIBS"]}"
+
+# totally thieved from Nokogiri's extconf.rb
+if Config::CONFIG['target_os'] =~ /mswin32/
+  # There's no default include/lib dir on Windows. Let's just add the Ruby ones
+  # and resort on the search path specified by INCLUDE and LIB environment
+  # variables
+  HEADER_DIRS = [INCLUDEDIR]
+  LIB_DIRS = [LIBDIR]
+
+else
+  HEADER_DIRS = [
+    # First search /opt/local for macports
+    '/opt/local/include',
+
+    # Then search /usr/local for people that installed from source
+    '/usr/local/include',
+
+    # Check the ruby install locations
+    INCLUDEDIR,
+
+    # Finally fall back to /usr
+    '/usr/include',
+  ]
+
+  LIB_DIRS = [
+    # First search /opt/local for macports
+    '/opt/local/lib',
+
+    # Then search /usr/local for people that installed from source
+    '/usr/local/lib',
+
+    # Check the ruby install locations
+    LIBDIR,
+
+    # Finally fall back to /usr
+    '/usr/lib',
+  ]
+end
+
+dir_config('discid', HEADER_DIRS, LIB_DIRS)
+
 if have_library('discid', 'discid_new') or
    have_library('discid.dll', 'discid_new')
   # Remove -MD from compiler flags on Windows.
@@ -10,4 +56,4 @@ if have_library('discid', 'discid_new') or
   create_makefile('MB_DiscID')
 else
   puts 'Required library libdiscid not found.'
-end
+end

data/ext/mb_discid.c

@@ -1,5 +1,5 @@
 /**
- * $Id: mb_discid.c 301 2009-11-19 11:39:31Z phw $
+ * $Id: mb_discid.c 312 2010-06-14 21:04:14Z phw $
  *
  * Ruby bindings for libdiscid. See http://musicbrainz.org/doc/libdiscid
  * for more information on libdiscid and MusicBrainz.
@@ -65,6 +65,30 @@ static VALUE mb_discid_submission_url(VALUE self)
 	}
 }
 
+/**
+ * call-seq:
+ *  webservice_url() -> string or nil
+ * 
+ * Return an URL for retrieving CD information from MusicBrainz' web service
+ *
+ * The URL provides the CD information in XML. 
+ * See http://musicbrainz.org/development/mmd for details.
+ *
+ * Returns +nil+ if no ID was yet read.
+ */
+static VALUE mb_discid_webservice_url(VALUE self)
+{
+	if (rb_iv_get(self, "@read") == Qfalse)
+		return Qnil;
+	else
+	{
+		DiscId *disc;
+		Data_Get_Struct(self, DiscId, disc);
+		
+		return rb_str_new2(discid_get_webservice_url(disc));
+	}
+}
+
 /**
  * call-seq:
  *  freedb_id() -> string or nil
@@ -352,6 +376,7 @@ void Init_MB_DiscID()
 	rb_define_method(cDiscID, "put", mb_discid_put, 3);
 	rb_define_method(cDiscID, "id", mb_discid_id, 0);
 	rb_define_method(cDiscID, "submission_url", mb_discid_submission_url, 0);
+	rb_define_method(cDiscID, "webservice_url", mb_discid_webservice_url, 0);
 	rb_define_method(cDiscID, "freedb_id", mb_discid_freedb_id, 0);
 	rb_define_method(cDiscID, "first_track_num", mb_discid_first_track_num, 0);
 	rb_define_method(cDiscID, "last_track_num", mb_discid_last_track_num, 0);

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mb-discid
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  hash: 17
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Philipp Wolfer
@@ -9,7 +15,7 @@ autorequire: mb-discid
 bindir: bin
 cert_chain: []
 
-date: 2009-11-19 00:00:00 +01:00
+date: 2011-07-02 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -44,21 +50,29 @@ require_paths:
 - lib
 - ext
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 59
+      segments: 
+      - 1
+      - 8
+      - 6
       version: 1.8.6
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: 
-- libdiscid (http://musicbrainz.org/doc/libdiscid)
+- libdiscid >= 0.2.2 (http://musicbrainz.org/doc/libdiscid)
 rubyforge_project: rbrainz
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Ruby bindings for libdiscid.