Refactor of source modules, including:

- dataset     -> data
- timeseries  -> util/timeseries
- scaffold    -> base/scaffold
- Adds templates/{chart,dashboard,data,graph} to match the structure of the modules
- Deletes unused/empty modules and templates

diff --git a/docs/internals/housekeeping.md b/docs/internals/housekeeping.md
index 978169b..c464fd2 100644 (file)
--- a/docs/internals/housekeeping.md
+++ b/docs/internals/housekeeping.md
@@ -49,15 +49,8 @@
 ## Misc
 - Generate markdoc wiki from `/docs` on Build, Deploy
 - Refactor directories:
-    - template/
-        graph/
-        chart/
-        data/
-        dashboard/
-    - dataset/ -> data/
+    - dataset/
         dataset/ +metric
         datasource/ +column
-    - scaffold/ -> base/scaffold/
-    - timeseries/ -> util/timeseries/
 - Wrap `Backbone.extend()` to fire `subclass` event on parent class
 

diff --git a/lib/base/scaffold/index.co b/lib/base/scaffold/index.co
new file mode 100644 (file)
index 0000000..6524ae6
--- /dev/null
+++ b/lib/base/scaffold/index.co
@@ -0,0 +1,3 @@
+models = require 'kraken/base/scaffold/scaffold-model'
+views  = require 'kraken/base/scaffold/scaffold-view'
+exports import models import views

diff --git a/lib/scaffold/scaffold-model.co b/lib/base/scaffold/scaffold-model.co
similarity index 100%
rename from lib/scaffold/scaffold-model.co
rename to lib/base/scaffold/scaffold-model.co

diff --git a/lib/scaffold/scaffold-view.co b/lib/base/scaffold/scaffold-view.co
similarity index 98%
rename from lib/scaffold/scaffold-view.co
rename to lib/base/scaffold/scaffold-view.co
index 4c187f9..b5299bc 100644 (file)
--- a/lib/scaffold/scaffold-view.co
+++ b/lib/base/scaffold/scaffold-view.co
@@ -3,7 +3,7 @@ op = require 'kraken/util/op'
 { BaseView,
 }  = require 'kraken/base'
 { Field, FieldList,
-}  = require 'kraken/scaffold/scaffold-model'
+}  = require 'kraken/base/scaffold/scaffold-model'
 
 
 FieldView = exports.FieldView = BaseView.extend do # {{{

diff --git a/lib/chart/chart-option-view.co b/lib/chart/chart-option-view.co
index 1fde054..6c9e2a0 100644 (file)
--- a/lib/chart/chart-option-view.co
+++ b/lib/chart/chart-option-view.co
@@ -14,7 +14,7 @@ DEBOUNCE_RENDER = exports.DEBOUNCE_RENDER = 100ms
 ChartOptionView = exports.ChartOptionView = BaseView.extend do # {{{
     tagName   : 'section'
     className : 'chart-option field'
-    template  : require 'kraken/template/chart-option'
+    template  : require 'kraken/template/chart/chart-option'
     
     type : 'string'
     isCollapsed : true
@@ -129,7 +129,7 @@ ChartOptionScaffold = exports.ChartOptionScaffold = BaseView.extend do # {{{
     __bind__       : <[ addField ]>
     tagName        : 'form'
     className      : 'chart-options scaffold'
-    template       : require 'kraken/template/chart-scaffold'
+    template       : require 'kraken/template/chart/chart-scaffold'
     
     collectionType : ChartOptionList
     subviewType    : ChartOptionView

diff --git a/lib/dashboard/dashboard-view.co b/lib/dashboard/dashboard-view.co
index 6fc4d59..fc0658c 100644 (file)
--- a/lib/dashboard/dashboard-view.co
+++ b/lib/dashboard/dashboard-view.co
@@ -17,7 +17,7 @@ DashboardView = exports.DashboardView = BaseView.extend do # {{{
     __bind__       : <[  ]>
     tagName        : 'section'
     className      : 'dashboard'
-    template       : require 'kraken/template/dashboard'
+    template       : require 'kraken/template/dashboard/dashboard'
     
     graph_ids : <[
         unique_visitors

diff --git a/lib/dataset/data-view.co b/lib/data/data-view.co
similarity index 95%
rename from lib/dataset/data-view.co
rename to lib/data/data-view.co
index 7201d84..c57eaa8 100644 (file)
--- a/lib/dataset/data-view.co
+++ b/lib/data/data-view.co
@@ -4,11 +4,11 @@ Seq = require 'seq'
 { BaseView, ViewList,
 } = require 'kraken/base'
 { DataSetView,
-} = require 'kraken/dataset/dataset-view'
+} = require 'kraken/data/dataset-view'
 { MetricEditView,
-} = require 'kraken/dataset/metric-edit-view'
+} = require 'kraken/data/metric-edit-view'
 { DataSource, 
-} = require 'kraken/dataset/datasource-model'
+} = require 'kraken/data/datasource-model'
 
 /**
  * @class DataSet selection and customization UI (root of the `data` tab).
@@ -17,7 +17,7 @@ DataView = exports.DataView = BaseView.extend do # {{{
     __bind__       : <[ onMetricsChanged ]>
     tagName        : 'section'
     className      : 'data-ui'
-    template       : require 'kraken/template/data'
+    template       : require 'kraken/template/data/data'
     
     datasources : null
     

diff --git a/lib/dataset/dataset-model.co b/lib/data/dataset-model.co
similarity index 98%
rename from lib/dataset/dataset-model.co
rename to lib/data/dataset-model.co
index dfe8aa9..b96480b 100644 (file)
--- a/lib/dataset/dataset-model.co
+++ b/lib/data/dataset-model.co
@@ -6,9 +6,9 @@ ColorBrewer = require 'colorbrewer'
 { BaseModel, BaseList,
 } = require 'kraken/base'
 { Metric, MetricList,
-} = require 'kraken/dataset/metric-model'
+} = require 'kraken/data/metric-model'
 { DataSource, DataSourceList,
-} = require 'kraken/dataset/datasource-model'
+} = require 'kraken/data/datasource-model'
 
 
 

diff --git a/lib/dataset/dataset-view.co b/lib/data/dataset-view.co
similarity index 97%
rename from lib/dataset/dataset-view.co
rename to lib/data/dataset-view.co
index bc8189f..4a55a14 100644 (file)
--- a/lib/dataset/dataset-view.co
+++ b/lib/data/dataset-view.co
@@ -10,7 +10,7 @@
 DataSetView = exports.DataSetView = BaseView.extend do # {{{
     tagName   : 'section'
     className : 'dataset-ui dataset'
-    template  : require 'kraken/template/dataset'
+    template  : require 'kraken/template/data/dataset'
     
     events:
         'click  .new-metric-button'                     : 'onNewMetric'
@@ -112,7 +112,7 @@ DataSetView = exports.DataSetView = BaseView.extend do # {{{
 DataSetMetricView = exports.DataSetMetricView = BaseView.extend do # {{{
     tagName   : 'tr'
     className : 'dataset-metric metric'
-    template  : require 'kraken/template/dataset-metric'
+    template  : require 'kraken/template/data/dataset-metric'
     
     
     

diff --git a/lib/dataset/datasource-model.co b/lib/data/datasource-model.co
similarity index 98%
rename from lib/dataset/datasource-model.co
rename to lib/data/datasource-model.co
index 19f6bfc..490ede7 100644 (file)
--- a/lib/dataset/datasource-model.co
+++ b/lib/data/datasource-model.co
@@ -1,11 +1,11 @@
 { _, op,
 } = require 'kraken/util'
 { TimeSeriesData, CSVData,
-} = require 'kraken/timeseries'
+} = require 'kraken/util/timeseries'
 { BaseModel, BaseList, ModelCache,
 } = require 'kraken/base'