mouse 0.1.0 → 1.0.0

data/History.markdown

@@ -1,3 +1,9 @@
+# 1.0.0 - Port Completed
+
+  * Added optional `point` argument to all `Mouse` click methods
+  * Added duration argument to all `Mouse` methods that are animated
+  * Fix differences between MRI CGPoint and MacRuby CGPoint
+
 # 0.1.0 - The basic API
 
   * Fixed animation timing (sleep(3) type coercion issue)

data/README.markdown

@@ -4,9 +4,58 @@ A port of mouse.rb from [AXElements](http://github.com/Marketcircle/AXElements),
 but cleaned up and rewritten in C to be more portable across languages and
 runtimes.
 
+By itself, the `mouse` gem is not that useful; but in combination
+with a gem for discovering the positions of things (like buttons) on
+the screen, this gem is very powerful and can be used for tasks such
+as automated functional
+testing; this is the purpose of the
+[AXElements](http://github.com/Marketcircle/AXElements) project.
+
+[Documentation](http://rdoc.info/gems/mouse/frames)
+
+
 ## Examples
 
-TODO :P
+    require 'mouse'
+
+    Mouse.current_position # => #<CGPoint x=873.2 y=345.0>
+
+    # positions can be given as a an array with two points, or a CGPoint
+    Mouse.move_to [10, 10]
+    Mouse.move_to CGPoint.new(10, 10)
+
+    # optionally specify how long it should take the mouse to move
+    Mouse.move_to [800, 300], 0.2
+
+    Mouse.click
+    Mouse.double_click
+    Mouse.triple_click
+
+    # secondary_click and right_click are aliases to the same method
+    Mouse.secondary_click
+    Mouse.right_click
+
+    # positive number scrolls up, negative number scrolls down
+    Mouse.scroll 10
+    Mouse.scroll -10
+
+    # optionally specify units for scroll amount, :pixel or :line
+    Mouse.scroll 10, :pixels
+    Mouse.scroll -10, :pixels
+
+See the [Mouse Documentation](http://rdoc.info/gems/mouse/Mouse) for
+more details.
+
+You may have noticed that when you ask the mouse to move to a specific
+location that it may not end up at the exact co-ordinates, but it will
+be close (distance of less than 1). This is by design, but that may
+change in the future if there are enough complaints.
+
+
+## TODO
+
+  * Support for mouse gestures
+  * Make animation duration accurate (currently naiveté has a bit of error)
 
 ## Copyright
 

data/Rakefile

@@ -1,4 +1,4 @@
-task :default => :install
+task :default => :test
 
 require 'rake/clean'
 CLEAN.include '*.plist', '*.gch'
@@ -13,11 +13,12 @@ task :console => [:compile] do
   sh 'irb -Ilib -rmouse'
 end
 
-desc 'Run tests'
-task :test do
-  # @todo
-  ruby 'test/helper.rb'
+require 'rake/testtask'
+Rake::TestTask.new do |t|
+  t.libs << '.'
+  t.pattern = 'test/*_test.rb'
 end
+task :test => :compile
 
 
 # Gem stuff

data/ext/mouse/mouse.c

@@ -8,6 +8,7 @@ static ID sel_y;
 static ID sel_to_point;
 static ID sel_to_i;
 static ID sel_new;
+static ID unit_pixel;
 
 #define CURRENT_POSITION rb_mouse_wrap_point(mouse_current_position())
 
@@ -57,109 +58,219 @@ rb_mouse_current_position(VALUE self)
  * Move the mouse cursor to the given co-ordinates
  *
  * @param point [CGPoint,Array(Number,Number),#to_point]
+ * @param duration [Number] animation time, in seconds (__optional__)
  * @return [CGPoint]
  */
 static
 VALUE
-rb_mouse_move_to(VALUE self, VALUE point)
+rb_mouse_move_to(int argc, VALUE *argv, VALUE self)
 {
-  mouse_move_to(rb_mouse_unwrap_point(point));
+  switch (argc)
+    {
+    case 0:
+      rb_raise(rb_eArgError, "move_to requires at least a one arg");
+      break;
+    case 1:
+      mouse_move_to(rb_mouse_unwrap_point(argv[0]));
+      break;
+    case 2:
+    default:
+      mouse_move_to2(rb_mouse_unwrap_point(argv[0]), NUM2DBL(argv[1]));
+    }
+
   return CURRENT_POSITION;
 }
 
 /*
  * Drag the mouse cursor to the given co-ordinates
  *
- * @param point [CGPoint,Array(Number,Number),#to_point]
+ * @param (see #move_to)
  * @return [CGPoint]
  */
 static
 VALUE
-rb_mouse_drag_to(VALUE self, VALUE point)
+rb_mouse_drag_to(int argc, VALUE *argv, VALUE self)
 {
-  mouse_drag_to(rb_mouse_unwrap_point(point));
+  switch (argc)
+    {
+    case 0:
+      rb_raise(rb_eArgError, "drag_to requires at least a one arg");
+      break;
+    case 1:
+      mouse_drag_to(rb_mouse_unwrap_point(argv[0]));
+      break;
+    case 2:
+    default:
+      mouse_drag_to2(rb_mouse_unwrap_point(argv[0]), NUM2DBL(argv[1]));
+    }
+
   return CURRENT_POSITION;
 }
 
 /*
+ * @note Scrolling by `:pixel` may not actually be by real pixels, but instead
+ *       correspond to Cocoa co-ords (I don't have a retina display, so I haven't
+ *       checked it out yet).
+ *
  * Generate `amount` scroll events at the current cursor position
  *
- * Returns number of lines scrolled.
+ * Returns number of lines scrolled. A positive `amount` will scroll up
+ * and a negative `amount` will scroll down.
+ *
+ * An invalid type of `units` will default to `:line`.
  *
  * @param amount [Number]
+ * @param units [Symbol] `:pixel` or `:line` (_default_: `:line` ) (__optional__)
  * @return [Number]
  */
 static
 VALUE
-rb_mouse_scroll(VALUE self, VALUE amount)
+rb_mouse_scroll(int argc, VALUE *argv, VALUE self)
 {
-  amount = rb_funcall(amount, sel_to_i, 0);
-  mouse_scroll(NUM2SIZET(amount));
+  if (argc == 0 || argc > 3)
+    rb_raise(rb_eArgError, "scroll requires 1..3 arguments, you gave %d", argc);
+
+  VALUE  amount = rb_funcall(argv[0], sel_to_i, 0);
+  size_t amt    = NUM2SIZET(amount);
+
+  if (argc == 1)
+    mouse_scroll(NUM2SIZET(amt));
+
+  ID units = rb_to_id(argv[1]);
+
+  if (argc == 2) {
+    if (units == unit_pixel)
+      mouse_scroll2(amt, kCGScrollEventUnitPixel);
+    else
+      mouse_scroll2(amt, kCGScrollEventUnitLine);
+  }
+
+  if (argc == 3) {
+    double duration = NUM2DBL(argv[2]);
+
+    if (units == unit_pixel)
+      mouse_scroll3(amt, kCGScrollEventUnitPixel, duration);
+    else
+      mouse_scroll3(amt, kCGScrollEventUnitLine, duration);
+  }
+
   return amount;
 }
 
 /*
- * Generate the down click part of a click event at the current position
+ * Generate the down click part of a click event
  *
  * This might be useful in concert with {Mouse.click_up} if you want
  * to inject some behaviour between the down and up click events.
  *
+ * You can optionally specify a point to click; the mouse cursor will
+ * instantly jump to the given point.
+ *
+ * @param point [CGPoint] (_default_: {#current_position}) (__optional__)
  * @return [CGPoint]
  */
 static
 VALUE
-rb_mouse_click_down(VALUE self)
+rb_mouse_click_down(int argc, VALUE *argv, VALUE self)
 {
-  mouse_click_down();
+  switch (argc)
+    {
+    case 0:
+      mouse_click_down();
+      break;
+    case 1:
+    default:
+      mouse_click_down2(rb_mouse_unwrap_point(argv[0]));
+    }
+
   return CURRENT_POSITION;
 }
 
 /*
- * Generate the up click part of a click event at the current position
+ * Generate the up click part of a click event
  *
  * This might be useful in concert with {Mouse.click_down} if you want
  * to inject some behaviour between the down and up click events.
  *
+ * You can optionally specify a point to click; the mouse cursor will
+ * instantly jump to the given point.
+ *
+ * @param point [CGPoint] (_default_: {#current_position}) (__optional__)
  * @return [CGPoint]
  */
 static
 VALUE
-rb_mouse_click_up(VALUE self)
+rb_mouse_click_up(int argc, VALUE *argv, VALUE self)
 {
-  mouse_click_up();
+  switch (argc)
+    {
+    case 0:
+      mouse_click_up();
+      break;
+    case 1:
+    default:
+      mouse_click_up(rb_mouse_unwrap_point(argv[0]));
+    }
+
   return CURRENT_POSITION;
 }
 
 /*
- * Generate a regular click event at the current mouse position
+ * Generate a regular click event (both up and down events)
+ *
+ * You can optionally specify a point to click; the mouse cursor will
+ * instantly jump to the given point.
  *
+ * @param point [CGPoint] (_default_: {#current_position}) (__optional__)
  * @return [CGPoint]
  */
 static
 VALUE
-rb_mouse_click(VALUE self)
+rb_mouse_click(int argc, VALUE *argv, VALUE self)
 {
-  mouse_click();
+  switch (argc)
+    {
+    case 0:
+      mouse_click();
+      break;
+    case 1:
+    default:
+      mouse_click2(rb_mouse_unwrap_point(argv[0]));
+    }
+
   return CURRENT_POSITION;
 }
 
 /*
- * Generate a secondary click at the current mouse position
+ * Generate a secondary click (both down and up events)
  *
  * Secondary click is often referred to as "right click".
  *
+ * You can optionally specify a point to click; the mouse cursor will
+ * instantly jump to the given point.
+ *
+ * @param point [CGPoint] (_default_: {#current_position}) (__optional__)
  * @return [CGPoint]
  */
 static
 VALUE
-rb_mouse_secondary_click(VALUE self)
+rb_mouse_secondary_click(int argc, VALUE *argv, VALUE self)
 {
-  mouse_secondary_click();
+  switch (argc)
+    {
+    case 0:
+      mouse_secondary_click();
+      break;
+    case 1:
+    default:
+      mouse_secondary_click2(rb_mouse_unwrap_point(argv[0]));
+    }
+
   return CURRENT_POSITION;
 }
 
 /*
- * Generate a click using an arbitrary mouse button at the current position
+ * Generate a click using an arbitrary mouse button (down and up events)
  *
  * Numbers are used to map the mouse buttons. At the time of writing,
  * the documented values are:
@@ -172,30 +283,62 @@ rb_mouse_secondary_click(VALUE self)
  * to figure out. See the `CGMouseButton` enum in the reference
  * documentation for the most up to date list.
  *
+ * You can optionally specify a point to click; the mouse cursor will
+ * instantly jump to the given point.
+ *
  * @param button [Number,#to_i]
+ * @param point [CGPoint] (_default_: {#current_position}) (__optional__)
  * @return [CGPoint]
  */
 static
 VALUE
-rb_mouse_arbitrary_click(VALUE self, VALUE button)
+rb_mouse_arbitrary_click(int argc, VALUE *argv, VALUE self)
 {
-  button = rb_funcall(button, sel_to_i, 0);
-  mouse_arbitrary_click(NUM2UINT(button));
+  if (argc == 0) {
+    rb_raise(rb_eArgError, "arbitrary_click requires at least one arg");
+    return Qnil;
+  }
+
+  uint_t button = NUM2INT(rb_funcall(argv[0], sel_to_i, 0));
+
+  switch (argc)
+    {
+    case 1:
+      mouse_arbitrary_click(button);
+      break;
+    case 2:
+    default:
+      mouse_arbitrary_click2(button, rb_mouse_unwrap_point(argv[1]));
+    }
+
   return CURRENT_POSITION;
 }
 
 /*
- * Generate a click event for the middle mouse button at the current position
+ * Generate a click event for the middle mouse button (down and up events)
  *
  * It doesn't matter if you don't have a middle mouse button.
  *
+ * You can optionally specify a point to click; the mouse cursor will
+ * instantly jump to the given point.
+ *
+ * @param point [CGPoint] (_default_: {#current_position}) (__optional__)
  * @return [CGPoint]
  */
 static
 VALUE
-rb_mouse_middle_click(VALUE self)
+rb_mouse_middle_click(int argc, VALUE *argv, VALUE self)
 {
-  mouse_middle_click();
+  switch (argc)
+    {
+    case 0:
+      mouse_middle_click();
+      break;
+    case 1:
+    default:
+      mouse_middle_click(rb_mouse_unwrap_point(argv[0]));
+    }
+
   return CURRENT_POSITION;
 }
 
@@ -205,16 +348,36 @@ rb_mouse_middle_click(VALUE self)
  * Unlike {Mouse.double_click} and {Mouse.triple_click} this will generate
  * a single event with the given number of clicks.
  *
+ * You can optionally specify a point to click; the mouse cursor will
+ * instantly jump to the given point.
+ *
  * @param num_clicks [Number,#to_i]
+ * @param point [CGPoint] (_default_: {#current_position}) (__optional__)
  * @return [CGPoint]
  */
 static
 VALUE
-rb_mouse_multi_click(VALUE self, VALUE num_clicks)
+rb_mouse_multi_click(int argc, VALUE *argv, VALUE self)
 {
+
+  if (argc == 0) {
+    rb_raise(rb_eArgError, "multi_click requires at least one arg");
+    return Qnil;
+  }
+
   // TODO: there has got to be a more idiomatic way to do this coercion
-  num_clicks = rb_funcall(num_clicks, sel_to_i, 0);
-  mouse_multi_click(NUM2SIZET(num_clicks));
+  size_t num_clicks = NUM2SIZET(rb_funcall(argv[0], sel_to_i, 0));
+
+  switch (argc)
+    {
+    case 1:
+      mouse_multi_click(num_clicks);
+      break;
+    case 2:
+    default:
+      mouse_multi_click2(num_clicks, rb_mouse_unwrap_point(argv[1]));
+    }
+
   return CURRENT_POSITION;
 }
 
@@ -225,13 +388,26 @@ rb_mouse_multi_click(VALUE self, VALUE num_clicks)
  * Apps seem to respond more consistently to this behaviour since that is
  * how a human would have to generate a double click event.
  *
+ * You can optionally specify a point to click; the mouse cursor will
+ * instantly jump to the given point.
+ *
+ * @param point [CGPoint] (_default_: {#current_position}) (__optional__)
  * @return [CGPoint]
  */
 static
 VALUE
-rb_mouse_double_click(VALUE self)
+rb_mouse_double_click(int argc, VALUE *argv, VALUE self)
 {
-  mouse_double_click();
+  switch (argc)
+    {
+    case 0:
+      mouse_double_click();
+      break;
+    case 1:
+    default:
+      mouse_double_click2(rb_mouse_unwrap_point(argv[0]));
+    }
+
   return CURRENT_POSITION;
 }
 
@@ -243,13 +419,26 @@ rb_mouse_double_click(VALUE self)
  * this behaviour since that is how a human would have to generate a
  * triple click event.
  *
+ * You can optionally specify a point to click; the mouse cursor will
+ * instantly jump to the given point.
+ *
+ * @param point [CGPoint] (_default_: {#current_position}) (__optional__)
  * @return [CGPoint]
  */
 static
 VALUE
-rb_mouse_triple_click(VALUE self)
+rb_mouse_triple_click(int argc, VALUE *argv, VALUE self)
 {
-  mouse_triple_click();
+  switch (argc)
+    {
+    case 0:
+      mouse_triple_click();
+      break;
+    case 1:
+    default:
+      mouse_triple_click2(rb_mouse_unwrap_point(argv[0]));
+    }
+
   return CURRENT_POSITION;
 }
 
@@ -265,10 +454,20 @@ Init_mouse()
   sel_to_i     = rb_intern("to_i");
   sel_new      = rb_intern("new");
 
+  unit_pixel   = rb_intern("pixel");
+
   /*
    * Document-module: Mouse
    *
-   * Herp Derp TODO
+   * A module with methods that "tap" into the system input methods.
+   * This is done by wrapping wrapping around the CoreGraphics event
+   * taps API provided by OS X.
+   *
+   * The module provides a simple Ruby interface to performing mouse
+   * interactions such as moving and clicking.
+   *
+   * This module can be used in a stand alone fashion or you can mix
+   * it into another class.
    *
    * [Reference](http://developer.apple.com/library/mac/#documentation/Carbon/Reference/QuartzEventServicesRef/Reference/reference.html)
    */
@@ -276,17 +475,19 @@ Init_mouse()
 
   rb_funcall(rb_mMouse, rb_intern("extend"), 1, rb_mMouse);
 
-  rb_define_method(rb_mMouse, "current_position", rb_mouse_current_position, 0);
-  rb_define_method(rb_mMouse, "move_to",          rb_mouse_move_to,          1);
-  rb_define_method(rb_mMouse, "drag_to",          rb_mouse_drag_to,          1);
-  rb_define_method(rb_mMouse, "scroll",           rb_mouse_scroll,           1);
-  rb_define_method(rb_mMouse, "click_down",       rb_mouse_click_down,       0);
-  rb_define_method(rb_mMouse, "click_up",         rb_mouse_click_up,         0);
-  rb_define_method(rb_mMouse, "click",            rb_mouse_click,            0);
-  rb_define_method(rb_mMouse, "secondary_click",  rb_mouse_secondary_click,  0);
-  rb_define_method(rb_mMouse, "arbitrary_click",  rb_mouse_arbitrary_click,  1);
-  rb_define_method(rb_mMouse, "middle_click",     rb_mouse_middle_click,     0);
-  rb_define_method(rb_mMouse, "multi_click",      rb_mouse_multi_click,      1);
-  rb_define_method(rb_mMouse, "double_click",     rb_mouse_double_click,     0);
-  rb_define_method(rb_mMouse, "triple_click",     rb_mouse_triple_click,     0);
+  rb_define_method(rb_mMouse, "current_position", rb_mouse_current_position,  0);
+  rb_define_method(rb_mMouse, "move_to",          rb_mouse_move_to,          -1);
+  rb_define_method(rb_mMouse, "drag_to",          rb_mouse_drag_to,          -1);
+  rb_define_method(rb_mMouse, "scroll",           rb_mouse_scroll,           -1);
+  rb_define_method(rb_mMouse, "click_down",       rb_mouse_click_down,       -1);
+  rb_define_method(rb_mMouse, "click_up",         rb_mouse_click_up,         -1);
+  rb_define_method(rb_mMouse, "click",            rb_mouse_click,            -1);
+  rb_define_method(rb_mMouse, "secondary_click",  rb_mouse_secondary_click,  -1);
+  rb_define_method(rb_mMouse, "middle_click",     rb_mouse_middle_click,     -1);
+  rb_define_method(rb_mMouse, "arbitrary_click",  rb_mouse_arbitrary_click,  -1);
+  rb_define_method(rb_mMouse, "multi_click",      rb_mouse_multi_click,      -1);
+  rb_define_method(rb_mMouse, "double_click",     rb_mouse_double_click,     -1);
+  rb_define_method(rb_mMouse, "triple_click",     rb_mouse_triple_click,     -1);
+
+  rb_define_alias(rb_mMouse, "right_click", "secondary_click");
 }

data/ext/mouse/mouser.c

@@ -9,15 +9,15 @@
 #include <ApplicationServices/ApplicationServices.h>
 #include "mouser.h"
 
-static const uint_t FPS              = 120;
-static const uint_t QUANTUM          = 1000000 / 120; // should be FPS, but GCC sucks
+static const uint_t FPS              = 240;
+static const uint_t QUANTUM          = 1000000 / 240; // should be FPS, but GCC sucks
 static const double DEFAULT_DURATION = 0.2; // seconds
 
 #define NEW_EVENT(type,point,button) CGEventCreateMouseEvent(nil,type,point,button)
 #define POST(event) CGEventPost(kCGHIDEventTap, event)
 #define CHANGE(event,type) CGEventSetType(event, type)
 
-#define CLOSE_ENOUGH(a,b) ((pow(a.x-b.x,2)+pow(a.y-b.y,2)) <= 1.0)
+#define CLOSE_ENOUGH(a,b) ((abs(a.x - b.x) < 1.0) && (abs(a.y - b.y) < 1.0))
 #define NOW (CFDateCreate(nil,CFAbsoluteTimeGetCurrent()))
 
 #ifdef NOT_MACRUBY
@@ -62,7 +62,7 @@ mouse_animate(
 	      )
 {
   CFDateRef current_time = NULL;
-  CGPoint current_point = start_point;
+  CGPoint current_point  = start_point;
   double     xstep = (end_point.x - start_point.x) / (duration * FPS);
   double     ystep = (end_point.y - start_point.y) / (duration * FPS);
   CFDateRef  start = NOW;
@@ -79,8 +79,11 @@ mouse_animate(
 
     mouse_sleep(1);
     current_time = NOW;
-    if (CFDateGetTimeIntervalSinceDate(NOW, start) > 5.0)
+
+    // this is a safety
+    if (CFDateGetTimeIntervalSinceDate(NOW, start) > (duration + 1))
       break;
+
     RELEASE(current_time);
     current_time = NULL;
 
@@ -145,7 +148,7 @@ mouse_drag_to(CGPoint point)
 
 
 void
-mouse_scroll3(size_t amount, enum MouseMovementUnit units, double duration)
+mouse_scroll3(size_t amount, CGScrollEventUnit units, double duration)
 {
   size_t     steps = round(FPS * duration);
   double   current = 0.0;
@@ -156,13 +159,13 @@ mouse_scroll3(size_t amount, enum MouseMovementUnit units, double duration)
     done   = (double)(step+1) / (double)steps;
     scroll = round((done - current) * amount);
     POSTRELEASE(CGEventCreateScrollWheelEvent(nil, units, 1, scroll));
-    mouse_sleep(1);
+    mouse_sleep(2);
     current += (double)scroll / (double)amount;
   }
 }
 
 void
-mouse_scroll2(size_t amount, enum MouseMovementUnit units)
+mouse_scroll2(size_t amount, CGScrollEventUnit units)
 {
   mouse_scroll3(amount, units, DEFAULT_DURATION);
 }
@@ -170,7 +173,7 @@ mouse_scroll2(size_t amount, enum MouseMovementUnit units)
 void
 mouse_scroll(size_t amount)
 {
-  mouse_scroll2(amount, kMouseScrollByLine);
+  mouse_scroll2(amount, kCGScrollEventUnitLine);
 }
 
 
@@ -184,8 +187,7 @@ mouse_click_down3(CGPoint point, uint_t sleep_quanta)
 void
 mouse_click_down2(CGPoint point)
 {
-  // TODO: replace constant 12 with something more abstract
-  mouse_click_down3(point, 12);
+  mouse_click_down3(point, FPS / 10);
 }
 
 void
@@ -240,8 +242,7 @@ mouse_secondary_click3(CGPoint point, uint_t sleep_quanta)
 void
 mouse_secondary_click2(CGPoint point)
 {
-  // TODO: replace constant 12 with something more abstract
-  mouse_secondary_click3(point, 12);
+  mouse_secondary_click3(point, FPS / 10);
 }
 
 void
@@ -268,7 +269,7 @@ mouse_arbitrary_click3(CGEventMouseSubtype button, CGPoint point, uint_t sleep_q
 void
 mouse_arbitrary_click2(CGEventMouseSubtype button, CGPoint point)
 {
-  mouse_arbitrary_click3(button, point, 12);
+  mouse_arbitrary_click3(button, point, FPS / 10);
 }
 
 void

data/ext/mouse/mouser.h

@@ -10,13 +10,6 @@
 
 typedef unsigned int uint_t;
 
-enum MouseMovementUnit {
-  kMouseScrollByLine  = kCGScrollEventUnitLine,
-  // TODO: might not be real pixels, might be Cocoa co-ords, need to investigate
-  kMouseScrollByPixel = kCGScrollEventUnitPixel
-};
-
-
 CGPoint mouse_current_position();
 
 void mouse_move_to(CGPoint point);
@@ -26,8 +19,8 @@ void mouse_drag_to(CGPoint point);
 void mouse_drag_to2(CGPoint point, double duration);
 
 void mouse_scroll(size_t amount);
-void mouse_scroll2(size_t amount, enum MouseMovementUnit units);
-void mouse_scroll3(size_t amount, enum MouseMovementUnit units, double duration);
+void mouse_scroll2(size_t amount, CGScrollEventUnit units);
+void mouse_scroll3(size_t amount, CGScrollEventUnit units, double duration);
 
 void mouse_click_down();
 void mouse_click_down2(CGPoint point);

data/lib/mouse/version.rb

@@ -1,4 +1,4 @@
 module Mouse
-  VERSION = '0.1.0'
+  VERSION = '1.0.0'
 end
 

data/lib/mouse.rb

@@ -1,7 +1,12 @@
 if RUBY_ENGINE == 'macruby'
 
+  framework 'AppKit'
+
   # A workaround that guarantees that `CGPoint` is defined
-  framework '/System/Library/Frameworks/CoreGraphics.framework'
+  MOUNTAIN_LION_APPKIT_VERSION = 1187
+  if NSAppKitVersionNumber >= MOUNTAIN_LION_APPKIT_VERSION
+    framework '/System/Library/Frameworks/CoreGraphics.framework'
+  end
 
 else
 
@@ -9,6 +14,12 @@ else
   # A structure that contains a point in a two-dimensional coordinate system
   class CGPoint < Struct.new(:x, :y)
 
+    # @param x [Number]
+    # @param y [Number]
+    def initialize x = 0.0, y = 0.0
+      super
+    end
+
     # @!attribute [rw] x
     #   The `x` co-ordinate of the screen point
     #   @return [Number]
@@ -24,7 +35,7 @@ else
     #
     # @return [String]
     def inspect
-      "#<CGPoint x=#{self[:x]} y=#{self[:y]}>"
+      "#<CGPoint x=#{self.x.to_f} y=#{self.y.to_f}>"
     end
 
   end

data/test/helper.rb

@@ -1,3 +1,4 @@
 require 'minitest/autorun'
+require 'mouse'
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mouse
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-03 00:00:00.000000000 Z
+date: 2012-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
@@ -98,18 +98,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1024147063034037924
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1024147063034037924
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24