capybara-selenium 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8fd20b8b4b3bf89cf1437c09075e558735f7d9cd
-  data.tar.gz: c783c285c0be5d82384bff1493f84dd5bb80a37f
+  metadata.gz: 6627dce1f034a041bd712a59a9a4c04630e60bb8
+  data.tar.gz: 91f0aac5ea218266ab0f7b278906fd5101296879
 SHA512:
-  metadata.gz: 4aa5cea8f4b8583d935edb6cccc7bd8c1e695e6a2e0431b0b476cc8d10b0dd8057f1291f9977b5860eeee960013e6e7885a459ba503e3d3a3af4a7b0a75b4d7c
-  data.tar.gz: ac4c54cd17254412c733e19576db7af95518c2d05eb26debf33044adb09cc9c3d8e5c70a29aa97cbc16d3e37fbb02031e5ef8a6765f4fc00049e8c873c45992f
+  metadata.gz: 4b7bb0d3ff96a9e218049237515626243418124fdd3fc723884ca440f1c4326b173380e70309516cdb8b8063bb51bbaa6e5f2e5d897be24f871c45923764b765
+  data.tar.gz: 8282d32ef4f71af945f9bc861789aacf770b8519f9536cb7df72c2cde5dc4fe2bb2cdc7184f7d4d0f16775efd5db50dc4afec82bc230d45c363ab10fdb66c4fd

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.0.4
+
+* Complete refactoring for `CapybaraSelenium::Configurator`
+* Documentation updated
+
 ## 0.0.3
 
 * Fixed constant name `CapybaraSelenium::Configurator` instead of 

data/README.md

@@ -27,62 +27,30 @@ Or install it yourself as:
 
 ## Usage
 
-Supported applications:
+Supported application servers:
 
-- [X] Modular sinatra apps (through config.ru)
-- [ ] Rails apps
+- Modular sinatra apps (through config.ru)
 
-#### Option 1: Using a block in constructor call (Recommended)
+Supported selenium servers:
+
+- Remote selenium server
 
 ```ruby
 # features/support/continous_integration.rb
-CapybaraSelenium::Configurator.new do
-  rack_app_server.configure do |config|
-    config.host = ENV['CI_APP_SERVER_HOST'] || 'localhost'
-    config.port = ENV['CI_APP_SERVER_PORT'] || 8080
-    config.config_ru_path  = File.expand_path(
+APP_SERVER_HOST = ENV['CI_APP_SERVER_HOST'] || 'localhost'
+APP_SERVER_PORT = ENV['CI_APP_SERVER_PORT'] || 8080
+SELENIUM_SERVER_URL = ENV['CI_SELENIUM_SERVER_URL'] || 
+                      'http://127.0.0.1:4444/wd/hub'
+
+CapybaraSelenium::Configurator.new do |app_server, selenium_server|
+  app_server.host = APP_SERVER_HOST
+  app_server.port = APP_SERVER_PORT
+  app_server.config_ru_path  = File.expand_path(
       File.join(__FILE__, '../web_app/config.ru'))
-  end
-
-  remote_selenium_server.configure do |config|
-    config.server_url = ENV['CI_SELENIUM_SERVER_URL'] ||
-      'http://127.0.0.1:4444/wd/hub'
-    config.capabilities = { browser_name: browser_name }
-  end
-end.dispatch
-```
-
-#### Option 2: Using instance methods
 
-```ruby
-# features/support/continous_integration.rb
-module ContinousIntegration
-  def driver_for(browser_name)
-    @configurator = CapybaraSelenium::Configurator.new
-    configure_rack_app_server
-    configure_selenium_server(browser_name)
-    @configurator.apply
-  end
-
-  def configure_rack_app_server
-    @configurator.rack_app_server.configure do |config|
-      config.host = ENV['CI_APP_SERVER_HOST'] || 'localhost'
-      config.port = ENV['CI_APP_SERVER_PORT'] || 8080
-      config.config_ru_path  = File.expand_path(
-        File.join(__FILE__, '../web_app/config.ru'))
-    end
-  end
-
-  def configure_selenium_server(browser_name)
-    @configurator.remote_selenium_server.configure do |config|
-      config.server_url = ENV['CI_SELENIUM_SERVER_URL'] ||
-        'http://127.0.0.1:4444/wd/hub'
-      config.capabilities = { browser_name: browser_name }
-    end
-  end
-end
-
-World(ContinousIntegration)
+  selenium_server.server_url = SELENIUM_SERVER_URL
+  selenium_server.capabilities = { browser_name: browser_name }
+end.configure
 ```
 
 ## Contributing

data/lib/capybara_selenium.rb

@@ -14,33 +14,42 @@ module CapybaraSelenium
   class Configurator
     include AppServer
     include SeleniumServer
-    attr_reader :driver
-
-    def initialize(&block)
-      define_singleton_method(:dispatch, block) if block_given?
+    attr_reader :driver, :app_server, :selenium_server
+
+    # @param [Hash] opts The options for configuring servers
+    # @option opts [String] :app_server The application server type. Default
+    #   :rack
+    # @option opts [String] :selenium_server The selenium server type. Default
+    #   :remote
+    def initialize(opts = {}, &block)
+      @app_server = configurator :app_server, app_server_type(opts)
+      @selenium_server = configurator :selenium_server, selenium_server_type(opts)
+      define_singleton_method :configure do
+        block.call(app_server, selenium_server)
+        app_server.apply
+        selenium_server.apply
+      end
     end
 
-    def apply
-      @app_server.apply
-      @driver = @selenium_server.apply
-    end
+    private
 
-    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
+    # @param [Hash] opts The options for app server
+    # @option opts [Symbol] :app_server The app server type
+    # @return [String] The application server type
+    def app_server_type(opts)
+      opts[:app_server] || :rack
     end
 
-    private
+    # @param [Hash] opts The options for selenium server
+    # @option opts [Symbol] :selenium_server The selenium server type
+    # @return [String] The selenium server type
+    def selenium_server_type(opts)
+      opts[:selenium_server] || :remote
+    end
 
     def configurator(server_type, configurator_type, &block)
-      klass = self.class
-      server_module = klass.classify(server_type)
-      configurator_klass = klass.classify(configurator_type)
+      server_module = server_type.to_s.classify
+      configurator_klass = configurator_type.to_s.classify
       "CapybaraSelenium::#{server_module}::#{configurator_klass}Configurator"
         .constantize.new(configuration(server_module, configurator_klass))
     end
@@ -49,9 +58,5 @@ module CapybaraSelenium
       "CapybaraSelenium::#{server_module}::#{klass}Configuration"
         .constantize.new
     end
-
-    def self.classify(type)
-      ActiveSupport::Inflector.classify(type)
-    end
   end
 end

data/lib/capybara_selenium/server/configurator.rb

@@ -1,29 +1,34 @@
 module CapybaraSelenium
   module Server
     class Configurator
-      def initialize(configuration)
-        @configuration = configuration
+      attr_accessor :config
+
+      def initialize(config)
+        @config = config
       end
 
       def configure(&block)
-        @configuration = create_configuration
-        block.call @configuration
+        @config = create_config
+        block.call @config
       end
 
-      def method_missing(method)
-        if @configuration.respond_to? method
-          return @configuration.send(method)
+      def method_missing(method, *args, &_)
+        if @config.respond_to? method
+          if method =~ /(.*)=/
+            return @config.send method, args.first
+          else
+            return @config.send method
+          end
         else
-          raise
+          fail
         end
       end
 
       private
 
-      def create_configuration
+      def create_config
         *modules, klass = self.class.to_s.split('::')
-        "#{modules.join('::')}::#{type_of(klass)}Configuration"
-          .constantize.new
+        "#{modules.join('::')}::#{type_of klass}Configuration".constantize.new
       end
 
       def type_of(klass)

data/lib/capybara_selenium/version.rb

@@ -1,3 +1,3 @@
 module CapybaraSelenium
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara-selenium
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - David Saenz Tagarro