uuid4r 0.1 → 0.1.1

data/ext/extconf.rb

@@ -1,13 +1,17 @@
 require 'mkmf'
-$LDFLAGS = "-lossp-uuid"
-$CFLAGS = "-Wall"
-if !have_library('ossp-uuid')
-  puts "OSSP uuid liberary required -- not found."
+
+if File.exist?(`which uuid-config`.chomp)
+  $CFLAGS << " -Wall " << `uuid-config --cflags`.chomp
+  $LDFLAGS << " " << `uuid-config --ldflags`.chomp
+end
+
+if !have_library('uuid')
+  puts "OSSP uuid library required -- not found."
   exit 1
 end
 create_makefile('uuid4r')
 File.open("Makefile", "a") << <<-EOT
 
 check:	$(DLLIB)
-	@$(RUBY) $(srcdir)/test/test_uuid.rb 
+	@$(RUBY) #{File.dirname(__FILE__)}/../test/test_uuid.rb
 EOT

data/ext/uuid4r.c

@@ -24,7 +24,7 @@
  */
  
 #include "ruby.h"
-#include "ossp/uuid.h"
+#include "uuid.h"
 
 VALUE rb_cUUID4R;
 VALUE rb_cUUID4RCommon;
@@ -162,7 +162,7 @@ uuid4r_import(self, format, str)
     uuid_create(&uuid);
     fmt = rb2uuid_fmt(format);
     StringValue(str);
-    uuid_import(uuid, fmt, RSTRING(str)->ptr, RSTRING(str)->len);
+    uuid_import(uuid, fmt, RSTRING_PTR(str), RSTRING_LEN(str));
     
     return Data_Wrap_Struct(rb_cUUID4RCommon, 0, uuid4r_free, uuid);
 }
@@ -268,7 +268,7 @@ uuid4r_uuid(argc, argv, self)
     uuid_t *uuid_ns;
     char *uuid_ns_str;
     uuid_fmt_t fmt;
-    unsigned int mode;
+    unsigned int mode = 0; /* suppress compiler warning */
     uuid_t *uuid;
     VALUE result;
 
@@ -277,7 +277,7 @@ uuid4r_uuid(argc, argv, self)
     
     switch (argc) {
         case 1:
-           rb_scan_args(argc, argv, "11", &version); 
+           rb_scan_args(argc, argv, "11", &version, &format);
            fmt = UUID_FMT_STR;
            break;
         case 2:
@@ -285,7 +285,7 @@ uuid4r_uuid(argc, argv, self)
            fmt = rb2uuid_fmt(format);           
            break;
         case 3:
-           rb_scan_args(argc, argv, "31", &version, &namespace, &namespace_str); 
+           rb_scan_args(argc, argv, "31", &version, &namespace, &namespace_str, &format);
            fmt = UUID_FMT_STR;
            break;
         case 4:

data/test/test_uuid.rb

@@ -1,5 +1,5 @@
 require 'test/unit'
-require './uuid4r.so'
+require 'uuid4r.so'
 
 class UUIDTest < Test::Unit::TestCase
   def test_uuid_v1_default
@@ -25,9 +25,9 @@ class UUIDTest < Test::Unit::TestCase
 
   def test_uuid_v1_txt
     assert_kind_of(String, UUID4R::uuid_v1(:txt))
-    assert(/^variant:/ =~ UUID4R::uuid_v1(:txt))
-    assert(/^version:/ =~ UUID4R::uuid_v1(:txt))
-    assert(/^content:/ =~ UUID4R::uuid_v1(:txt))
+    assert(/variant: DCE 1.1/ =~ UUID4R::uuid_v1(:txt))
+    assert(/version: 1/ =~ UUID4R::uuid_v1(:txt))
+    assert(/content:/ =~ UUID4R::uuid_v1(:txt))
   end
   
   def test_uuid_v3_str
@@ -73,9 +73,9 @@ class UUID4Rv1Test < Test::Unit::TestCase
 
   def test_compare
     uuid2 = UUID4R::UUID4Rv1.new
-    assert(@uuid.compare(uuid2) < 0)
-    assert(@uuid.compare(@uuid) == 0)
-    assert(uuid2.compare(@uuid) > 0)
+    assert(@uuid.compare(uuid2) == -1)
+    assert(@uuid.compare(@uuid) ==  0)
+    assert(uuid2.compare(@uuid) ==  1)
     assert_equal(-1, @uuid <=> uuid2)
     assert_equal( 0, @uuid <=> @uuid)
     assert_equal( 1, uuid2 <=> @uuid)

metadata

@@ -1,52 +1,62 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.11
-specification_version: 1
 name: uuid4r
 version: !ruby/object:Gem::Version 
-  version: "0.1"
-date: 2006-05-24 00:00:00 +09:00
-summary: This generates and parses UUID, based on OSSP uuid C library.
-require_paths: 
-- .
-email: daigo@debian.org
-homepage: http://uuid4r.rubyforge.org
-rubyforge_project: uuid4r
-description: This library generates and parses Universally Unique Identifier (UUID), based on OSSP uuid C library. So, libossp-uuid library is pre-required. OSSP uuid (http://www.ossp.org/pkg/lib/uuid/) is a ISO-C:1999 application programming interface (API) for the generation of DCE 1.1, ISO/IEC 11578:1996 and RFC 4122 compliant UUID. It supports DCE 1.1 variant UUIDs of version 1 (time and node based), version 3 (name based, MD5), version 4 (random number based) and version 5 (name based, SHA-1).
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 0.1.1
 platform: ruby
-signing_key: 
-cert_chain: 
 authors: 
 - Daigo Moriwaki
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2010-02-12 00:00:00 +01:00
+default_executable: 
+dependencies: []
+
+description: "    This library generates and parses Universally Unique Identifier (UUID),\n    based on OSSP uuid C library. So, libossp-uuid library is pre-required.\n    OSSP uuid (http://www.ossp.org/pkg/lib/uuid/) is a ISO-C:1999 application\n    programming interface (API) for the generation of DCE 1.1, ISO/IEC\n    11578:1996 and RFC 4122 compliant UUID. It supports DCE 1.1 variant UUIDs\n    of version 1 (time and node based), version 3 (name based, MD5), version 4\n    (random number based) and version 5 (name based, SHA-1).\n"
+email: daigo@debian.org
+executables: []
+
+extensions: 
+- ext/extconf.rb
+extra_rdoc_files: 
+- README
 files: 
 - ext/extconf.rb
 - ext/uuid4r.c
 - test/test_uuid.rb
 - README
-test_files: 
-- test/test_uuid.rb
+has_rdoc: true
+homepage: http://uuid4r.rubyforge.org
+licenses: []
+
+post_install_message: 
 rdoc_options: 
 - --title
 - UUID4R
 - --main
 - README
 - --line-numbers
-extra_rdoc_files: 
-- README
-executables: []
-
-extensions: 
-- ext/extconf.rb
+require_paths: 
+- .
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: []
-
+rubyforge_project: uuid4r
+rubygems_version: 1.3.5
+signing_key: 
+specification_version: 3
+summary: This generates and parses UUID, based on OSSP uuid C library.
+test_files: 
+- test/test_uuid.rb