motion-objection 0.6.3 → 0.6.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmY1MDA5MTVkNjJkY2UyNGU4MDY2YTZmNmRmNzEzZDYxYTRiNzgzMA==
+    NjRiNmUwZGFjYTc5YTI1NzhjMjZhNGY0N2RkMjBlNTA3ODlhMjk3Ng==
   data.tar.gz: !binary |-
-    N2IzYWZmNjBjODkxNGMxYzg1MjFjZTM2ZmE0MTNmZDBiMWRlY2E3MQ==
+    MTllOWVhZmIxMDJmZDdhODkzNTUxYmRhY2JhZThkNjAxNmU1ZDMzMA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YzZkZjM0YmQyOTc3OTM1OWJkMDIyODg4YjJmZTczMWIwNTg4YTJhNGEwMGU1
-    YmJkNDkzYjdlYmVlY2EzZWFjN2E5ZGJmY2QwZGIxZjFkOGFlMmUwNzBhZGQy
-    OTAyYzgzYTU4MTM1ODIyZDljODU3MTQwMDgxOGYyNzFkZWJhZjI=
+    YWYwNTU1OGU3Yjg4MjZhMDk2NDcyNjRmNDMwNzkxOTBhZjIwYTBmYjUxZDQ3
+    ZDc0YzMyMTNkNGE0NmUyYTI0MjNiNDc2ODc4NDBlZDYyY2JjNDFiNTQxYTBm
+    ZGM5ZWQxYTdlOGY0MTNlYTIxZGJmZWQzZmE1MDZmMDBiN2JhM2E=
   data.tar.gz: !binary |-
-    YjRjYzI3MTA5YjkzYjliZmMyZjkyMTVhM2ViMmU2OTg1YmE0MTAzZWMwODg4
-    NDBlZTg3OTA1NWE2NWRlNWI5YWM5YTgwNDczNDg4MmE5OTQ3NDNlZDNjZjU1
-    MzU0ZDAwOTQ3ZDIyMzc4MzhkNzQyZTg5Njk3NWQ2MDFkNWYzMGY=
+    NjYyODg0NzQ4NTRjMTliMTg0MDE0MDFjYzUyYWI2NzQ0ZmE0YWE0ZDliMTIw
+    NmI3YTUzYTI0MGFmYzYwZjMxOGI0NDg1MjQwNTIwYjM3OTA1ODQxZWQzZDc2
+    OGZkNjFlYTg4NzcyMTA1ZWRkYjczMjQ1Yjk4ZWZkMGZmM2JiODI=

data/README.md

@@ -3,7 +3,7 @@ motion-objection
 
 Wrapping the dependency injection library [Objection](https://github.com/atomicobject/objection) in RubyMotion.
 
-[![Build Status](https://travis-ci.org/atomicobject/motion-objection.png)](https://travis-ci.org/atomicobject/motion-objection)
+<!-- [![Build Status](https://travis-ci.org/atomicobject/motion-objection.png)](https://travis-ci.org/atomicobject/motion-objection) -->
 [![Gem Version](https://badge.fury.io/rb/motion-objection.png)](http://badge.fury.io/rb/motion-objection)
 [![Code Climate](https://codeclimate.com/github/atomicobject/motion-objection.png)](https://codeclimate.com/github/atomicobject/motion-objection)
 
@@ -15,12 +15,12 @@ gem install motion-objection
 
 ```ruby
 class Car
-  include Objection
+  include Objection::Compose
   compose_with :engine, :brakes, factory: JSObjectFactory
 end
 
 class Engine
-  include Objection
+  include Objection::Compose
   singleton
   compose_with 'engine/crank_shaft', 'engine/rod'
 
@@ -45,7 +45,7 @@ end
 
 ```ruby
 class ViewController < NSObject
-  include Objection
+  include Objection::Compose
   initializer "initWithNibName:bundle:", "Home"
 
   attr_reader :name
@@ -62,5 +62,5 @@ end
 ## Default Injector
 
 ```ruby
-Objection.default_injector = Objection.injector
+Objection.default_injector = Objection.injector AppModule.new, SecondaryModule.new
 ```

data/Rakefile

@@ -9,7 +9,9 @@ require './lib/motion-objection'
 Motion::Project::App.setup do |app|
   # Use `rake config' to see complete project settings.
   app.name = 'motion-objection'
+
   app.identifier = 'com.atomicobject.motion-objection'
+
   app.pods do 
     pod "Objection", "~>1.0.3"
   end

data/lib/motion-objection/compose.rb

@@ -0,0 +1,70 @@
+module Objection
+  module Compose
+    def self.included(base)
+      base.send :extend, ClassMethods
+    end
+
+    module Initializer
+      def objectionInitializer
+        @_initializer
+      end
+    end
+
+    module ClassMethods
+
+      def compose_with(*args)
+        @_type_mappings = {}
+        properties = []
+        args.each do |arg|
+          if arg.is_a? Hash
+            arg.each do |k,v|
+              @_type_mappings[k.to_s] = v
+              attr_accessor k
+              properties << k
+            end
+          else
+            prop = arg.split("/").last
+            attr_accessor prop
+            @_type_mappings[prop] = arg.to_s
+            properties << prop
+          end
+        end
+        @_dependencies = NSSet.setWithArray(properties.map(&:to_s))
+      end
+
+      def singleton
+        JSObjection.registerClass self, scope: JSObjectionScopeSingleton 
+      end
+
+      def initializer(selector, *args)
+        self.send :extend, Initializer 
+        @_initializer = {
+          "initializer" => selector,
+          "arguments" => args
+        }
+      end
+
+      protected 
+
+      def objectionRequires
+        @_dependencies ||= NSSet.set
+        if self.superclass.respondsToSelector :objectionRequires
+          set = NSMutableSet.setWithSet self.superclass.objectionRequires
+          set.unionSet @_dependencies
+          set
+        else
+          @_dependencies
+        end
+      end
+
+      def objectionTypeMappings
+        @_type_mappings ||= {}
+        if self.superclass.respondsToSelector :objectionTypeMappings
+          @_type_mappings.merge self.superclass.objectionTypeMappings
+        else
+          @_type_mappings
+        end
+      end
+    end
+  end
+end

data/lib/motion-objection/objection.rb

@@ -1,10 +1,7 @@
 module Objection
+  module_function
 
-  def self.included(base)
-    base.send :extend, ClassMethods
-  end
-
-  def self.injector(*modules)
+  def injector(*modules)
     if modules.empty?
       JSObjection.createInjector
     elsif modules.size == 1
@@ -14,74 +11,11 @@ module Objection
     end
   end
 
-  def self.default_injector=(injector)
+  def default_injector=(injector)
     JSObjection.setDefaultInjector injector
   end
 
-  def self.default_injector
+  def default_injector
     JSObjection.defaultInjector
   end
-
-  module Initializer
-    def objectionInitializer
-      @_initializer
-    end
-  end
-
-  module ClassMethods
-
-    def compose_with(*args)
-      @_type_mappings = {}
-      properties = []
-      args.each do |arg|
-        if arg.is_a? Hash
-          arg.each do |k,v|
-            @_type_mappings[k.to_s] = v
-            attr_accessor k
-            properties << k
-          end
-        else
-          prop = arg.split("/").last
-          attr_accessor prop
-          @_type_mappings[prop] = arg.to_s
-          properties << prop
-        end
-      end
-      @_dependencies = NSSet.setWithArray(properties.map(&:to_s))
-    end
-
-    def singleton
-      JSObjection.registerClass self, scope: JSObjectionScopeSingleton 
-    end
-
-    def initializer(selector, *args)
-      self.send :extend, Initializer 
-      @_initializer = {
-        "initializer" => selector,
-        "arguments" => args
-      }
-    end
-
-    protected 
-
-    def objectionRequires
-      @_dependencies ||= NSSet.set
-      if self.superclass.respondsToSelector :objectionRequires
-        set = NSMutableSet.setWithSet self.superclass.objectionRequires
-        set.unionSet @_dependencies
-        set
-      else
-        @_dependencies
-      end
-    end
-
-    def objectionTypeMappings
-      @_type_mappings ||= {}
-      if self.superclass.respondsToSelector :objectionTypeMappings
-        @_type_mappings.merge self.superclass.objectionTypeMappings
-      else
-        @_type_mappings
-      end
-    end
-  end
 end

data/lib/motion-objection/version.rb

@@ -1,3 +1,3 @@
 module Objection
-  VERSION = "0.6.3"
+  VERSION = "0.6.4"
 end

data/spec/helpers/objection_classes.rb

@@ -1,10 +1,20 @@
 class Car
-  include Objection
-  compose_with :engine, :brakes, factory: JSObjectFactory
+  include Objection::Compose
+  compose_with :engine, :brakes, factory: JSObjectFactory  
+end
+
+class EagerCar
+  include Objection::Compose
+  singleton
+  class<<self; attr_accessor :awoke; end
+
+  def awakeFromObjection
+    self.class.awoke = true
+  end
 end
 
 class Engine
-  include Objection
+  include Objection::Compose
   singleton
   compose_with 'engine/crank_shaft', 'engine/rod'
 
@@ -19,7 +29,9 @@ class Engine
   end
 end
 
-class V6Engine < Engine; end
+class V6Engine < Engine
+  compose_with factory: JSObjectFactory
+end
 
 class Brakes
   def brake!
@@ -32,7 +44,7 @@ class ABSBrakes < Brakes
 end
 
 class ViewController < NSObject
-  include Objection
+  include Objection::Compose
   initializer "initWithNibName:bundle:", "Home"
 
   attr_reader :name

data/spec/helpers/objection_modules.rb

@@ -17,3 +17,9 @@ class AppModuleII < JSObjectionModule
     bindClass ABSBrakes, toClass: Brakes
   end
 end
+
+class EagerSingletonModule < JSObjectionModule
+  def configure
+    registerEagerSingleton EagerCar
+  end
+end

data/spec/objection_spec.rb

@@ -11,12 +11,25 @@ describe "Objection" do
     end
   end
 
+  describe "#inject_dependencies" do
+    it "injects dependencies into an object constructed outside of objection" do
+      @engine = V6Engine.new
+
+      @engine.crank_shaft.should.equal nil
+
+      @injector.inject_dependencies @engine
+
+      @engine.crank_shaft.class.should.be.same_as Engine::CrankShaft
+    end
+  end
+
   describe "dependency injection" do
     it "supports inheritance" do
       @engine = @injector[V6Engine]
 
       @engine.crank_shaft.class.should.be.same_as Engine::CrankShaft
       @engine.rod.class.should.be.same_as Engine::Rod
+      @engine.factory.class.should.be.same_as JSObjectFactory
     end
 
     it "can construct an object with dependencies" do
@@ -54,6 +67,11 @@ describe "Objection" do
       @app_module2 = AppModuleII.alloc.init
     end
 
+    it "has support for eager singletons" do
+      @injector = Objection.injector EagerSingletonModule.new
+      EagerCar.awoke.should.equal true
+    end
+
     it "has support for an injector with a module" do
       @injector = Objection.injector @app_module
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motion-objection
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Justin DeWind
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-08 00:00:00.000000000 Z
+date: 2013-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: motion-cocoapods
@@ -40,6 +40,7 @@ files:
 - Rakefile
 - app/app_delegate.rb
 - lib/motion-objection.rb
+- lib/motion-objection/compose.rb
 - lib/motion-objection/inflector.rb
 - lib/motion-objection/jsobjection.rb
 - lib/motion-objection/jsobjection_injector.rb