domreactor-redglass 0.0.3 → 0.0.4

data/README.md

@@ -13,6 +13,7 @@ You will need a DomReactor account and an API token to use DomReactor's automate
 browsers = [:firefox, :chrome]
 archive_location = '/Users/you/Desktop/red_glass_snapshots'
 test_id = 1
+page_url = 'http://google.com'
 opts = {
     baseline_browser: {name: 'firefox', version: '20.0', platform: 'darwin'},
     threshold: 0.02
@@ -23,16 +24,16 @@ browsers.each do |browser|
   listener = RedGlassListener.new
   driver = Selenium::WebDriver.for browser, :listener => listener
   red_glass = RedGlass.new driver, {listener: listener, archive_location: archive_location, test_id: test_id}
-  driver.navigate.to 'http://google.com'
+  driver.navigate.to page_url
   red_glass.take_snapshot
   driver.quit
 end
 
 # Send the page archives to DomReactor.
 DomReactorRedGlass.auth_token = '12345'
-DomReactorRedGlass.create_chain_reaction("#{archive_location}/#{test_id}", opts)
+DomReactorRedGlass.create_chain_reaction(page_url, "#{archive_location}/#{test_id}", opts)
 ```
 
 # License
 
-The MIT License - Copyright (c) 2013 Frank O'Hara
+The MIT License - Copyright (c) 2013 Binary Mechanics

data/domreactor-redglass.gemspec

@@ -24,6 +24,6 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "bundler", "~> 1.3"
   s.add_development_dependency "rake"
-  s.add_development_dependency "rspec", "~> 2.13.0"
+  s.add_development_dependency "rspec", "~> 2.14.0"
   s.add_development_dependency 'selenium-webdriver'
 end

data/lib/domreactor-redglass/chain_reaction.rb

@@ -31,41 +31,32 @@ module DomReactorRedGlass
       @info ||= create_chain_reaction(@opts)
     end
 
+
     def post_archives(archive_location)
-      web_browser_ids = []
-      #TODO: Cache the web prowser for each archive location.
-      Dir.foreach(archive_location) do |file|
-        next if file == '.' or file == '..'
-        path = "#{archive_location}/#{file}"
-        if is_valid_page_archive? path
-          web_browser_ids << get_web_browser_info(parse_json_file("#{path}/metadata.json")[:browser])[:id]
-        end
-      end
-      update_chain_reaction(web_browser_ids: web_browser_ids)
-      dom_gun_reaction = create_dom_gun_reaction
       Dir.foreach(archive_location) do |file|
         next if file == '.' or file == '..'
         path = "#{archive_location}/#{file}"
         if is_valid_page_archive? path
           payload = create_payload(path)
-          RestClient.put("#{chain_reaction_url}/dom_gun_reactions/#{dom_gun_reaction[:id]}", payload, content_type: 'application/json')
+          create_dom_gun_reaction(payload)
         end
       end
-      start_reaction(dom_gun_reaction[:id])
+      start_reaction
     end
 
-    def start_reaction(id)
+    private
+
+    def start_reaction
       params = {
         auth_token: auth_token,
       }
-      RestClient.post("#{chain_reaction_url}/dom_gun_reactions/#{id}/start", params, content_type: 'application/json')
+      RestClient.post("#{chain_reaction_url}/start", params, content_type: 'application/json')
     end
 
-    def baseline_browser
-      get_web_browser_info(@opts[:baseline_browser])
-    end
 
-    private
+    def create_dom_gun_reaction(payload)
+      RestClient.post("#{chain_reaction_url}/dom_gun_reactions", payload, content_type: 'application/json')
+    end
 
     def get_web_browser_info(browser_info={})
       parameters = {auth_token: auth_token,content_type: 'application/json', accept: :json}.merge(browser_info)
@@ -74,8 +65,8 @@ module DomReactorRedGlass
       JSON.parse(response, symbolize_names: true)[:web_browsers].first
     end
 
-    def update_chain_reaction(params)
-      RestClient.put(chain_reaction_url, params.merge(auth_token: auth_token), content_type: 'application/json')
+    def baseline_browser
+      get_web_browser_info(@opts[:baseline_browser])
     end
 
     def create_chain_reaction(opts)
@@ -94,22 +85,13 @@ module DomReactorRedGlass
       JSON.parse(response, symbolize_names: true)[:chain_reaction]
     end
 
-    def create_dom_gun_reaction
-      payload = {
-        chain_reaction_id: id,
-        auth_token: auth_token,
-        page_url: page_url
-      }
-      dom_gun = RestClient.post("#{chain_reaction_url}/dom_gun_reactions", payload, content_type: 'application/json')
-      JSON.parse(dom_gun, symbolize_names: true)
-    end
-
     def create_payload(path)
       meta_data = parse_json_file("#{path}/metadata.json")
       {
         auth_token: auth_token,
         meta_data: meta_data,
         web_browser_id: get_web_browser_info(meta_data[:browser])[:id],
+        page_url: meta_data[:page_url],
         dom_elements: File.open("#{path}/dom.json", 'rb') {|f| f.read},
         page_source: File.open("#{path}/source.html") {|f| f.read},
         file: File.open("#{path}/screenshot.png")

data/lib/domreactor-redglass/version.rb

@@ -1,3 +1,3 @@
 module DomReactorRedGlass
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/chain_reaction_spec.rb

@@ -24,15 +24,16 @@ describe DomReactorRedGlass::ChainReaction do
 
   describe '#post_archives' do
     before do
-      chain_reaction.stub(:create_dom_gun_reaction) { {id: 81, stuff: true} }
-      chain_reaction.stub(:get_web_browser_info).exactly(4).times.
-        with({:name=>"firefox", :version=>"20.0", :platform=>"darwin"}) { {id: 22, browser: 'firefox'} }
-      RestClient.should_receive(:put).exactly(3).times
-      RestClient.should_receive(:post).once
-    end
-    it 'creates a dom gun reaction' do
+      chain_reaction.stub(:create_payload)
+      chain_reaction.stub(:create_dom_gun_reaction)
       chain_reaction.post_archives("#{SPEC_ROOT}/data/valid_archive")
     end
+    it 'creates the payload' do
+      expect(chain_reaction).to have_received(:create_payload).twice
+    end
+    it 'creates the dom gun reactions' do
+      expect(chain_reaction).to have_received(:create_dom_gun_reaction).twice
+    end
   end
   describe '#id' do
     it "gets the id from the info" do

data/spec/data/valid_archive/firefox_20.0_1369614643/metadata.json

@@ -1 +1 @@
-{"test_id":1,"time":1369614643,"page_url":"http://www.google.com/","browser":{"name":"firefox","version":"20.0","platform":"darwin"},"event_sequence":[],"doc_width":1004,"doc_height":1010}
+{"test_id":1,"time":1369614643,"page_url":"http://www.google.com/","browser":{"name":"firefox","version":"19.0","platform":"darwin"},"event_sequence":[],"doc_width":1004,"doc_height":1010}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: domreactor-redglass
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -115,7 +115,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -123,7 +123,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: 2.14.0
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement