activeadmin 0.3.3 → 0.3.4

data/CHANGELOG.md

@@ -2,6 +2,22 @@
 
 Nothing yet
 
+## 0.3.4
+
+2 commits by 2 authors
+
+### Bug Fixes
+
+* Fix reloading issues across operating systems.
+* Fix issue where SASS was recompiling on every request. This can seriously
+  decrease the load time of applications when running in development mode.
+  Thanks @dhiemstra for tracking this one down!
+
+### Contributors
+
+* Danny Hiemstra
+* Greg Bell
+
 ## 0.3.3
 
 1 commit by 1 author

data/lib/active_admin/application.rb

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

data/lib/active_admin/reloader.rb

@@ -1,28 +1,57 @@
 module ActiveAdmin
+
+  class FileUpdateChecker < ::ActiveSupport::FileUpdateChecker
+
+    # Over-ride the default #updated_at to support the deletion of files
+    def updated_at
+      paths.map { |path| File.mtime(path) rescue Time.now }.max
+    end
+
+  end
+
   # Deals with reloading Active Admin on each request in 
   # development and once in production.
   class Reloader
 
-    # @param [String] rails_version
-    #   The version of Rails we're using. We use this to switch between
-    #   the correcr Rails reloader class.
-    def initialize(app, rails_version)
-      @app = app
+    attr_reader :active_admin_app, 
+                :rails_app,
+                :file_update_checker
+
+    # @param [ActiveAdmin::Application] app
+    # @param [String] rails_version The version of Rails we're using. 
+    #                 We use this to switch between the correcrt Rails reloader class.
+    def initialize(rails_app, active_admin_app, rails_version)
+      @rails_app = rails_app
+      @active_admin_app = active_admin_app
       @rails_version = rails_version.to_s
+      @file_update_checker = FileUpdateChecker.new(watched_paths) do
+        reload!
+      end
+    end
+
+    def reload!
+      active_admin_app.unload!
+      rails_app.reload_routes!
+      file_update_checker.paths.clear
+      watched_paths.each{|path| file_update_checker.paths << path }
     end
 
     # Attach to Rails and perform the reload on each request.
     def attach!
-      file_update_checker = ActiveSupport::FileUpdateChecker.new(@app.load_paths) do
-        ActiveAdmin.application.unload!
-        Rails.application.reload_routes!
-      end
+      # Bring the checker into local scope for the ruby block
+      checker = file_update_checker
 
       reloader_class.to_prepare do
-        file_update_checker.execute_if_updated
+        checker.execute_if_updated
       end
     end
 
+    def watched_paths
+      paths = active_admin_app.load_paths
+      active_admin_app.load_paths.each{|path| paths += Dir[File.join(path, "**", "*.rb")]}
+      paths
+    end
+
     def reloader_class
       if @rails_version[0..2] == '3.1'
         ActionDispatch::Reloader

data/lib/active_admin/sass/css_loader.rb

@@ -9,7 +9,7 @@ class Sass::Importers::Filesystem
 
   # We want to ensure that all *.css.scss files are loaded as scss files
   def extensions_with_css
-    extensions_without_css.merge('css.scss' => :scss)
+    extensions_without_css.merge('{css.,}scss' => :scss)
   end
   alias_method_chain :extensions, :css
 

data/lib/active_admin/version.rb

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

data/spec/unit/reloader_spec.rb

@@ -16,21 +16,65 @@ end
 
 describe ActiveAdmin::Reloader do
 
-  let(:mock_app){ mock(:load_paths => []) }
+  let(:rails_app){ mock(:reload_routes! => true)}
+  let(:mock_app){ mock(:load_paths => ["app/admin"], :unload! => true)}
+  let(:reloader){ ActiveAdmin::Reloader.new(rails_app, mock_app, "3.1.0")}
 
-  it "should use ActionDispatch::Reloader if rails 3.1" do
-    reloader = ActiveAdmin::Reloader.new mock_app, '3.1.0'
-    reloader.reloader_class.should == ActionDispatch::Reloader
+  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(rails_app, mock_app, '3.1.0').attach!
   end
 
-  it "should use ActionDispatch::Callbacks if rails 3.0" do
-    reloader = ActiveAdmin::Reloader.new mock_app, '3.0.0'
-    reloader.reloader_class.should == ActionDispatch::Callbacks
+  describe "#reloader_class" do
+    it "should use ActionDispatch::Reloader if rails 3.1" do
+      reloader = ActiveAdmin::Reloader.new rails_app, 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 rails_app, mock_app, '3.0.0'
+      reloader.reloader_class.should == ActionDispatch::Callbacks
+    end
   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!
+  describe "#reload!" do
+
+    it "should unload the active admin app" do
+      mock_app.should_receive(:unload!)
+      reloader.reload!
+    end
+
+    it "should reload the rails app routes" do
+      rails_app.should_receive(:reload_routes!)
+      reloader.reload!
+    end
+
+    it 'should reset the files within the file_update_checker' do
+      reloader.file_update_checker.paths.should_receive(:clear)
+      reloader.file_update_checker.paths.should_receive(:<<).with("app/admin")
+      reloader.reload!
+    end
+
+  end
+
+  describe "#watched_paths" do
+    let(:mock_app){ ActiveAdmin::Application.new }
+    let(:admin_path){ File.join(Rails.root, "app", "admin") }
+
+    before do
+      mock_app.load_paths = [admin_path]
+    end
+
+    it "should return the load path directories" do
+      reloader.watched_paths.should include(admin_path)
+    end
+
+    it "should include all files in the directory" do
+      root = Rails.root + "/app/admin"
+      reloader.watched_paths.should include(*Dir["#{admin_path}/**/*.rb"])
+    end
+
   end
 
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: activeadmin
 version: !ruby/object:Gem::Version 
-  hash: 21
-  prerelease: 
+  prerelease: false
   segments: 
   - 0
   - 3
-  - 3
-  version: 0.3.3
+  - 4
+  segments_generated: true
+  version: 0.3.4
 platform: ruby
 authors: 
 - Greg Bell
@@ -15,133 +15,134 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-29 00:00:00 Z
+date: 2011-11-08 00:00:00 -08:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
+  name: rails
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 3
         - 0
         - 0
+        segments_generated: true
         version: 3.0.0
-  name: rails
+  type: :runtime
+  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
+  name: meta_search
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 63
         segments: 
         - 0
         - 9
         - 2
+        segments_generated: true
         version: 0.9.2
-  name: meta_search
+  type: :runtime
+  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
+  name: devise
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 1
         - 1
         - 2
+        segments_generated: true
         version: 1.1.2
-  name: devise
+  type: :runtime
+  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
+  name: formtastic
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - <
       - !ruby/object:Gem::Version 
-        hash: 15
         segments: 
         - 2
         - 0
         - 0
+        segments_generated: true
         version: 2.0.0
-  name: formtastic
+  type: :runtime
+  prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
+  name: inherited_resources
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - <
       - !ruby/object:Gem::Version 
-        hash: 27
         segments: 
         - 1
         - 3
         - 0
+        segments_generated: true
         version: 1.3.0
-  name: inherited_resources
+  type: :runtime
+  prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
+  name: kaminari
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 39
         segments: 
         - 0
         - 12
         - 4
+        segments_generated: true
         version: 0.12.4
-  name: kaminari
+  type: :runtime
+  prerelease: false
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
+  name: sass
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 3
         - 1
         - 0
+        segments_generated: true
         version: 3.1.0
-  name: sass
+  type: :runtime
+  prerelease: false
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
+  name: fastercsv
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
+        segments_generated: true
         version: "0"
-  name: fastercsv
+  type: :runtime
+  prerelease: false
   version_requirements: *id008
 description: The administration framework for Ruby on Rails.
 email: 
@@ -490,6 +491,7 @@ files:
 - tasks/docs.rake
 - tasks/test.rake
 - tasks/yard.rake
+has_rdoc: true
 homepage: http://activeadmin.info
 licenses: []
 
@@ -503,23 +505,25 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 2097501069627714187
       segments: 
       - 0
+      segments_generated: true
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 2097501069627714187
       segments: 
       - 0
+      segments_generated: true
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: The administration framework for Ruby on Rails.
@@ -642,4 +646,3 @@ 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: