watigiri 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2fd0e4b0bff75232878fbfa396d89e6d8c6bafbc
-  data.tar.gz: 06ee3c3acf02723a8de7aca0b02e8f84422b56f5
+  metadata.gz: 9ab5b03da6791a3ea140287be1c54da77467dc2a
+  data.tar.gz: 3a97f2c0b646ceec77ee95a228b9e5211906fe77
 SHA512:
-  metadata.gz: 8f919b5c53a445536ef18177c5609bce92995072a32048268c82763f262aa25916184e4c9fc07ce1a5d800001cd5b4090a2347f4fabd4208915e266c5df821c1
-  data.tar.gz: 5dd9eb0bf66df384af9ff4430bc26e0e32e87b2ca07c372ad969b2d831fab0b2b92e7f071482dfe98a6113ed1d62bed1bb5c0b0fdddaba5a5d56e65400e3ceea
+  metadata.gz: fd78179291c518fe0f759d1df7d350cccdce98ce3e7e480e31c4c5cbebb961ec8901a4a9126438568d900aa1876e7b04eb0c44e3af497840f9305066dbc4cd0f
+  data.tar.gz: d9b0c1f1ff1d3edef4fd625c073648c7d8fe1612355d7d50299c4f0d0d43a9802f70ece28c6ae585f202a15215789bbe4bbb9146eb0831d76cc777b47c1840c1

data/.rubocop.yml

@@ -0,0 +1,39 @@
+AllCops:
+  TargetRubyVersion: 2.3.7
+
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: when_needed, always, never
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces.
+# SupportedStyles: space, no_space, compact
+# SupportedStylesForEmptyBraces: space, no_space
+Layout/SpaceInsideHashLiteralBraces:
+  EnforcedStyle: no_space
+
+Style/CommentedKeyword:
+  Enabled: false
+
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# URISchemes: http, https
+Metrics/LineLength:
+  Max: 120
+
+# Configuration parameters: CountComments, ExcludedMethods.
+# ExcludedMethods: refine
+Metrics/BlockLength:
+  Exclude:
+    - 'spec/**/*'
+
+Style/Documentation:
+  Enabled: false
+
+# Configuration parameters: CountComments.
+Metrics/MethodLength:
+  Max: 13
+
+Metrics/CyclomaticComplexity:
+  Max: 10

data/.travis.yml

@@ -1,8 +1,15 @@
-sudo: false
+sudo: required
 language: ruby
 rvm:
-  - 2.4.1
+  - 2.3.7
 before_install:
   - export DISPLAY=:99
   - sh -e /etc/init.d/xvfb start
   - export PATH=~/.webdrivers:$PATH
+script: bundle exec rake $RAKE_TASK
+env:
+  - RAKE_TASK=spec
+  - RAKE_TASK=watirspec:run
+  - RAKE_TASK=rubocop
+addons:
+  chrome: stable

data/Gemfile

@@ -1,6 +1,6 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
+git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in watigiri.gemspec
 gemspec

data/Rakefile

@@ -1,5 +1,5 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
@@ -7,3 +7,8 @@ require 'watirspec/rake_tasks'
 WatirSpec::RakeTasks.new
 
 task default: %i[spec watirspec:run]
+
+require 'rubocop/rake_task'
+RuboCop::RakeTask.new(:rubocop) do |t|
+  t.options = ['--display-cop-names']
+end

data/lib/extensions/watir/browser.rb

@@ -1,5 +1,4 @@
 module Watir
-
   class Browser
     attr_reader :doc
 
@@ -30,5 +29,8 @@ module Watir
       body.text!
     end
 
+    def locator_namespace
+      @locator_namespace ||= Watigiri::Locators
+    end
   end # Browser
 end # Watir

data/lib/extensions/watir/element.rb

@@ -1,7 +1,5 @@
 module Watir
-
   class Element
-
     attr_reader :doc
 
     #
@@ -34,10 +32,9 @@ module Watir
       text.strip
     end
 
-    alias_method :el_stale?, :stale?
+    alias el_stale? stale?
     def stale?
       @doc.nil? && el_stale?
     end
-
   end # Element
 end # Watir

data/lib/extensions/watir/iframe.rb

@@ -12,15 +12,12 @@ module Watir
   end
 
   class FramedDriver
-
     private
 
-    alias_method :watir_switch!, :switch!
+    alias watir_switch! switch!
     def switch!
       @browser.doc = nil
       watir_switch!
     end
-
   end # FramedDriver
-
 end # Watir

data/lib/watigiri/locators/element/locator.rb

@@ -16,16 +16,13 @@ module Watigiri
     module LocatorHelpers
       def locate
         @nokogiri = @selector.delete(:nokogiri)
-        @regex = regex?
+        return super unless @nokogiri || regex?
 
-        return super unless @nokogiri || @regex
-        @query_scope.doc ||= if @query_scope.is_a?(Watir::Browser)
-                               Nokogiri::HTML(@query_scope.html).tap { |d| d.css('script').remove }
-                             else
-                               # This should be using `#fragment`, but can't because of
-                               # https://github.com/sparklemotion/nokogiri/issues/572
-                               Nokogiri::HTML(@query_scope.inner_html)
-                             end
+        # :inner_html should be using `#fragment`, but can't because of
+        # https://github.com/sparklemotion/nokogiri/issues/572
+        method = @query_scope.is_a?(Watir::Browser) ? :html : :inner_html
+
+        @query_scope.doc ||= Nokogiri::HTML(@query_scope.send(method)).tap { |d| d.css('script').remove }
 
         element = using_watir(:first)
         return if element.nil?
@@ -42,7 +39,7 @@ module Watigiri
 
       # "how" can only be :css or :xpath
       def locate_elements(how, what, _scope = @query_scope.wd)
-        return super unless @nokogiri || @regex
+        return super unless @nokogiri || regex?
 
         @query_scope.doc.send(how, what).map do |el|
           Watigiri::Element.new element: el, selector: {how => what}
@@ -50,18 +47,18 @@ module Watigiri
       end
 
       def fetch_value(element, how)
-        return super unless @nokogiri || @regex
-        return super if element.is_a?(Selenium::WebDriver::Element)
-        element = element.element if element.is_a?(Watigiri::Element)
+        element = update_element(element)
+        return if element.nil?
+
         case how
         when :text
           element.inner_text
         when :tag_name
           element.name.to_s.downcase
         when :href
-          (href = element.attribute('href')) && href.to_s.strip
+          element.attribute('href')&.to_s
         else
-          element.attribute(how.to_s.tr("_", "-")).to_s
+          element.attribute(how.to_s.tr('_', '-')).to_s
         end
       end
 
@@ -73,11 +70,21 @@ module Watigiri
       end
 
       def regex?
+        return @regex unless @regex.nil?
         return false unless (@selector.keys & %i[adjacent visible label text visible_text]).empty?
-        @selector.values.any? { |v| v.is_a?(Regexp) }
+        @regex = @selector.values.any? { |v| v.is_a?(Regexp) }
       end
-    end
 
+      def update_element(element)
+        if !(@nokogiri || regex?) || element.is_a?(Selenium::WebDriver::Element)
+          nil
+        elsif element.is_a?(Watigiri::Element)
+          element.element
+        else
+          element
+        end
+      end
+    end
 
     class Element
       class Locator < Watir::Locators::Element::Locator
@@ -134,15 +141,15 @@ module Watigiri
 
           tag_name = element.tag_name
 
-          [:text, :value, :label].each do |key|
-            if rx_selector.key?(key)
-              correct_key = tag_name == 'input' ? :value : :text
-              rx_selector[correct_key] = rx_selector.delete(key)
-            end
+          %i[text value label].each do |key|
+            next unless rx_selector.key?(key)
+            correct_key = tag_name == 'input' ? :value : :text
+            rx_selector[correct_key] = rx_selector.delete(key)
           end
 
           rx_selector.all? do |how, what|
-            what === fetch_value(element, how)
+            val = fetch_value(element, how)
+            what == val || val =~ /#{what}/
           end
         end
 

data/lib/watigiri.rb

@@ -7,11 +7,3 @@ require 'extensions/watir/iframe'
 
 require 'watigiri/locators/element/locator'
 require 'watigiri/locators/element/selector_builder'
-
-Watir.locator_namespace = Watigiri::Locators
-
-# Use Watir Validator behaviors for all Elements
-Watigiri::Locators::Element::Validator = Watir::Locators::Element::Validator
-Watigiri::Locators::Button::Validator = Watir::Locators::Button::Validator
-Watigiri::Locators::TextField::Validator = Watir::Locators::TextField::Validator
-

data/watigiri.gemspec

@@ -1,33 +1,33 @@
-# coding: utf-8
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
-  spec.name          = "watigiri"
-  spec.version       = "0.4.0"
-  spec.authors       = ["Titus Fortner"]
-  spec.email         = ["titusfortner@gmail.com"]
+  spec.name          = 'watigiri'
+  spec.version       = '0.5.0'
+  spec.authors       = ['Titus Fortner']
+  spec.email         = ['titusfortner@gmail.com']
 
-  spec.summary       = %q{Nokogiri locator engine for Watir}
-  spec.description = <<-DESCRIPTION_MESSAGE
-By default Watir locates elements with Selenium; this gem will replace Selenium calls
-with Nokogiri calls where designated.
+  spec.summary       = 'Nokogiri locator engine for Watir'
+  spec.description = <<~DESCRIPTION_MESSAGE
+    By default Watir locates elements with Selenium; this gem will replace Selenium calls
+    with Nokogiri calls where designated.
   DESCRIPTION_MESSAGE
-  spec.homepage      = "http://github.com/titusfortner/watigiri"
-  spec.license       = "MIT"
+  spec.homepage      = 'http://github.com/titusfortner/watigiri'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
-  spec.bindir        = "exe"
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_development_dependency "bundler", "~> 1.15"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "webdrivers", "~> 3.0"
+  spec.add_development_dependency 'bundler', '~> 1.15'
+  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'webdrivers', '~> 3.3', '>= 3.3.3'
 
-  spec.add_runtime_dependency "watir", "~> 6.10"
-  spec.add_runtime_dependency "nokogiri"
+  spec.add_runtime_dependency 'nokogiri'
+  spec.add_runtime_dependency 'watir', '~> 6.12'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: watigiri
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Titus Fortner
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-13 00:00:00.000000000 Z
+date: 2018-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,33 +53,39 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: webdrivers
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: watir
+  name: webdrivers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.10'
-  type: :runtime
+        version: '3.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.3.3
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.10'
+        version: '3.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.3.3
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +100,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: watir
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.12'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.12'
 description: |
   By default Watir locates elements with Selenium; this gem will replace Selenium calls
   with Nokogiri calls where designated.
@@ -105,6 +125,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt
@@ -138,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: Nokogiri locator engine for Watir