lanes 0.1.0 → 0.1.2

data/client/{styles → lanes/styles}/vendor/bootstrap.scss

@@ -57,8 +57,8 @@ $popover-max-width: 320px;
   @import "bootstrap/close";
 
   // Components w/ JavaScript
-  //@import "bootstrap/modals";
-  //@import "bootstrap-custom-modals";
+  /* @import "bootstrap/modals"; */
+  @import "bootstrap-custom-modals";
 
   @import "bootstrap/tooltip";
 

data/client/lanes/views/Base.coffee

@@ -25,7 +25,7 @@ class ViewBase
         pubSub     : "boolean"
         parent     : "object"
         subviewId  : { type: "string", setOnce: true }
-
+        formBindings: { type: 'any', default: false }
 
     derived:
         '$el':
@@ -81,8 +81,8 @@ class ViewBase
         if !this.pubSub? # if it's unset, not true/false; default to parent or true
             this.pubSub = if this.parent?.pubSub? then this.parent.pubSub else true
 
-
-        this.initializeFormBindings() if @form_bindings
+        if @formBindings || @parent?.formBindings
+            @formBindings = new Lanes.Views.FormBindings(this, @formBindings)
 
         if @keyBindings
             Lanes.Views.Keys.add(this, @keyBindings, @keyScope)
@@ -114,21 +114,15 @@ class ViewBase
     # **render** is the core function that your view can override, its job is
     # to populate its element (`this.el`), with the appropriate HTML.
     render: ->
-        this.withRenderContext( this.renderWithTemplate )
-        return this;
-
-    withRenderContext: (fn, args...)->
         Lanes.Views.RenderContext.push( @subviewId, @model )
-        returned = fn.apply(this,args)
+        this.renderContextFree()
         Lanes.Views.RenderContext.pop()
-        this.onRender?()
-        returned
+        this
 
     renderContextFree: ->
-        this.renderWithTemplate();
+        this.replaceEl( this.renderTemplateMethod() );
         this
 
-
     # ## listenToAndRun
     # Shortcut for registering a listener for a model
     # and also triggering it right away.
@@ -137,50 +131,42 @@ class ViewBase
         this.listenTo(object, events, bound)
         bound();
 
-    # Replaces the current root element with a newly created dom element
-    # 
-    # Either define a `template` property of your view
-    # or pass in a template directly.
-    # The template can either be a string or a function.
-    # If it's a function it will be passed the `context`
-    # argument.
-    renderWithTemplate: (templateArg)->
-        template = templateArg || this.resultsFor('template')
-        throw new Error('Template string or function needed.') unless template
-        template_fn = Lanes.Templates.find(template, this.FILE.extension)
-        newDom = if template_fn then template_fn( _.result(this,'templateModels')) else template
-        newDom = Lanes.Vendor.domify(newDom) if _.isString(newDom);
+    # Replaces the current root element with the contents of template
+    replaceEl: (template)->
+        newDom = Lanes.Vendor.domify(template)
         parent = this.el && this.el.parentNode;
         parent.replaceChild(newDom, this.el) if parent
         if newDom.nodeName == '#document-fragment'
-            throw new Error('Views can only have one root element.')
+            throw new Error("View #{this.FILE.path} can only have one root element.")
         if newDom.nodeName == '#text'
-            throw new Error('Views must have a root element.')
+            throw new Error("View #{this.FILE.path} must have a root element.")
         this.el = newDom;
+        this.onRender?()
         return this;
 
-    templateName: -> _.underscore( this.FILE.file )
-        
-    template: ->
-        this.FILE.extension.toLowerCase() + "/views/" + _.result(this,'templateName')
+    # Renders the results of calling method "name"
+    # to a string and returns it.
+    #
+    # The template can either be a string property or a function that returns a string.
+    renderTemplateMethod:(name="template",data)->
+        template = if this[name]
+            _.result(this, name)
+        else
+            data ||= _.result(this,"#{name}Data")
+            path = _.result(this,'templatePrefix') + _.result(this, "#{name}Name")
+            Lanes.Templates.render(this, path, data)
+        throw new Error("#{this.FILE.path} failed to render #{name}") unless template
+        template
 
-    FILE: FILE
+    templateName: -> _.underscore( this.FILE.path )
 
-    templateModels: ->
-        { model: this.model, collection: this.collection }
+    templatePrefix: -> this.FILE.extensionName.toLowerCase() + "/views/"
 
-    renderTemplate:(name,data={})->
-        template = Lanes.Templates.find(name, this.FILE.name)
-        if template
-            template(data)
-        else
-            Lanes.fatal( "Template #{name} doesn't exist!" )
-            ''
+    templateData: ->
+        { model: @model?.toJSON?(), collection: @collection?.toJSON?() }
 
-    renderTemplateMethod: (method)->
-        return null unless name = _.result(this, method)
-        this.renderTemplate(name, _.result(this, "#{method}Models") || @model)
 
+    FILE: FILE
 
     # Remove this view by taking the element out of the DOM, and removing any
     # applicable events listeners.
@@ -327,7 +313,6 @@ class ViewBase
                     new klass(_.extend(options,{ el: el, parent: self }))
 
         }
-
         action = ->
             return if (!this.el || !(el = this.query(opts.selector)))
             if (!opts.waitFor || _.getPath(this, opts.waitFor))
@@ -391,10 +376,10 @@ class ViewBase
 
     initializeKeyBindings: Lanes.emptyFn
 
-    initializeFormBindings: ->
-        @_form_bindings = {}
-        for data, selector of @form_bindings
-            @_form_bindings[data] = new Lanes.Views.FormBindings(this, data, selector)
+    # initializeFormBindings: ->
+    #     @_form_bindings = {}
+    #     for data, selector of @form_bindings
+    #         @_form_bindings[data] =
 
     setFieldsFromBindings: ->
         binding.setAllFields() for name, binding of @_form_bindings

data/client/lanes/views/FormBindings.coffee

@@ -1,22 +1,21 @@
 class Lanes.Views.FormBindings
 
-    constructor: (@view, @keypath, @selector)->
+    constructor: (@view, config={})->
         _.bindAll(this,'onFieldChange')
-        @selector = "#{@selector} " if @selector
-        @view.on( "change:el",          this.rebindForm,    this )
-        @view.on( "change:#{@keypath}", this.rebindModel,   this )
-        @view.on( "remove",             this.teardown,      this )
-        this.rebindModel( @view, @model() )
+        @selector = if config.selector then "#{config.selector} " else ""
+        @view.on( "change:el",     this.rebindForm,    this )
+        @view.on( "change:model",  this.rebindModel,   this )
+        @view.on( "remove",        this.teardown,      this )
+        this.rebindModel( @view, @view.model )
 
     onFieldChange: (ev)->
         el = Lanes.$(ev.target);
         name = el.attr('name');
-        m = this.model();
+        m = @view.model;
         return unless m.hasAttribute(name)
         val = el.val()
-
         el[0]._is_setting=true; m.set( name, val ); delete el[0]._is_setting
-        msg = m.validateFieldChange(name,val)
+        msg = m.checkValid(name,val)
         this.setError( el, msg )
 
     onAttributeUpdate: (model, opts={})->
@@ -24,7 +23,7 @@ class Lanes.Views.FormBindings
         if attributes['errors'] && ! _.isEmpty(attributes['errors'])
             for name, message of attributes['errors']
                 this.setError(Lanes.$(el),message) if el = this.getElement(name)
-        for name, _ of attributes
+        for name, _val of attributes
             el = this.getElement(name)
             this.setElValue(Lanes.$(el),model.get(name)) if el && ! el._is_setting
 
@@ -32,7 +31,8 @@ class Lanes.Views.FormBindings
         if el.attr('type')
             switch el.attr('type')
                 when 'radio'
-                    for input in Lanes.$(this.view.el).find("#{@selector}input[type=radio][name=#{el.attr('name')}]")
+                    selector="#{@selector}input[type=radio][name=#{el.attr('name')}]"
+                    for input in Lanes.$(this.view.el).find(selector)
                         input.checked = input.value == value
                 when 'checkbox'
                      el.prop('checked', !!value)
@@ -67,27 +67,29 @@ class Lanes.Views.FormBindings
         attrs
 
     fields: ->
-        @cached_fields ||= Lanes.$(@view.el).find("#{@selector}input, #{@selector}.ro-input.update")
+        @cached_fields ||= @view.el?.querySelectorAll("#{@selector}input, #{@selector}.ro-input.update")
 
     getElement: (name)->
-        _.find( this.fields(), (i)->i.getAttribute('name') == name )
+        return unless fields = this.fields()
+        for field in fields
+            return field if field.getAttribute('name') == name
+        null
 
     setAllFields: ->
-        this.onAttributeUpdate(this.model(), all: true)
-
-    model: ->
-        @cached_model ||= Lanes.getPath(@keypath, @view)
+        this.onAttributeUpdate(@view.model, all: true)
 
     rebindForm: (view, el)->
         input_selector = "#{@selector}input, #{@selector}select"
         if old_el = @view.changedAttributes()['el']
             Lanes.$(el).off("change", input_selector, this.onFieldChange )
         @cached_fields = null
-        Lanes.$(el).on("change",input_selector, this.onFieldChange )
+        if @view.model
+            this.setAllFields()
+        @view.$el.on("change", input_selector, this.onFieldChange )
 
     rebindModel: (view, model)->
         this.clearErrors()
-        if old_model = @view.changedAttributes()[@keypath]
+        if old_model = @view.changedAttributes()['model']
             old_model.off( "change", this.onAttributeUpdate )
         if model
             this.onAttributeUpdate(model, { all: true } )
@@ -95,4 +97,4 @@ class Lanes.Views.FormBindings
             model.on('change', this.onAttributeUpdate, this )
 
     teardown: ->
-        this.model().off( "change", this.onAttributeUpdate )
+        @view.model?.off( "change", this.onAttributeUpdate )

data/client/lanes/views/Helpers.coffee

@@ -15,7 +15,7 @@ impl = {
         this.markSafe(contents)
 
     template: (template,data)->
-        this.markSafe( Lanes.Templates.find('views/_'+template)(data) )
+        this.markSafe( Lanes.Templates.find('lanes/views/_'+template)(data) )
 
     markSafe: (str)->
         result = new String(str)

data/client/lanes/views/empty-span.html

@@ -0,0 +1 @@
+<span></span>

data/client/lanes/workspace/ActiveScreensSwitcher.coffee

@@ -1,6 +1,10 @@
 class TabView extends Lanes.Views.Base
 
     template: "<li><a data-toggle='tab'></a><span class='close'>×</span></li>"
+    FILE: FILE
+    mixins:[
+        Lanes.Workspace.WorkspaceView
+    ]
 
     bindings:
         'model.screen.title': { selector: 'a', type: 'text' }
@@ -22,7 +26,10 @@ TAB_PADDING = 0
 
 class Lanes.Workspace.ActiveScreenSwitcher extends Lanes.Views.Base
 
-    template: 'workspace/screens-switcher'
+    templateName: 'screens-switcher'
+    mixins:[
+        Lanes.Workspace.WorkspaceView
+    ]
 
     key_scope: { name: 'nav', shortcut: '⌘+shift+t,ctrl+shift+t' }
     key_bindings:

data/client/lanes/workspace/Layout.coffee

@@ -1,16 +1,19 @@
-
 class Lanes.Workspace.Layout extends Lanes.Views.Base
 
-    template: 'workspace/layout'
+    templateName: 'layout'
+    mixins:[
+        Lanes.Workspace.WorkspaceView
+    ]
+    FILE: FILE
 
     subviews:
         navbar:
             hook: 'navbar-container'
-            view: 'Lanes.Workspace.Navbar'
+            view: 'Workspace.Navbar'
 
         pages:
             hook: 'page-container'
-            view: 'Lanes.Workspace.Pages'
+            view: 'Workspace.Pages'
 
     subviewOptions: -> { model: this.model }
 

data/client/lanes/workspace/Navbar.coffee

@@ -1,6 +1,10 @@
 class Lanes.Workspace.Navbar extends Lanes.Views.Base
 
-    template: 'workspace/navbar'
+    templateName: 'navbar'
+    FILE: FILE
+    mixins:[
+        Lanes.Workspace.WorkspaceView
+    ]
 
     events:
         'click .screens-menu-toggle': 'switchMenu'
@@ -9,7 +13,7 @@ class Lanes.Workspace.Navbar extends Lanes.Views.Base
     subviews:
         screens:
             hook: 'screens-container'
-            view: 'Lanes.Workspace.ActiveScreenSwitcher'
+            view: 'Workspace.ActiveScreenSwitcher'
             model: 'model'
 
     bindings:

data/client/lanes/workspace/Pages.coffee

@@ -1,6 +1,10 @@
 class Lanes.Workspace.Pages extends Lanes.Views.Base
 
-    template: 'workspace/pages'
+    templateName: 'pages'
+    FILE: FILE
+    mixins:[
+        Lanes.Workspace.WorkspaceView
+    ]
 
     bindings:
         'model.screen_menu_size': { type: 'class' }

data/client/lanes/workspace/ScreensMenu.coffee

@@ -1,6 +1,10 @@
 class ScreenList extends Lanes.Views.Base
 
     template: "<li><a href='#'><span></span><i></i></a></li>"
+    FILE: FILE
+    mixins:[
+        Lanes.Workspace.WorkspaceView
+    ]
 
     events:
         click: 'displayScreen'
@@ -16,6 +20,10 @@ class ScreenList extends Lanes.Views.Base
 class ScreenGroup extends Lanes.Views.Base
 
     template: -> '<li class="group"><a href="#"><span></span><i></i></a><ul></ul></li>'
+    FILE: FILE
+    mixins:[
+        Lanes.Workspace.WorkspaceView
+    ]
     events:
         'click .group>a': 'toggleMenu'
 
@@ -42,8 +50,12 @@ class ScreenGroup extends Lanes.Views.Base
 
 class Lanes.Workspace.ScreensMenu extends Lanes.Views.Base
 
-    constructor: -> super
-    template: 'workspace/screens-menu'
+    templateName: 'screens-menu'
+    mixins:[
+        Lanes.Workspace.WorkspaceView
+    ]
+
+    FILE: FILE
 
     subviews:
         navigation:

data/client/lanes/workspace/WorkspaceView.coffee

@@ -0,0 +1,5 @@
+Lanes.Workspace.WorkspaceView = {
+
+    templatePrefix: -> 'workspace/'
+
+}

data/client/lanes/workspace/index.js

@@ -1,4 +1,5 @@
 //= require ../minimal
 //= require_self
+//= require ./WorkspaceView
 //= require_tree .
 Lanes.namespace( 'Workspace' );

data/client/lanes/workspace.scss.erb

@@ -11,7 +11,7 @@
   @import "<%= ext.stylesheet_include %>";
 <% end %>
 <% Lanes::Components.enabled_with_dependencies(self) do | component | %>
-  @import "components/<%= component %>/<%= component %>";
+  @import "lanes/components/<%= component %>/index";
 <% end %>
   @import "styles/plugins/all";
   @import "styles/layout";
@@ -22,3 +22,8 @@
   @import "styles/forms";
   @import "styles/keybindings";
 }
+<% if !Lanes.config.initial_workspace_screen_id.blank? &&
+      screen = Lanes::Screen[Lanes.config.initial_workspace_screen_id]
+%>
+  @import "<%= screen.css.remove(/\.css$/) + "/index.scss" %>"
+<% end %>

data/lanes.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
 
     spec.required_ruby_version = ">= 2.0"
 
-    spec.add_dependency "activerecord",           "~> 4.1"
+    spec.add_dependency "activerecord",           "~> 4.2"
     spec.add_dependency "pg",                     "~> 0.17"
     spec.add_dependency "sinatra",                "~> 1.4"
     spec.add_dependency "bcrypt",                 "~> 3.1"

data/lib/lanes/api/controller.rb

@@ -148,12 +148,11 @@ module Lanes
                 if options[:total_count]
                     json[:total] = options.delete(:total_count)
                 end
-                json.merge!({
-                                :success => success,
-                                :message => options[:messsage] || json_status_str(query, type.to_s.capitalize, success),
-                                :data    => success ? records_for_reply(query, options) : []
-                            })
-                return json
+                json.merge(
+                  success: success,
+                  message: options[:messsage] || json_status_str(query, type.to_s.capitalize, success),
+                  data:    success ? records_for_reply(query, options) : []
+                )
             end
 
 
@@ -327,5 +326,4 @@ module Lanes
 
         end
     end
-
 end

data/lib/lanes/api/helper_methods.rb

@@ -10,7 +10,7 @@ module Lanes
             def lanes_stylesheet_tag
                 stylesheet_tag( Extensions.require_workspace? ? 'lanes/workspace' : 'lanes/minimal' )
             end
-            
+
             def client_bootstrap_data
                 Oj.dump(Extensions.client_bootstrap_data(self), mode: :compat)
             end

data/lib/lanes/api/javascript_processor.rb

@@ -26,14 +26,15 @@ module Lanes
                 # if the file is being loaded under the "lanes" directory
                 # it's not an extension
                 if ns && ns != "Lanes"
+                    ns = ns.underscore.camelize
                     ref = "(window.Lanes ? window.Lanes['#{ns}'] : null)"
                     "(function(Lanes, #{ns}, _, window, FILE, undefined)"\
                       "{\n#{js}\n})(window.Lanes,#{ref},window._, window,"\
-                      "{namespace:#{ref},extension:'#{ns}',file:'#{file}'});"
+                      "{namespace:#{ref},extensionName:'#{ns}',path:'#{file}'});"
                 else
                     "(function(Lanes, _, window, FILE, undefined)"\
                       "{\n#{js}\n})(window.Lanes,window._, window,"\
-                      "{namespace:window.Lanes,extension:'Lanes',file:'#{file}'});"
+                      "{namespace:window.Lanes,extensionName:'Lanes',path:'#{file}'});"
                 end
             end
 

data/lib/lanes/command/app.rb

@@ -24,30 +24,34 @@ module Lanes
                 template "lib/namespace.rb", "lib/#{name}.rb"
                 template "lib/namespace/version.rb", "lib/#{name}/version.rb"
                 template "lib/namespace/extension.rb", "lib/#{name}/extension.rb"
+                template "lib/namespace/base_model.rb", "lib/#{name}/model.rb"
                 template "config/routes.rb"
                 template "config/lanes.rb"
                 template "gitignore",".gitignore"
                 create_file "tmp/.gitkeep",""
                 create_file "db/.gitkeep", ""
+                create_file "config/screens.rb"
             end
 
             def create_client_files
                 self.class.source_root.join('client').children.each do | path |
                     next unless path.directory?
-                    empty_directory "#{client_dir}/#{path.basename}" 
+                    empty_directory "#{client_dir}/#{path.basename}"
                     create_file "#{client_dir}/#{path.basename}/.gitkeep"
                 end
+                template "client/models/BaseModel.coffee", "#{client_dir}/models/Base.coffee"
+                template "client/views/BaseView.coffee",   "#{client_dir}/views/Base.coffee"
                 template "client/index.js",         "#{client_dir}/index.js"
                 template "client/Extension.coffee", "#{client_dir}/Extension.coffee"
                 template "client/styles.scss",      "#{client_dir}/styles.scss"
             end
 
             def create_spec
-                
+
             end
-            
+
             def create_first_screen
-                invoke GenerateScreen, ["base"], title: name.titleize, namespace: name
+                template "client/screens/Screen.coffee", "#{client_dir}/screens/Base.coffee"
             end
         end
 

data/lib/lanes/command/generate_model.rb

@@ -28,7 +28,8 @@ module Lanes
             end
 
             def create_migration
-                migration = exising_migration || Time.now.utc.strftime("%Y%m%d%H%M%S") + "_create_#{table_name}.rb"
+                migration = exising_migration ||
+                  Time.now.utc.strftime("%Y%m%d%H%M%S") + "_create_#{table_name}.rb"
                 self.fields = fields.map{ |field| ModelAttribute.parse(field) }
                 template "db/create_table_migration.rb", "db/migrate/#{migration}"
             end
@@ -36,15 +37,16 @@ module Lanes
             def create_model
                 template "lib/namespace/model.rb", "lib/#{namespace}/#{file_name}.rb"
                 template "spec/namespace/model_spec.rb", "#{spec_dir}/#{file_name}.rb"
-                template "spec/fixtures/namespace/model.yml", "spec/fixtures/#{namespace}/#{file_name}.yml"
+                template "spec/fixtures/namespace/model.yml",
+                         "spec/fixtures/#{namespace}/#{file_name}.yml"
             end
 
             def create_client
                 self.fields.unshift ModelAttribute.parse("id:integer")
                 template "client/models/Model.coffee", \
-                  "#{client_dir}/models/#{class_name}.coffee"
+                         "#{client_dir}/models/#{class_name}.coffee"
                 template "spec/client/models/ModelSpec.coffee", \
-                  "#{spec_dir}/models/#{class_name}Spec.coffee"
+                         "#{spec_dir}/models/#{class_name}Spec.coffee"
             end
 
             def add_route
@@ -83,13 +85,13 @@ module Lanes
                 end
             end
 
-            def client_parent
-                if options[:parent] == 'Lanes::Model'
-                    "Lanes.Models.Base"
-                else
-                    "Lanes.#{namespace.camelize}.#{options[:parent]}"
-                end
-            end
+            # def client_parent
+            #     if options[:parent] == 'Lanes::Model'
+            #         "Lanes.Models.Base"
+            #     else
+            #         "#{namespace.camelize}.Models.#{options[:parent]}"
+            #     end
+            # end
 
             def max_field_length
                 @max_field_length ||= fields.map{|field|