lanes 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dcfa482b3905ad3ec30faf5fe9569f6f6bc8650b
-  data.tar.gz: fd43ec7fc591b2f8310f89bf0c734bdff7be1a9f
+  metadata.gz: 09c525f4869a2e1f8b1d4ff92ca1f31344715994
+  data.tar.gz: 98893dd650c0d95209e9b337623f1c079e807ae6
 SHA512:
-  metadata.gz: 953ecd6093ed5e2cdf9e7b29de6f444a82a5299833c1c3166e930047ab8b80bbbf2c7a166d7a08df882a6d26552cf84ffbb577aac4a7299739144eda0708e591
-  data.tar.gz: 903218ab0ea98c8c1e290ba9c9976ad5585f84080625433e84e6ed22020e036db9d9263a57afc1ec52d039b1c57ad8b43467b9ba9a1021e8f70154d0210d1fe5
+  metadata.gz: e8a11e0a3028195b5cf5bf3ff6f1e2cc06754e08e776100fcc69abf330cf1cadcf1c8e8b72d408b60f73266bd719feebc0d523b4415a847957cc7f9d947ef732
+  data.tar.gz: a813d60b1ad735443aa90e5461743836f0eb606c81464e61e6d1131dc9e911fb5faba4a345ca876a474c3104205f360f19f1edaf0bb376bcbbe42b1f3fd56d91

data/.dir-locals.el

@@ -0,0 +1,8 @@
+((nil . ((js-indent-level . 4)
+         (js2-basic-offset . 4)
+         (enh-ruby-indent-level . 4)
+         (ruby-indent-level . 4)
+         (fill-column . 120))))
+
+((js2-mode . ((js2-basic-offset . 4)
+              (indent-tabs-mode . nil))))

data/client/lanes/Config.coffee

@@ -3,7 +3,7 @@ class Config extends Lanes.Models.State
 
     session:
         csrf_token:  { type: 'string', setOnce: true }
-        api_path:    { type: 'string', setOnce: true }
+        api_path:    { type: 'string', default: '', setOnce: true }
         environment: { type: 'string', setOnce: true }
 
     derived:

data/client/lanes/access/Extension.coffee

@@ -4,12 +4,7 @@ class Lanes.Access.Extension extends Lanes.Extensions.Base
 
     setBootstrapData: (data)->
         Lanes.current_user = new Lanes.Models.User
-
-        Lanes.Models.Roles.all = new Lanes.Models.Roles(
-            _.map( data.roles, (role)->
-                { id: role.toLowerCase(), name: role }
-            )
-        )
+        Lanes.Models.Roles.all = new Lanes.Models.Roles( data.roles )
         if data.user
             Lanes.current_user.set(data.user)
         if data.access

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

@@ -2,7 +2,7 @@ class Lanes.Access.Screens.UserManagement.GridUserEditor extends Lanes.Component
 
     writeTemplateName: 'user-management/grid-popover-editor'
     templatePrefix: 'lanes/access/screens'
-
+    useFormBindings: true
     writeTemplateData: ->
         { columns: _.reject(this.grid.columnDefinitions,(f)-> f.field=='role_names') }
 
@@ -13,10 +13,11 @@ class Lanes.Access.Screens.UserManagement.GridUserEditor extends Lanes.Component
             options: 'roleOptions'
 
     roleOptions: ->
-        { multiple: true, data: this.model.allRoles, mappings:{ title: 'name', selected: 'member' } }
-
-    constructor: (options={})->
-        super( _.extend(options,{formBindings: true}) )
+        {
+            field_name: 'role_names'
+            multiple: true, choices: this.model.allRoles
+            mappings:{ title: 'name', selected: 'member' }
+        }
 
     persistFields: ->
         @model.set({

data/client/lanes/access/screens/user-management/grid-popover-editor.html

@@ -1,9 +1,9 @@
 <form class="user-edit form-horizontal" role="form">
 <% for field in @columns: %>
   <div class="form-group">
-    <label for="field-<%= field.field %>" class="col-sm-3 control-label"><%= field.title %></label>
+    <label for="field-<%= field.id %>" class="col-sm-3 control-label"><%= field.title %></label>
     <div class="col-sm-9">
-      <input type="text" name="<%= field.field %>" class="form-control" id="field-<%= field.field %>" placeholder="">
+      <input type="text" name="<%= field.id %>" class="form-control" id="field-<%= field.id %>" placeholder="">
     </div>
   </div>
 <% end %>

data/client/lanes/components/grid/vendor/jquery.dataTables.js

@@ -2652,6 +2652,7 @@
 		var compat = function ( old, modern ) {
 			return json[old] !== undefined ? json[old] : json[modern];
 		};
+		var data = _fnAjaxDataSrc( settings, json );
 
 		var draw            = compat( 'sEcho',                'draw' );
 		var recordsTotal    = compat( 'iTotalRecords',        'recordsTotal' );
@@ -2669,7 +2670,6 @@
 		settings._iRecordsTotal   = parseInt(recordsTotal, 10);
 		settings._iRecordsDisplay = parseInt(recordsFiltered, 10);
 
-		var data = _fnAjaxDataSrc( settings, json );
 		for ( var i=0, ien=data.length ; i<ien ; i++ ) {
 			_fnAddData( settings, data[i] );
 		}

data/client/lanes/components/multi-select/MultiSelect.coffee

@@ -26,21 +26,26 @@ class Lanes.Components.MultiSelect extends Lanes.Components.Base
         if options.choices
             @selections ||= options.choices
 
-        @selections.ensureLoaded()
+        @selections?.ensureLoaded?()
 
         @mappings = _.extend({
             id: 'id', title: 'title', selected: 'selected'
         },options.mappings||{})
 
+    unSelectAll: ->
+        this.$el.find(":selected").prop('selected',false)
 
     onModelChange: ->
-        if @selections
+        this.unSelectAll()
+        if @selections && @model
             this.onModelAttributeChange(@model,@model.get(@field_name))
 
     selectionForID: (id)->
-        q={}; q[@mappings.id]=parseInt(id)
+        q={}; q[@mappings.id]=id
         @selections.findWhere( q )
 
-    onModelAttributeChange: (model,fkid)->
+    onModelAttributeChange: (model,fkids)->
         if ! this.el.binding_is_setting
-            this.select( this.selectionForID( fkid ) )
+            _.each(fkids, (fkid)=>
+                @select( @selectionForID( fkid )  )
+            )

data/client/lanes/components/select-field/SelectField.coffee

@@ -51,6 +51,7 @@ class Lanes.Components.SelectField extends Lanes.Components.MultiSelect
     readTemplate: ->
         "<div class='ro-input' name='#{this.field_name}'></div>"
 
+
     select: (option)->
         if this.readOnly
             this.$el.text( if option then option.code else "" )
@@ -59,4 +60,4 @@ class Lanes.Components.SelectField extends Lanes.Components.MultiSelect
             option = this.query("option[value=\"#{id}\"]")
             option.selected = true
         else
-            this.$el.find(":selected").prop('selected',false)
+            this.unSelectAll()

data/client/lanes/models/Base.coffee

@@ -59,7 +59,7 @@ class BaseModel
 
     # is the record saved
     isPersistent: ->
-        !!( this.api_path() && !this.isNew() )
+        !!( _.result(this,'api_path') && !this.isNew() )
 
     # used by PubSub to record a remote change to the model
     addChangeSet: (change)->

data/client/lanes/models/PubSub.coffee

@@ -9,7 +9,7 @@ class ModelType extends Lanes.Models.State
         records: 'object'
 
     subscribe: (model)->
-        channel = "/#{model.api_path()}/#{model.id}"
+        channel = "/#{_.result(model,'api_path')}/#{model.id}"
         Lanes.Vendor.MessageBus.subscribe(channel,(changes)->
             model.addChangeSet(changes)
         )
@@ -33,7 +33,8 @@ class ModelTypesCollection extends Lanes.Models.BasicCollection
     model: ModelType
 
     forModel: (model)->
-        models = this.get(model.api_path()) || this.add(id: model.api_path())
+        path = _.result(model,'api_path')
+        models = this.get(path) || this.add(id: path)
 
 
 Lanes.Models.PubSub = {
@@ -51,7 +52,7 @@ Lanes.Models.PubSub = {
         @types.forModel(model).remove(model)
 
     instanceFor: ( model_klass, id )->
-        @types.get(model_klass.prototype.api_path())?.records[id]?.model
+        @types.get(_.result(model_klass.prototype,'api_path'))?.records[id]?.model
 
     clear: ->
         @types = new ModelTypesCollection

data/client/lanes/models/Sync.coffee

@@ -77,9 +77,9 @@ Lanes.Models.Sync = {
         # Ensure that we have a URL.
         params.url = _.result(model, "url") or Lanes.Models.Sync.urlError() unless options.url
         params.url += '.json'
-        params.headers = {
-            X_CSRF_TOKEN: Lanes.config.csrf_token
-        }
+
+        params.headers = _.extend({}, _.result(options,'headers'))
+        params.headers['X_CSRF_TOKEN'] = Lanes.config.csrf_token
         params.contentType = "application/json"
         if options.data || _.contains(['create','update','patch'], method)
             params.data = JSON.stringify( options.data || model.dataForSave(options) )

data/client/lanes/screens/ChangeListener.coffee

@@ -40,7 +40,4 @@ Lanes.Screens.ChangeListener = {
         this.changes.invoke('updateTimeAgo')
         this.$('.changes-notification .scroller').animate({ scrollTop: 0 })
 
-    # included: ->
-    #     console.log this
-
 }

data/client/lanes/testing/ModelSaver.coffee

@@ -1,14 +1,21 @@
 class Lanes.Testing.ModelSaver
 
+    @setUser: (login)->
+        Lanes.Testing.ModelSaver::headers['X_TESTING_USER']= login
+
     @perform: (model,completion)->
         saver = new Lanes.Testing.ModelSaver(completion)
         saver.save(model)
 
+    headers:
+        X_ROLLBACK_AFTER_REQUEST: true
+
     constructor: (@completion)->
         _.bindAll(this,'success','error')
         spyOn(this, 'success').and.callThrough()
         spyOn(this, 'error').and.callThrough()
 
+
     success: ->
         this.notification.resolve(this)
         _.defer(@completion) if @completion
@@ -18,6 +25,10 @@ class Lanes.Testing.ModelSaver
         _.defer(@completion) if @completion
 
     save: (model)->
-        model.save(this)
+        model.save(this.toOptions()).then(Lanes.emptyFn, Lanes.emptyFn)
         this.notification = new _.DeferredPromise
         this.notification.promise
+
+
+    toOptions: ->
+        _.pick(this,'headers','success','error')

data/client/lanes/views/Base.coffee

@@ -369,7 +369,7 @@ class ViewBase
         prev = this.previous('model')
         return if prev == @model
         this._unbindFromObject(prev, @modelEvents) if prev
-        this._bindToObject(@model, @modelEvents)
+        this._bindToObject(@model, @modelEvents) if @model
         this.onModelChange?()
         true
 

data/client/lanes/views/Helpers.coffee

@@ -57,8 +57,9 @@ Lanes.Views.Helpers = {
         impl.grid_widths(widths);
 
     text_field: (name,options={})->
+        value = if options.value then " value=#{options.value}" else ''
         impl.field(name, options,
-            "<input type='#{options.type || 'text'}' name='#{name}' value='#{options.value}'><span class='feedback'></span>"
+            "<input type='#{options.type || 'text'}' name='#{name}'#{value}><span class='feedback'></span>"
             "<div class='ro-input update' name='#{name}'></div>"
         )
 

data/client/lanes/views/SaveNotify.coffee

@@ -1,26 +1,27 @@
-
 class ModelSaver
 
     constructor: ( @element, @options )->
         @mask = new Lanes.Views.TimedMask( @element, @options.message )
         @mask.prefixActions( "Save" )
         _.bindAll(this,'_onError','_onSuccess')
+        this.notification = new _.DeferredPromise
 
     save: ->
         @options.model.save({
             success: this._onSuccess, error: this._onError
         })
 
-    _onSuccess: (rec,resp,options)->
+    _onSuccess: (data,success,resp)->
         @mask.displaySuccess()
-        this._callback(true,resp)
+        this._callback(true,data,resp)
 
-    _onError: (rec,resp,options)->
-        @mask.displayFailure(rec.lastServerMessage)
-        this._callback(false,resp)
+    _onError: (data,success,resp)->
+        @mask.displayFailure(@options.model.lastServerMessage)
+        this._callback(false,data,resp)
 
-    _callback: (success,resp)->
+    _callback: (success,data,resp)->
         @options.callback(success,resp,@options.model) if @options.callback
+        this.notification?.resolve(data: data.data, success: success, response: resp)
 
 
 Lanes.Views.SaveNotify = ( view, options={} )->
@@ -28,3 +29,4 @@ Lanes.Views.SaveNotify = ( view, options={} )->
     _.defaults( options, { model: view.model, message: "Saving, Please Wait…"} )
     ms = new ModelSaver(el, options)
     ms.save()
+    return ms.notification.promise

data/client/lanes/views/TimedMask.coffee

@@ -18,7 +18,7 @@ class Lanes.Views.TimedMask
             color: 'firebrick'
 
     failsafeTimeout: 25000
-    defaultTimeout:   2000
+    defaultTimeout:   1500
 
     constructor: ( @element, options={} )->
         _.bindAll(this,'destroy')

data/lanes.gemspec

@@ -53,6 +53,6 @@ Gem::Specification.new do |spec|
     spec.add_dependency "sanitize",               "~> 3.0"
     spec.add_development_dependency "bundler",    "~> 1.5"
     spec.add_development_dependency "growl",      "~> 1.0"
-    spec.add_development_dependency "pry-byebug", "~> 2.0"
     spec.add_development_dependency "diffy",      "~> 3.0"
+
 end

data/lib/lanes/access/authentication_provider.rb

@@ -2,14 +2,20 @@ module Lanes
     module API
         class AuthenticationProvider
 
-            def initialize(session:nil, params:nil, request_type: type)
-                @session = session
-                @params  = params
-                @request_type = request_type
+            attr_reader :request
+
+            def initialize(request)
+                @request=request
             end
 
             def current_user
-                @current_user ||= Lanes::User.where(id: @session['user_id']).first
+                @current_user ||= (
+                    if Lanes.env.test? && request.env['HTTP_X_TESTING_USER']
+                        Lanes::User.where(login: request.env['HTTP_X_TESTING_USER']).first
+                    else
+                        Lanes::User.where(id: @session['user_id']).first
+                    end
+                )
             end
 
             def error_message
@@ -17,7 +23,7 @@ module Lanes
             end
 
             def error_message_for_access
-                return "Unable to " + case @request_type
+                return "Unable to " + case @request.request_method
                                       when 'GET' then "read"
                                       when 'POST','PATCH','PUT' then "write"
                                       when 'DELETE' then "delete"
@@ -28,20 +34,20 @@ module Lanes
 
             def allowed_access_to?(klass)
                 return false if current_user.nil?
-                case @request_type
+                case @request.request_method
                 when 'GET'
-                    klass.can_read_attributes?(@params,current_user)
+                    klass.can_read_attributes?(@request.params,current_user)
                 when 'POST','PATCH','PUT'
-                    klass.can_write_attributes?(@params,current_user)
+                    klass.can_write_attributes?(@request.params,current_user)
                 when 'DELETE'
-                    klass.can_delete_attributes?(@params,current_user)
+                    klass.can_delete_attributes?(@request.params,current_user)
                 else
                     false
                 end
             end
 
 
-            def wrap_request(model, req)
+            def wrap_reply(model, req)
                 if allowed_access_to?(model)
                     ::Lanes::User.scoped_to(current_user) do | user |
                         yield

data/lib/lanes/access/config/routes.rb

@@ -15,7 +15,7 @@ module Lanes
 
         delete "/user-session/:id.json" do
             session.destroy
-            wrap_request do
+            wrap_reply do
                 { success: true, message: "Logout succeeded", data: {} }
             end
         end

data/lib/lanes/access/extension.rb

@@ -25,9 +25,16 @@ module Lanes
             def client_paths
                 []
             end
-
+            def roles_for_client
+                Lanes::Access::Role.all_available.map do |role|
+                    {
+                      id: role.to_s.demodulize.underscore,
+                      name: role.to_s.demodulize
+                    }
+                end
+            end
             def client_bootstrap_data(view)
-                data = {}
+                data = { roles: roles_for_client }
                 if (user_id = view.session['user_id']) && (user = Lanes::User.where( id: user_id ).first)
                     data.merge!(user.workspace_data)
                 end

data/lib/lanes/access/role.rb

@@ -41,6 +41,18 @@ module Lanes
                     delete.push( *klasses )
                 end
 
+                def read( *klasses )
+                    self.read.push( *klasses )
+                end
+
+                def write( *klasses )
+                    self.write.push( *klasses )
+                end
+
+                def delete( *klasses )
+                    self.delete.push( *klasses )
+                end
+
                 def lock(klass, attribute)
                     LockedFields.lock( klass, attribute, self)
                 end

data/lib/lanes/access.rb

@@ -6,11 +6,11 @@ module Lanes
 
         class << self
 
-            def _type_to_ref(klass)
+            def type_to_client(klass)
                 klass.to_s.sub(/^(\w+).*?(\w+)$/,'\1.Models.\2')
             end
 
-            def _type_to_id(klass)
+            def type_to_client_id(klass)
                 ( klass.is_a?(Class) ? klass : klass.class ).to_s.demodulize.underscore
             end
 
@@ -18,18 +18,18 @@ module Lanes
                 {
                     :roles => user.roles.map{ | role |
                         {
-                            type: _type_to_id(role),
-                            read: role.read.map{ |klass| _type_to_ref(klass) },
-                            write: role.write.map{ |klass| _type_to_ref(klass) },
-                            delete: role.delete.map{ |klass| _type_to_ref(klass) }
+                            type: type_to_client_id(role),
+                            read: role.read.map{ |klass| type_to_client(klass) },
+                            write: role.write.map{ |klass| type_to_client(klass) },
+                            delete: role.delete.map{ |klass| type_to_client(klass) }
                         }
                     },
                     :locked_fields => LockedFields.definitions.map{ | klass, locks |
                         {
-                            type: _type_to_ref(klass),
+                            type: type_to_client(klass),
                             locks: locks.each_with_object({}) do |(field, grants), result|
                                 result[field] = grants.map do |grant|
-                                    { role: _type_to_id(grant[:role]), only: grant[:only] }
+                                    { role: type_to_client_id(grant[:role]), only: grant[:only] }
                                 end
                             end
                         }

data/lib/lanes/api/null_authentication_provider.rb

@@ -17,14 +17,14 @@ module Lanes
         class AuthenticationProvider
             USER = DummyUser.new
 
-            def initialize(session:nil, params:nil, request_type: type)
+            def initialize(request)
             end
 
             def current_user
                 USER
             end
 
-            def wrap_request(model, req)
+            def wrap_reply(model, req)
                 yield
             end
 

data/lib/lanes/api/request_wrapper.rb

@@ -30,17 +30,13 @@ module Lanes
 
                 def make_handler(model, controller, parent_attribute)
                     lambda do
-                        authentication = Lanes::API::AuthenticationProvider.new(
-                          request_type: request.request_method,
-                          session:      session,
-                          params:       params
-                        )
-                        authentication.wrap_request(model,self) do
+                        authentication = Lanes::API::AuthenticationProvider.new(request)
+                        authentication.wrap_reply(model,self) do
                             if parent_attribute
                               params[:nested_attribute] = Hash[ parent_attribute,
                                                                params[parent_attribute] ]
                             end
-                            wrap_request(!request.get?) do
+                            wrap_reply(!request.get?) do
                                 yield controller.new(model, authentication, params, data)
                             end
                         end
@@ -52,13 +48,17 @@ module Lanes
                 Lanes.logger.info "UserID: #{session['user_id']}, Params: #{request.params}"
             end
 
-            def wrap_request(with_transaction=true)
+            def wrap_reply(with_transaction=true)
                 response = { success: false, message: "No response was generated" }
                 log_request
                 if with_transaction
                     Lanes::Model.transaction do
-                        response = yield
-                        raise ActiveRecord::StatementInvalid if request.env['X_ROLLBACK_AFTER_REQUEST']
+                         response = yield
+                        # This is quite possibly a horrible idea.
+                        # It enables test specs to reset the db state after a request
+                        if Lanes.env.test? && request.env['HTTP_X_ROLLBACK_AFTER_REQUEST']
+                            Lanes::Model.connection.rollback_db_transaction
+                        end
                     end
                 else
                     response = yield

data/lib/lanes/concerns/association_extensions.rb

@@ -59,22 +59,31 @@ module Lanes::Concerns
                         "an inverse_of specified."
                 end
                 listeners.each do | name, target |
-                    targets[ name ] = Proc.new{ | record, *args |
-                        record = record.send( association.inverse_of.name )
-                        record.send( target, *( [record] + args ) ) if record
-                    }
+                    targets[name] = make_association_listener_for(target, association)
                 end
                 begin
                     klass = association.klass # This will throw if the class hasn't been loaded yet
-                    targets.each{ | name, proc | klass._add_event_listener( name, proc ) }
+                    targets.each{ | name, proc | klass._add_event_listener( name, &proc ) }
                 rescue NameError
-                    pending = PendingEventListeners.all[association.class_name.demodulize]
+                    pending = Lanes::Concerns::PubSub::PendingListeners.add(association.class_name)
                     targets.each do | name, proc |
                         pending[name] << proc
                     end
                 end
             end
-
+            def make_association_listener_for(target, association)
+                Proc.new{ | record, *args |
+                    associated_record = record.public_send(association.inverse_of.name)
+                    if associated_record
+                        args.unshift(record)
+                        if associated_record.is_a? ActiveRecord::Associations::CollectionProxy
+                            associated_record.each{ |r| r.send(target, *args) }
+                        else
+                            associated_record.send(target, *args)
+                        end
+                    end
+                }
+            end
             def setup_association_export( association, options )
                 export_associations( association.name, options == true ? {} : options )
             end