watir_pump 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aabfc0131d87382783e34ce50c0d8d2d5300e4b3
-  data.tar.gz: 893135fab092562d453dd8cf8896dcd1de4e0b8a
+  metadata.gz: 7ffaf36b627fe9a96a2e049a78722425468ab4c0
+  data.tar.gz: 22d9a1bab82fb13eb3b5b7e7a469c9fb10798da7
 SHA512:
-  metadata.gz: 5f2da34a3a1c0955dae1303c30566441973e110241e0346e1e1dd57d8e592fc1ed04aebb51f78df3ede6fd6419915065b53413d42c59a041d2c3ccacde99b9c6
-  data.tar.gz: 05cb2d72b0540aad1848dfa42ca080407efadda83800615942d3dcd426eab80253e4821d52b51383b18a46b2332d7376bb76708781eec4a106a8619a5443b484
+  metadata.gz: f0ba097dc075aeb94799110920f644fc890fc712c101997eb53e209b647fa74ea4a95e93277d3ae6156553e270b8c157f8baa4e4e1d7729c5d9b897d1fca5461
+  data.tar.gz: e80ed1f00a227ef55b67137788e2782a25192f24b3c85915d7897dcff5ba063b2befac8c69160ac59c82870acec82c8a0d0b68b20cb7a832b8cb29cbb4ac68ee

data/lib/watir_pump/component.rb

@@ -1,12 +1,17 @@
 # frozen_string_literal: true
 
+require 'set'
+require 'forwardable'
+
 require_relative 'component_collection'
 require_relative 'decorated_element'
 require_relative 'constants'
-require 'forwardable'
+require_relative 'components/radio_group'
+require_relative 'components/checkbox_group'
+require_relative 'components/dropdown_list'
 
 module WatirPump
-  class Component
+  class Component # rubocop:disable Metrics/ClassLength
     extend Forwardable
 
     include Constants
@@ -20,39 +25,73 @@ module WatirPump
       # Proxy methods for HTML tags
       Watir::Container.instance_methods(false).each do |watir_method|
         define_method watir_method do |name, *args|
+          return if public_methods.include? name
           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
+            find_element(watir_method, args, loc_args)
           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
-      Constants::READABLES.each do |watir_method|
+      include Components::RadioGroup
+      include Components::CheckboxGroup
+      include Components::DropdownList
+
+      def self.define_reader(watir_method)
         define_method "#{watir_method}_reader" do |name, *args|
           send(watir_method, "#{name}_element", *args)
           define_method(name) do
-            send("#{name}_element").text
+            @form_fields << name
+            el = send("#{name}_element")
+            %w[input textarea].include?(el.tag_name) ? el.value : el.text
           end
         end
       end
 
-      # Methods for element content writers
-      Constants::WRITABLES.each do |watir_method|
+      def self.define_writer(watir_method)
         define_method "#{watir_method}_writer" do |name, *args|
           send(watir_method, "#{name}_element", *args)
           define_method("#{name}=") do |value|
+            @form_fields << name
             send("#{name}_element").set value
           end
         end
       end
 
+      def self.define_accessor(watir_method)
+        define_method "#{watir_method}_accessor" do |name, *args|
+          send(watir_method, "#{name}_element", *args)
+          # reader, TODO: DRY it up
+          define_method(name) do
+            @form_fields << name
+            el = send("#{name}_element")
+            %w[input textarea].include?(el.tag_name) ? el.value : el.text
+          end
+          # writer, TODO: DRY it up
+          define_method("#{name}=") do |value|
+            @form_fields << name
+            send("#{name}_element").set value
+          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
+      Constants::READABLES.each do |watir_method|
+        define_reader(watir_method)
+      end
+
+      # Methods for element content writers
+      Constants::WRITABLES.each do |watir_method|
+        define_writer(watir_method)
+      end
+
+      # Methods for element content accessors
+      (Constants::WRITABLES & Constants::READABLES).each do |watir_method|
+        define_accessor(watir_method)
+      end
+
       # Methods for element clickers
       Constants::CLICKABLES.each do |watir_method|
         define_method "#{watir_method}_clicker" do |name, *args|
@@ -68,6 +107,8 @@ module WatirPump
           instance_exec(*args, &p)
         end
       end
+      alias element query
+      alias elements query
 
       def region(name, loc_method = nil, *loc_args, &blk)
         klass = Class.new(Component) { instance_exec(&blk) }
@@ -76,22 +117,20 @@ module WatirPump
 
       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
+          node = find_element_raw(watir_method: loc_method,
+                                  watir_method_args: loc_args,
+                                  code: loc_method,
+                                  code_args: args)
           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
+          nodes = find_element_raw(watir_method: loc_method,
+                                   watir_method_args: loc_args,
+                                   code: loc_method,
+                                   code_args: args)
           ComponentCollection.new(nodes.map { |n| klass.new(browser, self, n) })
         end
       end
@@ -111,6 +150,7 @@ module WatirPump
       @browser = browser
       @parent = parent
       @root_node = root_node
+      @form_fields = Set.new
     end
 
     def root
@@ -121,6 +161,33 @@ module WatirPump
     end
     alias node root
 
+    def fill_form(data)
+      data.to_h.each_pair do |k, v|
+        send("#{k}=", v)
+      end
+    end
+
+    def form_data
+      {}.tap do |h|
+        @form_fields.map { |field| h[field] = send(field) }
+      end
+    end
+
+    def find_element(watir_method, args, loc_args = nil)
+      find_element_raw(watir_method: watir_method,
+                       watir_method_args: args,
+                       code: args.first,
+                       code_args: loc_args)
+    end
+
+    def find_element_raw(watir_method: nil, watir_method_args: nil, code: nil, code_args: nil) # rubocop:disable Metrics/LineLength
+      if code.is_a? Proc
+        instance_exec(*code_args, &code)
+      elsif watir_method
+        root.send(watir_method, *watir_method_args)
+      end
+    end
+
     def method_missing(name, *args)
       # delegate missing methods to current RSpec example if set
       example = WatirPump.config.current_example

data/lib/watir_pump/components/checkbox_group.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module WatirPump
+  module Components
+    module CheckboxGroup
+      def checkbox_writer(name, *args) # rubocop:disable Metrics/AbcSize
+        define_method "#{name}=" do |values|
+          @form_fields << name
+          values = Array(values)
+          # <label>value<input /></label>
+          list = find_element(:checkboxes, args)
+          values.each do |value|
+            if list.first.parent.tag_name == 'label'
+              list.find { |el| el.parent.text == value }.set
+            else
+              # <label for='a'>value</label><input id='a' />
+              list.find { |el| el.id == root.label(text: value).for }.set
+            end
+          end
+        end
+      end
+
+      def checkbox_reader(name, *args) # rubocop:disable Metrics/AbcSize
+        define_method name do
+          @form_fields << name
+          selected = find_element(:checkboxes, args).select(&:set?)
+          return [] unless selected
+          if selected.first&.parent&.tag_name == 'label'
+            return selected.map { |el| el.parent.text }
+          end
+          selected.map { |el| root.label(for: el.id).text }
+        end
+      end
+
+      def checkbox_accessor(name, *args)
+        checkbox_reader(name, *args)
+        checkbox_writer(name, *args)
+      end
+      alias checkbox_group checkbox_accessor
+    end
+  end
+end

data/lib/watir_pump/components/dropdown_list.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module WatirPump
+  module Components
+    module DropdownList
+      def select_reader(name, *args)
+        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
+        end
+      end
+
+      def select_writer(name, *args)
+        define_method("#{name}=") do |values|
+          @form_fields << name
+          select = find_element(:select, args)
+          return select.select(*values)
+        end
+      end
+
+      def select_accessor(name, *args)
+        select_reader(name, *args)
+        select_writer(name, *args)
+      end
+      alias dropdown_list select_accessor
+    end
+  end
+end

data/lib/watir_pump/components/radio_group.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module WatirPump
+  module Components
+    module RadioGroup
+      def radio_reader(name, *args)
+        define_method name do |*loc_args|
+          @form_fields << name
+          list = find_element(:radios, args, loc_args)
+          selected = list.find(&:set?)
+          if selected
+            return selected.parent.text if selected&.parent&.tag_name == 'label'
+            return root.label(for: selected.id).text
+          end
+        end
+      end
+
+      def radio_writer(name, *args) # rubocop:disable Metrics/AbcSize
+        define_method "#{name}=" do |value|
+          @form_fields << name
+          list = find_element(:radios, args)
+          # <label>value<input /></label>
+          if list.first.parent.tag_name == 'label'
+            list.find { |el| el.parent.text == value }.set
+          else
+            # <label for='a'>value</label><input id='a' />
+            list.find { |el| el.id == root.label(text: value).for }.set
+          end
+        end
+      end
+
+      def radio_accessor(name, *args)
+        radio_reader(name, *args)
+        radio_writer(name, *args)
+      end
+      alias radio_group radio_accessor
+    end
+  end
+end

data/lib/watir_pump/constants.rb

@@ -16,7 +16,7 @@ module WatirPump
 
     WRITABLES = %i[
       text_field
-      text_area
+      textarea
     ].freeze
 
     READABLES = %i[
@@ -25,6 +25,8 @@ module WatirPump
       p
       link
       td
+      text_field
+      textarea
       h1
       h2
       h3

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: watir_pump
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Bartek Wilczek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-14 00:00:00.000000000 Z
+date: 2018-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -131,6 +131,9 @@ files:
 - lib/watir_pump.rb
 - lib/watir_pump/component.rb
 - lib/watir_pump/component_collection.rb
+- lib/watir_pump/components/checkbox_group.rb
+- lib/watir_pump/components/dropdown_list.rb
+- lib/watir_pump/components/radio_group.rb
 - lib/watir_pump/constants.rb
 - lib/watir_pump/decorated_element.rb
 - lib/watir_pump/page.rb