accessibility_core 0.3.4 → 0.3.5

data/History.markdown

@@ -1,3 +1,10 @@
+# 0.3.5 - Add some missing bits for MRI
+
+  * Add `Range#relative_to` to convert ranges to positive indicies
+  * Wrap all strings from Cocoa as UTF8
+  * Unwrap all ruby strings to Cocoa as UTF8
+
+
 # 0.3.4 - More adjustments for AXElements
 
   * Add `NSContainsRect()` for MRI

data/README.markdown

@@ -24,6 +24,7 @@ runtimes.
 
   * bridging for `NSAttributedString`
   * more descriptive error handling for the C extension
+  * handle string encodings that are not UTF8 (or a subset of UTF8)
 
 
 ## Tests

data/ext/accessibility/bridge/bridge.c

@@ -255,56 +255,32 @@ VALUE wrap_array_refs(CFArrayRef array) { WRAP_ARRAY(wrap_ref) }
 VALUE
 wrap_string(CFStringRef string)
 {
-  // flying by the seat of our pants here, this hasn't failed yet
-  // but probably will one day when I'm not looking
-  VALUE ruby_string;
-  CFIndex    length = CFStringGetLength(string);
-  char*        name = (char*)CFStringGetCStringPtr(string, kCFStringEncodingMacRoman);
-
-  if (name) {
-    ruby_string = rb_usascii_str_new(name, length);
-  }
-  else {
-    // currently we will always assume UTF-8
-    // perhaps we could use CFStringGetSystemEncoding in the future?
-    name = malloc(length+1);
-    CFStringGetCString(
-		       string,
-		       name,
-		       length+1,
-		       kCFStringEncodingUTF8
-		       );
-    ruby_string = rb_enc_str_new(name, length, rb_utf8_encoding());
-    free(name);
-  }
-
-  return ruby_string;
+  return wrap_nsstring((NSString*)string);
 }
 
 VALUE
 wrap_nsstring(NSString* string)
 {
-  return rb_enc_str_new(
-			[string UTF8String],
-			[string lengthOfBytesUsingEncoding:NSUTF8StringEncoding],
-			rb_utf8_encoding()
-			);
+  // TODO: find a larger scope to apply this autoreleasepool
+  @autoreleasepool{
+    return rb_enc_str_new(
+        [string UTF8String],
+        [string lengthOfBytesUsingEncoding:NSUTF8StringEncoding],
+        rb_utf8_encoding()
+        );
+  }
 }
 
 CFStringRef
 unwrap_string(VALUE string)
 {
-  return CFStringCreateWithCStringNoCopy(
-					 NULL,
-					 StringValueCStr(string),
-					 0,
-					 kCFAllocatorNull
-					 );
-  /* return CFStringCreateWithCString( */
-  /* 				   NULL, */
-  /* 				   StringValuePtr(string), */
-  /* 				   kCFStringEncodingUTF8 */
-  /* 				   ); */
+  return CFStringCreateWithBytes(
+                                 NULL,
+                                 (UInt8*)StringValueCStr(string),
+                                 RSTRING_LEN(string),
+                                 kCFStringEncodingUTF8,
+                                 false
+                                 );
 }
 
 NSString*

data/lib/accessibility/bridge/mri.rb

@@ -149,5 +149,43 @@ class Array
 end
 
 
+##
+# `accessibility-core` extensions to the `Range` class
+class Range
+
+  ##
+  # Returns a new Range instance which has negative values in
+  # the receiver expanded relative to `max`
+  #
+  # @example
+  #
+  #  (1..10).relative_to(10)   # => (1..10)
+  #  (-3..-1).relative_to(10)  # => (7..9)
+  #
+  # @param max [Fixnum]
+  # @return [Range]
+  def relative_to max
+    beg = adjust_index self.begin, max
+    len = adjust_index self.end, max
+    len -= 1 if exclude_end?
+    beg..len
+  end
+
+
+  private
+
+  def adjust_index val, max
+    if val >= max
+      exclude_end? ? max : max - 1
+    elsif val < 0
+      max + val
+    else
+      val
+    end
+  end
+
+end
+
+
 require 'accessibility/bridge/common'
 require 'accessibility/bridge/bridge.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.3.4'
+    VERSION = '0.3.5'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: accessibility_core
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-26 00:00:00.000000000 Z
+date: 2012-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
@@ -107,7 +107,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3361611520076368904
+      hash: 865923332438012461
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -116,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3361611520076368904
+      hash: 865923332438012461
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24