kookaburra 0.18.1 → 0.18.2

data/VERSION

@@ -1 +1 @@
-0.18.1
+0.18.2

data/kookaburra.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "kookaburra"
-  s.version = "0.18.1"
+  s.version = "0.18.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Wilger", "Sam Livingston-Gray", "Ravi Gadad"]

data/lib/kookaburra.rb

@@ -98,7 +98,9 @@ class Kookaburra
   end
 
   def application_driver
-    RackDriver.new(@rack_app)
+    unless @rack_app.nil?
+      RackDriver.new(@rack_app)
+    end
   end
 
   def test_data

data/spec/kookaburra_spec.rb

@@ -2,26 +2,47 @@ require 'kookaburra'
 
 describe Kookaburra do
   describe '#given' do
-    it 'returns an instance of the configured GivenDriver' do
-      Kookaburra::RackDriver.should_receive(:new) \
-        .with(:a_rack_app) \
-        .and_return(:a_rack_driver)
+    context 'without a :rack_app specified' do
+      it 'returns an instance of the configured GivenDriver' do
+        my_api_driver_class = mock(Class)
+        my_api_driver_class.should_receive(:new) \
+          .with(nil) \
+          .and_return(:an_api_driver)
 
-      my_api_driver_class = mock(Class)
-      my_api_driver_class.should_receive(:new) \
-        .with(:a_rack_driver) \
-        .and_return(:an_api_driver)
+        my_given_driver_class = mock(Class)
+        my_given_driver_class.should_receive(:new) do |options|
+          options[:api].should == :an_api_driver
+          :a_given_driver
+        end
 
-      my_given_driver_class = mock(Class)
-      my_given_driver_class.should_receive(:new) do |options|
-        options[:api].should == :an_api_driver
-        :a_given_driver
+        k = Kookaburra.new(:given_driver_class => my_given_driver_class,
+                           :api_driver_class => my_api_driver_class)
+        k.given.should == :a_given_driver
       end
+    end
+
+    context 'with a :rack_app specified' do
+      it 'returns an instance of the configured GivenDriver' do
+        Kookaburra::RackDriver.should_receive(:new) \
+          .with(:a_rack_app) \
+          .and_return(:a_rack_driver)
+
+        my_api_driver_class = mock(Class)
+        my_api_driver_class.should_receive(:new) \
+          .with(:a_rack_driver) \
+          .and_return(:an_api_driver)
 
-      k = Kookaburra.new(:given_driver_class => my_given_driver_class,
-                         :api_driver_class => my_api_driver_class,
-                         :rack_app => :a_rack_app)
-      k.given.should == :a_given_driver
+        my_given_driver_class = mock(Class)
+        my_given_driver_class.should_receive(:new) do |options|
+          options[:api].should == :an_api_driver
+          :a_given_driver
+        end
+
+        k = Kookaburra.new(:given_driver_class => my_given_driver_class,
+                           :api_driver_class => my_api_driver_class,
+                           :rack_app => :a_rack_app)
+        k.given.should == :a_given_driver
+      end
     end
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kookaburra
 version: !ruby/object:Gem::Version 
-  hash: 85
+  hash: 83
   prerelease: 
   segments: 
   - 0
   - 18
-  - 1
-  version: 0.18.1
+  - 2
+  version: 0.18.2
 platform: ruby
 authors: 
 - John Wilger