watir_pump 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf5d5c4150c2c096e77e82ccf8d4ddca9394903a
-  data.tar.gz: 0fe97e37e0235fd3f68be61126c38cc35d2730e0
+  metadata.gz: 2cbb8887dcba5251fc46c03f1df81c4d860a804f
+  data.tar.gz: 3ba5eaef6712ccad5a413f4848447476f3fda28f
 SHA512:
-  metadata.gz: a0e8136f06a040cc6df823d1d33bd42c186c826cea3dd551f116497932125c68db02f5043cb13f4ee44a2405f7c711dfa6e5b57fffc5f9911e13a385347c0760
-  data.tar.gz: 7da06cbcee65e874545af20c0e2c64a31d9c8bf3f7261640f67535a75c9d2d725d86a997bea9d333ba0581be39f1564a0c47c9665ece38eb8e1aa84c842e536d
+  metadata.gz: 2bbc87cfee1e802483f7808384510cb9b8d52b62f0b86bfea1beb2bc625e98f3fa1de46da49c28e5e0701c315a0d24f0c8ec51c1b38d0a161a9a080e298ab5b4
+  data.tar.gz: 05d9534cfe798b3834db12bbc8140195e301b22a9877999551bcc703343ebb4dfcebafd30db2f9923234b661a433ed57d6484e0c2ee131182de357430a885e1d

data/lib/watir_pump/component.rb

@@ -1,31 +1,103 @@
+# frozen_string_literal: true
+
+require_relative 'component_collection'
+require 'forwardable'
+
 module WatirPump
   class Component
+    extend Forwardable
+
+    delegate %i[visible? present?] => :root
+
     attr_reader :browser
     attr_reader :parent
 
     class << self
-      %w[text_field button span div link image].each do |watir_method|
-        define_method watir_method do |name, *args, **keyword_args|
+      # Proxy methods for HTML tags
+      Watir::Container.instance_methods(false).each do |watir_method|
+        define_method watir_method do |name, *args|
+          define_method(name) do |*loc_args|
+            if args&.first.is_a? Proc
+              instance_exec(*loc_args, &args.first)
+            else
+              root.send(watir_method, *args)
+            end
+          end
+        end
+      end
+
+      # Methods for element content readers
+      # span_reader, :title, id: asd
+      # will create methods :title and :title_element
+      # where :title is a shortcut for :title_element.text
+      %i[span div].each do |watir_method|
+        define_method "#{watir_method}_reader" do |name, *args|
+          send(watir_method, "#{name}_element", *args)
           define_method(name) do
-            root.send(watir_method, *args, **keyword_args)
+            send("#{name}_element").text
           end
         end
       end
 
-      def component(name, klass, rel_method = nil, *rel_args)
-        define_method(name) do
-          root_node = rel_method.nil? ? root : root.send(rel_method, *rel_args)
-          klass.new(browser, self, root_node)
+      # Methods for element content writers
+      %i[text_field].each do |watir_method|
+        define_method "#{watir_method}_writer" do |name, *args|
+          send(watir_method, "#{name}_element", *args)
+          define_method("#{name}=") do |value|
+            send("#{name}_element").set value
+          end
         end
       end
 
-      def components(name, klass, rel_method = nil, *rel_args)
-        define_method(name) do
-          root.send(rel_method, *rel_args).map do |node|
-            klass.new(browser, self, node)
+      # Methods for element clickers
+      %i[button link].each do |watir_method|
+        define_method "#{watir_method}_clicker" do |name, *args|
+          send(watir_method, "#{name}_element", *args)
+          define_method(name) do
+            send("#{name}_element").click
           end
         end
       end
+
+      def query(name, p)
+        define_method(name) do |*args|
+          instance_exec(*args, &p)
+        end
+      end
+
+      def region(name, loc_method = nil, *loc_args, &blk)
+        klass = Class.new(Component) { instance_exec(&blk) }
+        component(name, klass, loc_method, *loc_args)
+      end
+
+      def component(name, klass, loc_method = nil, *loc_args)
+        define_method(name) do |*args|
+          node = if loc_method.is_a? Proc
+                   instance_exec(*args, &loc_method)
+                 else
+                   loc_method.nil? ? root : root.send(loc_method, *loc_args)
+                 end
+          klass.new(browser, self, node)
+        end
+      end
+
+      def components(name, klass, loc_method = nil, *loc_args)
+        define_method(name) do |*args|
+          nodes = if loc_method.is_a? Proc
+                    instance_exec(*args, &loc_method)
+                  else
+                    root.send(loc_method, *loc_args)
+                  end
+          ComponentCollection.new(nodes.map { |n| klass.new(browser, self, n) })
+        end
+      end
+
+      def decorate(method, klass)
+        alias_method "#{method}_original".to_sym, method
+        define_method method do |*args|
+          klass.new(send("#{method}_original", *args))
+        end
+      end
     end
 
     def initialize(browser, parent = nil, root_node = nil)
@@ -40,5 +112,20 @@ module WatirPump
       ret = parent.root
       ret.class.name.include?('Collection') ? ret.first : ret
     end
+    alias node root
+
+    def method_missing(name, *args)
+      # delegate missing methods to current RSpec example if set
+      example = WatirPump.config.current_example
+      if example&.instance_exec { respond_to? name }
+        return example.instance_exec { send(name, *args) }
+      end
+      super
+    end
+
+    def respond_to_missing?(name, include_private = false)
+      example = WatirPump.config.current_example
+      example&.instance_exec { respond_to? name } || super
+    end
   end
 end

data/lib/watir_pump/component_collection.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'forwardable'
+
+module WatirPump
+  class ComponentCollection
+    extend Forwardable
+
+    delegate Enumerable.instance_methods(false) => :@arr
+    delegate %i[[] empty? each] => :@arr
+
+    def initialize(arr)
+      @arr = arr
+    end
+
+    %i[present? visible?].each do |method_name|
+      define_method method_name do
+        return false if empty?
+        find { |component| component.node.send(method_name) }
+      end
+    end
+  end
+end

data/lib/watir_pump/page.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'addressable/template'
 require_relative 'component'
 
@@ -10,26 +12,78 @@ module WatirPump
       end
 
       def open(params = {}, &blk)
-        url_template = WatirPump.config.base_url + uri
-        url = Addressable::Template.new(url_template).expand(params).to_s
-        instance.browser.goto url
-        use(&blk) if block_given?
+        instance.open(params, &blk)
+      end
+
+      def open_yield(params = {}, &blk)
+        instance.open_yield(params, &blk)
       end
 
       def browser
         instance.browser
       end
 
-      def use
-        yield instance, instance.browser
+      def use(&blk)
+        instance.use(&blk)
       end
       alias act use
 
+      def use_yield(&blk)
+        instance.use_yield(&blk)
+      end
+      alias act_yield use_yield
+
+      def loaded?
+        Addressable::Template.new(instance.url_template).match browser.url
+      end
+
       def instance
         @instance ||= new(WatirPump.config.browser)
       end
     end # << self
 
+    def open_yield(params = {}, &blk)
+      url = Addressable::Template.new(url_template).expand(params).to_s
+      browser.goto url
+      use_yield(&blk) if block_given?
+      self
+    end
+
+    def open(params = {}, &blk)
+      url = Addressable::Template.new(url_template).expand(params).to_s
+      browser.goto url
+      use(&blk) if block_given?
+      self
+    end
+
+    def use_yield
+      wait_for_loaded
+      yield self, browser
+      self
+    end
+    alias act_yield use_yield
+
+    def use(&blk)
+      wait_for_loaded
+      instance_exec(&blk)
+      self
+    end
+    alias act use
+
+    def url_template
+      WatirPump.config.base_url + self.class.uri
+    end
+
+    def wait_for_loaded
+      Watir::Wait.until(message: "Timeout waiting for #{self} to load") do
+        loaded?
+      end
+    end
+
+    def loaded?
+      self.class.loaded?
+    end
+
     def uri
       self.class.uri
     end

data/lib/watir_pump.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support/configurable'
 require 'watir'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: watir_pump
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Bartek Wilczek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-29 00:00:00.000000000 Z
+date: 2018-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -116,6 +116,7 @@ extra_rdoc_files: []
 files:
 - lib/watir_pump.rb
 - lib/watir_pump/component.rb
+- lib/watir_pump/component_collection.rb
 - lib/watir_pump/page.rb
 homepage: https://github.com/bwilczek/watir_pump
 licenses:
@@ -129,7 +130,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: '2.2'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -137,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Page Objects for Watir