insite 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 140cc225b61ec7d1eed65eb6da2e56bb9c8bd93eb10b038e953955112b8c80ae
-  data.tar.gz: ad0f773ce13d35339d31bc4995d8575d068cb00f62515f4cbe4956ccde4bcc1b
+  metadata.gz: 63e184f9aec996f76dcdcff1a0ee71f2b56c88523f92681c4d36f18faf614001
+  data.tar.gz: 7340f99e41bd7037a20a82bf1db9ef83ffae48be4dbaa3a62af3ac1e1681500c
 SHA512:
-  metadata.gz: 68aad6503cc6d0d1936db14dd7c3f8391c104d69887988beef8f2ebe07eb2a50c2699b5fd40911c6ca7a2b3bae98ad893f64a05dda53492c18377fe12df8ebda
-  data.tar.gz: 5b6aa0dc57f05ee9cbfc183fbf07b02f3167a39029139983e69072d932f4bab3f7858181cf7c5883503dbe88b6c3a118b791f83ec272cd2f1c8f9e7afb148136
+  metadata.gz: 58869a57afe8f2cd885b37a2c5cc34e60950adc31f5c7c57013c11f424fe52ada234db4da94d98510d96e1d27c81871d6958751b0ade6da16879a248ad7b186d
+  data.tar.gz: 24b267fa3b02d15070e815aa62805da01686a2be35d819e2ae42137cd8cc5506acf08dec074dd8614e10f36329ed7a11baa459fb0397a0fb9dc06ae7d8b89b8a

data/lib/insite/element/element.rb

@@ -80,25 +80,6 @@ module Insite
       end
     end
 
-    # def initialize(site, element)
-    #   @site    = site
-    #   @browser = @site.browser
-    #   @target  = element
-    #
-    #   # Temporary replacement for custom wait_until.
-    #   # TODO: Continue looking at scolling solutions.
-    #   if @target.present? && @target.respond_to?(:scroll)
-    #     @target.scroll.to
-    #     t = ::Time.now + 2
-    #     while ::Time.now <= t do
-    #       break if @target.present?
-    #       sleep 0.1
-    #     end
-    #   end
-    #
-    #   @target
-    # end
-
     def inspect
       if @target.selector.present?
         s = @selector.to_s

data/lib/insite/methods/common_methods.rb

@@ -49,46 +49,6 @@ module Insite
 
     end
     public
-    # private
-    # def process_browser
-    #   if @site.browser.is_a?(Watir::Browser)
-    #     begin
-    #       if @site.browser.exists?
-    #         return @site.browser
-    #       else
-    #         raise(
-    #           Insite::Errors::BrowserClosedError,
-    #           "Browser check failed. The browser is no longer present.\n\n"
-    #         )
-    #       end
-    #     rescue(Insite::Errors::BrowserNotOpenError) => e
-    #       raise e
-    #     rescue => e
-    #       raise(
-    #         Insite::Errors::BrowserResponseError,
-    #         <<~eos
-    #         Browser check failed. The browser returned an #{e.class} (#{e}) when it was queried.
-    #         Backtrace for the error:
-    #         #{e.backtrace.join("\n")}
-    #
-    #         eos
-    #       )
-    #     end
-    #   elsif @site.browser.nil?
-    #     raise(
-    #       Insite::Errors::BrowserNotOpenError,
-    #       "A browser has not been defined for the site. Try using Site#open to " \
-    #       "start a browser.\n\n"
-    #     )
-    #   else
-    #     raise(
-    #       Insite::Errors::BrowserNotValidError,
-    #       "Expected: Watir::Browser. Actual: #{@site.browser.class}.\n\n"
-    #     )
-    #   end
-    #
-    # end
-    # public
 
     def update_object(hash_args = {})
       rescues = [
@@ -99,12 +59,20 @@ module Insite
       ]
       failed = []
       hash_args.each do |k, v|
+        sleep 0.2
         begin
-          k = k.to_sym
-          if @page_elements.include?(k)
-            elem = public_send(k)
-
-            if [Insite::Alert, Insite::FileField, Insite::TextField, Insite::TextArea].include? elem.class
+          # k = k.to_sym
+          # if self.is_a?(Component)
+          #   elems = @component_elements
+          # else
+          #   elems = @page_elements
+          # end
+          #
+          # # TODO: DRY
+          # if self.is_a?(Insite::DefinedPage) && @page_elements.include?(k)
+          elem = public_send(k)
+          if elem.is_a?(Insite::Element)
+            if [Insite::FileField, Insite::TextField, Insite::TextArea].include? elem.class
               elem.set v
             elsif [Insite::Select].include? elem.class
               elem.select v
@@ -167,11 +135,16 @@ module Insite
                 raise ArgumentError, "Unsupported argument for #{elem.class}: '#{v}'"
               end
             end
-          elsif @component_elements.include?(k)
+          elsif elem.is_a?(Component) #&& @component_elements.include?(k)
+
             w = public_send(k)
 
             begin
-              w.update(v)
+              if w.is_a?(Component) && v.is_a?(Hash)
+                w.update_object(**v)
+              elsif w.is_a?(Component) && w.respond_to?(:update)
+                w.update(v)
+              end
             rescue => e
               begin
                 if v.is_a?(Array)
@@ -198,7 +171,11 @@ module Insite
                   public_send(k).update(*v)
                 end
               rescue => e2
-                raise ArgumentError, "Dynamic method call failed for #{k}.", e2.backtrace
+                raise(
+                  ArgumentError,
+                  "Dynamic method call failed for #{k}: #{e2.try(:message)}",
+                  e2.backtrace
+                )
               end
             end
           end
@@ -211,7 +188,7 @@ module Insite
               redo
             end
           else
-            raise e, "Failure trying to update #{k} with #{v.class}: #{v}:\n" + e.backtrace.join("\n")
+            raise e, "Failure trying to update #{k} with #{v.class}: #{v}. Original message: #{e.try(:message)}\n" + e.backtrace.join("\n")
           end
         end
         sleep 0.2

data/lib/insite/version.rb

@@ -1,3 +1,3 @@
 module Insite
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: insite
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - John Fitisoff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-12 00:00:00.000000000 Z
+date: 2018-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport