ember-cli-rails 0.1.13 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be18e685e2f0fd4283834765c0cd56694908f3d5
-  data.tar.gz: 2a41cce40c3702d9bf1211abe9297e449db9625a
+  metadata.gz: e50b3fd7677a1c72893cb980a3b8dc9615cd6d11
+  data.tar.gz: 6c609d1c47ba13914e261f309538c59d20f5a223
 SHA512:
-  metadata.gz: 30dfb8b4c37b172c65476c7a67fc08f648c4f85124f072f810897b80135158248ba945c37ade3a706154aee7220e71abb370c682415932bdebf9b71056bd3332
-  data.tar.gz: 09b6593d5205cb5590cb23e9eeecac57d40916f7578e900fefd9dfca67b51959f5923d121351315d6dd10c7b9604ea8fea6d23954e7be95a0db7849b4c63c0a6
+  metadata.gz: d67e13a57cfb31bd7c142507cb675c3486f4fe9d7c14b44e1e394338125a23a3b01e114f911188c0977ef7ff4e14368ef4cc190c1b9e3030351e7c99ccfff58e
+  data.tar.gz: f74adc89fa5e52c9a078845ce7e2ed37d35181170bbb07935a4339b85808878b0e5af914ac5456c54eeb355f2f14c5390e95e345dc632b3a54c0ac203cb5d66c

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+0.2.0
+-----
+
+* Rename rake namespace from ember-cli to ember [commit](https://github.com/rwz/ember-cli-rails/commit/3f5463835f05d21a34b5f8a9dfeb482b0501d8d4)
+* Allow helpers to take optons for ember assets [commit](https://github.com/rwz/ember-cli-rails/commit/335d117a5bf4d3520730c9c421a25aee5274c2b3)
+* Make EmberCLI.skip? predicate return boolean [commit](https://github.com/rwz/ember-cli-rails/commit/6f7cd58010aaf584e0810c44568008654bd1a764)
+* Introduce EmberCLI.env and ember\_cli\_rails\_mode config option [commit](https://github.com/rwz/ember-cli-rails/commit/4ff9ea1a1a152bee9f909e4379f6f469650891b5)
+* Rename EmberCLI.get\_app to .app and add .[] alias [commit](https://github.com/rwz/ember-cli-rails/commit/71b4c5cc97d9a410e2ef7acc536994e5d71175c6)
+
 0.1.13
 ------
 

data/README.md

@@ -1,7 +1,7 @@
 # EmberCLI Rails
 
 EmberCLI Rails is an integration story between (surprise suprise) EmberCLI and
-Rails. It is designed to provide an easy way to organize your Rails backed
+Rails 3.1 and up. It is designed to provide an easy way to organize your Rails backed
 EmberCLI application with a specific focus on upgradeability. Rails and Ember
 [slash EmberCLI] are maintained by different teams with different goals. As
 such, we believe that it is important to ensure smooth upgrading of both
@@ -197,8 +197,7 @@ directories %w[app config lib spec your-appname/app]
 
 ## Heroku
 
-In order to deploy EmberCLI Rails app to Heroku you need to follow the steps
-below:
+In order to deploy EmberCLI Rails app to Heroku:
 
 First, enable Heroku Multi Buildpack by running the following command:
 
@@ -206,7 +205,7 @@ First, enable Heroku Multi Buildpack by running the following command:
 heroku config:add BUILDPACK_URL=https://github.com/heroku/heroku-buildpack-multi
 ```
 
-Next, check in `.buildpacks` file to specify which buildpacks to use:
+Next, specify which buildpacks to use by creating a `.buildpacks` file in the project root containing:
 
 ```
 https://github.com/heroku/heroku-buildpack-nodejs
@@ -220,16 +219,10 @@ install`:
 gem "rails_12factor", group: :production
 ```
 
-Add a `package.json` to the root of your Rails project. This is to make sure
-it'll be detected by the NodeJS buildpack.
+Add a `package.json` file containing `{}` to the root of your Rails project.
+This is to make sure it'll be detected by the NodeJS buildpack.
 
-```javascript
-{
-  "dependencies": {
-    "bower": "*"
-  }
-}
-```
+Make sure you have `bower` as a npm dependency of your ember-cli app.
 
 Add a `postinstall` task to your EmberCLI app's `package.json`. This will
 ensure that during the deployment process, Heroku will install all dependencies
@@ -240,12 +233,14 @@ found in both `node_modules` and `bower_components`.
   # ...
   "scripts": {
     # ...
-    "postinstall": "../../node_modules/bower/bin/bower install"
+    "postinstall": "node_modules/bower/bin/bower install"¬
   }
 }
 ```
 
-Now you should be ready to deploy.
+ember-cli-rails adds your ember apps' build process to the rails asset compilation process.
+
+Now you should be ready to deploy. 
 
 ## Additional Information
 

data/app/controllers/ember_tests_controller.rb

@@ -18,7 +18,7 @@ class EmberTestsController < ActionController::Base
   end
 
   def app
-    EmberCLI.get_app(app_name)
+    EmberCLI[app_name]
   end
 
   def app_name

data/app/helpers/ember_cli_rails_helper.rb

@@ -0,0 +1,9 @@
+module EmberCLIRailsHelper
+  def include_ember_script_tags(name, options={})
+    javascript_include_tag *EmberCLI[name].exposed_js_assets, options
+  end
+
+  def include_ember_stylesheet_tags(name, options={})
+    stylesheet_link_tag *EmberCLI[name].exposed_css_assets, options
+  end
+end

data/lib/ember-cli-rails.rb

@@ -5,9 +5,9 @@ module EmberCLI
 
   autoload :App,           "ember-cli/app"
   autoload :Configuration, "ember-cli/configuration"
-  autoload :ViewHelpers,   "ember-cli/view_helpers"
   autoload :Helpers,       "ember-cli/helpers"
   autoload :Middleware,    "ember-cli/middleware"
+  autoload :PathSet,       "ember-cli/path_set"
 
   def configure
     yield configuration
@@ -17,12 +17,16 @@ module EmberCLI
     Configuration.instance
   end
 
-  def get_app(name)
-    configuration.apps[name]
+  def app(name)
+    apps.fetch(name) do
+      fail KeyError, "#{name.inspect} app is not defined"
+    end
   end
 
+  alias_method :[], :app
+
   def skip?
-    ENV["SKIP_EMBER"]
+    ENV["SKIP_EMBER"].present?
   end
 
   def prepare!
@@ -35,10 +39,7 @@ module EmberCLI
 
   def enable!
     prepare!
-
-    if Helpers.use_middleware?
-      Rails.configuration.middleware.use Middleware
-    end
+    append_middleware unless env.production?
   end
 
   def install_dependencies!
@@ -73,6 +74,12 @@ module EmberCLI
     @root ||= Rails.root.join("tmp", "ember-cli-#{uid}")
   end
 
+  def env
+    @env ||= Helpers.current_environment.inquiry
+  end
+
+  delegate :apps, to: :configuration
+
   private
 
   def uid
@@ -84,6 +91,10 @@ module EmberCLI
   end
 
   def each_app
-    configuration.apps.each{ |name, app| yield app }
+    apps.each{ |name, app| yield app }
+  end
+
+  def append_middleware
+    Rails.configuration.middleware.use Middleware
   end
 end

data/lib/ember-cli/app.rb

@@ -7,14 +7,13 @@ module EmberCLI
 
     class BuildError < StandardError; end
 
-    attr_reader :name, :options, :pid
+    attr_reader :name, :options, :paths, :pid
+
+    delegate :root, to: :paths
 
     def initialize(name, options={})
       @name, @options = name.to_s, options
-    end
-
-    def tests_path
-      dist_path.join("tests")
+      @paths = PathSet.new(self)
     end
 
     def compile
@@ -37,8 +36,7 @@ module EmberCLI
 
     def run_tests
       prepare
-      tests_pass = exec("#{ember_path} test")
-      exit 1 unless tests_pass
+      exit 1 unless exec("#{ember_path} test")
     end
 
     def stop
@@ -84,45 +82,34 @@ module EmberCLI
       MSG
     end
 
-    def ember_path
-      @ember_path ||= app_path.join("node_modules", ".bin", "ember").tap do |path|
-        fail <<-MSG.strip_heredoc unless path.executable?
-          No local ember executable found. You should run `npm install`
-          inside the #{name} app located at #{app_path}
-        MSG
+    def method_missing(method_name, *)
+      if path_method = supported_path_method(method_name)
+        paths.public_send(path_method)
+      else
+        super
       end
     end
 
-    private
-
-    delegate :match_version?, :non_production?, to: Helpers
-    delegate :configuration, to: EmberCLI
-    delegate :tee_path, :npm_path, :bundler_path, to: :configuration
-
-    def default_app_path
-      path = Rails.root.join("app", name)
-
-      return name unless path.directory?
-
-      ActiveSupport::Deprecation.warn <<-MSG.strip_heredoc
-        We have found that placing your EmberCLI
-        application inside Rails' app has negative performance implications.
-
-        Please see, https://github.com/rwz/ember-cli-rails/issues/66 for more
-        detailed information.
+    def respond_to_missing?(method_name, *)
+      if supported_path_method(method_name)
+        true
+      else
+        super
+      end
+    end
 
-        It is now recommended to place your EmberCLI application into the Rails
-        root path.
-      MSG
+    private
 
-      path
+    def supported_path_method(original)
+      path_method = original.to_s[/\A(.+)_path\z/, 1]
+      path_method if path_method && paths.respond_to?(path_method)
     end
 
     def silence_build(&block)
-      if ENV.fetch("EMBER_CLI_RAILS_VERBOSE"){ !non_production? }
+      if ENV.fetch("EMBER_CLI_RAILS_VERBOSE"){ EmberCLI.env.production? }
         yield
       else
-        silence_stream(STDOUT, &block)
+        silence_stream STDOUT, &block
       end
     end
 
@@ -130,29 +117,21 @@ module EmberCLI
       options.fetch(:build_timeout){ configuration.build_timeout }
     end
 
-    def lockfile
-      @lockfile ||= tmp_path.join("build.lock")
-    end
-
     def check_for_build_error!
       raise_build_error! if build_error?
     end
 
-    def build_error_file
-      @build_error_file ||= tmp_path.join("error.txt")
-    end
-
     def reset_build_error!
-      build_error_file.delete if build_error?
+      build_error_file_path.delete if build_error?
     end
 
     def build_error?
-      build_error_file.exist?
+      build_error_file_path.exist?
     end
 
     def raise_build_error!
       error = BuildError.new("EmberCLI app #{name.inspect} has failed to build")
-      error.set_backtrace build_error_file.read.split(?\n)
+      error.set_backtrace build_error_file_path.read.split(?\n)
       fail error
     end
 
@@ -161,7 +140,7 @@ module EmberCLI
         check_addon!
         check_ember_cli_version!
         reset_build_error!
-        FileUtils.touch lockfile
+        FileUtils.touch lockfile_path
         symlink_to_assets_root
         add_assets_to_precompile_list
         true
@@ -171,7 +150,7 @@ module EmberCLI
     def check_ember_cli_version!
       version = dev_dependencies.fetch("ember-cli").split(?-).first
 
-      unless match_version?(version, EMBER_CLI_VERSION)
+      unless Helpers.match_version?(version, EMBER_CLI_VERSION)
         fail <<-MSG.strip_heredoc
           EmberCLI Rails require ember-cli NPM package version to be
           #{EMBER_CLI_VERSION} to work properly. From within your EmberCLI directory
@@ -192,7 +171,7 @@ module EmberCLI
 
             $ npm install --save-dev ember-cli-rails-addon@#{ADDON_VERSION}
 
-          in you Ember application root: #{app_path}
+          in you Ember application root: #{root}
         MSG
       end
     end
@@ -221,36 +200,12 @@ module EmberCLI
       @ember_app_name ||= options.fetch(:name){ package_json.fetch(:name) }
     end
 
-    def app_path
-      @app_path ||= begin
-        path = options.fetch(:path){ default_app_path }
-        pathname = Pathname.new(path)
-        pathname.absolute?? pathname : Rails.root.join(path)
-      end
-    end
-
-    def tmp_path
-      @tmp_path ||= app_path.join("tmp").tap(&:mkpath)
-    end
-
-    def log_path
-      Rails.root.join("log", "ember-#{name}.#{Rails.env}.log")
-    end
-
-    def dist_path
-      @dist_path ||= EmberCLI.root.join("apps", name).tap(&:mkpath)
-    end
-
-    def assets_path
-      @assets_path ||= EmberCLI.root.join("assets").tap(&:mkpath)
-    end
-
     def environment
-      non_production?? "development" : "production"
+      EmberCLI.env.production?? "production" : "development"
     end
 
     def package_json
-      @package_json ||= JSON.parse(app_path.join("package.json").read).with_indifferent_access
+      @package_json ||= JSON.parse(package_json_file_path.read).with_indifferent_access
     end
 
     def dev_dependencies
@@ -259,7 +214,7 @@ module EmberCLI
 
     def addon_present?
       dev_dependencies["ember-cli-rails-addon"] == ADDON_VERSION &&
-        app_path.join("node_modules", "ember-cli-rails-addon", "package.json").exist?
+        addon_package_json_file_path.exist?
     end
 
     def excluded_ember_deps
@@ -274,14 +229,10 @@ module EmberCLI
       end
     end
 
-    def gemfile_path
-      app_path.join("Gemfile")
-    end
-
     def exec(cmd, options={})
       method_name = options.fetch(:method, :system)
 
-      Dir.chdir app_path do
+      Dir.chdir root do
         Kernel.public_send(method_name, env_hash, cmd, err: :out)
       end
     end
@@ -289,7 +240,7 @@ module EmberCLI
     def wait_for_build_complete_or_error
       loop do
         check_for_build_error!
-        break unless lockfile.exist?
+        break unless lockfile_path.exist?
         sleep 0.1
       end
     end

data/lib/ember-cli/engine.rb

@@ -1,9 +1,5 @@
 module EmberCLI
   class Engine < Rails::Engine
-    initializer "ember-cli-rails.view_helpers" do
-      ActionView::Base.send :include, ViewHelpers
-    end
-
     initializer "ember-cli-rails.inflector" do
       ActiveSupport::Inflector.inflections do |inflect|
         inflect.acronym "CLI" if inflect.respond_to?(:acronym)

data/lib/ember-cli/helpers.rb

@@ -24,21 +24,25 @@ module EmberCLI
       nil
     end
 
-    def non_production?
-      !Rails.env.production? && rails_config_for(:consider_all_requests_local)
+    def current_environment
+      rails_config_for(:ember_cli_rails_mode){ default_environment }.to_s
     end
 
-    def use_middleware?
-      rails_config_for(:use_ember_middleware, non_production?)
-    end
+    private
 
-    def use_live_recompilation?
-      rails_config_for(:use_ember_live_recompilation, Rails.env.development?)
+    def default_environment
+      if Rails.env.test?
+        "test"
+      elsif Rails.env.production? || !rails_config_for(:consider_all_requests_local)
+        "production"
+      else
+        "development"
+      end
     end
 
-    def rails_config_for(key, default=false)
+    def rails_config_for(key)
       config = Rails.configuration
-      config.respond_to?(key) ? config.public_send(key) : default
+      config.respond_to?(key) ? config.public_send(key) : yield
     end
   end
 end

data/lib/ember-cli/middleware.rb

@@ -19,7 +19,7 @@ module EmberCLI
 
     def enable_ember_cli
       @enabled ||= begin
-        if Helpers.use_live_recompilation?
+        if EmberCLI.env.development?
           EmberCLI.run!
         else
           EmberCLI.compile!

data/lib/ember-cli/path_set.rb

@@ -0,0 +1,96 @@
+module EmberCLI
+  class PathSet
+    def self.define_path(name, &definition)
+      define_method name do
+        ivar = "@_#{name}_path"
+        if instance_variable_defined?(ivar)
+          instance_variable_get(ivar)
+        else
+          instance_exec(&definition).tap{ |value| instance_variable_set ivar, value }
+        end
+      end
+    end
+
+    def initialize(app)
+      @app = app
+    end
+
+    define_path :root do
+      path = app_options.fetch(:path){ default_root }
+      pathname = Pathname.new(path)
+      pathname.absolute?? pathname : Rails.root.join(path)
+    end
+
+    define_path :tmp do
+      root.join("tmp").tap(&:mkpath)
+    end
+
+    define_path :log do
+      Rails.root.join("log", "ember-#{app_name}.#{Rails.env}.log")
+    end
+
+    define_path :dist do
+      EmberCLI.root.join("apps", app_name).tap(&:mkpath)
+    end
+
+    define_path :assets do
+      EmberCLI.root.join("assets").tap(&:mkpath)
+    end
+
+    define_path :gemfile do
+      root.join("Gemfile")
+    end
+
+    define_path :tests do
+      dist.join("tests")
+    end
+
+    define_path :package_json_file do
+      root.join("package.json")
+    end
+
+    define_path :ember do
+      root.join("node_modules", ".bin", "ember").tap do |path|
+        fail <<-MSG.strip_heredoc unless path.executable?
+          No local ember executable found. You should run `npm install`
+          inside the #{app_name} app located at #{root}
+        MSG
+      end
+    end
+
+    define_path :lockfile do
+      tmp.join("build.lock")
+    end
+
+    define_path :build_error_file do
+      tmp.join("error.txt")
+    end
+
+    define_path :tee do
+      app_options.fetch(:tee_path){ configuration.tee_path }
+    end
+
+    define_path :npm do
+      app_options.fetch(:npm_path){ configuration.npm_path }
+    end
+
+    define_path :bundler do
+      app_options.fetch(:bundler_path){ configuration.bundler_path }
+    end
+
+    define_path :addon_package_json_file do
+      root.join("node_modules", "ember-cli-rails-addon", "package.json")
+    end
+
+    private
+
+    attr_reader :app
+
+    delegate :name, :options, to: :app, prefix: true
+    delegate :configuration, to: EmberCLI
+
+    def default_root
+      Rails.root.join(app_name)
+    end
+  end
+end

data/lib/ember-cli/version.rb

@@ -1,3 +1,3 @@
 module EmberCLI
-  VERSION = "0.1.13".freeze
+  VERSION = "0.2.0".freeze
 end

data/lib/tasks/ember-cli.rake

@@ -1,6 +1,6 @@
-namespace "ember-cli" do
+namespace :ember do
   desc "Runs `ember build` for each App"
-  task compile: :install_dependencies do
+  task compile: :install do
     EmberCLI.compile!
   end
 
@@ -10,9 +10,9 @@ namespace "ember-cli" do
   end
 
   desc "Installs each EmberCLI app's dependencies"
-  task install_dependencies: :environment do
+  task install: :environment do
     EmberCLI.install_dependencies!
   end
 end
 
-task "assets:precompile" => "ember-cli:compile" unless EmberCLI.skip?
+task "assets:precompile" => "ember:compile" unless EmberCLI.skip?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ember-cli-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.2.0
 platform: ruby
 authors:
 - Pavel Pravosud
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-21 00:00:00.000000000 Z
+date: 2015-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -59,6 +59,7 @@ files:
 - LICENSE.txt
 - README.md
 - app/controllers/ember_tests_controller.rb
+- app/helpers/ember_cli_rails_helper.rb
 - config/routes.rb
 - lib/ember-cli-rails.rb
 - lib/ember-cli/app.rb
@@ -66,8 +67,8 @@ files:
 - lib/ember-cli/engine.rb
 - lib/ember-cli/helpers.rb
 - lib/ember-cli/middleware.rb
+- lib/ember-cli/path_set.rb
 - lib/ember-cli/version.rb
-- lib/ember-cli/view_helpers.rb
 - lib/generators/ember-cli/init/USAGE
 - lib/generators/ember-cli/init/init_generator.rb
 - lib/generators/ember-cli/init/templates/initializer.rb

data/lib/ember-cli/view_helpers.rb

@@ -1,13 +0,0 @@
-module EmberCLI
-  module ViewHelpers
-    def include_ember_script_tags(app_name)
-      app = EmberCLI.configuration.apps.fetch(app_name)
-      javascript_include_tag *app.exposed_js_assets
-    end
-
-    def include_ember_stylesheet_tags(app_name)
-      app = EmberCLI.configuration.apps.fetch(app_name)
-      stylesheet_link_tag *app.exposed_css_assets
-    end
-  end
-end