rubyosa19 0.5.0 → 0.5.4

data/{ext/rubyosa → src}/rbosa.c

@@ -27,7 +27,7 @@
  */ 
 
 #include "rbosa.h"
-#include <ruby/st.h>
+#include <st.h>
 
 static VALUE mOSA;
 static VALUE cOSAElement;
@@ -161,8 +161,13 @@ rbosa_element_new (VALUE self, VALUE type, VALUE value)
     }
     else {
         Check_Type (value, T_STRING);
+#ifdef RUBY_19
         c_value = RSTRING_PTR(value);
         c_value_size = RSTRING_LEN(value);
+#else
+        c_value = RSTRING (value)->ptr;
+        c_value_size = RSTRING (value)->len;
+#endif
     }
 
     error = AECreateDesc (ffc_type, c_value, c_value_size, &desc);
@@ -227,6 +232,9 @@ __rbosa_raise_potential_app_error (AEDesc *reply)
         return;
     }
 
+    if (errorNum == noErr)
+      return;
+
     /* The reply is an application error. */
 
     errorMsg = error_code_to_string(errorNum);
@@ -287,18 +295,32 @@ rbosa_app_send_event (VALUE self, VALUE event_class, VALUE event_id, VALUE param
     if (!NIL_P (params)) {
         unsigned    i;
 
-        for (i = 0; i < RARRAY_LEN(params); i++) {
+#ifdef RUBY_19
+		for (i = 0; i < RARRAY_LEN(params); i++) {
+#else
+        for (i = 0; i < RARRAY (params)->len; i++) {
+#endif
             VALUE   ary;
             VALUE   type;
             VALUE   element;
             FourCharCode code;
 
-            ary = RARRAY_PTR(params)[i];
-            if (NIL_P (ary) || RARRAY_LEN(ary) != 2)
+#ifdef RUBY_19
+			ary = RARRAY_PTR(params)[i];
+			if (NIL_P (ary) || RARRAY_LEN(ary) != 2)
+#else
+            ary = RARRAY (params)->ptr[i];
+			if (NIL_P (ary) || RARRAY (ary)->len != 2)
+#endif
                 continue;
 
+#ifdef RUBY_19
             type = RARRAY_PTR(ary)[0];
             element = RARRAY_PTR(ary)[1];
+#else
+            type = RARRAY (ary)->ptr[0];
+            element = RARRAY (ary)->ptr[1];
+#endif
             code = RVAL2FOURCHAR (type);
 
             if (code == '----')
@@ -557,8 +579,13 @@ rbosa_elementlist_new (int argc, VALUE *argv, VALUE self)
                   error_code_to_string (error), error);
 
     if (!NIL_P (ary)) {
+#ifdef RUBY_19
         for (i = 0; i < RARRAY_LEN(ary); i++)
             __rbosa_elementlist_add (&list, RARRAY_PTR(ary)[i], i + 1); 
+#else
+        for (i = 0; i < RARRAY (ary)->len; i++)
+            __rbosa_elementlist_add (&list, RARRAY (ary)->ptr[i], i + 1); 
+#endif
     }
     
     return rbosa_element_make (self, &list, Qnil);

data/{ext/rubyosa → src}/rbosa.h

@@ -29,7 +29,7 @@
 #ifndef __RBOSA_H_
 #define __RBOSA_H_
 
-#include "osx_ruby.h"
+#include <ruby.h>
 #include <Carbon/Carbon.h>
 #include <sys/param.h>
 

data/{ext/rubyosa → src}/rbosa_conv.c

@@ -43,9 +43,15 @@ rbobj_to_fourchar (VALUE obj)
             obj = rb_obj_as_string (obj);
 
         if (rb_obj_is_kind_of (obj, rb_cString)) {
+#ifdef RUBY_19
             if (RSTRING_LEN(obj) != 4)
                 rb_raise (rb_eArgError, USAGE_MSG);
             result = *(FourCharCode*)(RSTRING_PTR(obj));
+#else
+            if (RSTRING (obj)->len != 4)
+                rb_raise (rb_eArgError, USAGE_MSG);
+            result = *(FourCharCode*)(RSTRING (obj)->ptr);
+#endif
             result = CFSwapInt32HostToBig (result);
         }
         else {
@@ -75,9 +81,14 @@ rbobj_to_alias_handle (VALUE obj, AliasHandle *alias)
     Check_Type (obj, T_STRING);
     *alias = NULL;
 
-    URL = CFURLCreateFromFileSystemRepresentation (kCFAllocatorDefault, 
-                                                   (const UInt8 *)RSTRING_PTR (obj), 
-                                                   RSTRING_LEN(obj),
+    URL = CFURLCreateFromFileSystemRepresentation (kCFAllocatorDefault,
+#ifdef RUBY_19
+        										   (const UInt8 *)RSTRING_PTR(obj), 
+        										   RSTRING_LEN(obj),
+#else
+                                                   (const UInt8 *)RSTRING (obj)->ptr, 
+                                                   RSTRING (obj)->len,
+#endif
                                                    0 /* XXX: normally passing 0 even if it's a directory should
                                                         not hurt, as we are just getting the FSRef. */); 
     if (URL == NULL)
@@ -88,10 +99,18 @@ rbobj_to_alias_handle (VALUE obj, AliasHandle *alias)
         error = FSNewAlias (NULL, &ref, alias);
         if (error != noErr)
             rb_raise (rb_eArgError, "Cannot create alias handle for given filename '%s' : %s (%d)",
-                      RSTRING_PTR(obj), GetMacOSStatusErrorString (error), error); 
+#ifdef RUBY_19
+            		  RSTRING_PTR(obj), GetMacOSStatusErrorString (error), error); 
+#else
+                      RSTRING (obj)->ptr, GetMacOSStatusErrorString (error), error); 
+#endif
     }
     else {
         rb_raise (rb_eArgError, "Cannot obtain the filesystem reference for given filename '%s'",
-                  RSTRING_PTR(obj));
+#ifdef RUBY_19
+            	  RSTRING_PTR(obj));
+#else
+                  RSTRING (obj)->ptr);
+#endif
     }
 }

data/{ext/rubyosa → src}/rbosa_sdef.c

@@ -331,12 +331,20 @@ rbosa_scripting_info (VALUE self, VALUE hash)
         remote = CSTR2RVAL (c_remote);
     } 
 
+#ifdef RUBY_19
     if (RHASH_TBL(hash)->num_entries > 0) {
+#else
+    if (RHASH (hash)->tbl->num_entries > 0) {
+#endif
         VALUE   keys;
 
         keys = rb_funcall (hash, rb_intern ("keys"), 0);
         rb_raise (rb_eArgError, "inappropriate argument(s): %s", 
+#ifdef RUBY_19
                   RSTRING_PTR(rb_inspect (keys)));
+#else
+                  RSTRING (rb_inspect (keys))->ptr);
+#endif
     }
 
     if (NIL_P (remote)) {

metadata

@@ -1,63 +1,96 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: rubyosa19
-version: !ruby/object:Gem::Version
-  version: 0.5.0
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 0.5.4
 platform: ruby
-authors:
-- Alain Hoang
-- Jan Dvorak
-- Minh Thu Vo
-- James Adam
-- Paolo Bosetti
+authors: 
+- Laurent Sansonetti
+- Paolo Bosetti (adapting for 1.9)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-18 00:00:00.000000000 Z
-dependencies: []
-description: This is a modernization of the glorious but unmaintained rubyosa version,
-  aimed at making it compatible with ruby 1.9.x series. At the moment, it successfully
-  compiles on OS X Lion.
+
+date: 2011-03-03 00:00:00 -08:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: libxml-ruby
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.1.3
+  type: :runtime
+  version_requirements: *id001
+description: RubyOSA is a bridge that connects Ruby to the Apple Event Manager, automatically populating the API according to the target application's scriptable definition. This version is 1.9.2 compatible!
 email: p4010@me.com
-executables: []
-extensions:
-- ext/rubyosa/extconf.rb
+executables: 
+- rdoc-osa
+extensions: 
+- extconf.rb
 extra_rdoc_files: []
-files:
-- lib/rubyosa/rbosa.rb
-- lib/rubyosa/rbosa_properties.rb
-- lib/rubyosa.rb
-- ext/rubyosa/rbosa.c
-- ext/rubyosa/rbosa_conv.c
-- ext/rubyosa/rbosa_err.c
-- ext/rubyosa/rbosa_sdef.c
-- ext/rubyosa/osx_intern.h
-- ext/rubyosa/osx_ruby.h
-- ext/rubyosa/rbosa.h
-- ext/rubyosa/extconf.rb
-homepage: http://github.com/pbosetti/rubyosa19
+
+files: 
+- README.markdown
+- COPYRIGHT
+- AUTHORS
+- extconf.rb
+- src/rbosa.c
+- src/rbosa.h
+- src/rbosa_conv.c
+- src/rbosa_sdef.c
+- src/rbosa_err.c
+- src/lib/rbosa.rb
+- src/lib/rbosa_properties.rb
+- sample/Finder/show_desktop.rb
+- sample/iChat/uptime.rb
+- sample/iTunes/control.rb
+- sample/iTunes/fade_volume.rb
+- sample/iTunes/inspect.rb
+- sample/QuickTime/play_all.rb
+- sample/misc/sdef.rb
+- sample/BBEdit/unix_script.rb
+- sample/TextEdit/hello_world.rb
+- sample/iChat/image.rb
+- sample/iTunes/artwork.rb
+- sample/Mail/get_selected_mail.rb
+- 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
+- bin/rdoc-osa
+has_rdoc: true
+homepage: http://github.com/pbosetti/rubyosa
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
 requirements: []
-rubyforge_project: rubyosa19
-rubygems_version: 1.8.21
+
+rubyforge_project: rubyosa
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
-summary: Ruby 1.9.x OSA script interface
+summary: A Ruby/AppleEvent bridge.
 test_files: []
-has_rdoc: false
+