lib/capybara_selenium.rb in capybara-selenium-0.0.1 vs lib/capybara_selenium.rb in capybara-selenium-0.0.2

@@ -1,39 +1,57 @@
-require 'capybara_selenium/version'
-require 'capybara_selenium/app_server'
-require 'capybara_selenium/selenium_server'
+require_relative 'capybara_selenium/version'
+require_relative 'capybara_selenium/server/configurator'
+require_relative 'capybara_selenium/app_server/configurator'
+require_relative 'capybara_selenium/app_server/configuration'
+require_relative 'capybara_selenium/selenium_server/configurator'
+require_relative 'capybara_selenium/selenium_server/configuration'
 
 require 'active_support/inflector'
 
 # Helpers for initializing selenium drivers
 module CapybaraSelenium
   # Class for configuring capybara and selenium in order to instance the
   # desired driver.
-  class GlobalConfigurator
+  class Configurator
     include AppServer
     include SeleniumServer
+    attr_reader :driver
 
-    def initialize(opts = {})
-      check_options(opts)
-      @app_server = configurator_for :app_server, opts
-      @selenium_server = configurator_for :selenium_server, opts
+    def initialize(&block)
+      define_singleton_method(:dispatch, block) if block_given?
     end
 
-    def driver
+    def apply
       @app_server.apply
-      @selenium_server.apply
+      @driver = @selenium_server.apply
     end
 
+    def method_missing(method, *args, &block)
+      if method =~ /(.*)_app_server/
+        @app_server ||= configurator :app_server, $1
+      elsif method =~ /(.*)_selenium_server/
+        @selenium_server ||= configurator :selenium_server, $1
+      else
+        raise
+      end
+    end
+
     private
 
-    def check_options(opts)
-      fail 'App Server config missing' unless opts[:app_server]
-      fail 'Selenium Server config missing' unless opts[:selenium_server]
+    def configurator(server_type, configurator_type, &block)
+      klass = self.class
+      server_module = klass.classify(server_type)
+      configurator_klass = klass.classify(configurator_type)
+      "CapybaraSelenium::#{server_module}::#{configurator_klass}Configurator"
+        .constantize.new(configuration(server_module, configurator_klass))
     end
 
-    def configurator_for(*args)
-      configurator_type = args.shift
-      opts = args.first[configurator_type]
-      send "#{configurator_type}_configurator", opts
+    def configuration(server_module, klass)
+      "CapybaraSelenium::#{server_module}::#{klass}Configuration"
+        .constantize.new
+    end
+
+    def self.classify(type)
+      ActiveSupport::Inflector.classify(type)
     end
   end
 end