cocoa 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6451857601cfd72241c1051e50c9f16f5bcacf54
-  data.tar.gz: 1c62fb1676c95d06a59e42a73c9d6fe7520d91aa
+  metadata.gz: 04969b65f9381a64dff26285eadea02ee22a5707
+  data.tar.gz: 328544cf27ee82e63349e8e1978a972867243a51
 SHA512:
-  metadata.gz: 349346bb8fed1e2a73be47ddc9f17520b74d6370b486cd61d04dcacfc7fad409fe70e811d15d5b7324d4e66d160dd8019411c080fd311a361491f5e00e1a3959
-  data.tar.gz: 0107e0a962d28276a15fe08955c96e977efc2c2a05ccf74cd9a4f3f10d08756b8e1406d734d1731eba709411eb30cd9e7be2617e136c0204400376d52d94d225
+  metadata.gz: 9eb8aa0801e1737d082428259cef0108ece9d5d95263ba0ffe1646b6c5324910074ad208b70e90a8ce60b28c0217772e0b5c719ce7c75f2ac04bc27d83135769
+  data.tar.gz: 2d904420d15c59dfbe60962a7eb17e46dd029382ab00540817adb6b66fc961aa456c1a3c8254fcb8892380857cacd0735d369a379c29fd9da20873ca8bad54ac

data/Gemfile

@@ -2,11 +2,12 @@ source "http://rubygems.org"
 gem 'activesupport'
 gem 'ffi'
 group :development do
+  gem 'cocoa', :path => '.' unless File.basename($0) == 'rake' && $*.first == 'gemspec'
   gem 'bacon'
   gem 'mocha-on-bacon'
   # gem "shoulda", ">= 0"
   gem "rdoc", "~> 3.12"
   gem "bundler", "~> 1.0"
-  gem "jeweler", "~> 2.0.1"
+  gem "jeweler", "~> 2.0"
   gem "simplecov", ">= 0"
 end

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

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.4 ruby lib
+# stub: cocoa 0.1.5 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "cocoa"
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   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-10"
+  s.date = "2014-04-11"
   s.description = "Ruby FFI bindings for the OSX Cocoa API"
   s.email = "patrick.hanevold@gmail.com"
   s.extra_rdoc_files = [
@@ -441,30 +441,33 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activesupport>, [">= 0"])
       s.add_runtime_dependency(%q<ffi>, [">= 0"])
+      s.add_development_dependency(%q<cocoa>, [">= 0"])
       s.add_development_dependency(%q<bacon>, [">= 0"])
       s.add_development_dependency(%q<mocha-on-bacon>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 2.0.1"])
+      s.add_development_dependency(%q<jeweler>, ["~> 2.0"])
       s.add_development_dependency(%q<simplecov>, [">= 0"])
     else
       s.add_dependency(%q<activesupport>, [">= 0"])
       s.add_dependency(%q<ffi>, [">= 0"])
+      s.add_dependency(%q<cocoa>, [">= 0"])
       s.add_dependency(%q<bacon>, [">= 0"])
       s.add_dependency(%q<mocha-on-bacon>, [">= 0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, ["~> 1.0"])
-      s.add_dependency(%q<jeweler>, ["~> 2.0.1"])
+      s.add_dependency(%q<jeweler>, ["~> 2.0"])
       s.add_dependency(%q<simplecov>, [">= 0"])
     end
   else
     s.add_dependency(%q<activesupport>, [">= 0"])
     s.add_dependency(%q<ffi>, [">= 0"])
+    s.add_dependency(%q<cocoa>, [">= 0"])
     s.add_dependency(%q<bacon>, [">= 0"])
     s.add_dependency(%q<mocha-on-bacon>, [">= 0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, ["~> 1.0"])
-    s.add_dependency(%q<jeweler>, ["~> 2.0.1"])
+    s.add_dependency(%q<jeweler>, ["~> 2.0"])
     s.add_dependency(%q<simplecov>, [">= 0"])
   end
 end

data/lib/cocoa/extensions.rb

@@ -20,39 +20,47 @@ class String
 end
 
 class Cocoa::NSObject
+
   def self.const_missing name
     Cocoa.const_get name
   end
 
+  def self.native_name
+    name.split('::').last
+  end
+
   def self.alloc
-    new(true).alloc
+    instance = new(true)
+    instance.object = ObjC.msgSend_pointer(get_class,"alloc")
+    instance
   end
 
   def self.inherited(parent)
-    include ClassMethods
     if parent.name
-      klass = ObjC.objc_allocateClassPair(ObjC.objc_getClass(name.split('::').last),parent.name,0)
-      ObjC.objc_registerClassPair(klass)
+      klass = begin
+        Cocoa::const_get(parent.native_name)
+        ObjC.objc_getClass(parent.native_name)
+      rescue
+      end
+      unless klass && klass.address != 0
+        klass = ObjC.objc_allocateClassPair(ObjC.objc_getClass(native_name),parent.native_name,0)
+        ObjC.objc_registerClassPair(klass)
+      end
     end
   end
 
+  def self.get_class
+    ObjC.objc_getClass(native_name)
+  end
+
   def initialize allocated=false
-    @klass = ObjC.objc_getClass(self.native_name)
+    @klass = ObjC.objc_getClass(self.class.native_name)
     unless allocated
       self.object = @klass
       new
     end
   end
 
-  def get_class
-    ObjC.objc_getClass(self.native_name)
-  end
-
-  def alloc
-    self.object = ObjC.msgSend_pointer(ObjC.objc_getClass(self.native_name),"alloc")
-    self
-  end
-
   def init
     self.object = ObjC.msgSend_pointer(@object,"init")
     self
@@ -67,10 +75,4 @@ class Cocoa::NSObject
     self.object = ObjC.msgSend_pointer(@object,"autorelease")
     self
   end
-
-  module ClassMethods
-    def native_name
-      self.class.name.split('::').last
-    end
-  end
 end

data/spec/cocoa/cocoa_spec.rb

@@ -10,24 +10,29 @@ 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
+
   it 'should provide correct return types for instance methods' do
     array = Cocoa::NSMutableArray.array
     Cocoa::NSMutableArray.array.description.class.name.should == 'Cocoa::NSString'
   end
+
   it 'should convert NSString to ruby strings' do
     array = Cocoa::NSMutableArray.array
     array.addObject "head"
     array.addObject "tail"
     ObjC.NSString_to_String(array.description.object).should == "(\n    head,\n    tail\n)"
   end
+
   it 'should return stringifyable strings' do
     array = Cocoa::NSMutableArray.array
     array.addObject "head"
@@ -38,6 +43,42 @@ describe 'Cocoa' do
   it 'should call singular methods' do
     Cocoa::NSString.stringWithString('a string').should == 'a string'
   end
+
+  it 'should allocate' do
+    instance = Cocoa::NSString.alloc
+    instance.class.should == Cocoa::NSString
+    instance.className.should == "NSPlaceholderString"
+  end
+
+  it 'should allocate derived' do
+    class Derived < Cocoa::NSObject
+    end
+    instance = Derived.alloc
+    instance.class.should == Derived
+    instance.className.should == "Derived"
+  end
+
+  it 'should allocate namespaced derived' do
+    class Cocoa::NamespacedDerived < Cocoa::NSObject
+    end
+    instance = Cocoa::NamespacedDerived.alloc
+    instance.class.should == Cocoa::NamespacedDerived
+    instance.className.should == "NamespacedDerived"
+  end
+
+  it 'should allocate derived inside class' do
+    class Cocoa::Foobar
+      class InsideDerived < Cocoa::NSObject
+      end
+      def initialize
+        instance = InsideDerived.alloc
+        instance.class.should == InsideDerived
+        instance.className.should == "InsideDerived"
+      end
+    end
+    Cocoa::Foobar.new
+  end
+
   # TODO: known bug
   # it 'should call variadic singular methods' do
   #   Cocoa::NSSet.setWithObjects "A", "B", "and C"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoa
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Patrick Hanevold
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-10 00:00:00.000000000 Z
+date: 2014-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: cocoa
+  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: bacon
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement