watir_angular 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b88af5a1527779734181b1cdd1e8c5df74c59121
-  data.tar.gz: 0a058924f1d6a54ef8a59be0e569f85be65a7b06
+  metadata.gz: 4e019786d3a45abfef1cd132d84311e9e19ebe7f
+  data.tar.gz: c19d55702a8681c2fa17dc8ae24828424a734932
 SHA512:
-  metadata.gz: c8b3b29efc77708b7d4fc051c652a1b4ffbc1eebc3783e648680158a6bce4876ec22e478d58a7e975490a4d4f1160c4e5ee85900c04ee9d2d07e8de892772d7a
-  data.tar.gz: 61c71af4e3a6bcfbe298ccd24e1511c6b2bb8b7d91e06e2dc262ed5a5fbec330f5bab0dd713fcab6c93d9778c9a69b26a7086e1484e6ba886a23b65242c1032b
+  metadata.gz: 6e3578f7a70423f0286df7d0bf0459acf49f7025996a8a22322571a8a68576ad9169585775a12a64afad11735b3b349b21dee8de6b20c71ce83d99c8e68c7fe7
+  data.tar.gz: e50bda2128b5bc1980a58042e078e23bd313bee521b747a0cbdb7cf7a6570ec07b757078b1f1d1085cbba55b9590daa4350abf2762f7ab24548cbfe8ad222b22

data/.travis.yml

@@ -2,6 +2,8 @@ sudo: false
 language: ruby
 rvm:
   - 2.4.1
+addons:
+ chrome: stable
 before_install:
   - export DISPLAY=:99
   - sh -e /etc/init.d/xvfb start

data/README.md

@@ -26,6 +26,12 @@ Or install it yourself as:
 
     $ gem install watir_angular
 
+## Usage
+
+```ruby
+require "watir_angular"
+```
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/titusfortner/watir_angular.

data/lib/watir_angular.rb

@@ -2,10 +2,7 @@
 # From https://github.com/watir/watir/pull/387
 
 require "watir"
-
-require 'watir_angular/locators/element/locator'
 require 'watir_angular/locators/element/selector_builder'
-require 'watir_angular/locators/element/validator'
 
 module WatirAngular
   def wait_for_angular(timeout: Watir.default_timeout)
@@ -28,3 +25,16 @@ end
 
 require 'extensions/watir/browser'
 Watir.locator_namespace = WatirAngular::Locators
+
+WatirAngular::Locators::Element::Locator = Watir::Locators::Element::Locator
+WatirAngular::Locators::Element::Validator = Watir::Locators::Element::Validator
+
+# Behaviors for element subclasses to come from Watir rather than WatirAngular superclass element
+WatirAngular::Locators::Button::Locator = Watir::Locators::Button::Locator
+WatirAngular::Locators::Button::Validator = Watir::Locators::Button::Validator
+WatirAngular::Locators::Cell::Locator = Watir::Locators::Cell::Locator
+WatirAngular::Locators::Row::Locator = Watir::Locators::Row::Locator
+WatirAngular::Locators::TextArea::Locator = Watir::Locators::TextArea::Locator
+WatirAngular::Locators::TextField::Locator = Watir::Locators::TextField::Locator
+WatirAngular::Locators::TextField::Validator = Watir::Locators::TextField::Validator
+

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

@@ -1,28 +1,61 @@
 module WatirAngular
   module Locators
-    class Element
-      class SelectorBuilder < Watir::Locators::Element::SelectorBuilder
 
-        private
-
-        def assert_valid_as_attribute(attribute)
-          return if ng_attribute?(attribute)
-          super
-        end
+    module SelectorHelpers
+      def assert_valid_as_attribute(attribute)
+        return if ng_attribute?(attribute)
+        super
+      end
 
-        def ng_attribute?(attribute)
-          ng_attributes.include? attribute[/^ng_(.+)$/, 1]
-        end
+      def ng_attribute?(attribute)
+        ng_attributes.include? attribute[/^ng_(.+)$/, 1]
+      end
 
-        def ng_attributes
-          %w[app bind bind_html bind_template blur change checked class
+      def ng_attributes
+        %w[app bind bind_html bind_template blur change checked class
 class_even class_odd click cloak controller copy csp cut dblclick disabled focus
 form hide href if include init jq keydown keypress keyup list maxlength
 minlength model model_options mousedown mouseenter mouseleave mousemove mouseover
 mouseup non_bindable open options paste pluralize readonly repeat required selected
 show src srcset style submit switch transclude value]
-        end
       end
     end
+
+    class Element
+      class SelectorBuilder < Watir::Locators::Element::SelectorBuilder
+        include SelectorHelpers
+      end
+    end
+
+    class Button
+      class SelectorBuilder < Watir::Locators::Button::SelectorBuilder
+        include SelectorHelpers
+      end
+    end
+
+    class Cell
+      class SelectorBuilder < Watir::Locators::Cell::SelectorBuilder
+        include SelectorHelpers
+      end
+    end
+
+    class Row
+      class SelectorBuilder < Watir::Locators::Row::SelectorBuilder
+        include SelectorHelpers
+      end
+    end
+
+    class TextArea
+      class SelectorBuilder < Watir::Locators::TextArea::SelectorBuilder
+        include SelectorHelpers
+      end
+    end
+
+    class TextField
+      class SelectorBuilder < Watir::Locators::TextField::SelectorBuilder
+        include SelectorHelpers
+      end
+    end
+
   end
 end

data/support/travis.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+set -e
+set -x
+
+sh -e /etc/init.d/xvfb start

data/watir_angular.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "watir_angular"
-  spec.version       = "0.1.0"
+  spec.version       = "0.2.0"
   spec.authors       = ["Titus Fortner"]
   spec.email         = ["titusfortner@gmail.com"]
 
@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "watir", "~> 6.8"
+  spec.add_runtime_dependency "watir", "~> 6.8", ">= 6.8.2"
 
   spec.add_development_dependency "bundler", "~> 1.15"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: watir_angular
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Titus Fortner
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-05 00:00:00.000000000 Z
+date: 2017-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: watir
@@ -17,6 +17,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '6.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.8.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,6 +27,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '6.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.8.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -97,9 +103,8 @@ files:
 - Rakefile
 - lib/extensions/watir/browser.rb
 - lib/watir_angular.rb
-- lib/watir_angular/locators/element/locator.rb
 - lib/watir_angular/locators/element/selector_builder.rb
-- lib/watir_angular/locators/element/validator.rb
+- support/travis.sh
 - watir_angular.gemspec
 homepage: http://github.com/titusfortner/watir_angular
 licenses:

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

@@ -1,8 +0,0 @@
-module WatirAngular
-  module Locators
-    class Element
-      class Locator < Watir::Locators::Element::Locator
-      end
-    end
-  end
-end

data/lib/watir_angular/locators/element/validator.rb

@@ -1,8 +0,0 @@
-module WatirAngular
-  module Locators
-    class Element
-      class Validator < Watir::Locators::Element::Validator
-      end
-    end
-  end
-end