kookaburra 0.26.0 → 0.26.1

data/VERSION

@@ -1 +1 @@
-0.26.0
+0.26.1

data/kookaburra.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "kookaburra"
-  s.version = "0.26.0"
+  s.version = "0.26.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Wilger", "Sam Livingston-Gray", "Ravi Gadad"]
-  s.date = "2012-07-27"
+  s.date = "2012-07-28"
   s.description = "Cucumber + Capybara = Kookaburra? It made sense at the time."
   s.email = "johnwilger@gmail.com"
   s.extra_rdoc_files = [
@@ -41,6 +41,7 @@ Gem::Specification.new do |s|
     "lib/kookaburra/test_helpers.rb",
     "lib/kookaburra/ui_driver.rb",
     "lib/kookaburra/ui_driver/has_ui_components.rb",
+    "lib/kookaburra/ui_driver/scoped_browser.rb",
     "lib/kookaburra/ui_driver/ui_component.rb",
     "lib/kookaburra/ui_driver/ui_component/address_bar.rb",
     "spec/integration/test_a_rack_application_spec.rb",
@@ -50,6 +51,7 @@ Gem::Specification.new do |s|
     "spec/kookaburra/mental_model_matcher_spec.rb",
     "spec/kookaburra/mental_model_spec.rb",
     "spec/kookaburra/test_helpers_spec.rb",
+    "spec/kookaburra/ui_driver/scoped_browser_spec.rb",
     "spec/kookaburra/ui_driver/ui_component/address_bar_spec.rb",
     "spec/kookaburra/ui_driver/ui_component_spec.rb",
     "spec/kookaburra/ui_driver_spec.rb",

data/lib/kookaburra/mental_model.rb

@@ -73,8 +73,8 @@ class Kookaburra
       #
       # @note This is semantically the same as `Hash#slice` as provided
       #   by `ActiveSupport::CoreExt::Hash`
-      # @param [Object] *keys The keys that should be copied from the
-      #   collection
+      # @param [Object] keys The list of keys that should be copied from
+      #   the collection
       # @return [Hash] The resulting keys/values from the collection
       def slice(*keys)
         data = keys.inject({}) { |memo, key|
@@ -88,8 +88,8 @@ class Kookaburra
       #
       # @note This is semantically the same as `Hash#except` as provided
       #   by `ActiveSupport::CoreExt::Hash`
-      # @param [Object] *keys The keys that should *not* be copied from
-      #   the collection
+      # @param [Object] keys The list of keys that should *not* be
+      #   copied from the collection
       # @return [Hash] The resulting keys/values from the collection
       def except(*keys)
         slice(*(self.keys - keys))

data/lib/kookaburra/ui_driver/scoped_browser.rb

@@ -0,0 +1,34 @@
+class Kookaburra
+  class UIDriver
+    # Wraps a Kookaburra `browser` object and changes all method calls
+    # to that object so that they are scoped within the specified
+    # `component_locator`.
+    class ScopedBrowser < BasicObject
+
+      # @param [Object] browser The browser driver object used by
+      #   Kookaburra to drive the browser session
+      # @param [Proc] component_locator A Proc that will return the CSS
+      #   locator used to identify the HTML element within which all
+      #   calls to this object should be scoped. (A Proc is used rather
+      #   than a string, because it is possible that the object creating
+      #   this `ScopedBrowser` will not know the correct string at the
+      #   time this object is created.)
+      def initialize(browser, component_locator)
+        @browser = browser
+        @component_locator = component_locator
+      end
+
+      private
+
+      def component_locator
+        @component_locator.call
+      end
+
+      def method_missing(name, *args, &blk)
+        @browser.within(component_locator) do
+          @browser.send(name, *args, &blk)
+        end
+      end
+    end
+  end
+end

data/lib/kookaburra/ui_driver/ui_component.rb

@@ -1,6 +1,8 @@
+require 'delegate'
 require 'kookaburra/exceptions'
 require 'kookaburra/assertion'
 require 'kookaburra/ui_driver/has_ui_components'
+require 'kookaburra/ui_driver/scoped_browser'
 
 class Kookaburra
   class UIDriver
@@ -59,14 +61,13 @@ class Kookaburra
     #   end
     #
     # Note that the "browser operation" methods such as `#fill_in` and
-    # `#click_button` are forwarded to the {#browser} object (see
-    # {#method_missing}) and are automatically scoped to the component's DOM
-    # element.    
+    # `#click_button` are delegated to a {ScopedBrowser} and are
+    # automatically scoped to the component's DOM element.    
     #
     # @abstract Subclass and implement (at least) {#component_locator}. Unless
     #   you override the default implementation of {#url}, you must also
     #   override the {#component_path} method.
-    class UIComponent
+    class UIComponent < SimpleDelegator
       include Assertion
       extend HasUIComponents
 
@@ -92,28 +93,8 @@ class Kookaburra
         @browser = configuration.browser
         @app_host = configuration.app_host
         @server_error_detection = configuration.server_error_detection
-      end
-
-      # If the UIComponent is sent a message it does not understand, it will
-      # forward that message on to its {#browser} but wrap the call in a block
-      # provided to the the browser's `#within` method. This provides convenient
-      # access to the browser driver's DSL, automatically scoped to this
-      # component.
-      def method_missing(name, *args, &block)
-        if respond_to?(name)
-          browser.within(component_locator) do
-            browser.send(name, *args, &block)
-          end
-        else
-          super
-        end
-      end
-
-      # @private
-      # (Not really private, but YARD seemingly lacks RDoc's :nodoc tag, and the
-      # semantics here don't differ from Object#respond_to?)
-      def respond_to?(name)
-        super || browser.respond_to?(name)
+        scoped_browser = ScopedBrowser.new(@browser, lambda { component_locator })
+        super(scoped_browser)
       end
 
       # Is the component's element found on the page and is it considered

data/spec/kookaburra/ui_driver/scoped_browser_spec.rb

@@ -0,0 +1,11 @@
+require 'kookaburra/ui_driver/scoped_browser'
+
+describe Kookaburra::UIDriver::ScopedBrowser do
+  it 'forwards all method calls to the browser but scopes them to the component locator' do
+    browser = mock('Browser')
+    browser.should_receive(:within).with('#a_component_locator').and_yield
+    browser.should_receive(:some_other_method).with(:foo)
+    subject = Kookaburra::UIDriver::ScopedBrowser.new(browser, lambda { '#a_component_locator' })
+    subject.some_other_method(:foo)
+  end
+end

data/spec/kookaburra/ui_driver/ui_component_spec.rb

@@ -8,58 +8,6 @@ describe Kookaburra::UIDriver::UIComponent do
 
   it_behaves_like :it_can_have_ui_components, Kookaburra::UIDriver::UIComponent
 
-  describe '#respond_to?' do
-    let(:component) do
-      klass = Class.new(Kookaburra::UIDriver::UIComponent) do
-        def foo
-        end
-      end
-      klass.new(configuration)
-    end
-
-    it 'returns true if the UIComponent defines the specified method' do
-      component.respond_to?(:foo).should == true
-    end
-
-    it 'returns true if the #browser defines the specified method' do
-      browser = stub('Browser Driver', :respond_to? => true)
-      component.stub!(:browser => browser)
-      component.respond_to?(:a_very_unlikely_method_name).should == true
-    end
-
-    it 'returns false if neither the UIComponent nor the #browser define the specified method' do
-      browser = stub('Browser Driver', :respond_to? => false)
-      component.stub!(:browser => browser)
-      component.respond_to?(:a_very_unlikely_method_name).should == false
-    end
-  end
-
-  describe '#method_missing' do
-    context 'the component says it responds to the method' do
-      it 'scopes the method call within the component_locator and forwards to #browser' do
-        browser = mock('Browser Driver')
-        browser.should_receive(:some_browser_method) \
-          .with(:arguments) \
-          .and_return(:answer_from_browser)
-        browser.should_receive(:within) do |scope, &block|
-          scope.should == '#my_component'
-          block.call(browser)
-        end
-        configuration.stub!(:browser => browser)
-        component.stub!(:component_locator => '#my_component')
-        component.some_browser_method(:arguments).should == :answer_from_browser
-      end
-    end
-
-    context 'the component says it does not respond to the method' do
-      it 'raises a NoMethodError' do
-        component.stub!(:respond_to? => false)
-        lambda { component.no_such_method } \
-          .should raise_error(NoMethodError)
-      end
-    end
-  end
-
   describe '#visible?' do
     it 'returns true if the component_locator is found in the DOM and is visible' do
       browser = mock('Browser Driver')
@@ -67,7 +15,9 @@ describe Kookaburra::UIDriver::UIComponent do
         .with('#my_component', :visible) \
         .and_return(true)
       configuration.stub!(:browser => browser)
-      component.stub!(:component_locator => '#my_component')
+      def component.component_locator
+        '#my_component'
+      end
       component.visible?.should == true
     end
 
@@ -78,7 +28,9 @@ describe Kookaburra::UIDriver::UIComponent do
         false
       }
       configuration.stub!(:server_error_detection => server_error_detection)
-      component.stub!(:component_locator => '#my_component')
+      def component.component_locator
+        '#my_component'
+      end
       component.visible?.should == false
     end
 
@@ -89,8 +41,9 @@ describe Kookaburra::UIDriver::UIComponent do
         true
       }
       configuration.stub!(:server_error_detection => server_error_detection)
-      component.stub!(:component_locator => '#my_component')
-      component.stub!(:component_locator => '#my_component')
+      def component.component_locator
+        '#my_component'
+      end
       lambda { component.visible? } \
         .should raise_error(Kookaburra::UnexpectedResponse)
     end
@@ -99,7 +52,9 @@ describe Kookaburra::UIDriver::UIComponent do
   describe '#url' do
     it 'returns the app_host + #component_path' do
       configuration.stub!(:app_host => 'http://my.example.com')
-      component.stub!(:component_path => '/foo/bar')
+      def component.component_path
+        '/foo/bar'
+      end
       component.url.should == 'http://my.example.com/foo/bar'
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kookaburra
 version: !ruby/object:Gem::Version
-  version: 0.26.0
+  version: 0.26.1
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-27 00:00:00.000000000 Z
+date: 2012-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: patron
@@ -205,6 +205,7 @@ files:
 - lib/kookaburra/test_helpers.rb
 - lib/kookaburra/ui_driver.rb
 - lib/kookaburra/ui_driver/has_ui_components.rb
+- lib/kookaburra/ui_driver/scoped_browser.rb
 - lib/kookaburra/ui_driver/ui_component.rb
 - lib/kookaburra/ui_driver/ui_component/address_bar.rb
 - spec/integration/test_a_rack_application_spec.rb
@@ -214,6 +215,7 @@ files:
 - spec/kookaburra/mental_model_matcher_spec.rb
 - spec/kookaburra/mental_model_spec.rb
 - spec/kookaburra/test_helpers_spec.rb
+- spec/kookaburra/ui_driver/scoped_browser_spec.rb
 - spec/kookaburra/ui_driver/ui_component/address_bar_spec.rb
 - spec/kookaburra/ui_driver/ui_component_spec.rb
 - spec/kookaburra/ui_driver_spec.rb
@@ -236,7 +238,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -40301256200075417
+      hash: -3509025074302937225
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: