profit 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c983db22327639739ccddb2f961937262b8e152
-  data.tar.gz: fe2b3e21664863d794668263a95cd33dc55a7097
+  metadata.gz: 969014059784a1038daecb61130159475a5f1e8c
+  data.tar.gz: 881e0405ff428044a1a5259f46b5b2d3dfc73a75
 SHA512:
-  metadata.gz: 342be70e08be5ec0d08174327c765bde22a03c2fe53ff7a7ba5a2713fe64d048cafb7333f23f950bd9307add002ef67e8550c6993282b594a0b5db6af78c2ab8
-  data.tar.gz: fabf7ce5dc33fd63b4829d3073d718479a21cbcc240db36632a329144125f147b9d7df877d8b5111c14993a902e7939825ee1f79a31d6d583899e675cf9896e1
+  metadata.gz: d883e32d14df825d4de4fa6de6d95b870edf81ef4cf909120acd2b25941ba7c10cca17c58c853103d69884172b33182679d71cf26f95b349ed62a96405dcb863
+  data.tar.gz: 6f5b0edf6ab67d83f7c5926b172b35acb7c7335122a8d6100ec35ba5fcd39d040e58428b62d900ff303fa4b8475067eeebb7d285193b44ba3cf34ab9730c8f7e

data/lib/profit/app/public/js/main.js

@@ -19,4 +19,16 @@
     }
     charts[key] = new Chart(ctx).Line(data);
   });
+
+  $('a[data-toggle="tab"]').on('shown', function (e) {
+    var targetAnchor = $(e.target).attr('id');
+    var baseUrl = document.location.href.split("#")[0];
+    document.location.href = baseUrl + "#" + targetAnchor;
+  });
+
+  $(document).ready(function() {
+    var targetAnchor = document.location.href.split("#")[1];
+    $("#" + targetAnchor).tab("show");
+  });
+
 })(jQuery);

data/lib/profit/app/views/index.erb

@@ -55,8 +55,6 @@
       </div>
     </div>
 
-
-
     <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.js"></script>
     <script>window.jQuery || document.write('<script src="js/vendor/jquery-1.9.1.js"><\/script>')</script>
 

data/lib/profit/version.rb

@@ -1,3 +1,3 @@
 module Profit
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/spec/lib/server_spec.rb

@@ -66,8 +66,8 @@ describe Profit::Server do
 
     set = redis.smembers("profit:keys")
     expect(set.count).to eq 2
-    expect(set.to_a).to eq ["profit:metric:other_piece_of_code",
-                            "profit:metric:some_slow_piece_of_code"]
+    expect(set.to_a.sort).to eq ["profit:metric:other_piece_of_code",
+                                 "profit:metric:some_slow_piece_of_code"]
   end
 
   it "limits messages to 100" do

data/spec/profit_app/chart_app_spec.rb

@@ -1,5 +1,13 @@
 require 'spec_helper'
 
+def current_path
+  ["/", page.evaluate_script("document.location.href.split('/')").last].join
+end
+
+def active_link
+  page.find("li.active a")
+end
+
 describe 'Chart App' do
 
   let!(:redis)         { Redis.new(host: "127.0.0.1", port: 6379) }
@@ -21,8 +29,52 @@ describe 'Chart App' do
     sleep 0.1
     client.stop("some_foo_metric")
 
+    Timeout.timeout(1) do
+      sleep(0.01) until redis.smembers("profit:keys").any?
+    end
+
     visit '/'
 
     expect(page).to have_link("some_foo_metric")
   end
+
+  describe "urls", js: true do
+
+    before do
+      client.start("metric_1")
+      sleep 0.1
+      client.stop("metric_1")
+
+      client.start("metric_2")
+      sleep 0.1
+      client.stop("metric_2")
+    end
+
+    it "changes the url based on the current tab" do
+      visit "/"
+      expect(active_link.text).to eq "metric_2"
+      expect(current_path).to eq "/"
+
+      click_link("metric_1")
+
+      expect(active_link.text).to eq "metric_1"
+      expect(current_url).to match(/\/\#metric_1/)
+
+      click_link("metric_2")
+
+      expect(active_link.text).to eq "metric_2"
+      expect(current_url).to match(/\/\#metric_2/)
+    end
+
+    it "loads the tab according to the url's anchor" do
+      visit "/#metric_1"
+
+      expect(active_link.text).to eq "metric_1"
+
+      # TODO: have to load the page twice for now, investigate cause
+      visit "/#metric_2" and visit "/#metric_2"
+
+      expect(active_link.text).to eq "metric_2"
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -3,6 +3,8 @@ require './lib/profit/app/chart_app'
 require 'redis'
 require 'capybara'
 require 'capybara/dsl'
+require 'capybara/rspec'
+require 'capybara/webkit'
 
 set :environment, :test
 
@@ -18,6 +20,7 @@ class TestServer
 end
 
 Capybara.app = ChartApp
+Capybara.javascript_driver = :webkit
 
 RSpec.configure do |config|
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: profit
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Dave Rogers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-17 00:00:00.000000000 Z
+date: 2013-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -192,6 +192,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: capybara-webkit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: This is a client/server combination that allows you to profile code and
   send the results to a remote Redis server.
 email:
@@ -251,7 +265,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: A simple library to store profiling information for ruby code.