watirsome 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5fa8e7d26089505c8a179c6f73902bd3dd7db057
-  data.tar.gz: 90136197a30af82840ff96b2732dfc7b067ec4bb
+  metadata.gz: 1e39235eeb56b45caf40f4bc865c68b057693b8b
+  data.tar.gz: 3f927cee87c1102d922343cde661d0489c395aa2
 SHA512:
-  metadata.gz: ad061961a128224953286fef6302d4da1d537312fcc528c93466c300696a23652673508380c1b451e07db4adb448e9def4b1fbcd514de0d17cf723351b7be607
-  data.tar.gz: c77dd3c4fdae2a45e30a6a8f285c8b13c06f7c4689e543367726f022c9436720fc3b2ff3a383f3f144bf07da59cd682e76cbaf6e9f0453a5a0d59c23606068ce
+  metadata.gz: 8da3589cb73b360546f9671ce16be55d7ee5ae0aaf21830d35936cacb85bbf92d02f9dc88d6a176ac535e920f3e92c5df1a1df4f714ffe2df2a6e9f1447cebee
+  data.tar.gz: 0ffe8c1fad560e53cc457533c72ae9bb684d8a9fea599f105367fa16226b15e03ec19a0a1269150a18207f39374c8a43370832774a3e2a64e9336ec05ade30e9

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+### v0.2.2
+
+* Nothing new, just improvements in codebase
+
+### v0.2.1
+
+* Delegate `:visible` selector to Watir 6 which supports it natively
+
 ### v0.2.0
 
 * Update watirsome for Watir 6

data/lib/watirsome.rb

@@ -55,12 +55,12 @@
 #   page.agree = true
 #   page.agree #=> true
 #
-# @example Locators
+# @example Custom Locators
 #   class Page
 #     include Watirsome
 #
-#     div :visible, class: 'visible', visible: true
-#     div :invisible, class: 'visible', visible: false
+#     div :visible, class: 'visibility', visible: true
+#     div :invisible, class: 'visibility', visible: false
 #     select_list :country, selected: 'USA'
 #   end
 #

data/lib/watirsome/accessors.rb

@@ -154,28 +154,25 @@ module Watirsome
       #
       # @param [Symbol, String] method
       # @param [Array] args
-      # @return Two arrays: Watir locators and custom locators
+      # @return [Array<Hash>] two hashes: watir locators and custom locators
       # @api private
       #
       def extract_custom_args(method, *args)
         identifier = args.shift
-        watir_args = []
-        custom_args = []
+        watir_args = {}
+        custom_args = {}
+
         identifier.each_with_index do |hashes, index|
-          watir_arg = {}
-          custom_arg = {}
-          if hashes && !hashes.is_a?(Proc)
-            hashes.each do |k, v|
-              element_methods = Watir.element_class_for(method).instance_methods
-              if element_methods.include?(:"#{k}?") && !SKIP_CUSTOM_SELECTORS.include?(k)
-                custom_arg[k] = identifier[index][k]
-              else
-                watir_arg[k] = v
-              end
+          next if hashes.nil? || hashes.is_a?(Proc)
+
+          hashes.each do |k, v|
+            element_methods = Watir.element_class_for(method).instance_methods
+            if element_methods.include?(:"#{k}?") && !SKIP_CUSTOM_SELECTORS.include?(k)
+              custom_args[k] = identifier[index][k]
+            else
+              watir_args[k] = v
             end
           end
-          watir_args  << watir_arg  unless watir_arg.empty?
-          custom_args << custom_arg unless custom_arg.empty?
         end
 
         [watir_args, custom_args]
@@ -189,18 +186,18 @@ module Watirsome
       # Calls Watir browser instance to find element.
       #
       # @param [Symbol] method Watir method
-      # @param [Array] watir_args Watir locators
-      # @param [Array] custom_args Custom locators
+      # @param [Hash] watir_args Watir locators
+      # @param [Hash] custom_args Custom locators
       # @api private
       #
       def grab_elements(method, watir_args, custom_args)
         if custom_args.empty?
-          @browser.__send__(method, *watir_args)
+          @browser.__send__(method, watir_args)
         else
           plural = Watirsome.plural?(method)
           method = Watirsome.pluralize(method) unless plural
-          elements = @browser.__send__(method, *watir_args)
-          custom_args.first.each do |k, v|
+          elements = @browser.__send__(method, watir_args)
+          custom_args.each do |k, v|
             elements.to_a.select! do |e|
               if e.public_method(:"#{k}?").arity.zero?
                 e.__send__(:"#{k}?") == v

data/lib/watirsome/version.rb

@@ -1,3 +1,3 @@
 module Watirsome
-  VERSION = '0.2.1'.freeze
+  VERSION = '0.2.2'.freeze
 end # Watirsome

data/support/doctest.html

@@ -13,8 +13,8 @@
       <input type="radio" name="sex" value="Female">
     </div>
     <div>
-      <div class="visible">Visible</div>
-      <div class="visible" style="display: none">Invisible</div>
+      <div class="visibility">Visible</div>
+      <div class="visibility" style="display: none">Invisible</div>
     </div>
   </body>
 </html>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: watirsome
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Alex Rodionov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-14 00:00:00.000000000 Z
+date: 2017-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: watir
@@ -112,4 +112,3 @@ signing_key:
 specification_version: 4
 summary: Awesome page objects with Watir
 test_files: []
-has_rdoc: