lanes 0.1.5 → 0.1.6

data/client/lanes/testing/ModelSaver.coffee

@@ -0,0 +1,23 @@
+class Lanes.Testing.ModelSaver
+
+    @perform: (model,completion)->
+        saver = new Lanes.Testing.ModelSaver(completion)
+        saver.save(model)
+
+    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
+
+    error: ->
+        this.notification.resolve(this)
+        _.defer(@completion) if @completion
+
+    save: (model)->
+        model.save(this)
+        this.notification = new _.DeferredPromise
+        this.notification.promise

data/client/lanes/testing/index.js

@@ -0,0 +1,4 @@
+//=require_self
+//=require ./ModelSaver
+
+Lanes.Testing = ( Lanes.Testing || {} )

data/client/lanes/workspace/ActiveScreensSwitcher.coffee

@@ -53,11 +53,10 @@ class Lanes.Workspace.ActiveScreenSwitcher extends Lanes.Views.Base
         super
         _.bindAll(this, 'resetShownControls')
         @collection = Lanes.Screens.Definitions.displaying
-        this.listenTo( @collection, "change:active", this.onActiveChange )
-        this.listenTo( this.viewport,  "change:width", this.resetShownControls )
+        this.listenTo( @collection,        "change:active",     this.onActiveChange)
+        this.listenTo( this.viewport,      "change:width",      this.resetShownControls)
         this.listenTo( Lanes.current_user, "change:isLoggedIn", this.closeScreens)
 
-
     closeScreens: ->
         @collection.reset()
 

data/client/lanes/workspace/Pages.coffee

@@ -11,7 +11,6 @@ class Lanes.Workspace.Pages extends Lanes.Views.Base
         'model.screen_menu_size': { type: 'class' }
         'model.popover_menu': { type: 'booleanClass', name: 'popover-menu' }
 
-
     subviews:
         menu:
             view: 'ScreensMenu'
@@ -19,26 +18,22 @@ class Lanes.Workspace.Pages extends Lanes.Views.Base
     ui:
         screen: '.screen'
 
-
     initialize: (options)->
-        this.listenTo( Lanes.Screens.Definitions.displaying, "change:active", this.onActiveChange )
-        this.listenTo( Lanes.Screens.Definitions.displaying, "remove",        this.onRemove )
-        #this.listenTo( @model,'change:screen_menu_position', this.moveScreensMenu )
+        this.listenTo( Lanes.current_user,                   "change:isLoggedIn", this.closeScreens)
+        this.listenTo( Lanes.Screens.Definitions.displaying, "change:active",     this.onActiveChange)
         super
 
-    # moveScreensMenu: ->
-    #     return unless 'side' == this.viewport.screen_menu_position
-    #     this.ui.screens_menu_container.append( this.viewport.menu_view.el )
+    closeScreens: ->
+        this.ui.screen.children().detach()
 
-    onRemove: (sv)->
-        sv.view.remove()
+    onRemove: (screen)->
+        screen.view.remove()
 
     onActiveChange: (screen,active)->
         view = screen.view
         view.parent = this
         unless view.rendered
             view.render()
-
         if active
             this.ui.screen.append( view.el )
         else

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

@@ -22,7 +22,7 @@
         height: 48px;
         width: 150px;
         margin: 2px;
-        background: url(asset_path('images/logo-sm.png')) no-repeat;
+        background: url(asset_path('images/lanes/logo-sm.png')) no-repeat;
     }
 
     .navbar-toggle, .screens-menu-toggle {

data/lanes.gemspec

@@ -54,5 +54,5 @@ Gem::Specification.new do |spec|
     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

@@ -40,14 +40,14 @@ module Lanes
                 end
             end
 
+
             def wrap_request(model, req)
                 if allowed_access_to?(model)
                     ::Lanes::User.scoped_to(current_user) do | user |
-                        Lanes.logger.debug "User   : #{user.id} (#{user.login})"
-                        Lanes.logger.debug "Params : #{@params}"
                         yield
                     end
                 else
+                    Lanes.logger.warn "Unauthorized access attempted to #{req}"
                     req.halt( 401, Oj.dump({
                       success:false, errors: {user: "Access Denied"}, message: "Access Denied"
                     }))

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

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

data/lib/lanes/access/role.rb

@@ -53,6 +53,11 @@ module Lanes
                     ALL
                 end
 
+                # By default a role can only access if it's type is included in the
+                # array of acceptable roles.  An Admin role may provide a custom implementation
+                def can_access_locked_roles?(roles)
+                    roles.include?(self)
+                end
             end
         end
 

data/lib/lanes/access/role_collection.rb

@@ -49,20 +49,23 @@ module Lanes
 
           private
 
+            def role_types
+                @role_types ||= @roles.map(&:class)
+            end
+
             def model_to_class(model)
-              model.is_a?(Class) ? model : model.class
+                model.is_a?(Class) ? model : model.class
             end
 
             # Test if the given roles grant access to the model
             def test_access(model, attribute, access_type)
                 # Check if the attribute is locked
                 # If it is, the locks determine access, otherwise use the model's grants
-                roles = LockedFields.roles_needed_for(model, attribute, access_type)
-                if roles.empty?
-                    return !!@roles.detect { |role| yield role }.present?
+                locked_to_roles = LockedFields.roles_needed_for(model, attribute, access_type)
+                if locked_to_roles.none?
+                    return @roles.detect{ |role| yield role }.present?
                 else
-                    roles.any?{ |role| role.models_include?(model) }
-                    #!!roles.find { |role| @roles.map(&:class).include?(role) }
+                    role_types.any?{|role| role.can_access_locked_roles?(locked_to_roles) }
                 end
             end
 

data/lib/lanes/access/roles/administrator.rb

@@ -5,18 +5,11 @@ module Lanes
 
             class Administrator < Role
 
-                def self.grant_global_access!
-
-                    self.grant( *Lanes::Model.descendants )
-
-                    LockedFields.definitions.each do | klass, fields |
-                        fields.each do |field, grants|
-                            grants.push({ role: self, only: nil })
-                        end
-                    end
+                # The admin can access all the things
+                def self.can_access_locked_roles?(roles)
+                    true
                 end
 
-
                 def can_read?(model)
                     true
                 end

data/lib/lanes/api/request_wrapper.rb

@@ -5,30 +5,30 @@ module Lanes
             class << self
 
                 def get(*args)
-                    wrap_request(*args) do |controller|
+                    make_handler(*args) do |controller|
                         controller.perform_retrieval
                     end
                 end
 
                 def post(*args)
-                    wrap_request(*args) do |controller|
+                    make_handler(*args) do |controller|
                         controller.perform_creation
                     end
                 end
 
                 def update(*args)
-                    wrap_request(*args) do |controller|
+                    make_handler(*args) do |controller|
                         controller.perform_update
                     end
                 end
 
                 def delete(*args)
-                    wrap_request(*args) do |controller|
+                    make_handler(*args) do |controller|
                         controller.perform_destroy
                     end
                 end
 
-                def wrap_request(model, controller, parent_attribute)
+                def make_handler(model, controller, parent_attribute)
                     lambda do
                         authentication = Lanes::API::AuthenticationProvider.new(
                           request_type: request.request_method,
@@ -40,7 +40,7 @@ module Lanes
                               params[:nested_attribute] = Hash[ parent_attribute,
                                                                params[parent_attribute] ]
                             end
-                            wrap_json_reply do
+                            wrap_request(!request.get?) do
                                 yield controller.new(model, authentication, params, data)
                             end
                         end
@@ -48,8 +48,21 @@ module Lanes
                 end
             end
 
-            def wrap_json_reply
-                response = yield
+            def log_request
+                Lanes.logger.info "UserID: #{session['user_id']}, Params: #{request.params}"
+            end
+
+            def wrap_request(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']
+                    end
+                else
+                    response = yield
+                end
                 if false == response[:success]
                     status(406)
                 end

data/lib/lanes/api/root.rb

@@ -9,19 +9,17 @@ require_relative 'pub_sub'
 module Lanes
     module API
         class Root < Sinatra::Application
-            set :environment, Lanes.config.environment
             Lanes.config.get(:environment) do | env |
                 set :environment, env
             end
             register SprocketsExtension
             helpers RequestWrapper
             helpers HelperMethods
+            use Rack::Session::Cookie, :key => 'lanes.session', :secret => Lanes.config.session_secret_key_base
+            use ActiveRecord::ConnectionAdapters::ConnectionManagement
             not_found do
                 Oj.dump({ message: "endpoint not found", success: false  })
             end
-
-            use Rack::Session::Cookie, :key => 'lanes.session', :secret => Lanes.config.session_secret_key_base
-            use ActiveRecord::ConnectionAdapters::ConnectionManagement
             error do
                 Oj.dump({
                     success: false,

data/lib/lanes/api/sprockets_extension.rb

@@ -14,13 +14,15 @@ module Lanes
                     env = ::Sprockets::Environment.new
                     Lanes::API::SprocketsExtension.configure(env, compress:true)
                     manifest = Sprockets::Manifest.new( env.index, "public/assets/manifest.json" )
-                    manifest.compile('lanes/workspace.js', 'lanes/workspace.css',
-                                     'lanes/minimal.js',   'lanes/minimal.css' )
-                    Extensions.each{|ext|
-                        manifest.compile(ext.client_images.map(&:to_s))
-                    }
+                    manifest.compile('lanes.js', 'lanes.css')
+                    Extensions.each do |ext|
+                        ext.each_static_asset do | asset |
+                          manifest.compile( asset.to_s )
+                        end
+                    end
                     Screen.each do | screen |
-                        manifest.compile( screen.assets ) unless screen.assets.blank?
+                        assets = screen.assets
+                        manifest.compile( assets ) unless assets.empty?
                     end
                 end
 

data/lib/lanes/api/test_specs.rb

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

data/lib/lanes/capistrano.rb

@@ -0,0 +1,18 @@
+set :linked_dirs, %w{config}
+
+namespace :deploy do
+
+    desc 'Runs bundle exec lanes db migrate'
+    task :migrate => [:set_rails_env] do
+        on primary fetch(:migration_role) do
+            info '[deploy:migrate] Run `lanes db migrate`'
+            within release_path do
+                with rails_env: fetch(:rails_env) do
+                    execute :bundle, "exec lanes db migrate"
+                end
+            end
+        end
+    end
+
+    after 'deploy:updated', 'deploy:migrate'
+end

data/lib/lanes/command/app.rb

@@ -62,13 +62,9 @@ module Lanes
                 @template = "<div><h1>Base Screen</h1></div>"
                 options[:description] = "Base Screen for #{namespace.titleize}"
                 options[:fileless] = true
-                screen_id = 'base'
-                template "client/screens/Screen.coffee", "#{client_dir}/screens/Base.coffee"
+                template "client/screens/Base.coffee", "#{client_dir}/screens/Base.coffee"
                 template "spec/client/Screen.coffee",    "#{spec_dir}/screens/Base.coffee"
-                insert_into_file "config/screens.rb", after: "" do
-                    source = File.expand_path(find_in_source_paths("config/screen.rb"))
-                    ERB.new(::File.binread(source), nil, "-","@output_buffer").result(binding)
-                end
+                create_file "config/screens.rb", ""
             end
 
         end

data/lib/lanes/command/generate_model.rb

@@ -18,27 +18,23 @@ module Lanes
 
             def set_variables
                 super
-                if name=~/::/
-                    (@namespace,@name) = name.split("::")
-                else
-                    @namespace = computed_namespace
-                end
                 @file_name  = name.underscore
-                @table_name = namespace + "_" + name.tableize
+                prefix = extension.db_table_prefix
+                @table_name = prefix ? "#{prefix}_#{name.tableize}" : name.tableize
             end
 
             def create_migration
                 migration = exising_migration ||
-                  Time.now.utc.strftime("%Y%m%d%H%M%S") + "_create_#{table_name}.rb"
+                  migration_timestamp + "_create_#{table_name}.rb"
                 self.fields = fields.map{ |field| ModelAttribute.parse(field) }
                 template "db/create_table_migration.rb", "db/migrate/#{migration}"
             end
 
             def create_model
-                template "lib/namespace/model.rb", "lib/#{namespace}/models/#{file_name}.rb"
+                template "lib/namespace/model.rb", "lib/#{identifier}/models/#{file_name}.rb"
                 template "spec/server/model_spec.rb", "spec/server/#{file_name}_spec.rb"
                 template "spec/fixtures/namespace/model.yml",
-                         "spec/fixtures/#{namespace}/#{file_name}.yml"
+                         "spec/fixtures/#{identifier}/#{file_name}.yml"
             end
 
             def create_client
@@ -50,8 +46,8 @@ module Lanes
             end
 
             def add_route
-                insert_into_file "config/routes.rb", before: "end" do
-                    "    resources #{namespace.camelize}::#{class_name}\n"
+                insert_into_file "config/routes.rb", after: /.*Lanes::API.routes.draw.*?\n/ do
+                    "    resources #{namespace}::#{class_name}\n"
                 end
             end
 
@@ -66,6 +62,10 @@ module Lanes
                 migrations.any? ? migrations.first.basename.to_s : nil
             end
 
+            def migration_timestamp
+                ENV['MIGRATION_TIMESTAMP'] || Time.now.utc.strftime("%Y%m%d%H%M%S")
+            end
+
             def computed_namespace
                 # find a file and directory with the same basename
                 entries = Dir.glob(self.destination_root + "/lib/*")

data/lib/lanes/command/generate_view.rb

@@ -25,7 +25,7 @@ module Lanes
             # option :from, :required => true
 
             def create_screen
-                template "client/views/View.coffee",   "#{client_dir}/#{name.classify}.coffee"
+                template "client/views/View.coffee",   "#{client_dir}/#{class_name}.coffee"
                 template "spec/client/views/ViewSpec.coffee", \
                   "#{spec_dir}/#{class_name}Spec.coffee"
             end

data/lib/lanes/command/named_command.rb

@@ -13,10 +13,8 @@ module Lanes
             end
 
             def load_namespace
-                @namespace  = options[:namespace] ||
-                  Command.load_current_extension(raise_on_fail:true)
-                    .identifier.underscore.camelize
-                @identifier = @namespace.underscore.dasherize
+                @identifier = extension.identifier
+                @namespace  = options[:namespace] || @identifier.underscore.camelize
             end
 
             def set_variables
@@ -25,6 +23,11 @@ module Lanes
                 @client_dir = "client/#{identifier}"
             end
 
+            protected
+
+            def extension
+                @extension ||= Command.load_current_extension(raise_on_fail:true)
+            end
         end
     end
 end

data/lib/lanes/concerns/set_attribute_data.rb

@@ -100,7 +100,7 @@ module Lanes::Concerns
 
                     association = self.association(name)
                     if value.is_a?(Hash) && [:belongs_to,:has_one].include?(association.reflection.macro)
-                        target = association.target || association.build
+                        target = send(name) || association.build
                         result[name] = target.set_attribute_data(value, user)
                     elsif value.is_a?(Array) && :has_many == association.reflection.macro
                         result[name] = _set_attribute_data_from_collection(association, value, user)

data/lib/lanes/configuration.rb

@@ -70,6 +70,7 @@ module Lanes
         config_option :root_view, 'Lanes.Workspace.Layout'
         config_option :initial_workspace_screen_id, ''
         config_option :specs_root, Pathname.getwd
+        config_option :static_asset_types, ['images','fonts']
     end
 
     class << self

data/lib/lanes/db.rb

@@ -14,6 +14,7 @@ module Lanes
                 ::ActiveRecord::Base.configurations = config
                 ::ActiveRecord::Base.establish_connection( ::ActiveRecord::Base.configurations[ env ] )
             end
+            ActiveRecord::Base.logger = Lanes.logger
         end
 
         def load_seed

data/lib/lanes/extension/definition.rb

@@ -21,6 +21,8 @@ module Lanes
             # Array of Pathname's to add to sprockets
             attr_accessor_with_default :root_path
 
+            attr_accessor_with_default :db_table_prefix
+
             # Does the extension use PubSub functionality
             class_attribute  :uses_pub_sub
 
@@ -52,10 +54,20 @@ module Lanes
                 [ root_path.join('client') ]
             end
 
-            def client_images
-                images = []
-                root_path.join('client','images').find{|path| images << path if path.file? }
-                images
+            def static_paths
+                client_paths.each_with_object(Array.new) do |path, result|
+                    Lanes.config.static_asset_types.each do | prefix |
+                        result << path.join(prefix) if path.join(prefix).exist?
+                    end
+                end
+            end
+
+            def each_static_asset
+                static_paths.each do | path |
+                    path.find.each do | entry |
+                        yield entry if entry.file?
+                    end
+                end
             end
 
             def route(route_set)

data/lib/lanes/extension.rb

@@ -95,6 +95,7 @@ module Lanes
                   controlling_extension: controlling.identifier,
                   root_view:  Lanes.config.root_view,
                   api_path: Lanes.config.mounted_at,
+                  environment: Lanes.config.environment,
                   initial_workspace_screen_id: Lanes.config.initial_workspace_screen_id,
                   pub_sub: require_pub_sub?
                 }
@@ -104,10 +105,6 @@ module Lanes
                 return data
             end
 
-            def client_images
-                each{|ext| }
-            end
-
             def load_controlling_config
                 config_file = self.controlling.root_path.join('config','lanes.rb')
                 if config_file.exist?

data/lib/lanes/version.rb

@@ -1,5 +1,5 @@
 module Lanes
 
-    VERSION = "0.1.5"
+    VERSION = "0.1.6"
 
 end

data/spec/server/command-reference-files/initial/.gitignore

@@ -0,0 +1,3 @@
+public/assets
+tmp/cache
+log/*log

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

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

data/spec/server/command-reference-files/initial/Guardfile

@@ -0,0 +1,13 @@
+require "lanes/guard_tasks"
+
+Lanes::GuardTasks.run(self, name: "appy-app") do | tests |
+
+    tests.client do
+
+    end
+
+    tests.server do
+
+    end
+
+end

data/spec/server/command-reference-files/initial/Rakefile

@@ -0,0 +1,2 @@
+require_relative 'lib/appy-app'
+require 'lanes/rake_tasks'

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

@@ -0,0 +1,7 @@
+class AppyApp.Extension extends Lanes.Extensions.Base
+
+    FILE: FILE
+
+    identifier: "appy-app"
+
+    setBootstrapData: (data)->

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

@@ -0,0 +1,4 @@
+class AppyApp.Router extends Lanes.Screens.Router
+
+    routes:
+        {}

data/spec/server/command-reference-files/initial/client/appy-app/index.js

@@ -0,0 +1,21 @@
+//=require ./models/Base
+//=require ./views/Base
+//=require_tree ./models
+//=require_tree ./views
+//=require_tree ./components
+//=require ./screens/Base
+//=require ./Router
+//=require ./Extension
+
+/*
+ Files located in the above directories are part of the default
+ Javascript build and are downloaded to the client on the initial
+ request.
+
+ Accordingly, only essential files should be included here. Code that
+ relates to a screen should be placed in the "screens" directory,
+ where it will be loaded dynamically when the screen is displayed.
+
+ Alternatively, feel free to modify the require statements above to
+ only include the paths you need.
+ */

data/spec/server/command-reference-files/initial/client/appy-app/models/Base.coffee

@@ -0,0 +1,5 @@
+# All models in AppyApp will inherit from
+# this common base class.
+class AppyApp.Models.Base extends Lanes.Models.Base
+
+    abstractClass: true

data/spec/server/command-reference-files/initial/client/appy-app/screens/Base.coffee

@@ -0,0 +1,3 @@
+class AppyApp.Screens.Base extends Lanes.Screens.Base
+
+    abstractClass: true

data/spec/server/command-reference-files/initial/client/appy-app/styles.scss

@@ -0,0 +1 @@
+/* Enter styles for your application in scss format here */

data/spec/server/command-reference-files/initial/client/appy-app/views/Base.coffee

@@ -0,0 +1,5 @@
+# All views in AppyApp will inherit from
+# this common base class.
+class AppyApp.Views.Base extends Lanes.Views.Base
+
+    abstractClass: true