lanes 0.0.3 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41bcbe3635fa651f4d328c6c9d3dc14c267a37b5
-  data.tar.gz: e9180ffbee013255fbb75a11f689f6923535a42a
+  metadata.gz: 9103ba1713d2bda09e56196a703bf4f6641c4580
+  data.tar.gz: d4126f48d2d374e4323c2dccfdba535894082956
 SHA512:
-  metadata.gz: 3f32416a466e17a5c0ad6be69399461f9eb0b57e222cd7a07ee292f7b967ef3d09cad020fd852429d4d18fda2d34c441fc8880b70754d81a2f21ca462341c392
-  data.tar.gz: 39df407261c4ef0189a3ce9808b4d41330d90aebed86cb77682366cd1c8e17072880c67b37e7b9f8d2fca6dc7789187d5259069583804fe82bd4fa43c6eb31ae
+  metadata.gz: aad53b38768c367f155369608fdde18d4a34b6bd52da1e93a9d39a593885b08c8066a295ad69a3b908251c7c933c65cdd6a65d75e8a4440b3578b681139370c5
+  data.tar.gz: ce087ff038a83b5ec978aaa7edc39f1c10c31ed153d43c9e6ecaff7d358985720c63446c634505f61d2c5a075471f0904729e3a6aa17221492aa0bcb3ade7bf2

data/.gitignore

@@ -8,6 +8,7 @@ InstalledFiles
 coverage
 doc/
 log/
+public
 lib/bundler/man
 pkg
 rdoc

data/Gemfile

@@ -2,7 +2,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 "guard-jasmine",       github: "guard/guard-jasmine",           branch: 'jasmine-2'
+gem "guard-jasmine",       github: "guard/guard-jasmine",           branch: 'master'
 
 gem 'puma'
 

data/Rakefile

@@ -23,20 +23,6 @@ YARD::Rake::YardocTask.new do |t|
 end
 
 
-desc "Open an irb session preloaded with skr-core"
-task :console do
-    require 'irb'
-    require 'irb/completion'
-    require 'pp'
-    require 'lanes'
-    include Lanes
-    Lanes::DB.establish_connection
-    ActiveRecord::Base.logger = Logger.new STDOUT
-    ARGV.clear
-    IRB.start
-end
-
-
 task :doc => 'db:environment' do
     env = ENV['RAILS_ENV'] || 'development'
     ENV['SCHEMA']       = 'db/schema.rb'
@@ -44,31 +30,3 @@ task :doc => 'db:environment' do
     Rake::Task["db:schema:dump"].invoke
     Rake::Task["yard"].invoke
 end
-
-
-task :guard => [ 'db:migrate', 'db:test:clone_structure' ] do
-    # NAS: I've never figured out how to run Guard from a rake task
-    # Guard.setup
-    # Guard.run_all
-    # ^ this will work but only runs the task once
-    # and doesn't listen for changes.  Which kinda defeats the purpose
-    # For now just shell out until I can figure it out
-    sh "bundle exec guard"
-end
-
-args = ['-F','config/puma.rb']
-
-task :dev do
-    args.push('start')
-    Puma::ControlCLI.new(args).run
-end
-
-# require 'jasmine'
-# load 'jasmine/tasks/jasmine.rake'
-
-
-task :testj do
-    require 'lanes/api'
-    Lanes.config.specs_root = Pathname.getwd
-
-end

data/client/{javascripts/component → lanes/components}/Base.coffee

@@ -4,7 +4,7 @@ class BaseComponent
         super
         @access ||= this.calculate_access()
 
-    namespace: "Component"
+    namespace: "Components"
 
     session:
         access:
@@ -19,21 +19,21 @@ class BaseComponent
     writeTemplate: -> @renderTemplateMethod('template')
     emptyTemplate: -> '<span></span>'
 
-    template: (scope)->
-        if scope.writeAble
-            scope.writeTemplate()
-        else if scope.readOnly
-            scope.readTemplate()
+    template: ->
+        if this.writeAble
+            this.writeTemplate()
+        else if this.readOnly
+            this.readTemplate()
         else
-            scope.emptyTemplate()
+            this.emptyTemplate()
 
     calculate_access:->
-        if ! @field_name || Lanes.View.RenderContext.canWrite(@field_name)
+        if ! @field_name || Lanes.Views.RenderContext.canWrite(@field_name)
             'write'
-        else if Lanes.View.RenderContext.canRead(@field_name)
+        else if Lanes.Views.RenderContext.canRead(@field_name)
             'read'
         else
             'none'
 
 
-Lanes.Component.Base = Lanes.View.Base.extend(BaseComponent)
+Lanes.Components.Base = Lanes.Views.Base.extend(BaseComponent)

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

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

data/client/{javascripts/component → lanes/components}/grid/Editor.coffee

@@ -1,4 +1,4 @@
-class Lanes.Component.Grid.Editor extends Lanes.Component.Base
+class Lanes.Components.Grid.Editor extends Lanes.Components.Base
 
     session:
         grid: 'object' # n.b. - not 'state'.  Doing so causes stack overflow since grid also has a 'editor' session var
@@ -7,35 +7,32 @@ class Lanes.Component.Grid.Editor extends Lanes.Component.Base
         'click .save':   'saveChanges'
         'click .cancel': 'cancelEditing'
 
+    ui:
+        form: 'form'
+
     constructor: (config)->
         super
         this.grid = this.parent
 
     move: (row)->
         if @row
-            @grid.fireEvent('cancel-edit',@row)
+            this.$el.trigger('cancel-edit',@row)
         @row=row
         @model = this.grid.modelForRow(@row)
         this.render() unless this.rendered
         this.grid.$('.dataTables_scrollBody').append(this.el)
         this.updateFields()
 
-    render: ->
-        super
-        this.cacheJqElements({
-            form: 'form'
-        })
-
     updateFields: ->
         for input, index in this.$('input')
             if definition = this.getColumn(input.name)
-                _.dom.setAttribute(input, 'value', this.model.get(definition.field) )
+                Lanes.dom.setAttribute(input, 'value', this.model.get(definition.field) )
         this.$('input').first().focus()
 
     persistFields: ->
         for input, index in this.$('input')
             if definition = this.getColumn(input.name)
-                @model.set( definition.field, _.dom.getAttribute(input,'value') )
+                @model.set( definition.field, Lanes.dom.getAttribute(input,'value') )
 
     getColumn: (name)->
         _.findWhere(this.grid.column_definitions, { field: name })
@@ -45,12 +42,12 @@ class Lanes.Component.Grid.Editor extends Lanes.Component.Base
         @model.save().then => @updateGridRow()
 
     updateGridRow: ->
-        @grid.fireEvent('row-updated', @row)
+        this.$el.trigger('row-updated', @row)
         @grid.updateRow(@row,@model)
         this.cancelEditing()
 
     cancelEditing: ->
-        @grid.fireEvent('cancel-edit', @row)
+        this.$el.trigger('cancel-edit',@row)
         this.detach()
         this.model = null
 
@@ -60,6 +57,6 @@ class Lanes.Component.Grid.Editor extends Lanes.Component.Base
             @cancelEditing()
 
     fields: ->
-        _.map(this.form.children(), (input,index)->
+        _.map(this.ui.form.children(), (input,index)->
             { index: index, input: Lanes.$(input), column: this.grid.column_definitions[index] }
         ,this)

data/client/{javascripts/component → lanes/components/grid}/Grid.coffee

@@ -7,7 +7,7 @@ _.extend( Lanes.$.fn.dataTableExt.oStdClasses,{
 })
 
 
-class Lanes.Component.Grid extends Lanes.Component.Base
+class Lanes.Components.Grid extends Lanes.Components.Base
 
     events:
         'click button.refresh': 'reload'
@@ -17,7 +17,7 @@ class Lanes.Component.Grid extends Lanes.Component.Base
         'cancel-edit': 'onCancelEdit'
         'order.dt table': 'onSort'
 
-    templateName: 'grid'
+    template: 'grid/template'
     templateData: ->
         data = { grid: this, buttons: ['refresh'] }
         data['buttons'].push('create') if @add_records
@@ -46,7 +46,7 @@ class Lanes.Component.Grid extends Lanes.Component.Base
         editing_controller:  'any' # either string or constructor fn
 
     initialize: (options)->
-        this.listenTo(this.ui,'change:screen_menu_size', this.delayedWidthReset)
+        this.listenTo(this.viewport,'change:screen_menu_size', this.delayedWidthReset)
 
         unless Lanes.current_user.canWrite(this.model_class)
             this.edit_records = false
@@ -74,7 +74,7 @@ class Lanes.Component.Grid extends Lanes.Component.Base
         @dt_api.ajax.reload()
 
     unselect: (row)->
-        @fireEvent('unselect-row', @modelForRow(row), {row:row} )
+        this.$el.trigger('unselect-row', [@modelForRow(row), {row:row}])
         row.removeClass('active')
 
     beginEdit: (row,ev)->
@@ -118,7 +118,7 @@ class Lanes.Component.Grid extends Lanes.Component.Base
                 this.unselect(row)
             else
                 row.addClass('active')
-                @fireEvent('select-row', {model:model, row:row} ) if model = this.modelForRow(row)
+                this.$el.trigger('select-row', {model:model, row:row} ) if model = this.modelForRow(row)
 
     updateRow: (row, model)->
         row.attr('id', model.id)
@@ -160,7 +160,7 @@ class Lanes.Component.Grid extends Lanes.Component.Base
             oScroller: { loadingIndicator: true }
 #            columnDefs: @column_definitions
             ajax:
-                url: @record_query.url
+                url: @record_query.url + ".json"
                 data: (d)=>@buildData(d)
                 dataSrc: (d)->
                     d.recordsFiltered = d.recordsTotal = d.total

data/client/{javascripts/component → lanes/components}/grid/PopOverEditor.coffee

@@ -1,6 +1,6 @@
-class Lanes.Component.Grid.PopOverEditor extends Lanes.Component.Grid.Editor
+class Lanes.Components.Grid.PopOverEditor extends Lanes.Components.Grid.Editor
 
-    templateName: 'grid/popover-editor'
+    template: 'grid/popover-editor'
     templateData: ->
         { columns: this.grid.column_definitions }
 
@@ -12,7 +12,7 @@ class Lanes.Component.Grid.PopOverEditor extends Lanes.Component.Grid.Editor
         super
         if @popover
             @popover.destroy()
-        @popover = new Lanes.Component.PopOver({
+        @popover = new Lanes.Components.PopOver({
                 parent: this
                 className: 'grid-popover-editor'
                 target: Lanes.$(ev.target)

data/client/{javascripts/component → lanes/components}/grid/RowEditor.coffee

@@ -1,7 +1,6 @@
-class Lanes.Component.Grid.RowEditor extends Lanes.Component.Grid.Editor
+class Lanes.Components.Grid.RowEditor extends Lanes.Components.Grid.Editor
 
-
-    templateName: 'grid/row-editor'
+    template: 'grid/row-editor'
 
     move: (row)->
         super

data/client/lanes/components/grid/config.json

@@ -0,0 +1,3 @@
+{
+    "depends": ["popover"]
+}

data/client/{stylesheets/compoonents → lanes/components/grid}/grid.scss

@@ -1,3 +1,5 @@
+@import "editors";
+
 .lanes-grid {
 
   clear: both;
@@ -25,7 +27,7 @@
     padding-top: 20px;
     text-align: center;
     font-size: 1.2em;
-    background:url(asset_path('ajax-loader.gif')) no-repeat scroll 40% 7px $body-bg;
+    background:url(asset_path('images/ajax-loader.gif')) no-repeat scroll 40% 7px $body-bg;
   }
 
 
@@ -85,12 +87,12 @@
     cursor: pointer;
   }
 
-  thead .sorting { background: url(image-path('dataTables/sort_both.png')) no-repeat center right; }
-  thead .sorting_asc { background: url(image-path('dataTables/sort_asc.png')) no-repeat center right; }
-  thead .sorting_desc { background: url(image-path('dataTables/sort_desc.png')) no-repeat center right; }
+  thead .sorting { background: url(image-path('images/dataTables/sort_both.png')) no-repeat center right; }
+  thead .sorting_asc { background: url(image-path('images/dataTables/sort_asc.png')) no-repeat center right; }
+  thead .sorting_desc { background: url(image-path('images/dataTables/sort_desc.png')) no-repeat center right; }
 
-  thead .sorting_asc_disabled { background: url(image-path('dataTables/sort_asc_disabled.png')) no-repeat center right; }
-  thead .sorting_desc_disabled { background: url(image-path('dataTables/sort_desc_disabled.png')) no-repeat center right; }
+  thead .sorting_asc_disabled { background: url(image-path('images/dataTables/sort_asc_disabled.png')) no-repeat center right; }
+  thead .sorting_desc_disabled { background: url(image-path('images/dataTables/sort_desc_disabled.png')) no-repeat center right; }
 
   thead > tr > th {
     padding-left: 18px;

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

@@ -0,0 +1,8 @@
+//= require ./template
+//= require ./row-editor
+//= require ./popover-editor
+//= require ./vendor
+//= require ./Grid
+//= require ./Editor
+//= require ./PopOverEditor
+//= require ./RowEditor

data/client/{javascripts/vendor/dataTables → lanes/components/grid/vendor}/jquery.dataTables.js

@@ -38,6 +38,7 @@
         factory( require( 'jquery' ) );
     }
 	else if ( jQuery && !jQuery.fn.dataTable ) {
+
 		// Define using browser globals otherwise
 		// Prevent multiple instantiations if the script is loaded twice
 		factory( jQuery );

data/client/lanes/components/index.js

@@ -0,0 +1,2 @@
+//= require ./Base
+//= require ./enabled

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

@@ -0,0 +1,47 @@
+class Lanes.Components.ModalDialog extends Lanes.Components.Base
+
+    events:
+        'hide.bs.modal': '_onHide'
+
+    bindings:
+        'viewport.layout_size': { type:'class',selector:'.modal-dialog'}
+        'viewport.layout_size': { selector: '.modal', type: 'class' }
+
+    buttons:
+        close: { label: 'Close', type: 'default', dismiss: true }
+
+    session:
+        dialog_title: 'string'
+
+    toggleShown: (show)->
+        if show then this.show() else this.hide()
+
+    template: ->
+        tmpl = Lanes.Templates.find('modal/template', this.namespace)
+        tmpl({
+            size    : @size  || 'lg'
+            title   : @title || context.dialog_title
+            body    : this.renderTemplateMethod('bodyTemplate')
+            buttons : @buttons
+        })
+
+    hide:->
+        this.$el.modal('hide')
+        _.Promise.resolve( this )
+
+    show: ->
+        if this.rendered
+            this.viewport.el.append(this.el)
+            this.$el.modal('show')
+        else
+            this.render()
+            this.$el.modal({ body: this.viewport.el })
+        this.notification = new _.DeferredPromise
+        return this.notification.promise
+
+    destroy: ->
+        this.detach()
+
+    _onHide: (ev)->
+        this.detach()
+        this.notification.resolve(this)

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

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

data/client/lanes/components/modal/modal.scss

@@ -0,0 +1,20 @@
+@import "styles/vendor/bootstrap/modals";
+
+.modal-backdrop{
+  position: absolute;
+}
+
+
+// Use our sizing detection instead of media-queries
+
+.modal {
+
+  &.md{
+    .modal-lg {
+      right: 5%;
+      width: 100%;
+      left: 5%;
+    }
+  }
+
+}

data/client/{javascripts/component/modal.html → lanes/components/modal/template.html}

@@ -1,3 +1,4 @@
+<div class="modal fade" role="dialog">
   <div class="modal-dialog modal-<%= @size %>">
     <div class="modal-content">
       <div class="modal-header">
@@ -5,12 +6,12 @@
         <h4 class="modal-title" id="myModalLabel"><%= @title %></h4>
       </div>
       <div class="modal-body">
-          <%- @body %>
+        <%- @body %>
       </div>
       <div class="modal-footer">
-          <% for name, opts of @buttons: %>
-             <button type="button" name="<%= name %>" class="btn btn-<%= opts.type %>" <%='data-dismiss=modal' if opts.dismiss %>><%= opts.label %></button>
-          <% end %>
+        <% for name, opts of @buttons: %>
+        <button type="button" name="<%= name %>" class="btn btn-<%= opts.type %>" <%='data-dismiss=modal' if opts.dismiss %>><%= opts.label %></button>
+        <% end %>
         <!-- <button type="button" class="btn btn-primary">Save changes</button> -->
       </div>
     </div>

data/client/{javascripts/component → lanes/components/popover}/PopOver.coffee

@@ -1,4 +1,4 @@
-class Lanes.Component.PopOver extends Lanes.Component.Base
+class Lanes.Components.PopOver extends Lanes.Components.Base
 
     events:
         'hide.bs.popover': '_onHide'
@@ -26,8 +26,8 @@ class Lanes.Component.PopOver extends Lanes.Component.Base
             Lanes.warn "PopOver Template #{this.template} was not found"
 
     initialize: (options)->
-        template = Lanes.Templates.find('component/popover')({ className: options.className||'' })
-        _.extend(options, this.options, {template: template, container: this.ui?.viewport})
+        template = Lanes.Templates.find('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
 
@@ -36,7 +36,7 @@ class Lanes.Component.PopOver extends Lanes.Component.Base
 
     show: ->
         this.target.popover('show')
-        this.notification = new Lanes.Deferred
+        this.notification = new _.DeferredPromise
         return this.notification.promise
 
     destroy: ->

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

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

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

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

data/client/{javascripts/component → lanes/components/radio_group}/RadioGroup.coffee

@@ -15,7 +15,7 @@ class RadioInput
         super
 
 
-Lanes.View.Base.extend(RadioInput)
+Lanes.Views.Base.extend(RadioInput)
 
 
 class RadioGroup

data/client/{javascripts/component → lanes/components/record_finder}/RecordFinder.coffee

@@ -1,7 +1,7 @@
 class FinderClause
     constructor: -> super
 
-    templateName: 'record-finder/clause'
+    template: 'record-finder/clause'
 
     initialize: ->
         window.fc = this.model
@@ -102,7 +102,7 @@ Lanes.Component.ModalDialog.extend(FinderDialog)
 
 class RecordFinder
     constructor: -> super
-    templateName: 'record-finder/field'
+    template: 'record-finder/field'
     templateData: -> { field_name: @record_query.initial_field }
 
     events:
@@ -125,7 +125,7 @@ class RecordFinder
         ).then( (record)=>
             record.withAssociations(@.includeAssociations...) if record
         ).then( (record)=>
-            @.fireEvent("display-record", record) if record
+            this.$el.trigger("display-record", record) if record
         , (e)->Lanes.warn(e) )
 
     onKey: (ev)->
@@ -138,6 +138,6 @@ class RecordFinder
     runQuery: (ev)->
         code = this.$(ev.target).val()
         @record_query.loadSingle(code.toUpperCase(),{ include: @includeAssociations })
-            .then( (reply)=> @fireEvent("display-record", reply.record) if reply.record )
+            .then( (reply)=> this.$el.trigger("display-record", reply.record) if reply.record )
 
 Lanes.Component.RecordFinder = Lanes.Component.Base.extend(RecordFinder)

data/client/lanes/components/select_field/SelectField.coffee

@@ -0,0 +1,87 @@
+class SelectOption extends Lanes.Views.Base
+    template: (scope)->
+        '<option></option>'
+
+    constructor: (options)->
+        @groupName=options.groupName
+        m = options.mappings
+        @bindings = {}
+        @bindings["model.#{m.id}"]       = { type: 'value', selector: 'option' }
+        @bindings["model.#{m.selected}"] = { type: 'booleanAttribute', selector: 'option', name:'selected' }
+        @bindings["model.#{m.title}"]    = 'option'
+        @bindings["model.#{m.visible}"]  = { type: 'toggle' } if m.visible
+        super
+
+
+class Lanes.Components.SelectField extends Lanes.Components.Base
+
+    subviews:
+        fields:
+            hook: 'choices-input'
+            collection: 'selections'
+            options: 'subViewOptions'
+            view: SelectOption
+
+    session:
+        multiple: { type: 'boolean', default: false }
+        selections: 'collection'
+
+    subViewOptions: ->
+        { field_name: @field_name, mappings: @mappings }
+
+    constructor: (options={})->
+        if options.has_many
+            @association = options.model.associations[options.has_many]
+            @field_name  = @association.fk
+        else
+            @field_name = options.field_name || options.subViewId
+
+        @mappings = _.extend({
+            id: 'id', title: 'title', selected: 'selected'
+        },options.mappings||{})
+        super
+
+
+    initialize: (options={})->
+        if @association
+            collection = Lanes.Data[@association.model].sharedCollection()
+            collection.fetch().then (m)=>
+                @selections = m
+                this.on('change:model', this.onModelChange )
+        else if options.data
+            @selections = options.data
+
+    selectionForID: (id)->
+        q={}; q[@mappings.id]=id
+        @selections.findWhere( q )
+
+    onAttributeChange: (model,fkid)->
+        this.select( this.selectionForID( fkid ) )
+
+    onModelChange: ->
+        if (old_model = this.previousAttributes()['model'])
+            this.stopListening(old_model,"change:#{@association.fk}", this.onAttributeChange )
+        this.listenTo(@model,"change:#{@association.fk}", this.onAttributeChange )
+        fk_id = @model.get( @association.fk )
+        record = if fk_id
+            this.selectionForID( fk_id )
+        else
+            @model[@association.name]
+        this.select(record)
+
+    writeTemplate: ->
+        multiple = if this.multiple then "multiple" else ""
+        "<select class='form-control' #{multiple} name='#{this.field_name}' data-hook='choices-input'></select>"
+
+    readTemplate: ->
+        "<div class='ro-input' name='#{this.field_name}'></div>"
+
+    select: (option)->
+        if this.readOnly
+            this.$el.text( if option then option.code else "" )
+        else if option
+            id = option.get(@mappings.id)
+            option = this.query("option[value=\"#{id}\"]")
+            option.selected = true
+        else
+            this.$el.find(":selected").prop('selected',false)

data/client/{screens/user-management → lanes/components/select_field}/index.js

@@ -1,2 +1 @@
-//= require_self
 //= require_tree .