rb-appscript 0.5.0 → 0.5.1

data/src/rbae.c

@@ -1,5 +1,10 @@
 /*
- *  Copyright (C) 2006 HAS
+ * rb-appscript
+ *
+ * ae -- a low-level API providing a basic Ruby wrapper around the various 
+ *    Apple Event Manager, Process Manager and Launch Services APIs used by aem
+ *
+ *  Copyright (C) 2006-2008 HAS. Released under MIT License.
  *
  *  Thanks to:
  *  - FUJIMOTO Hisakuni, author of RubyAEOSA
@@ -11,8 +16,6 @@
 #include <CoreFoundation/CoreFoundation.h>
 #include "SendThreadSafe.h"
 
-VALUE rb_ll2big(LONG_LONG); // keeps gcc happy
-
 // AE module and classes
 static VALUE mAE;
 static VALUE cAEDesc;
@@ -38,6 +41,14 @@ AEEventHandlerUPP upp_GenericEventHandler;
 AECoercionHandlerUPP upp_GenericCoercionHandler;
 
 
+// these macros were added in 1.8.6
+
+#if !defined(RSTRING_LEN)
+#define RSTRING_LEN(x) (RSTRING(x)->len)
+#define RSTRING_PTR(x) (RSTRING(x)->ptr)
+#endif
+
+
 /**********************************************************************/
 // Raise MacOS error
 
@@ -79,8 +90,8 @@ rbAE_MacOSError_inspect(VALUE self)
 static DescType
 rbStringToDescType(VALUE obj)
 {
-	if (rb_obj_is_kind_of(obj, rb_cString) && RSTRING(obj)->len == 4) {
-		return CFSwapInt32HostToBig(*(DescType *)(RSTRING(obj)->ptr));
+	if (rb_obj_is_kind_of(obj, rb_cString) && RSTRING_LEN(obj) == 4) {
+		return CFSwapInt32HostToBig(*(DescType *)(RSTRING_PTR(obj)));
 	} else {
 		rb_raise(rb_eArgError, "Not a four-char-code string.");
 	}
@@ -146,7 +157,7 @@ rbAE_AEDesc_new(VALUE class, VALUE type, VALUE data)
 	
 	Check_Type(data, T_STRING);
 	err = AECreateDesc(rbStringToDescType(type),
-					   RSTRING(data)->ptr, RSTRING(data)->len,
+					   RSTRING_PTR(data), RSTRING_LEN(data),
 					   &desc);
 	if (err != noErr) rbAE_raiseMacOSError("Can't create AEDesc.", err);
 	return rbAE_wrapAEDesc(&desc);
@@ -190,7 +201,7 @@ rbAE_AEDesc_newUnflatten(VALUE class, VALUE data)
 	AEDesc desc;
 	
 	Check_Type(data, T_STRING);
-	err = AEUnflattenDesc(RSTRING(data)->ptr, &desc);
+	err = AEUnflattenDesc(RSTRING_PTR(data), &desc);
 	if (err != noErr) rbAE_raiseMacOSError("Can't create AEDesc.", err);
 	return rbAE_wrapAEDesc(&desc);
 }
@@ -438,8 +449,8 @@ rbAE_findApplication(VALUE self, VALUE creator, VALUE bundleID, VALUE name)
 	inCreator = (creator == Qnil) ? kLSUnknownCreator : rbStringToDescType(creator);
 	if (bundleID != Qnil) {
 		inBundleID = CFStringCreateWithBytes(NULL,
-											 (UInt8 *)(RSTRING(bundleID)->ptr),
-											 (CFIndex)(RSTRING(bundleID)->len),
+											 (UInt8 *)(RSTRING_PTR(bundleID)),
+											 (CFIndex)(RSTRING_LEN(bundleID)),
 											 kCFStringEncodingUTF8,
 											 false);
 		if (inBundleID == NULL) rb_raise(rb_eRuntimeError, "Invalid bundle ID string.");
@@ -448,8 +459,8 @@ rbAE_findApplication(VALUE self, VALUE creator, VALUE bundleID, VALUE name)
 	}
 	if (name != Qnil) {
 		inName = CFStringCreateWithBytes(NULL,
-										 (UInt8 *)(RSTRING(name)->ptr),
-										 (CFIndex)(RSTRING(name)->len),
+										 (UInt8 *)(RSTRING_PTR(name)),
+										 (CFIndex)(RSTRING_LEN(name)),
 										 kCFStringEncodingUTF8,
 										 false);
 		if (inName == NULL) {
@@ -551,69 +562,31 @@ rbAE_launchApplication(VALUE self, VALUE path, VALUE firstEvent, VALUE flags)
 // HFS/POSIX path conversions
 
 static VALUE
-rbAE_convertPOSIXPathToURL(VALUE self, VALUE path)
-{
-	CFURLRef url;
-	UInt8 buffer[PATH_MAX];
-
-	url = CFURLCreateFromFileSystemRepresentation(NULL,
-												  (UInt8 *)(RSTRING(path)->ptr),
-												  (CFIndex)(RSTRING(path)->len),
-												  false);
-	if (url == NULL) rb_raise(rb_eRuntimeError, "Invalid POSIX path string.");
-	buffer[CFURLGetBytes(url, buffer, PATH_MAX - 1)] = '\0';
-	CFRelease(url);
-	return rb_str_new2((char *)buffer);
-}
-
-static VALUE
-rbAE_convertHFSPathToURL(VALUE self, VALUE path)
+rbAE_convertPathToURL(VALUE self, VALUE path, VALUE pathStyle)
 {
 	CFStringRef str;
 	CFURLRef url;
 	UInt8 buffer[PATH_MAX];
 	
 	str = CFStringCreateWithBytes(NULL,
-								  (UInt8 *)(RSTRING(path)->ptr),
-								  (CFIndex)(RSTRING(path)->len),
+								  (UInt8 *)(RSTRING_PTR(path)),
+								  (CFIndex)(RSTRING_LEN(path)),
 								  kCFStringEncodingUTF8,
 								  false);
-	if (str == NULL) rb_raise(rb_eRuntimeError, "Invalid HFS path string.");
+	if (str == NULL) rb_raise(rb_eRuntimeError, "Bad path string.");
 	url = CFURLCreateWithFileSystemPath(NULL,
 										str,
-										kCFURLHFSPathStyle,
+										NUM2LONG(pathStyle),
 										false);
 	CFRelease(str);
-	if (url == NULL) rb_raise(rb_eRuntimeError, "Invalid HFS path string.");
+	if (url == NULL) rb_raise(rb_eRuntimeError, "Invalid path.");
 	buffer[CFURLGetBytes(url, buffer, PATH_MAX - 1)] = '\0';
 	CFRelease(url);
 	return rb_str_new2((char *)buffer);
 }
 
 static VALUE
-rbAE_convertURLToPOSIXPath(VALUE self, VALUE urlStr)
-{
-	Boolean err;
-	CFURLRef url;
-	UInt8 buffer[PATH_MAX];
-
-	url = CFURLCreateWithBytes(NULL,
-							   (UInt8 *)(RSTRING(urlStr)->ptr),
-							   (CFIndex)(RSTRING(urlStr)->len),
-							   kCFStringEncodingUTF8,
-							   NULL);
-	if (url == NULL) rb_raise(rb_eRuntimeError, "Invalid URL string.");
-	err = CFURLGetFileSystemRepresentation(url,
-										   true,
-										   buffer,
-										   PATH_MAX);
-	CFRelease(url);
-	if (!err) rb_raise(rb_eRuntimeError, "Can't get POSIX path.");
-	return rb_str_new2((char *)buffer);
-}
-
-static VALUE
-rbAE_convertURLToHFSPath(VALUE self, VALUE urlStr)
+rbAE_convertURLToPath(VALUE self, VALUE urlStr, VALUE pathStyle)
 {
 	Boolean err;
 	CFURLRef url;
@@ -621,20 +594,20 @@ rbAE_convertURLToHFSPath(VALUE self, VALUE urlStr)
 	char buffer[PATH_MAX];
 
 	url = CFURLCreateWithBytes(NULL,
-							   (UInt8 *)(RSTRING(urlStr)->ptr),
-							   (CFIndex)(RSTRING(urlStr)->len),
+							   (UInt8 *)(RSTRING_PTR(urlStr)),
+							   (CFIndex)(RSTRING_LEN(urlStr)),
 							   kCFStringEncodingUTF8,
 							   NULL);
-	if (url == NULL) rb_raise(rb_eRuntimeError, "Invalid URL string.");
-	str = CFURLCopyFileSystemPath(url, kCFURLHFSPathStyle);
+	if (url == NULL) rb_raise(rb_eRuntimeError, "Bad URL string.");
+	str = CFURLCopyFileSystemPath(url, NUM2LONG(pathStyle));
 	CFRelease(url);
-	if (str == NULL) rb_raise(rb_eRuntimeError, "Can't get HFS path.");
+	if (str == NULL) rb_raise(rb_eRuntimeError, "Can't get path.");
 	err = CFStringGetCString(str,
 							 buffer,
 							 PATH_MAX,
 							 kCFStringEncodingUTF8);
 	CFRelease(str);
-	if (!err) rb_raise(rb_eRuntimeError, "Can't get HFS path.");
+	if (!err) rb_raise(rb_eRuntimeError, "Can't get path.");
 	return rb_str_new2(buffer);
 }
 
@@ -662,7 +635,7 @@ rbAE_convertUnixSecondsToLongDateTime(VALUE self, VALUE secs)
 
 	err = UCConvertCFAbsoluteTimeToLongDateTime(NUM2DBL(secs) - kCFAbsoluteTimeIntervalSince1970, &ldt);
 	if (err != noErr) rbAE_raiseMacOSError("Can't convert seconds to LongDateTime.", err);
-	return rb_ll2big(ldt);
+	return LL2NUM(ldt);
 }
 
 
@@ -676,22 +649,22 @@ rbAE_OSAGetAppTerminology(VALUE self, VALUE path)
 	rb_raise(rb_eNotImpError, "AE.get_app_terminology isn't available in 64-bit processes.\n");
 	return Qnil;
 #else
+	static ComponentInstance defaultComponent;
 	FSRef appRef;
 	FSSpec fss;
-	ComponentInstance defaultComponent;
 	Boolean didLaunch;
 	AEDesc theDesc;
 	OSErr err = noErr;
 	
-	if (OSAGetAppTerminology == NULL)
-		rb_raise(rb_eNotImpError, "OSAGetAppTerminology unavailable.\n");
 	err = FSPathMakeRef((UInt8 *)StringValuePtr(path), &appRef, NULL);
 	if (err != 0) rbAE_raiseMacOSError("Couldn't make FSRef.", err);
 	err = FSGetCatalogInfo(&appRef, kFSCatInfoNone, NULL, NULL, &fss, NULL);
 	if (err != 0) rbAE_raiseMacOSError("Couldn't make FSSpec.", err);
-	defaultComponent = OpenDefaultComponent(kOSAComponentType, 'ascr');
-	err = GetComponentInstanceError(defaultComponent);
-	if (err != 0) rbAE_raiseMacOSError("Couldn't make default component instance.", err);
+	if (!defaultComponent) {
+		defaultComponent = OpenDefaultComponent(kOSAComponentType, 'ascr');
+		err = GetComponentInstanceError(defaultComponent);
+		if (err != 0) rbAE_raiseMacOSError("Couldn't make default component instance.", err);
+	}
 	err = OSAGetAppTerminology(defaultComponent, 
 							   kOSAModeNull,
 							   &fss, 
@@ -951,14 +924,10 @@ Init_ae (void)
 	rb_define_module_function(mAE, "psn_for_process_id", rbAE_psnForPID, 1);
 	rb_define_module_function(mAE, "launch_application", rbAE_launchApplication, 3);
 	
-	rb_define_module_function(mAE, "convert_posix_path_to_url", 
-							  rbAE_convertPOSIXPathToURL, 1);
-	rb_define_module_function(mAE, "convert_hfs_path_to_url", 
-							  rbAE_convertHFSPathToURL, 1);
-	rb_define_module_function(mAE, "convert_url_to_posix_path", 
-							  rbAE_convertURLToPOSIXPath, 1);
-	rb_define_module_function(mAE, "convert_url_to_hfs_path", 
-							  rbAE_convertURLToHFSPath, 1);
+	rb_define_module_function(mAE, "convert_path_to_url", 
+							  rbAE_convertPathToURL, 2);
+	rb_define_module_function(mAE, "convert_url_to_path", 
+							  rbAE_convertURLToPath, 2);
 
 	rb_define_module_function(mAE, "convert_long_date_time_to_unix_seconds", 
 							  rbAE_convertLongDateTimeToUnixSeconds, 1);

data/test/test_aemreference.rb

@@ -1,4 +1,6 @@
-#!/usr/local/bin/ruby -w
+#!/usr/bin/ruby -w
+
+begin; require 'rubygems'; rescue LoadError; end
 
 require 'test/unit'
 require "_aem/aemreference"
@@ -40,6 +42,11 @@ class TC_AEMReferences < Test::Unit::TestCase
 					'AEM.con.elements("docu").by_index(3), ' +
 					'AEM.con.elements("docu").by_name("foo"))', nil],
 			
+			[AEMReference::App.elements('docu').by_range(1, 'foo'),
+					'AEM.app.elements("docu").by_range(1, "foo")',
+					AEMReference::App.elements("docu").by_range(
+							AEMReference::Con.elements("docu").by_index(1), 
+							AEMReference::Con.elements("docu").by_name("foo"))],
 			
 			[AEMReference::Its.property('name').eq('foo').and(AEMReference::Its.elements('cwor').eq([])), 
 					'AEM.its.property("name").eq("foo").and(AEM.its.elements("cwor").eq([]))', nil],
@@ -103,9 +110,8 @@ class TC_AEMReferences < Test::Unit::TestCase
 		assert_not_equal(AEMReference::App.elements('ctxt').property('ctxt'), AEMReference::App.property('ctxt').property('ctxt'))
 		assert_not_equal(AEMReference::App.elements('ctxt').property('ctxt'), 333)
 		assert_not_equal(333, AEMReference::App.property('ctxt').property('ctxt'))
-#		# by-range and by-filter references do basic type checking to ensure a reference is given
-#		assert_raises(TypeError) { AEMReference::App.elements('docu').by_range(1, 2) }
-#		assert_raises(TypeError) { AEMReference::App.elements('docu').by_filter(1) }
+#		# by-filter references do basic type checking to ensure an its-based reference is given
+		assert_raises(TypeError) { AEMReference::App.elements('docu').by_filter(1) }
 		
 	end
 end

data/test/test_appscriptcommands.rb

@@ -1,4 +1,6 @@
-#!/usr/local/bin/ruby -w
+#!/usr/bin/ruby -w
+
+begin; require 'rubygems'; rescue LoadError; end
 
 require 'test/unit'
 require 'appscript'

data/test/test_appscriptreference.rb

@@ -1,4 +1,6 @@
-#!/usr/local/bin/ruby -w
+#!/usr/bin/ruby -w
+
+begin; require 'rubygems'; rescue LoadError; end
 
 require 'test/unit'
 require "appscript"
@@ -68,8 +70,8 @@ class TC_AppscriptReferences < Test::Unit::TestCase
 					@s+'.documents[its.size.ge(42)]', nil],
 			
 			[@te.documents[1, 'foo'], 
-					@s+'.documents[con.documents[1], con.documents["foo"]]', 
-					@te.documents[Appscript.con.documents[1], Appscript.con.documents['foo']]],
+					@s+'.documents[1, "foo"]',
+					@te.documents[Appscript.con.documents[1], Appscript.con.documents["foo"]]],
 			
 			[@te.documents[1].text \
 					.paragraphs.characters[

data/test/test_codecs.rb

@@ -1,4 +1,6 @@
-#!/usr/local/bin/ruby -w
+#!/usr/bin/ruby -w
+
+begin; require 'rubygems'; rescue LoadError; end
 
 require 'test/unit'
 require 'aem'

data/test/test_findapp.rb

@@ -1,4 +1,6 @@
-#!/usr/local/bin/ruby -w
+#!/usr/bin/ruby -w
+
+begin; require 'rubygems'; rescue LoadError; end
 
 require 'test/unit'
 require "_aem/findapp"

data/test/test_mactypes.rb

@@ -1,4 +1,6 @@
-#!/usr/local/bin/ruby -w
+#!/usr/bin/ruby -w
+
+begin; require 'rubygems'; rescue LoadError; end
 
 require 'test/unit'
 require "_aem/mactypes"
@@ -13,6 +15,10 @@ class TC_MacTypes < Test::Unit::TestCase
 		# puts "path: #{@path1}" # e.g. /tmp/codecs-test.HWr1EnE3
 	end
 	
+	def normalize(path)
+		return path.gsub(/\/+/, '/') # quick-n-dirty
+	end
+	
 	def test_alias
 		# make alias
 		f = MacTypes::Alias.path(@path1)
@@ -22,10 +28,10 @@ class TC_MacTypes < Test::Unit::TestCase
 		
 		# get path
 		# note that initial /tmp/codecs-test... path will automatically change to /private/tmp/codecs-test...
-		p1 = '/private'+@path1
-		p2 = '/private'+@path2
-		
-		assert_equal("MacTypes::Alias.path(#{p1.inspect})", f.inspect)
+		p1 = normalize('/private'+@path1)
+		p2 = normalize('/private'+@path2)
+				
+		assert_equal(p1, normalize(f.path))
 		
 		#puts "alias path 1: #{f}" # e.g. /private/tmp/codecs-test.HWr1EnE3
 		assert_equal(p1, f.to_s)
@@ -40,7 +46,7 @@ class TC_MacTypes < Test::Unit::TestCase
 		# puts "alias path 2: #{f}" # /private/tmp/moved-codecs-test.HWr1EnE3
 		assert_equal(p2, f.to_s)
 
-		assert_equal("MacTypes::Alias.path(#{p2.inspect})", f.inspect)
+		assert_equal(p2, normalize(f.path))
 		
 		# check a FileNotFoundError is raised if getting path/FileURL for a filesystem object that no longer exists
 		`rm #{@path2}`

data/test/test_osax.rb

@@ -1,13 +1,10 @@
-#!/usr/local/bin/ruby -w
+#!/usr/bin/ruby -w
+
+begin; require 'rubygems'; rescue LoadError; end
 
 require 'test/unit'
 require 'osax'
 
-class AS_SafeObject
-	def self.hide(name)
-	end
-end
-
 class TC_OSAX < Test::Unit::TestCase
 	
 	def test_1

metadata

@@ -1,33 +1,26 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
-specification_version: 1
 name: rb-appscript
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
-date: 2007-12-20 00:00:00 +00:00
-summary: Ruby appscript (rb-appscript) is a high-level, user-friendly Apple event bridge that allows you to control scriptable Mac OS X applications using ordinary Ruby scripts.
-require_paths: 
-- lib
-email: 
-homepage: http://rb-appscript.rubyforge.org/
-rubyforge_project: rb-appscript
-description: 
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: false
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "1.8"
-  version: 
+  version: 0.5.1
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - HAS
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2008-02-18 00:00:00 +00:00
+default_executable: 
+dependencies: []
+
+description: 
+email: 
+executables: []
+
+extensions: 
+- extconf.rb
+extra_rdoc_files: []
+
 files: 
 - CHANGES
 - doc
@@ -41,7 +34,6 @@ files:
 - doc/aem-manual/07_findapp.html
 - doc/aem-manual/08_examples.html
 - doc/aem-manual/aemreferenceinheritance.gif
-- doc/aem-manual/full.css
 - doc/aem-manual/index.html
 - doc/appscript-manual
 - doc/appscript-manual/01_introduction.html
@@ -61,10 +53,10 @@ files:
 - doc/appscript-manual/application_architecture.gif
 - doc/appscript-manual/application_architecture2.gif
 - doc/appscript-manual/finder_to_textedit_event.gif
-- doc/appscript-manual/full.css
 - doc/appscript-manual/index.html
 - doc/appscript-manual/relationships_example.gif
 - doc/appscript-manual/ruby_to_itunes_event.gif
+- doc/full.css
 - doc/index.html
 - doc/mactypes-manual
 - doc/mactypes-manual/index.html
@@ -126,6 +118,32 @@ files:
 - test/test_osax.rb
 - test/testall.sh
 - TODO
+has_rdoc: false
+homepage: http://rb-appscript.rubyforge.org/
+post_install_message: 
+rdoc_options: []
+
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "1.8"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+requirements: []
+
+rubyforge_project: rb-appscript
+rubygems_version: 1.0.1
+signing_key: 
+specification_version: 2
+summary: Ruby appscript (rb-appscript) is a high-level, user-friendly Apple event bridge that allows you to control scriptable Mac OS X applications using ordinary Ruby scripts.
 test_files: 
 - test/test_aemreference.rb
 - test/test_appscriptcommands.rb
@@ -134,15 +152,3 @@ test_files:
 - test/test_findapp.rb
 - test/test_mactypes.rb
 - test/test_osax.rb
-rdoc_options: []
-
-extra_rdoc_files: []
-
-executables: []
-
-extensions: 
-- extconf.rb
-requirements: []
-
-dependencies: []
-