lanes 0.1.8 → 0.1.9

data/client/lanes/views/Base.coffee

@@ -25,7 +25,6 @@ class ViewBase
         pubSub     : "boolean"
         parent     : "object"
         subviewId  : { type: "string", setOnce: true }
-        formBindings: { type: 'any', default: false }
 
     derived:
         '$el':
@@ -50,16 +49,16 @@ class ViewBase
                 this.root_view?.viewport
 
 
-    constructor: (attrs={})->
+    constructor: (options={})->
 
         this.cid = _.uniqueId('view');
-        attrs || (attrs = {});
-        parent = attrs.parent;
-        delete attrs.parent;
+        options || (options = {});
+        parent = options.parent;
+        delete options.parent;
 
         this._substituteEventUI()
 
-        Lanes.Vendor.Ampersand.State.call(this, attrs, {init: false, parent: parent})
+        Lanes.Vendor.Ampersand.State.call(this, options, {init: false, parent: parent})
 
         this.on('change:$el',   this._onElementChange, this)
         this.on('change:model', this._onModelChange, this)
@@ -68,21 +67,18 @@ class ViewBase
         this._onCollectionChange() if @collection
         this._parsedBindings = Lanes.Vendor.Ampersand.Bindings(this.bindings, this)
         this._initializeBindings();
-        if attrs.el && !this.autoRender
+        if options.el && !this.autoRender
             this._onElementChange();
 
         this._initializeSubviews();
-        this.initialize.apply(this, arguments);
-
-        this.set(_.pick(attrs, 'model', 'collection', 'el'))
 
         this.render() if this.autoRender && this.template
 
         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
 
-        if @formBindings || @useFormBindings || @parent?.formBindings
-            @formBindings = new Lanes.Views.FormBindings(this, @formBindings)
+        if @formBindings || options.formBindings || @parent?.formBindings
+            @formBindings = new Lanes.Views.FormBindings(this, @formBindings||options.formBindings)
 
         if @keyBindings
             Lanes.Views.Keys.add(this, @keyBindings, @keyScope)
@@ -90,6 +86,8 @@ class ViewBase
         if @pubSub
             this._pubSub = new Lanes.Views.PubSub(this)
 
+        # all done, call initialize ourselves since we told state not to via 'init:false'
+        this.initialize.apply(this, arguments);
 
     _normalizeUIString: (uiString, ui)->
         uiString.replace(/@ui\.[a-zA-Z_$0-9]*/g, (r)->
@@ -114,7 +112,7 @@ 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: ->
-        Lanes.Views.RenderContext.push( @subviewId, @model )
+        Lanes.Views.RenderContext.push( this, @model )
         this.renderContextFree()
         Lanes.Views.RenderContext.pop()
         this
@@ -291,17 +289,19 @@ class ViewBase
             Lanes.u.findObject(subview.component, 'Components', this.FILE)
         else if subview.view
             if _.isString(subview.view)
-                Lanes.u.getPath(subview.view, this.subviewPrefix() )
+                this.findSubView(subview.view)
             else
                 subview.view
         Lanes.warn( "Unable to obtain view for %o", subview) if ! klass
         klass
 
-    # ## subviewPrefix
-    # returns the namespace that the views should be in
-    # is needed so views can be specified by only thier name, rather than complete path
-    subviewPrefix: ->
-        Lanes.u.objectPath(this.FILE)
+    # ## findSubView
+    # searches for the named subview in the appropriate location
+    # normal view will search the Views namespace, screens under the screen
+    findSubView: (name)->
+        Lanes.u.findRelative(name, this.FILE) ||
+            @FILE.namespace['Views']?[name] ||
+            Lanes.u.getPath(name)
 
     # ## _parseSubview
     # helper for parsing out the subview declaration and registering
@@ -370,7 +370,7 @@ class ViewBase
         return if prev == @model
         this._unbindFromObject(prev, @modelEvents) if prev
         this._bindToObject(@model, @modelEvents) if @model
-        this.onModelChange?()
+        this.onModelChange?(prev)
         true
 
     _onCollectionChange: ->

data/client/lanes/views/FormBindings.coffee

@@ -3,7 +3,7 @@ class Lanes.Views.FormBindings
     constructor: (@view, config={})->
         _.bindAll(this,'onFieldChange')
         @selector = if config.selector then "#{config.selector} " else ""
-        @view.on( "change:el",     this.rebindForm,    this )
+        @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 )
@@ -14,7 +14,9 @@ class Lanes.Views.FormBindings
         return unless @view.model?.hasAttribute(name)
         val = el.val()
         unless false == this.view.trigger("update:#{val}", val)
-            el[0].binding_is_setting=true; @view.model.setFromView(name, val); delete el[0].binding_is_setting
+            el[0].binding_is_setting=true
+            @view.model.setFromView(name, val)
+            delete el[0].binding_is_setting
         msg = @view.model.checkValid(name,val)
         this.setError( el, msg )
         return true

data/client/lanes/views/RenderContext.coffee

@@ -8,8 +8,8 @@ Lanes.Views.RenderContext = {
     start: (@parent, model=@parent.model)->
         @stack = [[@parent,model]]
 
-    push: (identifier, model)->
-        @stack.push([identifier,model])
+    push: (view, model)->
+        @stack.push([view,model])
         @_grants = null
 
     model: ->

data/client/lanes/workspace/Layout.coffee

@@ -9,10 +9,10 @@ class Lanes.Workspace.Layout extends Lanes.Views.Base
     subviews:
         navbar:
             hook: 'navbar-container'
-            view: 'Navbar'
+            view: 'Lanes.Workspace.Navbar'
         pages:
             hook: 'page-container'
-            view: 'Pages'
+            view: 'Lanes.Workspace.Pages'
 
     session:
         ui_state: 'state'
@@ -23,3 +23,7 @@ class Lanes.Workspace.Layout extends Lanes.Views.Base
     constructor: (options={})->
         options.ui_state = new Lanes.Workspace.UIState( model: options.model, layout: this )
         super
+
+    onRender: ->
+        if Lanes.config.initial_workspace_screen_id
+            Lanes.Screens.display_id(Lanes.config.initial_workspace_screen_id)

data/client/lanes/workspace/Navbar.coffee

@@ -12,7 +12,7 @@ class Lanes.Workspace.Navbar extends Lanes.Views.Base
     subviews:
         screens:
             hook: 'screens-container'
-            view: 'ActiveScreenSwitcher'
+            view: 'Lanes.Workspace.ActiveScreenSwitcher'
             model: 'model'
 
     bindings:

data/client/lanes/workspace/Pages.coffee

@@ -12,7 +12,7 @@ class Lanes.Workspace.Pages extends Lanes.Views.Base
 
     subviews:
         menu:
-            view: 'ScreensMenu'
+            view: 'Lanes.Workspace.ScreensMenu'
 
     ui:
         screen: '.screen'

data/client/lanes/workspace/navbar.html

@@ -1,6 +1,8 @@
 <div class="header-top">
     <div class="navbar-header">
-        <a class="navbar-brand logo" href="#"></a>
+        <a class="navbar-brand logo" href="#">
+            <%= _.titleize(Lanes.Extensions.controlling().identifier) %>
+        </a>
 
         <button class="screens-menu-toggle" type="button">
             <span class="sr-only">Toggle navbar</span>

data/client/lanes/workspace/styles/header.scss

@@ -22,7 +22,9 @@
         height: 48px;
         width: 150px;
         margin: 2px;
-        background: url(asset_path('images/lanes/logo-sm.png')) no-repeat;
+        color: rgb(205, 208, 212);
+        font-size: 30px;
+        text-shadow: rgb(143, 112, 112) 2px 2px 4px;
     }
 
     .navbar-toggle, .screens-menu-toggle {

data/lib/lanes/access/authentication_provider.rb

@@ -46,14 +46,14 @@ module Lanes
                 end
             end
 
-
             def wrap_reply(model, req)
                 if allowed_access_to?(model)
                     ::Lanes::User.scoped_to(current_user) do | user |
                         yield
                     end
                 else
-                    Lanes.logger.warn "Unauthorized access attempted to #{req}"
+                    Lanes.logger.warn request.env['HTTP_X_TESTING_USER']
+                    Lanes.logger.warn "Unauthorized access attempted to #{req.url}"
                     req.halt( 401, Oj.dump({
                       success:false, errors: {user: "Access Denied"}, message: "Access Denied"
                     }))

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

@@ -2,7 +2,7 @@ module Lanes
     API.routes.draw do
 
         post "/user-session.json" do
-            wrap_json_reply do
+            wrap_reply do
                 user = User.where(login: data['login']).first
                 if user && user.authenticate(data['password'])
                     session[:user_id] = user.id

data/lib/lanes/access/extension.rb

@@ -27,10 +27,7 @@ module Lanes
             end
             def roles_for_client
                 Lanes::Access::Role.all_available.map do |role|
-                    {
-                      id: role.to_s.demodulize.underscore,
-                      name: role.to_s.demodulize
-                    }
+                    { id: role.to_s.demodulize.underscore, name: role.to_s.demodulize }
                 end
             end
             def client_bootstrap_data(view)

data/lib/lanes/access/role.rb

@@ -2,28 +2,33 @@ module Lanes
     module Access
 
         class Role
-            class_attribute :read, :write, :delete
+            class_attribute :read_types, :write_types, :delete_types
 
             def initialize(user)
                 @user = user
             end
 
             def can_read?(model)
-                read.include?(model)
+                read_types.include?(model)
             end
 
             def can_write?(model)
-                write.include?(model)
+                write_types.include?(model)
             end
 
             def can_delete?(model)
-                delete.include?(model)
+                delete_types.include?(model)
             end
 
             class << self
                 ALL=Array.new
 
-                def grant_global_access(types=[:read,:write,:delete], *klass)
+                def grant_global_access(types=:all, *klass)
+                    unless types.is_a?(Symbol)
+                        klass.unshift(types)
+                        types=:all
+                    end
+                    types = [:read,:write,:delete] if :all == types
                     types = [*types]
                     ALL.each do | child |
                         types.each{ |type| child.send(type).concat(klass) }
@@ -32,33 +37,33 @@ module Lanes
 
                 def inherited(subklass)
                     ALL << subklass
-                    subklass.read = []; subklass.write = []; subklass.delete = []
+                    subklass.read_types = []; subklass.write_types = []; subklass.delete_types = []
                 end
 
                 def grant( *klasses )
-                    self.read.push( *klasses )
-                    write.push( *klasses )
-                    delete.push( *klasses )
+                    read_types.push(*klasses)
+                    write_types.push(*klasses)
+                    delete_types.push(*klasses)
                 end
 
                 def read( *klasses )
-                    self.read.push( *klasses )
+                    read_types.push(*klasses)
                 end
 
                 def write( *klasses )
-                    self.write.push( *klasses )
+                    write_types.push(*klasses)
                 end
 
-                def delete( *klasses )
-                    self.delete.push( *klasses )
+                def delete(*klasses )
+                    delete_types.push(*klasses)
                 end
 
                 def lock(klass, attribute)
-                    LockedFields.lock( klass, attribute, self)
+                    LockedFields.lock(klass, attribute, self)
                 end
 
                 def lock_writes(klass, attribute)
-                    LockedFields.lock( klass, attribute, self, :write)
+                    LockedFields.lock(klass, attribute, self, :write)
                 end
 
                 def all_available

data/lib/lanes/access/test_fixture_extensions.rb

@@ -0,0 +1,20 @@
+module AccessFixtureTestPatches
+    extend ActiveSupport::Concern
+
+    included do
+        alias_method_chain :table_rows, :custom_autoset_user_fields
+    end
+
+    def table_rows_with_custom_autoset_user_fields
+        results = table_rows_without_custom_autoset_user_fields
+        if model_class && model_class < ActiveRecord::Base && model_class.record_modifications
+            results[ table_name ].each do | row |
+                row['created_by_id'] = 593363170 if model_class.column_names.include?('created_by_id')
+                row['updated_by_id'] = 593363170 if model_class.column_names.include?('updated_by_id')
+            end
+        end
+        results
+    end
+end
+
+ActiveRecord::FixtureSet.send :include, AccessFixtureTestPatches

data/lib/lanes/access.rb

@@ -19,9 +19,9 @@ module Lanes
                     :roles => user.roles.map{ | role |
                         {
                             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) }
+                            read: role.read_types.map{ |klass| type_to_client(klass) },
+                            write: role.write_types.map{ |klass| type_to_client(klass) },
+                            delete: role.delete_types.map{ |klass| type_to_client(klass) }
                         }
                     },
                     :locked_fields => LockedFields.definitions.map{ | klass, locks |

data/lib/lanes/api/request_wrapper.rb

@@ -31,7 +31,7 @@ module Lanes
                 def make_handler(model, controller, parent_attribute)
                     lambda do
                         authentication = Lanes::API::AuthenticationProvider.new(request)
-                        authentication.wrap_reply(model,self) do
+                        authentication.wrap_reply(model, self) do
                             if parent_attribute
                               params[:nested_attribute] = Hash[ parent_attribute,
                                                                params[parent_attribute] ]
@@ -46,6 +46,7 @@ module Lanes
 
             def log_request
                 Lanes.logger.info "UserID: #{session['user_id']}, Params: #{request.params}"
+                Lanes.logger.debug JSON.pretty_generate(data) unless Lanes.env.production?
             end
 
             def wrap_reply(with_transaction=true)
@@ -53,7 +54,7 @@ module Lanes
                 log_request
                 if with_transaction
                     Lanes::Model.transaction do
-                         response = yield
+                        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']

data/lib/lanes/api/sprockets_extension.rb

@@ -22,7 +22,7 @@ module Lanes
                     end
                     Screen.each do | screen |
                         assets = screen.assets
-                        manifest.compile( assets ) unless assets.empty?
+                        manifest.compile(assets) unless assets.empty?
                     end
                 end
 

data/lib/lanes/api/test_specs.rb

@@ -18,9 +18,9 @@ module Lanes
             end
 
             def js_files
-                [ '/assets/lanes/testing' ] +
                 urlpath(Jasmine::Core.js_files)   +
                 urlpath(Jasmine::Core.boot_files) +
+                [ '/assets/lanes/testing' ] +
                 urlpath(spec_files(extension.identifier))
             end
 

data/lib/lanes/capistrano.rb

@@ -1,10 +1,10 @@
-set :linked_dirs, %w{config}
+set :linked_files, %w{config/database.yml}
 
-namespace :deploy do
+namespace :db do
 
-    desc 'Runs bundle exec lanes db migrate'
-    task :migrate => [:set_rails_env] do
-        on primary fetch(:migration_role) do
+    desc 'Migrates the database by running: bundle exec lanes db migrate'
+    task :migrate => ["deploy:set_rails_env"] do
+        on roles(:db) do
             info '[deploy:migrate] Run `lanes db migrate`'
             within release_path do
                 with rails_env: fetch(:rails_env) do
@@ -14,5 +14,17 @@ namespace :deploy do
         end
     end
 
-    after 'deploy:updated', 'deploy:migrate'
+    desc 'Seeds the database by running: bundle exec lanes db seed'
+    task :seed => ["deploy:set_rails_env"] do
+        on roles(:db) do
+            info '[deploy:seed] Run `lanes db seed`'
+            within release_path do
+                with rails_env: fetch(:rails_env) do
+                    execute :bundle, "exec lanes db seed"
+                end
+            end
+        end
+    end
+
+    after 'deploy:updated', 'db:migrate'
 end

data/lib/lanes/command/app.rb

@@ -28,7 +28,7 @@ module Lanes
                 template "config/routes.rb"
                 template "config/lanes.rb"
                 template "gitignore",".gitignore"
-                create_file "lib/#{identifier}/models/empty.rb",""
+
                 create_file "log/.gitkeep",""
                 create_file "tmp/.gitkeep",""
                 create_file "db/.gitkeep", ""

data/lib/lanes/command/generate_model.rb

@@ -51,6 +51,12 @@ module Lanes
                 end
             end
 
+            def add_autoload
+                insert_into_file "lib/#{identifier}/model.rb", before: /^end\n/ do
+                    "    autoload :#{class_name}, \"#{identifier}/models/#{file_name}\"\n"
+                end
+            end
+
           private
 
             def fields_with_index

data/lib/lanes/command/generate_view.rb

@@ -9,25 +9,26 @@ module Lanes
               screen: 'global'
             }
             class_options( OPTIONS )
+            attr_reader :view_class
 
             def set_variables
                 super
                 if options[:screen] == 'global'
                     @client_dir << "/views"
                     @spec_dir   << "/views"
+                    @view_class =  "#{namespace}.Views.#{class_name}"
                 else
-                    @client_dir << "/screens/#{options[:screen].underscore.dasherize}"
-                    @spec_dir   << "/screens/#{options[:screen].underscore.dasherize}"
+                    screen_directory = options[:screen].underscore.dasherize
+                    @client_dir << "/screens/#{screen_directory}"
+                    @spec_dir   << "/screens/#{screen_directory}"
+                    @view_class =  "#{namespace}.Screens.#{options[:screen]}.#{class_name}"
                 end
             end
 
-            # desc "foo bar"
-            # option :from, :required => true
-
             def create_screen
                 template "client/views/View.coffee",   "#{client_dir}/#{class_name}.coffee"
                 template "spec/client/views/ViewSpec.coffee", \
-                  "#{spec_dir}/#{class_name}Spec.coffee"
+                         "#{spec_dir}/#{class_name}Spec.coffee"
             end
 
 

data/lib/lanes/command/named_command.rb

@@ -18,7 +18,7 @@ module Lanes
             end
 
             def set_variables
-                @class_name = name.underscore.classify
+                @class_name = name.underscore.camelize
                 @spec_dir   = "spec/#{identifier}"
                 @client_dir = "client/#{identifier}"
             end

data/lib/lanes/concerns/all.rb

@@ -7,5 +7,6 @@ require_relative "export_methods"
 require_relative "export_scope"
 require_relative "set_attribute_data"
 require_relative "pub_sub"
+require_relative "code_identifier"
 require_relative "queries"
 require_relative "sanitize_fields"

data/lib/lanes/concerns/code_identifier.rb

@@ -0,0 +1,43 @@
+module Lanes
+    module Concerns
+
+        # @see ClassMethods
+        module CodeIdentifier
+
+            extend ActiveSupport::Concern
+
+            # ### Code Identifier Concern
+            # This adds the {#has_code_identifier} class method
+            module ClassMethods
+
+                # A 2-10 character string that identifies an entity, such as a Customer, Vendor, or SKU.
+                # The code is often assigned by the user, but may also
+                # be auto-generated by {Skr::Strings.code_identifier}
+                #
+                # @param max_length [Integer] how long the code is allowed to be
+                # @param from [Symbol], method to call for a string to base the code upon
+                def has_code_identifier( from: nil, max_length: 10 )
+
+                    validates :code, :length=>2..max_length, :presence=>true, :uniqueness=>true
+
+                    alias_attribute :record_identifier, :code
+
+                    if from
+                        before_validation(:on=>:create) do
+                            source = self[from]
+                            unless source.blank?
+                                self.code ||= Lanes::Strings.code_identifier( source, length:max_length )
+                            end
+                        end
+                    end
+
+                    before_validation do
+                        self.code = self.code.upcase unless self.code.blank?
+                    end
+                end
+
+            end
+
+        end
+    end
+end

data/lib/lanes/concerns/set_attribute_data.rb

@@ -32,14 +32,6 @@ module Lanes::Concerns
 
         module ClassMethods
 
-            # # An attribute accessor that allows access from the API
-            # def api_attr_accessor( *names )
-            #     names.each do | attr |
-            #         attr_accessor attr
-            #         whitelist_attributes attr
-            #     end
-            # end
-
             # @param attributes [Array of symbols] attributes that are safe for the API to set
             def whitelist_attributes( *attributes )
                 options = attributes.extract_options!

data/lib/lanes/configuration.rb

@@ -52,7 +52,7 @@ module Lanes
         config_option :table_prefix, ''
 
         # The configuration environment to use, test, development, production
-        config_option :environment, (ENV['RACK_ENV'] || 'development').to_sym
+        config_option :environment, (ENV['LANES_ENV'] || ENV['RACK_ENV'] || ENV['RAILS_ENV'] || 'development').to_sym
 
         # The secret key to use for session cookies.
         config_option :session_secret_key_base,  '1234', silent: true

data/lib/lanes/db.rb

@@ -5,14 +5,14 @@ module Lanes
 
         attr_accessor(:config_file)
 
-        def establish_connection( env = ENV['RAILS_ENV'] || 'development')
+        def establish_connection(env=Lanes.config.environment)
             if ENV['DATABASE_URL']
-                ::ActiveRecord::Base.establish_connection( ENV['DATABASE_URL'] )
+                ::ActiveRecord::Base.establish_connection(ENV['DATABASE_URL'])
             else
                 file = config_file || Extensions.controlling.root_path.join("config","database.yml")
                 config = YAML::load( IO.read(file) )
                 ::ActiveRecord::Base.configurations = config
-                ::ActiveRecord::Base.establish_connection( ::ActiveRecord::Base.configurations[ env ] )
+                ::ActiveRecord::Base.establish_connection(::ActiveRecord::Base.configurations[env.to_s])
             end
             ActiveRecord::Base.logger = Lanes.logger
         end
@@ -25,25 +25,27 @@ module Lanes
         def configure_rake_environment
             ActiveRecord::Tasks::DatabaseTasks.seed_loader = Lanes::DB
             default_schema = Extensions.controlling.root_path.join("db","schema.sql")
-            env = ENV['RAILS_ENV'] || 'development'
             ENV['SCHEMA']          ||= default_schema.to_s
             ENV['DB_STRUCTURE']    ||= default_schema.to_s
             ActiveRecord::Base.schema_format = :sql
-            Lanes::DB.establish_connection( env )
+            ActiveRecord::Base.dump_schema_after_migration = !Lanes.env.production?
+            Lanes::DB.establish_connection
             ActiveRecord::Tasks::DatabaseTasks.database_configuration = ActiveRecord::Base.configurations
-            ActiveRecord::Tasks::DatabaseTasks.env = 'test'
+            env=Lanes.config.environment.to_s
+            ActiveRecord::Tasks::DatabaseTasks.env = env
             ActiveRecord::Tasks::DatabaseTasks.migrations_paths = 'db/migrate'
-            ActiveRecord::Tasks::DatabaseTasks.current_config( :config => ActiveRecord::Base.configurations[ env ] )
+            ActiveRecord::Tasks::DatabaseTasks.current_config(
+                config: ActiveRecord::Base.configurations[env]
+            )
         end
 
-
         private
 
         def migrations_dir
             ::ActiveRecord::Migrator.migrations_paths.first
         end
 
-        def silence_activerecord(&block)
+        def silence_activerecord
             old_logger = ::ActiveRecord::Base.logger
             ::ActiveRecord::Base.logger = nil
             yield if block_given?