mouse 1.0.5 → 1.0.6

data/History.markdown

@@ -1,3 +1,8 @@
+# 1.0.6 - Boogs
+
+  * Fix `Mouse.scroll` assuming arguments always included units
+  * Fix `Mouse.scroll` assuming amount was always positive (d'oh)
+
 # 1.0.5 - Tweaks for AXElements
 
   * Coerce `CGPoint.new` arguments using `#to_f`

data/README.markdown

@@ -56,6 +56,7 @@ change in the future if there are enough complaints.
 
   * Support for mouse gestures
   * Make animation duration accurate (current naiveté has a bit of error)
+  * Import test app and specialize so we can have better tests
 
 
 ## Copyright

data/ext/mouse/mouse.c

@@ -9,6 +9,7 @@ static ID sel_to_point;
 static ID sel_to_i;
 static ID sel_new;
 static ID unit_pixel;
+static ID unit_line;
 
 #define CURRENT_POSITION rb_mouse_wrap_point(mouse_current_position())
 
@@ -118,8 +119,6 @@ rb_mouse_drag_to(int argc, VALUE *argv, VALUE self)
  * 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]
@@ -131,19 +130,23 @@ rb_mouse_scroll(int argc, VALUE *argv, VALUE self)
   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);
+  VALUE amount = rb_funcall(argv[0], sel_to_i, 0);
+  int   amt    = NUM2INT(amount);
 
-  if (argc == 1)
-    mouse_scroll(NUM2SIZET(amt));
+  if (argc == 1) {
+    mouse_scroll(amt);
+    return amount;
+  }
 
   ID units = rb_to_id(argv[1]);
 
   if (argc == 2) {
     if (units == unit_pixel)
       mouse_scroll2(amt, kCGScrollEventUnitPixel);
-    else
+    else if (units == unit_line)
       mouse_scroll2(amt, kCGScrollEventUnitLine);
+    else
+      rb_raise(rb_eArgError, "unknown units `%s'", rb_id2name(units));
   }
 
   if (argc == 3) {
@@ -151,8 +154,10 @@ rb_mouse_scroll(int argc, VALUE *argv, VALUE self)
 
     if (units == unit_pixel)
       mouse_scroll3(amt, kCGScrollEventUnitPixel, duration);
-    else
+    else if (units == unit_line)
       mouse_scroll3(amt, kCGScrollEventUnitLine, duration);
+    else
+      rb_raise(rb_eArgError, "unknown units `%s'", rb_id2name(units));
   }
 
   return amount;
@@ -456,6 +461,7 @@ Init_mouse()
   sel_new      = rb_intern("new");
 
   unit_pixel   = rb_intern("pixel");
+  unit_line    = rb_intern("line");
 
   /*
    * Document-module: Mouse

data/ext/mouse/mouser.c

@@ -148,7 +148,7 @@ mouse_drag_to(CGPoint point)
 
 
 void
-mouse_scroll3(size_t amount, CGScrollEventUnit units, double duration)
+mouse_scroll3(int amount, CGScrollEventUnit units, double duration)
 {
   size_t     steps = round(FPS * duration);
   double   current = 0.0;
@@ -165,13 +165,13 @@ mouse_scroll3(size_t amount, CGScrollEventUnit units, double duration)
 }
 
 void
-mouse_scroll2(size_t amount, CGScrollEventUnit units)
+mouse_scroll2(int amount, CGScrollEventUnit units)
 {
   mouse_scroll3(amount, units, DEFAULT_DURATION);
 }
 
 void
-mouse_scroll(size_t amount)
+mouse_scroll(int amount)
 {
   mouse_scroll2(amount, kCGScrollEventUnitLine);
 }

data/ext/mouse/mouser.h

@@ -18,9 +18,9 @@ void mouse_move_to2(CGPoint point, double duration);
 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, CGScrollEventUnit units);
-void mouse_scroll3(size_t amount, CGScrollEventUnit units, double duration);
+void mouse_scroll(int amount);
+void mouse_scroll2(int amount, CGScrollEventUnit units);
+void mouse_scroll3(int 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 = '1.0.5'
+  VERSION = '1.0.6'
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mouse
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -98,18 +98,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2345337379390693889
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2345337379390693889
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24