watir_drops 0.1.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6510cd26391a9257fe3c3cb6eb2957fed55831be
-  data.tar.gz: 112fbc8732ba85e0a9a55579441c699616faeb04
+  metadata.gz: 299a92e87b3d647d0607b8494ebb96530d288dc6
+  data.tar.gz: 864b1daef08f0d67bf59cf3f73aaa06e0a85411f
 SHA512:
-  metadata.gz: fc1cd499b7a87cc25bb9968736c04c9aae5d771c3a0c43ec4068ee09ffc570afad2ae1b9c80edb29e12ada3d5409af24334aacfcadba515118fe6d3d744d3958
-  data.tar.gz: 9af9603efc5a85053434e121c764ff1cbf886e628a11504f63257c940e2d7dd420b1ca30cb29f5ee1e671528c3e6387df810b4713f6b220fc917d390c8e45576
+  metadata.gz: 14f394a58a009bcd29ddddae1510a6bb054830b9b632ce7634f9df3f802119075cf697cca32e1242b8e8866709512af02084ec229ecac751e9abd79c82f316d0
+  data.tar.gz: 7ad1570992eca4938bb2a9b6b425952eda61dd3109593347c03a32b178442b3e617bac343a7336494e232c1c0b6a632de03045fd16086b12b677f2b7bc21ee8f

data/lib/watir_drops.rb

@@ -1,7 +1,6 @@
-require 'watir-webdriver'
+require 'watir_session'
+require 'require_all'
 
-require "watir_drops/version"
-require "watir_drops/session"
-require "watir_drops/page_object"
+require_all 'lib'
 
 include WatirDrops

data/lib/watir_drops/page_object.rb

@@ -1,10 +1,12 @@
+require "active_support/inflector"
+
 module WatirDrops
   class PageObject
 
     class << self
-      def page_url url
-        define_method("goto") do
-          browser.goto url
+      def page_url
+        define_method("goto") do |*args|
+          browser.goto yield(*args)
         end
       end
 
@@ -17,11 +19,18 @@ module WatirDrops
           self.instance_exec(*args, &block)
         end
 
+        define_method(name.to_s.pluralize) do |*args|
+          selector = self.instance_exec(*args, &block).instance_variable_get('@selector')
+          element_type = selector.delete :tag_name
+          browser.send(element_type.pluralize, selector)
+        end
+
+
         define_method("#{name}=") do |val|
           watir_element = self.instance_exec &block
           case watir_element
             when Watir::Radio
-              watir_element.set val
+              watir_element.set if val
             when Watir::CheckBox
               val ? watir_element.set : watir_element.clear
             when Watir::Select
@@ -36,22 +45,39 @@ module WatirDrops
         elements << {name.to_sym => block}
       end
 
+      def visit(*args)
+        new.tap do |page|
+          page.goto(*args)
+          yield if block_given?
+        end
+      end
+
+      def use
+        new.tap { yield if block_given? }
+      end
+
     end
 
     attr_reader :browser
 
-    def initialize(browser=nil)
-      @browser = browser || WatirDrops::Session.instance.browser
+    def initialize
+      @browser = WatirSession.browser
     end
 
-    def visit
-      goto if self.respond_to? :goto
-      self
+    def submit_form(model)
+      intersect = self.class.elements.map(&:keys).flatten & model.keys
+      intersect.each do |val|
+        self.send("#{val}=", model.send(val))
+      end
     end
 
     def title
       browser.title
     end
 
+    def url
+      browser.url
+    end
+
   end
 end

data/watir_drops.gemspec

@@ -1,11 +1,8 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'watir_drops/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "watir_drops"
-  spec.version       = WatirDrops::VERSION
+  spec.version       = '0.3.0'
   spec.authors       = ["Titus Fortner"]
   spec.email         = ["titusfortner@gmail.com"]
 
@@ -23,5 +20,9 @@ application information, allowing it to be decoupled from the tests}
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec"
-  spec.add_development_dependency "watir-webdriver", "~> 0.8.0"
+  spec.add_development_dependency "require_all"
+  spec.add_development_dependency "test-model"
+  spec.add_development_dependency "watir-webdriver"
+  spec.add_development_dependency "watir_session"
+  spec.add_development_dependency "activesupport", "~> 3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: watir_drops
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Titus Fortner
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-07-30 00:00:00.000000000 Z
+date: 2016-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,20 +52,76 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: require_all
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: test-model
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: watir-webdriver
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: watir_session
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '3.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
@@ -82,8 +138,6 @@ files:
 - Rakefile
 - lib/watir_drops.rb
 - lib/watir_drops/page_object.rb
-- lib/watir_drops/session.rb
-- lib/watir_drops/version.rb
 - watir_drops.gemspec
 homepage: https://github.com/titusfortner/watir_drops
 licenses:
@@ -105,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Page Object Framework for use with Watir

data/lib/watir_drops/session.rb

@@ -1,17 +0,0 @@
-require 'singleton'
-
-module WatirDrops
-  class Session
-    include Singleton
-
-    def browser
-      @browser ||= Watir::Browser.new :chrome
-    end
-
-    def quit
-      @browser.quit
-      @browser = nil
-    end
-
-  end
-end

data/lib/watir_drops/version.rb

@@ -1,3 +0,0 @@
-module WatirDrops
-  VERSION = "0.1.1"
-end