rubyosa 0.3.0.1 → 0.4.0

data/src/lib/rbosa_properties.rb

@@ -30,8 +30,10 @@ module OSA
   @sym_to_code = {}
   @code_to_sym = {}
 
-  def self.add_property(sym, code)
-    return if @sym_to_code.has_key?(sym) or @code_to_sym.has_key?(code)
+  def self.add_property(sym, code, override=false)
+    unless override
+      return if @sym_to_code.has_key?(sym) or @code_to_sym.has_key?(code)
+    end
     @sym_to_code[sym] = code
     @code_to_sym[code] = sym
   end
@@ -134,3 +136,6 @@ end
   :visible, 'pvis'
 
 ].each_slice(2) { |sym, code| OSA.add_property(sym, code) }
+
+# A convenience shortcut to :point_size
+OSA.add_property(:size, 'ptsz', true)

data/src/rbosa.c

@@ -271,6 +271,7 @@ rbosa_app_send_event (VALUE self, VALUE event_class, VALUE event_id, VALUE param
     VALUE       rb_timeout;
     SInt32      timeout;
     VALUE       rb_reply;
+    unsigned    has_direct_param;
 
     error = AECreateAppleEvent (RVAL2FOURCHAR (event_class),
                                 RVAL2FOURCHAR (event_id),
@@ -282,6 +283,7 @@ rbosa_app_send_event (VALUE self, VALUE event_class, VALUE event_id, VALUE param
         rb_raise (rb_eArgError, "Cannot create Apple Event '%s%s' : %s (%d)", 
                   RVAL2CSTR (event_class), RVAL2CSTR (event_id), error_code_to_string (error), error);
 
+    has_direct_param = 0;
     if (!NIL_P (params)) {
         unsigned    i;
 
@@ -289,6 +291,7 @@ rbosa_app_send_event (VALUE self, VALUE event_class, VALUE event_id, VALUE param
             VALUE   ary;
             VALUE   type;
             VALUE   element;
+            FourCharCode code;
 
             ary = RARRAY (params)->ptr[i];
             if (NIL_P (ary) || RARRAY (ary)->len != 2)
@@ -296,6 +299,10 @@ rbosa_app_send_event (VALUE self, VALUE event_class, VALUE event_id, VALUE param
 
             type = RARRAY (ary)->ptr[0];
             element = RARRAY (ary)->ptr[1];
+            code = RVAL2FOURCHAR (type);
+
+            if (code == '----')
+                has_direct_param = 1;
 
             error = AEPutParamDesc (&ae, RVAL2FOURCHAR (type), rbosa_element_aedesc (element));
             if (error != noErr) { 
@@ -308,7 +315,10 @@ rbosa_app_send_event (VALUE self, VALUE event_class, VALUE event_id, VALUE param
 
     rb_timeout = rb_iv_get (mOSA, "@timeout");
     timeout = NIL_P (rb_timeout) ? kAEDefaultTimeout : NUM2INT (rb_timeout);
-   
+
+    if (has_direct_param == 0)
+        AEPutAttributePtr (&ae, 'subj', typeNull, NULL, 0);
+
     error = AESend (&ae, &reply, (RVAL2CBOOL(need_retval) ? kAEWaitReply : kAENoReply) | kAECanInteract | kAECanSwitchLayer,
                     kAENormalPriority, timeout, NULL, NULL);
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: rubyosa
 version: !ruby/object:Gem::Version 
-  version: 0.3.0.1
-date: 2007-03-02 00:00:00 +01:00
+  version: 0.4.0
+date: 2007-04-11 00:00:00 +02:00
 summary: A Ruby/AppleEvent bridge.
 require_paths: 
 - lib
@@ -55,6 +55,9 @@ files:
 - sample/AddressBook/inspect.rb
 - sample/iTunes/tag_genre_lastfm.rb
 - data/rubyosa/rdoc_html.rb
+- sample/Photoshop/new_doc.rb
+- sample/Photoshop/new_doc_with_text.rb
+- sample/iTunes/name_that_tune.rb
 test_files: []
 
 rdoc_options: []