ember-cli-rails 0.5.8 → 0.6.0

data/lib/ember_cli/configuration.rb

@@ -5,16 +5,7 @@ module EmberCli
     include Singleton
 
     def app(name, **options)
-      if options.has_key? :build_timeout
-        deprecate_timeout
-      end
-
-      if options.has_key? :enable
-        deprecate_enable
-      end
-
       app = App.new(name, options)
-      app.sprockets.register!
       apps.store(name, app)
     end
 
@@ -30,38 +21,14 @@ module EmberCli
       @npm_path ||= Helpers.which("npm")
     end
 
-    def bundler_path
-      @bundler_path ||= Helpers.which("bundler")
+    def tee_path
+      @tee_path ||= Helpers.which("tee")
     end
 
-    def build_timeout=(*)
-      deprecate_timeout
+    def bundler_path
+      @bundler_path ||= Helpers.which("bundler")
     end
 
     attr_accessor :watcher
-
-    private
-
-    def deprecate_enable
-      warn <<-WARN.strip_heredoc
-
-      The `enable` lambda configuration has been removed.
-
-      Please read https://github.com/thoughtbot/ember-cli-rails/pull/261 for
-      details.
-
-      WARN
-    end
-
-    def deprecate_timeout
-      warn <<-WARN.strip_heredoc
-
-      The `build_timeout` configuration has been removed.
-
-      Please read https://github.com/thoughtbot/ember-cli-rails/pull/259 for
-      details.
-
-      WARN
-    end
   end
 end

data/lib/ember_cli/directory_asset_map.rb

@@ -0,0 +1,30 @@
+module EmberCli
+  class DirectoryAssetMap
+    def initialize(directory)
+      @directory = Pathname(directory)
+    end
+
+    def to_h
+      {
+        "assets" => files_with_data,
+        "prepend" => "assets/",
+      }
+    end
+
+    def files_with_data
+      files.reduce({}) do |manifest, file|
+        name = File.basename(file.path)
+
+        manifest[name] = name
+
+        manifest
+      end
+    end
+
+    private
+
+    def files
+      @directory.children.map { |path| File.new(path) }
+    end
+  end
+end

data/lib/ember_cli/engine.rb

@@ -5,20 +5,8 @@ module EmberCli
       require "ember_cli/route_helpers"
     end
 
-    initializer "ember-cli-rails.enable" do
-      EmberCli.enable! unless EmberCli.skip?
-    end
-
     config.to_prepare do
       ActionController::Base.helper EmberRailsHelper
     end
-
-    config.after_initialize do
-      if defined?(ApplicationController)
-        require "ember_cli/controller_extension"
-
-        ApplicationController.include(EmberCli::ControllerExtension)
-      end
-    end
   end
 end

data/lib/ember_cli/{constraint.rb → html_constraint.rb}

@@ -1,5 +1,5 @@
 module EmberCli
-  class Constraint
+  class HtmlConstraint
     def matches?(request)
       matches = request.format.to_s =~ /html/ || -1
 

data/lib/ember_cli/path_set.rb

@@ -18,28 +18,28 @@ module EmberCli
       end
     end
 
+    def index_file
+      dist.join("index.html")
+    end
+
     def tmp
       @tmp ||= root.join("tmp").tap(&:mkpath)
     end
 
     def log
-      @log ||= rails_root.join("log", "ember-#{app_name}.#{environment}.log")
+      @log ||= logs.join("ember-#{app_name}.#{environment}.log")
     end
 
     def dist
       @dist ||= ember_cli_root.join("apps", app_name).tap(&:mkpath)
     end
 
-    def assets
-      @assets ||= ember_cli_root.join("assets").tap(&:mkpath)
-    end
-
-    def app_assets
-      @app_assets ||= assets.join(app_name)
+    def asset_map
+      @asset_map ||= Pathname.glob(assets.join("assetMap*.json")).first
     end
 
-    def applications
-      @applications ||= rails_root.join("public", "_apps").tap(&:mkpath)
+    def assets
+      @assets ||= dist.join("assets").tap(&:mkpath)
     end
 
     def gemfile
@@ -97,6 +97,10 @@ module EmberCli
       @npm ||= app_options.fetch(:npm_path) { configuration.npm_path }
     end
 
+    def tee
+      @tee ||= app_options.fetch(:tee_path) { configuration.tee_path }
+    end
+
     def bundler
       @bundler ||= app_options.fetch(:bundler_path) do
         configuration.bundler_path
@@ -109,6 +113,10 @@ module EmberCli
 
     delegate :name, :options, to: :app, prefix: true
 
+    def logs
+      rails_root.join("log").tap(&:mkpath)
+    end
+
     def default_root
       rails_root.join(app_name)
     end

data/lib/ember_cli/route_helpers.rb

@@ -1,4 +1,4 @@
-require "ember_cli/constraint"
+require "ember_cli/html_constraint"
 
 module ActionDispatch
   module Routing
@@ -14,10 +14,14 @@ module ActionDispatch
           format: :html,
         )
 
+        dist_directory = EmberCli[app_name].paths.dist
+
         Rails.application.routes.draw do
-          scope constraints: EmberCli::Constraint.new do
+          scope constraints: EmberCli::HtmlConstraint.new do
             get("#{to}(*rest)", routing_options)
           end
+
+          mount Rack::File.new(dist_directory.to_s) => to
         end
       end
     end

data/lib/ember_cli/shell.rb

@@ -51,8 +51,12 @@ module EmberCli
     attr_reader :ember, :env, :options, :paths
 
     def spawn(command)
-      Kernel.spawn(env, command, chdir: paths.root.to_s, out: paths.log.to_s) ||
-        exit(1)
+      Kernel.spawn(
+        env,
+        command,
+        chdir: paths.root.to_s,
+        err: paths.build_error_file.to_s,
+      ) || exit(1)
     end
 
     def exec(command)

data/lib/ember_cli/version.rb

@@ -1,3 +1,3 @@
 module EmberCli
-  VERSION = "0.5.8".freeze
+  VERSION = "0.6.0".freeze
 end

data/lib/generators/{ember-cli → ember}/heroku/USAGE

@@ -10,7 +10,7 @@ Description:
         $ heroku config:unset SKIP_EMBER
 
 Example:
-    rails generate ember-cli:heroku
+    rails generate ember:heroku
 
     This will install the following gems:
         rails_12factor

data/lib/generators/{ember-cli → ember}/heroku/heroku_generator.rb

@@ -2,7 +2,7 @@ module EmberCli
   class HerokuGenerator < Rails::Generators::Base
     source_root File.expand_path("../templates", __FILE__)
 
-    namespace "ember-cli:heroku"
+    namespace "ember:heroku"
 
     def copy_package_json_file
       template "package.json.erb", "package.json"
@@ -13,16 +13,6 @@ module EmberCli
       run "chmod a+x bin/heroku_install"
     end
 
-    def config_js_compressor
-      production_config = "config/environments/production.rb"
-
-      inject_into_file production_config, before: "end\n" do
-        <<-RUBY
-  config.assets.js_compressor = nil
-        RUBY
-      end
-    end
-
     def inject_12factor_gem
       gem "rails_12factor", group: [:staging, :production]
     end

data/lib/generators/ember/init/USAGE

@@ -0,0 +1,8 @@
+Description:
+  Generates `ember.rb` initializer.
+
+Example:
+    rails generate ember:init
+
+    This will create:
+        config/initializers/ember.rb

data/lib/generators/{ember-cli → ember}/init/init_generator.rb

@@ -2,7 +2,7 @@ module EmberCli
   class InitGenerator < Rails::Generators::Base
     source_root File.expand_path("../templates", __FILE__)
 
-    namespace "ember-cli:init"
+    namespace "ember:init"
 
     def copy_initializer_file
       copy_file "initializer.rb", "config/initializers/ember.rb"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ember-cli-rails
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.6.0
 platform: ruby
 authors:
 - Pavel Pravosud
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-07 00:00:00.000000000 Z
+date: 2015-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -32,48 +32,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '5'
-- !ruby/object:Gem::Dependency
-  name: non-stupid-digest-assets
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: sprockets
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: cocaine
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.5.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.5.8
 description: 
 email:
 - pavel@pravosud.com
@@ -91,31 +63,30 @@ files:
 - app/views/ember_cli/ember/index.html.erb
 - lib/ember-cli-rails.rb
 - lib/ember_cli/app.rb
+- lib/ember_cli/asset_map.rb
 - lib/ember_cli/assets.rb
 - lib/ember_cli/build_monitor.rb
 - lib/ember_cli/capture.rb
 - lib/ember_cli/command.rb
 - lib/ember_cli/configuration.rb
-- lib/ember_cli/constraint.rb
-- lib/ember_cli/controller_extension.rb
+- lib/ember_cli/directory_asset_map.rb
 - lib/ember_cli/engine.rb
 - lib/ember_cli/errors.rb
 - lib/ember_cli/helpers.rb
+- lib/ember_cli/html_constraint.rb
 - lib/ember_cli/html_page.rb
-- lib/ember_cli/missing_manifest.rb
 - lib/ember_cli/path_set.rb
 - lib/ember_cli/route_helpers.rb
 - lib/ember_cli/runner.rb
 - lib/ember_cli/shell.rb
-- lib/ember_cli/sprockets.rb
 - lib/ember_cli/version.rb
-- lib/generators/ember-cli/heroku/USAGE
-- lib/generators/ember-cli/heroku/heroku_generator.rb
-- lib/generators/ember-cli/heroku/templates/bin_heroku_install.erb
-- lib/generators/ember-cli/heroku/templates/package.json.erb
-- lib/generators/ember-cli/init/USAGE
-- lib/generators/ember-cli/init/init_generator.rb
-- lib/generators/ember-cli/init/templates/initializer.rb
+- lib/generators/ember/heroku/USAGE
+- lib/generators/ember/heroku/heroku_generator.rb
+- lib/generators/ember/heroku/templates/bin_heroku_install.erb
+- lib/generators/ember/heroku/templates/package.json.erb
+- lib/generators/ember/init/USAGE
+- lib/generators/ember/init/init_generator.rb
+- lib/generators/ember/init/templates/initializer.rb
 - lib/tasks/ember-cli.rake
 homepage: https://github.com/thoughtbot/ember-cli-rails
 licenses:

data/lib/ember_cli/controller_extension.rb

@@ -1,19 +0,0 @@
-module EmberCli
-  module ControllerExtension
-    def self.included(base)
-      build_ember_app = lambda do
-        app = params[:ember_app]
-
-        if app.present?
-          EmberCli[app].build
-        end
-      end
-
-      if base.respond_to?(:before_action)
-        base.before_action(&build_ember_app)
-      else
-        base.before_filter(&build_ember_app)
-      end
-    end
-  end
-end

data/lib/ember_cli/missing_manifest.rb

@@ -1,11 +0,0 @@
-module EmberCli
-  class MissingManifest
-    def files
-      {}
-    end
-
-    def assets
-      {}
-    end
-  end
-end

data/lib/ember_cli/sprockets.rb

@@ -1,82 +0,0 @@
-require "sprockets"
-require "ember_cli/errors"
-require "non-stupid-digest-assets"
-require "ember_cli/html_page"
-require "ember_cli/missing_manifest"
-require "ember_cli/assets"
-
-module EmberCli
-  class Sprockets
-    class AssetPipelineError < BuildError; end
-
-    def initialize(app)
-      @app = app
-    end
-
-    def register!
-      register_or_raise!(Rails.configuration.assets.precompile)
-      register_or_raise!(NonStupidDigestAssets.whitelist)
-    end
-
-    def index_html(head:, body:)
-      html_page = HtmlPage.new(
-        content: app.index_file.read,
-        head: head,
-        body: body,
-      )
-
-      html_page.render
-    end
-
-    def javascript_assets
-      assets.javascripts
-    end
-
-    def stylesheet_assets
-      assets.stylesheets
-    end
-
-    private
-
-    attr_reader :app
-
-    def assets
-      Assets.new(
-        app_name: app.name,
-        ember_app_name: ember_app_name,
-        manifest: rails_manifest,
-      )
-    end
-
-    def ember_app_name
-      @ember_app_name ||= app.options.fetch(:name) { package_json.fetch(:name) }
-    end
-
-    def package_json
-      @package_json ||=
-        JSON.parse(app.paths.package_json_file.read).with_indifferent_access
-    end
-
-    def rails_manifest
-      if Rails.application.respond_to?(:assets_manifest)
-        Rails.application.assets_manifest
-      else
-        MissingManifest.new
-      end
-    end
-
-    def asset_matcher
-      %r{\A#{app.name}/}
-    end
-
-    def register_or_raise!(precompiled_assets)
-      if precompiled_assets.include?(asset_matcher)
-        raise AssetPipelineError.new <<-MSG.strip_heredoc
-          EmberCLI application #{app.name.inspect} already registered!
-        MSG
-      else
-        precompiled_assets << asset_matcher
-      end
-    end
-  end
-end