lanes 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b20837325a4feed75930d806fcc0ab5a8e914d3
-  data.tar.gz: 42515ab0003321f83e4946766645550b706deea5
+  metadata.gz: 3c48fe1ac2eaf85a9771acba612806120af0168b
+  data.tar.gz: 815755b8f6e731e8a85f6a02ed443a1ef676e9cf
 SHA512:
-  metadata.gz: 70dc86cd4d7e8c44aa1536ad7301672ccb75e0b1b0525bb7f5bfc07fade7de185644190ea99358df5e6d01200e1b7605a5cad2c2b324270a7efc498f2c9f2e43
-  data.tar.gz: 9fd2a37a119aaadfe4dda3f22fa2cd4882d2f79e19eed6e1a96469f8060ea77a579e3c38fd6dcf5dfc86552a34128bbc901f88a7dc94a3c8e15f01968646b69e
+  metadata.gz: 7d868609cfbac56dbd4e6ed6e4ca02284acd12c7e0cbea3145748b1a0726dd7e9bb8267eaa0c5ac436844297acc15a612fa6a07cb03e800f5e50d0a6f68c0e93
+  data.tar.gz: 844e24f045c8896fb405e20570edc981a7dcc04a3167316b9741090b42f2bc33767837b49a4d6589c60e747937d4f2410d989ce4c8891676ee757f3264ed53cd

data/.rubocop.yml

@@ -0,0 +1,7 @@
+
+StringLiterals:
+  Enabled: false
+
+Style/IndentationWidth:
+  # Number of spaces for each indentation level.
+  Width: 4

data/Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
-gem "yard-activerecord",   github: 'nathanstitt/yard-activerecord', branch: 'develop'
-gem "active_record_mocks", github: 'envygeeks/active_record_mocks', branch: 'master'
+gem "yard-activerecord",   github: 'nathanstitt/yard-activerecord',   branch: 'develop'
+gem "active_record_mocks", github: 'nathanstitt/active_record_mocks', branch: 'develop'
 
 gem 'puma'
 

data/client/lanes/components/Base.coffee

@@ -4,8 +4,6 @@ class BaseComponent
         super
         @access ||= this.calculate_access()
 
-    namespace: "Components"
-
     session:
         access:
             type: 'string',
@@ -15,17 +13,21 @@ class BaseComponent
         readOnly:  { deps: ['access'], fn:-> @access=='read' }
         writeAble: { deps: ['access'], fn:-> @access=='write' }
 
-    readTemplate:  -> @renderTemplateMethod('template')
-    writeTemplate: -> @renderTemplateMethod('template')
-    emptyTemplate: -> '<span></span>'
+    emptyTemplateName: -> this.writeTemplate()
+    readTemplateName:  -> this.writeTemplate()
+    writeTemplateName: -> 'lanes/views/empty-span'
 
-    template: ->
-        if this.writeAble
-            this.writeTemplate()
+    renderContextFree: ->
+        tmpl = if this.writeAble
+            'writeTemplate'
         else if this.readOnly
-            this.readTemplate()
+            'readTemplate'
         else
-            this.emptyTemplate()
+            'emptyTemplate'
+
+        this.replaceEl( this.renderTemplateMethod(tmpl) );
+
+    templatePrefix: -> this.FILE.extensionName.toLowerCase() + "/components/"
 
     calculate_access:->
         if ! @field_name || Lanes.Views.RenderContext.canWrite(@field_name)
@@ -35,5 +37,4 @@ class BaseComponent
         else
             'none'
 
-
 Lanes.Components.Base = Lanes.Views.Base.extend(BaseComponent)

data/client/lanes/components/enabled.js.erb

@@ -1,3 +1,3 @@
 <% Lanes::Components.enabled_with_dependencies(self) do | component |
-    require_asset "components/#{component}"
+    require_asset "lanes/components/#{component}"
 end %>

data/client/lanes/components/grid/Editor.coffee

@@ -35,7 +35,7 @@ class Lanes.Components.Grid.Editor extends Lanes.Components.Base
                 @model.set( definition.field, Lanes.dom.getAttribute(input,'value') )
 
     getColumn: (name)->
-        _.findWhere(this.grid.column_definitions, { field: name })
+        _.findWhere(this.grid.columnDefinitions, { field: name })
 
     saveChanges: ->
         this.persistFields()
@@ -58,5 +58,5 @@ class Lanes.Components.Grid.Editor extends Lanes.Components.Base
 
     fields: ->
         _.map(this.ui.form.children(), (input,index)->
-            { index: index, input: Lanes.$(input), column: this.grid.column_definitions[index] }
+            { index: index, input: Lanes.$(input), column: this.grid.columnDefinitions[index] }
         ,this)

data/client/lanes/components/grid/Grid.coffee

@@ -1,9 +1,9 @@
 # ModelsTables class modifications
 _.extend( Lanes.$.fn.dataTableExt.oStdClasses,{
     sTable: "table table-striped"
-	sWrapper: "dataTables_wrapper form-inline"
-	sFilterInput: "form-control input-sm"
-	sLengthSelect: "form-control input-sm"
+    sWrapper: "dataTables_wrapper form-inline"
+    sFilterInput: "form-control input-sm"
+    sLengthSelect: "form-control input-sm"
 })
 
 
@@ -17,42 +17,43 @@ class Lanes.Components.Grid extends Lanes.Components.Base
         'cancel-edit': 'onCancelEdit'
         'order.dt table': 'onSort'
 
-    template: 'grid/template'
-    templateModels: ->
+    writeTemplateName: 'grid/template'
+
+    writeTemplateData: ->
         data = { grid: this, buttons: ['refresh'] }
-        data['buttons'].push('create') if @add_records
-        data['buttons'].push('delete') if @delete_records
+        data['buttons'].push('create') if @addRecords
+        data['buttons'].push('delete') if @deleteRecords
         data
 
     derived:
-        column_definitions:
-            deps:['record_query'], fn: ->
-                @record_query.fields.map(this._make_field, this)
+        columnDefinitions:
+            deps:['recordRuery'], fn: ->
+                @recordQuery.fields.map(this._makeField, this)
 
-        model_class:
-             deps:['record_query'], fn:-> @record_query.model_class
+        modelClass:
+             deps:['recordQuery'], fn:-> @recordQuery.model_class
 
-        single_select_mode:
-             deps:['selection_mode'], fn:-> @selection_mode == 'single'
+        singleSelectMode:
+             deps:['selectionMode'], fn:-> @selectionMode == 'single'
 
     session:
-        edit_records:   ['boolean',true,false]
-        add_records:    ['boolean',true,false]
-        delete_records: ['boolean',true,false]
-        record_query:   'state'
-        editor:         'state'
-        selection_mode: ['string', true, 'single']
-        editor_config:  { type: 'object' }
-        editing_controller:  'any' # either string or constructor fn
-
-    initialize: (options)->
-        this.listenTo(this.viewport,'change:screen_menu_size', this.delayedWidthReset)
-
-        unless Lanes.current_user.canWrite(this.model_class)
-            this.edit_records = false
-            this.add_records  = false
-        unless Lanes.current_user.canDelete(this.model_class)
-            this.delete_records = false
+        editRecords:   ['boolean',true,false]
+        addRecords:    ['boolean',true,false]
+        deleteRecords: ['boolean',true,false]
+        createRecordFn: 'function'
+        recordQuery:   'state'
+        editor:        'state'
+        selectionMode: ['string', true, 'single']
+        editorConfig:  { type: 'object' }
+        editingController:  'any' # either string or constructor fn
+
+    initialize: ->
+        this.listenTo(this.viewport,'change:screen_enu_size', this.delayedWidthReset)
+        unless Lanes.current_user.canWrite(this.modelClass)
+            this.editRecords = false
+            this.addRecords  = false
+        unless Lanes.current_user.canDelete(this.modelClass)
+            this.deleteRecords = false
 
     onSort: ->
         return unless @editor
@@ -82,36 +83,40 @@ class Lanes.Components.Grid extends Lanes.Components.Base
         this.createEditor(row) unless @editor
         @editor.move(row,ev)
 
-
     createEditor: (row)->
-        config = _.extend({ parent: this }, this.editor_config)
-        @editor = switch this.editing_controller
+        config = _.extend({ parent: this }, this.editorConfig)
+        @editor = switch this.editingController
             when 'row' then new Grid.RowEditor(config)
             when 'popover' then new Grid.PopOverEditor(config)
-            else new this.editing_controller(config)
+            else new this.editingController(config)
 
     deleteRow: ->
         @editor.deleteCurrent()
 
+    createNewRecord: ->
+        if @createRecordFn
+            @createRecordFn(this)
+        else
+            new this.modelClass()
 
     addRow: (record)->
         # create a record if record argument wasn't given or it's an event
-        record = new this.model_class() if !record || record.type == "click"
+        record = this.createNewRecord() if !record || record.type == "click"
         row = this.dt_api.row.add( this._dataFromModel(record) )
-        this.api_settings().oFeatures.bServerSide=false
+        this.apiSettings().oFeatures.bServerSide=false
         row.draw(false)
-        this.api_settings().oFeatures.bServerSide=true
-        this.$( row.nodes() ).click()
+        this.apiSettings().oFeatures.bServerSide=true
+        tr = row.nodes()[0]
+        this.$( tr.cells[ tr.cells.length/2 ] ).click()
 
-
-    api_settings: ->
+    apiSettings: ->
         this.dt_api.settings()[0]
 
     onRowClick: (ev)->
         row = this.$(ev.target).closest('tr')
-        if this.edit_records
+        if this.editRecords
             this.beginEdit(row,ev)
-        else if @single_select_mode
+        else if @singleSelectMode
             this.unselect(row) for row in this.$('tr .active')
         else
             if row.hasClass('active')
@@ -124,23 +129,20 @@ class Lanes.Components.Grid extends Lanes.Components.Base
         row.attr('id', model.id)
         this.dt_api.row(row).data(this._dataFromModel(model)).draw()
 
-
     modelForRow: (row)->
         data = this.dt_api.row(row).data()
         return null unless data
         return data.model if data.model?.isModel
         attrs = if row.attr('id') then { id: parseInt(row.attr('id')) } else {}
-        for field,i in @column_definitions
+        for field,i in @columnDefinitions
             attrs[field.field] = data[i]
-        data.model = new @record_query.model_class(attrs,ignoreUnsaved:true)
-
+        data.model = new @modelClass(attrs,ignoreUnsaved:true)
 
     delayedGridConfiguration: ->
         _.delay( =>
             @dt_api.columns.adjust()
         ,500 )
 
-
     render: ->
         super
         responsiveHelper = undefined;
@@ -148,7 +150,6 @@ class Lanes.Components.Grid extends Lanes.Components.Base
             tablet: 1024,
             phone : 480
         };
-
         this.dataTable=this.$('table').dataTable(
             deferRender: true
             scrollY: "300px"
@@ -158,9 +159,8 @@ class Lanes.Components.Grid extends Lanes.Components.Base
             bProcessing: true
             bDeferRender: true
             oScroller: { loadingIndicator: true }
-#            columnDefs: @column_definitions
             ajax:
-                url: @record_query.url + ".json"
+                url: @recordQuery.url + ".json"
                 data: (d)=>@buildModels(d)
                 dataSrc: (d)->
                     d.recordsFiltered = d.recordsTotal = d.total
@@ -169,24 +169,26 @@ class Lanes.Components.Grid extends Lanes.Components.Base
             dom: "rtiS"
             oScroller:
                 rowHeight: 40
-            columns: @column_definitions
+            columns: @columnDefinitions
         )
         this.dt_api = this.dataTable.api()
-
         this.delayedGridConfiguration()
         this
 
     buildModels: (d)->
-        params = { o: {}, s: d.start, l: d.length||100, df:'array', f: ['id'].concat(_.pluck(@column_definitions, 'field')) }
-        if ! _.isEmpty( query = @record_query.asParams() )
+        params = {
+            o: {}, s: d.start, l: d.length||100, df:'array',
+            f: ['id'].concat(_.pluck(@columnDefinitions, 'field'))
+        }
+        if ! _.isEmpty( query = @recordQuery.asParams() )
             params['q']=query
         for order in d.order
-            column = @record_query.fields.at(order.column)
+            column = @recordQuery.fields.at(order.column)
             params['o'][column.field] = order.dir
         params
 
 
-    _make_field: (query_field,index)->
+    _makeField: (query_field,index)->
         align = switch query_field.type
             when 'integer','bigdec' then 'r'
             else 'l'
@@ -194,6 +196,6 @@ class Lanes.Components.Grid extends Lanes.Components.Base
 
     _dataFromModel: (model)->
         data = []
-        for field,i in @column_definitions
+        for field,i in @columnDefinitions
             data.push( model.get(field.field) || '' )
         data

data/client/lanes/components/grid/PopOverEditor.coffee

@@ -2,7 +2,7 @@ class Lanes.Components.Grid.PopOverEditor extends Lanes.Components.Grid.Editor
 
     template: 'grid/popover-editor'
     templateModels: ->
-        { columns: this.grid.column_definitions }
+        { columns: this.grid.columnDefinitions }
 
     session:
         view: 'object'
@@ -16,12 +16,12 @@ class Lanes.Components.Grid.PopOverEditor extends Lanes.Components.Grid.Editor
                 parent: this
                 className: 'grid-popover-editor'
                 target: Lanes.$(ev.target)
-                title: this.title || this.calculated_title()
+                title: this.title || this.calculatedTitle()
                 content: this.el
                 autoShow: true
             })
 
-    calculated_title: ->
+    calculatedTitle: ->
         (if this.model.isNew() then "Create: " else "Edit: ") + this.model.constructor.name
 
     cancelEditing: ->

data/client/lanes/components/grid/RowEditor.coffee

@@ -14,7 +14,7 @@ class Lanes.Components.Grid.RowEditor extends Lanes.Components.Grid.Editor
         inputs = this.form.children()
         for input, index in inputs
             column = Lanes.$(this.row[0].cells[index])
-            definition = this.grid.column_definitions[index]
+            definition = this.grid.columnDefinitions[index]
             Lanes.$(input)
                 .width(column.width())
                 .css("left", column.position().left)

data/client/lanes/components/grid/template.html

@@ -1,4 +1,4 @@
 <div class="lanes-grid">
-  <% if @grid.edit_records: %><%= h.toolbar( buttons: @buttons ) %><% end %>
+  <% if @grid.editRecords: %><%= h.toolbar( buttons: @buttons ) %><% end %>
   <table cellspacing="0" width="100%"></table>
 </div>

data/client/lanes/components/modal/ModalDialog.coffee

@@ -17,7 +17,7 @@ class Lanes.Components.ModalDialog extends Lanes.Components.Base
         if show then this.show() else this.hide()
 
     template: ->
-        tmpl = Lanes.Templates.find('modal/template', this.namespace)
+        tmpl = Lanes.Templates.find('lanes/components/modal/template')
         tmpl({
             size    : @size  || 'lg'
             title   : @title || context.dialog_title

data/client/lanes/components/modal/{modal.scss → _index.scss}

@@ -1,4 +1,4 @@
-@import "styles/vendor/bootstrap/modals";
+
 
 .modal-backdrop{
   position: absolute;

data/client/lanes/components/modal/index.js

@@ -1,2 +1,2 @@
-//= require vendor/bootstrap/modal
+//= require lanes/vendor/bootstrap/modal
 //= require_tree .

data/client/lanes/components/popover/PopOver.coffee

@@ -26,7 +26,7 @@ class Lanes.Components.PopOver extends Lanes.Components.Base
             Lanes.warn "PopOver Template #{this.template} was not found"
 
     initialize: (options)->
-        template = Lanes.Templates.find('components/popover/template')({ className: options.className||'' })
+        template = Lanes.Templates.find('lanes/components/popover/template')({ className: options.className||'' })
         _.extend(options, this.options, {template: template, container: this.viewport?.root})
         this.target.popover(options).on("hide.bs.popover", _.bind(this._onHide, this) )
         this.show() if options.autoShow

data/client/lanes/components/popover/_index.scss

@@ -0,0 +1 @@
+@import "lanes/styles/vendor/bootstrap/popovers";

data/client/lanes/components/popover/index.js

@@ -1,2 +1,2 @@
-//= require vendor/bootstrap/popover
+//= require lanes/vendor/bootstrap/popover
 //= require_tree .

data/client/lanes/extension/Extensions.coffee

@@ -10,9 +10,10 @@ Lanes.Extensions = {
     fireOnAvailable: (application)->
         instance.onAvailable?(application) for identifier, instance of @instances
 
-    setBootstrapModels: (bootstrap_data)->
+    setBootstrapData: (bootstrap_data)->
         for identifier,data of bootstrap_data
-            instance?.setBootstrapModels?(data)
+            instance = this.instances[identifier]
+            instance?.setBootstrapData?(data)
 
     makeNamespace: (identifier)->
         for ns in ['Models','Views','Controllers','Screens']

data/client/lanes/lib/Templates.coffee

@@ -8,6 +8,13 @@ Lanes.Templates.find = (name, namespace) ->
     else
         null
 
+Lanes.Templates.render = (view, name, data)->
+    template_fn = Lanes.Templates.find(name, view.FILE.extensionName)
+    if template_fn
+        template_fn( data )
+    else
+        null
+
 # scribbed from eco's compiler.coffee
 # we include the functions here rather than on every single template
 Lanes.Templates.Wrapper = {

data/client/lanes/minimal.js

@@ -5,7 +5,7 @@
 //= require ./models
 //= require ./plugins
 //= require ./views
-//= require ./screens
 //= require ./components/Base
 //= require ./components/enabled
 //= require ./extension/LateLoaded
+//= require ./screens

data/client/lanes/minimal.scss.erb

@@ -6,7 +6,7 @@
 <% end %>
 
 <% Lanes::Components.enabled_with_dependencies(self) do | component | %>
-  @import "components/<%= component %>/<%= component %>";
+  @import "lanes/components/<%= component %>/index";
 <% end %>
 
 }

data/client/lanes/models/Base.coffee

@@ -1,4 +1,3 @@
-
 # ------------------------------------------------------------------ #
 # The ModelChangeMonitor watches for changes on the                  #
 # Model and remembers which attributes have been changed             #
@@ -58,7 +57,7 @@ class AssocationMap
             target_klass ||= findAssociationClass() # it might not have been present previously
             record = target_klass.findOrCreate(args)
             record.parent = this
-            record        
+            record
         { deps: [definition.fk], fn: createAssocation }
 
     # Sets the assocations for "model"
@@ -157,7 +156,7 @@ class BaseModel
              base += "/"
         return base + encodeURIComponent(this.getId())
 
-    
+
     # A record is considered loaded if it has the id set and some attributes set
     isLoaded: ->
         !this.isNew() && !_.isEmpty( _.omit(this.attributes,this.idAttribute) )
@@ -184,30 +183,28 @@ class BaseModel
     # Searches the PubSub idenity map for a record of the same type and matching id
     # If one is found, it will update it with the given attributes and return it
     # When not found, it will create a new record and return it.
-    # The newly created record will not be stored, in PubSub map, only records bound to a view are stored
+    # The newly created record will not be stored in the PubSub map,
+    # as only records bound to a view are stored there
     @findOrCreate: (attrs, options={})->
         if attrs.id && ( record = Lanes.Models.PubSub.instanceFor(this, attrs.id) )
             record.set(attrs)
         else
             new this(attrs,options)
 
-    # Fetch a single record using an ID and the query options
-    @fetch: (id, options={})->
-        record = new this()
-        if _.isNumber(id)
-            record.id = id
-        record.fetch(options)
-
     # Calls Ampersand State's set method, then sets any associations that are present as well
     set: (attrs,options)->
         super
         this.associations.set(this,attrs) if this.associations
         this
 
-    where: (query,options)->
-        collection = new @constructor.Collection
-        collection.fetch( _.extend({query: query}, options) )
-        collection
+    # Loads records from the server that match query, returns a collection
+    @where: (query, options)->
+        this.Collection.fetch( _.extend({query: query}, options) )
+
+    # Load a single record using an ID and the query options
+    @fetchById: (id, options={})->
+        record = new this(id: id)
+        record.fetch(options)
 
     # Sets the attribute data from a server respose
     setFromServer: (data,options)->
@@ -227,7 +224,7 @@ class BaseModel
             'create'
         else
             if options.saveAll then 'update' else 'patch'
-        
+
         sync = this.sync(method, this, options);
 
         handlers.promise
@@ -260,7 +257,7 @@ class BaseModel
         handlers.promise
 
     # returns any attributes that have been set and not saved
-    unsavedModels: ->
+    unsavedAttributes: ->
         attrs = if this.isNew() then {} else { id: this.getId() }
         _.extend(attrs, _.pick( this.getAttributes(props:true, true),
             @changeMonitor.changedAttributes() ) )
@@ -272,7 +269,7 @@ class BaseModel
         if options.saveAll
             data = this.getAttributes(props:true, true)
         else
-            data = this.unsavedModels()
+            data = this.unsavedAttributes()
         _.extend(data, this.associations.dataForSave(this, options)) if this.associations
         data
 
@@ -307,7 +304,7 @@ class BaseModel
         klass::session['updated_at'] ||= 'date'
 
         if klass::associations
-            klass::associations = new AssocationMap(klass) 
+            klass::associations = new AssocationMap(klass)
 
         unless klass.Collection
             class DefaultCollection

data/client/lanes/models/Bootstrap.coffee

@@ -3,6 +3,5 @@ Lanes.Models.Bootstrap = {
     initialize: (options)->
         Lanes.Models.Config.csrf_token = options.csrf
         Lanes.Models.Config.api_path  = options.api_path
-        Lanes.Extensions.setBootstrapModels(options);
-
+        Lanes.Extensions.setBootstrapData(options);
 }