cocoa 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04969b65f9381a64dff26285eadea02ee22a5707
-  data.tar.gz: 328544cf27ee82e63349e8e1978a972867243a51
+  metadata.gz: 5f71aa43ea295a1886c05be665d147e1312fb09a
+  data.tar.gz: c33bb6813e008b446256ceec2592d4b1dd897bcc
 SHA512:
-  metadata.gz: 9eb8aa0801e1737d082428259cef0108ece9d5d95263ba0ffe1646b6c5324910074ad208b70e90a8ce60b28c0217772e0b5c719ce7c75f2ac04bc27d83135769
-  data.tar.gz: 2d904420d15c59dfbe60962a7eb17e46dd029382ab00540817adb6b66fc961aa456c1a3c8254fcb8892380857cacd0735d369a379c29fd9da20873ca8bad54ac
+  metadata.gz: e655407c657e9e8b7a7bfbdf65fa7cd1f27cdbbaa050183e283c03a6308041abb71f678914e974d7f2a5caf6b8454cf808ce8269bf99b16612b657c3f401fb32
+  data.tar.gz: 4eddefb01fbb2b0bef984084a2adcb0ff50c144614887cf3591a29211cad5ca3fbe4d53471661446b5da273e3edf48c6dded60b20b89f2a50468eb4f089d787b

data/Rakefile

@@ -1,6 +1,10 @@
 # encoding: utf-8
 
-PROJECT_SPECS = FileList['spec/**/*_spec.rb']
+PROJECT_SPECS = if RUBY_VERSION.split.first.to_i >= 2
+  FileList['spec/**/*_spec.rb'] + FileList['spec/**/*_spec_r2.rb']
+else
+  FileList['spec/**/*_spec.rb']
+end
 
 require 'jeweler'
 Jeweler::Tasks.new do |gem|

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.1.6

data/cocoa.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: cocoa 0.1.5 ruby lib
+# stub: cocoa 0.1.6 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "cocoa"
-  s.version = "0.1.5"
+  s.version = "0.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Patrick Hanevold"]
-  s.date = "2014-04-11"
+  s.date = "2014-04-13"
   s.description = "Ruby FFI bindings for the OSX Cocoa API"
   s.email = "patrick.hanevold@gmail.com"
   s.extra_rdoc_files = [
@@ -425,6 +425,7 @@ Gem::Specification.new do |s|
     "lib/cocoa/structs/NSRect.rb",
     "lib/cocoa/structs/NSSize.rb",
     "spec/cocoa/cocoa_spec.rb",
+    "spec/cocoa/cocoa_spec_r2.rb",
     "spec/spec_helper.rb",
     "tasks/bacon.rake",
     "tasks/generate.rake",

data/lib/cocoa/extensions.rb

@@ -26,7 +26,13 @@ class Cocoa::NSObject
   end
 
   def self.native_name
-    name.split('::').last
+    arr = name.split('::')
+    native = if arr.first == 'Cocoa'
+      arr.last
+    else
+      name.gsub(/::/,'__')
+    end
+    native
   end
 
   def self.alloc

data/lib/cocoa/helpers.rb

@@ -123,24 +123,27 @@ module Cocoa
 
     def self.attach_method method,*_params
       return if method==:class
-      @@method_specs ||= {}
-      @@method_specs[method] = []
+      @method_specs ||= {}
+      @method_specs[method] = []
       [_params].flatten.each do |spec|
-        @@method_specs[method] << ObjC::MethodDef.new(method,spec)
+        @method_specs[method] << ObjC::MethodDef.new(method,spec)
       end
       define_method method do |*args|
+        klass = self.class; klass = klass.superclass while !klass.instance_methods(false).include?(method)
+        spec = klass.instance_variable_get(:@method_specs)[method]
+
         matching = if args.size <= 1
-          matching = @@method_specs[method].select do |m|
+          matching = spec.select do |m|
             m.types.size == args.size
           end
         else
           matching = if args.last.is_a? Hash
-            @@method_specs[method].select do |m|
+            spec.select do |m|
               args.last.keys == m.names
             end
           else
             raise "hell" unless args.size == 1
-            @@method_specs[method].select do |m|
+            spec.select do |m|
               m.types.size == 1
             end
           end
@@ -157,18 +160,26 @@ module Cocoa
     end
 
     def self.method_defs method
-      return nil unless @@method_specs[method]
+      klass = self
+      method_specs = klass.instance_variable_get(:@method_specs)
+      while klass && (!method_specs || !method_specs[method])
+        klass = klass.superclass
+        method_specs = klass.instance_variable_get(:@method_specs)
+      end
+      return nil unless method_specs
+
+      spec = 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|
+        filtered = spec.select do |m|
           ((m.types.size == 0 && keys.size == 0) || (m.types.size > keys.size)) &&
           (m.names[0,keys.size-1] || []) == keys
         end
         return nil if filtered.size == 0
         filtered
       else
-        filtered = @@method_specs[method].select do |m|
+        filtered = spec.select do |m|
           ((m.types.size == 0 && keys.size == 0) || (m.types.size == keys.size+1)) &&
           m.names == keys
         end
@@ -181,18 +192,42 @@ module Cocoa
     def self.method_added(name)
       return if name == :== # TODO: define as equals or something?
       return if name.to_s[-1] == '='
+      return if caller[1].split('`').last[0..-2] == 'method_added'      # self
       return if caller.first.split('`').last[0..-2] == 'define_method'  # MRI
       return if caller.first.split('`').last[0..-2] == 'attach_method'  # Rubinius
 
+      # define an alias for keyword argument methods such that:
+      # class Foo
+      #   def bar whatever, alpha: nil
+      #     puts "alpha is: #{alpha}"
+      #   end
+      #   def bar whatever, omega: nil
+      #     puts "omega is: #{omega}"
+      #   end
+      # end
+      # Foo.new.bar "hello", omega: "is omega"
+      # Foo.new.bar "hello", alpha: "is alpha"
+      #=>
+      # omega is: is omega
+      # alpha is: is alpha
+      keys = instance_method(name).parameters.select{ |param| param.first == :key }.map{ |param| param.last }
+      ruby_name = name
+      if keys.size > 0
+        ruby_name = "_#{name}_with_#{keys.join('_and_')}".to_sym
+        alias_method ruby_name, name
+      end
+
+
       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|
+          m.ruby_name = ruby_name
           begin
             instance = Cocoa.instances[this.address]
-            params = instance_method(name).parameters
+            params = instance_method(ruby_name).parameters
             m.callback(instance,params,args)
           rescue => e
             puts e.message
@@ -203,10 +238,20 @@ module Cocoa
         callback_name = "#{self.name.gsub('::','__')}_#{m.selector.gsub(/:/,'_')}".to_sym
         add_method = "add_#{callback_name}".to_sym
 
+        native_name = begin
+          arr = self.name.split('::')
+          native = if arr.first == 'Cocoa'
+            arr.last
+          else
+            self.name.gsub(/::/,'__')
+          end
+          native
+        end
+
         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)
+        ObjC.send(add_method,ObjC.objc_getClass(native_name),ObjC.sel_registerName(m.selector),@callbacks.last,m.objc_types)
       end
     end
   end

data/lib/cocoa/objc.rb

@@ -75,19 +75,23 @@ module ObjC
     instance = begin
       Cocoa::const_get(klass_name).new(true)
     rescue
-      klass_name = if klass_name =~ /^__NSCF/
-        "NS#{klass_name[6..-1]}" 
-      elsif klass_name[0]=='_'
-        if superklass = Cocoa::const_get(NSString_to_String(Cocoa::NSStringFromClass(ObjC.msgSend_pointer(ret,"superclass"))))
-          superklass.name.split('::').last
+      begin
+        Object.const_get(klass_name.gsub(/__/,'::')).new(true)
+      rescue
+        klass_name = if klass_name =~ /^__NSCF/
+          "NS#{klass_name[6..-1]}" 
+        elsif klass_name[0]=='_'
+          if superklass = Cocoa::const_get(NSString_to_String(Cocoa::NSStringFromClass(ObjC.msgSend_pointer(ret,"superclass"))))
+            superklass.name.split('::').last
+          else
+            "FIX_#{klass_name}" 
+          end
         else
-          "FIX_#{klass_name}" 
+          klass_name
         end
-      else
-        klass_name
+        klass = smart_constantize(ret,klass_name)
+        klass.new(true)
       end
-      klass = smart_constantize(ret,klass_name)
-      klass.new(true)
     end
     instance.object = ret
     instance
@@ -119,7 +123,7 @@ module ObjC
     case type
     when nil
       default
-    when '@', 'v', 'q', 'Q', '^v'
+    when '@', 'v', 'q', 'Q', '^v', 'B'
       type
     when /^{([^=]*)=.*}$/
       type

data/lib/cocoa/objc/method_def.rb

@@ -1,6 +1,6 @@
 module ObjC
   class MethodDef
-    attr_accessor :name,:names,:types,:return_type
+    attr_accessor :name,:names,:types,:return_type,:ruby_name
 
     TYPES = {
       'c' => :char,
@@ -31,6 +31,7 @@ module ObjC
 
     def initialize name,options
       @name = name.to_sym
+      @ruby_name = name.to_sym
       @names = options[:names].map(&:to_sym)
       @types = options[:types]
       @return_type = options[:retval]
@@ -280,12 +281,12 @@ module ObjC
 
       ret = if params.size > 0 && params.last.first == :rest
         args = args.map{ |arg| Cocoa::instance_for(arg) }
-        instance.send(name, args.first, Hash[*names.zip(args[1..-1]).flatten])
+        instance.send(ruby_name, args.first, Hash[*names.zip(args[1..-1]).flatten])
       elsif keys.size > 0
         args = args.map{ |arg| Cocoa::instance_for(arg) }
-        instance.send(name, args.first, Hash[*keys.zip(args[1..-1]).flatten])
+        instance.send(ruby_name, args.first, Hash[*keys.zip(args[1..-1]).flatten])
       else
-        instance.send(name, *args.map{ |arg| Cocoa::instance_for(arg) })
+        instance.send(ruby_name, *args.map{ |arg| Cocoa::instance_for(arg) })
       end
       ffi_return_value(ret)
     end

data/spec/cocoa/cocoa_spec.rb

@@ -17,6 +17,17 @@ describe 'Cocoa' do
     Derived.superclass.name.should == 'Cocoa::NSObject'
   end
 
+  it 'should provide native names' do
+    class Derived < Cocoa::NSObject
+    end
+    module Scoped; end
+    class Scoped::Derived < Cocoa::NSObject
+    end
+    Cocoa::NSObject.native_name.should == 'NSObject'
+    Derived.native_name.should == 'Derived'
+    Scoped::Derived.native_name.should == 'Scoped__Derived'
+  end
+
   it 'should provide correct return types for class methods' do
     Cocoa::NSMutableArray.array.class.name.should == 'Cocoa::NSMutableArray'
   end
@@ -115,6 +126,7 @@ describe 'Cocoa' do
       # fake ruby 2
       unbound_method = mock('UnboundMethod')
       Cocoa::NSObject.expects(:instance_method).with(:tableView).at_least_once.returns(unbound_method)
+      Cocoa::NSObject.expects(:instance_method).with(:_tableView_with_objectValueForTableColumn_and_row).at_least_once.returns(unbound_method)
       unbound_method.expects(:parameters).at_least_once.returns([[:req, :table_view], [:key, :objectValueForTableColumn], [:key, :row]])
       class Derived < Cocoa::NSObject
         #def tableView(table_view, objectValueForTableColumn: column, row: i); end
@@ -122,7 +134,7 @@ describe 'Cocoa' do
       end
 
       derived = Derived.new
-      derived.expects(:tableView).with(
+      derived.expects(:_tableView_with_objectValueForTableColumn_and_row).with(
         Cocoa::NSString.stringWithString("arg1"),
         objectValueForTableColumn: Cocoa::NSString.stringWithString("arg2"),
         row: 123
@@ -137,6 +149,7 @@ describe 'Cocoa' do
       # fake ruby 2
       unbound_method = mock('UnboundMethod')
       Cocoa::NSObject.expects(:instance_method).with(:tableView).at_least_once.returns(unbound_method)
+      Cocoa::NSObject.expects(:instance_method).with(:_tableView_with_objectValueForTableColumn_and_row).at_least_once.returns(unbound_method)
       unbound_method.expects(:parameters).at_least_once.returns([[:req, :table_view], [:key, :objectValueForTableColumn], [:key, :row]])
       class Derived < Cocoa::NSObject
         #def tableView(table_view, objectValueForTableColumn: column, row: i); end
@@ -157,7 +170,7 @@ describe 'Cocoa' do
       end
 
       derived = Derived.new
-      derived.expects(:tableView).with(
+      derived.expects(:_tableView_with_objectValueForTableColumn_and_row).with(
         Cocoa::NSString.stringWithString("arg1"),
         objectValueForTableColumn: Cocoa::NSString.stringWithString("arg2"),
         row: 123

data/spec/cocoa/cocoa_spec_r2.rb

@@ -0,0 +1,18 @@
+require_relative '../spec_helper'
+require 'cocoa'
+
+describe 'Cocoa' do
+#  context 'callbacks' do
+    it 'should be able to call overridden methods with keword arguments and return a value' do
+      class Derived < Cocoa::NSObject
+        def tableView(table_view, objectValueForTableColumn: column, row: i)
+          "returned value"
+        end
+      end
+
+      derived = Derived.new
+      ret = derived.tableView("arg1", objectValueForTableColumn: "arg2", row: 123)
+      ret.to_s.should == "returned value"
+    end
+#  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoa
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Patrick Hanevold
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-11 00:00:00.000000000 Z
+date: 2014-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -550,6 +550,7 @@ files:
 - lib/cocoa/structs/NSRect.rb
 - lib/cocoa/structs/NSSize.rb
 - spec/cocoa/cocoa_spec.rb
+- spec/cocoa/cocoa_spec_r2.rb
 - spec/spec_helper.rb
 - tasks/bacon.rake
 - tasks/generate.rake