ae_page_objects 0.1.2.dt2 → 0.1.2

data/lib/ae_page_objects.rb

@@ -33,7 +33,6 @@ module AePageObjects
     autoload :Visitable,        'ae_page_objects/concerns/visitable'
   end
   
-  autoload :Window,            'ae_page_objects/window'
   autoload :Node,              'ae_page_objects/node'
   autoload :Document,          'ae_page_objects/document'
   autoload :Element,           'ae_page_objects/element'

data/lib/ae_page_objects/concerns/staleable.rb

@@ -7,7 +7,7 @@ module AePageObjects
       extend ActiveSupport::Concern
   
       def stale?
-        !!@stale
+        @stale
       end
 
       def node

data/lib/ae_page_objects/core/application.rb

@@ -3,8 +3,9 @@ module AePageObjects
     include AePageObjects::Singleton
       
     class << self
+      private :new
+
       attr_accessor :called_from
-      protected :called_from=
 
       delegate :initialize!, :to => :instance
       delegate :config,      :to => :instance

data/lib/ae_page_objects/core/singleton.rb

@@ -2,12 +2,6 @@ module AePageObjects
   module Singleton
     extend ActiveSupport::Concern
 
-    included do
-      class << self
-        private :new
-      end
-    end
-
     module ClassMethods
       def instance
         @instance ||= new

data/lib/ae_page_objects/document.rb

@@ -1,15 +1,6 @@
 module AePageObjects
   class Document < Node
     include Concerns::Visitable
-
-    attr_reader :window
-    
-    def initialize
-      super(Capybara.current_session)
-
-      @window = Window.current
-      @window.current_document = self
-    end
     
     def document
       self

data/lib/ae_page_objects/element.rb

@@ -20,7 +20,7 @@ module AePageObjects
       raise ArgumentError, ":name or :locator is required" unless @name || @locator
       
       @locator ||= default_locator
-
+      
       super(scoped_node)
     end
     
@@ -38,7 +38,7 @@ module AePageObjects
 
     def __full_name__
       if parent.respond_to?(:__full_name__)
-        [ parent.__full_name__, __name__ ].compact.presence.try(:join, '_')
+        [ parent.__full_name__, __name__ ].compact.join('_')
       else
         __name__
       end

data/lib/ae_page_objects/node.rb

@@ -7,7 +7,7 @@ module AePageObjects
       include Dsl::Collection
       include Dsl::FormFor
 
-      def initialize(capybara_node)
+      def initialize(capybara_node = Capybara.current_session)
         @node = capybara_node
       end
 

data/lib/ae_page_objects/version.rb

@@ -1,3 +1,3 @@
 module AePageObjects
-  VERSION = '0.1.2.dt2'.freeze
+  VERSION = '0.1.2'.freeze
 end

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ae_page_objects
 version: !ruby/object:Gem::Version 
-  hash: 115207405
-  prerelease: 6
+  hash: 31
+  prerelease: 
   segments: 
   - 0
   - 1
   - 2
-  - dt
-  - 2
-  version: 0.1.2.dt2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Donnie Tognazzini
@@ -147,7 +145,6 @@ files:
 - lib/ae_page_objects/elements/select.rb
 - lib/ae_page_objects/node.rb
 - lib/ae_page_objects/version.rb
-- lib/ae_page_objects/window.rb
 homepage: http://github.com/appfolio/ae_page_objects
 licenses: 
 - MIT

data/lib/ae_page_objects/window.rb

@@ -1,51 +0,0 @@
-module AePageObjects
-  class Window
-    class << self
-      def all
-        @all ||= {}
-      end
-
-      def current
-        current_handle = Capybara.current_session.driver.browser.window_handle
-
-        window = all.keys.find do |window|
-          window.handle == current_handle
-        end
-
-        unless window
-          window = new(current_handle)
-          all[window] = window
-        end
-
-        window
-      end
-    end
-
-    attr_reader :current_document, :handle
-
-    def initialize(handle)
-      @handle = handle
-      @current_document = nil
-
-      self.class.all[self] = self
-    end
-
-    def current_document=(document)
-      @current_document.send(:stale!) if @current_document
-      @current_document = document
-    end
-
-    def switch_to
-      Capybara.current_session.driver.browser.switch_to.window(handle)
-      current_document
-    end
-
-    def close
-      self.current_document = nil
-
-      Capybara.current_session.execute_script("window.close();")
-
-      self.class.all.delete(self)
-    end
-  end
-end