Merge branch 'pull91' into develop

Author: tsuckow

src/main/scala/net/codingwell/scalaguice/InjectorExtensions.scala

@@ -15,7 +15,7 @@
  */
 package net.codingwell.scalaguice
 
-import com.google.inject.{Binding, Key, Injector}
+import com.google.inject.{Binding, Injector, Key, Provider}
 import java.lang.annotation.Annotation
 import KeyExtensions._
 import scala.reflect.ClassTag
@@ -32,5 +32,9 @@ object InjectorExtensions {
  def existingBinding[T: TypeTag](ann: Annotation): Option[Binding[T]] = existingBinding(typeLiteral[T].annotatedWith(ann))
  def existingBinding[T: TypeTag, Ann <: Annotation : ClassTag]: Option[Binding[T]] = existingBinding(typeLiteral[T].annotatedWith[Ann])
  def existingBinding[T](key: Key[T]): Option[Binding[T]] = Option(self.getExistingBinding(key))
+
+ def provider[T: TypeTag]: Provider[T] = self.getProvider(typeLiteral[T].toKey)
+ def provider[T: TypeTag](ann: Annotation): Provider[T] = self.getProvider(typeLiteral[T].annotatedWith(ann))
+ def provider[T: TypeTag, Ann <: Annotation : ClassTag]: Provider[T] = self.getProvider(typeLiteral[T].annotatedWith[Ann])
  }
 }

src/test/scala/net/codingwell/scalaguice/InjectorExtensionsSpec.scala

@@ -48,11 +48,11 @@ class InjectorExtensionsSpec extends WordSpec with Matchers {
  inst.get should equal("String")
  }
 
- "allow instance to be retreived using a type parameter and an annotation" in {
+ "allow instance to be retrieved using a type parameter and an annotation" in {
  injector.instance[A](named("d"))
  }
 
- "allow instance to be retreived using a type parameter and an annotation class" in {
+ "allow instance to be retrieved using a type parameter and an annotation class" in {
  injector.instance[B, Named]
  }
 
@@ -95,5 +95,22 @@ class InjectorExtensionsSpec extends WordSpec with Matchers {
  "allow missing bindings to be retrieved by key optionally" in {
  injector.existingBinding[A](keyMissingFn[A]) should not be defined
  }
+
+ "allow provider to be retrieved using a type parameter" in {
+ injector.provider[A]
+ }
+
+ "allow generic provider to be retrieved using a type parameter" in {
+ val inst = injector.provider[Gen[String]]
+ inst.get.get should equal("String")
+ }
+
+ "allow provider to be retrieved using a type parameter and an annotation" in {
+ injector.provider[A](named("d"))
+ }
+
+ "allow provider to be retrieved using a type parameter and an annotation class" in {
+ injector.provider[B, Named]
+ }
  }
 }