cocoa 0.1.3 → 0.1.4

data/lib/cocoa/structs/NSRange.rb

@@ -20,4 +20,7 @@ module Cocoa
   def CFRangeMake loc,len
     CFRange.new(location: loc, length: len)
   end
+  def NSMakeRange loc,len
+    NSRange.new(location: loc, length: len)
+  end
 end

data/lib/cocoa/structs/NSRect.rb

@@ -20,6 +20,9 @@ module Cocoa
   def CGRectMake x,y,width,height
     CGRect.new(x: x, y: y, width: width, height: height)
   end
+  def NSMakeRect x,y,width,height
+    CGRect.new(x: x, y: y, width: width, height: height)
+  end
 
   NSZeroRect = CGRect.new(x: 0, y: 0, width: 0, height: 0)
 end

data/spec/cocoa/cocoa_spec.rb

@@ -10,6 +10,11 @@ describe 'Cocoa' do
     end
     Derived.new.get_lazy.class.name.should == 'Cocoa::NSMenu'
   end
+  it 'should provide ruby superclass' do
+    class Derived < Cocoa::NSObject
+    end
+    Derived.superclass.name.should == 'Cocoa::NSObject'
+  end
   it 'should provide correct return types for class methods' do
     Cocoa::NSMutableArray.array.class.name.should == 'Cocoa::NSMutableArray'
   end
@@ -29,4 +34,98 @@ describe 'Cocoa' do
     array.addObject "tail"
     array.description.to_s.should == "(\n    head,\n    tail\n)"
   end
+
+  it 'should call singular methods' do
+    Cocoa::NSString.stringWithString('a string').should == 'a string'
+  end
+  # TODO: known bug
+  # it 'should call variadic singular methods' do
+  #   Cocoa::NSSet.setWithObjects "A", "B", "and C"
+  # end
+
+  it 'should return structs' do
+    rect = Cocoa::NSView.alloc.initWithFrame(Cocoa::NSMakeRect(12,34,56,78))
+    rect.frame[:origin][:x].should == 12.0
+    rect.frame[:origin][:y].should == 34.0
+    rect.frame[:size][:width].should == 56.0
+    rect.frame[:size][:height].should == 78.0
+  end
+
+#  context 'callbacks' do
+    it 'should call methods with a argument' do
+      class Derived < Cocoa::NSObject
+        def foobar foo; end
+      end
+      derived = Derived.new
+      derived.expects(:foobar).with(Cocoa::NSString.stringWithString("a argument"))
+      ObjC.msgSend_pointer(derived.object,"foobar:",:pointer,ObjC.String_to_NSString("a argument"))
+    end
+
+    it 'should call overridden methods with no arguments' do
+      class Derived < Cocoa::NSObject
+        def accessibilityActionNames; end
+      end
+      derived = Derived.new
+      derived.expects(:accessibilityActionNames)
+      ObjC.msgSend_pointer(derived.object,"accessibilityActionNames")
+    end
+
+    it 'should call overridden methods with keword arguments' do
+      # fake ruby 2
+      unbound_method = mock('UnboundMethod')
+      Cocoa::NSObject.expects(:instance_method).with(:tableView).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
+        def tableView; end
+      end
+
+      derived = Derived.new
+      derived.expects(:tableView).with(
+        Cocoa::NSString.stringWithString("arg1"),
+        objectValueForTableColumn: Cocoa::NSString.stringWithString("arg2"),
+        row: 123
+      )
+      ObjC.msgSend_pointer(derived.object,"tableView:objectValueForTableColumn:row:",
+        :pointer,ObjC.String_to_NSString("arg1"),
+        :pointer,ObjC.String_to_NSString("arg2"),
+        :int,123)
+    end
+
+    it 'should call overridden methods with keword arguments and return a value' do
+      # fake ruby 2
+      unbound_method = mock('UnboundMethod')
+      Cocoa::NSObject.expects(:instance_method).with(:tableView).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
+        def tableView *args; "returned value"; end
+      end
+
+      derived = Derived.new
+      ret = ObjC.msgSend_pointer(derived.object,"tableView:objectValueForTableColumn:row:",
+        :pointer,ObjC.String_to_NSString("arg1"),
+        :pointer,ObjC.String_to_NSString("arg2"),
+        :int,123)
+      ObjC.NSString_to_String(ret).to_s.should == "returned value"
+    end
+
+    it 'should call overridden methods covered by splat' do
+      class Derived < Cocoa::NSObject
+        def tableView *args; end
+      end
+
+      derived = Derived.new
+      derived.expects(:tableView).with(
+        Cocoa::NSString.stringWithString("arg1"),
+        objectValueForTableColumn: Cocoa::NSString.stringWithString("arg2"),
+        row: 123
+      )
+      ret = ObjC.msgSend_pointer(derived.object,"tableView:objectValueForTableColumn:row:",
+        :pointer,ObjC.String_to_NSString("arg1"),
+        :pointer,ObjC.String_to_NSString("arg2"),
+        :int,123)
+    end
+
+#  end
 end

data/spec/spec_helper.rb

@@ -36,3 +36,4 @@ $: << File.expand_path(File.join(File.dirname(__FILE__), '/../lib'))
 # end
 
 require 'bacon'
+require 'mocha-on-bacon'

data/tasks/generate.rake

@@ -8,7 +8,9 @@ task :generate do
   sdkroot = '/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk'
   frameworks = ['AppKit','Foundation','QuartzCore','CoreGraphics','CoreText','CoreFoundation']
   FileUtils.mkdir_p('tmp')
-  `/usr/bin/gen_bridge_metadata --no-32-bit -F complete #{frameworks.map{ |fw| "-f #{sdkroot}/System/Library/Frameworks/#{fw}.framework" }.join(' ')} -c "-isysroot #{sdkroot} #{frameworks.map{ |fw| "-framework #{fw}" }.join(' ')} -O0 -g" -o tmp/Foundation.bridgesupport`
+  Bundler.with_clean_env do
+    `/usr/bin/gen_bridge_metadata --no-32-bit -F complete #{frameworks.map{ |fw| "-f #{sdkroot}/System/Library/Frameworks/#{fw}.framework" }.join(' ')} -c "-isysroot #{sdkroot} #{frameworks.map{ |fw| "-framework #{fw}" }.join(' ')} -O0 -g" -o tmp/Foundation.bridgesupport`
+  end
 
   # TODO: This spaghetti can be done both dynamicly and properly
   enums = {}
@@ -23,9 +25,9 @@ task :generate do
         enums[node['name']] = node['value64'] || node['value']
       when 'class'
         out = File.open("lib/cocoa/bindings/#{node['name']}.rb",'w')
-        klass_name = Cocoa::String_to_NSString(node['name'])
+        klass_name = ObjC::String_to_NSString(node['name'])
         klass = Cocoa::NSClassFromString(klass_name)
-        superclass_name = Cocoa::NSString_to_String(Cocoa::NSStringFromClass(ObjC.msgSend(klass,'superclass')))
+        superclass_name = ObjC::NSString_to_String(Cocoa::NSStringFromClass(ObjC.msgSend_pointer(klass,'superclass')))
         out.puts "# generated by 'rake generate'"
         out.puts "require 'cocoa/bindings/#{superclass_name}'" unless superclass_name == '(NULL)'
         out.puts "module Cocoa"
@@ -61,7 +63,7 @@ task :generate do
             next if method==nil
             method = "self.#{method}" if node['class_method']
             methods[method] ||= []
-            h = { args: selector.count(':'), names: selector.split(':')[1..-1], :types => arg_types, :retval => retval }
+            h = { args: selector.count(':'), names: selector.split(':')[1..-1].map(&:to_sym), :types => arg_types, :retval => retval }
             h[:variadic] = true if node['variadic']
             methods[method] << h unless methods[method].include?(h)
           else

metadata

@@ -1,126 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: cocoa
 version: !ruby/object:Gem::Version
-  version: 0.1.3
-  prerelease: 
+  version: 0.1.4
 platform: ruby
 authors:
 - Patrick Hanevold
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-27 00:00:00.000000000 Z
+date: 2014-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bacon
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mocha-on-bacon
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.12'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Ruby FFI bindings for the OSX Cocoa API
@@ -138,6 +137,7 @@ files:
 - VERSION
 - cocoa.gemspec
 - examples/hello_world.rb
+- examples/table_view.rb
 - examples/window.rb
 - lib/cocoa.rb
 - lib/cocoa/bindings/CAAnimation.rb
@@ -530,6 +530,7 @@ files:
 - lib/cocoa/extensions.rb
 - lib/cocoa/helpers.rb
 - lib/cocoa/objc.rb
+- lib/cocoa/objc/method_def.rb
 - lib/cocoa/structs/NSPoint.rb
 - lib/cocoa/structs/NSRange.rb
 - lib/cocoa/structs/NSRect.rb
@@ -542,26 +543,25 @@ files:
 homepage: http://github.com/patrickhno/cocoa
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby bindings for Cocoa
 test_files: []