motion-objection 0.6.1 → 0.6.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDllZmQ5MjJhM2QyMWRiMWYzZjgwMjdjNWQ1M2FlN2IyMWViYmExZQ==
+    ZDljYjFhMmUzNTYxMjc3MWU5OTdjNGQ0NTM2MTdmMWZmMDk4NGVhYw==
   data.tar.gz: !binary |-
-    Mzc0ZDdkNDYxNzMxYWFjMjRlYzM3OTJmNTYzZjNjYjRlMWYwY2E0ZA==
+    MDljMjMwZjBmOGVlMTRlOTUyZGU2NTM5ODY2NjAyMzVkNzVhNGRiZQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NDA4YzMxYTUwMGY4Mjk5NzZmNjQzYmNhMGFlOTlmMjc1MGNlYzhlZjg2ODQ0
-    NDExNWJmNGQzNWRkZmU3ZDlmY2Y1NjUxNjk2N2UwYmNkMzA3NDM0NzMwOTQ2
-    ZTY5YjAzZGVhOTMwMjRlNGVmODc2NTMwZDg0ZjQxOTI0NzUyZWI=
+    MWQ3ZjdiMGE5NzQxZWZjOWI1MTM1YzFmNmM4MTlkMTEyYWE5YTY3NGQ0ZWQ4
+    Nzk5NDA5Y2M3YmRlODRiOTNiNjZlZmIwMGE4ODIwMDk5YTlhZDdlNDc0M2Fk
+    MGQwOWUzNjM5YzJhZmJjOWQyNTFlZmRiMzUxYTVmYTkyNGNhZTU=
   data.tar.gz: !binary |-
-    MzFhNTkyOWRmOTY3NjYzYmM5NDk2NmNhZGUyYzBiNjdlMTA3ZWQyN2NjZTY3
-    NzdiNGM4M2IwYTNkOTYwNDdiY2I4MjBkNzgxZmVjNzhkMjU1NWViMTUzNTE3
-    M2Y5ZjczMzM4YWQ2YTQ4NTFiNTM5Nzg2MWUwY2RkMDI4MGEzYTU=
+    MWJjZjdiNjcwNzE0MDU1YmFlOGNhYmI0MzAyMGFhZjAyZDJlZmYzZmZmM2My
+    NzczNjc5NDc1Mzc0ODk5OTU2MzY0MWI0M2NlNDU5MzQ3NGU0ZDAyNzMxN2Jm
+    YWZkNGE5MTkwYTY4YzdmNzY1NGU4NGU4YzBhMTI4M2RkOTc5ZWY=

data/README.md

@@ -4,6 +4,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)
+[![Gem Version](https://badge.fury.io/rb/motion-objection.png)](http://badge.fury.io/rb/motion-objection)
 
 ## Install
 ```bash

data/lib/motion-objection/objection.rb

@@ -31,11 +31,23 @@ module Objection
   module ClassMethods
 
     def compose_with(*args)
-      props = args.map { |x| x.split("/").last }
-      props.each { |x| attr_accessor x }
-      @_types_mappings = {}
-      props.each_index { |i| @_types_mappings[props[i]] = args[i] }
-      @_dependencies = NSSet.setWithArray(props.map(&:to_s))
+      @_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
+          properties << prop
+        end
+      end
+      @_dependencies = NSSet.setWithArray(properties.map(&:to_s))
     end
 
     def singleton
@@ -64,11 +76,11 @@ module Objection
     end
 
     def objectionTypeMappings
-      @_types_mappings ||= {}
+      @_type_mappings ||= {}
       if self.superclass.respondsToSelector :objectionTypeMappings
-        @_types_mappings.merge self.superclass.objectionTypeMappings
+        @_type_mappings.merge self.superclass.objectionTypeMappings
       else
-        @_types_mappings
+        @_type_mappings
       end
     end
   end

data/lib/motion-objection/ruby_property_reflector.rb

@@ -2,10 +2,15 @@ class RubyPropertyReflector
   NAMESPACE_SEPARTOR = "/"
   
   def self.propertyForClass(klass, andProperty: property)
-    scopes = klass.send(:objectionTypeMappings)[property].to_s.split(NAMESPACE_SEPARTOR).map { |x| x.split("_") }.map { |x| x.map { |y| y.capitalize }.join("") }
-    klass = scopes.inject(Object) do |const, name|
-      const.const_get name
+    mapping = klass.send(:objectionTypeMappings)[property]
+    if mapping.is_a? Class
+      dependency_type = mapping
+    else
+      scopes = klass.send(:objectionTypeMappings)[property].to_s.split(NAMESPACE_SEPARTOR).map { |x| x.split("_") }.map { |x| x.map { |y| y.capitalize }.join("") }
+      dependency_type = scopes.inject(Object) do |const, name|
+        const.const_get name
+      end
     end
-    JSObjectionPropertyInfo.new(klass, JSObjectionTypeClass).value
+    JSObjectionPropertyInfo.new(dependency_type, JSObjectionTypeClass).value
   end
 end

data/lib/motion-objection/version.rb

@@ -1,3 +1,3 @@
 module Objection
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 end

data/spec/helpers/objection_classes.rb

@@ -1,6 +1,6 @@
 class Car
   include Objection
-  compose_with :engine, :brakes
+  compose_with :engine, :brakes, factory: JSObjectFactory
 end
 
 class Engine

data/spec/objection_spec.rb

@@ -23,6 +23,7 @@ describe "Objection" do
       @car = @injector.get_object Car
       @car.engine.class.should.be.same_as Engine
       @car.brakes.class.should.be.same_as Brakes
+      @car.factory.class.should.be.same_as JSObjectFactory
     end
 
     it "has support for singletons" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion-objection
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Justin DeWind