lanes 0.0.5 → 0.0.8

data/lib/lanes/api/request_wrapper.rb

@@ -53,6 +53,7 @@ module Lanes
                 if false == response[:success]
                     status(406)
                 end
+                content_type 'application/json'
                 Oj.dump(response, mode: :compat)
             end
 

data/lib/lanes/api/root.rb

@@ -1,8 +1,7 @@
 require 'sinatra'
 require 'oj'
 require 'rack/csrf'
-require 'sprockets-helpers'
-require 'message_bus'
+
 require_relative 'sprockets_extension'
 require_relative 'helper_methods'
 require_relative 'pub_sub'
@@ -20,13 +19,9 @@ module Lanes
             not_found do
                 Oj.dump({ message: "endpoint not found", success: false  })
             end
-            before do
-                content_type 'application/json'
-            end
 
             use Rack::Session::Cookie, :key => 'lanes.session', :secret => Lanes.config.session_secret_key_base
             use ActiveRecord::ConnectionAdapters::ConnectionManagement
-            use MessageBus::Rack::Middleware
             error do
                 Lanes.logger.warn request.env['sinatra.error']#.backtrace
                 Oj.dump({
@@ -40,7 +35,7 @@ module Lanes
                 set :views, Pathname.new(__FILE__).dirname.join("../../../views")
                 set :show_exceptions, false
                 DB.establish_connection
-                PubSub.initialize
+                PubSub.initialize(self)
                 Extensions.load_current_config
                 # late load in case an extension has provided an alternative implementation
                 require "lanes/api/null_authentication_provider" unless API.const_defined?(:AuthenticationProvider)

data/lib/lanes/api/sprockets_compressor.rb

@@ -1,4 +1,5 @@
 require "yui/compressor"
+require "closure-compiler"
 
 module Lanes
     module API
@@ -9,13 +10,16 @@ module Lanes
 
             def initialize_engine
                 require_template_library 'yui/compressor'
+                require_template_library 'closure-compiler'
             end
 
             def prepare
             end
 
             def js
-                @js||=YUI::JavaScriptCompressor.new(:munge => true, :java_opts=>'-client')
+                # n.b. setting 'ADVANCED_OPTIMIZATIONS' doesn't work at this time, it
+                # introduces JS errors :(  Haven't debugged further
+                @js||=Closure::Compiler.new
             end
             def css
                 @css ||= YUI::CssCompressor.new( :java_opts=>'-client' )
@@ -23,7 +27,7 @@ module Lanes
             def evaluate(context, locals, &block)
                 case context.content_type
                 when 'application/javascript'
-                    js.compress(data)
+                    js.compile(data)
                 when 'text/css'
                     css.compress(data)
                 else

data/lib/lanes/api/sprockets_extension.rb

@@ -2,8 +2,8 @@ require 'sprockets'
 require 'sass'
 require 'sinatra/sprockets-helpers'
 require_relative 'javascript_processor'
-require_relative 'sprockets_compressor'
 require 'compass/import-once/activate'
+require 'sprockets-helpers'
 
 module Lanes
     module API
@@ -13,9 +13,16 @@ module Lanes
                 def compile!
                     env = ::Sprockets::Environment.new
                     Lanes::API::SprocketsExtension.configure(env, compress:true)
-                    comp = Sprockets::Manifest.new( env.index, "public/assets" )
-                    comp.compile( 'lanes/workspace.js', 'lanes/workspace.css' )
-                    env
+                    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))
+                    }
+                    Screens::Definition.each(env) do | screen |
+                        manifest.compile( screen.files )
+                    end
+                    
                 end
 
                 def configure(env, compress:false)
@@ -29,6 +36,7 @@ module Lanes
                         ext.client_paths.each{ |path| env.append_path(path) }
                     end
                     if compress
+                        require_relative 'sprockets_compressor'
                         env.js_compressor  = AssetCompressor
                         env.css_compressor = AssetCompressor
                     end
@@ -41,16 +49,16 @@ module Lanes
                     app.set :sprockets, ::Sprockets::Environment.new
                     configure(app.sprockets)
 
-                    # The url for client
-                    app.set :digest_assets, false
-
                     app.configure do
                         ::Sprockets::Helpers.configure do |config|
                             config.environment = app.sprockets
                             config.prefix      = Lanes.config.assets_path_prefix
-                            config.digest      = app.digest_assets
                             config.public_path = app.public_folder
-                            config.debug = true
+                            config.debug = !app.production?
+                            if app.production?
+                                config.manifest = Sprockets::Manifest.new(app.sprockets,
+                                                      "public/assets/manifest.json")
+                            end
                         end
                     end
 
@@ -61,6 +69,14 @@ module Lanes
                             settings.sprockets.call env_sprockets
                         end
                     end
+                    app.configure :production do
+                        app.get "#{Lanes.config.assets_path_prefix}/*" do |path|
+                            if manifest_path = ::Sprockets::Helpers.manifest.assets[path]
+                                path = manifest_path
+                            end
+                            send_file "public/assets/" + path
+                        end
+                    end
                 end
 
             end

data/lib/lanes/api/test_specs.rb

@@ -1,13 +1,17 @@
 require 'jasmine-core'
+require 'lanes/command'
 
 module Lanes
     module API
 
+        LanesDummyExt = Struct.new(:identifier, :root_path)
         class TestSpecs
+
             cattr_accessor :current
 
-            def initialize(root)
-                @root = root
+            attr_accessor :extension
+            def initialize(ext)
+                @extension = ext
             end
 
             def css_files
@@ -18,13 +22,13 @@ module Lanes
                 urlpath(Jasmine::Core.js_files)   +
                 urlpath(Jasmine::Core.boot_files) +
                 urlpath(spec_files("helpers"))    +
-                urlpath(spec_files("client"))
+                urlpath(spec_files(extension.identifier))
             end
 
           private
 
             def spec_files(path)
-                dir = @root.join("spec")
+                dir = extension.root_path.join("spec")
                 regex = /^#{dir}\//
                 Dir.glob( dir.join(path,"**/*.{coffee,js}") ).map do |file|
                     file.sub(regex,'').sub(/coffee$/,'js')
@@ -37,11 +41,11 @@ module Lanes
         end
 
 
-        Lanes.config.get(:specs_root) do | root |
-            TestSpecs.current = TestSpecs.new(root)
-            Root.sprockets.append_path(root.join("spec"))
-        end
-
+        ext = Lanes::Command.load_current_extension ||
+          LanesDummyExt.new('lanes', Pathname.new(__FILE__).dirname.join("../../../"))
+        TestSpecs.current = TestSpecs.new(ext)
+        Root.sprockets.append_path(ext.root_path.join("spec"))
+        
 
         Root.sprockets.append_path(Jasmine::Core.path)
 

data/lib/lanes/command.rb

@@ -1,3 +1,5 @@
+require 'thor/error'
+
 module Lanes
     module Command
         class << self
@@ -16,22 +18,30 @@ module Lanes
             # Will silently swallow any exceptions that are raised when the file is required and return nil
             #
             # @return [Extension] extension that was loaded, nil if none was found
-            def load_current_extension
+            def load_current_extension(raise_on_fail:false)
+                
                 previous = Extensions.all
-                ext = Dir.glob("./lib/**/extension.rb").first
+                ext = Dir.glob("./lib/*/extension.rb").first
                 if ext
                     begin
                         require(ext)
                     rescue
-                        return nil
+                        return _maybe_fail(raise_on_fail)
+                    end
+                    all = Extensions.all
+                    if all.any?
+                        diff = all - previous
+                        return diff.any? ? diff.first.new : Extensions.all.first.new
                     end
-                    diff = Extensions.all - previous
-                    return diff.any? ? diff.first.new : nil
                 else
-                    return nil
+                    return _maybe_fail(raise_on_fail)
                 end
             end
 
+            def _maybe_fail(should_raise)
+                raise Thor::Error.new("Unable to locate Lanes environment") if should_raise
+                return nil
+            end
         end
     end
 end

data/lib/lanes/command/app.rb

@@ -33,15 +33,21 @@ module Lanes
 
             def create_client_files
                 self.class.source_root.join('client').children.each do | path |
-                    empty_directory "#{client_dir}/#{path.basename}" if path.directory?
+                    next unless path.directory?
+                    empty_directory "#{client_dir}/#{path.basename}" 
+                    create_file "#{client_dir}/#{path.basename}/.gitkeep"
                 end
-                template "client/namespace-extension.js", "#{client_dir}/index.js"
-                template "client/Extension.coffee",       "#{client_dir}/Extension.coffee"
-                template "client/styles/styles.scss",     "client/#{name}-styles.scss"
+                template "client/index.js",         "#{client_dir}/index.js"
+                template "client/Extension.coffee", "#{client_dir}/Extension.coffee"
+                template "client/styles.scss",      "#{client_dir}/styles.scss"
             end
 
+            def create_spec
+                
+            end
+            
             def create_first_screen
-                invoke GenerateScreen, [name], title: name.titleize, namespace: name
+                invoke GenerateScreen, ["base"], title: name.titleize, namespace: name
             end
         end
 

data/lib/lanes/command/generate_model.rb

@@ -36,15 +36,16 @@ module Lanes
 
             def create_model
                 template "lib/namespace/model.rb", "lib/#{namespace}/#{file_name}.rb"
-                template "spec/namespace/model_spec.rb", "spec/#{namespace}/#{file_name}.rb"
+                template "spec/namespace/model_spec.rb", "#{spec_dir}/#{file_name}.rb"
                 template "spec/fixtures/namespace/model.yml", "spec/fixtures/#{namespace}/#{file_name}.yml"
             end
 
             def create_client
+                self.fields.unshift ModelAttribute.parse("id:integer")
                 template "client/data/Model.coffee", \
-                         "#{client_dir}/data/#{class_name}.coffee"
+                  "#{client_dir}/data/#{class_name}.coffee"
                 template "spec/client/data/ModelSpec.coffee", \
-                         "spec/client/data/#{class_name}Spec.coffee"
+                  "#{spec_dir}/data/#{class_name}Spec.coffee"
             end
 
             def add_route

data/lib/lanes/command/generate_screen.rb

@@ -22,8 +22,9 @@ module Lanes
                 template "lib/namespace/screen.rb",      "lib/#{namespace}/#{name}_screen.rb"
                 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}/#{name.classify}.coffee"
+                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"
             end
 
         end

data/lib/lanes/command/generate_view.rb

@@ -13,7 +13,7 @@ module Lanes
                 template "client/views/View.coffee",   "#{client_dir}/views/#{name.classify}.coffee"
                 template "client/views/template.html", "#{client_dir}/views/#{name.dasherize}.html"
                 template "spec/client/views/ViewSpec.coffee", \
-                         "spec/client/views/#{class_name}Spec.coffee"
+                  "#{spec_dir}/views/#{class_name}Spec.coffee"
             end
 
         end

data/lib/lanes/command/named_command.rb

@@ -6,19 +6,20 @@ module Lanes
 
             argument :name
 
-            attr_reader :namespace, :class_name, :client_dir
+            attr_reader :namespace, :class_name, :client_dir, :spec_dir
 
             def self.source_root
                 Pathname.new(__FILE__).dirname.join("templates")
             end
 
             def load_namespace
-                @namespace  = options[:namespace] || Command.load_current_extension.identifier
-                raise Thor::Error("Unable to locate Lanes environment") unless @namespace
-            end
+                @namespace  = options[:namespace] ||
+                  Command.load_current_extension(raise_on_fail:true).identifier
+              end
 
             def set_variables
                 @class_name = name.classify
+                @spec_dir =   "spec/#{namespace}"
                 @client_dir = "client/#{namespace}"
             end
 

data/lib/lanes/command/templates/Gemfile

@@ -1,7 +1,6 @@
 source 'https://rubygems.org'
 
-gem "guard-jasmine",      github: "guard/guard-jasmine",   branch: 'master'
-gem "lanes",              github: "argosity/lanes",        branch: 'master'
+gem "lanes", github: "argosity/lanes", branch: 'master'
 
 # Uncomment to enable access control and user administration
 # gem "lanes-access",       github: "argosity/lanes-access", branch: 'master'

data/lib/lanes/command/templates/client/data/Model.coffee

@@ -1,7 +1,7 @@
 class <%= namespace.camelize %>.Data.<%= class_name %> extends <%= client_parent %>
 
     api_path: '<%= name.downcase.pluralize.underscore.dasherize %>'
-    namespace: NAMESPACE
+    source: FILE
 
     props:
 <% fields.each do |field| -%>
@@ -19,6 +19,6 @@ class <%= namespace.camelize %>.Data.<%= class_name %> extends <%= client_parent
 <% end -%>
 <% end -%>
 
-class Lanes.<%= namespace.camelize %>.Data.<%= class_name %>Collection extends <%= options[:client_collection_parent] %>
+class <%= namespace.camelize %>.Data.<%= class_name %>Collection extends <%= options[:client_collection_parent] %>
 
-    model: Lanes.<%= namespace.camelize %>.Data.<%= class_name %>
+    model: <%= namespace.camelize %>.Data.<%= class_name %>

data/lib/lanes/command/templates/client/screens/Screen.coffee

@@ -1,9 +1,7 @@
 class <%= namespace.camelize %>.Screens.<%= class_name %> extends Lanes.Screens.Base
 
-    namespace: NAMESPACE
+    source: FILE
 
-    # List subviews <TODO: add link to docs>
     subviews: {}
 
-    # List events  <TODO: add link to docs>
     events: {}

data/lib/lanes/command/templates/client/views/View.coffee

@@ -1,9 +1,7 @@
 class <%= namespace.classify %>.Views.<%= class_name %> extends Lanes.Views.Base
 
-    namespace: NAMESPACE
+    source: FILE
 
-    # List subviews <TODO: add link to docs>
     subviews: {}
 
-    # List events  <TODO: add link to docs>
     events: {}

data/lib/lanes/command/templates/config/lanes.rb

@@ -3,5 +3,5 @@
 #
 # It will not be evaluated if another extension is loading this one
 Lanes.configure do | config |
-    config.root_view = "<%= class_name %>.Screens.<%= class_name %>"
+    config.root_view = "<%= class_name %>.Screens.Base"
 end

data/lib/lanes/command/templates/gitignore

@@ -1 +1,2 @@
+public/assets
 tmp/cache

data/lib/lanes/command/templates/lib/namespace/screen.rb

@@ -11,7 +11,7 @@ module <%= namespace.camelize %>
         group_id    "<%= options[:group] %>"
         model_class "<%= options[:model_class] %>"
         view_class  "<%= namespace.camelize %>.Screens.<%= class_name %>"
-        files       ['screens/<%= name.dasherize %>.js','screens/<%= name.dasherize %>.css']
+        files       ['<%= namespace %>/screens/<%= name.dasherize %>.js','<%= namespace %>/screens/<%= name.dasherize %>.css']
     end
 
 end

data/lib/lanes/command/templates/spec/client/Screen.coffee

@@ -0,0 +1,7 @@
+#= require <%= namespace %>/screens/<%= name %>
+
+describe "<%= class_name %> Screen Suite", ->
+
+    it "can be instantiated", ->
+        view = new <%= namespace.camelize %>.Screens.<%= class_name %>()
+        expect(view).toEqual(jasmine.any(<%= namespace.camelize %>.Screens.<%= class_name %>));

data/lib/lanes/command/templates/spec/client/views/ViewSpec.coffee

@@ -1,5 +1,5 @@
 describe "<%= class_name %> View Suite", ->
 
     it "can be instantiated", ->
-        view = new Lanes.<%= namespace.camelize %>.Views.<%= class_name %>()
-        expect(view).toEqual(jasmine.any(Lanes.<%= namespace.camelize %>.Views.<%= class_name %>));
+        view = new <%= namespace.camelize %>.Views.<%= class_name %>()
+        expect(view).toEqual(jasmine.any(<%= namespace.camelize %>.Views.<%= class_name %>));

data/lib/lanes/concerns/all.rb

@@ -12,5 +12,5 @@ require_relative "locked_fields"
 require_relative "pub_sub"
 require_relative "queries"
 require_relative "random_hash_code"
-require_relative "sanitize_api_data"
 require_relative "visible_id_identifier"
+require_relative "sanitize_fields"