lanes 0.1.2 → 0.1.5

data/lib/lanes/command/db.rb

@@ -21,8 +21,11 @@ module Lanes
             def run_task(task)
                 Command.load_current_extension
                 require_relative "../rake_tasks"
+                say("Executing " + task)
                 Extensions.each do |ext|
                     Dir.chdir(ext.root_path) do
+                        say("\t" + ext.identifier)
+                        Rake::Task[task].reenable
                         Rake::Task[task].invoke
                     end
                 end

data/lib/lanes/command/generate_model.rb

@@ -35,17 +35,17 @@ module Lanes
             end
 
             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 "lib/namespace/model.rb", "lib/#{namespace}/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"
             end
 
             def create_client
                 self.fields.unshift ModelAttribute.parse("id:integer")
-                template "client/models/Model.coffee", \
+                template "client/models/Model.coffee",
                          "#{client_dir}/models/#{class_name}.coffee"
-                template "spec/client/models/ModelSpec.coffee", \
+                template "spec/client/models/ModelSpec.coffee",
                          "#{spec_dir}/models/#{class_name}Spec.coffee"
             end
 

data/lib/lanes/command/generate_screen.rb

@@ -8,31 +8,33 @@ module Lanes
                 title:       '',
                 description: '',
                 icon:        '',
-                group_id:    '',
+                group_id:    'system',
                 model_class: '',
                 namespace: nil
             }
             class_options( OPTIONS )
 
-            def set_defaults
+            attr_reader :screen_id
+
+            def set_variables
+                super
                 options[:title] = name.titleize if options[:title].blank?
+                @screen_id = class_name.underscore.dasherize
             end
 
             def create_screen
-                template "client/screens/index.js",      "#{client_dir}/screens/#{name}/index.js"
-                template "client/screens/styles.scss",   "#{client_dir}/screens/#{name}/index.scss"
-                template "client/screens/Screen.coffee",
-                         "#{client_dir}/screens/#{name}/#{class_name}.coffee"
-                template "client/screens/layout.html",   "#{client_dir}/screens/#{name}/layout.html"
-                template "spec/client/Screen.coffee",    "#{spec_dir}/screens/#{class_name}.coffee"
+                template "client/screens/index.js",      "#{client_dir}/screens/#{screen_id}/index.js"
+                template "client/screens/styles.scss",   "#{client_dir}/screens/#{screen_id}/index.scss"
+                template "client/screens/Screen.coffee", "#{client_dir}/screens/#{screen_id}/#{class_name}.coffee"
+                template "client/screens/layout.html",   "#{client_dir}/screens/#{screen_id}/layout.html"
+                template "spec/client/Screen.coffee",    "#{spec_dir}/screens/#{screen_id}/#{class_name}Spec.coffee"
             end
 
             def add_definition
-                insert_into_file "config/screens.rb", after: "" do
+                append_to_file "config/screens.rb" do
                     source = File.expand_path(find_in_source_paths("config/screen.rb"))
                     ERB.new(::File.binread(source), nil, "-","@output_buffer").result(binding)
                 end
-
             end
         end
     end

data/lib/lanes/command/generate_view.rb

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

data/lib/lanes/command/named_command.rb

@@ -6,21 +6,23 @@ module Lanes
 
             argument :name
 
-            attr_reader :namespace, :class_name, :client_dir, :spec_dir
+            attr_reader :namespace, :class_name, :client_dir, :spec_dir, :identifier
 
             def self.source_root
-                Pathname.new(__FILE__).dirname.join("templates")
+                Pathname.new(__FILE__).dirname.join("..","..","..","templates")
             end
 
             def load_namespace
                 @namespace  = options[:namespace] ||
-                  Command.load_current_extension(raise_on_fail:true).identifier
+                  Command.load_current_extension(raise_on_fail:true)
+                    .identifier.underscore.camelize
+                @identifier = @namespace.underscore.dasherize
             end
 
             def set_variables
                 @class_name = name.underscore.classify
-                @spec_dir   = "spec/#{namespace}"
-                @client_dir = "client/#{namespace}"
+                @spec_dir   = "spec/#{identifier}"
+                @client_dir = "client/#{identifier}"
             end
 
         end

data/lib/lanes/command/server.rb

@@ -1,4 +1,4 @@
-require 'guard'
+require 'guard/cli'
 
 module Lanes
     module Command

data/lib/lanes/command.rb

@@ -28,11 +28,7 @@ module Lanes
                         stack = e.backtrace[0..4].join("\n")
                         raise Thor::Error.new("Loading ./lib/*/extension.rb failed with: #{e}\n#{stack}")
                     end
-                    all = Extensions.all
-                    if all.any?
-                        diff = all - previous
-                        return diff.any? ? diff.first.new : Extensions.all.first.new
-                    end
+                    Extensions.controlling
                 else
                     return _maybe_fail(raise_on_fail)
                 end
@@ -42,6 +38,7 @@ module Lanes
                 raise Thor::Error.new("Unable to locate Lanes environment.\nDoes ./lib/*/extension.rb exist?") if should_raise
                 return nil
             end
+
         end
     end
 end

data/lib/lanes/components.rb

@@ -7,7 +7,7 @@ module Lanes
 
             # @param names [Symbol] list of components to include in applications
             def enable(*names)
-                @@enabled += names.map(&:to_sym)
+                @@enabled += names.map(&:to_s)
                 @@enabled.uniq!
             end
 

data/lib/lanes/concerns/queries.rb

@@ -8,7 +8,7 @@ module Lanes
 
             module ClassMethods
 
-                def compose_query_using_detail_view( view: view, join_to: join_to )
+                def compose_query_using_detail_view( view: nil, join_to: nil )
                     view = Lanes.config.table_prefix + view.to_s
                     joins("join #{view} as details on details.#{join_to} = #{table_name}.#{primary_key}")
                     .select("#{table_name}.*, details.*")

data/lib/lanes/concerns/set_attribute_data.rb

@@ -1,6 +1,5 @@
 module Lanes::Concerns
 
-
     module ApiAttributeAccess
 
 
@@ -15,7 +14,7 @@ module Lanes::Concerns
         module AccessChecks
             # Can the API read data from the model?
             def can_read_attributes?(params, user)
-                return user.can_write?(self, params)
+                return user.can_read?(self, params)
             end
 
             # Can the API write data to the model?
@@ -88,13 +87,12 @@ module Lanes::Concerns
 
             return {} unless self.can_write_attributes?(data, user)
 
-            data.each_with_object(Hash.new) do | kv, result |
-                ( key, value ) = kv
-
+            data.each_with_object(Hash.new) do | (key, value), result |
                 # First we set all the attributes that are allowed
                 if self.setting_attribute_is_allowed?(key.to_sym, user)
-                    public_send("#{key}=",result[key] = value)
-                else
+                    result[key] = value
+                    public_send("#{key}=", value)
+                elsif value.present?
                     # allow nested params to be specified using Rails _attributes
                     name = key.to_s.gsub(/_attributes$/,'').to_sym
 

data/lib/lanes/db.rb

@@ -9,7 +9,8 @@ module Lanes
             if ENV['DATABASE_URL']
                 ::ActiveRecord::Base.establish_connection( ENV['DATABASE_URL'] )
             else
-                config = YAML::load( IO.read( config_file || "config/database.yml" ) )
+                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 ] )
             end
@@ -22,10 +23,10 @@ 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'
-            Lanes::DB.config_file  ||= 'config/database.yml'
-            ENV['SCHEMA']          ||= 'db/schema.sql'
-            ENV['DB_STRUCTURE']    ||= 'db/schema.sql'
+            ENV['SCHEMA']          ||= default_schema.to_s
+            ENV['DB_STRUCTURE']    ||= default_schema.to_s
             ActiveRecord::Base.schema_format = :sql
             Lanes::DB.establish_connection( env )
             ActiveRecord::Tasks::DatabaseTasks.database_configuration = ActiveRecord::Base.configurations

data/lib/lanes/extension/definition.rb

@@ -0,0 +1,95 @@
+module Lanes
+    module Extensions
+
+        class Definition
+            include ::Lanes::Concerns::AttrAccessorWithDefault
+
+            def self.inherited(klass)
+                if Extensions.controlling_locked
+                    ALL.unshift(klass)
+                else
+                    ALL << klass
+                end
+            end
+
+            attr_reader :context
+
+            attr_accessor_with_default :load_phase, :late
+
+            attr_accessor_with_default :identifier
+
+            # Array of Pathname's to add to sprockets
+            attr_accessor_with_default :root_path
+
+            # Does the extension use PubSub functionality
+            class_attribute  :uses_pub_sub
+
+            # Load extension before/after the named extensions
+            class_attribute :before
+            class_attribute :after
+
+            def self.components(*names)
+                Components.enable(*names)
+            end
+
+            def client_bootstrap_data(view)
+                {}
+            end
+
+            def stylesheet_include
+                self.identifier + '/styles'
+            end
+
+            def javascript_include
+                self.identifier
+            end
+
+            def client_namespace
+                identifier.underscore.camelize
+            end
+
+            def client_paths
+                [ root_path.join('client') ]
+            end
+
+            def client_images
+                images = []
+                root_path.join('client','images').find{|path| images << path if path.file? }
+                images
+            end
+
+            def route(route_set)
+                routes_config = root_path.join('config','routes.rb')
+                if routes_config.exist?
+                    require routes_config
+                end
+            end
+
+            def on_boot
+            end
+
+        end
+
+        class Base < Definition
+            identifier "lanes"
+
+            root_path Pathname.new(__FILE__).dirname.join("..","..","..").expand_path
+            def stylesheet_include
+                nil
+            end
+
+            def javascript_include
+                nil
+            end
+
+            def on_boot
+                if Lanes.env.test? && Extensions.controlling.class == self.class
+                    Extensions.lock_controlling!
+                    require_relative("../workspace/extension")
+                end
+            end
+
+        end
+
+    end
+end

data/lib/lanes/extension.rb

@@ -1,65 +1,9 @@
 module Lanes
 
     module Extensions
+        mattr_accessor :controlling_locked
 
-        class Definition
-            include Concerns::AttrAccessorWithDefault
-
-            attr_reader :context
-
-            attr_accessor_with_default :load_phase, :late
-
-            attr_accessor_with_default :identifier
-
-            # Array of Pathname's to add to sprockets
-            attr_accessor_with_default :root_path
-
-            # Does the extension use PubSub functionality
-            class_attribute  :uses_pub_sub
-            class_attribute  :uses_workspace
-
-            # Load extension before/after the named extensions
-            class_attribute :before
-            class_attribute :after
-
-            def self.components(*names)
-                Components.enable(*names)
-            end
-
-            def client_bootstrap_data(view)
-                {}
-            end
-
-            def stylesheet_include
-                self.identifier + '/styles'
-            end
-
-            def javascript_include
-                self.identifier
-            end
-
-            def client_namespace
-                identifier.underscore.camelize
-            end
-
-            def client_paths
-                [ root_path.join('client') ]
-            end
-
-            def client_images
-                images = []
-                root_path.join('client','images').find{|path| images << path if path.file? }
-                images
-            end
-
-            def route(route_set)
-                routes_config = root_path.join('config','routes.rb')
-                if routes_config.exist?
-                    require routes_config
-                end
-            end
-
-        end
+        ALL=Array.new
 
         class << self
 
@@ -72,6 +16,12 @@ module Lanes
                 end
             end
 
+            # lock the current controlling extension so that it can't
+            # be changed by other extensions that are loaded later
+            def lock_controlling!
+                self.controlling_locked=true
+            end
+
             def load_after(extension)
                 self.after = extension
             end
@@ -81,15 +31,28 @@ module Lanes
             end
 
             def all
-                Definition.descendants
+                ALL
             end
 
             def require_workspace?
-                all.detect{|ext| ext.uses_workspace }
+                all.any?{|ext| ext.uses_workspace }
             end
 
             def require_pub_sub?
-                all.detect{|ext| ext.uses_pub_sub }
+                all.any?{|ext| ext.uses_pub_sub }
+            end
+
+            def each_asset(phase: :early, type: :js)
+                each do |ext|
+                    if phase == :all || ext.load_phase == phase
+                        asset = case type
+                                when :js  then ext.javascript_include
+                                when :css then ext.stylesheet_include
+                                else nil
+                                end
+                        yield asset unless asset.nil?
+                    end
+                end
             end
 
             def sorted
@@ -120,17 +83,16 @@ module Lanes
                 sorted.map{ |klass| yield klass.new }
             end
 
-            def early_loaded
-                each{ |ext| yield ext if ext.load_phase == :early }
-            end
-
-            def late_loaded
-                each{ |ext| yield ext if ext.load_phase == :late  }
+            def controlling
+                last = ALL.last
+                each{|ext| return ext if ext.is_a?(last) }
+                LanesExtension.new # fallback if can't find an extension
             end
 
             def client_bootstrap_data(view)
                 data = {
                   csrf_token: Rack::Csrf.csrf_token(view.env),
+                  controlling_extension: controlling.identifier,
                   root_view:  Lanes.config.root_view,
                   api_path: Lanes.config.mounted_at,
                   initial_workspace_screen_id: Lanes.config.initial_workspace_screen_id,
@@ -146,8 +108,8 @@ module Lanes
                 each{|ext| }
             end
 
-            def load_current_config
-                config_file = Pathname.getwd.join('config','lanes.rb')
+            def load_controlling_config
+                config_file = self.controlling.root_path.join('config','lanes.rb')
                 if config_file.exist?
                     require config_file
                 end
@@ -157,4 +119,7 @@ module Lanes
 
     end
 
+
 end
+
+require_relative 'extension/definition'

data/lib/lanes/guard_tasks.rb

@@ -35,8 +35,8 @@ module Lanes
             dsl.guard :minitest, :all_on_start => true do
                 dsl.watch(%r{^spec/spec_helper\.rb}) { 'test' }
                 dsl.watch(%r{^spec/.+_spec\.rb})
-                dsl.watch(%r{^spec/fixtures/#{app_name}/(.+)s\.yml})   { |m| "spec/#{m[1]}_spec.rb" }
-                dsl.watch(%r{^lib/#{app_name}/(.+)\.rb})               { |m| "spec/#{m[1]}_spec.rb" }
+                dsl.watch(%r{^spec/fixtures/#{app_name}/(.+)s\.yml})   { |m| "spec/server/#{m[1]}_spec.rb" }
+                dsl.watch(%r{^lib/#{app_name}/(.+)\.rb})               { |m| "spec/server/#{m[1]}_spec.rb" }
                 matchers.server_matches.call if matchers.server_matches
             end
 

data/lib/lanes/screen.rb

@@ -36,6 +36,14 @@ module Lanes
                 Extensions.load_screens
                 GROUPS.values.each{ | group | yield group }
             end
+
+            def config_file
+                Lanes::Extensions.controlling.root_path.join("config","screens.rb")
+            end
+
+            def uncache_file_on_update(asset)
+                asset.depend_on(config_file) if config_file.exist?
+            end
         end
 
         class Group

data/lib/lanes/spec_helper.rb

@@ -11,9 +11,6 @@ require 'minitest/spec'
 require 'minitest/autorun'
 require 'mocha/mini_test'
 
-require_relative 'testing_models'
-
-
 RAILS_ENV = "test"
 I18n.enforce_available_locales = true
 Lanes::DB.establish_connection('test')
@@ -37,14 +34,9 @@ module Lanes
 
     class TestCase < ActiveSupport::TestCase
         include Lanes
-        include ActiveRecordMocks::IncludeMe
 
         include ActiveRecord::TestFixtures
         self.fixture_path =  Pathname.new(__FILE__).dirname.join('fixtures')
-        # setup do
-        #     #Thread.current[:lanes_current_user] = lanes_users(:admin)
-        #     #Lanes::Access.calculate_model_access!
-        # end
 
         self.use_transactional_fixtures = true
         fixtures :all
@@ -121,6 +113,7 @@ module MiniTest
         def assert_saves( model )
             assert model.save, "#{model.class} failed to save: #{model.errors.full_messages.join(',')}"
         end
+
         def refute_saves( model, *errors )
             refute model.save, "#{model.class} saved successfully when it should not have"
             errors.each do |error|
@@ -131,7 +124,6 @@ module MiniTest
 
         end
 
-
         def assert_event_fires( klass, event, &block )
             @event_results = []
             klass.observe(event) do | *args |
@@ -146,31 +138,3 @@ module MiniTest
         end
     end
 end
-
-
-module FixtureHelpers
-
-    extend ActiveSupport::Concern
-
-    included do
-        alias_method_chain :table_rows, :custom_autoset_fields
-    end
-
-    def table_rows_with_custom_autoset_fields
-        results = table_rows_without_custom_autoset_fields
-        if model_class
-            results[ table_name ].each do | row |
-                row['visible_id'] = Lanes::SequentialId.next_for( model_class ) if model_class.column_names.include?('visible_id')
-                row['hash_code' ] = Lanes::Strings.random if model_class.column_names.include?('hash_code')
-                row['created_at'] = Time.now if model_class.column_names.include?('created_at')
-                row['updated_at'] = Time.now if model_class.column_names.include?('updated_at')
-                # 135138680 == "admin"
-                row['created_by_id'] = 135138680  if model_class.column_names.include?('created_by_id')
-                row['updated_by_id'] = 135138680 if model_class.column_names.include?('updated_by_id')
-            end
-        end
-        results
-    end
-end
-
-ActiveRecord::FixtureSet.send :include, FixtureHelpers

data/lib/lanes/version.rb

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

data/lib/lanes/workspace/extension.rb

@@ -0,0 +1,28 @@
+module Lanes
+    module Workspace
+        class Extension < Lanes::Extensions::Definition
+
+            identifier "lanes-workspace"
+
+            root_path Pathname.new(__FILE__).dirname.expand_path
+
+            def stylesheet_include
+                'lanes/workspace/styles'
+            end
+
+            def javascript_include
+                'lanes/workspace'
+            end
+
+            def client_namespace
+                'Workspace'
+            end
+
+            def client_paths
+                []
+            end
+
+        end
+
+    end
+end

data/lib/lanes/workspace.rb

@@ -0,0 +1,7 @@
+module Lanes
+    module Workspace
+    end
+end
+
+require_relative 'access'
+require_relative 'workspace/extension'

data/npm-build/package.json

@@ -12,8 +12,8 @@
         "ampersand-collection-view": "~1.1",
         "ampersand-rest-collection": "~2.0",
         "ampersand-collection-underscore-mixin": "~1.0",
-        "ampersand-collection": "~1.3",
-        "ampersand-subcollection": "~1.5",
+        "ampersand-collection": "~1.4",
+        "ampersand-subcollection": "~2.0",
         "ampersand-router": "~1.0",
         "ampersand-dom-bindings": "~3.3",
         "underscore.inflections": "~0.2.1",

data/spec/api/javascript_processor_spec.rb

@@ -95,7 +95,7 @@ Foo = (function() {
 
 Bar.extend(Foo);
 
-})(window.Lanes,(window.Lanes ? window.Lanes['Foo'] : null),window._, window,{namespace:(window.Lanes ? window.Lanes['Foo'] : null),extensionName:'Foo',path:'baz'});
+})(window.Lanes,(window.Lanes ? window.Lanes['Foo'] : null),window._, window,{namespace:(window.Lanes ? window.Lanes['Foo'] : null),extensionName:'Foo',path:["foo","bar","baz"]});
 EOS
 
 Scope = Struct.new(:logical_path)