automation_object 0.6.0 → 0.7.5

data/lib/automation_object/state/{composite/hook_actions → hook_actions}/reset_screen.rb

@@ -3,11 +3,10 @@ require_relative 'action_loop'
 
 module AutomationObject
   module State
-    module Composite
-      # Reset screen hook loop
-      class ResetScreen < ActionLoop
-        def single_run
-        end
+    # Reset screen hook loop
+    class ResetScreen < ActionLoop
+      def single_run
+        composite.screen.reset
       end
     end
   end

data/lib/automation_object/state/hook_actions/show_modal.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+require_relative 'action_loop'
+
+module AutomationObject
+  module State
+    # Show modal hook loop
+    class ShowModal < ActionLoop
+      def single_run
+        new_modal = composite.screen.modals[blue_prints]
+
+        return false if new_modal.load.live? == false
+
+        new_modal.activate
+        true
+      end
+    end
+  end
+end

data/lib/automation_object/state/hook_actions/sleep.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+require_relative 'action_loop'
+
+module AutomationObject
+  module State
+    # Sleep hook loop
+    class Sleep < ActionLoop
+      def single_run
+        sleep(blue_prints)
+      end
+    end
+  end
+end

data/lib/automation_object/state/hook_actions/wait_for_elements.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+require_relative 'action_loop'
+
+module AutomationObject
+  module State
+    # Wait for elements hook loop
+    class WaitForElements < ActionLoop
+      def single_run
+        blue_prints.each do |hook_element_requirement|
+          hook_element_requirement = ElementRequirement.new(driver, hook_element_requirement, 1)
+          return false unless hook_element_requirement.run
+        end
+
+        true
+      end
+    end
+  end
+end

data/lib/automation_object/state/modal.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+require_relative '_base'
+require_relative '_error'
+
+require_relative 'element'
+require_relative 'element_array'
+require_relative 'element_hash'
+
+module AutomationObject
+  module State
+    # Modal composite for managing state
+    class Modal < Base
+      has_one :load, interface: Hook
+
+      has_many :elements, interface: Element
+      has_many :element_arrays, interface: ElementArray
+      has_many :element_hashes, interface: ElementHash
+
+      def utilize
+        raise ModalNotActiveError, name unless active?
+      end
+
+      # Whether or not modal is active
+      attr_accessor :active
+
+      # @return [Boolean] screen is active or not
+      def active?
+        @active ||= false
+      end
+
+      def activate
+        @active = true
+      end
+
+      def deactivate
+        @active = false
+        reset
+      end
+
+      def reset
+        elements.values.map(&:reset)
+        element_arrays.values.map(&:reset)
+        element_hashes.values.map(&:reset)
+      end
+    end
+  end
+end

data/lib/automation_object/state/screen.rb

@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+require_relative '_base'
+require_relative '_error'
+
+require_relative 'modal'
+require_relative 'hook'
+require_relative 'element'
+require_relative 'element_array'
+require_relative 'element_hash'
+
+module AutomationObject
+  module State
+    # Screen composite for managing state
+    class Screen < Base
+      attr_accessor :modal, :window_handle, :previous_screen_name
+
+      has_one :load, interface: Hook
+
+      # Children for this composite
+      has_many :modals, interface: Modal
+
+      has_many :elements, interface: Element
+      has_many :element_arrays, interface: ElementArray
+      has_many :element_hashes, interface: ElementHash
+
+      # Whether or not modal is active
+      attr_accessor :active
+
+      # @return [Boolean] screen is active or not
+      def active?
+        @active ||= false
+      end
+
+      def activate
+        @active = true
+        self.window_handle = driver.window_handle
+      end
+
+      def deactivate
+        @active = false
+        self.window_handle = nil
+        modals.values.map(&:deactivate)
+        reset
+      end
+
+      def utilize
+        raise ScreenNotActiveError, name unless active?
+        driver.window_handle = window_handle if window_handle != driver.window_handle
+      end
+
+      def close
+        raise ScreenNotActiveError, name unless active?
+
+        driver.window_handle = window_handle if window_handle != driver.window_handle
+        driver.close
+      end
+
+      # @return [Boolean]
+      def closed?
+        !driver.window_handles.include?(window_handle)
+      end
+
+      def reset
+        elements.values.map(&:reset)
+        element_arrays.values.map(&:reset)
+        element_hashes.values.map(&:reset)
+      end
+    end
+  end
+end

data/lib/automation_object/state/top.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+require_relative '_base'
+require_relative '_error'
+
+require_relative 'screen'
+
+module AutomationObject
+  module State
+    # Top composite for managing state
+    class Top < Base
+      # Children for this composite
+      has_many :screens, interface: Screen
+
+      def initialize(*args)
+        super(*args)
+
+        driver.get(blue_prints.base_url) if blue_prints.base_url
+        set_initial_screen
+      end
+
+      # Get the initial screen
+      # @raise [AutomationObject::State::NoInitialScreenError] if no initial screen
+      # @return [Symbol] screen name
+      def set_initial_screen
+        # If default screen then check if its live and set it
+        if blue_prints.default_screen
+          default_name = blue_prints.default_screen
+
+          raise AutomationObject::State::NoInitialScreenError if screens[default_name].load.live? != true
+
+          return screens[default_name].activate
+        end
+
+        screens.each_value do |screen|
+          next unless screen.load.live?
+          return screen.activate
+        end
+
+        raise AutomationObject::State::NoInitialScreenError
+      end
+    end
+  end
+end

data/lib/automation_object/state.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require_relative 'state/session'
+require_relative 'state/top'
 
 module AutomationObject
   # State Port, following port/adapter pattern
@@ -11,9 +11,9 @@ module AutomationObject
     # Will use a composite to help control the state
     # @param driver [AutomationObject::Driver::Driver] driver interface
     # @param blue_prints [AutomationObject::BluePrint::Composite::Top] Top composite interface
-    # # @return [AutomationObject::State::Session] Session instance
+    # # @return [AutomationObject::State::Top] Top instance
     def create(driver, blue_prints)
-      Session.new(driver, blue_prints)
+      Top.new(driver, blue_prints)
     end
   end
 end

data/lib/automation_object/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module AutomationObject
-  VERSION = '0.6.0'
+  VERSION = '0.7.5'
 end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: automation_object
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.5
 platform: ruby
 authors:
 - Michael Blatter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-16 00:00:00.000000000 Z
+date: 2016-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.12'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11.3'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.9.4
+        version: '2.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.9.4
+        version: '2.9'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -98,16 +98,16 @@ dependencies:
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
@@ -398,33 +398,30 @@ files:
 - lib/automation_object/proxy/proxy.rb
 - lib/automation_object/proxy/throttle_proxy.rb
 - lib/automation_object/state.rb
-- lib/automation_object/state/composite/_base.rb
-- lib/automation_object/state/composite/_common_element.rb
-- lib/automation_object/state/composite/element.rb
-- lib/automation_object/state/composite/element_array.rb
-- lib/automation_object/state/composite/element_hash.rb
-- lib/automation_object/state/composite/element_proxy.rb
-- lib/automation_object/state/composite/helpers/window.rb
-- lib/automation_object/state/composite/helpers/window_manager.rb
-- lib/automation_object/state/composite/hook.rb
-- lib/automation_object/state/composite/hook_action.rb
-- lib/automation_object/state/composite/hook_actions/action_loop.rb
-- lib/automation_object/state/composite/hook_actions/change_screen.rb
-- lib/automation_object/state/composite/hook_actions/change_to_previous_screen.rb
-- lib/automation_object/state/composite/hook_actions/close_modal.rb
-- lib/automation_object/state/composite/hook_actions/close_screen.rb
-- lib/automation_object/state/composite/hook_actions/element_requirement.rb
-- lib/automation_object/state/composite/hook_actions/new_screen.rb
-- lib/automation_object/state/composite/hook_actions/possible_screen_changes.rb
-- lib/automation_object/state/composite/hook_actions/reset_screen.rb
-- lib/automation_object/state/composite/hook_actions/show_modal.rb
-- lib/automation_object/state/composite/hook_actions/sleep.rb
-- lib/automation_object/state/composite/hook_actions/wait_for_elements.rb
-- lib/automation_object/state/composite/modal.rb
-- lib/automation_object/state/composite/screen.rb
-- lib/automation_object/state/composite/top.rb
-- lib/automation_object/state/error.rb
-- lib/automation_object/state/session.rb
+- lib/automation_object/state/_base.rb
+- lib/automation_object/state/_common_element.rb
+- lib/automation_object/state/_error.rb
+- lib/automation_object/state/element.rb
+- lib/automation_object/state/element_array.rb
+- lib/automation_object/state/element_hash.rb
+- lib/automation_object/state/element_proxy.rb
+- lib/automation_object/state/hook.rb
+- lib/automation_object/state/hook_action.rb
+- lib/automation_object/state/hook_actions/action_loop.rb
+- lib/automation_object/state/hook_actions/change_screen.rb
+- lib/automation_object/state/hook_actions/change_to_previous_screen.rb
+- lib/automation_object/state/hook_actions/close_modal.rb
+- lib/automation_object/state/hook_actions/close_screen.rb
+- lib/automation_object/state/hook_actions/element_requirement.rb
+- lib/automation_object/state/hook_actions/new_screen.rb
+- lib/automation_object/state/hook_actions/possible_screen_changes.rb
+- lib/automation_object/state/hook_actions/reset_screen.rb
+- lib/automation_object/state/hook_actions/show_modal.rb
+- lib/automation_object/state/hook_actions/sleep.rb
+- lib/automation_object/state/hook_actions/wait_for_elements.rb
+- lib/automation_object/state/modal.rb
+- lib/automation_object/state/screen.rb
+- lib/automation_object/state/top.rb
 - lib/automation_object/step_definitions.rb
 - lib/automation_object/step_definitions/element.rb
 - lib/automation_object/step_definitions/element_array.rb

data/lib/automation_object/state/composite/_base.rb

@@ -1,81 +0,0 @@
-# frozen_string_literal: true
-require_relative '../../helpers/composite'
-
-module AutomationObject
-  module State
-    module Composite
-      # Parent composite class
-      class Base < ::AutomationObject::Composite
-        # @return [AutomationObject::State::Session]
-        attr_accessor :session
-
-        # @return [AutomationObject::BluePrint::Composite::]
-        attr_accessor :blue_prints
-
-        # @return [AutomationObject::Driver::Driver]
-        attr_accessor :driver
-
-        # @param session [AutomationObject::State::Session] session
-        # @param driver [AutomationObject::Driver] driver
-        # @param blue_prints [AutomationObject::BluePrint::Composite::Base] blue print composite
-        # @param name [Symbol] name of composite element
-        # @param parent [Object, nil] parent composite object
-        # @param location [String] string location for error/debugging purposes
-        def initialize(session, driver, blue_prints, name = :top, parent = nil, location = 'top')
-          self.session = session
-          self.driver = driver
-          self.blue_prints = blue_prints
-
-          super(name, parent, location)
-        end
-
-        # Overriding base get_child method
-        # @param name [Symbol] name of child
-        # @param args [Hash] args
-        def get_child(name, args)
-          child_location = location + "[#{name}]"
-
-          args.fetch(:interface).new(session,
-                                     driver,
-                                     blue_prints.send(name),
-                                     name, self, child_location)
-        end
-
-        # Overriding base get_children method
-        # @param name [Symbol] name of child
-        # @param args [Hash] args
-        # @return children [Array<Composite>] return children and names
-        def get_children(name, args)
-          children_hash = {}
-
-          blue_prints.send(name).each do |child_key, child_blue_prints|
-            child_location = location + "[#{child_key}]"
-
-            children_hash[child_key] = args.fetch(:interface).new(session,
-                                                                  driver,
-                                                                  child_blue_prints,
-                                                                  name, self, child_location)
-          end
-
-          children_hash
-        end
-
-        # Recursive function to reach parent screen
-        # Can return nil if above a screen!
-        # @return [AutomationObject::State::Composite::Screen,nil]
-        def screen
-          return nil if is_a?(Top)
-
-          # Should recursively call top until parent is nil
-          is_a?(Screen) ? self : parent.screen
-        end
-
-        # Recursive function to reach top
-        # @return [AutomationObject::State::Composite::Top]
-        def top
-          is_a?(Top) ? self : parent.top
-        end
-      end
-    end
-  end
-end