unobtainium 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62f55e229f2458af4e265380afd8e407135e2f6e
-  data.tar.gz: 84c5321fff693ec7eedddc59f74bbe829303f383
+  metadata.gz: 234ce137a967d3cbf7343bc5dce74f6a3a606339
+  data.tar.gz: 4bd93c4402adf6a379f1037b70958941018e805f
 SHA512:
-  metadata.gz: 070ff928ed2373b5f26bcb9d4c596d6d7ced6443d0028feeaba897a1cb66accec60b8612204245ef9c76dc00213bab8c0c9ea0562483d286d7d3524926536781
-  data.tar.gz: 2c8b4a547d1cc410d60f0d0d86c214720097f1da2ea7a4d1717d7b1645615be12add8ccfac7eac53f1e091e4c8ef32ef28b8672f1366d7db87ebffad32acf4a5
+  metadata.gz: 7899a9aefc8410150b42f930d8a770fff850883284026551b25edd9e30bdf152117b5510e88e192b2e21b097346e5cc8e773ee2bdbe945bf5a72a4641032e683
+  data.tar.gz: f718847acf4c4600caa0f5a7b37dd76c0e5cf468b3d1993582aae3bdfbb2092d4fcc94ece7942c6e906029dbc0cf825a6dc491438981b68c140634be9a3c4846

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    unobtainium (0.2.0)
+    unobtainium (0.2.1)
 
 GEM
   remote: https://rubygems.org/

data/lib/unobtainium/drivers/appium.rb

@@ -6,6 +6,9 @@
 # Copyright (c) 2016 Jens Finkhaeuser and other unobtainium contributors.
 # All rights reserved.
 #
+
+require_relative './support/util'
+
 module Unobtainium
   module Drivers
 
@@ -31,6 +34,8 @@ module Unobtainium
       }.freeze
 
       class << self
+        include ::Unobtainium::Drivers::Utility
+
         ##
         # Return true if the given label matches this driver implementation,
         # false otherwise.
@@ -84,17 +89,6 @@ module Unobtainium
 
         private
 
-        ##
-        # For a recognized label alias, returns a normalized label.
-        def normalize_label(label)
-          LABELS.each do |normalized, aliases|
-            if label == normalized or aliases.include?(label)
-              return normalized
-            end
-          end
-          return nil
-        end
-
         ##
         # If the driver options include a request for a browser, we can
         # supplement some missing specs in the options.

data/lib/unobtainium/drivers/selenium.rb

@@ -6,6 +6,9 @@
 # Copyright (c) 2016 Jens Finkhaeuser and other unobtainium contributors.
 # All rights reserved.
 #
+
+require_relative './support/util'
+
 module Unobtainium
   module Drivers
 
@@ -23,6 +26,8 @@ module Unobtainium
       }.freeze
 
       class << self
+        include ::Unobtainium::Drivers::Utility
+
         ##
         # Return true if the given label matches this driver implementation,
         # false otherwise.
@@ -62,19 +67,6 @@ module Unobtainium
           driver = ::Selenium::WebDriver.for(normalize_label(label), options)
           return driver
         end
-
-        private
-
-        ##
-        # For a recognized label alias, returns a normalized label.
-        def normalize_label(label)
-          LABELS.each do |normalized, aliases|
-            if label == normalized or aliases.include?(label)
-              return normalized
-            end
-          end
-          return nil
-        end
       end # class << self
     end # class Selenium
 

data/lib/unobtainium/drivers/support/util.rb

@@ -0,0 +1,36 @@
+# coding: utf-8
+#
+# unobtainium
+# https://github.com/jfinkhaeuser/unobtainium
+#
+# Copyright (c) 2016 Jens Finkhaeuser and other unobtainium contributors.
+# All rights reserved.
+#
+module Unobtainium
+  module Drivers
+    ##
+    # Utility code shared by driver implementations
+    module Utility
+      ##
+      # For a recognized label alias, returns a normalized label. Requires
+      # the enclosing class to provide a LABELS connstant that is a hash
+      # where keys are the normalized label, and the value is an array of
+      # aliases:
+      #
+      #   LABELS = {
+      #     foo: [:alias1, :alias2],
+      #     bar: [],
+      #   }.freeze
+      #
+      # Empty aliases means that there are no aliases for this label.
+      def normalize_label(label)
+        self::LABELS.each do |normalized, aliases|
+          if label == normalized or aliases.include?(label)
+            return normalized
+          end
+        end
+        return nil
+      end
+    end # module Utility
+  end # module Drivers
+end # module Unobtainium

data/lib/unobtainium/version.rb

@@ -7,5 +7,5 @@
 # All rights reserved.
 #
 module Unobtainium
-  VERSION = "0.2.0".freeze
+  VERSION = "0.2.1".freeze
 end

data/lib/unobtainium/world.rb

@@ -57,6 +57,12 @@ module Unobtainium
       # we need to use.
       if not options.nil? and not options["base"].nil?
         label = options["base"]
+
+        # Unfortunately, the "base" key may not be recognized by the drivers,
+        # which could lead to errors down the road. Let's remove it; it's reserved
+        # by the Config class, so drivers can't use it anyhow.
+        options = options.dup
+        options.delete("base")
       end
 
       # The driver may modify the options; if so, we should let it do that

data/spec/config_spec.rb

@@ -105,4 +105,15 @@ describe ::Unobtainium::Config do
     expect(cfg["drivers.branch2.base"]).to eql 'mock'
     expect(cfg["drivers.leaf.base"]).to eql 'mock'
   end
+
+  it "extends configuration hashes when the base does not exist" do
+    config = File.join(@data_path, 'driverconfig.yml')
+    cfg = ::Unobtainium::Config.load_config(config)
+
+    # Ensure the hash contains its own value
+    expect(cfg["drivers.base_does_not_exist.some"]).to eql "value"
+
+    # Also ensure the "base" is set properly
+    expect(cfg["drivers.base_does_not_exist.base"]).to eql "nonexistent_base"
+  end
 end

data/spec/data/driverconfig.yml

@@ -20,4 +20,7 @@ drivers:
     extends: branch2
     leafoption: baz
     branch1option: override
+  base_does_not_exist:
+    extends: nonexistent_base
+    some: value
 driver: leaf

data/spec/world_spec.rb

@@ -31,7 +31,8 @@ describe ::Unobtainium::World do
     expect(@tester.driver.passed_options["mockoption"]).to eql 42
   end
 
-  it "extends driver options" do
-    expect(@tester.driver.passed_options["base"]).to eql "mock"
+  it "extends driver options, but doesn't pass 'base' on" do
+    expect(@tester.config["drivers.leaf.base"]).to eql "mock"
+    expect(@tester.driver.passed_options["base"]).to be_nil
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: unobtainium
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Jens Finkhaeuser
@@ -112,6 +112,7 @@ files:
 - lib/unobtainium/driver.rb
 - lib/unobtainium/drivers/appium.rb
 - lib/unobtainium/drivers/selenium.rb
+- lib/unobtainium/drivers/support/util.rb
 - lib/unobtainium/pathed_hash.rb
 - lib/unobtainium/recursive_merge.rb
 - lib/unobtainium/runtime.rb