Skip to content

Add support for changes to Ruby C API #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mjturner wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add support for changes to Ruby C API #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions QLPrettyPatch/QLPrettyPatch.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

#import <QuickLook/QuickLook.h>
#import <Ruby/ruby.h>
#import <Ruby/ruby/version.h>
#import <WebKit/WebKit.h>

#ifdef DEBUG
Expand Down Expand Up @@ -38,10 +39,26 @@

char prettyPatchPathFSRep[QLMaxPathSize];
[prettyPatchPath getFileSystemRepresentation:prettyPatchPathFSRep maxLength:QLMaxPathLength];

// Cater for differing API
#if RUBY_API_VERSION_CODE > 10900
int rb_execStatus = 0;
int rb_state = 0;

rb_load_file(prettyPatchPathFSRep);
char* options[] = {"", prettyPatchPathFSRep };
void *node = ruby_options(2, options);
if (ruby_executable_node(node, &rb_state)) {
rb_execStatus = ruby_exec_node(node);
QLDebugLog(@"ruby_exec_node() returned status code %d.", rb_execStatus);
}
#else
rb_load_file(prettyPatchPathFSRep);

int rb_execStatus = ruby_exec();

QLDebugLog(@"ruby_exec() returned status code %d.", rb_execStatus);
#endif

void (^cleanup_and_finalize_ruby)(void) = ^{
ruby_cleanup(rb_execStatus);
Expand All @@ -52,7 +69,9 @@
NSString *patchString = [NSString stringWithContentsOfURL:(NSURL *)patchURLRef encoding:NSUTF8StringEncoding error:&error];
if (!patchString) {
QLDebugLog(@"Failed to read patch file at URL '%@' (%@).", (NSURL *)patchURLRef, [error localizedDescription]);
#if RUBY_API_VERSION_CODE < 10900
cleanup_and_finalize_ruby();
#endif
return nil;
}

Expand All @@ -65,7 +84,9 @@
char * patchPrettyCString = StringValueCStr(rb_patchPrettyString);
NSString *patchPrettyString = [NSString stringWithCString:patchPrettyCString encoding:NSUTF8StringEncoding];

#if RUBY_API_VERSION_CODE < 10900
cleanup_and_finalize_ruby();
#endif

return [patchPrettyString dataUsingEncoding:NSUTF8StringEncoding];
}
Expand Down