accessibility_core 0.4.3 → 0.5.0

data/ext/accessibility/core/extconf.rb

@@ -4,19 +4,14 @@ $CFLAGS << ' -std=c99 -Wall -Werror -pedantic -ObjC'
 $LIBS   << ' -framework CoreFoundation -framework ApplicationServices -framework Cocoa'
 $LIBS   << ' -framework CoreGraphics' unless `sw_vers -productVersion`.to_f == 10.7
 
-if RUBY_ENGINE == 'macruby'
-  $CFLAGS << ' -fobjc-gc'
-else
-  unless RbConfig::CONFIG["CC"].match /clang/
-    clang = `which clang`.chomp
-    if clang.empty?
-      raise "Clang not installed. Cannot build C extension"
-    else
-      RbConfig::MAKEFILE_CONFIG["CC"]  = clang
-      RbConfig::MAKEFILE_CONFIG["CXX"] = clang
-    end
+unless RbConfig::CONFIG["CC"].match(/clang/)
+  clang = `which clang`.chomp
+  if clang.empty?
+    raise "Clang not installed. Cannot build C extension"
+  else
+    RbConfig::MAKEFILE_CONFIG["CC"]  = clang
+    RbConfig::MAKEFILE_CONFIG["CXX"] = clang
   end
-  $CFLAGS << ' -DNOT_MACRUBY'
 end
 
 create_makefile 'accessibility/core/core'

data/ext/accessibility/extras/extconf.rb

@@ -3,20 +3,14 @@ require 'mkmf'
 $CFLAGS << ' -std=c99 -Wall -Werror -pedantic -ObjC'
 $LIBS   << ' -framework CoreFoundation -framework Cocoa -framework IOKit'
 
-if RUBY_ENGINE == 'macruby'
-  $CFLAGS << ' -fobjc-gc'
-  $CFLAGS.sub! /-Werror/, '' # :(
-else
-  unless RbConfig::CONFIG["CC"].match /clang/
-    clang = `which clang`.chomp
-    if clang.empty?
-      raise "Clang not installed. Cannot build C extension"
-    else
-      RbConfig::MAKEFILE_CONFIG["CC"]  = clang
-      RbConfig::MAKEFILE_CONFIG["CXX"] = clang
-    end
+unless RbConfig::CONFIG["CC"].match(/clang/)
+  clang = `which clang`.chomp
+  if clang.empty?
+    raise "Clang not installed. Cannot build C extension"
+  else
+    RbConfig::MAKEFILE_CONFIG["CC"]  = clang
+    RbConfig::MAKEFILE_CONFIG["CXX"] = clang
   end
-  $CFLAGS << ' -DNOT_MACRUBY'
 end
 
 create_makefile 'accessibility/extras/extras'

data/ext/accessibility/extras/extras.c

@@ -7,11 +7,9 @@
 #import <IOKit/ps/IOPSKeys.h>
 #import <IOKit/pwr_mgt/IOPMLib.h>
 #import <IOKit/hidsystem/IOHIDShared.h>
+#import <Cocoa/Cocoa.h>
 
 static VALUE rb_mBattery;
-#ifndef NOT_MACRUBY
-static VALUE rb_cScreen;
-#endif
 
 static VALUE battery_not_installed;
 static VALUE battery_charged;
@@ -20,11 +18,6 @@ static VALUE battery_discharging;
 
 static io_connect_t screen_connection = MACH_PORT_NULL;
 
-
-#ifdef NOT_MACRUBY
-
-#import <Cocoa/Cocoa.h>
-
 static VALUE rb_cRunningApp;
 static VALUE rb_cWorkspace;
 static VALUE rb_cProcInfo;
@@ -38,9 +31,9 @@ static VALUE key_opts;
 
 static
 VALUE
-wrap_app(NSRunningApplication* app)
+wrap_app(NSRunningApplication* const app)
 {
-  return Data_Wrap_Struct(rb_cRunningApp, NULL, objc_finalizer, (void*)app);
+    return Data_Wrap_Struct(rb_cRunningApp, NULL, objc_finalizer, (void*)app);
 }
 
 static
@@ -52,22 +45,23 @@ unwrap_app(VALUE app)
   return running_app;
 }
 
-static VALUE wrap_array_apps(NSArray* ary)
+static VALUE wrap_array_apps(NSArray* const ary)
 {
-  CFArrayRef array = (CFArrayRef)ary;
+  CFArrayRef const array = (CFArrayRef const)ary;
   WRAP_ARRAY(wrap_app);
 }
 
 
 static
 VALUE
-rb_running_app_with_pid(VALUE self, VALUE pid)
+rb_running_app_with_pid(VALUE self, VALUE num_pid)
 {
-  NSRunningApplication* app = [NSRunningApplication
-			       runningApplicationWithProcessIdentifier:NUM2PIDT(pid)];
-  if (app)
-    return wrap_app(app);
-  return Qnil; // ruby behaviour would be to raise, but we want "drop-in" compat
+    const pid_t pid = NUM2PIDT(num_pid);
+    NSRunningApplication* const app =
+      [NSRunningApplication runningApplicationWithProcessIdentifier:pid];
+
+    if (app) return wrap_app(app);
+    return Qnil; // ruby behaviour would be to raise, but we want "drop-in" compat
 }
 
 static
@@ -82,10 +76,9 @@ static
 VALUE
 rb_running_app_current_app(VALUE self)
 {
-  NSRunningApplication* app = [NSRunningApplication currentApplication];
-  if (app)
-    return wrap_app(app);
-  return Qnil;
+    NSRunningApplication* const app = [NSRunningApplication currentApplication];
+    if (app) return wrap_app(app);
+    return Qnil;
 }
 
 static
@@ -482,26 +475,19 @@ static
 VALUE
 rb_screen_screens(VALUE self)
 {
-  return wrap_array_screens((CFArrayRef)[NSScreen screens]);
+    return wrap_array_screens((CFArrayRef)[NSScreen screens]);
 }
 
 static
 VALUE
 rb_screen_frame(VALUE self)
 {
-  return wrap_rect([unwrap_screen(self) frame]);
+    return wrap_rect(NSRectToCGRect([unwrap_screen(self) frame]));
 }
 
-#endif
-
-
 static
 VALUE
-#ifdef NOT_MACRUBY
 rb_screen_wake(VALUE self)
-#else
-rb_screen_wake(VALUE self, SEL sel)
-#endif
 {
   // don't bother if we are awake
   if (!CGDisplayIsAsleep(CGMainDisplayID()))
@@ -518,7 +504,7 @@ rb_screen_wake(VALUE self, SEL sel)
     }
   }
 
-  CGPoint      mouse = [NSEvent mouseLocation];
+  CGPoint      mouse = NSPointToCGPoint([NSEvent mouseLocation]);
   IOGPoint     point = { mouse.x, mouse.y };
   unsigned int flags = (unsigned int)[NSEvent modifierFlags];
   NXEventData   data;
@@ -720,8 +706,6 @@ Init_extras()
   // force Ruby to be registered as an app with the system
   [NSApplication sharedApplication];
 
-#ifdef NOT_MACRUBY
-
   /*
    * Document-class: NSRunningApplication
    *
@@ -861,9 +845,7 @@ Init_extras()
   rb_define_method(rb_cBundle, "infoDictionary",             rb_bundle_info_dict,                0);
   rb_define_method(rb_cBundle, "objectForInfoDictionaryKey", rb_bundle_object_for_info_dict_key, 1);
 
-
   rb_define_method(rb_cObject, "load_plist", rb_load_plist, 1);
-#endif
 
 
   /*
@@ -877,15 +859,10 @@ Init_extras()
    */
   rb_cScreen = rb_define_class("NSScreen", rb_cObject);
 
-#ifdef NOT_MACRUBY
   rb_define_singleton_method(rb_cScreen, "mainScreen", rb_screen_main,    0);
   rb_define_singleton_method(rb_cScreen, "screens",    rb_screen_screens, 0);
   rb_define_singleton_method(rb_cScreen, "wakeup",     rb_screen_wake,    0); // our custom method
   rb_define_method(          rb_cScreen, "frame",      rb_screen_frame,   0);
-#else
-  rb_objc_define_method(*(VALUE*)rb_cScreen, "wakeup", rb_screen_wake, 0);
-#endif
-
 
   /*
    * Document-module: Battery

data/ext/accessibility/highlighter/extconf.rb

@@ -4,20 +4,14 @@ $CFLAGS << ' -std=c99 -Wall -Werror -pedantic -ObjC'
 $LIBS   << ' -framework CoreFoundation -framework ApplicationServices -framework Cocoa'
 $LIBS   << ' -framework CoreGraphics' unless `sw_vers -productVersion`.to_f == 10.7
 
-if RUBY_ENGINE == 'macruby'
-  $CFLAGS << ' -fobjc-gc'
-  $CFLAGS.sub! /-Werror/, ''
-else
-  unless RbConfig::CONFIG["CC"].match /clang/
-    clang = `which clang`.chomp
-    if clang.empty?
-      raise "Clang not installed. Cannot build C extension"
-    else
-      RbConfig::MAKEFILE_CONFIG["CC"]  = clang
-      RbConfig::MAKEFILE_CONFIG["CXX"] = clang
-    end
+unless RbConfig::CONFIG["CC"].match(/clang/)
+  clang = `which clang`.chomp
+  if clang.empty?
+    raise "Clang not installed. Cannot build C extension"
+  else
+    RbConfig::MAKEFILE_CONFIG["CC"]  = clang
+    RbConfig::MAKEFILE_CONFIG["CXX"] = clang
   end
-  $CFLAGS << ' -DNOT_MACRUBY'
 end
 
 create_makefile 'accessibility/highlighter/highlighter'

data/ext/accessibility/highlighter/highlighter.c

@@ -4,8 +4,6 @@
 #include "../extras/extras.h"
 
 
-#ifdef NOT_MACRUBY
-
 static VALUE rb_cHighlighter;
 static VALUE rb_cColor;
 
@@ -53,9 +51,9 @@ static
 CGRect
 flip(CGRect rect)
 {
-  double screen_height = NSMaxY([[NSScreen mainScreen] frame]);
-  rect.origin.y        = screen_height - NSMaxY(rect);
-  return rect;
+    const double screen_height = NSMaxY([[NSScreen mainScreen] frame]);
+    rect.origin.y              = screen_height - NSMaxY(NSRectFromCGRect(rect));
+    return rect;
 }
 
 static
@@ -65,14 +63,12 @@ rb_highlighter_new(int argc, VALUE* argv, VALUE self)
   if (!argc)
     rb_raise(rb_eArgError, "wrong number of arguments (0 for 1+)");
 
-  CGRect bounds = unwrap_rect(coerce_to_rect(argv[0]));
-  bounds = flip(bounds); // we assume the rect is in the other co-ordinate system
-
-  NSWindow* window =
-    [[NSWindow alloc] initWithContentRect:bounds
-                                styleMask:NSBorderlessWindowMask
-		                  backing:NSBackingStoreBuffered
-                                    defer:true];
+  const CGRect bounds = flip(unwrap_rect(coerce_to_rect(argv[0])));
+  NSWindow* const window =
+      [[NSWindow alloc] initWithContentRect:NSRectFromCGRect(bounds)
+                                  styleMask:NSBorderlessWindowMask
+		                    backing:NSBackingStoreBuffered
+                                      defer:true];
 
   NSColor* color = [NSColor magentaColor];
 
@@ -89,7 +85,7 @@ rb_highlighter_new(int argc, VALUE* argv, VALUE self)
   [window setLevel:NSStatusWindowLevel];
   [window setBackgroundColor:color];
   [window setIgnoresMouseEvents:true];
-  [window setFrame:bounds display:false];
+  [window setFrame:NSRectFromCGRect(bounds) display:false];
   [window makeKeyAndOrderFront:NSApp];
   [window setReleasedWhenClosed:false];
 
@@ -132,7 +128,7 @@ static
 VALUE
 rb_highlighter_frame(VALUE self)
 {
-  return wrap_rect([unwrap_window(self) frame]);
+    return wrap_rect(NSRectToCGRect([unwrap_window(self) frame]));
 }
 
 static
@@ -225,7 +221,6 @@ rb_color_equality(VALUE self, VALUE other)
   return Qfalse;
 }
 
-#endif
 
 
 void
@@ -234,8 +229,6 @@ Init_highlighter()
   Init_bridge();
   Init_extras();
 
-#ifdef NOT_MACRUBY
-
   // force initialization or NSWindow won't work
   [NSApplication sharedApplication];
 
@@ -292,6 +285,4 @@ Init_highlighter()
   //rb_define_singleton_method(rb_cColor, "colorWithSRGBRed", rb_color_rgb,        2);
 
   rb_define_method(rb_cColor, "==", rb_color_equality, 1);
-
-#endif
 }

data/lib/accessibility/bridge.rb

@@ -1,33 +1,3 @@
 require 'accessibility/core/version'
+require 'accessibility/bridge/mri'
 
-
-if defined? MACRUBY_REVISION
-
-  ##
-  # Whether or not we are running on MacRuby
-  def on_macruby?
-    true
-  end
-
-  framework 'Cocoa'
-
-  # A workaround that guarantees that `CGPoint` is defined
-  unless defined? MOUNTAIN_LION_APPKIT_VERSION
-    MOUNTAIN_LION_APPKIT_VERSION = 1187
-  end
-
-  if NSAppKitVersionNumber >= MOUNTAIN_LION_APPKIT_VERSION
-    framework '/System/Library/Frameworks/CoreGraphics.framework'
-  end
-
-  require 'accessibility/bridge/macruby'
-
-else
-
-  def on_macruby?
-    false
-  end
-
-  require 'accessibility/bridge/mri'
-
-end

data/lib/accessibility/core.rb

@@ -3,10 +3,5 @@ require 'accessibility/bridge'
 
 # internal deps
 require 'accessibility/core/version'
-
-if on_macruby?
-  require 'accessibility/core/macruby'
-else
-  require 'accessibility/core/core.bundle'
-end
+require 'accessibility/core/core.bundle'
 

data/lib/accessibility/core/version.rb

@@ -6,6 +6,6 @@ module Accessibility
   # Namespace for `accessibility_core` specific classes
   module Core
     # return [String]
-    VERSION = '0.4.3'
+    VERSION = '0.5.0'
   end
 end

data/lib/accessibility/extras.rb

@@ -1,5 +1,3 @@
 require 'accessibility/bridge'
-
 require 'accessibility/extras/common'
-framework 'Cocoa' if on_macruby?
 require 'accessibility/extras/extras.bundle'

data/lib/accessibility/highlighter.rb

@@ -1,8 +1,3 @@
 require 'accessibility/bridge'
-
-if on_macruby?
-  require 'accessibility/highlighter/macruby'
-else
-  require 'accessibility/highlighter/highlighter.bundle'
-end
+require 'accessibility/highlighter/highlighter.bundle'
 

data/test/helper.rb

@@ -3,16 +3,6 @@ $LOAD_PATH << 'lib'
 require 'minitest/autorun'
 require 'minitest/pride'
 
-if defined? MACRUBY_REVISION
-  def on_macruby?
-    true
-  end
-else
-  def on_macruby?
-    false
-  end
-end
-
 if `uname -r`.to_i >= 13
   def on_sea_lion?
     true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: accessibility_core
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.0
 platform: ruby
 authors:
 - Mark Rada
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-05 00:00:00.000000000 Z
+date: 2015-01-11 00:00:00.000000000 Z
 dependencies: []
 description: |
   accessibility_core is a wrapper around the OS X Accessibility framework.
@@ -28,15 +28,12 @@ extensions:
 extra_rdoc_files: []
 files:
 - lib/accessibility/bridge/common.rb
-- lib/accessibility/bridge/macruby.rb
 - lib/accessibility/bridge/mri.rb
 - lib/accessibility/bridge.rb
-- lib/accessibility/core/macruby.rb
 - lib/accessibility/core/version.rb
 - lib/accessibility/core.rb
 - lib/accessibility/extras/common.rb
 - lib/accessibility/extras.rb
-- lib/accessibility/highlighter/macruby.rb
 - lib/accessibility/highlighter.rb
 - ext/accessibility/bridge/bridge.c
 - ext/accessibility/core/core.c
@@ -52,9 +49,8 @@ files:
 - README.markdown
 - History.markdown
 - .yardopts
-- test/test_core.rb
 - test/helper.rb
-homepage: http://github.com/AXElements/accessibility_core
+homepage: https://github.com/AXElements/accessibility_core
 licenses:
 - BSD 3-clause
 metadata: {}
@@ -74,10 +70,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: A library for building automation tools on OS X
 test_files:
-- test/test_core.rb
 - test/helper.rb