watir_pump 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ffaf36b627fe9a96a2e049a78722425468ab4c0
-  data.tar.gz: 22d9a1bab82fb13eb3b5b7e7a469c9fb10798da7
+  metadata.gz: 02e401686e107b87efd108c2ddf4325f02e982d0
+  data.tar.gz: e2f460ee7306706cfac9cd43fac92722e8eb76f7
 SHA512:
-  metadata.gz: f0ba097dc075aeb94799110920f644fc890fc712c101997eb53e209b647fa74ea4a95e93277d3ae6156553e270b8c157f8baa4e4e1d7729c5d9b897d1fca5461
-  data.tar.gz: e80ed1f00a227ef55b67137788e2782a25192f24b3c85915d7897dcff5ba063b2befac8c69160ac59c82870acec82c8a0d0b68b20cb7a832b8cb29cbb4ac68ee
+  metadata.gz: fc80d939a394010276058897d615605cc999030350d70a0b92edb5a5c8fd45226e3ea53e3fb87d87defec5d2682f5749e9f8c991ce590ccc7d6e3a496b46d1bf
+  data.tar.gz: 429bea681e781b515948e6b7e8a21801bc9f4a47da693eb5f8140698ec9861e92f1a18744e266bfdab63055ed7ef6305fe5e5b37b4703160ac24a465ac573571

data/lib/watir_pump/component.rb

@@ -32,16 +32,34 @@ module WatirPump
         end
       end
 
+      def form_field_readers
+        @form_field_readers ||= Set.new
+      end
+
+      def form_field_writers
+        @form_field_writers ||= Set.new
+      end
+
       include Components::RadioGroup
       include Components::CheckboxGroup
       include Components::DropdownList
 
+      def custom_reader(name, code = nil)
+        form_field_readers << name
+        query(name, code) if code
+      end
+
+      def custom_writer(name, code = nil)
+        form_field_writers << name
+        query("#{name}=", code) if code
+      end
+
       def self.define_reader(watir_method)
         define_method "#{watir_method}_reader" do |name, *args|
-          send(watir_method, "#{name}_element", *args)
+          send(watir_method, "#{name}_reader_element", *args)
+          form_field_readers << name
           define_method(name) do
-            @form_fields << name
-            el = send("#{name}_element")
+            el = send("#{name}_reader_element")
             %w[input textarea].include?(el.tag_name) ? el.value : el.text
           end
         end
@@ -49,27 +67,27 @@ module WatirPump
 
       def self.define_writer(watir_method)
         define_method "#{watir_method}_writer" do |name, *args|
-          send(watir_method, "#{name}_element", *args)
+          send(watir_method, "#{name}_writer_element", *args)
+          form_field_writers << name
           define_method("#{name}=") do |value|
-            @form_fields << name
-            send("#{name}_element").set value
+            send("#{name}_writer_element").set value
           end
         end
       end
 
-      def self.define_accessor(watir_method)
+      def self.define_accessor(watir_method) # rubocop:disable Metrics/AbcSize
         define_method "#{watir_method}_accessor" do |name, *args|
-          send(watir_method, "#{name}_element", *args)
+          send(watir_method, "#{name}_accessor_element", *args)
           # reader, TODO: DRY it up
+          form_field_readers << name
           define_method(name) do
-            @form_fields << name
-            el = send("#{name}_element")
+            el = send("#{name}_accessor_element")
             %w[input textarea].include?(el.tag_name) ? el.value : el.text
           end
           # writer, TODO: DRY it up
+          form_field_writers << name
           define_method("#{name}=") do |value|
-            @form_fields << name
-            send("#{name}_element").set value
+            send("#{name}_accessor_element").set value
           end
         end
       end
@@ -95,9 +113,9 @@ module WatirPump
       # Methods for element clickers
       Constants::CLICKABLES.each do |watir_method|
         define_method "#{watir_method}_clicker" do |name, *args|
-          send(watir_method, "#{name}_element", *args)
+          send(watir_method, "#{name}_clicker_element", *args)
           define_method(name) do
-            send("#{name}_element").click
+            send("#{name}_clicker_element").click
           end
         end
       end
@@ -144,13 +162,21 @@ module WatirPump
           end
         end
       end
+
+      def decorate2(method, code)
+        original_name = "#{method}_before_decorate2".to_sym
+        alias_method original_name, method
+        define_method method do |*args|
+          v = send(original_name, *args)
+          instance_exec(v, &code)
+        end
+      end
     end
 
     def initialize(browser, parent = nil, root_node = nil)
       @browser = browser
       @parent = parent
       @root_node = root_node
-      @form_fields = Set.new
     end
 
     def root
@@ -162,6 +188,10 @@ module WatirPump
     alias node root
 
     def fill_form(data)
+      missing = data.to_h.keys - self.class.form_field_writers.to_a
+      unless missing.empty?
+        raise "#{self.class.name} does not contain writer(s) for #{missing}"
+      end
       data.to_h.each_pair do |k, v|
         send("#{k}=", v)
       end
@@ -169,7 +199,9 @@ module WatirPump
 
     def form_data
       {}.tap do |h|
-        @form_fields.map { |field| h[field] = send(field) }
+        self.class.form_field_readers.map do |field|
+          h[field] = send(field)
+        end
       end
     end
 

data/lib/watir_pump/components/checkbox_group.rb

@@ -4,8 +4,8 @@ module WatirPump
   module Components
     module CheckboxGroup
       def checkbox_writer(name, *args) # rubocop:disable Metrics/AbcSize
+        form_field_writers << name
         define_method "#{name}=" do |values|
-          @form_fields << name
           values = Array(values)
           # <label>value<input /></label>
           list = find_element(:checkboxes, args)
@@ -21,8 +21,8 @@ module WatirPump
       end
 
       def checkbox_reader(name, *args) # rubocop:disable Metrics/AbcSize
+        form_field_readers << name
         define_method name do
-          @form_fields << name
           selected = find_element(:checkboxes, args).select(&:set?)
           return [] unless selected
           if selected.first&.parent&.tag_name == 'label'

data/lib/watir_pump/components/dropdown_list.rb

@@ -4,8 +4,8 @@ module WatirPump
   module Components
     module DropdownList
       def select_reader(name, *args)
+        form_field_readers << name
         define_method(name) do
-          @form_fields << name
           select = find_element(:select, args)
           selected = select.selected_options
           return select.multiple? ? selected.map(&:text) : selected.first.text
@@ -13,8 +13,8 @@ module WatirPump
       end
 
       def select_writer(name, *args)
+        form_field_writers << name
         define_method("#{name}=") do |values|
-          @form_fields << name
           select = find_element(:select, args)
           return select.select(*values)
         end

data/lib/watir_pump/components/radio_group.rb

@@ -4,8 +4,8 @@ module WatirPump
   module Components
     module RadioGroup
       def radio_reader(name, *args)
+        form_field_readers << name
         define_method name do |*loc_args|
-          @form_fields << name
           list = find_element(:radios, args, loc_args)
           selected = list.find(&:set?)
           if selected
@@ -16,8 +16,8 @@ module WatirPump
       end
 
       def radio_writer(name, *args) # rubocop:disable Metrics/AbcSize
+        form_field_writers << name
         define_method "#{name}=" do |value|
-          @form_fields << name
           list = find_element(:radios, args)
           # <label>value<input /></label>
           if list.first.parent.tag_name == 'label'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: watir_pump
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Bartek Wilczek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-03 00:00:00.000000000 Z
+date: 2018-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport