cocoa 0.1.3 → 0.1.4

data/lib/cocoa/bindings/NSWindowController.rb

@@ -5,8 +5,8 @@ module Cocoa
     attach_method :close, :args=>0, :names=>[], :types=>[], :retval=>"v"
     attach_method :document, :args=>0, :names=>[], :types=>[], :retval=>"@"
     attach_method :initWithWindow, :args=>1, :names=>[], :types=>["@"], :retval=>"@"
-    attach_method :initWithWindowNibName, [{:args=>1, :names=>[], :types=>["@"], :retval=>"@"}, {:args=>2, :names=>["owner"], :types=>["@", "@"], :retval=>"@"}]
-    attach_method :initWithWindowNibPath, :args=>2, :names=>["owner"], :types=>["@", "@"], :retval=>"@"
+    attach_method :initWithWindowNibName, [{:args=>1, :names=>[], :types=>["@"], :retval=>"@"}, {:args=>2, :names=>[:owner], :types=>["@", "@"], :retval=>"@"}]
+    attach_method :initWithWindowNibPath, :args=>2, :names=>[:owner], :types=>["@", "@"], :retval=>"@"
     attach_method :isWindowLoaded, :args=>0, :names=>[], :types=>[], :retval=>"B"
     attach_method :loadWindow, :args=>0, :names=>[], :types=>[], :retval=>"v"
     attach_method :owner, :args=>0, :names=>[], :types=>[], :retval=>"@"

data/lib/cocoa/bindings/NSWorkspace.rb

@@ -10,25 +10,25 @@ module Cocoa
     attach_method :checkForRemovableMedia, :args=>0, :names=>[], :types=>[], :retval=>"v"
     attach_method :desktopImageOptionsForScreen, :args=>1, :names=>[], :types=>["@"], :retval=>"@"
     attach_method :desktopImageURLForScreen, :args=>1, :names=>[], :types=>["@"], :retval=>"@"
-    attach_method :duplicateURLs, :args=>2, :names=>["completionHandler"], :types=>["@", "@?"], :retval=>"v"
+    attach_method :duplicateURLs, :args=>2, :names=>[:completionHandler], :types=>["@", "@?"], :retval=>"v"
     attach_method :extendPowerOffBy, :args=>1, :names=>[], :types=>["q"], :retval=>"q"
     attach_method :fileLabelColors, :args=>0, :names=>[], :types=>[], :retval=>"@"
     attach_method :fileLabels, :args=>0, :names=>[], :types=>[], :retval=>"@"
     attach_method :fileSystemChanged, :args=>0, :names=>[], :types=>[], :retval=>"B"
-    attach_method :filenameExtension, :args=>2, :names=>["isValidForType"], :types=>["@", "@"], :retval=>"B"
+    attach_method :filenameExtension, :args=>2, :names=>[:isValidForType], :types=>["@", "@"], :retval=>"B"
     attach_method :findApplications, :args=>0, :names=>[], :types=>[], :retval=>"v"
     attach_method :frontmostApplication, :args=>0, :names=>[], :types=>[], :retval=>"@"
     attach_method :fullPathForApplication, :args=>1, :names=>[], :types=>["@"], :retval=>"@"
-    attach_method :getFileSystemInfoForPath, :args=>6, :names=>["isRemovable", "isWritable", "isUnmountable", "description", "type"], :types=>["@", "^B", "^B", "^B", "^@", "^@"], :retval=>"B"
-    attach_method :getInfoForFile, :args=>3, :names=>["application", "type"], :types=>["@", "^@", "^@"], :retval=>"B"
+    attach_method :getFileSystemInfoForPath, :args=>6, :names=>[:isRemovable, :isWritable, :isUnmountable, :description, :type], :types=>["@", "^B", "^B", "^B", "^@", "^@"], :retval=>"B"
+    attach_method :getInfoForFile, :args=>3, :names=>[:application, :type], :types=>["@", "^@", "^@"], :retval=>"B"
     attach_method :hideOtherApplications, :args=>0, :names=>[], :types=>[], :retval=>"v"
     attach_method :iconForFile, :args=>1, :names=>[], :types=>["@"], :retval=>"@"
     attach_method :iconForFileType, :args=>1, :names=>[], :types=>["@"], :retval=>"@"
     attach_method :iconForFiles, :args=>1, :names=>[], :types=>["@"], :retval=>"@"
     attach_method :isFilePackageAtPath, :args=>1, :names=>[], :types=>["@"], :retval=>"B"
-    attach_method :launchAppWithBundleIdentifier, :args=>4, :names=>["options", "additionalEventParamDescriptor", "launchIdentifier"], :types=>["@", "Q", "@", "^@"], :retval=>"B"
-    attach_method :launchApplication, [{:args=>1, :names=>[], :types=>["@"], :retval=>"B"}, {:args=>3, :names=>["showIcon", "autolaunch"], :types=>["@", "B", "B"], :retval=>"B"}]
-    attach_method :launchApplicationAtURL, :args=>4, :names=>["options", "configuration", "error"], :types=>["@", "Q", "@", "^@"], :retval=>"@"
+    attach_method :launchAppWithBundleIdentifier, :args=>4, :names=>[:options, :additionalEventParamDescriptor, :launchIdentifier], :types=>["@", "Q", "@", "^@"], :retval=>"B"
+    attach_method :launchApplication, [{:args=>1, :names=>[], :types=>["@"], :retval=>"B"}, {:args=>3, :names=>[:showIcon, :autolaunch], :types=>["@", "B", "B"], :retval=>"B"}]
+    attach_method :launchApplicationAtURL, :args=>4, :names=>[:options, :configuration, :error], :types=>["@", "Q", "@", "^@"], :retval=>"@"
     attach_method :launchedApplications, :args=>0, :names=>[], :types=>[], :retval=>"@"
     attach_method :localizedDescriptionForType, :args=>1, :names=>[], :types=>["@"], :retval=>"@"
     attach_method :menuBarOwningApplication, :args=>0, :names=>[], :types=>[], :retval=>"@"
@@ -38,24 +38,24 @@ module Cocoa
     attach_method :noteFileSystemChanged, [{:args=>0, :names=>[], :types=>[], :retval=>"v"}, {:args=>1, :names=>[], :types=>["@"], :retval=>"v"}]
     attach_method :noteUserDefaultsChanged, :args=>0, :names=>[], :types=>[], :retval=>"v"
     attach_method :notificationCenter, :args=>0, :names=>[], :types=>[], :retval=>"@"
-    attach_method :openFile, [{:args=>1, :names=>[], :types=>["@"], :retval=>"B"}, {:args=>4, :names=>["fromImage", "at", "inView"], :types=>["@", "@", "{CGPoint=dd}", "@"], :retval=>"B"}, {:args=>2, :names=>["withApplication"], :types=>["@", "@"], :retval=>"B"}, {:args=>3, :names=>["withApplication", "andDeactivate"], :types=>["@", "@", "B"], :retval=>"B"}]
+    attach_method :openFile, [{:args=>1, :names=>[], :types=>["@"], :retval=>"B"}, {:args=>4, :names=>[:fromImage, :at, :inView], :types=>["@", "@", "{CGPoint=dd}", "@"], :retval=>"B"}, {:args=>2, :names=>[:withApplication], :types=>["@", "@"], :retval=>"B"}, {:args=>3, :names=>[:withApplication, :andDeactivate], :types=>["@", "@", "B"], :retval=>"B"}]
     attach_method :openTempFile, :args=>1, :names=>[], :types=>["@"], :retval=>"B"
     attach_method :openURL, :args=>1, :names=>[], :types=>["@"], :retval=>"B"
-    attach_method :openURLs, :args=>5, :names=>["withAppBundleIdentifier", "options", "additionalEventParamDescriptor", "launchIdentifiers"], :types=>["@", "@", "Q", "@", "^@"], :retval=>"B"
-    attach_method :performFileOperation, :args=>5, :names=>["source", "destination", "files", "tag"], :types=>["@", "@", "@", "@", "^q"], :retval=>"B"
+    attach_method :openURLs, :args=>5, :names=>[:withAppBundleIdentifier, :options, :additionalEventParamDescriptor, :launchIdentifiers], :types=>["@", "@", "Q", "@", "^@"], :retval=>"B"
+    attach_method :performFileOperation, :args=>5, :names=>[:source, :destination, :files, :tag], :types=>["@", "@", "@", "@", "^q"], :retval=>"B"
     attach_method :preferredFilenameExtensionForType, :args=>1, :names=>[], :types=>["@"], :retval=>"@"
-    attach_method :recycleURLs, :args=>2, :names=>["completionHandler"], :types=>["@", "@?"], :retval=>"v"
+    attach_method :recycleURLs, :args=>2, :names=>[:completionHandler], :types=>["@", "@?"], :retval=>"v"
     attach_method :runningApplications, :args=>0, :names=>[], :types=>[], :retval=>"@"
-    attach_method :selectFile, :args=>2, :names=>["inFileViewerRootedAtPath"], :types=>["@", "@"], :retval=>"B"
-    attach_method :setDesktopImageURL, :args=>4, :names=>["forScreen", "options", "error"], :types=>["@", "@", "@", "^@"], :retval=>"B"
-    attach_method :setIcon, :args=>3, :names=>["forFile", "options"], :types=>["@", "@", "Q"], :retval=>"B"
+    attach_method :selectFile, :args=>2, :names=>[:inFileViewerRootedAtPath], :types=>["@", "@"], :retval=>"B"
+    attach_method :setDesktopImageURL, :args=>4, :names=>[:forScreen, :options, :error], :types=>["@", "@", "@", "^@"], :retval=>"B"
+    attach_method :setIcon, :args=>3, :names=>[:forFile, :options], :types=>["@", "@", "Q"], :retval=>"B"
     attach_singular_method :sharedWorkspace, :args=>0, :names=>[], :types=>[], :retval=>"@"
     attach_method :showSearchResultsForQueryString, :args=>1, :names=>[], :types=>["@"], :retval=>"B"
-    attach_method :slideImage, :args=>3, :names=>["from", "to"], :types=>["@", "{CGPoint=dd}", "{CGPoint=dd}"], :retval=>"v"
-    attach_method :type, :args=>2, :names=>["conformsToType"], :types=>["@", "@"], :retval=>"B"
-    attach_method :typeOfFile, :args=>2, :names=>["error"], :types=>["@", "^@"], :retval=>"@"
+    attach_method :slideImage, :args=>3, :names=>[:from, :to], :types=>["@", "{CGPoint=dd}", "{CGPoint=dd}"], :retval=>"v"
+    attach_method :type, :args=>2, :names=>[:conformsToType], :types=>["@", "@"], :retval=>"B"
+    attach_method :typeOfFile, :args=>2, :names=>[:error], :types=>["@", "^@"], :retval=>"@"
     attach_method :unmountAndEjectDeviceAtPath, :args=>1, :names=>[], :types=>["@"], :retval=>"B"
-    attach_method :unmountAndEjectDeviceAtURL, :args=>2, :names=>["error"], :types=>["@", "^@"], :retval=>"B"
+    attach_method :unmountAndEjectDeviceAtURL, :args=>2, :names=>[:error], :types=>["@", "^@"], :retval=>"B"
     attach_method :userDefaultsChanged, :args=>0, :names=>[], :types=>[], :retval=>"B"
   end
 end

data/lib/cocoa/bindings/NSXMLDTD.rb

@@ -3,18 +3,18 @@ require 'cocoa/bindings/NSXMLNode'
 module Cocoa
   class NSXMLDTD < Cocoa::NSXMLNode
     attach_method :addChild, :args=>1, :names=>[], :types=>["@"], :retval=>"v"
-    attach_method :attributeDeclarationForName, :args=>2, :names=>["elementName"], :types=>["@", "@"], :retval=>"@"
+    attach_method :attributeDeclarationForName, :args=>2, :names=>[:elementName], :types=>["@", "@"], :retval=>"@"
     attach_method :elementDeclarationForName, :args=>1, :names=>[], :types=>["@"], :retval=>"@"
     attach_method :entityDeclarationForName, :args=>1, :names=>[], :types=>["@"], :retval=>"@"
-    attach_method :initWithContentsOfURL, :args=>3, :names=>["options", "error"], :types=>["@", "Q", "^@"], :retval=>"@"
-    attach_method :initWithData, :args=>3, :names=>["options", "error"], :types=>["@", "Q", "^@"], :retval=>"@"
-    attach_method :insertChild, :args=>2, :names=>["atIndex"], :types=>["@", "Q"], :retval=>"v"
-    attach_method :insertChildren, :args=>2, :names=>["atIndex"], :types=>["@", "Q"], :retval=>"v"
+    attach_method :initWithContentsOfURL, :args=>3, :names=>[:options, :error], :types=>["@", "Q", "^@"], :retval=>"@"
+    attach_method :initWithData, :args=>3, :names=>[:options, :error], :types=>["@", "Q", "^@"], :retval=>"@"
+    attach_method :insertChild, :args=>2, :names=>[:atIndex], :types=>["@", "Q"], :retval=>"v"
+    attach_method :insertChildren, :args=>2, :names=>[:atIndex], :types=>["@", "Q"], :retval=>"v"
     attach_method :notationDeclarationForName, :args=>1, :names=>[], :types=>["@"], :retval=>"@"
     attach_singular_method :predefinedEntityDeclarationForName, :args=>1, :names=>[], :types=>["@"], :retval=>"@"
     attach_method :publicID, :args=>0, :names=>[], :types=>[], :retval=>"@"
     attach_method :removeChildAtIndex, :args=>1, :names=>[], :types=>["Q"], :retval=>"v"
-    attach_method :replaceChildAtIndex, :args=>2, :names=>["withNode"], :types=>["Q", "@"], :retval=>"v"
+    attach_method :replaceChildAtIndex, :args=>2, :names=>[:withNode], :types=>["Q", "@"], :retval=>"v"
     attach_method :setChildren, :args=>1, :names=>[], :types=>["@"], :retval=>"v"
     attach_method :setPublicID, :args=>1, :names=>[], :types=>["@"], :retval=>"v"
     attach_method :setSystemID, :args=>1, :names=>[], :types=>["@"], :retval=>"v"

data/lib/cocoa/bindings/NSXMLDocument.rb

@@ -9,18 +9,18 @@ module Cocoa
     attach_method :addChild, :args=>1, :names=>[], :types=>["@"], :retval=>"v"
     attach_method :characterEncoding, :args=>0, :names=>[], :types=>[], :retval=>"@"
     attach_method :documentContentKind, :args=>0, :names=>[], :types=>[], :retval=>"Q"
-    attach_method :initWithContentsOfURL, :args=>3, :names=>["options", "error"], :types=>["@", "Q", "^@"], :retval=>"@"
-    attach_method :initWithData, :args=>3, :names=>["options", "error"], :types=>["@", "Q", "^@"], :retval=>"@"
+    attach_method :initWithContentsOfURL, :args=>3, :names=>[:options, :error], :types=>["@", "Q", "^@"], :retval=>"@"
+    attach_method :initWithData, :args=>3, :names=>[:options, :error], :types=>["@", "Q", "^@"], :retval=>"@"
     attach_method :initWithRootElement, :args=>1, :names=>[], :types=>["@"], :retval=>"@"
-    attach_method :initWithXMLString, :args=>3, :names=>["options", "error"], :types=>["@", "Q", "^@"], :retval=>"@"
-    attach_method :insertChild, :args=>2, :names=>["atIndex"], :types=>["@", "Q"], :retval=>"v"
-    attach_method :insertChildren, :args=>2, :names=>["atIndex"], :types=>["@", "Q"], :retval=>"v"
+    attach_method :initWithXMLString, :args=>3, :names=>[:options, :error], :types=>["@", "Q", "^@"], :retval=>"@"
+    attach_method :insertChild, :args=>2, :names=>[:atIndex], :types=>["@", "Q"], :retval=>"v"
+    attach_method :insertChildren, :args=>2, :names=>[:atIndex], :types=>["@", "Q"], :retval=>"v"
     attach_method :isStandalone, :args=>0, :names=>[], :types=>[], :retval=>"B"
-    attach_method :objectByApplyingXSLT, :args=>3, :names=>["arguments", "error"], :types=>["@", "@", "^@"], :retval=>"@"
-    attach_method :objectByApplyingXSLTAtURL, :args=>3, :names=>["arguments", "error"], :types=>["@", "@", "^@"], :retval=>"@"
-    attach_method :objectByApplyingXSLTString, :args=>3, :names=>["arguments", "error"], :types=>["@", "@", "^@"], :retval=>"@"
+    attach_method :objectByApplyingXSLT, :args=>3, :names=>[:arguments, :error], :types=>["@", "@", "^@"], :retval=>"@"
+    attach_method :objectByApplyingXSLTAtURL, :args=>3, :names=>[:arguments, :error], :types=>["@", "@", "^@"], :retval=>"@"
+    attach_method :objectByApplyingXSLTString, :args=>3, :names=>[:arguments, :error], :types=>["@", "@", "^@"], :retval=>"@"
     attach_method :removeChildAtIndex, :args=>1, :names=>[], :types=>["Q"], :retval=>"v"
-    attach_method :replaceChildAtIndex, :args=>2, :names=>["withNode"], :types=>["Q", "@"], :retval=>"v"
+    attach_method :replaceChildAtIndex, :args=>2, :names=>[:withNode], :types=>["Q", "@"], :retval=>"v"
     attach_singular_method :replacementClassForClass, :args=>1, :names=>[], :types=>["#"], :retval=>"#"
     attach_method :rootElement, :args=>0, :names=>[], :types=>[], :retval=>"@"
     attach_method :setCharacterEncoding, :args=>1, :names=>[], :types=>["@"], :retval=>"v"

data/lib/cocoa/bindings/NSXMLElement.rb

@@ -5,22 +5,22 @@ module Cocoa
     attach_method :addAttribute, :args=>1, :names=>[], :types=>["@"], :retval=>"v"
     attach_method :addChild, :args=>1, :names=>[], :types=>["@"], :retval=>"v"
     attach_method :addNamespace, :args=>1, :names=>[], :types=>["@"], :retval=>"v"
-    attach_method :attributeForLocalName, :args=>2, :names=>["URI"], :types=>["@", "@"], :retval=>"@"
+    attach_method :attributeForLocalName, :args=>2, :names=>[:URI], :types=>["@", "@"], :retval=>"@"
     attach_method :attributeForName, :args=>1, :names=>[], :types=>["@"], :retval=>"@"
     attach_method :attributes, :args=>0, :names=>[], :types=>[], :retval=>"@"
-    attach_method :elementsForLocalName, :args=>2, :names=>["URI"], :types=>["@", "@"], :retval=>"@"
+    attach_method :elementsForLocalName, :args=>2, :names=>[:URI], :types=>["@", "@"], :retval=>"@"
     attach_method :elementsForName, :args=>1, :names=>[], :types=>["@"], :retval=>"@"
-    attach_method :initWithName, [{:args=>1, :names=>[], :types=>["@"], :retval=>"@"}, {:args=>2, :names=>["URI"], :types=>["@", "@"], :retval=>"@"}, {:args=>2, :names=>["stringValue"], :types=>["@", "@"], :retval=>"@"}]
-    attach_method :initWithXMLString, :args=>2, :names=>["error"], :types=>["@", "^@"], :retval=>"@"
-    attach_method :insertChild, :args=>2, :names=>["atIndex"], :types=>["@", "Q"], :retval=>"v"
-    attach_method :insertChildren, :args=>2, :names=>["atIndex"], :types=>["@", "Q"], :retval=>"v"
+    attach_method :initWithName, [{:args=>1, :names=>[], :types=>["@"], :retval=>"@"}, {:args=>2, :names=>[:URI], :types=>["@", "@"], :retval=>"@"}, {:args=>2, :names=>[:stringValue], :types=>["@", "@"], :retval=>"@"}]
+    attach_method :initWithXMLString, :args=>2, :names=>[:error], :types=>["@", "^@"], :retval=>"@"
+    attach_method :insertChild, :args=>2, :names=>[:atIndex], :types=>["@", "Q"], :retval=>"v"
+    attach_method :insertChildren, :args=>2, :names=>[:atIndex], :types=>["@", "Q"], :retval=>"v"
     attach_method :namespaceForPrefix, :args=>1, :names=>[], :types=>["@"], :retval=>"@"
     attach_method :namespaces, :args=>0, :names=>[], :types=>[], :retval=>"@"
     attach_method :normalizeAdjacentTextNodesPreservingCDATA, :args=>1, :names=>[], :types=>["B"], :retval=>"v"
     attach_method :removeAttributeForName, :args=>1, :names=>[], :types=>["@"], :retval=>"v"
     attach_method :removeChildAtIndex, :args=>1, :names=>[], :types=>["Q"], :retval=>"v"
     attach_method :removeNamespaceForPrefix, :args=>1, :names=>[], :types=>["@"], :retval=>"v"
-    attach_method :replaceChildAtIndex, :args=>2, :names=>["withNode"], :types=>["Q", "@"], :retval=>"v"
+    attach_method :replaceChildAtIndex, :args=>2, :names=>[:withNode], :types=>["Q", "@"], :retval=>"v"
     attach_method :resolveNamespaceForName, :args=>1, :names=>[], :types=>["@"], :retval=>"@"
     attach_method :resolvePrefixForNamespaceURI, :args=>1, :names=>[], :types=>["@"], :retval=>"@"
     attach_method :setAttributes, :args=>1, :names=>[], :types=>["@"], :retval=>"v"

data/lib/cocoa/bindings/NSXMLNode.rb

@@ -7,7 +7,7 @@ module Cocoa
     attach_method :XMLString, :args=>0, :names=>[], :types=>[], :retval=>"@"
     attach_method :XMLStringWithOptions, :args=>1, :names=>[], :types=>["Q"], :retval=>"@"
     attach_method :XPath, :args=>0, :names=>[], :types=>[], :retval=>"@"
-    attach_singular_method :attributeWithName, [{:args=>3, :names=>["URI", "stringValue"], :types=>["@", "@", "@"], :retval=>"@"}, {:args=>2, :names=>["stringValue"], :types=>["@", "@"], :retval=>"@"}]
+    attach_singular_method :attributeWithName, [{:args=>3, :names=>[:URI, :stringValue], :types=>["@", "@", "@"], :retval=>"@"}, {:args=>2, :names=>[:stringValue], :types=>["@", "@"], :retval=>"@"}]
     attach_method :canonicalXMLStringPreservingComments, :args=>1, :names=>[], :types=>["B"], :retval=>"@"
     attach_method :childAtIndex, :args=>1, :names=>[], :types=>["Q"], :retval=>"@"
     attach_method :childCount, :args=>0, :names=>[], :types=>[], :retval=>"Q"
@@ -17,31 +17,31 @@ module Cocoa
     attach_method :detach, :args=>0, :names=>[], :types=>[], :retval=>"v"
     attach_singular_method :document, :args=>0, :names=>[], :types=>[], :retval=>"@"
     attach_singular_method :documentWithRootElement, :args=>1, :names=>[], :types=>["@"], :retval=>"@"
-    attach_singular_method :elementWithName, [{:args=>1, :names=>[], :types=>["@"], :retval=>"@"}, {:args=>2, :names=>["URI"], :types=>["@", "@"], :retval=>"@"}, {:args=>3, :names=>["children", "attributes"], :types=>["@", "@", "@"], :retval=>"@"}, {:args=>2, :names=>["stringValue"], :types=>["@", "@"], :retval=>"@"}]
+    attach_singular_method :elementWithName, [{:args=>1, :names=>[], :types=>["@"], :retval=>"@"}, {:args=>2, :names=>[:URI], :types=>["@", "@"], :retval=>"@"}, {:args=>3, :names=>[:children, :attributes], :types=>["@", "@", "@"], :retval=>"@"}, {:args=>2, :names=>[:stringValue], :types=>["@", "@"], :retval=>"@"}]
     attach_method :index, :args=>0, :names=>[], :types=>[], :retval=>"Q"
-    attach_method :initWithKind, [{:args=>1, :names=>[], :types=>["Q"], :retval=>"@"}, {:args=>2, :names=>["options"], :types=>["Q", "Q"], :retval=>"@"}]
+    attach_method :initWithKind, [{:args=>1, :names=>[], :types=>["Q"], :retval=>"@"}, {:args=>2, :names=>[:options], :types=>["Q", "Q"], :retval=>"@"}]
     attach_method :kind, :args=>0, :names=>[], :types=>[], :retval=>"Q"
     attach_method :level, :args=>0, :names=>[], :types=>[], :retval=>"Q"
     attach_method :localName, :args=>0, :names=>[], :types=>[], :retval=>"@"
     attach_singular_method :localNameForName, :args=>1, :names=>[], :types=>["@"], :retval=>"@"
     attach_method :name, :args=>0, :names=>[], :types=>[], :retval=>"@"
-    attach_singular_method :namespaceWithName, :args=>2, :names=>["stringValue"], :types=>["@", "@"], :retval=>"@"
+    attach_singular_method :namespaceWithName, :args=>2, :names=>[:stringValue], :types=>["@", "@"], :retval=>"@"
     attach_method :nextNode, :args=>0, :names=>[], :types=>[], :retval=>"@"
     attach_method :nextSibling, :args=>0, :names=>[], :types=>[], :retval=>"@"
-    attach_method :nodesForXPath, :args=>2, :names=>["error"], :types=>["@", "^@"], :retval=>"@"
+    attach_method :nodesForXPath, :args=>2, :names=>[:error], :types=>["@", "^@"], :retval=>"@"
     attach_method :objectValue, :args=>0, :names=>[], :types=>[], :retval=>"@"
-    attach_method :objectsForXQuery, [{:args=>3, :names=>["constants", "error"], :types=>["@", "@", "^@"], :retval=>"@"}, {:args=>2, :names=>["error"], :types=>["@", "^@"], :retval=>"@"}]
+    attach_method :objectsForXQuery, [{:args=>3, :names=>[:constants, :error], :types=>["@", "@", "^@"], :retval=>"@"}, {:args=>2, :names=>[:error], :types=>["@", "^@"], :retval=>"@"}]
     attach_method :parent, :args=>0, :names=>[], :types=>[], :retval=>"@"
     attach_singular_method :predefinedNamespaceForPrefix, :args=>1, :names=>[], :types=>["@"], :retval=>"@"
     attach_method :prefix, :args=>0, :names=>[], :types=>[], :retval=>"@"
     attach_singular_method :prefixForName, :args=>1, :names=>[], :types=>["@"], :retval=>"@"
     attach_method :previousNode, :args=>0, :names=>[], :types=>[], :retval=>"@"
     attach_method :previousSibling, :args=>0, :names=>[], :types=>[], :retval=>"@"
-    attach_singular_method :processingInstructionWithName, :args=>2, :names=>["stringValue"], :types=>["@", "@"], :retval=>"@"
+    attach_singular_method :processingInstructionWithName, :args=>2, :names=>[:stringValue], :types=>["@", "@"], :retval=>"@"
     attach_method :rootDocument, :args=>0, :names=>[], :types=>[], :retval=>"@"
     attach_method :setName, :args=>1, :names=>[], :types=>["@"], :retval=>"v"
     attach_method :setObjectValue, :args=>1, :names=>[], :types=>["@"], :retval=>"v"
-    attach_method :setStringValue, [{:args=>1, :names=>[], :types=>["@"], :retval=>"v"}, {:args=>2, :names=>["resolvingEntities"], :types=>["@", "B"], :retval=>"v"}]
+    attach_method :setStringValue, [{:args=>1, :names=>[], :types=>["@"], :retval=>"v"}, {:args=>2, :names=>[:resolvingEntities], :types=>["@", "B"], :retval=>"v"}]
     attach_method :setURI, :args=>1, :names=>[], :types=>["@"], :retval=>"v"
     attach_method :stringValue, :args=>0, :names=>[], :types=>[], :retval=>"@"
     attach_singular_method :textWithStringValue, :args=>1, :names=>[], :types=>["@"], :retval=>"@"

data/lib/cocoa/bindings/NSXPCConnection.rb

@@ -9,7 +9,7 @@ module Cocoa
     attach_method :exportedInterface, :args=>0, :names=>[], :types=>[], :retval=>"@"
     attach_method :exportedObject, :args=>0, :names=>[], :types=>[], :retval=>"@"
     attach_method :initWithListenerEndpoint, :args=>1, :names=>[], :types=>["@"], :retval=>"@"
-    attach_method :initWithMachServiceName, :args=>2, :names=>["options"], :types=>["@", "Q"], :retval=>"@"
+    attach_method :initWithMachServiceName, :args=>2, :names=>[:options], :types=>["@", "Q"], :retval=>"@"
     attach_method :initWithServiceName, :args=>1, :names=>[], :types=>["@"], :retval=>"@"
     attach_method :interruptionHandler, :args=>0, :names=>[], :types=>[], :retval=>"@?"
     attach_method :invalidate, :args=>0, :names=>[], :types=>[], :retval=>"v"

data/lib/cocoa/bindings/NSXPCInterface.rb

@@ -2,12 +2,12 @@
 require 'cocoa/bindings/NSObject'
 module Cocoa
   class NSXPCInterface < Cocoa::NSObject
-    attach_method :classesForSelector, :args=>3, :names=>["argumentIndex", "ofReply"], :types=>[":", "Q", "B"], :retval=>"@"
-    attach_method :interfaceForSelector, :args=>3, :names=>["argumentIndex", "ofReply"], :types=>[":", "Q", "B"], :retval=>"@"
+    attach_method :classesForSelector, :args=>3, :names=>[:argumentIndex, :ofReply], :types=>[":", "Q", "B"], :retval=>"@"
+    attach_method :interfaceForSelector, :args=>3, :names=>[:argumentIndex, :ofReply], :types=>[":", "Q", "B"], :retval=>"@"
     attach_singular_method :interfaceWithProtocol, :args=>1, :names=>[], :types=>["@"], :retval=>"@"
     attach_method :protocol, :args=>0, :names=>[], :types=>[], :retval=>"@"
-    attach_method :setClasses, :args=>4, :names=>["forSelector", "argumentIndex", "ofReply"], :types=>["@", ":", "Q", "B"], :retval=>"v"
-    attach_method :setInterface, :args=>4, :names=>["forSelector", "argumentIndex", "ofReply"], :types=>["@", ":", "Q", "B"], :retval=>"v"
+    attach_method :setClasses, :args=>4, :names=>[:forSelector, :argumentIndex, :ofReply], :types=>["@", ":", "Q", "B"], :retval=>"v"
+    attach_method :setInterface, :args=>4, :names=>[:forSelector, :argumentIndex, :ofReply], :types=>["@", ":", "Q", "B"], :retval=>"v"
     attach_method :setProtocol, :args=>1, :names=>[], :types=>["@"], :retval=>"v"
   end
 end

data/lib/cocoa/extensions.rb

@@ -2,6 +2,9 @@ class Cocoa::NSString < Cocoa::NSObject
   def to_s
     ObjC.NSString_to_String(object)
   end
+  def == other
+    to_s == other.to_s
+  end
 end
 
 class String
@@ -46,22 +49,22 @@ class Cocoa::NSObject
   end
 
   def alloc
-    self.object = ObjC.msgSend(ObjC.objc_getClass(self.native_name),"alloc")
+    self.object = ObjC.msgSend_pointer(ObjC.objc_getClass(self.native_name),"alloc")
     self
   end
 
   def init
-    self.object = ObjC.msgSend(@object,"init")
+    self.object = ObjC.msgSend_pointer(@object,"init")
     self
   end
 
   def new
-    self.object = ObjC.msgSend(@object,"new")
+    self.object = ObjC.msgSend_pointer(@object,"new")
     self
   end
 
   def autorelease
-    self.object = ObjC.msgSend(@object,"autorelease")
+    self.object = ObjC.msgSend_pointer(@object,"autorelease")
     self
   end
 

data/lib/cocoa/helpers.rb

@@ -16,7 +16,7 @@ module Cocoa
   end
   def instance_for data
     if data.is_a?(FFI::Pointer)
-      @@instances[data.address] ||= ObjC.translate_retval nil,data,'@'
+      @@instances[data.address] ||= ObjC.ffi_to_ruby_value(nil, data, '@')
     else
       data
     end
@@ -29,7 +29,7 @@ module Cocoa
       Cocoa.const_set(method,ObjC.NSString_to_String(send(raw)))
     else
       define_singleton_method method do
-       ObjC.NSString_to_String(send(raw))
+        ObjC.NSString_to_String(send(raw))
       end
     end
   end
@@ -40,7 +40,7 @@ module Cocoa
     if params[:args] == 0
       define_singleton_method method do
         instance = new(true)
-        instance.object = ObjC.msgSend(instance.klass,method.to_s)
+        instance.object = ObjC.msgSend_pointer(instance.klass,method.to_s)
         instance
       end
     else
@@ -55,175 +55,99 @@ module Cocoa
       params = params.last
     end
 
+    m = ObjC::MethodDef.new(method,params.first)
+
     params = params.extract_options!
     params.freeze
     begin
       if params[:args] == 0
-        attach_function "call_#{method}".to_sym, method, [], ObjC.apple_type_to_ffi(params[:retval])
+        attach_function "call_#{method}".to_sym, method, m.ffi_types, m.ffi_return_type
         define_method method do
-          case params[:retval]
-          when /^\^{[^=]*=.*}$/
-            Cocoa::translate_retval(method,send("call_#{method}".to_sym),params[:retval])
-          else
-            raise params.inspect
-          end
+          m.ruby_return_value(send("call_#{method}".to_sym))
         end
       else
-        attach_function "call_#{method}".to_sym, method, params[:types].map{ |arg| ObjC.apple_type_to_ffi(arg) }, ObjC.apple_type_to_ffi(params[:retval])
+        attach_function "call_#{method}".to_sym, method, m.ffi_types, m.ffi_return_type
         define_method method do |*args|
           raise ArgumentError.new("#{method} requires #{params[:args]} argument(s)") unless params[:args] == args.size
-          ret = send("call_#{method}".to_sym,*ObjC.call_arguments(params,args))
-          if params[:retval]=='v'
-            self
-          else
-            ObjC.translate_retval(method,ret,params[:retval])
-          end
+          m.ruby_return_value(self,send("call_#{method}".to_sym,*m.call_arguments(args)))
         end
       end
     rescue FFI::NotFoundError => e
     end
   end
+
   extend self
 
   class NSObject
     attr_accessor :klass
     attr_reader :object
 
-    def self.smart_constantize ret,klass_name
-      begin
-        Cocoa.const_get(klass_name)
-      rescue
-        _superclass = ObjC.msgSend(ret,'superclass')
-        superclass_name = Cocoa::NSString_to_String(Cocoa::NSStringFromClass(_superclass))
-        superclass = begin
-          "Cocoa::#{superclass_name}".constantize        
-        rescue Exception => e
-          smart_constantize(_superclass,superclass_name)
-        end
-        proxy = Class.new(superclass)
-        Cocoa.const_set(klass_name, proxy)
-        klass = ("Cocoa::"+klass_name).constantize
-        superclass.inherited(klass)
-        klass
+    def self.attach_singular_method method,*__params
+      return if method == :superclass
+      return if method == :class
+      return if method == :new
+
+      @@singular_specs ||= {}
+      @@singular_specs[method] = []
+      [__params].flatten.each do |spec|
+        @@singular_specs[method] << ObjC::MethodDef.new(method,spec)
       end
-    end
 
-    def self.attach_singular_method method,*__params
-      __params.freeze
-      return if method==:class
-      return if method==:new
-      if __params.first.is_a?(Hash) && __params.first[:args] == 0
-        define_singleton_method method do
-          instance = new(true)
-          instance.object = ObjC.msgSend(instance.klass,method.to_s)
-          instance
-        end
-      else
-        _params = [__params.dup].flatten
-        _params.freeze
-        define_singleton_method method do |*args|
-          par = if _params.size == 1 && _params.first[:variadic]
-            _params
-          else
-            _params.select{ |par| (par[:args] == 1 && args.size == 1) || (par[:args] == args.last.size+1 && par[:names].map(&:to_sym).sort == args.last.keys.sort) }
+      define_singleton_method method do |*args|
+        matching = if args.size <= 1
+          matching = @@singular_specs[method].select do |m|
+            m.types.size == args.size
           end
-          raise ArgumentError unless par.size == 1
-          params = par.dup.extract_options!
-
-          options = args.extract_options!
-          fixed_args = if params[:variadic]
-            raise "not yet supported" unless params[:types].size == 1
-            NSObject.fixed_args(args,options,params[:types],params)
+        else
+          matching = if args.last.is_a? Hash
+            @@singular_specs[method].select do |m|
+              args.last.keys == m.names
+            end
           else
-            NSObject.fixed_args(args,options,params[:types])
-          end
-          ret = ObjC.msgSend(ObjC.objc_getClass(name.split('::').last),"#{method}#{(['']+params[:names]).join(':')}:",*fixed_args)
-          case params[:retval]
-          when '@'
-            return nil if ret.address == 0
-            ObjC.object_to_instance(ret)
-          when 'v'
-            self
-         else
-            raise params[:retval]
+            if args.size == 1
+              @@singular_specs[method].select do |m|
+                m.types.size == 1
+              end
+            else
+              @@singular_specs[method].select do |m|
+                m.variadic? && m.types.size == 1
+              end
+            end
           end
         end
+        raise "hell" unless matching.size == 1
+        m = matching.first
+        m.call(self,ObjC.objc_getClass(name.split('::').last),*args)
       end
     end
 
     def self.attach_method method,*_params
       return if method==:class
       @@method_specs ||= {}
-      if _params.first.is_a? Array
-        _params = [_params].flatten
-        _params.freeze
-        define_method method do |*args|
-          if args.last.is_a? Hash
-            params = _params.select{ |par| par[:args] == args.last.size+1 && par[:names].map(&:to_sym).sort == args.last.keys.sort }
-            raise ArgumentError unless params.size == 1
-            params = params.extract_options!
-            @@method_specs[method] = params
-
-            options = args.extract_options!
-            fixed_args = ObjC.fixed_args(args,options,params[:types])
-            # puts "ObjC.msgSend(@object,\"#{method}:#{params[:names].join(':')}:\",#{fixed_args.inspect})"
-            ObjC.msgSend(@object,"#{method}#{(['']+params[:names]).join(':')}:",*fixed_args)
-            self
-          else
-            params = _params.select{ |par| par[:args] == 1 }
-            raise ArgumentError unless params.size == 1
-            @@method_specs[method] = params
-
-            fixed_args = ObjC.fixed_args(args)
-            # puts "ObjC.msgSend(#{@object.inspect},#{method},#{fixed_args.inspect})"
-            ObjC.msgSend(@object,"#{method}:",*fixed_args)
-            self
-          end
-        end
-      else
-        params = _params.extract_options!
-        @@method_specs[method] = params
-        if params[:args] == 0
-          params.freeze
-          define_method method do
-            case params[:retval]
-            when '@'
-              ObjC.translate_retval(method,ObjC.msgSend(@object,method.to_s),params[:retval])
-            when 'v'
-              ObjC.msgSend(@object,method.to_s)
-              self
-            when '^v'
-              ObjC.msgSend(@object,method.to_s)
-            when 'Q', 'q'
-              ObjC.msgSend(@object,method.to_s).address
-            when 'B'
-              ret = ObjC.msgSend(@object,method.to_s)
-              ret.address ? true : false
-            when /^{([^=]*)=.*}$/
-              ObjC.msgSend_stret($1.constantize,@object,method.to_s)
-            when /^\^{([^=]*)=.*}$/
-              ret = ObjC.msgSend(@object,method.to_s)
-              ObjC.object_to_instance(ret)
-            when '*'
-              ObjC.msgSend(@object,method.to_s).read_string
-            else
-              puts params.inspect
-              raise params[:retval]
-            end
+      @@method_specs[method] = []
+      [_params].flatten.each do |spec|
+        @@method_specs[method] << ObjC::MethodDef.new(method,spec)
+      end
+      define_method method do |*args|
+        matching = if args.size <= 1
+          matching = @@method_specs[method].select do |m|
+            m.types.size == args.size
           end
         else
-          define_method method do |*args|
-            options = args.extract_options!
-            fixed_args = ObjC.fixed_args(args,options,params[:types])
-            case params[:retval]
-            when '@'
-              ObjC.translate_retval(method,ObjC.msgSend(@object,"#{method}#{(['']+params[:names]).join(':')}:",*fixed_args),params[:retval])
-            else
-              ObjC.msgSend(@object,"#{method}#{(['']+params[:names]).join(':')}:",*fixed_args)
-              self
+          matching = if args.last.is_a? Hash
+            @@method_specs[method].select do |m|
+              args.last.keys == m.names
+            end
+          else
+            raise "hell" unless args.size == 1
+            @@method_specs[method].select do |m|
+              m.types.size == 1
             end
           end
         end
+        raise "hell" unless matching.size == 1
+        m = matching.first
+        m.call(self,@object,*args)
       end
     end
 
@@ -232,62 +156,58 @@ module Cocoa
       @object = obj
     end
 
-    def self.ffi_argument_types method
-      return [:pointer] unless @@method_specs[method] # own method probably TODO: return argument count * pointers
-      @@method_specs[method][:types].map do |type|
-        case type
-        when '@'
-          :pointer
-        when /^{([^=]*)=.*}$/
-          Cocoa::const_get($1).by_value
-        else
-          raise type
+    def self.method_defs method
+      return nil unless @@method_specs[method]
+      params = instance_method(method).parameters
+      keys = params.select{ |param| param.first == :key }.map{ |param| param.last }
+      if params.size > 0 && params.last.first == :rest
+        filtered = @@method_specs[method].select do |m|
+          ((m.types.size == 0 && keys.size == 0) || (m.types.size > keys.size)) &&
+          (m.names[0,keys.size-1] || []) == keys
         end
-      end
-    end
-
-    def self.ffi_return_type method
-      return :void unless @@method_specs[method] # own method probably
-      case @@method_specs[method][:retval]
-      when nil
-        :void
-      when 'v'
-        :void
-      when '@'
-        :pointer
+        return nil if filtered.size == 0
+        filtered
       else
-        raise @@method_specs[method][:retval].inspect
+        filtered = @@method_specs[method].select do |m|
+          ((m.types.size == 0 && keys.size == 0) || (m.types.size == keys.size+1)) &&
+          m.names == keys
+        end
+        return nil if filtered.size == 0
+        raise filtered.inspect unless filtered.size == 1
+        filtered.first
       end
     end
 
-    def self.objc_argument_types method
-      #"@:^{CGRect={CGPoint=dd}{CGSize=dd}}@"
-      return 'v@:@' unless @@method_specs[method] # own method probably TODO: @v: + @ times argument count
-      ObjC.objc_type(@@method_specs[method][:retval],'v')+'@:'+@@method_specs[method][:types].map{ |type| ObjC.objc_type(type) }.join
-    end
-
     def self.method_added(name)
+      return if name == :== # TODO: define as equals or something?
+      return if name.to_s[-1] == '='
       return if caller.first.split('`').last[0..-2] == 'define_method'  # MRI
       return if caller.first.split('`').last[0..-2] == 'attach_method'  # Rubinius
-      method_definition = "#{self.name.gsub('::','__')}_#{name}".to_sym
-      add_method = "add_#{method_definition}".to_sym
 
-      @method_callers ||= {}
-      raise "allready added" if @method_callers[method_definition]
-      @method_callers[method_definition] = Proc.new do |this,cmd,*args|
-        begin
-          instance = Cocoa.instances[this.address]
-          instance.send(name,*args.map{ |arg| Cocoa::instance_for(arg) })
-        rescue => e
-          puts e.message
-          puts e.backtrace
+      defs = method_defs name
+      defs ||= ObjC::MethodDef.new(name, :names => [], :types => ['@'], :retval => 'v')  # TODO: generate from method arguments!
+
+      [defs].flatten.each do |m|
+        @callbacks ||= []
+        @callbacks << Proc.new do |this,cmd,*args|
+          begin
+            instance = Cocoa.instances[this.address]
+            params = instance_method(name).parameters
+            m.callback(instance,params,args)
+          rescue => e
+            puts e.message
+            puts e.backtrace
+          end
         end
-      end
 
-      ObjC.callback method_definition, [:pointer, :pointer]+ffi_argument_types(name), ffi_return_type(name)
-      ObjC.attach_function add_method, :class_addMethod, [:pointer,:pointer,method_definition,:string], :void
+        callback_name = "#{self.name.gsub('::','__')}_#{m.selector.gsub(/:/,'_')}".to_sym
+        add_method = "add_#{callback_name}".to_sym
 
-      ObjC.send(add_method,ObjC.objc_getClass(self.name.split('::').last),ObjC.sel_registerName("#{name}:"),@method_callers[method_definition],objc_argument_types(name))
+        ObjC.callback callback_name, [:pointer, :pointer]+m.ffi_types, m.ffi_return_type
+        ObjC.attach_function add_method, :class_addMethod, [:pointer,:pointer,callback_name,:string], :void
+
+        ObjC.send(add_method,ObjC.objc_getClass(self.name.split('::').last),ObjC.sel_registerName(m.selector),@callbacks.last,m.objc_types)
+      end
     end
   end
 end