rubyosa19 0.5.4 → 0.6.0

data/ext/rubyosa/osx_ruby.h

@@ -0,0 +1,34 @@
+/**********************************************************************
+
+  ruby.h -
+
+  $Author$
+  created at: Sun 10 12:06:15 Jun JST 2007
+
+  Copyright (C) 2007-2008 Yukihiro Matsumoto
+
+**********************************************************************/
+
+#ifndef RUBY_H
+#define RUBY_H 1
+
+#define HAVE_RUBY_DEFINES_H     1
+#define HAVE_RUBY_ENCODING_H    1
+#define HAVE_RUBY_INTERN_H      1
+#define HAVE_RUBY_IO_H          1
+#define HAVE_RUBY_MISSING_H     1
+#define HAVE_RUBY_ONIGURUMA_H   1
+#define HAVE_RUBY_RE_H          1
+#define HAVE_RUBY_REGEX_H       1
+#define HAVE_RUBY_RUBY_H        1
+#define HAVE_RUBY_ST_H          1
+#define HAVE_RUBY_UTIL_H        1
+#define HAVE_RUBY_VERSION_H     1
+#define HAVE_RUBY_VM_H          1
+#ifdef _WIN32
+#define HAVE_RUBY_WIN32_H       1
+#endif
+
+#include "ruby/ruby.h"
+
+#endif /* RUBY_H */

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

@@ -27,7 +27,7 @@
  */ 
 
 #include "rbosa.h"
-#include <st.h>
+#include <ruby/st.h>
 
 static VALUE mOSA;
 static VALUE cOSAElement;
@@ -161,13 +161,8 @@ 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);
@@ -232,9 +227,6 @@ __rbosa_raise_potential_app_error (AEDesc *reply)
         return;
     }
 
-    if (errorNum == noErr)
-      return;
-
     /* The reply is an application error. */
 
     errorMsg = error_code_to_string(errorNum);
@@ -295,32 +287,18 @@ rbosa_app_send_event (VALUE self, VALUE event_class, VALUE event_id, VALUE param
     if (!NIL_P (params)) {
         unsigned    i;
 
-#ifdef RUBY_19
-		for (i = 0; i < RARRAY_LEN(params); i++) {
-#else
-        for (i = 0; i < RARRAY (params)->len; i++) {
-#endif
+        for (i = 0; i < RARRAY_LEN(params); i++) {
             VALUE   ary;
             VALUE   type;
             VALUE   element;
             FourCharCode code;
 
-#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
+            ary = RARRAY_PTR(params)[i];
+            if (NIL_P (ary) || RARRAY_LEN(ary) != 2)
                 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 == '----')
@@ -579,13 +557,8 @@ 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/{src → ext/rubyosa}/rbosa.h

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

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

@@ -43,15 +43,9 @@ 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 {
@@ -81,14 +75,9 @@ rbobj_to_alias_handle (VALUE obj, AliasHandle *alias)
     Check_Type (obj, T_STRING);
     *alias = NULL;
 
-    URL = CFURLCreateFromFileSystemRepresentation (kCFAllocatorDefault,
-#ifdef RUBY_19
-        										   (const UInt8 *)RSTRING_PTR(obj), 
-        										   RSTRING_LEN(obj),
-#else
-                                                   (const UInt8 *)RSTRING (obj)->ptr, 
-                                                   RSTRING (obj)->len,
-#endif
+    URL = CFURLCreateFromFileSystemRepresentation (kCFAllocatorDefault, 
+                                                   (const UInt8 *)RSTRING_PTR (obj), 
+                                                   RSTRING_LEN(obj),
                                                    0 /* XXX: normally passing 0 even if it's a directory should
                                                         not hurt, as we are just getting the FSRef. */); 
     if (URL == NULL)
@@ -99,18 +88,10 @@ 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)",
-#ifdef RUBY_19
-            		  RSTRING_PTR(obj), GetMacOSStatusErrorString (error), error); 
-#else
-                      RSTRING (obj)->ptr, GetMacOSStatusErrorString (error), error); 
-#endif
+                      RSTRING_PTR(obj), GetMacOSStatusErrorString (error), error); 
     }
     else {
         rb_raise (rb_eArgError, "Cannot obtain the filesystem reference for given filename '%s'",
-#ifdef RUBY_19
-            	  RSTRING_PTR(obj));
-#else
-                  RSTRING (obj)->ptr);
-#endif
+                  RSTRING_PTR(obj));
     }
 }

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

@@ -331,20 +331,12 @@ 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)) {

data/{src/lib → lib/rubyosa}/rbosa.rb

@@ -24,23 +24,53 @@
 # IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-unless RUBY_VERSION =~ /^1.9/ then
-  $KCODE = 'u' # we will use UTF-8 strings
-end
-
-require 'osa'
 require 'date'
 require 'uri'
-require 'iconv'
-require 'xml'
+# require 'iconv'
+
+# Try to load RubyGems first, libxml-ruby may have been installed by it.
+begin require 'rubygems'; rescue LoadError; end
+
+# If libxml-ruby is not present, switch to REXML.
+USE_LIBXML = begin
+  require 'xml/libxml'
+
+  # libxml-ruby bug workaround.
+  class XML::Node
+    alias_method :old_cmp, :==
+    def ==(x)
+      (x != nil and old_cmp(x))
+    end
+  end
+  true
+rescue LoadError
+  require 'rexml/document'
+
+  # REXML -> libxml-ruby compatibility layer.
+  class REXML::Element
+    alias_method :old_find, :find
+    def find(path=nil, &block)
+      if path.nil? and block
+        old_find { |*x| block.call(*x) }
+      else
+        list = []
+        ::REXML::XPath.each(self, path) { |e| list << e }
+        list
+      end
+    end
+    def [](attr)
+      attributes[attr]
+    end
+    def find_first(path)
+      ::REXML::XPath.first(self, path)
+    end
+  end
+  false
+end
 
 class String
   def to_4cc
-    if RUBY_VERSION =~ /^1.9/ then
-      OSA.__four_char_code__(Iconv.iconv('MACROMAN', 'UTF-8', self)[0].to_s)
-    else
-      OSA.__four_char_code__(Iconv.iconv('MACROMAN', 'UTF-8', self).to_s)
-    end
+    OSA.__four_char_code__(self.encode('MACROMAN').to_s)
   end
 end
 
@@ -433,7 +463,12 @@ module OSA
 
   def self.__load_sdef__(sdef, target, app_module, merge_only=false, app_class=nil)
     # Load the sdef.
-    doc = XML::Parser.string(sdef).parse
+    doc = if USE_LIBXML
+      parser = XML::Parser.string(sdef)
+      parser.parse
+    else
+      REXML::Document.new(sdef)
+    end
 
     # Retrieves and creates enumerations.
     enum_group_codes = {} 
@@ -617,13 +652,13 @@ module OSA
       has_result = result != nil
  
       code = element['code']
-      begin
-        code = Iconv.iconv('MACROMAN', 'UTF-8', code).to_s
-      rescue Iconv::IllegalSequence
-        # We can't do more...
-        STDERR.puts "unrecognized command code encoding '#{code}', skipping..." if $DEBUG
-        next
-      end
+      # begin
+        code = code.encode('MACROMAN').to_s
+      # rescue Iconv::IllegalSequence
+      #   # We can't do more...
+      #   STDERR.puts "unrecognized command code encoding '#{code}', skipping..." if $DEBUG
+      #   next
+      # end
 
       classes_to_define = []
       forget_direct_parameter = true
@@ -1003,5 +1038,3 @@ OSA.add_conversion_to_osa('color') do |values|
   ary = values.map { |i| OSA::Element.__new__('long', [i].pack('l')) }
   OSA::ElementList.__new__(ary)
 end
-
-require 'rbosa_properties'

data/lib/rubyosa.rb

@@ -0,0 +1,18 @@
+# encoding: utf-8
+#
+# Copyright (C) 2012 Paolo Bosetti <p4010@me.com>
+#
+# This program is distributed under the terms of the MIT license.
+# See the included MIT-LICENSE file for the terms of this license.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require "rubyosa/osa"
+require "rubyosa/rbosa"
+require "rubyosa/rbosa_properties"

metadata

@@ -1,96 +1,63 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rubyosa19
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.6.0
   prerelease: 
-  version: 0.5.4
 platform: ruby
-authors: 
-- Laurent Sansonetti
-- Paolo Bosetti (adapting for 1.9)
+authors:
+- Alain Hoang
+- Jan Dvorak
+- Minh Thu Vo
+- James Adam
+- Paolo Bosetti
 autorequire: 
 bindir: bin
 cert_chain: []
-
-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!
+date: 2012-04-19 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.
 email: p4010@me.com
-executables: 
-- rdoc-osa
-extensions: 
-- extconf.rb
+executables: []
+extensions:
+- ext/rubyosa/extconf.rb
 extra_rdoc_files: []
-
-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
+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
 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: rubyosa
-rubygems_version: 1.5.2
+rubyforge_project: rubyosa19
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
-summary: A Ruby/AppleEvent bridge.
+summary: Ruby 1.9.x OSA script interface
 test_files: []
-
+has_rdoc: false

data/AUTHORS

@@ -1,16 +0,0 @@
-Maintainer & Author:
-Laurent Sansonetti <lsansonetti@apple.com>
-
-Contributors:
-Aaron Patterson <aaron.patterson@gmail.com>
-Carlos Villela <carlos.villela@gmail.com>
-James MacAulay <jmacaulay@gmail.com>
-Justin Palmer <encytemedia@gmail.com>
-Michael Pruett <michael@68k.org>
-Michail Pishchagin <mblsha@gmail.com>
-Mike Naberezny <mike@maintainable.com>
-Sebastian Delmont <sd@notso.net>
-Stefan Saasen <s@juretta.com>
-Terry Donoghue <donoghue@apple.com>
-Vincent Isambart <vincent.isambart@gmail.com>
-Wes Rogers <wesrog@gmail.com>

data/COPYRIGHT

@@ -1,25 +0,0 @@
-Copyright (c) 2006-2007, Apple Inc. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1.  Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer. 
-2.  Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution. 
-3.  Neither the name of Apple Inc. ("Apple") nor the names of
-    its contributors may be used to endorse or promote products derived
-    from this software without specific prior written permission. 
-
-THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.

data/README.markdown

@@ -1,61 +0,0 @@
-Introduction
-============
-
-RubyOSA is a bridge that connects Ruby to the Apple Event Manager 
-infrastructure.
- 
-It automatically populates the API (classes, methods, constants) according 
-to the target application's scriptable definition.
-
-RubyOSA is an alternative to RubyAEOSA, and meant to replace it.
-
-RubyOSA is licensied under a BSD license, see the COPYRIGHT file for more 
-information.
-
-More information on the [project home page](http://rubyosa.rubyforge.org).
-
-Requirements
-============
-
-* Mac OS X 10.4.X or greater
-* ruby 1.8.X or greater
-* libxml-ruby 0.3.8 or greater
-
-Install
-=======
-The plain old way:
-
-	$ ruby extconf.rb
-	$ make
-	$ sudo make install
-	$ sudo make install-extras
-
-`make install` will only install the core of the bridge, while 
-`make install-extras` will install some additional tools such as the rdoc-osa
-utility.
-
-Otherwise, if you are reading GitHub, use the gem:
-
-	sudo gem install sstephenson-rubyosa
-
-or
-
-	sudo gem install pbosetti-rubyosa
-
-Support
-=======
-
-A tutorial is available online at [http://rubyosa.rubyforge.org/tutorial.html](http://rubyosa.rubyforge.org/tutorial.html).
-
-Sample code is available in the `sample' sub-directory.
-
-The rdoc-osa tool can be used to generate API reference documentation
-for the given application. See its --help flag for more information
-about how to use it.
-
-Feel free to send feedback to rubyosa-discuss@rubyforge.org.
-
-You can also file bugs, patches and feature requests to [the tracker](http://rubyforge.org/tracker/?group_id=1845.)
-
-When reporting a bug, please set the AEDebugSends and AEDebugReceives 
-environment variables to 1 and attach the logs.