gamera 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1514c6ae476cacccdbbda467f5dfad23badcf65
-  data.tar.gz: e2a5a09b08486c2cdbe6c3708933edb8ae4ca328
+  metadata.gz: 39ff7f416acffb3dcf8337af12277f8909dbedf0
+  data.tar.gz: bb476b347c1072a52b33b2150bc06c3f304162d0
 SHA512:
-  metadata.gz: 9da7b5a27ad9ce0ccd429f9e7b9da223d5aec1f7875f169539f1dd6bc8c639c2b6e83fbb2c554553b631d35c4162163e8bef15c702319c139d8e9b29c8995615
-  data.tar.gz: 2faecf839d93d833cdadf7e558afbd6bfdcbb9c164841863a58ad518e2f52af869b2d52f1b8a948078d9002eec3e56523d6a20d7737f4691e070b690aacb664f
+  metadata.gz: df265039a2e6ccb513b63ad756e93b248f79604ce1be9879f76908fb60d33dee08540c38c9b5a1261d68d9e10aca2a4cf58fbd55171c304aa4fcd6562ce7476c
+  data.tar.gz: f0ab1a3fc8caddf64621e14ced528a65e3b80763d9a3dde47a7f2ecb71088834b3b34246d0098b68c9341f36b19ec89785373ccbeb368235186676ba7198d4c5

data.tar.gz.sig

@@ -1 +1,2 @@
-��'�>����$+�s{IoM�K�H
+Զ�"�!��If蠆�"
+O{s‰t���-ʠ�4��\���HA�h!�Ƭ��ʔi4�}���f��#�eЖ����C����	�O�/��Qm��|^�w<3�pL.s����I1��Q�L��O��mJ�Lb��r�L�_�A^�{��jϐ�2(2�Q

data/lib/gamera.rb

@@ -3,6 +3,10 @@ require_relative 'gamera/builders/sequel_fixture_builder'
 require_relative 'gamera/exceptions'
 require_relative 'gamera/page'
 
+require_relative 'gamera/modules/visitable'
+
+require_relative 'gamera/utils/path_joiner'
+
 require_relative 'gamera/page_sections/form'
 require_relative 'gamera/page_sections/table'
 

data/lib/gamera/modules/visitable.rb

@@ -0,0 +1,56 @@
+module Gamera
+  module Visitable
+    # Methods to include on pages that are visitable, i.e. have a URL to visit and are then displayed.
+
+    include Capybara::DSL
+
+    # Open the page url in the browser specified in your Capybara configuration
+    #
+    # @param fail_on_redirect [Boolean] Whether to fail if the site redirects to a page that does not match the url_matcher regex
+    # @raise [WrongPageVisited] if the site redirects to URL that doesn't match the url_matcher regex and fail_on_redirect is true
+    def visit(fail_on_redirect = true)
+      super(url)
+      if fail_on_redirect
+        fail Gamera::WrongPageVisited, "Expected URL '#{url}', got '#{page.current_url}'" unless displayed?
+      end
+    end
+
+    # Check to see if we eventually land on the right page
+    #
+    # @param wait_time_seconds [Integer] How long to wait for the correct page to load
+    # @return [Boolean] true if the url loaded in the browser matches the url_matcher pattern
+    # @raise [NoUrlMatcherForPage] if there's no url_matcher for this page
+    def displayed?(wait_time_seconds = Capybara.default_wait_time)
+      fail Gamera::NoUrlMatcherForPage if url_matcher.nil?
+      start_time = Time.now
+      loop do
+        return true if page.current_url.chomp('/') =~ url_matcher
+        break unless Time.now - start_time <= wait_time_seconds
+        sleep(0.05)
+      end
+      false
+    end
+
+    # A method to wait for slow loading data on a page. Useful, for example,
+    # when waiting on a page that shows the count of records loaded via a slow
+    # web or import.
+    #
+    # @param retries [Integer] Number of times to reload the page before giving up
+    # @param allowed_errors [Array] Array of errors that trigger a refresh, e.g.,  if an ExpectationNotMetError was raised during an acceptance test
+    # @param block [Block] The block to execute after each refresh
+    def with_refreshes(retries, allowed_errors = [RSpec::Expectations::ExpectationNotMetError], &block)
+      retries_left ||= retries
+      visit
+      block.call(retries_left)
+    rescue *allowed_errors => e
+      retries_left -= 1
+      retry if retries_left >= 0
+      raise e
+    end
+
+    # A reminder to implement a url method when using this module.
+    def url
+      fail NotImplementedError, 'To use the Visitable module, you must implement a url method'
+    end
+  end
+end

data/lib/gamera/page.rb

@@ -27,6 +27,8 @@
 
 require 'capybara'
 require_relative 'exceptions'
+require_relative 'modules/visitable'
+require_relative 'utils/path_joiner'
 
 module Gamera
   # This is a base class which implements common methods for page object
@@ -131,75 +133,17 @@ module Gamera
   #   end
   class Page
     include Capybara::DSL
+    include Visitable
+    extend Forwardable
 
     attr_reader :url, :url_matcher
 
+    def_delegator PathJoiner, :path_join, :path_join
+
     def initialize(url, url_matcher = nil)
       @url = url
       @url_matcher = url_matcher || /#{url}/
     end
 
-    # Open the page url in the browser specified in your Capybara configuration
-    #
-    # @param fail_on_redirect [Boolean] Whether to fail if the site redirects to a page that does not match the url_matcher regex
-    # @raise [WrongPageVisited] if the site redirects to URL that doesn't match the url_matcher regex and fail_on_redirect is true
-    def visit(fail_on_redirect = true)
-      super(url)
-      if fail_on_redirect
-        fail WrongPageVisited, "Expected URL '#{url}', got '#{page.current_url}'" unless displayed?
-      end
-    end
-
-    # Check to see if we eventually land on the right page
-    #
-    # @param wait_time_seconds [Integer] How long to wait for the correct page to load
-    # @return [Boolean] true if the url loaded in the browser matches the url_matcher pattern
-    # @raise [NoUrlMatcherForPage] if there's no url_matcher for this page
-    def displayed?(wait_time_seconds = Capybara.default_wait_time)
-      fail Gamera::NoUrlMatcherForPage if url_matcher.nil?
-      start_time = Time.now
-      loop do
-        return true if page.current_url.chomp('/') =~ url_matcher
-        break unless Time.now - start_time <= wait_time_seconds
-        sleep(0.05)
-      end
-      false
-    end
-
-    # A method to wait for slow loading data on a page. Useful, for example,
-    # when waiting on a page that shows the count of records loaded via a slow
-    # web or import.
-    #
-    # @param retries [Integer] Number of times to reload the page before giving up
-    # @param allowed_errors [Array] Array of errors that trigger a refresh, e.g.,  if an ExpectationNotMetError was raised during an acceptance test
-    # @param block [Block] The block to execute after each refresh
-    def with_refreshes(retries, allowed_errors = [RSpec::Expectations::ExpectationNotMetError], &block)
-      retries_left ||= retries
-      visit
-      block.call(retries_left)
-    rescue *allowed_errors => e
-      retries_left -= 1
-      retry if retries_left >= 0
-      raise e
-    end
-
-    # This is a flag for tracking which page object classes don't cover all of
-    # the elements and/or controls on the target web page.
-    #
-    # @return [Boolean] true unless everything's been captured in the page
-    #   object class
-    def sparse?
-      false
-    end
-
-    # This is a utility method to clean up URLs formed by concatenation since we
-    # sometimes ended up with "//" in the middle of URLs which broke the
-    # url_matcher checks.
-    #
-    # @param elements [String] duck types
-    # @return [String] of elements joined by single "/" characters.
-    def path_join(*elements)
-      "/#{elements.join('/')}".gsub(%r(//+), '/')
-    end
   end
 end

data/lib/gamera/utils/path_joiner.rb

@@ -0,0 +1,13 @@
+module Gamera
+  class PathJoiner
+    # This is a utility method to clean up URLs formed by concatenation since we
+    # sometimes ended up with "//" in the middle of URLs which broke the
+    # url_matcher checks.
+    #
+    # @param elements [String] duck types
+    # @return [String] of elements joined by single "/" characters.
+    def self.path_join(*elements)
+      "/#{elements.join('/')}".gsub(%r(//+), '/')
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gamera
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Eric Dobbs
@@ -32,7 +32,7 @@ cert_chain:
   464gGOxiLBQhgi5LrYOx/4oHzyd9o7ZEC/rFUw6RlYq/Zy91Y68MQG3R4q54FSDr
   JCSrp1wI+0CJRVpPuS6W3r3h8/lBfq6wPTmg3MzlDTDYHTnh7poY3EqC6x7+xA==
   -----END CERTIFICATE-----
-date: 2015-11-05 00:00:00.000000000 Z
+date: 2015-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -183,7 +183,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: 2.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -193,7 +193,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: 2.0.4
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -288,10 +288,12 @@ files:
 - lib/gamera/builders/sequel_fixture_builder.rb
 - lib/gamera/exceptions.rb
 - lib/gamera/general_proxy.rb
+- lib/gamera/modules/visitable.rb
 - lib/gamera/page.rb
 - lib/gamera/page_sections/form.rb
 - lib/gamera/page_sections/table.rb
 - lib/gamera/utils/database_cleaner.rb
+- lib/gamera/utils/path_joiner.rb
 - lib/pry_setup.rb
 homepage: http://gamera-team.github.io/gamera/
 licenses: