red-glass 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1981fbf8ec724074b636362a35c8e0ce01b6ef16
-  data.tar.gz: 0d4101faeb1934eb0f63010f30b7c72d1955299f
+  metadata.gz: ab67587fe9749012ed0825735e13d059eba0d9a5
+  data.tar.gz: 2d9dbf7cf256413425e8b90e9ed8e6a6cb150347
 SHA512:
-  metadata.gz: 9625acd8842cff9c1641f72a3b1346a103aa09413a24e6ccca2a5161cd610788615429567af5eb7ba44571e7c94140a1d67aa475606c4bc2ab3a6e6fcc495e34
-  data.tar.gz: 342726e2f00e12f2ca70036f7ee317e7707177ddd6c07f0dbee5e96dba8c27c564a1394d48148cd2f74964de29aa7c592642cd6741523b6ba091114e44e4a2b7
+  metadata.gz: 422a44f794b1dcecdfc53eac1bbff98d15689d13c4e433ae1b48cba4d17d0a00d7b5dd680e1950ec5857ea3deaf1464da22ab70941286f297caa4ab0564c8794
+  data.tar.gz: 13d73d497b2125d1eea8272ccb1d08d47e7fe5da0885da4ba4d86d1ac736f8030c3391564a816fd33a5713989845f2534c4f737a4caa047ee865984b5db366cc

data/lib/red-glass/red_glass.rb

@@ -160,21 +160,12 @@ class RedGlass
   end
 
   def serialize_dom
-    dom_json_string = "{\n\t\"browser\":" + "\"" + @page_metadata[:browser][:name] + "\","
-    dom_json_string += "\n\t\"elements\":\n\t[\n\t"
-    serialize_dom_js_string = stringify_serialize_dom_js
-    dom_json_string += @driver.execute_script(serialize_dom_js_string + " return RecurseDomJSON(rgUtils.query('*'),'')")
-    dom_json_string = dom_json_string[0, (dom_json_string.length - 3)] + "\n\t]\n}"
-    @page_metadata[:doc_width] = @driver.execute_script(serialize_dom_js_string + ' return rgUtils.query(document).width()')
-    @page_metadata[:doc_height] = @driver.execute_script(serialize_dom_js_string + ' return rgUtils.query(document).height()')
-    write_serialized_dom dom_json_string
-  end
-
-  def stringify_serialize_dom_js
-    recurse_dom_file = File.open("#{PROJ_ROOT}/red-glass-js/serialize-dom.js", 'rb')
-    recurse_dom_string = recurse_dom_file.read
-    recurse_dom_file.close
-    recurse_dom_string
+    dom = JSON.parse(@driver.execute_script("return JSON.stringify(jQuery(document).redGlass('serializeDOM'));"),
+                     { symbolize_names: true })
+    dom[:browser] = @page_metadata[:browser][:name]
+    @page_metadata[:doc_width] = dom[:width]
+    @page_metadata[:doc_height] = dom[:height]
+    write_serialized_dom(dom.to_json)
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: red-glass
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Frank O'Hara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-04 00:00:00.000000000 Z
+date: 2014-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -200,7 +200,6 @@ files:
 - lib/red-glass/red-glass-app/server.key
 - lib/red-glass/red-glass-app/views/index.erb
 - lib/red-glass/red-glass-js/redglass.carryall.js
-- lib/red-glass/red-glass-js/serialize-dom.js
 - lib/red-glass/red_glass.rb
 - lib/red-glass/red_glass_listener.rb
 homepage: https://github.com/fohara/red-glass

data/lib/red-glass/red-glass-js/serialize-dom.js

@@ -1,30 +0,0 @@
-var rgUtils = {};
-var uniqueIds = [];
-rgUtils.query = jQuery;
-rgUtils.toInt = function(n){ return Math.round(Number(n)); };
-rgUtils.hasText = function($thing){
-    var isTxt = true;
-    if($thing.text() == ""){
-        isTxt = false;
-    }
-    return isTxt;
-};
-rgUtils.isVisible = function($thing) { return $thing.is(':visible'); };
-
-function RecurseDomJSON($item, domJSON) {
-    $item.each(function() {
-        try{
-            domJSON += '{"tagName":' + '"' + rgUtils.query(this).get(0).tagName + '"' + ',' + '"id":' + '"' +
-                rgUtils.query(this).attr("id") + '"' + ',' + '"top":' + '"' + rgUtils.toInt(rgUtils.query(this).offset().top) + '"' +
-                ',' + '"left":' + '"' + rgUtils.toInt(rgUtils.query(this).offset().left) + '"' +
-                ',' + '"xpath":' + '"' + rgUtils.query(this).ellocate(uniqueIds).xpath + '"' +
-                ',' + '"width":' + '"' + rgUtils.toInt(rgUtils.query(this).width()) + '"' +
-                ',' + '"height":' + '"' + rgUtils.toInt(rgUtils.query(this).height()) + '"' +
-                ',' + '"isVisible":' + '"' + rgUtils.isVisible(rgUtils.query(this)) + '"' +
-                ',' + '"hasText":' + '"' + rgUtils.hasText(rgUtils.query(this)) +'"},\n\t' ;
-        }
-        catch(err){  } // Perhaps errors could be thrown in a configurable "strict" mode.
-    });
-    uniqueIds = [];
-    return domJSON;
-}