insite 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db6875ab42b0dc5e67d04b58ed8e2784688c3638
-  data.tar.gz: a634d3df6da0647fda5665f615a1dec6282f027f
+  metadata.gz: ba6a1246b6338a57653604a433afaa8c31985d7b
+  data.tar.gz: 5adef870b2e99c96391706fed734f262988b6ff4
 SHA512:
-  metadata.gz: b17d8b1d92af6f10c38b17999cc69a1c9895d408a3a571a34c634bd91ffbd80eda9ab08e662b61c5bcb918feb9adb810a3e06910fc5a1d97bdca0eb5076e191c
-  data.tar.gz: 4f4b65feeaa634894a8a237d0863921524ad5ffed17d8439aa4fdb934d95aff16dea9b6faf66c0b3a5a4da6c6b717ac6cd69d446d56951fa0fafcd1f90a5eb93
+  metadata.gz: e6e270c71cdf68c39edcb78e9f4082add0b14003a90334e98a874b22c2dff4e3e8b0d5aa79a0ec57b185bd2bac2dd518fc11f254c0349b90845fa135e20c7316
+  data.tar.gz: d397bc85b7362a3aafafd278caf8c8880a75c5e8b7b7a8638a13f998e4a3a4b3464427cd27fd68697622546e772a91daaee81cab463483c1018de376c6b989a6

data/lib/insite/component/component.rb

@@ -7,7 +7,7 @@ require 'pry'
 # into components that can be reused across multiple pages.
 module Insite
   class Component
-    attr_reader :args, :browser, :non_relative, :selector, :site, :type, :target
+    attr_reader :args, :browser, :non_relative, :parent, :selector, :site, :type, :target
     class_attribute :selector, default: {}
     self.selector  = self.selector.clone
 
@@ -187,21 +187,14 @@ module Insite
     # here and that makes the code more confusing. And there should be a proper
     # collection class for element collections, with possibly some AR-like accessors.
     def initialize(parent, *args)
-      # Figure out the correct query scope.
-      parent.respond_to?(:target) ? obj = parent : obj = parent.site
-      @parent   = obj
-
-      # @parent   = parent
       @site     = parent.class.ancestors.include?(Insite) ? parent : parent.site
       @browser  = @site.browser
       @component_elements = self.class.component_elements
 
-      if args[0].is_a?(Insite::Element) || args[0].is_a?(Insite::ElementCollection)
-        @dom_type = nil
+      if args[0].is_a?(Insite::Element) || args[0].is_a?(Watir::Element)
         @args     = nil
         @target   = args[0].target
-      elsif args[0].is_a?(Watir::Element) || args[0].is_a?(Watir::ElementCollection)
-        @dom_type = nil
+      elsif args[0].is_a?(Insite::ElementCollection) || args[0].is_a?(Watir::ElementCollection)
         @args     = nil
         @target   = args[0]
       else
@@ -217,26 +210,23 @@ module Insite
 
         @selector     = self.class.selector.merge(parse_args(args))
         @args         = @selector
-        @non_relative = @args.delete(:non_relative) || false
 
+        # Figure out the correct query scope.
+        @non_relative = @args.delete(:non_relative) || false
         if @non_relative
-          # @args = parse_args(args)
-          # @selector = @args
-          @target = @browser.send(@args)
+          @parent = parent.site
         else
-          # @args = parse_args(args)
-
-          # # Figure out the correct query scope.
-          # @parent.respond_to?(:target) ? obj = @parent.target : obj = @browser
+          parent.respond_to?(:target) ? obj = parent : obj = parent.site
+          @parent = obj
+        end
 
-          # See if there's a Watir DOM method for the class. If not, then
-          # initialize using the default collection.
-          if watir_class = Insite::CLASS_MAP.key(self.class)
-            @target = watir_class.new(@parent.target, @args)
-            # @target = watir_class.new(obj, @args)
-          else
-            @target = Watir::HTMLElement.new(@parent.target, @args)
-          end
+        # See if there's a Watir DOM method for the class. If not, then
+        # initialize using the default HTML element.
+        watir_class = Insite::CLASS_MAP.key(self.class)
+        if watir_class && watir_class != Watir::HTMLElement
+          @target = watir_class.new(@parent.target, @args)
+        else
+          @target = Watir::HTMLElement.new(@parent.target, @args)
         end
 
         # New webdriver approach.

data/lib/insite/component/component_collection.rb

@@ -1,6 +1,6 @@
 module Insite
   class ComponentCollection
-    attr_reader :args, :collection_member_type, :browser, :indentifiers, :site, :target
+    attr_reader :args, :collection_member_type, :browser, :indentifiers, :parent, :site, :target
     class_attribute :selector, default: {}
     self.selector  = self.selector.clone
 
@@ -43,38 +43,36 @@ module Insite
     end
 
     def initialize(parent, *args)
-      # Figure out the correct query scope.
-      parent.respond_to?(:target) ? obj = parent : obj = parent.site
-      @parent   = obj
-
       @site     = parent.class.ancestors.include?(Insite) ? parent : parent.site
       @browser  = @site.browser
       @collection_member_type = self.class.instance_variable_get(:@collection_member_type)
       @selector = @collection_member_type.selector
 
-      if args[0].is_a?(Insite::Element) || args[0].is_a?(Insite::ElementCollection)
+      if args[0].is_a?(Insite::Element) || args[0].is_a?(Watir::Element)
         @dom_type = nil
         @args     = nil
         @target   = args[0].target
-      elsif  args[0].is_a?(Watir::Element) || args[0].is_a?(Watir::ElementCollection)
+      elsif  args[0].is_a?(Insite::ElementCollection) || args[0].is_a?(Watir::ElementCollection)
         @dom_type = nil
         @args     = nil
         @target   = args[0]
       else
-        @args = parse_args(args)
+
+        @args     = parse_args(args)
+        @selector = @args
+
+        @non_relative = @args.delete(:non_relative) || false
+        if @non_relative
+          @parent = parent.site
+        else
+          parent.respond_to?(:target) ? obj = parent : obj = parent.site
+          @parent = obj
+        end
 
         if watir_class = Insite::CLASS_MAP.key(self.class)
-          if @parent.respond_to?(:target)
-            @target = watir_class.new(@parent.target, @args)
-          else
-            @target = watir_class.new(@browser, @args)
-          end
+          @target = watir_class.new(@parent.target, @args)
         else
-          if @parent.respond_to?(:target)
-            @target = Watir::HTMLElementCollection.new(@parent.target, @args)
-          else
-            @target = Watir::HTMLElementCollection.new(@browser, @args)
-          end
+          @target = Watir::HTMLElementCollection.new(@parent.target, @args)
         end
       end
     end

data/lib/insite/element/element.rb

@@ -41,11 +41,11 @@ module Insite
       @site     = parent.class.ancestors.include?(Insite) ? parent : parent.site
       @browser  = @site.browser
 
-      if args[0].is_a?(Insite::Element) || args[0].is_a?(Insite::ElementCollection)
+      if args[0].is_a?(Insite::Element) || args[0].is_a?(Watir::Element)
         @target   = args[0].target
         @selector = @target.selector.dup
         @args     = @selector
-      elsif  args[0].is_a?(Watir::Element) || args[0].is_a?(Watir::ElementCollection)
+      elsif  args[0].is_a?(Insite::ElementCollection) || args[0].is_a?(Watir::ElementCollection)
         @args     = nil
         @selector = @target.instance_variable_get(:@selector).dup
         @args     = @selector
@@ -61,6 +61,15 @@ module Insite
         else
           @args = parse_args(args.dup)
         end
+
+        # Figure out the correct query scope.
+        @non_relative = @args.delete(:non_relative) || false
+        if @non_relative
+          @parent = parent.site
+        else
+          parent.respond_to?(:target) ? obj = parent : obj = parent.site
+          @parent = obj
+        end
         @selector = @args
 
         if watir_class = Insite::CLASS_MAP.key(self.class)

data/lib/insite/element/element_collection.rb

@@ -38,11 +38,11 @@ module Insite
       @parent   = obj
       @site     = parent.class.ancestors.include?(Insite) ? parent : parent.site
       @browser  = @site.browser
-      if args[0].is_a?(Insite::Element) || args[0].is_a?(Insite::ElementCollection)
+      if args[0].is_a?(Insite::Element) || args[0].is_a?(Watir::Element)
         @target   = args[0].target
         @args     = @target.selector.dup
         @selector = @args
-      elsif  args[0].is_a?(Watir::Element) || args[0].is_a?(Watir::ElementCollection)
+      elsif args[0].is_a?(Insite::ElementCollection) || args[0].is_a?(Watir::ElementCollection)
         @target   = args[0]
         @args     = @target.instance_variable_get(:@selector).dup
         @selector   = @args
@@ -50,12 +50,33 @@ module Insite
         if @collection_member_type == Insite::HTMLElement
           @args     = parse_args(args)
           @selector = @args
+
+          # Figure out the correct query scope.
+          @non_relative = @args.delete(:non_relative) || false
+          if @non_relative
+            @parent = parent.site
+          else
+            parent.respond_to?(:target) ? obj = parent : obj = parent.site
+            @parent = obj
+          end
+
           @target   = Watir::HTMLElementCollection.new(@parent.target, @args)
         else
           @args   = parse_args(args).merge(
             tag_name: Insite.class_to_tag(@collection_member_type)
           )
           @selector = @args
+
+          # Figure out the correct query scope.
+          @non_relative = @args.delete(:non_relative) || false
+          if @non_relative
+            @parent = parent.site
+          else
+            parent.respond_to?(:target) ? obj = parent : obj = parent.site
+            @parent = obj
+          end
+          @selector = @args
+
           @target   = Insite::CLASS_MAP.key(self.class).new(@parent.target, @args)
         end
       end

data/lib/insite/insite.rb

@@ -22,7 +22,7 @@ module Insite
   end
 
   def self.tag_to_class(tag)
-    CLASS_MAP[Watir.tag_to_class[tag]] || Insite::HTMLElement
+    CLASS_MAP[Watir.tag_to_class[tag.to_sym]] || Insite::HTMLElement
   end
 
   # Automatically sets up a Page class when Insite is included. Probably overkill

data/lib/insite/methods/common_methods.rb

@@ -190,7 +190,8 @@ module Insite
 
     # Duplicates Watir DOM element argument parsing for element methods.
     private
-    def parse_args(args)
+    def parse_args(*args)
+      args = args.flatten if args.is_a?(Array)
       case args.length
       when 2
         return { args[0] => args[1] }

data/lib/insite/version.rb

@@ -1,3 +1,3 @@
 module Insite
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: insite
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - John Fitisoff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-25 00:00:00.000000000 Z
+date: 2018-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport