lanes 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 09c525f4869a2e1f8b1d4ff92ca1f31344715994
-  data.tar.gz: 98893dd650c0d95209e9b337623f1c079e807ae6
+  metadata.gz: b111e3e03f3c6f6a3bfffca0d087590b1ea0277a
+  data.tar.gz: ac11d9b1700311f927f06d06bcbee08de31c56e2
 SHA512:
-  metadata.gz: e8a11e0a3028195b5cf5bf3ff6f1e2cc06754e08e776100fcc69abf330cf1cadcf1c8e8b72d408b60f73266bd719feebc0d523b4415a847957cc7f9d947ef732
-  data.tar.gz: a813d60b1ad735443aa90e5461743836f0eb606c81464e61e6d1131dc9e911fb5faba4a345ca876a474c3104205f360f19f1edaf0bb376bcbbe42b1f3fd56d91
+  metadata.gz: 3fd3233d6311c8df5041a5a39e2245f5e5099fbddde5126c8b4202e51bb79e51a25391bec8a18f9c51d13d3d34f66e7e22e5ce54a0fc88e42ea9e568bfe473ce
+  data.tar.gz: bd91444bafa49fc750fb6750071903a4856bff5ececf54c577935b55382788798f5b574f57b91fd41f56fb80bb5dece54b208fbc981e8b23f69d3519e0ce7d48

data/client/lanes/access/LoginDialog.coffee

@@ -8,7 +8,6 @@ class Lanes.Access.LoginDialog extends Lanes.Components.ModalDialog
 
     size: 'md'
     title: 'Please sign in …'
-    FILE: FILE
 
     domEvents:
         'click .btn-primary': 'onLogin'

data/client/lanes/access/screens/user-management/UserManagement.coffee

@@ -2,7 +2,6 @@ class Lanes.Access.Screens.UserManagement extends Lanes.Screens.Base
 
     templateName: 'user-management/screen'
     templatePrefix: 'lanes/access/screens'
-    FILE: FILE
 
     subviews:
         grid:

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

@@ -8,7 +8,6 @@ _.extend( Lanes.$.fn.dataTableExt.oStdClasses,{
 
 
 class Lanes.Components.Grid extends Lanes.Components.Base
-    FILE: FILE
 
     domEvents:
         'click button.refresh': 'reload'
@@ -48,6 +47,7 @@ class Lanes.Components.Grid extends Lanes.Components.Base
         selectionMode: ['string', true, 'single']
         editorConfig:  { type: 'object' }
         editingController:  'any' # either string or constructor fn
+        columnWidths: { type: 'array', default: -> [] }
 
     initialize: ->
         if this.viewport
@@ -191,7 +191,12 @@ class Lanes.Components.Grid extends Lanes.Components.Base
         align = switch query_field.type
             when 'integer','bigdec' then 'r'
             else 'l'
-        { title: query_field.title, id: query_field.id, className: align, "targets": [ index ] }
+        options = {
+            id: query_field.id, title: query_field.title,
+            className: align, "targets": [ index ]
+        }
+        options['width'] = @columnWidths[index] if @columnWidths[index]
+        options
 
     _dataFromModel: (model)->
         data = []

data/client/lanes/components/radio-group/RadioGroup.coffee

@@ -17,7 +17,6 @@ class RadioInput extends Lanes.Views.Base
 
 class Lanes.Components.RadioGroup extends Lanes.Components.MultiSelect
 
-    FILE: FILE
 
     writeTemplate: ->
         "<span data-hook='choices-input'></span>"

data/client/lanes/components/record-finder/Clause.coffee

@@ -1,5 +1,4 @@
 class Lanes.Components.RecordFinder.Clause extends Lanes.Components.Base
-    FILE: FILE
 
     writeTemplateName: 'clause'
     useFormBindings: true

data/client/lanes/components/record-finder/Dialog.coffee

@@ -1,5 +1,4 @@
 class Lanes.Components.RecordFinder.Dialog extends Lanes.Components.ModalDialog
-    FILE: FILE
 
     domEvents:
         'click .add-clause': 'addClause'
@@ -12,7 +11,7 @@ class Lanes.Components.RecordFinder.Dialog extends Lanes.Components.ModalDialog
             hook: 'grid'
             component: 'Grid'
             options: ->
-                { recordQuery: @recordQuery }
+                _.extend(@gridOptions||{}, { recordQuery: @recordQuery, options: @gridOptions })
         query_clauses:
              container: '.query-clauses'
              view: Lanes.Components.RecordFinder.Clause, collection: 'clauses'
@@ -22,6 +21,7 @@ class Lanes.Components.RecordFinder.Dialog extends Lanes.Components.ModalDialog
 
     session:
         recordQuery: 'model'
+        gridOptions: 'object'
         clauses: 'collection'
 
     initialize:(options)->

data/client/lanes/components/record-finder/RecordFinder.coffee

@@ -1,5 +1,4 @@
 class Lanes.Components.RecordFinder extends Lanes.Components.Base
-    FILE: FILE
 
     writeTemplateName: 'field'
     writeTemplateData: ->
@@ -13,6 +12,7 @@ class Lanes.Components.RecordFinder extends Lanes.Components.Base
         withAssociations: 'array'
         invalid_chars: 'regex'
         recordQuery: 'model'
+        gridOptions: 'gridOptions'
         fieldName:  'string'
         queryField: [ 'string', false, 'code' ]
 
@@ -30,7 +30,8 @@ class Lanes.Components.RecordFinder extends Lanes.Components.Base
 
     displayFinder: ->
         finder = new Lanes.Components.RecordFinder.Dialog(
-            parent:this, title: @title, recordQuery: @recordQuery
+            gridOptions: @gridOptions, parent:this
+            title: @title, recordQuery: @recordQuery
         )
         finder.show().then( (dlg)->
             dlg.remove().record

data/client/lanes/components/select2/Select2.coffee

@@ -0,0 +1,8 @@
+class Lanes.Components.Select2 extends Lanes.Components.Base
+
+    writeTemplate: ->
+        multiple = if this.multiple then "multiple" else ""
+        "<div><select class='form-control' #{multiple} name='#{this.field_name}' data-hook='choices-input'></select></div>"
+
+    readTemplate: ->
+        "<div class='ro-input' name='#{this.field_name}'></div>"

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

@@ -0,0 +1,2 @@
+//= require ./template
+//= require ./Select2

data/client/lanes/extension/Extensions.coffee

@@ -18,7 +18,7 @@ Lanes.Extensions = {
 
     makeNamespace: (identifier)->
         for ns in ['Models','Views','Controllers','Screens','Components']
-            Lanes.namespace("#{identifier}.#{ns}")
+            Lanes.namespace("#{identifier}.#{ns}.Mixins")
 
     controlling: ->
         this.get( @controlling_id )

data/client/lanes/lib/ModuleSupport.coffee

@@ -18,5 +18,5 @@ class Lanes.lib.ModuleSupport
                 _.extend(@::[key], value)
             else
                 @::[key] = value
-        obj.included?.apply(@)
+        obj.included?(@)
         this

data/client/lanes/models/ChangeSet.coffee

@@ -1,6 +1,5 @@
 class Lanes.Models.ChangeSet extends Lanes.Models.Base
 
-    FILE: FILE
 
     constructor: ->
         super

data/client/lanes/models/ModelAssociations.coffee

@@ -15,7 +15,7 @@ class Lanes.Models.AssocationMap
     getClassFor: (name)->
         definition = @definitions[name]
         object = definition.model || definition.collection
-        Lanes.u.findObject( object, 'Models', @klass::FILE)
+        Lanes.u.findObject(object, 'Models', @klass::FILE)
 
     getOptions: (name, definition, model)->
         options = { parent: model }
@@ -24,32 +24,32 @@ class Lanes.Models.AssocationMap
         options
 
     # will be called in the scope of the model
-    createModel: (association, name, definition, fk, pk, target_klass)->
-        target_klass ||= association.getClassFor(name)
+    createModel: (association, name, definition, fk, pk, target_class)->
+        target_class ||= association.getClassFor(name)
         options = association.getOptions(name,definition,this)
         model_id = this.get(pk)
         if model_id && model_id == this._cache[name]?.id
             this._cache[name]
         else
-            target_klass.findOrCreate(options)
+            target_class.findOrCreate(options)
 
     # will be called in the scope of the model
-    createCollection: (association, name, definition, fk, pk, target_klass)->
-        target_klass ||= association.getClassFor(name)
+    createCollection: (association, name, definition, fk, pk, target_class)->
+        target_class ||= association.getClassFor(name)
         options = association.getOptions(name,definition,this)
         options.filter ||= {}
         options.filter[fk]=this.get(pk)
 
-        if target_klass::isCollection
-            new target_klass(options.models||[],options)
+        if target_class::isCollection
+            new target_class(options.models||[],options)
         else
-            options.model=target_klass
+            options.model=target_class
             new Lanes.Models.AssociationCollection(options.models||[],options)
     # returns the definition for the derived property
     derivedDefinition: (name,definition)->
         createFn = _.partial(
             if definition.model then this.createModel else this.createCollection,
-            this, name, definition, this.fk(name), this.pk(name), this.getClassFor(name)
+            this, name, definition, this.fk(name), this.pk(name)
         )
         { deps: [this.pk(name)], fn: createFn }
 

data/client/lanes/models/mixins/HasCodeField.coffee

@@ -2,11 +2,11 @@ Lanes.Models.Mixins.HasCodeField = {
 
     INVALID: /[^A-Z0-9a-z]/
 
-    included: ->
-        this.prototype.INVALID_CODE_CLanes.RS ||= Lanes.Models.mixins.Lanes.sCodeField.INVALID
+    included: (klass)->
+        klass::INVALID_CODE_CHARS ||= Lanes.Models.mixins.Lanes.sCodeField.INVALID
 
     initialize: ->
-        this.on('change:code', this.upcaseCode )
+        this.on('change:code', this.upcaseCode)
 
     upcaseCode: ->
         this.set('code', this.get('code').toUpperCase())

data/client/lanes/screens/Definitions.coffee

@@ -1,5 +1,4 @@
 class ScreenView extends Lanes.Models.BasicModel
-    FILE: FILE
 
     session:
         screen: 'object'
@@ -31,7 +30,6 @@ class ScreenView extends Lanes.Models.BasicModel
 
 
 class ScreenDefinition extends Lanes.Models.BasicModel
-    FILE: FILE
 
     session:
         id:          'string'
@@ -86,7 +84,6 @@ class ScreenDefinition extends Lanes.Models.BasicModel
 
 
 class ScreenViewSet extends Lanes.Models.BasicCollection
-    FILE: FILE
 
     model: ScreenView
 
@@ -125,7 +122,6 @@ class ScreenViewSet extends Lanes.Models.BasicCollection
 
 
 class ScreenSet extends Lanes.Models.BasicCollection
-    FILE: FILE
 
     model: ScreenDefinition
 
@@ -138,7 +134,6 @@ class ScreenSet extends Lanes.Models.BasicCollection
 
 
 class MenuGroup extends Lanes.Models.BasicModel
-    FILE: FILE
 
     session:
         id:          'string'
@@ -156,7 +151,6 @@ class MenuGroup extends Lanes.Models.BasicModel
         })
 
 class MenuGroupSet extends Lanes.Models.BasicCollection
-    FILE: FILE
 
     constructor: -> super
     model: MenuGroup

data/client/lanes/views/ModelUpdate.coffee

@@ -1,6 +1,5 @@
 class Lanes.Views.ModelUpdate extends Lanes.Views.Base
 
-    FILE: FILE
 
     templateData: ->
         { change: @model }

data/client/lanes/workspace/ActiveScreensSwitcher.coffee

@@ -1,7 +1,6 @@
 class TabView extends Lanes.Views.Base
 
     template: "<li><a data-toggle='tab'></a><span class='close'>×</span></li>"
-    FILE: FILE
     mixins:[
         Lanes.Workspace.WorkspaceView
     ]

data/client/lanes/workspace/Layout.coffee

@@ -1,6 +1,5 @@
 class Lanes.Workspace.Layout extends Lanes.Views.Base
 
-    FILE: FILE
     templateName: 'layout'
     templateData: ->
         { ui: this.ui_state }

data/client/lanes/workspace/Navbar.coffee

@@ -1,7 +1,6 @@
 class Lanes.Workspace.Navbar extends Lanes.Views.Base
 
     templateName: 'navbar'
-    FILE: FILE
     mixins:[
         Lanes.Workspace.WorkspaceView
     ]

data/client/lanes/workspace/Pages.coffee

@@ -1,7 +1,6 @@
 class Lanes.Workspace.Pages extends Lanes.Views.Base
 
     templateName: 'pages'
-    FILE: FILE
     mixins:[
         Lanes.Workspace.WorkspaceView
     ]

data/client/lanes/workspace/ScreensMenu.coffee

@@ -1,7 +1,6 @@
 class ScreenList extends Lanes.Views.Base
 
     template: "<li><a href='#'><span></span><i></i></a></li>"
-    FILE: FILE
     mixins:[
         Lanes.Workspace.WorkspaceView
     ]
@@ -19,7 +18,6 @@ class ScreenList extends Lanes.Views.Base
 class ScreenGroup extends Lanes.Views.Base
 
     template: '<li class="group"><a class="heading" href="#"><span></span><i></i></a><ul></ul></li>'
-    FILE: FILE
     mixins:[
         Lanes.Workspace.WorkspaceView
     ]
@@ -47,7 +45,6 @@ class ScreenGroup extends Lanes.Views.Base
 
 class Lanes.Workspace.ScreensMenu extends Lanes.Views.Base
 
-    FILE: FILE
     templateName: 'screens-menu'
     mixins:[
         Lanes.Workspace.WorkspaceView

data/lib/lanes/access/authentication_provider.rb

@@ -10,10 +10,10 @@ module Lanes
 
             def current_user
                 @current_user ||= (
-                    if Lanes.env.test? && request.env['HTTP_X_TESTING_USER']
+                    if Lanes.env.test? && request.env['HTTP_X_TESTING_USER'].present?
                         Lanes::User.where(login: request.env['HTTP_X_TESTING_USER']).first
                     else
-                        Lanes::User.where(id: @session['user_id']).first
+                        Lanes::User.where(id: request.session['user_id']).first
                     end
                 )
             end
@@ -23,7 +23,7 @@ module Lanes
             end
 
             def error_message_for_access
-                return "Unable to " + case @request.request_method
+                return "Unable to " + case request.request_method
                                       when 'GET' then "read"
                                       when 'POST','PATCH','PUT' then "write"
                                       when 'DELETE' then "delete"
@@ -34,13 +34,13 @@ module Lanes
 
             def allowed_access_to?(klass)
                 return false if current_user.nil?
-                case @request.request_method
+                case request.request_method
                 when 'GET'
-                    klass.can_read_attributes?(@request.params,current_user)
+                    klass.can_read_attributes?(request.params,current_user)
                 when 'POST','PATCH','PUT'
-                    klass.can_write_attributes?(@request.params,current_user)
+                    klass.can_write_attributes?(request.params,current_user)
                 when 'DELETE'
-                    klass.can_delete_attributes?(@request.params,current_user)
+                    klass.can_delete_attributes?(request.params,current_user)
                 else
                     false
                 end

data/lib/lanes/api/coffeescript_processor.rb

@@ -0,0 +1,64 @@
+# Coffeescript has two shortcomings with regards to Lanes
+#
+# The first is that it's extends format is incompatible with AmpersandState,
+# State does quite a bit more via it's own .extend methods.
+# Accordingly, we substitute our own "extend" call whenever we encounter a coffeescript extends
+#
+# The second issue is that if a constructor isn't present, coffeescript with generate it's own
+# blank implementation that fails to call "super".  We add a constructor that does call super if one's missing.
+
+module Lanes
+    module API
+        class CoffeeScriptProcessor < JsAssetCompiler
+
+            class CoffeeClass
+                attr_reader :name, :extends, :contents, :file_contents, :indent
+                def initialize(name, extends, file_contents)
+                    @name=name; @extends=extends; @file_contents=file_contents
+                    file_contents.gsub!(/class\s+#{name}\s+.*?\n/,"class #{name}\n")
+                    @contents = @file_contents[/(class #{name}\n.*?)(\n\w|\Z)/m,1]
+                    @indent = @contents[/\n(\s+)(\w+):/,1] || '    '
+                end
+
+                def ensure_property(property_name, definition)
+                    if contents !~ /^\s+#{property_name}\s*:/
+                        # figure out how much to indent, sigh.
+                        file_contents.gsub!(/class #{name}\n/,
+                                            "\\0#{indent}#{property_name}: #{definition}\n")
+                    end
+                end
+
+                def save
+                    file_contents.gsub!( /(class #{name}\n.*?)(\n\w|\Z)/m,
+                                         "\\1\n#{extends}.extend(#{name})\n\\2" )
+                end
+            end
+
+            self.registered_extension = '.coffee'
+
+            attr_reader :contents
+
+            CONSTRUCTOR = /constructor\s*:/
+
+            EXTENDING_CLASS_DEFINITION = /class\s+([\w|\.]+)\s+extends\s+([\w|\.]+)\s*?\n/
+
+            def cleaned
+                @contents = data.dup
+                data.scan(EXTENDING_CLASS_DEFINITION) do |match|
+                    (name, extends) = match
+                    cc = CoffeeClass.new(name, extends, contents)
+                    cc.ensure_property("constructor", "-> super")
+                    cc.ensure_property("FILE", "FILE")
+                    cc.save
+                end
+                contents
+            end
+
+            def evaluate(scope, locals, &block)
+                wrap_js scope, ::CoffeeScript.compile(cleaned, bare: true)
+            end
+
+
+        end
+    end
+end

data/lib/lanes/api/javascript_processor.rb

@@ -40,47 +40,53 @@ module Lanes
 
         end
 
-        class CoffeeScriptWrapper < JsAssetCompiler
-            self.registered_extension = '.coffee'
-
-            CONSTRUCTOR = /constructor\s*:/
-            EXTENDING_CLASS = /class\s+([\w|\.]+)\s+extends\s+([\w|\.]+)\s*?\n/
-
-            # Coffeescript has two shortcomings with regards to Lanes
-            #
-            # The first is that it's extends format is incompatible with AmpersandState,
-            # State does quite a bit more via it's own .extend methods.
-            # Accordingly, we substitute our own "extend" call whenever we encounter a coffeescript extends
-            #
-            # The second issue is that if a constructor isn't present, coffeescript with generate it's own
-            # blank implementation that fails to call "super".  We add a constructor that does call super if one's missing.
-
-            def cleaned
-                contents = data.dup
-                data.scan(EXTENDING_CLASS) do |match|
-                    (name,extends) = match
-
-                    contents.gsub!(/class\s+#{name}\s+.*?\n/,"class #{name}\n")
-                    definition = contents[/(class #{name}\n.*?)(\n\w|\Z)/m,1]
-                    # is it missing a constructor?
-                    if definition !~ /constructor:/
-                        # figure out how much to indent, sigh.
-                        indent = definition[/\n(\s+)(\w+):/,1] || '    '
-                        contents.gsub!(/class #{name}\n/,"\\0#{indent}constructor: -> super\n")
-
-                    end
-                    contents.gsub!( /(class #{name}\n.*?)(\n\w|\Z)/m, "\\1\n#{extends}.extend(#{name})\n\\2" )
-
-                    contents
-                    #contents << "#{extends}.extend(#{name})\n"
-                end
-                contents
-            end
-
-            def evaluate(scope, locals, &block)
-                wrap_js scope, ::CoffeeScript.compile(cleaned, bare: true)
-            end
-        end
+        # class CoffeeScriptWrapper < JsAssetCompiler
+        #     self.registered_extension = '.coffee'
+
+        #     CONSTRUCTOR = /constructor\s*:/
+        #     CLASS_DEFINITION = /\s*class\s+([\w|\.]+)/
+        #     EXTENDING_CLASS = /class\s+([\w|\.]+)\s+extends\s+([\w|\.]+)\s*?\n/
+
+        #     # Coffeescript has two shortcomings with regards to Lanes
+        #     #
+        #     # The first is that it's extends format is incompatible with AmpersandState,
+        #     # State does quite a bit more via it's own .extend methods.
+        #     # Accordingly, we substitute our own "extend" call whenever we encounter a coffeescript extends
+        #     #
+        #     # The second issue is that if a constructor isn't present, coffeescript with generate it's own
+        #     # blank implementation that fails to call "super".  We add a constructor that does call super if one's missing.
+
+        #     def cleaned
+        #         contents = data.dup
+        #         data.scan(CLASS_DEFINITION) do |match|
+        #             (name, extends) = match
+        #             definition = get_definition(name)
+
+
+        #             # is it missing a constructor?
+        #             if definition !~ /constructor:/
+        #                 # figure out how much to indent, sigh.
+        #                 indent = definition[/\n(\s+)(\w+):/,1] || '    '
+        #                 contents.gsub!(/class #{name}\n/,"\\0#{indent}constructor: -> super\n")
+
+        #             end
+        #             contents.gsub!( /(class #{name}\n.*?)(\n\w|\Z)/m, "\\1\n#{extends}.extend(#{name})\n\\2" )
+
+        #             contents
+        #             #contents << "#{extends}.extend(#{name})\n"
+        #         end
+        #         contents
+        #     end
+
+        #     def evaluate(scope, locals, &block)
+        #         wrap_js scope, ::CoffeeScript.compile(cleaned, bare: true)
+        #     end
+
+        #     def get_definition(name)
+        #         contents.gsub!(/class\s+#{name}\s+.*?\n/,"class #{name}\n")
+        #                        definition = contents[/(class #{name}\n.*?)(\n\w|\Z)/m,1]
+        #     end
+        # end
 
         class Es6Compiler < JsAssetCompiler
             self.registered_extension = '.es6'
@@ -129,3 +135,5 @@ module Lanes
 
     end
 end
+
+require_relative 'coffeescript_processor'

data/lib/lanes/api/root.rb

@@ -35,7 +35,9 @@ module Lanes
                 PubSub.initialize(self)
                 Extensions.load_controlling_config
                 # late load in case an extension has provided an alternative implementation
-                require "lanes/api/null_authentication_provider" unless API.const_defined?(:AuthenticationProvider)
+                unless API.const_defined?(:AuthenticationProvider)
+                    require "lanes/api/null_authentication_provider"
+                end
                 # use Rack::Csrf, :skip=>['GET:/'], :raise => true
             end
 

data/lib/lanes/concerns/pub_sub.rb

@@ -1,6 +1,6 @@
 module Lanes::Concerns
 
-    # Event subscription and publishing for Stockor Models
+    # Event subscription and publishing for Models
     # Every model has certain built-in events (:save, :create, :update, :destroy)
     # And may also implement custom events that reflect the models domain
     # @example Send an email when a customer's name is updated
@@ -50,31 +50,37 @@ module Lanes::Concerns
             class_attribute :_event_listeners
             base.valid_event_names = [ :save, :create, :update, :destroy ]
 
-            base.after_save    :fire_after_save_events
-            base.after_create  :fire_after_create_events
-            base.after_update  :fire_after_update_events
-            base.after_destroy :fire_after_destroy_events
+            base.after_save    :fire_after_save_pubsub_events
+            base.after_create  :fire_after_create_pubsub_events
+            base.after_update  :fire_after_update_pubsub_events
+            base.after_destroy :fire_after_destroy_pubsub_events
         end
 
         module ClassMethods
             def inherited(base)
                 super
                 klass = base.to_s.demodulize
-
-                #p klass
-                # if klass=="Tester"
-                #     binding.pry
-                # end
                 events = PubSub::PendingListeners.claim( klass )
-                events.each{ | name, procs | base.event_listeners[name] += procs  }
-
+                events.each{ | name, procs |
+                    procs.each{|pr|
+                        base.send(:_add_event_listener, name, &pr)
+                    }
+                }
             end
 
             def observe( event, &block )
-                _ensure_validate_event( event )
+                unless self.valid_event_names.include?(event.to_sym)
+                    raise InvalidEvent.new("#{event} is not a valid event for #{self}")
+                end
                 _add_event_listener( event.to_sym, &block )
             end
 
+            protected
+
+            def has_additional_events( *names )
+                self.valid_event_names += names.map{ |name| name.to_sym }
+            end
+
             private
 
             def _add_event_listener(name, &block)
@@ -84,46 +90,38 @@ module Lanes::Concerns
                 self._event_listeners = self._event_listeners.dup
                 self._event_listeners[name] = listeners
             end
-
-            def _ensure_validate_event(event)
-                unless self.valid_event_names.include?(event.to_sym)
-                    raise InvalidEvent.new("#{event} is not a valid event for #{self}")
-                end
-            end
-
-            def has_additional_events( *names )
-                self.valid_event_names += names.map{ |name| name.to_sym }
-            end
         end
 
         protected
 
-        def fire_after_destroy_events
-            _fire_event(:update, self )
+        def fire_after_destroy_pubsub_events
+            fire_pubsub_event(:update, self)
         end
-        def fire_after_update_events
-            _fire_event(:update, self )
+
+        def fire_after_update_pubsub_events
+            fire_pubsub_event(:update, self)
         end
-        def fire_after_create_events
-            _fire_event(:create, self )
+
+        def fire_after_create_pubsub_events
+            fire_pubsub_event(:create, self)
         end
-        def fire_after_save_events
-            _fire_event( :save, self )
+
+        def fire_after_save_pubsub_events
+            fire_pubsub_event(:save, self)
         end
 
-        def fire_event( name, *arguments )
-            self.class._ensure_validate_event( name )
-            arguments.unshift( self )
-            _fire_event( name, *arguments )
+        def fire_pubsub_event(name, *arguments)
+            return if self.class._event_listeners.nil? ||
+                      !self.class._event_listeners.has_key?(name.to_sym)
+            arguments = arguments.dup.unshift(self)
+            self.class._event_listeners[ name.to_sym ].each{ | block |
+                block.call(*arguments)
+            }
         end
 
         private
 
-        def _fire_event( name, *arguments )
-            return if self.class._event_listeners.nil? ||
-                           !self.class._event_listeners.has_key?(name.to_sym)
-
-            self.class._event_listeners[ name.to_sym ].each{ | block | block.call(*arguments) }
+        def _fire_pubsub_event( name, *arguments )
         end
     end
 

data/lib/lanes/configuration.rb

@@ -51,25 +51,31 @@ module Lanes
         # Database tables will have this prefix applied to them
         config_option :table_prefix, ''
 
-        config_option :debug_assets, false
-        config_option :default_javascript_tag_options, {}
-
+        # The configuration environment to use, test, development, production
         config_option :environment, (ENV['RACK_ENV'] || 'development').to_sym
+
         # The secret key to use for session cookies.
         config_option :session_secret_key_base,  '1234', silent: true
+
+        # Configuration for Redis
         config_option :redis, { path: "/tmp/redis.sock" }
-        config_option :pubsub_key, nil
-        config_option :pubsub_host, nil
-        config_option :pubsub_timeout, 10
 
-        config_option :es6_transpiler_path, '6to5'
-        config_option :es6_transpiler_options, '-t '
+        # Title of application
         config_option :app_title, "Lanes Test"
+
+        # url prefix to use for assets
         config_option :assets_path_prefix, "/assets"
+
+        # prefix to use for all urls
         config_option :mounted_at, ''
+
+        # The initial view class to display
         config_option :root_view, 'Lanes.Workspace.Layout'
+
+        # Screen to display on load (if workspace extension is used)
         config_option :initial_workspace_screen_id, ''
-        config_option :specs_root, Pathname.getwd
+
+        # types of assets to include into compiled package
         config_option :static_asset_types, ['images','fonts']
     end
 

data/lib/lanes/version.rb

@@ -1,5 +1,5 @@
 module Lanes
 
-    VERSION = "0.1.7"
+    VERSION = "0.1.8"
 
 end

data/spec/command-reference-files/initial/Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem "lanes", '0.1.6'
+gem "lanes", '0.1.8'
 
 gem "rake"
 gem 'puma'

data/spec/command-reference-files/initial/client/appy-app/Extension.coffee

@@ -1,6 +1,5 @@
 class AppyApp.Extension extends Lanes.Extensions.Base
 
-    FILE: FILE
 
     identifier: "appy-app"
 

data/spec/command-reference-files/model/client/appy-app/models/TestTest.coffee

@@ -1,6 +1,5 @@
 class AppyApp.Models.TestTest extends AppyApp.Models.Base
 
-    FILE: FILE
 
     props:
         id   : "integer"

data/spec/command-reference-files/screen/client/appy-app/screens/ready-set-go/ReadySetGo.coffee

@@ -1,6 +1,5 @@
 class AppyApp.Screens.ReadySetGo extends AppyApp.Screens.Base
 
-    FILE: FILE
 
     subviews: {}
 

data/spec/command-reference-files/screen/config/screens.rb

@@ -1,4 +1,5 @@
 Lanes::Screen.define "ready-set-go" do | screen |
+    screen.title       = "Ready Set Go"
     screen.description = ""
     screen.icon        = ""
     screen.group_id    = ""

data/spec/command-reference-files/view/client/appy-app/views/BigView.coffee

@@ -1,6 +1,5 @@
 class AppyApp.Views.BigView extends AppyApp.Views.Base
 
-    FILE: FILE
 
     ## These are listed only as examples.
     # If unused they can be safely removed.

data/spec/{api/javascript_processor_spec.rb → server/api/coffeescript_processor_spec.rb}

@@ -1,6 +1,6 @@
 require "lanes/spec_helper"
 
-class JavascriptProcessorTest < Lanes::TestCase
+class CoffeeScriptProcessor < Lanes::TestCase
 
 SCRIPT = <<-EOS
 class NS.Baz
@@ -30,6 +30,7 @@ class NS.Baz
         alert(msg);
 
 class NS.Bar
+    FILE: FILE
     constructor: -> super
     squawk:->
         this.alert("Hello World!")
@@ -37,6 +38,7 @@ class NS.Bar
 NS.Baz.extend(NS.Bar)
 
 class Foo
+    FILE: FILE
     constructor: ->
         this.called=true
         super
@@ -65,6 +67,8 @@ NS.Baz = (function() {
 })();
 
 NS.Bar = (function() {
+  Bar.prototype.FILE = FILE;
+
   function Bar() {
     Bar.__super__.constructor.apply(this, arguments);
   }
@@ -80,6 +84,8 @@ NS.Bar = (function() {
 NS.Baz.extend(NS.Bar);
 
 Foo = (function() {
+  Foo.prototype.FILE = FILE;
+
   function Foo() {
     this.called = true;
     Foo.__super__.constructor.apply(this, arguments);
@@ -101,7 +107,7 @@ EOS
 Scope = Struct.new(:logical_path)
 
     def test_coffeescript_generation
-        template = API::CoffeeScriptWrapper.new{ |t| SCRIPT }
+        template = API::CoffeeScriptProcessor.new{ |t| SCRIPT }
         assert_equal CLEANED, template.cleaned
 
 

data/spec/server/concerns/pub_sub_spec.rb

@@ -5,123 +5,122 @@ describe "PubSub" do
     include ActiveRecordMocks::IncludeMe
     around do | test |
         with_mocked_tables do |m|
-            m.create_table do |t|
-                t.model_name :Evbt
-                t.belongs_to :evhm, class_name: "Evhm", listen: { create: 'on_create_hm' },
-                             inverse_of: :evbt
-                t.layout do |l|
-                    l.integer :evhm_id
-                end
-                t.parent_class "Lanes::Model"
-            end
-            class Evbt
+
+            class A < Lanes::Model
                 has_additional_events :test_one
-                def on_create_hm(*args)
-                    32
+                def on_save_b(*args)
+                end
+                def on_save_event_tester(*args)
                 end
             end
-
             m.create_table do |t|
-                t.model_name :EventTester
+                t.model_name :A
                 t.parent_class "Lanes::Model"
-                t.belongs_to :evbt, class_name: 'Evhm'
+                t.belongs_to :b_model, class_name: "B", listen: { save: :on_save_b },
+                             inverse_of: :a_model
 
-                t.has_many   :evhm, class_name: 'Evhm', inverse_of: :event_tester
+                t.belongs_to :event_tester, class_name: "EventTester", inverse_of: :a_models,
+                             listen: { save: 'on_save_event_tester' }
 
                 t.layout do |l|
-                    l.integer :bt_id
-                    l.string :name, :number
+                    l.integer :b_model_id, :b_id
+                    l.integer :event_tester_id
                 end
             end
 
+            class B < Lanes::Model
+                def on_save_a(*args)
+                end
+            end
             table = m.create_table do |t|
-                t.model_name :Evhm
-                t.belongs_to :evbt, class_name: "Evbt", listen: { save: 'on_create_bt' },
-                             inverse_of: :evhm
-                t.belongs_to :event_tester, class_name: "EventTester", inverse_of: :evhm,
-                             listen: { save: 'on_save_event_tester' }
+                t.model_name :B
                 t.parent_class "Lanes::Model"
+                t.has_one :a_model, class_name: "A", listen: { save: 'on_save_a' },
+                             inverse_of: :b_model
                 t.layout do | l |
                     l.string :mumble
-                    l.integer :evbt_id, :event_tester_id
                 end
             end
-            def table.on_save_event_tester(*args)
+
+            class EventTester < Lanes::Model
             end
 
+            m.create_table do |t|
+                t.model_name :EventTester
+                t.parent_class "Lanes::Model"
+                t.has_many   :a_models, class_name: 'A', inverse_of: :event_tester
 
+                t.layout do |l|
+                    l.string :name, :number
+                end
+            end
 
             test.call
+
         end
     end
 
     it "listens to other associations" do
-        e=Evbt.new
-        assert_equal 32, e.on_create_hm
-        b=e.build_evhm
-        b.expects(:on_create_bt)
-        assert e.save
+        a=A.new
+        b=a.build_b_model
+        assert b.a_model
+        a.expects(:on_save_b)
+        assert a.save
 
         et = EventTester.new
-        evh = et.evhm.build
-        evh.expects(:on_save_event_tester)
-        assert et.save
+        a=et.a_models.build
+        a.expects(:on_save_event_tester)
+        et.save
     end
 
     it "registers" do
-        assert_equal [ :save, :create, :update, :destroy ],EventTester.valid_event_names
-        assert_equal [ :save, :create, :update, :destroy, :test_one ],Evbt.valid_event_names
+        assert_equal [ :save, :create, :update, :destroy ], EventTester.valid_event_names
+        assert_equal [ :save, :create, :update, :destroy, :test_one ], A.valid_event_names
     end
 
     it "can only observe valid events" do
-        assert_raises( EventTester::InvalidEvent) do
+        assert_raises(EventTester::InvalidEvent) do
             EventTester.observe(:invalid_event) do | ev |
             end
         end
-        assert_raises( EventTester::InvalidEvent) do
-            EventTester.observe(:save) do | ev |
+        assert_raises(EventTester::InvalidEvent) do
+            B.observe(:test_two) do | ev |
             end
-            EventTester.new.send(:fire_event,:invalid_event)
         end
-        assert_raises( EventTester::InvalidEvent) do
-            Evbt.observe(:test_two) do | ev |
-            end
-        end
-        assert_raises( EventTester::InvalidEvent) do
-            Evhm.observe(:test_one) do | ev |
+        assert_raises(EventTester::InvalidEvent) do
+            A.observe(:glub_glub) do | ev |
             end
         end
         begin
-            Evbt.observe(:test_one) do | ev |
+            B.observe(:test_one) do | ev |
             end
         rescue EventTester::InvalidEvent=>e
-            assert_equal 'test_one is not a valid event for PubSubTest::Ev2', e.to_s
+            assert_equal 'test_one is not a valid event for B', e.to_s
         end
     end
 
     it "events can be subscribed to" do
         EventTester.observe(:save) do | ev |
-
         end
     end
 
     it "can be fired and observed" do
         results=[]
-        Evbt.observe(:test_one) do | ev, one, two |
+        A.observe(:test_one) do | ev, one, two |
             results = [ ev, one, two ]
         end
-        evt=Evbt.new
-        evt.send(:fire_event, :test_one, 3, 5 )
-        assert_equal [ evt, 3, 5 ], results
+        a=A.new
+        a.send(:fire_pubsub_event, :test_one, 3, 5 )
+        assert_equal [a, 3, 5], results
 
-        evt.send(:fire_event, :test_one, 'foo' )
-        assert_equal [ evt, 'foo', nil ], results
+        a.send(:fire_pubsub_event, :test_one, 'foo' )
+        assert_equal [a, 'foo', nil], results
     end
 
 
     it "can use custom event assertions" do
-        assert_event_fires( Evbt, :test_one ) do
-            Evbt.new.send(:fire_event, :test_one, 3, 5 )
+        assert_event_fires(A, :test_one) do
+            A.new.send(:fire_pubsub_event, :test_one, 3, 5)
         end
         assert_equal [ 3, 5 ], last_event_results[1..-1]
     end

data/templates/client/Extension.coffee

@@ -1,6 +1,5 @@
 class <%= namespace %>.Extension extends Lanes.Extensions.Base
 
-    FILE: FILE
 
     identifier: "<%= identifier %>"
 

data/templates/client/models/Model.coffee

@@ -1,6 +1,5 @@
 class <%= namespace %>.Models.<%= class_name %> extends <%= namespace %>.Models.Base
 
-    FILE: FILE
 
     props:
 <% fields.each do |field| -%>

data/templates/client/screens/Screen.coffee

@@ -1,6 +1,5 @@
 class <%= namespace.camelize %>.Screens.<%= class_name %> extends <%= namespace.camelize %>.Screens.Base
 
-    FILE: FILE
 <% if @template -%>
     template: '''
         <%= @template %>

data/templates/client/views/View.coffee

@@ -1,6 +1,5 @@
 class <%= namespace %>.Views.<%= class_name %> extends <%= namespace %>.Views.Base
 
-    FILE: FILE
 
     ## These are listed only as examples.
     # If unused they can be safely removed.

data/templates/config/screen.rb

@@ -1,4 +1,5 @@
 Lanes::Screen.define "<%= screen_id %>" do | screen |
+    screen.title       = "<%= options[:title] %>"
     screen.description = "<%= options[:description] %>"
     screen.icon        = "<%= options[:icon] %>"
     screen.group_id    = "<%= options[:group] %>"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lanes
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Nathan Stitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-17 00:00:00.000000000 Z
+date: 2015-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -527,6 +527,8 @@ files:
 - client/lanes/components/select-field/SelectField.coffee
 - client/lanes/components/select-field/index.js
 - client/lanes/components/select-field/styles.scss
+- client/lanes/components/select2/Select2.coffee
+- client/lanes/components/select2/index.js
 - client/lanes/extension/Base.coffee
 - client/lanes/extension/EarlyExtensions.js.erb
 - client/lanes/extension/Extensions.coffee
@@ -810,6 +812,7 @@ files:
 - lib/lanes/access/user.rb
 - lib/lanes/access/version.rb
 - lib/lanes/api.rb
+- lib/lanes/api/coffeescript_processor.rb
 - lib/lanes/api/controller.rb
 - lib/lanes/api/eco.js
 - lib/lanes/api/error_formatter.rb
@@ -886,7 +889,6 @@ files:
 - npm-build/package.json
 - npm-build/shims/underscore.js
 - npm-build/template.js
-- spec/api/javascript_processor_spec.rb
 - spec/command-reference-files/initial/.gitignore
 - spec/command-reference-files/initial/Gemfile
 - spec/command-reference-files/initial/Guardfile
@@ -943,6 +945,7 @@ files:
 - spec/lanes/models/PubSubSpec.coffee
 - spec/lanes/views/BaseSpec.coffee
 - spec/lanes/views/FormBindingsSpec.coffee
+- spec/server/api/coffeescript_processor_spec.rb
 - spec/server/command_spec.rb
 - spec/server/concerns/api_path_spec.rb
 - spec/server/concerns/association_extensions_spec.rb