watir_drops 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1b475375851d1ea8fc17aa62fe2cfd1e437200d
-  data.tar.gz: 4e8860a64f047f6b504d3e85cc74a3a704bf6a5b
+  metadata.gz: e9ff8bd28fdad499598436c884e44f46fa563035
+  data.tar.gz: b32d82432fff06087e5481f0386b29b454240a87
 SHA512:
-  metadata.gz: 01462e4c5a5c0ead9be37393f56b631e17b2e6a9aeb03ff358c3a7fb3a5ebf68647cfe3ae9bd13f16df425eb94b96e4745f666c564b2caa280fb77da4c039876
-  data.tar.gz: 17f4e13f11d2dea7439e7d3cead93150371615abc8d4275f56b0ab5242c90b86546c10f2259b24b557148881b2d937c074a33436d84126a1b0a3436c5195a668
+  metadata.gz: 426fb0ebf0323aec3c8ac52d87923c06d12d08f4aedf71cb088e7ff68a021f420cec5e80bd1f41b09c50390d050424a4064924d41785190915e5c958f0433bb7
+  data.tar.gz: 99ffbcf96242fc928336bcac3e2e906aa586e003f63fb4c18ee4523b1401dd9b968ff69995e963594f582118d75a5d34839aca5a04318094b86f39b0108f1095

data/CHANGES.md

@@ -1,3 +1,7 @@
+### 0.5.0 (2016-02-16)
+
+* split new definition of elements & collections into a sub-class
+
 ### 0.4.1 (2016-02-15)
 
 * alias fill_form with populate_page_with (page_object gem equivalent)

data/lib/watir_drops.rb

@@ -1,2 +1,3 @@
 require 'watir-webdriver'
 require 'watir_drops/page_object'
+require 'watir_drops/training_wheels'

data/lib/watir_drops/page_object.rb

@@ -21,60 +21,49 @@ module WatirDrops
         subclass.element_list = element_list.dup
       end
 
-      Watir::Container.instance_methods(false).each do |class_method_name|
-        define_method(class_method_name) do |instance_method_name, locator = {}, &block|
-          define_method(instance_method_name) do |*args|
-            if block.is_a? Proc
-              raise StandardError, 'Can not define element with both locator and block' unless locator.empty?
-              expected_class = browser.send(class_method_name).class
-              element = self.instance_exec(*args, &block)
-              return element if element.is_a? expected_class
-              raise StandardError, "#{instance_method_name} method was defined as a #{expected_class}, but is a #{element.class}"
-            else
-              browser.send(class_method_name, locator)
-            end
-          end
+      def elements(name, &block)
+        define_method(name) do |*args|
+          self.instance_exec(*args, &block)
+        end
 
-          define_method("#{instance_method_name}=") do |val|
-            watir_element = self.send(instance_method_name)
-            watir_element.wait_until_present
-            case watir_element
-              when Watir::Radio
-                watir_element.set if val
-              when Watir::CheckBox
-                val ? watir_element.set : watir_element.clear
-              when Watir::Select
-                watir_element.select val
-              when Watir::Button
-                watir_element.click
-              # TODO - Email & Password types are not set to UserEditable in Watir
-              when Watir::Input
-                watir_element.wd.clear
-                watir_element.send_keys val
-              else
-                watir_element.click if val
-            end
-          end
+        element_list << name.to_sym
+      end
 
-          define_method(instance_method_name.to_s.pluralize) do |*args|
-            if block.is_a? Proc
-              expected_class = browser.send(class_method_name.to_s.pluralize).class
+      def element(name, &block)
+        define_method(name) do |*args|
+          self.instance_exec(*args, &block)
+        end
 
-              single_element = self.instance_exec(*args, &block)
-              parent = single_element.instance_variable_get('@parent')
-              selector = single_element.instance_variable_get('@selector')
-              element_type = selector.delete(:tag_name) || 'element'
-              element = parent.send(element_type.pluralize, selector)
+        define_method(name.to_s.pluralize) do |*args|
+          single_element = self.instance_exec(*args, &block)
+          parent = single_element.instance_variable_get('@parent')
+          selector = single_element.instance_variable_get('@selector')
+          element_type = selector.delete(:tag_name) || 'element'
+          parent.send(element_type.pluralize, selector)
+        end
 
-              return element if element.is_a?(expected_class) || class_method_name == :element
-              raise StandardError, "#{instance_method_name} method was defined as a #{expected_class}, but is a #{element.class}"
+        define_method("#{name}=") do |val|
+          watir_element = self.instance_exec &block
+          watir_element.wait_until_present
+          case watir_element
+            when Watir::Radio
+              watir_element.set if val
+            when Watir::CheckBox
+              val ? watir_element.set : watir_element.clear
+            when Watir::Select
+              watir_element.select val
+            when Watir::Button
+              watir_element.click
+            # TODO - Email & Password types are not set to UserEditable in Watir
+            when Watir::Input
+              watir_element.wd.clear
+              watir_element.send_keys val
             else
-              browser.send(class_method_name.to_s.pluralize, locator)
-            end
+              watir_element.click if val
           end
-
-          element_list << instance_method_name.to_sym
         end
+
+        element_list << name.to_sym
       end
 
       def visit(*args)
@@ -88,28 +77,29 @@ module WatirDrops
         new.tap { yield if block_given? }
       end
 
-      def browser=(*args)
-        @@browser = block_given? ? yield(args) : args.first
+      def browser=(browser_input)
+        @@browser = browser_input
       end
 
       def browser
-        @@browser || (WatirSession.browser if defined? WatirSession)
+        @@browser
       end
 
     end
 
-    def browser
-      self.class.browser
+    attr_reader :browser
+
+    def initialize(browser_input = @@browser)
+      @browser = browser_input
     end
 
     def fill_form(model)
-      model = model.to_h unless model.is_a? Hash
+      model = model.to_h if model.is_a? OpenStruct
       intersect = self.class.element_list & model.keys
       intersect.each do |val|
         self.send("#{val}=", model[val])
       end
     end
-    alias_method :populate_page_with, :fill_form
 
     def title
       browser.title

data/lib/watir_drops/training_wheels.rb

@@ -0,0 +1,67 @@
+module WatirDrops
+
+  class TrainingWheels < PageObject
+
+    class << self
+
+      Watir::Container.instance_methods(false).each do |class_method_name|
+        define_method(class_method_name) do |instance_method_name, locator = {}, &block|
+          define_method(instance_method_name) do |*args|
+            if block.is_a? Proc
+              raise StandardError, 'Can not define element with both locator and block' unless locator.empty?
+              expected_class = browser.send(class_method_name).class
+              element = self.instance_exec(*args, &block)
+              return element if element.is_a? expected_class
+              raise StandardError, "#{instance_method_name} method was defined as a #{expected_class}, but is a #{element.class}"
+            else
+              browser.send(class_method_name, locator)
+            end
+          end
+
+          define_method("#{instance_method_name}=") do |val|
+            watir_element = self.send(instance_method_name)
+            watir_element.wait_until_present
+            case watir_element
+            when Watir::Radio
+              watir_element.set if val
+            when Watir::CheckBox
+              val ? watir_element.set : watir_element.clear
+            when Watir::Select
+              watir_element.select val
+            when Watir::Button
+              watir_element.click
+              # TODO - Email & Password types are not set to UserEditable in Watir
+            when Watir::Input
+              watir_element.wd.clear
+              watir_element.send_keys val
+            else
+              watir_element.click if val
+            end
+          end
+
+          define_method(instance_method_name.to_s.pluralize) do |*args|
+            if block.is_a? Proc
+              expected_class = browser.send(class_method_name.to_s.pluralize).class
+
+              single_element = self.instance_exec(*args, &block)
+              parent = single_element.instance_variable_get('@parent')
+              selector = single_element.instance_variable_get('@selector')
+              element_type = selector.delete(:tag_name) || 'element'
+              element = parent.send(element_type.pluralize, selector)
+
+              return element if element.is_a?(expected_class) || class_method_name == :element
+              raise StandardError, "#{instance_method_name} method was defined as a #{expected_class}, but is a #{element.class}"
+            else
+              browser.send(class_method_name.to_s.pluralize, locator)
+            end
+          end
+
+          element_list << instance_method_name.to_sym
+        end
+      end
+    end
+
+    alias_method :populate_page_with, :fill_form
+
+  end
+end

data/watir_drops.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = 'watir_drops'
-  spec.version       = '0.4.1'
+  spec.version       = '0.5.0'
   spec.authors       = ['Titus Fortner']
   spec.email         = ['titusfortner@gmail.com']
 
@@ -16,11 +16,12 @@ application information, allowing it to be decoupled from the tests}
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'activesupport', '~> 3.0'
+  spec.add_runtime_dependency 'watir-webdriver'
 
   spec.add_development_dependency 'bundler', '~> 1.10'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.3'
   spec.add_development_dependency 'factory_girl'
   spec.add_development_dependency 'data_magic'
-  spec.add_development_dependency 'watir_session', '~> 0.2'
+  spec.add_development_dependency 'watir_model'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: watir_drops
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Titus Fortner
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: watir-webdriver
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -95,19 +109,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: watir_session
+  name: watir_model
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0'
 description: |-
   This gem leverages the Watir test framework to allow for easy modeling of specific web
   application information, allowing it to be decoupled from the tests
@@ -125,6 +139,7 @@ files:
 - Rakefile
 - lib/watir_drops.rb
 - lib/watir_drops/page_object.rb
+- lib/watir_drops/training_wheels.rb
 - watir_drops.gemspec
 homepage: https://github.com/titusfortner/watir_drops
 licenses: