capybara-selenium 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27ac12b559b08c9451fbcfcf35c270ca9f082672
-  data.tar.gz: 7a4d7119f936ee926a6ce89cd66c824da4b82f10
+  metadata.gz: 54318fe730391294e0641cf2de1d6380bd689b3d
+  data.tar.gz: dbdc0c6fa4ab296352d8406e7665914f816aa5cc
 SHA512:
-  metadata.gz: 48e2b5fddebb1b124e2f1df4570bc5fcd96d375c5614752b2e923b412f091a14d90ef52aad249f0a030cc66eb68477d1967e2361b65cfdb52a36f99cc6de8e66
-  data.tar.gz: 52e661a585a9f2ff926002791001f6f37206ceccba91e6f61df41b424c7b625e64e8dcfd5de4dd1984c8f0e640f6cf67e769bb39f49273dddd46007611e7e3f5
+  metadata.gz: 0029c1a01b9c432722c914dbf261ec60ee879974498704aad105a824ef4f9268f6f6832f456189b49b03d61ff65f03ab3024d8d130ff2fa02d05a33b71267091
+  data.tar.gz: 15d2051feff5361f02624814c378d4577027252bf54e7aeb39d1f18f73872aa79bcd0480d7da96c07e5736c4e1600781b3f2e9e944e60fad2de0f861155054b0

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.0.6
+
+* Syntax improvements for `CapybaraSelenium::SeleniumServer::RemoteConfigurator`
+* Refactoring `configure` method call
+* Documentation updated
+
 ## 0.0.5
 
 * Fixed capabilities for selenium remote server

data/README.md

@@ -42,15 +42,15 @@ 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(
+CapybaraSelenium.configure(:rack, :remote) do |config|
+  config.app_server.host = APP_SERVER_HOST
+  config.app_server.port = APP_SERVER_PORT
+  config.app_server.config_ru_path = File.expand_path(
       File.join(__FILE__, '../web_app/config.ru'))
 
-  selenium_server.server_url = SELENIUM_SERVER_URL
-  selenium_server.capabilities = { browser_name: browser_name }
-end.configure
+  config.selenium_server.url = SELENIUM_SERVER_URL
+  config.selenium_server.capabilities = { browser_name: browser_name }
+end
 ```
 
 ## Contributing

data/lib/capybara_selenium.rb

@@ -11,42 +11,25 @@ require 'active_support/inflector'
 module CapybaraSelenium
   # Class for configuring capybara and selenium in order to instance the
   # desired driver.
-  class Configurator
+  class << self
     include AppServer
     include SeleniumServer
     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
+    # @param app_server_type [Symbol] The application server type.
+    #   Default: :rack
+    # @param selenium_server_type [Symbol The selenium server type.
+    #   Default: :remote
+    def configure(app_server_type = :rack, selenium_server_type = :remote)
+      @app_server = configurator :app_server, app_server_type
+      @selenium_server = configurator :selenium_server, selenium_server_type
+      yield self
+      app_server.apply
+      selenium_server.apply
     end
 
     private
 
-    # @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
-
-    # @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)
       server_module = server_type.to_s.classify
       configurator_klass = configurator_type.to_s.classify

data/lib/capybara_selenium/selenium_server/configurator.rb

@@ -1,11 +1,6 @@
 module CapybaraSelenium
   module SeleniumServer
     class BaseConfigurator < Server::Configurator
-      private
-
-      def caps(key)
-        capabilities[key]
-      end
     end
 
     class RemoteConfigurator < BaseConfigurator
@@ -22,14 +17,17 @@ module CapybaraSelenium
       end
 
       def driver_name
-        "#{caps(:browser_name)}_#{caps(:version)}_#{caps(:platform)}"
+        browser_name = capabilities[:browser_name]
+        version = capabilities[:version]
+        platform = capabilities[:platform]
+        "#{browser_name}_#{version}_#{platform}"
       end
 
       # @return [Hash] The desired capabilities for the browser
       def desired_capabilities
-        return @desired_capabilities if @desired_capabilities
-        @desired_capabilities = Selenium::WebDriver::Remote::Capabilities
-                                .send(caps(:browser_name), capabilities)
+        caps = Selenium::WebDriver::Remote::Capabilities.new
+        capabilities.keys.each { |key| caps[key] = capabilities[key] }
+        caps
       end
     end
   end

data/lib/capybara_selenium/version.rb

@@ -1,3 +1,3 @@
 module CapybaraSelenium
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

metadata

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