skybox 0.2.3.1 → 0.3.0

data/lib/skybox/static/js/skybox.js

@@ -1,6 +1,5 @@
 (function() {
 var table = null;
-var actions = [];
 var properties = [];
 
 //----------------------------------------------------------------------------
@@ -20,7 +19,7 @@ var properties = [];
  */
 function ready(callback) {
   // Clears dependencies and checks for completion.
-  var dependencies = ["actions", "properties"];
+  var dependencies = ["properties"];
   var removedep = function(dependency) {
     dependencies = dependencies.filter(function(i) { return i != dependency; });
     if(dependencies.length == 0) {
@@ -30,7 +29,6 @@ function ready(callback) {
   
   // Initialize and wait for dependencies.
   $(document).ready(function() { 
-    actions_load().done(function() { removedep("actions"); });
     properties_load().done(function() { removedep("properties"); });
   });
 }
@@ -49,49 +47,6 @@ function table_get(_) {
 }
 
 
-//--------------------------------------
-// Actions
-//--------------------------------------
-
-/**
- * Sets or retrieves the actions.
- */
-function actions_get(_) {
-  if (!arguments.length) return actions;
-  actions = _;
-}
-
-/**
- * Retrieves an action object by id.
- */
-function actions_find(id) {
-  for(var i=0; i<actions.length; i++) {
-    if(actions[i].id == id || actions[i].name == id) {
-      return actions[i];
-    }
-  }
-}
-
-/**
- * Loads action data.
- *
- * @return {Object}  The XHR used to load the action data.
- */
-function actions_load() {
-  var xhr = $.getJSON("/actions", {table:table}, function(data) {
-    actions = [
-      {id:"enter", name:"Session Start"},
-      {id:"exit", name:"Session End"},
-      {id:"other", name:"Other"}
-    ].concat(data);
-  })
-  .fail(function() {
-    alert("Unable to load action data");
-  });
-  return xhr;
-}
-
-
 //--------------------------------------
 // Properties
 //--------------------------------------
@@ -121,7 +76,7 @@ function properties_find(id) {
  * @return {Object}  The XHR used to load the property data.
  */
 function properties_load() {
-  var xhr = $.getJSON("/properties", {table:table}, function(data) {
+  var xhr = $.getJSON("/api/" + table + "/properties", function(data) {
     properties = data;
   })
   .fail(function() {
@@ -168,97 +123,6 @@ function data_normalize(data, nodes, links, options) {
 }
 
 
-//--------------------------------------
-// Query
-//--------------------------------------
-
-/**
- * Converts a query into a human readable HTML string.
- *
- * @param {Object} query  The query.
- *
- * @return {String} The HTML string.
- */
-function query_html(query) {
-  return (query.selections.length > 0 ? query_selection_html(query.selections[0]) : "");
-}
-
-/**
- * Converts a selection into a human readable HTML string.
- *
- * @param {Object} selection  The selection object.
- *
- * @return {String} The HTML string.
- */
-function query_selection_html(selection) {
-  var fields_html = query_selection_fields_html(selection);
-  var conditions_html = query_selection_conditions_html(selection);
-  
-  var html = [];
-  if(fields_html) html.push(fields_html);
-  if(conditions_html) html.push(conditions_html);
-  return html.join(" ") + ".";
-}
-
-/**
- * Converts the fields/groups of a selection into a human readable HTML string.
- *
- * @param {Object} selection  The selection object.
- *
- * @return {String} The HTML string.
- */
-function query_selection_fields_html(selection) {
-  // Generate the field/group section.
-  var html = "Find the "
-  html += '<span rel="popover" class="selection">';
-  switch(selection.fields[0].aggregationType) {
-    case "count": html += "number of ";
-  }
-  html += (selection.groups[0].expression == "action_id" ? "actions performed" : selection.groups[0].expression);
-  html += "</span>"
-  
-  return html;
-}
-
-/**
- * Converts the conditions of a selection into a human readable HTML string.
- *
- * @param {Object} selection  The selection object.
- *
- * @return {String} The HTML string.
- */
-function query_selection_conditions_html(selection) {
-  if(!selection.conditions || selection.conditions.length == 0) return null;
-
-  var htmls = [];
-  for(i=0; i<selection.conditions.length; i++) {
-    var condition = selection.conditions[i];
-
-
-    var html = '<span class="condition" data-condition-index="' + i + '">';
-    html += condition.type + " ";
-    if(condition.action == "enter") {
-      html += "session start";
-    }
-    else {
-      var action = actions_find(condition.action.id);
-      html += "<em>" + (action ? "'" + action.name + "'" : "&lt;action&gt;") + "</em>";
-    }
-    html += "</span>"
-    htmls.push(html);
-  }
-  switch(selection.fields[0].aggregationType) {
-    case "count": html += "The number of ";
-  }
-  html += (selection.groups[0].expression == "action_id" ? "actions performed" : selection.groups[0].expression);
-  html += "</span>"
-  
-  return htmls.join(" and ");
-}
-
-
-
-
 //----------------------------------------------------------------------------
 //
 // Public Interface
@@ -268,18 +132,11 @@ function query_selection_conditions_html(selection) {
 skybox = {
   ready:ready,
   table:table_get,
-  query:{
-    html:query_html
-  },
   data:{
     normalize:data_normalize
   }
 };
 
-// Actions namespace.
-skybox.actions = actions_get,
-skybox.actions.find = actions_find;
-skybox.actions.load = actions_load;
 
 // Properties namespace.
 skybox.properties = properties_get,

data/lib/skybox/static/js/skybox.query.js

@@ -0,0 +1,96 @@
+(function() {
+if(!skybox) skybox = {}
+skybox.query = function() {}
+skybox.query.selections = function() {}
+
+//--------------------------------------
+// Branches
+//--------------------------------------
+
+/**
+ * Retrieves a list of all non-leaf nodes in the query.
+ *
+ * @param {Object} query  The query
+ *
+ * @return {Array}  A list of non-leaf nodes (query, conditions) in the query.
+ */
+skybox.query.branches = function(query) {
+  if(!query) return [];
+
+  var branches = [];
+  if(query.type != "selection") {
+    branches = [query];
+    for(var i=0; i<query.steps.length; i++) {
+      branches = branches.concat(skybox.query.branches(query.steps[i]))
+    }
+  }
+  return branches;
+}
+
+
+//--------------------------------------
+// Selections
+//--------------------------------------
+
+/**
+ * Extracts an array of selection objects from a query.
+ *
+ * @param {Object} query  The query
+ *
+ * @return {Array}  A list of selections.
+ */
+skybox.query.selections = function(query) {
+  if(!query) return [];
+
+  var selections = [];
+  if(query.type == "selection") {
+    selections = [query];
+  } else if(query.steps) {
+    for(var i=0; i<query.steps.length; i++) {
+      selections = selections.concat(skybox.query.selections(query.steps[i]))
+    }
+  }
+  return selections;
+}
+
+/**
+ * Extracts a lookup of selection objects from a query by name.
+ *
+ * @param {Object} query  The query
+ *
+ * @return {Object}  A lookup of selections by name.
+ */
+skybox.query.selections.hash = function (query) {
+  var hash = {};
+  var selections = skybox.query.selections(query);
+  for(var i=0; i<selections.length; i++) {
+    var selection = selections[i];
+    if(selection.name) {
+      hash[selection.name] = selection;
+    }
+  }
+  return hash;
+}
+
+
+/**
+ * Finds the parent of a selection.
+ *
+ * @param {Object} query  The query
+ * @param {Object} selection  The selection to find the parent of.
+ *
+ * @return {Object}  The parent of the selection.
+ */
+skybox.query.selections.parent = function(query, selection) {
+  var branches = skybox.query.branches(query);
+  for(var i=0; i<branches.length; i++) {
+    var branch = branches[i];
+    for(var j=0; j<branch.steps.length; j++) {
+      if(branch.steps[j] == selection) {
+        return branch;
+      }
+    }
+  }
+  return null;
+}
+})();

data/lib/skybox/version.rb

@@ -1,3 +1,3 @@
 class Skybox
-  VERSION = "0.2.3.1"
+  VERSION = "0.3.0"
 end

data/lib/skybox/views/explore.erb

@@ -1,9 +1,12 @@
-<div class="content row">
-  <div class="span12">
-    <p id="query-text" class="lead"></p>
-  </div>
-</div>
+<link href="/css/skybox.explore.css" rel="stylesheet">
+<script src="/js/skybox.explore.js"></script>
 
 <div class="content row">
   <div id="chart" class="span12"></div>
 </div>
+
+<script>
+skybox.ready(function() {
+  skybox.explore.init();
+});
+</script>

data/lib/skybox/views/index.erb

@@ -8,7 +8,7 @@
     <select class="span6 table-name">
       <option></option>
       <% @tables.each do |table| %>
-        <option><%= table['name'] %></option>
+        <option><%= table.name %></option>
       <% end %>
     </select>
   </div>

data/lib/skybox/views/layout.erb

@@ -10,22 +10,17 @@
     <link href="/css/bootstrap.css" rel="stylesheet">
     <link href="/css/bootstrap-responsive.css" rel="stylesheet">
     <link href="/css/skybox.css" rel="stylesheet">
-    <% if File.exists?("#{settings.public_folder}/css/skybox.#{@action}.css") %>
-      <link href="/css/skybox.<%= @action %>.css" rel="stylesheet">
-    <% end %>
 
     <script src="/js/jquery-1.9.1.js"></script>
     <script src="/js/bootstrap.js"></script>
+    <script src="/js/humanize.js"></script>
     <script src="/js/d3.v3.js"></script>
     <script src="/js/d3.flow.js"></script>
-    <script src="/js/humanize.js"></script>
     <script src="/js/skybox.js"></script>
-    <% if File.exists?("#{settings.public_folder}/css/skybox.#{@action}.css") %>
-      <script src="/js/skybox.<%= @action %>.js"></script>
-    <% end %>
+    <script src="/js/skybox.query.js"></script>
 
     <script>
-      skybox.table(<%= @table.to_json %>);
+      skybox.table(<%= @table_name.to_json %>);
     </script>
 
     <!--[if lt IE 9]>
@@ -38,17 +33,9 @@
       <% if request.path != '/' %>
         <div class="navbar">
           <div class="navbar-inner">
-            <a class="brand" href="/"><%= @table.nil? ? 'Skybox' : @table %></a>
+            <a class="brand" href="/"><%= @table_name.nil? ? 'Skybox' : @table_name %></a>
             <ul class="nav">
-              <li class="<%= @action == 'explore' ? 'active' : '' %>"><a href="/<%=@table%>/explore">Explore</a></li>
-              <li class="dropdown">
-                <a href="#" role="button" class="dropdown-toggle <%= request.path.index(/[^\/]+\/admin/i).nil? ? '' : 'active' %>" data-toggle="dropdown">Admin <b class="caret"></b></a>
-                <ul class="dropdown-menu" role="menu" aria-labelledby="drop1">
-                  <li role="presentation"><a role="menuitem" tabindex="-1" href="/<%= @table %>/admin/actions">Manage Actions</a></li>
-                  <li role="presentation"><a role="menuitem" tabindex="-1" href="/<%= @table %>/admin/properties">Manage Properties</a></li>
-                </ul>
-              </li>
-
+              <li class="<%= @action == 'explore' ? 'active' : '' %>"><a href="/<%=@table_name%>/explore">Explore</a></li>
             </ul>
             
             <div class="pull-right"><img class="loading" src="/img/loading.gif"/></div>

metadata

@@ -1,36 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: skybox
 version: !ruby/object:Gem::Version
-  version: 0.2.3.1
-  prerelease: 
+  version: 0.3.0
 platform: ruby
 authors:
 - Ben Johnson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-22 00:00:00.000000000 Z
+date: 2013-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.3
+        version: 1.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.3
+        version: 1.4.2
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,39 +41,34 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.1.2
+        version: 4.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.1.2
+        version: 4.1.3
 - !ruby/object:Gem::Dependency
   name: skydb
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: unindentable
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -94,87 +83,76 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 10.0.3
+        version: 10.0.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 10.0.3
+        version: 10.0.4
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.3.3
+        version: 4.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.3.3
+        version: 4.7.0
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: 0.13.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: 0.13.3
 - !ruby/object:Gem::Dependency
   name: rerun
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.9.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.9.3
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -182,7 +160,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -211,9 +188,8 @@ files:
 - lib/skybox/static/js/jquery-1.9.1.js
 - lib/skybox/static/js/skybox.explore.js
 - lib/skybox/static/js/skybox.js
+- lib/skybox/static/js/skybox.query.js
 - lib/skybox/version.rb
-- lib/skybox/views/admin/actions/index.erb
-- lib/skybox/views/admin/properties/index.erb
 - lib/skybox/views/explore.erb
 - lib/skybox/views/index.erb
 - lib/skybox/views/layout.erb
@@ -222,32 +198,25 @@ files:
 - bin/skybox
 homepage: http://github.com/skydb/skybox
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 4266038721710341627
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 4266038721710341627
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Sky-based Analytics Frontend
 test_files: []