activeadmin 0.3.2 → 0.3.3

data/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 Nothing yet
 
+## 0.3.3
+
+1 commit by 1 author
+
+### Enhancements
+
+* Only reload Active Admin when files in the load paths have changed. This is a
+  major speed increase in development mode. Also helps with memory consumption
+  because we aren't reloading Active admin all the time.
+
+### Contributors
+
+* Greg Bell
+
 ## 0.3.2
 
 45 commits by 15 contributors

data/features/support/env.rb

@@ -9,18 +9,24 @@ ENV['BUNDLE_GEMFILE'] = File.expand_path('../../../Gemfile', __FILE__)
 require File.expand_path('../../../spec/support/detect_rails_version', __FILE__)
 ENV["RAILS"] = detect_rails_version
 
+ENV["RAILS_ENV"] ||= "cucumber"
+ENV['RAILS_ROOT'] = File.expand_path("../../../spec/rails/rails-#{ENV["RAILS"]}", __FILE__)
+
+
 require 'rubygems'
 require "bundler"
 Bundler.setup
 
-ENV["RAILS_ENV"] ||= "cucumber"
-ENV['RAILS_ROOT'] = File.expand_path("../../../spec/rails/rails-#{ENV["RAILS"]}", __FILE__)
-
 # Create the test app if it doesn't exists
 unless File.exists?(ENV['RAILS_ROOT'])
   system 'rake setup'
 end
 
+# Ensure the Active Admin load path is happy
+require 'rails'
+require 'active_admin'
+ActiveAdmin.application.load_paths = [ENV['RAILS_ROOT'] + "/app/admin"]
+
 require ENV['RAILS_ROOT'] + '/config/environment'
 
 # Setup autoloading of ActiveAdmin and the load path

data/lib/active_admin/application.rb

@@ -208,7 +208,7 @@ module ActiveAdmin
     end
 
     def attach_reloader
-      ActiveAdmin::Reloader.new(Rails.version).attach!
+      ActiveAdmin::Reloader.new(self, Rails.version).attach!
     end
 
 

data/lib/active_admin/reloader.rb

@@ -6,16 +6,21 @@ module ActiveAdmin
     # @param [String] rails_version
     #   The version of Rails we're using. We use this to switch between
     #   the correcr Rails reloader class.
-    def initialize(rails_version)
+    def initialize(app, rails_version)
+      @app = app
       @rails_version = rails_version.to_s
     end
 
     # Attach to Rails and perform the reload on each request.
     def attach!
-      reloader_class.to_prepare do
+      file_update_checker = ActiveSupport::FileUpdateChecker.new(@app.load_paths) do
         ActiveAdmin.application.unload!
         Rails.application.reload_routes!
       end
+
+      reloader_class.to_prepare do
+        file_update_checker.execute_if_updated
+      end
     end
 
     def reloader_class

data/lib/active_admin/version.rb

@@ -1,3 +1,3 @@
 module ActiveAdmin
-  VERSION = '0.3.2'
+  VERSION = '0.3.3'
 end

data/spec/unit/reloader_spec.rb

@@ -4,25 +4,33 @@ require 'spec_helper'
 begin
   ActionDispatch::Reloader
 rescue
-  module ActionDispatch; module Reloader; end; end
+  module ActionDispatch; module Reloader; def self.to_prepare; end; end; end
 end
 
 begin
   ActionDispatch::Callbacks
 rescue
-  module ActionDispatch; module Callbacks; end; end
+  module ActionDispatch; module Callbacks; def self.to_prepare; end; end; end
 end
 
 
 describe ActiveAdmin::Reloader do
 
+  let(:mock_app){ mock(:load_paths => []) }
+
   it "should use ActionDispatch::Reloader if rails 3.1" do
-    reloader = ActiveAdmin::Reloader.new '3.1.0'
+    reloader = ActiveAdmin::Reloader.new mock_app, '3.1.0'
     reloader.reloader_class.should == ActionDispatch::Reloader
   end
 
   it "should use ActionDispatch::Callbacks if rails 3.0" do
-    reloader = ActiveAdmin::Reloader.new '3.0.0'
+    reloader = ActiveAdmin::Reloader.new mock_app, '3.0.0'
     reloader.reloader_class.should == ActionDispatch::Callbacks
   end
+
+  it "should initialize a new file update checker" do
+    ActiveSupport::FileUpdateChecker.should_receive(:new).with(mock_app.load_paths).and_return(mock(:execute_if_updated => true))
+    ActiveAdmin::Reloader.new(mock_app, '3.1.0').attach!
+  end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: activeadmin
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Greg Bell
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-23 00:00:00 Z
+date: 2011-10-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false
@@ -642,3 +642,4 @@ test_files:
 - spec/unit/views/components/table_for_spec.rb
 - spec/unit/views/pages/layout_spec.rb
 - spec/unit/views/tabbed_navigation_spec.rb
+has_rdoc: