watir_pump 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2cbb8887dcba5251fc46c03f1df81c4d860a804f
-  data.tar.gz: 3ba5eaef6712ccad5a413f4848447476f3fda28f
+  metadata.gz: 2b43d865d216cb89a0021ec97a0e0d9dc47732b5
+  data.tar.gz: d225472e316f49be403ce6a1c7c1adbd87a8535c
 SHA512:
-  metadata.gz: 2bbc87cfee1e802483f7808384510cb9b8d52b62f0b86bfea1beb2bc625e98f3fa1de46da49c28e5e0701c315a0d24f0c8ec51c1b38d0a161a9a080e298ab5b4
-  data.tar.gz: 05d9534cfe798b3834db12bbc8140195e301b22a9877999551bcc703343ebb4dfcebafd30db2f9923234b661a433ed57d6484e0c2ee131182de357430a885e1d
+  metadata.gz: 3825e375c66c430c3ae772ac5935f393c6c1a905f904f1f9e28b183e7fdb53ce8cfea0c4c4f5c702b9c19de49a8735fbced6f662f64dc412006f152dd778603e
+  data.tar.gz: 837952750b60feb3bffca0c5eb0d75147328cceb70b3482f29f1c2fd0b9dfda80d83aeee954235a879c9bbc8cd83664d72de352c5acf92cdc0e9bdf4f7ef8534

data/lib/watir_pump/page.rb

@@ -1,38 +1,27 @@
 # frozen_string_literal: true
 
+require 'forwardable'
 require 'addressable/template'
 require_relative 'component'
 
 module WatirPump
   class Page < Component
     class << self
+      extend Forwardable
+
+      INSTANCE_DELEGATED_METHODS = %i[
+        browser
+        open open_yield open_dsl
+        use use_yield use_dsl
+        act act_yield use_dsl
+      ].freeze
+      delegate INSTANCE_DELEGATED_METHODS => :instance
+
       def uri(uri = nil)
         @uri = uri unless uri.nil?
         @uri
       end
 
-      def open(params = {}, &blk)
-        instance.open(params, &blk)
-      end
-
-      def open_yield(params = {}, &blk)
-        instance.open_yield(params, &blk)
-      end
-
-      def browser
-        instance.browser
-      end
-
-      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
@@ -42,6 +31,14 @@ module WatirPump
       end
     end # << self
 
+    def open(params = {}, &blk)
+      if WatirPump.config.call_page_blocks_with_yield
+        open_yield(params, &blk)
+      else
+        open_dsl(params, &blk)
+      end
+    end
+
     def open_yield(params = {}, &blk)
       url = Addressable::Template.new(url_template).expand(params).to_s
       browser.goto url
@@ -49,13 +46,22 @@ module WatirPump
       self
     end
 
-    def open(params = {}, &blk)
+    def open_dsl(params = {}, &blk)
       url = Addressable::Template.new(url_template).expand(params).to_s
       browser.goto url
-      use(&blk) if block_given?
+      use_dsl(&blk) if block_given?
       self
     end
 
+    def use(&blk)
+      if WatirPump.config.call_page_blocks_with_yield
+        use_yield(&blk)
+      else
+        use_dsl(&blk)
+      end
+    end
+    alias act use
+
     def use_yield
       wait_for_loaded
       yield self, browser
@@ -63,12 +69,12 @@ module WatirPump
     end
     alias act_yield use_yield
 
-    def use(&blk)
+    def use_dsl(&blk)
       wait_for_loaded
       instance_exec(&blk)
       self
     end
-    alias act use
+    alias act_dsl use_dsl
 
     def url_template
       WatirPump.config.base_url + self.class.uri

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: watir_pump
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Bartek Wilczek
@@ -138,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Page Objects for Watir