watir_css 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6f07dd5e75eeda87032565d7a935dd18dd81f20
-  data.tar.gz: b430308783605df302565a8184735645b7250f28
+  metadata.gz: 86ee5dfc4cf6b5cf4af5885b2975a37ecea4cad5
+  data.tar.gz: d783387eeb3daefc8c682fd31104c115e82f8599
 SHA512:
-  metadata.gz: ea6d64b1471d18104fd43ff246f6244c0439b8ecadf419b1c64b24c37ddc45417ec2f0128a78d0a0ec49f86fe437d7c8fbd51c365824c9cc0d8fd49c178f3fad
-  data.tar.gz: bcadc60e3fc40afb296fe3db22d1aa212fd18883c0f53c6a6f30ea23b00da3f06bf370b4dd7ae554fe9b85b0e0167092bbec59336aa9e3180a33c9c662c91c39
+  metadata.gz: e8439dbc8ba086941e46ac6371fac7f5797ee1bd6e1be0bb48c929b9ec45095bad4160aeb57ee89797ce46ef3b6ab6bf2ce88225326236fca615bee37300ac16
+  data.tar.gz: 4e53c1df3f7e2b90936bf196a8c06f5ac435614c4ee701cf8f5df494242dfbcfd0ff0056c3cbb6e5edf1815e4d630d46484512172206a5a1ce2d1cc64c088a05

data/.travis.yml

@@ -1,4 +1,8 @@
+sudo: false
 language: ruby
 rvm:
-  - 2.3.0
-before_install: gem install bundler -v 1.11.2
+  - 2.4.1
+before_install:
+  - export DISPLAY=:99
+  - sh -e /etc/init.d/xvfb start
+  - export PATH=~/.webdrivers:$PATH

data/README.md

@@ -1,6 +1,12 @@
 # WatirCss
 
-CSS-based locator engine for [watir-webdriver](https://github.com/watir/watir-webdriver).
+A CSS based locator engine for [watir](https://github.com/watir/watir).
+
+By default Watir translates location approaches into XPath. This gem will replace XPath calls
+with CSS calls where possible.
+
+Some locator strategies supported by Watir cannot be reimplemented with watir_css. 
+In such cases, it falls back to the XPath implementation in Watir.
 
 ## Installation
 
@@ -24,50 +30,13 @@ $ gem install watir_css
 
 ## Usage
 
-Require after watir-webdriver, the rest should just work.
-
 ```ruby
-require 'watir-webdriver'
 require 'watir_css'
 ```
 
-## Comparison with default watir-webdriver locator
-
-By default Watir converts calls into XPath; this gem will replace XPath calls
-with CSS calls where possible.
-
-This functionality used to be present directly in watir-webdriver. During
-the transition to Watir 6.0, a hook was included in the repository to 
-allow for alternate locator strategies.
-
-This gem replaces:
-
-```ruby
-Watir.prefer_css
-```
-
-## Limitations
-
-Some watir-webdriver locators cannot be reimplemented with watir_css. In such cases,
-it fall backs to watir-webdriver, so you should be able to migrate pretty easily.
-
-## Development
-
-To install this gem onto your local machine, run `bundle exec rake install`.
-To release a new version, update the version number in `version.rb`,
-and then run `bundle exec rake release`, which will create a git tag for the version,
-push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
-
 ## Specs
 
-Watir_css uses [watirspec](https://github.com/watir/watirspec) for testing, so
-you should first fetch it:
-
-```bash
-$ git submodule init && git submodule update
-```
-
-Now, you can run all specs:
+WatirCss will run watirspecs from Watir project:
 
 ```bash
 $ bundle exec rake spec

data/Rakefile

@@ -3,4 +3,7 @@ require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+require 'watirspec/rake_tasks'
+WatirSpec::RakeTasks.new
+
+task default: %i[spec watirspec:run]

data/lib/watir_css.rb

@@ -4,11 +4,10 @@ require 'watir_css/locators/element/locator'
 require 'watir_css/locators/element/selector_builder'
 require 'watir_css/locators/element/selector_builder/css'
 require 'watir_css/locators/element/validator'
-require 'watir_css/version'
 
 Watir.locator_namespace = WatirCss::Locators
 
-WatirCss::Locators::Button = Watir::Locators::Button
+WatirCss::Locators::Button    = Watir::Locators::Button
 WatirCss::Locators::Cell      = Watir::Locators::Cell
 WatirCss::Locators::Row       = Watir::Locators::Row
 WatirCss::Locators::TextArea  = Watir::Locators::TextArea

data/lib/watir_css/locators/element/selector_builder.rb

@@ -10,12 +10,12 @@ module WatirCss
         private
 
         def build_wd_selector(selectors)
-          unless selectors.values.any? { |e| e.is_a? Regexp }
-            build_css(selectors) || build_xpath(selectors)
-          end
+          return if selectors.values.any? { |e| e.is_a? Regexp }
+          build_css(selectors) || build_xpath(selectors)
         end
 
         def build_css(selectors)
+          return if selectors.values.any? { |e| e.is_a?(Symbol) || e.is_a?(TrueClass) || e.is_a?(FalseClass)}
           css_builder.build(selectors)
         end
 

data/watir_css.gemspec

@@ -1,11 +1,10 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'watir_css/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "watir_css"
-  spec.version       = WatirCss::VERSION
+  spec.version       = "0.2.0"
   spec.authors       = ["Titus Fortner"]
   spec.email         = ["titusfortner@gmail.com"]
 
@@ -23,9 +22,10 @@ DESCRIPTION_MESSAGE
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'watir', '>= 6.0.0.beta2'
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency 'sinatra' # watirspec
+  spec.add_development_dependency "webdrivers", "~> 3.0"
+
+  spec.add_runtime_dependency "watir", "~> 6.8", ">= 6.8.1"
 end

metadata

@@ -1,59 +1,59 @@
 --- !ruby/object:Gem::Specification
 name: watir_css
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Titus Fortner
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-11 00:00:00.000000000 Z
+date: 2017-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: watir
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.0.beta2
-  type: :runtime
+        version: '1.11'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.0.beta2
+        version: '1.11'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: webdrivers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -67,19 +67,25 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: sinatra
+  name: watir
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 6.8.1
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 6.8.1
 description: |
   By default Watir converts calls into XPath; this gem will replace XPath calls
   with CSS calls where possible.
@@ -102,7 +108,6 @@ files:
 - lib/watir_css/locators/element/selector_builder.rb
 - lib/watir_css/locators/element/selector_builder/css.rb
 - lib/watir_css/locators/element/validator.rb
-- lib/watir_css/version.rb
 - watir_css.gemspec
 homepage: https://github.com/watir/watir_css
 licenses:
@@ -124,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: CSS locator engine for Watir

data/lib/watir_css/version.rb

@@ -1,3 +0,0 @@
-module WatirCss
-  VERSION = "0.1.0"
-end