selenium-grid-parser 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c67b67b2c32df2a55bdbb0f198cef4a9e3114ce
-  data.tar.gz: 34d19cb4a5ef692dc51ca872ac3dea1157fbb828
+  metadata.gz: 28c90e3c7577fd14150f06be813abe183b7f6547
+  data.tar.gz: bfcf06e4d3c64eff177b4f942adf7ab4e6b44ead
 SHA512:
-  metadata.gz: cfc61932a8031f3c59561b3e15fb40da91e6ac11bbd9c3d167a26cbf8d18fda06069a346cd120273406ce6c3f1979197003c670e3e5330aa991938a19f5676b5
-  data.tar.gz: 6a4e58bb35885f396b1ae9c9fd97ef4315801fa3a00cfacbd3cc895c1b8e617a4d4bbc03248500e98c036228b525f7d374f1f8e2cb3c671e583ea061500536ad
+  metadata.gz: 7e8b74275ad846c91937355ed4afa5370260b990733b253ff2c2676fb5ee72781179d20e176b8990d4f452e39072661e6f99708bfd146f20a88970b26a73e439
+  data.tar.gz: 146321282d026792a3f42ad009a55b2a84dbfa0fb5c259e840b7bd87e0afafb206c6579e2ad81e6e121909ba2d243593369bf77483d4e98eaac3aaeb86122b39

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    selenium-grid-parser (0.0.2)
+    selenium-grid-parser (0.0.3)
 
 GEM
   remote: https://rubygems.org/

data/lib/nodes/client/grid_node_client.rb

@@ -8,9 +8,15 @@ module SeleniumGridConsoleParser
       end
 
       def sessions
-        response = HTTParty.get("#{@url}/wd/hub/sessions")
+        begin
+          response = HTTParty.get("#{@url}/wd/hub/sessions", timeout: 10)
+        rescue Net::ReadTimeout
+          raise NodeDownException
+        end
         return response.body if response.code == 200
       end
     end
+
+    class NodeDownException < Exception; end
   end
 end

data/lib/nodes/data/grid_node_data.rb

@@ -7,11 +7,44 @@ module SeleniumGridConsoleParser
     class GridNodeData
       def initialize(node)
         @node = node
+        @cache = GridNodeCacheData.new()
       end
 
       def sessions
-        node_client = GridNodeClient.new(@node.remoteHost)
-        JSON.parse(node_client.sessions)
+        if (@cache.valid? && @cache.read("sessions"))
+          sessions = @cache.read("sessions")
+        else
+          sessions = GridNodeClient.new(@node.remoteHost).sessions
+          @cache.write("sessions", sessions)
+        end
+        JSON.parse(sessions)
+      end
+    end
+
+    class GridNodeCacheData
+      def initialize(cache_duration_in_secs = 20)
+        @max_seconds = cache_duration_in_secs
+        @data = {}
+        @time = 0
+      end
+
+      def valid?
+        time_difference = (Time.now - @time).to_i
+        if time_difference > @max_seconds
+          @data = {}
+          return false
+        else
+          return true
+        end
+      end
+
+      def write(key,value)
+        @data[key] = value
+        @time = Time.now
+      end
+
+      def read(key)
+        @data[key]
       end
     end
   end

data/lib/nodes/grid_node.rb

@@ -8,6 +8,8 @@ module SeleniumGridConsoleParser
       def initialize(configuration)
         @remoteHost = configuration["remoteHost"]
         @configuration = configuration.delete_if {|key, value| key == "remoteHost"}
+        @down = false
+        @data = GridNodeData.new(self)
       end
 
       def name
@@ -15,13 +17,30 @@ module SeleniumGridConsoleParser
       end
 
       def free?
-        sessions = GridNodeData.new(self).sessions
-        @free = sessions["value"].size == 0 ? true : false
+        if down?
+          @free = false
+        else
+          sessions = @data.sessions
+          @free = sessions["value"].size == 0 ? true : false
+        end
+        @free
+      end
+
+      def down?
+        begin
+          @data.sessions
+        rescue NodeDownException
+          @down = true
+          return true
+        end
+        @down = false
+        return false
       end
 
       def to_hash
+        free?
         grid_node_hash = self.instance_variables.each_with_object({}) { |var, hash| hash[var.to_s.delete("@")] = self.instance_variable_get(var) }
-        grid_node_hash["free"] = free?
+        grid_node_hash.delete("data")
         grid_node_hash
       end
     end

data/selenium-grid-parser.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "selenium-grid-parser"
-  spec.version       = "0.0.2"
+  spec.version       = "0.0.3"
   spec.authors       = ["jjortega"]
   spec.email         = ["juanjortcan@gmail.com"]
   spec.summary       = %q{Selenium-Grid doesn't have a pretty API so let parse it!}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: selenium-grid-parser
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - jjortega
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-22 00:00:00.000000000 Z
+date: 2016-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -73,7 +73,7 @@ email:
 - juanjortcan@gmail.com
 executables:
 - console
-- parse
+- selenium_grid_parser
 extensions: []
 extra_rdoc_files: []
 files:
@@ -84,7 +84,7 @@ files:
 - README.md
 - Rakefile
 - bin/console
-- bin/parse
+- bin/selenium_grid_parser
 - lib/nodes/client/grid_node_client.rb
 - lib/nodes/configuration/capabilities.rb
 - lib/nodes/configuration/node_configuration.rb