watir_pump 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b50e9841f5e868ad64f52c9851defc86f383b47
-  data.tar.gz: 719578db8fbaa1114f571dc67421e383613ca87e
+  metadata.gz: 1c3bcc424954cdcc59cecdb50c0018bc61f28d36
+  data.tar.gz: b67d48f87edf576d5416a46df0e2c921b692d0d8
 SHA512:
-  metadata.gz: '029e0c38c1826c88154b558c241d0f4d9e3e52b51554fbe20d0f3460fcffd1f3d9de107a8321670b05732a0d7b74820f5fa94c69a0e593b2ca2e65d62f9315d8'
-  data.tar.gz: a0df31050a5da15be8033d9a86614e11190321e74b771b102346f06717f8be33c87c94e69f49595328b5ab7c4088c551db3bf9ffb645fec96003fabb57450446
+  metadata.gz: 5849c0b42c0f198876bc20d3b48a5ac74e4afbce99b7a83c8af9a6ba709d8031fbe8ee7dcabdb6336babec4e1864baf5934851c28c82f568ff7d8f3f90c627da
+  data.tar.gz: cfb180a53d56cb07e28e4a8a33e5285316f0c7b7a5bd8b1dc75b73d13c798d794d8a2680abcf6feffc00bf24c8baff1b95a77f5113ce664fa9ca6ae0b6971d17

data/lib/watir_pump/component.rb

@@ -187,8 +187,30 @@ module WatirPump
     end
     alias node root
 
+    def form_field_writers
+      return @form_field_writers if @form_field_writers
+      @form_field_writers = Set.new
+      self.class.ancestors.each do |a|
+        if a.respond_to? :form_field_writers
+          @form_field_writers += a.form_field_writers
+        end
+      end
+      @form_field_writers
+    end
+
+    def form_field_readers
+      return @form_field_readers if @form_field_readers
+      @form_field_readers = Set.new
+      self.class.ancestors.each do |a|
+        if a.respond_to? :form_field_readers
+          @form_field_readers += a.form_field_readers
+        end
+      end
+      @form_field_readers
+    end
+
     def fill_form(data)
-      missing = data.to_h.keys - self.class.form_field_writers.to_a
+      missing = data.to_h.keys - form_field_writers.to_a
       unless missing.empty?
         raise "#{self.class.name} does not contain writer(s) for #{missing}"
       end
@@ -205,7 +227,7 @@ module WatirPump
 
     def form_data
       {}.tap do |h|
-        self.class.form_field_readers.map do |field|
+        form_field_readers.map do |field|
           h[field] = send(field)
         end
       end

data/lib/watir_pump/page.rb

@@ -18,7 +18,14 @@ module WatirPump
       delegate INSTANCE_DELEGATED_METHODS => :instance
 
       def uri(uri = nil)
-        @uri = uri unless uri.nil?
+        return @uri if @uri
+        if uri.nil?
+          ancestors[1..-1].each do |a|
+            return @uri = a.uri if a.respond_to?(:uri) && a.uri
+          end
+        else
+          @uri = uri
+        end
         @uri
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: watir_pump
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Bartek Wilczek