kballard-osx-plist 1.0 → 1.0.1

data/README.txt

@@ -1,6 +1,6 @@
 == osx/plist
     by Kevin Ballard
-    http://github.com/kballard/plist
+    http://github.com/kballard/osx-plist
 
 == DESCRIPTION:
 
@@ -13,17 +13,17 @@ osx/plist is a Ruby library for manipulating Property Lists natively using the b
 == INSTALL:
 
   $ gem sources -a http://gems.github.com/ (you only need to do this once)
-  $ gem install kballard-plist
+  $ gem install kballard-osx-plist
 
 == SOURCE:
 
 osx/plist's git repo is available on GitHub, which can be browsed at:
 
-  http://github.com/kballard/plist
+  http://github.com/kballard/osx-plist
 
 and cloned from:
 
-  git://github.com/kballard/plist.git
+  git://github.com/kballard/osx-plist.git
 
 == USAGE:
 

data/Rakefile

@@ -1,10 +1,10 @@
 require 'rubygems'
 require 'hoe'
 
-Hoe.new('osx-plist', "1.0") do |p|
+Hoe.new('osx-plist', "1.0.1") do |p|
   p.author = "Kevin Ballard"
   p.email = "kevin@sb.org"
   p.summary = "Property List manipulation for OS X"
-  p.url = "http://www.github.com/kballard/plist"
+  p.url = "http://www.github.com/kballard/osx-plist"
   p.spec_extras = {:extensions => "ext/plist/extconf.rb"}
 end

data/ext/plist/plist.c

@@ -57,7 +57,11 @@
  */
 
 #include <ruby.h>
+#if HAVE_RUBY_ST_H
+#include <ruby/st.h>
+#else
 #include <st.h>
+#endif
 #include <CoreFoundation/CoreFoundation.h>
 
 // Here's some convenience macros
@@ -147,14 +151,14 @@ VALUE plist_load(int argc, VALUE *argv, VALUE self) {
 		// even though binary shouldn't be < 6 characters
 		UInt8 *bytes;
 		int len;
-		if (RSTRING(buffer)->len < 6) {
+		if (RSTRING_LEN(buffer) < 6) {
 			bytes = ALLOC_N(UInt8, 6);
 			memset(bytes, '\n', 6);
-			MEMCPY(bytes, RSTRING(buffer)->ptr, UInt8, RSTRING(buffer)->len);
+			MEMCPY(bytes, RSTRING_PTR(buffer), UInt8, RSTRING_LEN(buffer));
 			len = 6;
 		} else {
-			bytes = (UInt8 *)RSTRING(buffer)->ptr;
-			len = RSTRING(buffer)->len;
+			bytes = (UInt8 *)RSTRING_PTR(buffer);
+			len = RSTRING_LEN(buffer);
 		}
 		CFReadStreamRef readStream = CFReadStreamCreateWithBytesNoCopy(kCFAllocatorDefault, bytes, len, kCFAllocatorNull);
 		CFReadStreamOpen(readStream);
@@ -163,7 +167,7 @@ VALUE plist_load(int argc, VALUE *argv, VALUE self) {
 		CFRelease(readStream);
 	} else {
 		// Format wasn't requested
-		CFDataRef data = CFDataCreateWithBytesNoCopy(kCFAllocatorDefault, (const UInt8*)RSTRING(buffer)->ptr, RSTRING(buffer)->len, kCFAllocatorNull);
+		CFDataRef data = CFDataCreateWithBytesNoCopy(kCFAllocatorDefault, (const UInt8*)RSTRING_PTR(buffer), RSTRING_LEN(buffer), kCFAllocatorNull);
 		plist = CFPropertyListCreateFromXMLData(kCFAllocatorDefault, data, kCFPropertyListImmutable, &error);
 		CFRelease(data);
 	}
@@ -346,15 +350,10 @@ VALUE plist_dump(int argc, VALUE *argv, VALUE self) {
 	} else {
 		type = rb_to_id(type);
 	}
-	if (type != id_xml && type != id_binary && type != id_openstep) {
-		rb_raise(rb_eArgError, "Argument 3 must be one of :xml1, :binary1, or :openstep");
-		return Qnil;
-	}
 	if (!RTEST(rb_respond_to(io, id_write))) {
 		rb_raise(rb_eArgError, "Argument 1 must be an IO object");
 		return Qnil;
 	}
-	CFPropertyListRef plist = convertObject(obj);
 	CFPropertyListFormat format;
 	if (type == id_xml) {
 		format = kCFPropertyListXMLFormat_v1_0;
@@ -362,7 +361,11 @@ VALUE plist_dump(int argc, VALUE *argv, VALUE self) {
 		format = kCFPropertyListBinaryFormat_v1_0;
 	} else if (type == id_openstep) {
 		format = kCFPropertyListOpenStepFormat;
+	} else {
+		rb_raise(rb_eArgError, "Argument 3 must be one of :xml1, :binary1, or :openstep");
+		return Qnil;
 	}
+	CFPropertyListRef plist = convertObject(obj);
 	VALUE data = convertPlistToString(plist, format);
 	if (NIL_P(data)) {
 		return Qnil;
@@ -388,11 +391,6 @@ VALUE obj_to_plist(int argc, VALUE *argv, VALUE self) {
 	} else {
 		type = rb_to_id(type);
 	}
-	if (type != id_xml && type != id_binary && type != id_openstep) {
-		rb_raise(rb_eArgError, "Argument 2 must be one of :xml1, :binary1, or :openstep");
-		return Qnil;
-	}
-	CFPropertyListRef plist = convertObject(self);
 	CFPropertyListFormat format;
 	if (type == id_xml) {
 		format = kCFPropertyListXMLFormat_v1_0;
@@ -400,7 +398,11 @@ VALUE obj_to_plist(int argc, VALUE *argv, VALUE self) {
 		format = kCFPropertyListBinaryFormat_v1_0;
 	} else if (type == id_openstep) {
 		format = kCFPropertyListOpenStepFormat;
+	} else {
+		rb_raise(rb_eArgError, "Argument 2 must be one of :xml1, :binary1, or :openstep");
+		return Qnil;
 	}
+	CFPropertyListRef plist = convertObject(self);
 	VALUE data = convertPlistToString(plist, format);
 	CFRelease(plist);
 	if (type == id_xml || type == id_binary) {
@@ -437,15 +439,15 @@ CFPropertyListRef convertString(VALUE obj) {
 	if (RTEST(str_blob(obj))) {
 		// convert to CFDataRef
 		StringValue(obj);
-		CFDataRef data = CFDataCreate(kCFAllocatorDefault, (const UInt8*)RSTRING(obj)->ptr, (CFIndex)RSTRING(obj)->len);
+		CFDataRef data = CFDataCreate(kCFAllocatorDefault, (const UInt8*)RSTRING_PTR(obj), (CFIndex)RSTRING_LEN(obj));
 		return data;
 	} else {
 		// convert to CFStringRef
 		StringValue(obj);
-		CFStringRef string = CFStringCreateWithBytes(kCFAllocatorDefault, (const UInt8*)RSTRING(obj)->ptr, (CFIndex)RSTRING(obj)->len, kCFStringEncodingUTF8, false);
+		CFStringRef string = CFStringCreateWithBytes(kCFAllocatorDefault, (const UInt8*)RSTRING_PTR(obj), (CFIndex)RSTRING_LEN(obj), kCFStringEncodingUTF8, false);
 		if (!string) {
 			// try MacRoman
-			string = CFStringCreateWithBytes(kCFAllocatorDefault, (const UInt8*)RSTRING(obj)->ptr, (CFIndex)RSTRING(obj)->len, kCFStringEncodingMacRoman, false);
+			string = CFStringCreateWithBytes(kCFAllocatorDefault, (const UInt8*)RSTRING_PTR(obj), (CFIndex)RSTRING_LEN(obj), kCFStringEncodingMacRoman, false);
 		}
 		return string;
 	}
@@ -463,19 +465,25 @@ int iterateHash(VALUE key, VALUE val, VALUE dict) {
 
 // Converts a Hash to a CFDictionaryREf
 CFDictionaryRef convertHash(VALUE obj) {
-	CFIndex count = (CFIndex)RHASH(obj)->tbl->num_entries;
+	// RHASH_TBL exists in ruby 1.8.7 but not ruby 1.8.6
+#ifdef RHASH_TBL
+	st_table *tbl = RHASH_TBL(obj);
+#else
+	st_table *tbl = RHASH(obj)->tbl;
+#endif
+	CFIndex count = (CFIndex)tbl->num_entries;
 	CFMutableDictionaryRef dict = CFDictionaryCreateMutable(kCFAllocatorDefault, count, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
-	st_foreach(RHASH(obj)->tbl, iterateHash, (VALUE)dict);
+	st_foreach(tbl, iterateHash, (VALUE)dict);
 	return dict;
 }
 
 // Converts an Array to a CFArrayRef
 CFArrayRef convertArray(VALUE obj) {
-	CFIndex count = (CFIndex)RARRAY(obj)->len;
+	CFIndex count = (CFIndex)RARRAY_LEN(obj);
 	CFMutableArrayRef array = CFArrayCreateMutable(kCFAllocatorDefault, count, &kCFTypeArrayCallBacks);
 	int i;
 	for (i = 0; i < count; i++) {
-		CFPropertyListRef aVal = convertObject(RARRAY(obj)->ptr[i]);
+		CFPropertyListRef aVal = convertObject(RARRAY_PTR(obj)[i]);
 		CFArrayAppendValue(array, aVal);
 		CFRelease(aVal);
 	}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: kballard-osx-plist
 version: !ruby/object:Gem::Version 
-  version: "1.0"
+  version: 1.0.1
 platform: ruby
 authors: 
 - Kevin Ballard
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-25 00:00:00 -07:00
+date: 2009-02-05 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -19,7 +19,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.5.1
+        version: 1.7.0
     version: 
 description: osx/plist is a Ruby library for manipulating Property Lists natively using the built-in support in OS X.
 email: kevin@sb.org
@@ -43,7 +43,7 @@ files:
 - test/suite.rb
 - test/test_plist.rb
 has_rdoc: true
-homepage: http://www.github.com/kballard/plist
+homepage: http://www.github.com/kballard/osx-plist
 post_install_message: 
 rdoc_options: 
 - --main
@@ -65,7 +65,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: osx-plist
-rubygems_version: 1.0.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: Property List manipulation for OS X

data/plist.gemspec

@@ -1,25 +0,0 @@
-Gem::Specification.new do |s|
-  s.name = %q{osx-plist}
-  s.version = "1.0"
-
-  s.specification_version = 2 if s.respond_to? :specification_version=
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Kevin Ballard"]
-  s.date = %q{2008-04-25}
-  s.description = %q{osx/plist is a Ruby library for manipulating Property Lists natively using the built-in support in OS X.}
-  s.email = %q{kevin@sb.org}
-  s.extensions = ["ext/plist/extconf.rb"]
-  s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.txt"]
-  s.files = ["History.txt", "Manifest.txt", "README.txt", "Rakefile", "ext/plist/extconf.rb", "ext/plist/plist.c", "plist.gemspec", "test/fixtures/xml_plist", "test/suite.rb", "test/test_plist.rb"]
-  s.has_rdoc = true
-  s.homepage = %q{http://www.github.com/kballard/plist}
-  s.rdoc_options = ["--main", "README.txt"]
-  s.require_paths = ["ext"]
-  s.rubyforge_project = %q{osx-plist}
-  s.rubygems_version = %q{1.0.1}
-  s.summary = %q{Property List manipulation for OS X}
-  s.test_files = ["test/test_plist.rb"]
-
-  s.add_dependency(%q<hoe>, [">= 1.5.1"])
-end