ember-cli-rails 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b747535336222c46f26a9fa8282fd431a8bc778b
-  data.tar.gz: e5433c4e6c9aeee22d0ad7f2863905565812ad06
+  metadata.gz: e781eea1e9e1586408d6af0ffb8438989446554b
+  data.tar.gz: 5b40c7081f54e4a51447393c91bf6c8f1cdb0501
 SHA512:
-  metadata.gz: 4a56a9ebfe129b41ae041a2fc5d701877a6fafc710b134ce8ce6788fe5d3d264b81c75c0ed8ae6dbbe6c2d0437e18fef00652d5655a522f34e13efbe08907375
-  data.tar.gz: 2bb7bfeceb07c887d4c01da711484928f0ca95736ca2805da3d48cee79774b5ca49b994236bb819882a96ab43a9b67f283618eae55723853b604a4329c37d88a
+  metadata.gz: 21dfad6429f5ee62379deaed39cb33d09b570c1fd0796665b8c35e7b76a6edfeeb0805a203284b1aaeb6d7a598bf60fbd78f1ec67dfe325b34957fd4f59e9d6f
+  data.tar.gz: 42a6d2cd995a60ded8da52383bd8ce16ccdd9a3af0504c36ae0b2ea432eadce1657c97c5061046cb5d3aeaa6e03d87a15427a0e15c5eb04998885497d680b3c6

data/lib/ember-cli-rails.rb

@@ -5,7 +5,6 @@ module EmberCLI
 
   autoload :App,           "ember-cli/app"
   autoload :Configuration, "ember-cli/configuration"
-  autoload :RackServer,    "ember-cli/rack_server"
   autoload :ViewHelpers,   "ember-cli/view_helpers"
   autoload :Helpers,       "ember-cli/helpers"
 
@@ -26,15 +25,27 @@ module EmberCLI
   end
 
   def enable!
-    if Rails.env.development?
-      prepare!
-      Rack::Server.send :prepend, RackServer
-    else
-      compile!
+    prepare!
+
+    Rails.application.instance_eval do
+      singleton_class.instance_eval do
+        alias_method :call_without_ember_cli, :call
+      end
+
+      def call(env)
+        @_ember_cli_enabled ||= begin
+          EmberCLI.compile!
+          EmberCLI.run! if Rails.env.development?
+          true
+        end
+
+        call_without_ember_cli(env)
+      end
     end
   end
 
   def run!
+    prepare!
     each_app &:run
   end
 
@@ -62,6 +73,6 @@ module EmberCLI
   end
 
   def each_app
-    configuration.apps.values.each{ |a| yield a }
+    configuration.apps.each{ |name, app| yield app }
   end
 end

data/lib/ember-cli/app.rb

@@ -2,20 +2,19 @@ module EmberCLI
   class App
     attr_reader :name, :options, :pid
 
-    def initialize(name, **options)
+    def initialize(name, options={})
       @name, @options = name.to_s, options
     end
 
     def compile
-      symlink_to_assets_root
-      add_assets_to_precompile_list
+      prepare
       silence_stream STDOUT do
         system command, chdir: app_path, err: :out
       end
     end
 
     def run
-      compile
+      prepare
       @pid = spawn(command(watch: true), chdir: app_path, err: :out)
       at_exit{ stop }
     end
@@ -35,6 +34,14 @@ module EmberCLI
     delegate :tee_path, to: :configuration
     delegate :configuration, to: :EmberCLI
 
+    def prepare
+      @prepared ||= begin
+        symlink_to_assets_root
+        add_assets_to_precompile_list
+        true
+      end
+    end
+
     def symlink_to_assets_root
       assets_path.join(name).make_symlink dist_path.join("assets")
     end
@@ -43,8 +50,8 @@ module EmberCLI
       Rails.configuration.assets.precompile << /(?:\/|\A)#{name}\//
     end
 
-    def command(watch: nil)
-      watch = "--watch" if watch
+    def command(options={})
+      watch = options[:watch] ? "--watch" : ""
       "#{ember_path} build #{watch} --environment #{environment} --output-path #{dist_path} #{log_pipe}"
     end
 
@@ -75,7 +82,7 @@ module EmberCLI
     end
 
     def environment
-      Rails.env.in?(%w[development test]) ? Rails.env : "production"
+      Helpers.non_production?? "development" : "production"
     end
   end
 end

data/lib/ember-cli/configuration.rb

@@ -4,8 +4,8 @@ module EmberCLI
   class Configuration
     include Singleton
 
-    def app(name, **options)
-      apps.store name, App.new(name, **options)
+    def app(name, options={})
+      apps.store name, App.new(name, options)
     end
 
     def apps

data/lib/ember-cli/helpers.rb

@@ -15,10 +15,14 @@ module EmberCLI
       nil
     end
 
+    def non_production?
+      !Rails.env.production? && Rails.configuration.consider_all_requests_local
+    end
+
     def override_assets_precompile_task!
       Rake.application.instance_eval do
         @tasks["assets:precompile:original"] = @tasks.delete("assets:precompile")
-        Rake::Task.define_task "assets:precompile", %i[assets precompile] => :environment do
+        Rake::Task.define_task "assets:precompile", [:assets, :precompile] => :environment do
           EmberCLI.compile!
           Rake::Task["assets:precompile:original"].execute
         end

data/lib/ember-cli/railtie.rb

@@ -5,21 +5,19 @@ module EmberCLI
     end
 
     initializer "ember-cli-rails.inflector" do
-      ActiveSupport::Inflector.inflections(:en) do |inflect|
+      ActiveSupport::Inflector.inflections :en do |inflect|
         inflect.acronym "CLI"
       end
     end
 
-    initializer "ember-cli-rails.rack-server" do
-      EmberCLI.enable! if non_production?
+    initializer "ember-cli-rails.enable" do
+      EmberCLI.enable! if EmberCLI::Helpers.non_production?
     end
 
     rake_tasks do
-      require "ember-cli/rake_task"
+      require "sprockets/rails/task"
+      EmberCLI::Helpers.override_assets_precompile_task!
     end
 
-    def non_production?
-      !Rails.env.production? && Rails.configuration.consider_all_requests_local
-    end
   end
 end

data/lib/ember-cli/version.rb

@@ -1,3 +1,3 @@
 module EmberCLI
-  VERSION = "0.0.5".freeze
+  VERSION = "0.0.6".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ember-cli-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Pavel Pravosud
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-08 00:00:00.000000000 Z
+date: 2014-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -39,9 +39,7 @@ files:
 - lib/ember-cli/app.rb
 - lib/ember-cli/configuration.rb
 - lib/ember-cli/helpers.rb
-- lib/ember-cli/rack_server.rb
 - lib/ember-cli/railtie.rb
-- lib/ember-cli/rake_task.rb
 - lib/ember-cli/version.rb
 - lib/ember-cli/view_helpers.rb
 - lib/generators/ember-cli/init/USAGE
@@ -57,9 +55,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/ember-cli/rack_server.rb

@@ -1,10 +0,0 @@
-module EmberCLI
-  module RackServer
-    def start
-      EmberCLI.run! if defined?(Rails.application) && app == Rails.application
-      super
-    ensure
-      EmberCLI.stop!
-    end
-  end
-end

data/lib/ember-cli/rake_task.rb

@@ -1,3 +0,0 @@
-require "sprockets/rails/task"
-
-EmberCLI::Helpers.override_assets_precompile_task!