axe-matchers 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bdf81bdb1412cef3a81c282f9ca50e00e45a5ea2
-  data.tar.gz: caf2305fffda49e5b17cfddbb2df32ca4d74e452
+  metadata.gz: 88bbc1b711577affa1153852e892ed18fc531265
+  data.tar.gz: d22ece7e3486a010e178fc94398a14c50a79290c
 SHA512:
-  metadata.gz: bfe6802522f3e4c9cc3beed6df69b07ec53d35075afed103293913ee885d328e84f2a4d8401b349b32455d984f13ea9f3f5dff56f9a78ee42394fe1e4cce31de
-  data.tar.gz: 43c4b5dbbc063725cd4dd7c6f47a86b7b2097081d2d7fd3c9c2ec86ec7949e4a5a27e1e4f53f8345ce51c9e0f72e96cf33baa1041439af1f04e3e6ee4a310cf5
+  metadata.gz: ca6f9503838d38f9eeb918e5d9571f0ea487e68ac9e9ee868f24e0fd5fe52b041bf61c89450dead8e75ece88fe8a2e15da9c4037a46de3a83e78664db2899238
+  data.tar.gz: fce3a5257299ebf5f9d674c410d19b6979766435e8ec473788ad5fa257c3fc4947f35050beec8d4773a0685d764c702aff48690e640b89a0920e03cff668d376

data/README.md

@@ -1,26 +1,32 @@
-# Installation
+# axe-matchers
+
+Automated accessibility testing powered by aXe.
 
-## with Bundler
+Provides Cucumber step definitions and RSpec matchers for auditing accessibility.
+
+# Installation
 
-add to your `Gemfile`:
+Add this line to your application's Gemfile:
 
 ``` ruby
 gem 'axe-matchers'
 ```
 
-and then run
+And then execute:
 
 ``` sh
-bundle install
+$ bundle install
 ```
 
-## manually (without Bundler)
+Or install it yourself as:
 
 ``` sh
-gem install axe-matchers
+$ gem install axe-matchers
 ```
 
-# Cucumber Configuration
+# Cucumber
+
+## Configuration
 
 1. Require step definitions: in `features/support/env.rb` or similar.
 
@@ -46,21 +52,21 @@ gem install axe-matchers
     end
     ```
 
-# Accessibility Steps
+## Built-In Accessibility Cucumber Steps
 
 To construct an axe accessibility Cucumber step, begin with the base step, and append any clauses necessary. All of the following clauses may be mixed and matched; however, they must appear in the specified order:
 
 `Then the page should be accessible [including] [excluding] [according-to] [checking-rules/checking-only-rules] [skipping-rules]`
 
-## Base Step
+### Base Step
 
 ``` gherkin
 Then the page should be accessible
 ```
 
-The base step is the core component of the step. It is a complete step on its own and will verify the currently loaded page is accessible using the default configuration of [axe.a11yCheck](https://github.com/dequelabs/axe-core/blob/master/doc/API.md#api-name-axea11ycheck) (the entire document is checked using the default rules).
+The base step is the core component of the step. It is a complete step on its own and will verify the currently loaded page is accessible using the default configuration of [axe.a11yCheck][a11ycheck] (the entire document is checked using the default rules).
 
-## Inclusion clause
+### Inclusion clause
 
 ``` gherkin
 Then the page should be accessible within "#selector"
@@ -68,9 +74,9 @@ Then the page should be accessible within "#selector"
 
 The inclusion clause (`within "#selector"`) specifies which elements of the page should be checked. A valid CSS selector must be provided, and is surrounded in double quotes. Compound selectors may be used to select multiple elements. e.g. `within "#header, .footer"`
 
-Additional [context parameter documentation](https://github.com/dequelabs/axe-core/blob/master/doc/API.md#a-context-parameter)
+*see additional [context parameter documentation][context-param]*
 
-## Exclusion clause
+### Exclusion clause
 
 ``` gherkin
 Then the page should be accessible excluding "#selector"
@@ -78,7 +84,7 @@ Then the page should be accessible excluding "#selector"
 
 The exclusion clause (`excluding "#selector"`) specifies which elements of the document should be ignored. A valid CSS selector must be provided, and is surrounded in double quotes. Compound selectors may be used to select multiple elements. e.g. `excluding "#widget, .ad"`
 
-Additional [context parameter documentation](https://github.com/dequelabs/axe-core/blob/master/doc/API.md#a-context-parameter)
+*see additional [context parameter documentation][context-param]*
 
 If desired, a semicolon (`;`) or the word `but` may be used to separate the exclusion clause from the inclusion clause (if present).
 
@@ -87,7 +93,7 @@ Then the page should be accessible within "main"; excluding "aside"
 Then the page should be accessible within "main" but excluding "aside"
 ```
 
-## Accessibility Standard (Tag) clause
+### Accessibility Standard (Tag) clause
 
 ``` gherkin
 Then the page should be accessible according to: tag-name
@@ -95,7 +101,7 @@ Then the page should be accessible according to: tag-name
 
 The tag clause specifies which accessibility standard (or standards) should be used to check the page. The accessibility standards are specified by name (tag). Multiple standards can be specified when comma-separated. e.g. `according to: wcag2a, section508`
 
-The acceptable [tag names are documented](https://github.com/dequelabs/axe-core/blob/master/doc/API.md#b-options-parameter) as well as a [complete listing of rules](https://github.com/dequelabs/axe-core/blob/master/doc/rule-descriptions.md) that correspond to each tag/standard.
+The acceptable [tag names are documented][options-param] as well as a [complete listing of rules][rules] that correspond to each tag.
 
 If desired, a semicolon (`;`) may be used to separate the tag clause from the preceding clause.
 
@@ -103,13 +109,15 @@ If desired, a semicolon (`;`) may be used to separate the tag clause from the pr
 Then the page should be accessible within "#header"; according to: best-practice
 ```
 
-## Checking Rules clause
+### Checking Rules clause
 
 ``` gherkin
 Then the page should be accessible checking: ruleId
 ```
 
-The checking-rules clause specifies which *additional* rules to run (in addition to the specified tags, if any, or the default ruleset). The rules are specified by comma-separated rule IDs. (see [rules documentation](https://github.com/dequelabs/axe-core/blob/master/doc/rule-descriptions.md) for a list of valid rule IDs)
+The checking-rules clause specifies which *additional* rules to run (in addition to the specified tags, if any, or the default ruleset). The rules are specified by comma-separated rule IDs.
+
+*see [rules documentation][rules] for a list of valid rule IDs*
 
 If desired, a semicolon (`;`) or the word `and` may be used to separate the checking-rules clause from the preceding clause.
 
@@ -118,7 +126,7 @@ Then the page should be accessible according to: wcag2a; checking: color-contras
 Then the page should be accessible according to: wcag2a and checking: color-contrast
 ```
 
-### Exclusive Rules clause
+#### Exclusive Rules clause
 
 ``` gherkin
 Then the page should be accessible checking only: ruleId
@@ -126,13 +134,15 @@ Then the page should be accessible checking only: ruleId
 
 This clause is not really a separate clause. But rather, by adding the word `only` to the checking-rules clause, the meaning of the step can be changed. As described above, by default the checking-rules clause specifies *additional* rules to run. If the word `only` is used, then *only* the specified rules are checked.
 
-## Skipping Rules clause
+### Skipping Rules clause
 
 ``` gherkin
 Then the page should be accessible skipping: ruleId
 ```
 
-The skipping-rules clause specifies which rules to skip. This allows an accessibility standard to be provided (via the tag clause) while ignoring a particular rule. The rules are specified by comma-separated rule IDs. (see [rules documentation](https://github.com/dequelabs/axe-core/blob/master/doc/rule-descriptions.md) for a list of valid rule IDs)
+The skipping-rules clause specifies which rules to skip. This allows an accessibility standard to be provided (via the tag clause) while ignoring a particular rule. The rules are specified by comma-separated rule IDs.
+
+*see [rules documentation][rules] for a list of valid rule IDs*
 
 If desired, a semicolon (`;`) or the word `but` may be used to separate the skipping-rules clause from the preceding clause.
 
@@ -141,7 +151,7 @@ Then the page should be accessible according to: wcag2a; skipping: accesskeys
 Then the page should be accessible according to: wcag2a but skipping: accesskeys
 ```
 
-# Examples
+## Examples
 
 ``` gherkin
 Then the page should be accessible within "main, header" but excluding "footer"
@@ -152,3 +162,27 @@ Then the page should be accessible checking only: document-title, label
 
 Then the page should be accessible according to: best-practice and checking: aria-roles, definition-list
 ```
+
+# WebDrivers
+
+axe-matchers supports Capybara, Selenium, and Watir webdrivers; each tested with Firefox, Chrome, Safari, and PhantomJS. Additionally, capybara-webkit and poltergeist are supported.
+
+*__Notes:__*
+
+- Auditing IFrames is not suppored in Poltergeist < 1.8.0. Upgrade to 1.8.0+ or set `skip_iframes=true` in `Axe.configure`
+- Chrome requires [ChromeDriver](https://sites.google.com/a/chromium.org/chromedriver/) (tested with 2.21)
+- Safari requires [SafariDriver](https://code.google.com/p/selenium/wiki/SafariDriver) (tested with 2.48)
+
+
+
+[inclusion-clause]: #inclusion-clause
+[exclusion-clause]: #exclusion-clause
+[tag-clause]: #accessibility-standard-tag-clause
+[rules-clause]: #checking-rules-clause
+[exclusive-rules-clause]: #exclusive-rules-clause
+[skipping-rules-clause]: #skipping-rules-clause
+
+[a11ycheck]: https://github.com/dequelabs/axe-core/blob/master/doc/API.md#api-name-axea11ycheck
+[context-param]: https://github.com/dequelabs/axe-core/blob/master/doc/API.md#a-context-parameter
+[options-param]: https://github.com/dequelabs/axe-core/blob/master/doc/API.md#b-options-parameter
+[rules]: https://github.com/dequelabs/axe-core/blob/master/doc/rule-descriptions.md

data/lib/axe.rb

@@ -1,17 +1,8 @@
-require 'forwardable'
 require 'axe/configuration'
+require 'axe/version'
 
 module Axe
-  class << self
-    extend Forwardable
-    def_delegator :configuration, :page_from
-
-    def configuration
-      @configuration ||= Configuration.new
-    end
-
-    def configure
-      yield configuration if block_given?
-    end
+  def self.configure
+    yield Configuration.instance if block_given?
   end
 end

data/lib/axe/api.rb

@@ -1,5 +1,4 @@
 module Axe
   module API
-    LIBRARY_IDENTIFIER = "axe"
   end
 end

data/lib/axe/api/a11y_check.rb

@@ -8,12 +8,13 @@ require 'axe/api/audit'
 require 'axe/api/context'
 require 'axe/api/options'
 require 'axe/api/results'
-require 'axe/javascript_library'
+require 'axe/core'
 
 module Axe
   module API
     class A11yCheck
-      METHOD_NAME = "#{LIBRARY_IDENTIFIER}.a11yCheck"
+      JS_NAME = "a11yCheck"
+      METHOD_NAME = "#{Core::JS_NAME}.#{JS_NAME}"
 
       extend Forwardable
       def_delegators :@context, :within, :excluding
@@ -28,7 +29,6 @@ module Axe
       end
 
       def call(page)
-        inject_axe_lib page
         audit page do |results|
           Audit.new to_js, Results.new(results)
         end
@@ -36,12 +36,8 @@ module Axe
 
       private
 
-      def inject_axe_lib(page)
-        JavaScriptLibrary.new.inject_into page
-      end
-
       def audit(page)
-        yield page.execute_async_script "#{METHOD_NAME}.apply(#{LIBRARY_IDENTIFIER}, arguments)", @context.to_json, @options.to_json
+        yield page.execute_async_script "#{METHOD_NAME}.apply(#{Core::JS_NAME}, arguments)", @context.to_json, @options.to_json
       end
 
       def to_js

data/lib/axe/configuration.rb

@@ -1,42 +1,56 @@
 require 'forwardable'
+require 'pathname'
+require 'rubygems'
+require 'singleton'
+require 'yaml'
+
+require 'axe/hooks'
 require 'webdriver_script_adapter/execute_async_script_adapter'
 
 module Axe
   class Configuration
+    include Singleton
+    include Hooks
     extend Forwardable
 
-    attr_accessor :page
+    attr_writer :jslib
+    attr_accessor :page, :jslib_path, :skip_iframes
+
     def_delegators ::WebDriverScriptAdapter,
       :async_results_identifier, :async_results_identifier=,
       :max_wait_time, :max_wait_time=,
       :wait_interval, :wait_interval=
 
-    def page_from(world)
-      page_from_eval(world) ||
-        page ||
-        default_page_from(world) ||
-        from_ivar(:@page, world) ||
-        from_ivar(:@browser, world) ||
-        from_ivar(:@driver, world) ||
-        from_ivar(:@webdriver, world) ||
-        NullWebDriver.new
+    def initialize
+      @page = :page
+      @jslib_path = gem_root + '/node_modules/axe-core/axe.min.js'
     end
 
-    private
-
-    def page_from_eval(world)
-      world.instance_eval "#{page}" if page.is_a?(String) || page.is_a?(Symbol)
+    def jslib
+      @jslib ||= Pathname.new(@jslib_path).read
     end
 
-    def default_page_from(world)
-      world.page if world.respond_to? :page
+    class << self
+      def from_yaml(path="config/axe.yml")
+        file = Pathname.new(path)
+        from_hash(YAML.load_file(file)) if file.exist?
+        instance
+      end
+
+      def from_hash(attributes)
+        attributes.each do |k, v|
+          instance.__send__("#{k}=", v)
+        end
+        instance
+      end
     end
 
-    def from_ivar(ivar, world)
-      self.page = ivar
-      page_from_eval(world)
+    private
+
+    def gem_root
+      Gem::Specification.find_by_name('axe-matchers').gem_dir
     end
   end
-
-  class NullWebDriver; end
 end
+
+Axe::Configuration.from_yaml

data/lib/axe/core.rb

@@ -0,0 +1,46 @@
+require 'webdriver_script_adapter/execute_async_script_adapter'
+require 'webdriver_script_adapter/frame_adapter'
+require 'webdriver_script_adapter/query_selector_adapter'
+
+require 'axe/configuration'
+require 'axe/loader'
+
+module Axe
+  class Core
+    JS_NAME = "axe"
+
+    def initialize(page)
+      @page = wrap_driver page
+      load_axe_core Axe::Configuration.instance.jslib
+    end
+
+    def call(callable)
+      callable.call(@page)
+    end
+
+    private
+
+    def load_axe_core(source)
+      Loader.new(@page, self).call(source) unless already_loaded?
+    end
+
+    def already_loaded?
+      @page.evaluate_script <<-JS
+        window.#{JS_NAME} &&
+        typeof #{JS_NAME}.a11yCheck === 'function'
+      JS
+    end
+
+    def wrap_driver(driver)
+      ::WebDriverScriptAdapter::QuerySelectorAdapter.wrap(
+        ::WebDriverScriptAdapter::FrameAdapter.wrap(
+          ::WebDriverScriptAdapter::ExecuteAsyncScriptAdapter.wrap(
+            ::WebDriverScriptAdapter::ExecEvalScriptAdapter.wrap(
+              driver
+            )
+          )
+        )
+      )
+    end
+  end
+end

data/lib/axe/cucumber/step.rb

@@ -1,6 +1,6 @@
 require 'yaml'
 
-require 'axe'
+require 'axe/finds_page'
 require 'axe/matchers'
 require 'axe/expectation'
 
@@ -41,7 +41,7 @@ module Axe
       $/x
 
       def self.create_for(world)
-        new Axe.page_from world
+        new(FindsPage.in(world).page)
       end
 
       def initialize(page)
@@ -50,12 +50,12 @@ module Axe
 
       def assert_accessibility(negate=false, inclusion="", exclusion="", tags="", run_only=false, run_rules="", skip_rules="", options=nil)
         is_accessible = Axe::Matchers::BeAccessible.new.tap do |a|
-          a.within *selector(inclusion)
-          a.excluding *selector(exclusion)
-          a.according_to *split(tags)
-          a.checking *split(run_rules) unless run_only
-          a.checking_only *split(run_rules) if run_only
-          a.skipping *split(skip_rules)
+          a.within(*selector(inclusion))
+          a.excluding(*selector(exclusion))
+          a.according_to(*split(tags))
+          a.checking(*split(run_rules)) unless run_only
+          a.checking_only(*split(run_rules)) if run_only
+          a.skipping(*split(skip_rules))
           a.with_options to_hash(options)
         end
 

data/lib/axe/finds_page.rb

@@ -0,0 +1,55 @@
+require 'axe/configuration'
+
+module Axe
+  class FindsPage
+    WEBDRIVER_NAMES = [ :page, :browser, :driver, :webdriver ]
+
+    class << self
+      alias :in :new
+    end
+
+    def initialize(world)
+      @world = world
+    end
+
+    def page
+      from_configuration || implicit or raise "A page/browser/webdriver must be configured"
+    end
+
+    private
+
+    def configuration
+      Axe::Configuration.instance
+    end
+
+    def from_configuration
+      if configuration.page.is_a?(String) || configuration.page.is_a?(Symbol)
+        from_world(configuration.page)
+      else
+        configuration.page
+      end
+    end
+
+    def implicit
+      WEBDRIVER_NAMES.map(&method(:from_world)).drop_while(&:nil?).first
+    end
+
+    def from_world(name)
+      via_method(name) || via_ivar(name)
+    end
+
+    def via_method(name)
+      @world.__send__(name) if @world.respond_to?(name)
+    end
+
+    def via_ivar(name)
+      name = ensure_ivar_format(name)
+      @world.instance_variable_get(name) if @world.instance_variables.include?(name)
+    end
+
+    def ensure_ivar_format(name)
+      # ensure leading '@'
+      name.to_s.sub(/^([^@])/, '@\1').to_sym
+    end
+  end
+end

data/lib/axe/hooks.rb

@@ -0,0 +1,32 @@
+module Axe
+  module Hooks
+    HOOKS = [ :after_load ]
+
+    HOOKS.each do |hook_name|
+      # define instance-level registration method per hook
+      define_method hook_name do |callable=nil, &block|
+        callable ||= block
+        Hooks.callbacks.fetch(hook_name) << callable if callable
+      end
+
+      # define singleton-level run_* method per hook
+      define_singleton_method "run_#{hook_name}" do |*args|
+        callbacks.fetch(hook_name).each do |callback|
+          callback.call(*args)
+        end
+      end
+    end
+
+    # beware, the callbacks hash is a single shared instance tied to this module
+    def self.callbacks
+      @callbacks ||= initialize_callbacks_array_per_hook
+    end
+
+    private
+
+    def self.initialize_callbacks_array_per_hook
+      Hash[ HOOKS.map{|name| [name, []]} ]
+    end
+
+  end
+end

data/lib/axe/loader.rb

@@ -0,0 +1,29 @@
+require 'axe/configuration'
+require 'axe/hooks'
+
+module Axe
+  class Loader
+    def initialize(page, lib)
+      @page = page
+      @lib = lib
+    end
+
+    def call(source)
+      @page.execute_script source
+      Axe::Hooks.run_after_load @lib
+      load_into_iframes(source) unless Axe::Configuration.instance.skip_iframes
+    end
+
+    private
+
+    def load_into_iframes(source)
+      iframes.each do |iframe|
+        @page.within_frame(iframe) { call source }
+      end
+    end
+
+    def iframes
+      @page.find_elements(:tag_name, "iframe")
+    end
+  end
+end

data/lib/axe/matchers/be_accessible.rb

@@ -1,6 +1,6 @@
 require 'forwardable'
 require 'chain_mail/chainable'
-require 'axe/page'
+require 'axe/core'
 require 'axe/api/a11y_check'
 
 module Axe
@@ -18,8 +18,7 @@ module Axe
       end
 
       def matches?(page)
-        @audit = @a11y_check.call Page.new page
-
+        @audit = Core.new(page).call @a11y_check
         @audit.passed?
       end
     end

data/lib/axe/version.rb

@@ -1,3 +1,29 @@
 module Axe
-  VERSION = "1.1.1"
+  module VERSION
+    MAJOR=1
+    MINOR=2
+    PATCH=0
+    PRE=nil
+    BUILD=nil
+
+    class << self
+      def to_s
+        [MAJOR, MINOR, PATCH].join(".") + pre + build
+      end
+
+      private
+
+      def pre
+        empty?(PRE) ? "" : "-#{PRE}"
+      end
+
+      def build
+        empty?(BUILD) ? "" : "+#{BUILD}"
+      end
+
+      def empty?(v)
+        v.nil? || v.empty?
+      end
+    end
+  end
 end

data/lib/webdriver_script_adapter/frame_adapter.rb

@@ -0,0 +1,63 @@
+require 'dumb_delegator'
+
+module WebDriverScriptAdapter
+  class FrameAdapter < ::DumbDelegator
+
+    def self.wrap(driver)
+      if driver.respond_to?(:within_frame)
+        driver #capybara already supports within_frame
+      elsif !driver.respond_to?(:switch_to)
+        WatirAdapter.new driver
+      elsif driver.switch_to.respond_to?(:parent_frame)
+        new driver # add within_frame to selenium
+      else
+        ParentlessFrameAdapter.new driver # old selenium doesn't support parent_frame
+      end
+    end
+
+    def within_frame(frame)
+      switch_to.frame(frame)
+      yield
+    ensure
+      begin
+        switch_to.parent_frame
+      rescue => e
+        if /switchToParentFrame|frame\/parent/.match(e.message)
+          ::Kernel.warn "WARNING: This browser only supports first-level iframes. Second-level iframes and beyond will not be audited. To skip auditing all iframes, set Axe::Configuration#skip_iframes=true"
+        end
+        switch_to.default_content
+      end
+    end
+
+    private
+
+    class WatirAdapter < ::DumbDelegator
+      # delegate to Watir's Selenium #driver
+      def within_frame(frame, &block)
+        FrameAdapter.instance_method(:within_frame).bind(FrameAdapter.wrap driver).call(frame.wd, &block)
+      end
+    end
+
+    # Selenium Webdriver < 2.43 doesnt support moving back to the parent
+    class ParentlessFrameAdapter < ::DumbDelegator
+
+      # storage of frame stack (for reverting to parent) taken from Capybara
+      # : https://github.com/jnicklas/capybara/blob/2.6.2/lib/capybara/selenium/driver.rb#L117-L147
+      #
+      # There doesnt appear to be any way in Selenium Webdriver < 2.43 to move back to a parent frame
+      # other than going back to the root and then reiterating down
+      def within_frame(frame)
+        @frame_stack[window_handle] ||= []
+        @frame_stack[window_handle] << frame
+
+        switch_to.frame(frame)
+        yield
+      ensure
+        @frame_stack[window_handle].pop
+        switch_to.default_content
+        @frame_stack[window_handle].each { |f| switch_to.frame(f) }
+      end
+    end
+
+  end
+end

data/lib/webdriver_script_adapter/query_selector_adapter.rb

@@ -0,0 +1,18 @@
+require 'dumb_delegator'
+
+module WebDriverScriptAdapter
+  class QuerySelectorAdapter < ::DumbDelegator
+
+    def self.wrap(driver)
+      # capybara: all(<tag>) but also seems to support all(:tag_name, <tag>)
+      # watir: elements(:tag_name); also supports #iframes
+      # selenium: find_elements(:tag_name, <tag>); aliased as all
+
+      driver.respond_to?(:find_elements) ? driver : new(driver)
+    end
+
+    def find_elements(*args)
+      respond_to?(:elements) ? elements(*args) : all(*args)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: axe-matchers
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Deque Systems
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-04 00:00:00.000000000 Z
+date: 2016-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dumb_delegator
@@ -67,6 +67,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -171,14 +185,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
@@ -232,21 +246,25 @@ files:
 - lib/axe/api/value_object.rb
 - lib/axe/api.rb
 - lib/axe/configuration.rb
+- lib/axe/core.rb
 - lib/axe/cucumber/step.rb
 - lib/axe/cucumber/step_definitions.rb
 - lib/axe/cucumber.rb
 - lib/axe/dsl.rb
 - lib/axe/expectation.rb
-- lib/axe/javascript_library.rb
+- lib/axe/finds_page.rb
+- lib/axe/hooks.rb
+- lib/axe/loader.rb
 - lib/axe/matchers/be_accessible.rb
 - lib/axe/matchers.rb
-- lib/axe/page.rb
 - lib/axe/rspec.rb
 - lib/axe/version.rb
 - lib/axe.rb
 - lib/chain_mail/chainable.rb
 - lib/webdriver_script_adapter/exec_eval_script_adapter.rb
 - lib/webdriver_script_adapter/execute_async_script_adapter.rb
+- lib/webdriver_script_adapter/frame_adapter.rb
+- lib/webdriver_script_adapter/query_selector_adapter.rb
 - node_modules/axe-core/axe.min.js
 - LICENSE
 - README.md

data/lib/axe/javascript_library.rb

@@ -1,26 +0,0 @@
-require 'pathname'
-require 'rubygems'
-
-module Axe
-  class JavaScriptLibrary
-
-    def inject_into(page)
-      page.execute_script source
-    end
-
-    def source
-      axe_lib.read
-    end
-
-    private
-
-    def axe_lib
-      gem_root + 'node_modules/axe-core/axe.min.js'
-    end
-
-    def gem_root
-      Pathname.new Gem::Specification.find_by_name('axe-matchers').gem_dir
-    end
-
-  end
-end

data/lib/axe/page.rb

@@ -1,26 +0,0 @@
-require 'forwardable'
-require 'webdriver_script_adapter/exec_eval_script_adapter'
-require 'webdriver_script_adapter/execute_async_script_adapter'
-
-module Axe
-  class Page
-    extend Forwardable
-    def_delegators :@driver, :execute_script, :execute_async_script
-
-    def initialize(driver)
-      @driver = wrap_exec_async wrap_exec_eval driver
-    end
-
-    private
-
-    # ensure driver has #execute_async_script
-    def wrap_exec_async(driver)
-      ::WebDriverScriptAdapter::ExecuteAsyncScriptAdapter.wrap driver
-    end
-
-    # ensure driver has #execute_script and #evaluate_script
-    def wrap_exec_eval(driver)
-      ::WebDriverScriptAdapter::ExecEvalScriptAdapter.wrap driver
-    end
-  end
-end