embork 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68e08a13835911d3be709a08ed0f8c8e1d33d41f
-  data.tar.gz: 2d1db05b1f2d067446e290a62d69d615e6dfe0d6
+  metadata.gz: beee56400bed3d39116dd3bfd9b3f447739f08b8
+  data.tar.gz: 144f885261daf6d9793b1616705d44c0ccef14a1
 SHA512:
-  metadata.gz: c59ae75b4decaa04317aa4b0e32b064969d26a40a1ff2ea0a667baca1bb635294a04d1a85fce506714282047e3f584373c8aeec2a3a4d6e6f0da8bf7b7d2dd15
-  data.tar.gz: 79a46ae25a8232379c62ffc16f84c60b389238a08038fdbc389ecd4ab65c68351d316de644b0a4ac5a2cf46d711895c9d73eb03c6794c92d94f59a0904f916da
+  metadata.gz: 300f11415db99528295500a1500762b74e295e873817caa0b4c035305bfc2c0af75239a14cbd947241229436e36503394ccb668098e270baf1d289438f001461
+  data.tar.gz: 6823e594fdc2f0a3a1e427e15218028cb6acc1101c85144794ceee2e8c2150fd1ec859176ba32725057f90b31d3099ab874111c5bc9b6415b3b348ac91f09c60

data/README.md

@@ -1,24 +1,47 @@
 # Embork
 
-TODO: Write a gem description
+Build awesome hybrid EmberJS Apps! Embork is a build system for ember backed by
+sprockets. It works like any conventional build system, but with a focus on
+supporting multiple build targets. It also has a facility to develop with a
+rack-compatible back-end providing the index.html file.
 
 ## Installation
 
-Add this line to your application's Gemfile:
+Install it as a gem!
 
-    gem 'embork'
+    $ gem install embork
 
-And then execute:
+## Usage
 
-    $ bundle
+#### To create a new application:
 
-Or install it yourself as:
+    $ embork new my-app
 
-    $ gem install embork
+#### Running the development server:
 
-## Usage
+    $ embork server <environment>
+
+The default environment is 'development'. There is also a production environment
+included with the generator, however, you may create as many environments as you
+want just by copying or creating a new folder under the `config` directory.
+
+#### Running the test suite
+
+There are two ways to run tests. You can run the QUnit test suite in a browser
+by running the test server with the test paths enabled:
+
+    $ embork server --enable-tests <environment>
+    $ open http://localhost:9292/tests.html
+
+You can also run the test suite entirely via the command line:
+
+    $ embork test <environment>
 
-TODO: Write usage instructions here
+This will run a server on a random port, and connect to it using the
+`qunit-runner` [gem](https://github.com/scoremedia/qunit-runner "qunit-runner").
+This is the best option to use for integrating QUnit into your ci server.
+Additionally, you can use the `DISABLE_COLORS` environment variable to turn off
+colour in stdout.  This helps with ci servers that don't support tty color.
 
 ## Contributing
 

data/bin/embork

@@ -1,63 +1,5 @@
 #!/usr/bin/env ruby
 
-require 'embork'
-require 'thor'
+require 'embork/cli'
 
-class EmborkCLI < Thor
-  class_option :borkfile, :type => :string, :default => "./Borkfile",
-    :desc => "Path to the embork config file."
-
-  desc "create PACKAGE_NAME", %{generate an Embork Ember application called "PACKAGE_NAME"}
-  option :use_ember_data, :type => :boolean, :default => false
-  option :directory, :type => :string, :default => nil
-  def create(package_name)
-    puts %{Creating embork app in "%s"} % package_name
-    Embork::Generator.new(package_name, options).generate
-  end
-
-  desc "server [ENVIRONMENT]", %{run the development or production server}
-  option :port, :type => :numeric, :default => 9292
-  option :host, :type => :string, :default => 'localhost'
-  option :bundle_version, :type => :string, :default => nil
-  option :with_latest_bundle, :type => :boolean, :default => false
-  def server(environment = :development)
-    borkfile = Embork::Borkfile.new options[:borkfile], environment
-    Embork::Server.new(borkfile, options).run
-  end
-
-  desc "build [ENVIRONMENT]", %{build the project in the 'build' directory}
-  option :keep_all_old_versions, :type => :boolean, :default => false,
-    :desc => %{By default, older versions of the project are removed, only keeping the last few versions. This flag keeps all old versions.}
-  def build(environment = :production)
-    borkfile = Embork::Borkfile.new options[:borkfile], environment
-    builder = Embork::Builder.new(borkfile)
-    builder.build
-    builder.clean unless options[:keep_all_old_versions]
-  end
-
-  desc "clean", %{Remove all files under the build directory}
-  def clean
-    borkfile = Embork::Borkfile.new options[:borkfile]
-    FileUtils.rm_rf File.expand_path('build', borkfile.project_root)
-  end
-
-  desc "clean-cache", %{Blow away the sprockets cache}
-  def clean_cache
-    borkfile = Embork::Borkfile.new options[:borkfile]
-    FileUtils.rm_rf File.expand_path('.cache', borkfile.project_root)
-  end
-
-  desc "hint", %{run jshint on the app and tests}
-  option :only_app, :type => :boolean, :default => false
-  option :only_tests, :type => :boolean, :default => false
-  def hint
-    borkfile = Embork::Borkfile.new options[:borkfile]
-    Dir.chdir borkfile.project_root do
-      system('npm run hint-app') unless options[:only_tests]
-      system('npm run hint-testss') unless options[:only_app]
-    end
-  end
-
-end
-
-EmborkCLI.start(ARGV)
+Embork::CLI.start(ARGV)

data/blueprint/Borkfile

@@ -34,6 +34,11 @@ configure :development do
 end
 
 configure :production do
+  # Enable a javascript compressor. Whichever you enable, include the
+  # corresponding gem in the Gemfile.
+  #
+  # compress_with :closure_compiler
+  # compress_with :uglifier
 end
 
 # Use :static index to fall back to sprockets-built html files OR pass in

data/blueprint/Gemfile

@@ -11,3 +11,8 @@ gem 'embork'
 # Borkfile.
 #
 # gem 'bootstrap-sass'
+
+# Include the closure-compiler or uglifier gem to use either javascript
+# compressor. They both have to be enabled through your Borkfile.
+#
+# gem 'closure-compiler'

data/blueprint/erbfiles

@@ -1,5 +1,6 @@
 app/app.js
 app/index.html.erb
+tests/tests.html.erb
 bower.json
 package.json
 Borkfile

data/blueprint/tests/fixtures.js

@@ -0,0 +1 @@
+//= require_tree ./fixtures

data/blueprint/tests/test-loader.js

@@ -1,6 +1,3 @@
-/* globals requirejs,require */
-
-// TODO: load based on params
 Ember.keys(requirejs.entries).forEach(function(entry) {
   if ((/\-test/).test(entry)) {
     require(entry, null, null, true);

data/blueprint/tests/{index.html → tests.html.erb}

@@ -7,7 +7,6 @@
     <meta name="description" content="">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
-
     <link rel="stylesheet" href="assets/qunit.css">
     <style>
       #ember-testing-container {
@@ -25,18 +24,23 @@
         zoom: 50%;
       }
     </style>
+
+    <%%= javascript_include_tag "/application.js" %>
+    <%%= javascript_include_tag "/tests.js" %>
+
+    <script src="/qunit/qunit/qunit.js"></script>
+    <script src="/ember-qunit/dist/named-amd/main.js"></script>
+
   </head>
   <body>
     <div id="qunit"></div>
     <div id="qunit-fixture"></div>
 
-    <script>
-      window.ENV = {{ENV}};
-    </script>
     <script src="assets/qunit.js"></script>
     <script src="assets/application.js"></script>
     <script src="assets/tests.js"></script>
     <script>
+      window.ENV = <%%= Embork.env %>;
       require('<%= namespace %>/tests/test-helper');
       require('<%= namespace %>/tests/test-loader');
     </script>

data/blueprint/tests/tests.js

@@ -0,0 +1,5 @@
+//= require test-helper
+//= require test-loader
+//= require_tree ./helpers
+//= require_tree ./integration
+//= require_tree ./unit

data/embork.gemspec

@@ -6,7 +6,7 @@ require 'embork/version'
 Gem::Specification.new do |spec|
   spec.name          = 'embork'
   spec.version       = Embork::VERSION
-  spec.authors       = ['Matthew Smart']
+  spec.authors       = ['Mina Smart']
   spec.email         = ['mdsmart@gmail.com']
   spec.description   = %q{A tool set for building ember apps.}
   spec.summary       = %q{A tool set for building ember apps.}
@@ -22,12 +22,14 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'ember-source', '~> 1.5.1.1'
   spec.add_runtime_dependency 'handlebars-source', '~> 1.3.0'
   spec.add_runtime_dependency 'thor', '~> 0.19.1'
-  spec.add_runtime_dependency 'rack'
+  spec.add_runtime_dependency 'rack', '~> 1.5.2'
   spec.add_runtime_dependency 'coffee-script'
-  spec.add_runtime_dependency 'sass'
+  spec.add_runtime_dependency 'sass', '~> 3.2.0'
   spec.add_runtime_dependency 'execjs'
-  spec.add_runtime_dependency 'barber'
+  spec.add_runtime_dependency 'barber', '~> 0.4.2'
   spec.add_runtime_dependency 'colorize'
+  spec.add_runtime_dependency 'qunit-runner', '~> 0.0.1'
+  spec.add_runtime_dependency 'phrender', '~> 0.0.3'
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rspec', '~> 3.0.0.beta1'
@@ -37,5 +39,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'pry', '0.9.12.2'
   spec.add_development_dependency 'compass'
   spec.add_development_dependency 'bootstrap-sass'
+  spec.add_development_dependency 'closure-compiler'
 
 end

data/lib/embork.rb

@@ -10,14 +10,12 @@ require "embork/generator"
 require "embork/logger"
 require "embork/pushstate"
 require "embork/server"
+require "embork/phrender"
 require "embork/sprockets"
 
 class Embork
-  def self.env
-    @env
-  end
-
-  def self.env=(environment)
-    @env = environment
+  class << self
+    attr_accessor :env
+    attr_accessor :bundle_version
   end
 end

data/lib/embork/borkfile.rb

@@ -13,6 +13,16 @@ class Embork::Borkfile
     attr_reader :backend
     attr_reader :html
     attr_reader :frameworks
+    attr_reader :compressor
+    attr_reader :es6_transform
+    attr_reader :phrender_index_file
+    attr_reader :phrender_javascript_paths
+    attr_reader :phrender_raw_javascript
+
+    # request uri path to the index file.
+    def phrender_index_file(index_file_path = nil)
+      @phrender_index_file = index_file_path || @phrender_index_file
+    end
 
     def keep_old_versions(number_to_keep = nil)
       @keep_old_versions = number_to_keep || @keep_old_versions
@@ -27,9 +37,10 @@ class Embork::Borkfile
     include Attributes
 
     SUPPORTED_FRAMEWORKS = %w(bootstrap compass)
+    SUPPORTED_COMPRESSORS = %w(closure_compiler uglifier)
 
     def initialize(environment, logger)
-      Embork.env = @environment = environment
+      Embork.env = @environment = environment.to_sym
       @asset_paths = []
       @helpers = []
       @sprockets_postprocessors = []
@@ -42,11 +53,16 @@ class Embork::Borkfile
       @es6_namespace = nil
       @frameworks = []
       @logger = logger
+      @compressor = nil
+      @es6_transform = nil
+      @phrender_javascript_paths = []
+      @phrender_raw_javascript = []
+      @phrender_index_file = nil
     end
 
     def use_framework(framework)
       framework = framework.to_s
-      if SUPPORTED_FRAMEWORKS.include? framework.to_s
+      if SUPPORTED_FRAMEWORKS.include? framework
         @frameworks.push framework
       else
         @logger.critical 'Framework "%s" is not currently supported by embork.' % framework
@@ -83,6 +99,14 @@ class Embork::Borkfile
       @backend = app
     end
 
+    def phrender_add_javascript_file(path)
+      @phrender_javascript_paths.push path
+    end
+
+    def phrender_add_javascript(code)
+      @phrender_raw_javascript.push code
+    end
+
     def configure(environment, &block)
       if environment == @environment
         self.instance_exec &block
@@ -90,13 +114,33 @@ class Embork::Borkfile
     end
 
     def get_binding
-      return binding
+      binding
     end
 
     def compile_html(files)
       files = [ files ] unless files.kind_of? Array
       @html.concat files
     end
+
+    def compress_with(compressor)
+      if SUPPORTED_COMPRESSORS.include? compressor.to_s
+        @compressor = compressor
+      else
+        @logger.critical 'Compressor "%s" is not currently supported by embork.' % compressor.to_s
+        @logger.unknown ''
+        exit 1
+      end
+    end
+
+    def transform_es6_module_names(transform_proc)
+      if transform_proc.respond_to?(:call) || transform_proc.nil?
+        @es6_transform = transform_proc
+      else
+        @logger.critical 'ES6 Module transform must respond to #call'
+        exit 1
+      end
+    end
+
   end
 
   include Attributes
@@ -123,8 +167,9 @@ class Embork::Borkfile
   def set_options(file)
     # Setup paths
     default_paths = [
-      'app',
       'config/%s' % [ @environment.to_s ],
+      'app',
+      'app/styles',
       'components'
     ]
     @asset_paths = default_paths.concat file.asset_paths

data/lib/embork/cli.rb

@@ -0,0 +1,95 @@
+require 'embork'
+require 'qunit/runner'
+require 'thor'
+
+class Embork::CLI < Thor
+  class_option :borkfile, :type => :string, :default => "./Borkfile",
+    :desc => "Path to the embork config file."
+
+  desc "create PACKAGE_NAME", %{generate an Embork Ember application called "PACKAGE_NAME"}
+  option :use_ember_data, :type => :boolean, :default => false
+  option :directory, :type => :string, :default => nil
+  def create(package_name)
+    puts %{Creating embork app in "%s"} % package_name
+    Embork::Generator.new(package_name, options).generate
+  end
+
+  desc "server [ENVIRONMENT]", %{run the development or production server}
+  option :port, :type => :numeric, :default => 9292
+  option :host, :type => :string, :default => 'localhost'
+  option :bundle_version, :type => :string, :default => nil
+  option :with_latest_bundle, :type => :boolean, :default => false
+  option :enable_tests, :type => :boolean, :default => false
+  def server(environment = :development)
+    borkfile = Embork::Borkfile.new options[:borkfile], environment
+    Embork::Server.new(borkfile, options).run_webrick
+  end
+
+  desc "phrender [ENVIRONMENT]", %{run phrender the prerenderer}
+  option :port, :type => :numeric, :default => 9292
+  option :host, :type => :string, :default => 'localhost'
+  option :bundle_version, :type => :string, :default => nil
+  option :with_latest_bundle, :type => :boolean, :default => false
+  def phrender(environment = :development)
+    borkfile = Embork::Borkfile.new options[:borkfile], environment
+    Embork::Phrender.new(borkfile, options).run_webrick
+  end
+
+  desc "test [ENVIRONMENT]", %{run the qunit test suite}
+  def test(environment = :development)
+    borkfile = Embork::Borkfile.new options[:borkfile], environment
+    min = 52000
+    max = 65000
+    port = (Random.rand * (max - min) + min).to_i
+    host = 'localhost'
+
+    server_options = {
+      :host => host,
+      :port => port,
+      :enable_tests => true,
+      :disable_logging => true
+    }
+
+    server = Embork::Server.new(borkfile, server_options)
+
+    server_thread = Thread.new{ server.run_webrick }
+
+    test_url = "http://%s:%s/tests.html" % [ host, port ]
+    Qunit::Runner.new(test_url).run(options[:timeout])
+    server_thread.kill
+  end
+
+  desc "build [ENVIRONMENT]", %{build the project in the 'build' directory}
+  option :keep_all_old_versions, :type => :boolean, :default => false,
+    :desc => %{By default, older versions of the project are removed, only keeping the last few versions. This flag keeps all old versions.}
+  def build(environment = :production)
+    borkfile = Embork::Borkfile.new options[:borkfile], environment
+    builder = Embork::Builder.new(borkfile)
+    builder.build
+    builder.clean unless options[:keep_all_old_versions]
+  end
+
+  desc "clean", %{Remove all files under the build directory}
+  def clean
+    borkfile = Embork::Borkfile.new options[:borkfile]
+    FileUtils.rm_rf File.expand_path('build', borkfile.project_root)
+  end
+
+  desc "clean-cache", %{Blow away the sprockets cache}
+  def clean_cache
+    borkfile = Embork::Borkfile.new options[:borkfile]
+    FileUtils.rm_rf File.expand_path('.cache', borkfile.project_root)
+  end
+
+  desc "hint", %{run jshint on the app and tests}
+  option :only_app, :type => :boolean, :default => false
+  option :only_tests, :type => :boolean, :default => false
+  def hint
+    borkfile = Embork::Borkfile.new options[:borkfile]
+    Dir.chdir borkfile.project_root do
+      system('npm run hint-app') unless options[:only_tests]
+      system('npm run hint-testss') unless options[:only_app]
+    end
+  end
+
+end

data/lib/embork/environment.rb

@@ -1,5 +1,6 @@
 require 'embork/sprockets'
 require 'sprockets'
+require 'tilt'
 
 class Embork::Environment
   include Embork::Sprockets::Frameworks
@@ -42,12 +43,19 @@ class Embork::Environment
     setup_processors
     setup_engines
     setup_frameworks
+    setup_transforms
+    setup_compressor if @borkfile.compressor
+  end
+
+  def setup_transforms
+    Embork::Sprockets::ES6ModuleTranspiler.transform = @borkfile.es6_transform
   end
 
   def setup_sprockets_defaults
     @sprockets_environment.register_postprocessor 'application/javascript', Embork::Sprockets::ES6ModuleTranspiler
     @sprockets_environment.register_engine '.hbs', Embork::Sprockets::EmberHandlebarsCompiler
     @sprockets_environment.register_engine '.handlebars', Embork::Sprockets::EmberHandlebarsCompiler
+    ::Tilt::CoffeeScriptTemplate.default_bare = true
   end
 
   def setup_paths
@@ -87,4 +95,13 @@ class Embork::Environment
       self.send method, @sprockets_environment
     end
   end
+
+  def setup_compressor
+    if @borkfile.compressor == :closure_compiler
+      @sprockets_environment.register_bundle_processor 'application/javascript',
+        Embork::Sprockets::ClosureCompiler
+    elsif @borkfile.compressor == :uglifier
+      @sprockets_environment.js_compressor = :uglify
+    end
+  end
 end

data/lib/embork/forwarder.rb

@@ -15,9 +15,9 @@ class Embork::Forwarder
   def call(env)
     status, headers, body = @app.call(env)
     if status == 404
-      self.class.target.new(@app).call(env)
-    else
-      [ status, headers, body ]
+      status, headers, body = self.class.target.new(@app).call(env)
+      headers['Push-State-Redirect'] = 'true'
     end
+    [ status, headers, body ]
   end
 end

data/lib/embork/phrender.rb

@@ -0,0 +1,21 @@
+require 'phrender'
+require 'embork/server'
+
+class Embork::Phrender < Embork::Server
+
+  def build_app
+    cascade_apps = @cascade_apps
+    phrender = [Phrender::RackMiddleware, {
+      :javascript_files => @borkfile.phrender_javascript_paths,
+      :javascript => @borkfile.phrender_raw_javascript,
+      :index_file => @borkfile.phrender_index_file
+    }]
+    backend = @borkfile.backend
+    Rack::Builder.new do
+      use *phrender
+      use backend unless backend == :static_index
+      run Rack::Cascade.new(cascade_apps)
+    end
+  end
+
+end

data/lib/embork/pushstate.rb

@@ -7,10 +7,11 @@ class Embork::Pushstate
   def call(env)
     status, headers, body = @app.call(env)
     if status == 404
-      env['PATH_INFO'] = '/index.html'
-      @app.call(env)
-    else
-      [ status, headers, body ]
+      modified_env = env.dup
+      modified_env['PATH_INFO'] = '/index.html'
+      status, headers, body = @app.call(modified_env)
+      headers['Push-State-Redirect'] = 'true'
     end
+    [ status, headers, body ]
   end
 end

data/lib/embork/server.rb

@@ -11,19 +11,25 @@ class Embork::Server
   attr_reader :backend
   attr_reader :project_root
   attr_reader :sprockets_environment
+  attr_reader :port
+  attr_reader :host
+  attr_reader :disable_logging
   attr_reader :app
 
-
   def initialize(borkfile, options = {})
     @borkfile = borkfile
-    if options.has_key?(:bundle_version) && !options[:bundle_version].nil?
-      @bundle_version = options[:bundle_version]
+    if !options[:bundle_version].nil?
+      Embork.bundle_version = options[:bundle_version]
+      setup_bundled_mode
+    elsif options[:with_latest_bundle]
+      Embork.bundle_version = sorted_versions(@borkfile.project_root).first
       setup_bundled_mode
-    elsif options.has_key?(:with_latest_bundle) && !!options[:with_latest_bundle]
-      @asset_bundle_version = sorted_versions(@borkfile.project_root).first
+    elsif options[:enable_tests]
+      setup_test_mode
     else
       setup_dev_mode
     end
+    @disable_logging = options[:disable_logging]
     @port = options[:port]
     @host = options[:host]
   end
@@ -33,48 +39,53 @@ class Embork::Server
     @sprockets_environment = @environment.sprockets_environment
     @project_root = @borkfile.project_root
 
-    set_backend
-
-    container = self
-    static_directory = File.join(container.project_root, 'static')
+    static_directory = File.join(project_root, 'static')
 
-    @app = Rack::Builder.new do
-      use container.backend
-      use Rack::Static, :urls => [ '/images', '/fonts', ], :root => static_directory
-
-      map '/' do
-        run container.sprockets_environment
-      end
-    end
+    @cascade_apps = [
+      @sprockets_environment,
+      Rack::File.new(static_directory)
+    ]
+    @app = build_app
   end
 
   def setup_bundled_mode
     @project_root = File.join @borkfile.project_root, 'build', Embork.env.to_s
 
-    set_backend
-
     static_directory = @project_root
-    container = self
 
-    @app = Rack::Builder.new do
-      use container.backend
-      use Rack::Static, :urls => [ '/' ], :root => static_directory
-      # Should never reach here. It just need s an app to run
-      run lambda { |env| [ 200, { 'Content-Type'  => 'text/html', }, '' ] }
-    end
+    @cascade_apps = [ Rack::File.new(static_directory) ]
+    @app = build_app
+  end
+
+  def setup_test_mode
+    setup_dev_mode
+    @sprockets_environment.prepend_path 'tests'
   end
 
-  def set_backend
+  def build_app
     if @borkfile.backend == :static_index
-      @backend = Embork::Pushstate
+      backend = Embork::Pushstate
     else
       Embork::Forwarder.target = @borkfile.backend
-      @backend = Embork::Forwarder
+      backend = Embork::Forwarder
+    end
+    cascade_apps = @cascade_apps
+    Rack::Builder.new do
+      use backend
+      run Rack::Cascade.new(cascade_apps)
     end
   end
 
-  def run
-    Rack::Handler::WEBrick.run @app, :Port => @port, :Host => @host
+  def run_webrick
+    opts = {
+      :Port => @port,
+      :Host => @host
+    }
+    if @disable_logging
+      opts[:Logger] = WEBrick::Log.new("/dev/null")
+      opts[:AccessLog] = []
+    end
+    Rack::Handler::WEBrick.run @app, opts
   end
 
 end

data/lib/embork/sprockets.rb

@@ -3,4 +3,5 @@ end
 require 'embork/sprockets/helpers'
 require 'embork/sprockets/es6_module_transpiler'
 require 'embork/sprockets/ember_handlebars_compiler'
+require 'embork/sprockets/closure_compiler'
 require 'embork/sprockets/frameworks'

data/lib/embork/sprockets/closure_compiler.rb

@@ -0,0 +1,24 @@
+require 'tilt'
+require 'embork/logger'
+
+class Embork::Sprockets::ClosureCompiler < Tilt::Template
+  self.default_mime_type = 'application/javascript'
+
+  def prepare
+    @logger = Embork::Logger.new STDOUT, :simple
+  end
+
+  def self.compiler
+    require 'closure-compiler'
+    @compiler ||= Closure::Compiler.new(
+      :jar_file => File.expand_path('../support/closure_compiler.jar', __FILE__),
+      :compilation_level => 'SIMPLE'
+    )
+  end
+
+  def evaluate(scope, locals, &block)
+    @logger.info 'Compressing %s.js with the closure compiler' % scope.logical_path
+    self.class.compiler.compile data
+  end
+
+end

data/lib/embork/sprockets/es6_module_transpiler.rb

@@ -34,7 +34,7 @@ class Embork::Sprockets::ES6ModuleTranspiler < Tilt::Template
   self.namespace = nil
 
   def prepare
-    # Required to be implemented by Tilt for some reason...
+    @logger = Embork::Logger.new(STDOUT, :simple)
   end
 
   def evaluate(scope, locals, &block)
@@ -46,7 +46,13 @@ class Embork::Sprockets::ES6ModuleTranspiler < Tilt::Template
     if manifest? || component? || template?
       data
     else
-      wrap_in_closure(self.class.runtime.exec module_generator)
+      begin
+        compiled_module = wrap_in_closure(self.class.runtime.exec module_generator)
+        compiled_module.gsub! %("use strict";), '' if fixture?
+        compiled_module
+      rescue
+        @logger.fatal 'ES6 Module error in file %s' % @logical_path
+      end
     end
   end
 
@@ -72,6 +78,10 @@ class Embork::Sprockets::ES6ModuleTranspiler < Tilt::Template
     !!@logical_path.match(/^templates/)
   end
 
+  def fixture?
+    !!@logical_path.match(/^fixtures/)
+  end
+
   def wrap_in_closure(compiled_code)
     if self.class.compile_to == :cjs
       <<-CJS.strip_heredoc % [ module_name, compiled_code ]

data/lib/embork/sprockets/frameworks.rb

@@ -3,8 +3,9 @@ module Embork::Sprockets::Frameworks
     begin
       require 'compass'
       sprockets_environment.append_path Compass::Frameworks['compass'].stylesheets_directory
+      Compass.configuration.images_path = File.join sprockets_environment.root, 'static', 'images'
     rescue LoadError => e
-      (@logger ||= Embork::Logger.new(STDOUT)).error 'Compass gem is not installed.'
+      (@logger ||= Embork::Logger.new(STDOUT, :simple)).error 'Compass gem is not installed.'
       @logger.info %{Add `gem 'compass'` to your Gemfile and run `bundle` to install it.}
       exit 1
     end

data/lib/embork/sprockets/helpers.rb

@@ -5,7 +5,8 @@ module Embork::Sprockets::Helpers
   end
 
   def javascript_include_tag(path)
-    script = self.class.use_bundled_assets ? generate_versioned_name(path) : path
+    path = self.class.use_bundled_assets ? generate_versioned_name(path) : path
+    script = asset_path(path, :type => :javascript)
     %{<script src="%s"></script>} % [ script ]
   end
 
@@ -15,7 +16,8 @@ module Embork::Sprockets::Helpers
   def stylesheet_link_tag(path, options = {})
     options = { :media => :all }.merge options
 
-    stylesheet = self.class.use_bundled_assets ? generate_versioned_name(path) : path
+    path = self.class.use_bundled_assets ? generate_versioned_name(path) : path
+    stylesheet = asset_path(path, :type => :stylesheet)
 
     %{<link href="%s" rel="stylesheet" type="text/css" media="%s"></link>} % [
       stylesheet,
@@ -30,6 +32,27 @@ module Embork::Sprockets::Helpers
     Embork::Sprockets::ES6ModuleTranspiler.namespace
   end
 
+  def asset_path(path, options = {})
+    base_path = '/'
+    if !options.has_key? :type
+      File.join base_path, path
+    else
+      type = options[:type]
+      case type
+      when :image
+        File.join base_path, 'images', path
+      when :font
+        File.join base_path, 'fonts', path
+      when :javascript
+        File.join base_path, path
+      when :stylesheet
+        File.join base_path, path
+      else
+        File.join base_path, type.to_s, path
+      end
+    end
+  end
+
   protected
 
   def generate_versioned_name(path_to_file)
@@ -41,5 +64,6 @@ module Embork::Sprockets::Helpers
     versioned_name = "%s-%s%s" % [ base, self.class.bundled_version, ext ]
     (path.nil?) ? versioned_name : File.join(path, versioned_name)
   end
+
 end
 

data/lib/embork/version.rb

@@ -1,3 +1,3 @@
 class Embork
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/embork/borkfile/Borkfile.full

@@ -21,9 +21,17 @@ compile_html [ 'index.html' ]
 
 use_framework :bootstrap
 
+phrender_index_file 'phrender.html'
+phrender_add_javascript_file'application.js'
+phrender_add_javascript_file :ember_driver
+phrender_add_javascript "require('index');"
+
+transform_es6_module_names proc{ |name| name + 'krump' }
+
 configure :development do
   append_asset_path 'foo/dev/js'
   compile_html 'dev.html'
+  compress_with :closure_compiler
 end
 
 configure :production do

data/spec/embork/borkfile_spec.rb

@@ -42,6 +42,20 @@ describe 'Embork::Borkfile' do
     it 'has no es6 module namespace defined' do
       expect(borkfile.es6_namespace).to eq(nil)
     end
+
+    it 'has no default compressor' do
+      expect(borkfile.compressor).to eq(nil)
+    end
+
+    it 'has no default es6 transform' do
+      expect(borkfile.es6_transform).to eq(nil)
+    end
+
+    it 'has no default phrender configuration' do
+      expect(borkfile.phrender_index_file).to eq(nil)
+      expect(borkfile.phrender_javascript_paths).to be_empty
+      expect(borkfile.phrender_raw_javascript).to be_empty
+    end
   end
 
   describe 'basic config' do
@@ -99,6 +113,23 @@ describe 'Embork::Borkfile' do
       expect(borkfile.frameworks).to include 'bootstrap'
       expect(borkfile.frameworks).not_to include 'compass'
     end
+
+    it 'configures the closure_compiler as the compressor' do
+      expect(borkfile.compressor).to eq(:closure_compiler)
+    end
+
+    it 'includes the specified es6 transform' do
+      expect(borkfile.es6_transform.respond_to? :call).to eq(true)
+    end
+
+    it 'respects the phrender configuration ' do
+      expect(borkfile.phrender_index_file).to eq('phrender.html')
+      expect(borkfile.phrender_javascript_paths).to match_array [
+        'application.js',
+        :ember_driver
+      ]
+      expect(borkfile.phrender_raw_javascript).to include("require('index');")
+    end
   end
 
   describe 'relative root' do

data/spec/embork/environment_spec.rb

@@ -25,7 +25,9 @@ describe 'Embork::Environment' do
       { :extension => '.bork', :klass => my_engine }
     ],
     :es6_namespace => 'my-package',
-    :frameworks => [ 'bootstrap', 'compass' ]
+    :frameworks => [ 'bootstrap', 'compass' ],
+    :compressor => :closure_compiler,
+    :es6_transform => proc{ |name| name + 'foo' }
   })}
 
   let (:environment) { Embork::Environment.new borkfile }
@@ -75,4 +77,12 @@ describe 'Embork::Environment' do
     expect(environment.sprockets_environment.paths.to_s).to match /\/bootstrap-sass-.*?\/vendor\/assets\/stylesheets/
   end
 
+  it 'adds the Embork::Sprockets::ClosureCompiler as a bundle processor' do
+    expect(environment.sprockets_environment.bundle_processors('application/javascript')).to include(Embork::Sprockets::ClosureCompiler)
+  end
+
+  it 'sets up an es6 transform' do
+    expect(Embork::Sprockets::ES6ModuleTranspiler.transform.respond_to? :call).to eq(true)
+  end
+
 end

data/spec/embork/generator_spec.rb

@@ -15,7 +15,12 @@ describe 'Embork::Generator' do
 
   it 'loads the list of files to be processed by ERB' do
     expect(generator.erb_files).to match_array([
-      "Borkfile", "app/app.js", "app/index.html.erb", "bower.json", "package.json"
+      "Borkfile",
+      "app/app.js",
+      "app/index.html.erb",
+      "bower.json",
+      "package.json",
+      "tests/tests.html.erb"
     ])
   end
 

data/spec/embork/server/example_app/tests/index.html.erb

@@ -0,0 +1 @@
+test-index

data/spec/embork/server_spec.rb

@@ -149,4 +149,15 @@ describe 'Embork::Server' do
     end
 
   end
+
+  context 'test mode' do
+    let(:server) { Embork::Server.new borkfile, :enable_tests => true }
+    let(:app) { server.app }
+
+    it 'serves out the test index' do
+      get '/'
+      expect(last_response).to be_ok
+      expect(last_response.body.strip).to eq(%{test-index})
+    end
+  end
 end

data/spec/embork/sprockets/helper_spec.rb

@@ -0,0 +1,77 @@
+require 'spec_helper'
+
+require 'embork/sprockets/helpers'
+
+describe 'Embork::Sprockets::helpers' do
+  let(:context_class) do
+    class Context
+      include Embork::Sprockets::Helpers
+      extend Embork::Sprockets::Helpers::ClassMethods
+    end
+    Context.new
+  end
+
+  context '#javascript_include_tag' do
+    it 'builds a root directory script tag' do
+      expect(context_class.javascript_include_tag('application.js')).to eq(
+        %{<script src="/application.js"></script>})
+    end
+  end
+
+  context '#stylesheet_link_tag' do
+    it 'builds a root directory link tag' do
+      expect(context_class.stylesheet_link_tag('application.css')).to eq(
+        %{<link href="/application.css" rel="stylesheet" type="text/css" media="all"></link>})
+    end
+  end
+
+  context '#asset_path' do
+    it 'pluralizes images' do
+      expect(context_class.asset_path('image.png', :type => :image)).to eq(
+        %{/images/image.png})
+    end
+
+    it 'pluralizes fonts' do
+      expect(context_class.asset_path('font.eot', :type => :font)).to eq(
+        %{/fonts/font.eot})
+    end
+
+    it 'doesn\t sub-directory javascripts' do
+      expect(context_class.asset_path('file.js', :type => :javascript)).to eq(
+        %{/file.js})
+    end
+
+    it 'doesn\t sub-directory stylesheets' do
+      expect(context_class.asset_path('file.css', :type => :stylesheet)).to eq(
+        %{/file.css})
+    end
+
+    it 'passes arbitrary types to named subdirectories' do
+      expect(context_class.asset_path('file.mp3', :type => :audio)).to eq(
+        %{/audio/file.mp3})
+      expect(context_class.asset_path('file.avi', :type => :video)).to eq(
+        %{/video/file.avi})
+    end
+  end
+
+  context 'versioned assets' do
+    before(:each) do
+      context_class.class.use_bundled_assets = true
+      context_class.class.bundled_version = '12345abcd'
+    end
+
+    context '#javascript_include_tag' do
+      it 'builds a versioned script tag' do
+        expect(context_class.javascript_include_tag('application.js')).to eq(
+          %{<script src="/application-12345abcd.js"></script>})
+      end
+    end
+
+    context '#stylesheet_link_tag' do
+      it 'builds a versioned link tag' do
+        expect(context_class.stylesheet_link_tag('application.css')).to eq(
+          %{<link href="/application-12345abcd.css" rel="stylesheet" type="text/css" media="all"></link>})
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embork
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
-- Matthew Smart
+- Mina Smart
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-05 00:00:00.000000000 Z
+date: 2014-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets
@@ -70,16 +70,16 @@ dependencies:
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.2
 - !ruby/object:Gem::Dependency
   name: coffee-script
   requirement: !ruby/object:Gem::Requirement
@@ -98,16 +98,16 @@ dependencies:
   name: sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: execjs
   requirement: !ruby/object:Gem::Requirement
@@ -126,16 +126,16 @@ dependencies:
   name: barber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.2
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +150,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: qunit-runner
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.1
+- !ruby/object:Gem::Dependency
+  name: phrender
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -262,6 +290,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: closure-compiler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A tool set for building ember apps.
 email:
 - mdsmart@gmail.com
@@ -311,28 +353,34 @@ files:
 - blueprint/package.json
 - blueprint/static/.gitkeep
 - blueprint/tests/.jshintrc
+- blueprint/tests/fixtures.js
 - blueprint/tests/helpers/resolver.js
 - blueprint/tests/helpers/start-app.js
-- blueprint/tests/index.html
 - blueprint/tests/test-helper.js
 - blueprint/tests/test-loader.js
+- blueprint/tests/tests.html.erb
+- blueprint/tests/tests.js
 - blueprint/tests/unit/.gitkeep
 - embork.gemspec
 - lib/embork.rb
 - lib/embork/borkfile.rb
 - lib/embork/build_versions.rb
 - lib/embork/builder.rb
+- lib/embork/cli.rb
 - lib/embork/environment.rb
 - lib/embork/forwarder.rb
 - lib/embork/generator.rb
 - lib/embork/logger.rb
+- lib/embork/phrender.rb
 - lib/embork/pushstate.rb
 - lib/embork/server.rb
 - lib/embork/sprockets.rb
+- lib/embork/sprockets/closure_compiler.rb
 - lib/embork/sprockets/ember_handlebars_compiler.rb
 - lib/embork/sprockets/es6_module_transpiler.rb
 - lib/embork/sprockets/frameworks.rb
 - lib/embork/sprockets/helpers.rb
+- lib/embork/sprockets/support/closure_compiler.jar
 - lib/embork/sprockets/support/es6-module-transpiler.js
 - lib/embork/sprockets/support/node_runner.js
 - lib/embork/version.rb
@@ -365,6 +413,7 @@ files:
 - spec/embork/server/example_app/static/fonts/.gitkeep
 - spec/embork/server/example_app/static/images/.gitkeep
 - spec/embork/server/example_app/static/images/image.png
+- spec/embork/server/example_app/tests/index.html.erb
 - spec/embork/server/specimen.css
 - spec/embork/server/specimen.js
 - spec/embork/server_spec.rb
@@ -388,6 +437,7 @@ files:
 - spec/embork/sprockets/es6_module_transpiler/namespaced.js
 - spec/embork/sprockets/es6_module_transpiler/transformed.js
 - spec/embork/sprockets/es6_module_transpiler_spec.rb
+- spec/embork/sprockets/helper_spec.rb
 - spec/spec_helper.rb
 homepage: ''
 licenses:
@@ -442,6 +492,7 @@ test_files:
 - spec/embork/server/example_app/static/fonts/.gitkeep
 - spec/embork/server/example_app/static/images/.gitkeep
 - spec/embork/server/example_app/static/images/image.png
+- spec/embork/server/example_app/tests/index.html.erb
 - spec/embork/server/specimen.css
 - spec/embork/server/specimen.js
 - spec/embork/server_spec.rb
@@ -465,4 +516,5 @@ test_files:
 - spec/embork/sprockets/es6_module_transpiler/namespaced.js
 - spec/embork/sprockets/es6_module_transpiler/transformed.js
 - spec/embork/sprockets/es6_module_transpiler_spec.rb
+- spec/embork/sprockets/helper_spec.rb
 - spec/spec_helper.rb