activeadmin 0.2.2 → 0.3.0

data/lib/generators/active_admin/assets/templates/3.1/active_admin.css.scss

@@ -0,0 +1,6 @@
+// Active Admin CSS Styles
+@import "active_admin/mixins";
+@import "active_admin/base";
+
+// To customize the Active Admin interfaces, add your
+// styles here:

data/lib/generators/active_admin/assets/templates/3.1/active_admin.js

@@ -0,0 +1 @@
+//= require active_admin/base

data/lib/generators/active_admin/assets/templates/dashboards.rb

@@ -0,0 +1,36 @@
+ActiveAdmin::Dashboards.build do
+
+  # Define your dashboard sections here. Each block will be
+  # rendered on the dashboard in the context of the view. So just
+  # return the content which you would like to display.
+  
+  # == Simple Dashboard Section
+  # Here is an example of a simple dashboard section
+  #
+  #   section "Recent Posts" do
+  #     ul do
+  #       Post.recent(5).collect do |post|
+  #         li link_to(post.title, admin_post_path(post))
+  #       end
+  #     end
+  #   end
+  
+  # == Render Partial Section
+  # The block is rendererd within the context of the view, so you can
+  # easily render a partial rather than build content in ruby.
+  #
+  #   section "Recent Posts" do
+  #     render 'recent_posts' # => this will render /app/views/admin/dashboard/_recent_posts.html.erb
+  #   end
+  
+  # == Section Ordering
+  # The dashboard sections are ordered by a given priority from top left to
+  # bottom right. The default priority is 10. By giving a section numerically lower
+  # priority it will be sorted higher. For example:
+  #
+  #   section "Recent Posts", :priority => 10
+  #   section "Recent User", :priority => 1
+  #
+  # Will render the "Recent Users" then the "Recent Posts" sections on the dashboard.
+
+end

data/lib/generators/active_admin/install/install_generator.rb

@@ -28,10 +28,8 @@ module ActiveAdmin
         route "ActiveAdmin.routes(self)"
       end
 
-      def copy_assets
-        template 'active_admin_vendor.js',  'public/javascripts/active_admin_vendor.js'
-        template 'active_admin.js',         'public/javascripts/active_admin.js'
-        directory 'images', 'public/images/active_admin'
+      def create_assets
+        generate "active_admin:assets"
       end
 
       def create_migrations

data/lib/generators/active_admin/install/templates/active_admin.rb.erb

@@ -21,7 +21,9 @@ ActiveAdmin.setup do |config|
   #
   # To set no namespace by default, use:
   #   config.default_namespace = false
-  config.default_namespace = :admin
+  #
+  # Default:
+  # config.default_namespace = :admin
 
 
   # == User Authentication
@@ -45,14 +47,34 @@ ActiveAdmin.setup do |config|
   config.current_user_method = :current_admin_user
 
 
+  # == Logging Out
+  #
+  # Active Admin displays a logout link on each screen. These
+  # settings configure the location and method used for the link.
+  #
+  # This setting changes the path where the link points to. If it's
+  # a string, the strings is used as the path. If it's a Symbol, we
+  # will call the method to return the path.
+  #
+  # Default:
+  # config.logout_link_path = :destroy_admin_user_session_path
+
+  # This setting changes the http method used when rendering the
+  # link. For example :get, :delete, :put, etc..
+  #
+  # Default:
+  # config.logout_link_method = :get
+
+
   # == Admin Comments
   #
-  # Admin notes allow you to add notes to any model
+  # Admin comments allow you to add comments to any model for admin use
   #
-  # Admin notes are enabled by default in the default
+  # Admin comments are enabled by default in the default
   # namespace only. You can turn them on in a namesapce
   # by adding them to the comments array.
   #
+  # Default:
   # config.allow_comments_in = [:admin]
 
 
@@ -66,7 +88,7 @@ ActiveAdmin.setup do |config|
 
   # == Register Stylesheets & Javascripts
   #
-  # We recomend using the built in Active Admin layout and loading
+  # We recommend using the built in Active Admin layout and loading
   # up your own stylesheets / javascripts to customize the look
   # and feel.
   #

data/lib/generators/active_admin/install/templates/dashboards.rb

@@ -16,11 +16,13 @@ ActiveAdmin::Dashboards.build do
   #   end
   
   # == Render Partial Section
-  # The block is rendererd within the context of the view, so you can
+  # The block is rendered within the context of the view, so you can
   # easily render a partial rather than build content in ruby.
   #
   #   section "Recent Posts" do
-  #     render 'recent_posts' # => this will render /app/views/admin/dashboard/_recent_posts.html.erb
+  #     div do
+  #       render 'recent_posts' # => this will render /app/views/admin/dashboard/_recent_posts.html.erb
+  #     end
   #   end
   
   # == Section Ordering

data/lib/generators/active_admin/install/templates/migrations/2_move_admin_notes_to_comments.rb

@@ -9,8 +9,8 @@ class MoveAdminNotesToComments < ActiveRecord::Migration
     add_index     :active_admin_comments, [:author_type, :author_id]
 
     # Update all the existing comments to the default namespace
-    say "Updating any existing comments to the #{ActiveAdmin.default_namespace} namespace."
-    execute "UPDATE active_admin_comments SET namespace='#{ActiveAdmin.default_namespace}'"
+    say "Updating any existing comments to the #{ActiveAdmin.application.default_namespace} namespace."
+    execute "UPDATE active_admin_comments SET namespace='#{ActiveAdmin.application.default_namespace}'"
   end
 
   def self.down

data/script/local

@@ -0,0 +1,44 @@
+#!/usr/bin/env ruby
+
+require File.expand_path('../../spec/support/detect_rails_version', __FILE__)
+
+unless ARGV[0]
+  puts <<-EOF
+Usage: ./script/#{__FILE__} COMMAND [ARGS]
+
+The command will be run in the context of the local rails
+app stored in test-rails-app.
+
+Examples:
+
+./script/local server
+./script/local c
+./script/local rake db:migrate
+  EOF
+  exit(1)
+end
+
+# Set up some variables
+rails_version = detect_rails_version || '3.0.0'
+
+test_app_dir = ".test-rails-apps"
+test_app_path = "#{test_app_dir}/test-rails-app-#{rails_version}"
+
+# Ensure .test-rails-apps is created
+system "mkdir #{test_app_dir}" unless File.exists?(test_app_dir)
+
+# Create the sample rails app if it doesn't already exist
+unless File.exists? test_app_path
+  system "RAILS='#{rails_version}' bundle exec rails new #{test_app_path} -m spec/support/rails_template_with_data.rb"
+end
+
+# Link this rails app
+system "rm test-rails-app"
+system "ln -s #{test_app_path} test-rails-app"
+
+# If it's a rails command, auto add the rails script
+RAILS_COMMANDS = %w{generate console server dbconsole g c s runner}
+args = RAILS_COMMANDS.include?(ARGV[0]) ? ["rails", ARGV].flatten : ARGV
+
+# Run the command
+exec "cd test-rails-app && GEMFILE=../Gemfile bundle exec #{args.join(" ")}"

data/script/use_rails

@@ -0,0 +1,46 @@
+#!/usr/bin/env ruby
+#
+# Switches the development environment to use the given
+# version of rails. Caches the Gemfile.locks so that 
+# switching it very fast.
+
+def cmd(command)
+  puts command
+  exit 1 unless system command
+end
+
+version = ARGV[0]
+
+unless version
+  puts "USAGE: ./script/#{__FILE__} VERSION [OPTIONS]"
+  puts
+  puts "Options:"
+  puts "  --clobber   Add this flag to remove the existing Gemfile.lock before running"
+  exit(1)
+end
+
+def file_or_symlink?(path)
+  File.exist?(path) || File.symlink?(path)
+end
+
+gem_lock_dir = ".gemfile-locks"
+gem_lock_file = "#{gem_lock_dir}/Gemfile-#{version}.lock"
+
+# Ensure our lock dir is created
+cmd "mkdir #{gem_lock_dir}" unless File.exists?(gem_lock_dir)
+
+# --clobber passed in
+if File.exists?(gem_lock_file) && ARGV.include?('--clobber')
+  cmd "rm #{gem_lock_file}"
+end
+
+unless File.exists?(gem_lock_file)
+  # Generate it
+  cmd "rm Gemfile.lock" if file_or_symlink?("Gemfile.lock")
+  cmd "export RAILS=#{version} && bundle install"
+  cmd "mv Gemfile.lock #{gem_lock_file}"
+end
+
+cmd("rm Gemfile.lock") if file_or_symlink?("Gemfile.lock")
+cmd("ln -s #{gem_lock_file} Gemfile.lock")
+cmd("bundle")

data/spec/integration/belongs_to_spec.rb

@@ -33,7 +33,7 @@ describe_with_capybara "Belongs To" do
 
     describe "the view links" do
       it "should take you to the sub resource" do
-        click "View"
+        click_link "View"
         current_path.should == "/admin/users/#{user.id}/posts/#{post.id}"
       end
     end

data/spec/integration/default_namespace.rb

@@ -0,0 +1,77 @@
+require 'spec_helper'
+
+describe ActiveAdmin::Application do
+
+  include Rails.application.routes.url_helpers
+
+  [false, nil].each do |value|
+
+    describe "with a #{value} default namespace" do
+
+      before(:all) do
+        @__original_application = ActiveAdmin.application
+        application = ActiveAdmin::Application.new
+        application.default_namespace = value
+        ActiveAdmin.application = application
+        load_defaults!
+        reload_routes!
+      end
+
+      after(:all) do
+        ActiveAdmin.application = @__original_application
+      end
+
+      it "should generate a dashboard controller" do
+        defined?(::DashboardController).should be_true
+      end
+
+      it "should generate a dashboard route" do
+        dashboard_path.should == "/"
+      end
+
+      it "should generate a log out path" do
+        destroy_admin_user_session_path.should == "/admin_users/logout"
+      end
+
+      it "should generate a log in path" do
+        new_admin_user_session_path.should == "/admin_users/login"
+      end
+
+    end
+
+  end
+
+    describe "with a test default namespace" do
+
+      before(:all) do
+        @__original_application = ActiveAdmin.application
+        application = ActiveAdmin::Application.new
+        application.default_namespace = :test
+        ActiveAdmin.application = application
+        load_defaults!
+        reload_routes!
+      end
+
+      after(:all) do
+        ActiveAdmin.application = @__original_application
+      end
+
+      it "should generate a dashboard controller" do
+        defined?(::Test::DashboardController).should be_true
+      end
+
+      it "should generate a dashboard route" do
+        test_dashboard_path.should == "/test"
+      end
+
+      it "should generate a log out path" do
+        destroy_admin_user_session_path.should == "/test/logout"
+      end
+
+      it "should generate a log in path" do
+        new_admin_user_session_path.should == "/test/login"
+      end
+
+    end
+
+end

data/spec/integration/javascript_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+require 'jslint'
+
+%x[which java]
+if $? == 0 # Only run the JS Lint test if Java is installed
+  describe "Javascript" do
+    before do
+      @lint = JSLint::Lint.new(
+        :paths => ['public/javascripts/**/*.js'],
+        :exclude_paths => ['public/javascripts/vendor/**/*.js'],
+        :config_path => 'spec/support/jslint.yml'
+      )
+    end
+
+    it "should not have any syntax errors" do
+      @lint.run
+    end
+  end
+end
+

data/spec/integration/stylesheets_spec.rb

@@ -0,0 +1,41 @@
+require 'spec_helper'
+
+describe "Stylesheets" do
+  if Rails.version[0..2] == '3.1'
+    require "sprockets"
+    context "when Rails 3.1.x" do
+      let(:css) do
+        assets = Rails.application.assets
+        assets.find_asset("active_admin.css")
+      end
+      it "should successfully render the scss stylesheets using sprockets" do
+        css.should_not be_nil
+      end
+      it "should not have any syntax errors" do
+        css.to_s.should_not include("Syntax error:")
+      end
+    end
+  end
+
+  if Rails.version[0..2] == '3.0'
+    context "when Rails 3.0.x" do
+      let(:stylesheet_path) do
+        Rails.root + 'public/stylesheets/active_admin.css'
+      end
+
+      before do
+        "rm #{stylesheet_path}" if File.exists?(stylesheet_path)
+        Sass::Plugin.force_update_stylesheets
+      end
+
+      it "should render the scss stylesheets using SASS" do
+        File.exists?(stylesheet_path).should be_true
+      end
+
+      it "should not have any syntax errors" do
+        css = File.read(stylesheet_path)
+        css.should_not include("Syntax error:")
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -3,18 +3,15 @@ $LOAD_PATH << File.expand_path('../support', __FILE__)
 
 ENV['BUNDLE_GEMFILE'] = File.expand_path('../../Gemfile', __FILE__)
 
-require 'rubygems'
+require 'detect_rails_version'
+ENV['RAILS'] = detect_rails_version
+
 require "bundler"
 Bundler.setup
 
 require 'shoulda/active_record'
 include Shoulda::ActiveRecord::Macros
 
-# Setup autoloading of ActiveAdmin and the load path
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-autoload :ActiveAdmin, 'active_admin'
-
-
 module ActiveAdminIntegrationSpecHelper
   extend self
 
@@ -28,7 +25,7 @@ module ActiveAdminIntegrationSpecHelper
   end
 
   def reload_menus!
-    ActiveAdmin.namespaces.values.each{|n| n.load_menu! }
+    ActiveAdmin.application.namespaces.values.each{|n| n.load_menu! }
   end
 
   # Sometimes we need to reload the routes within
@@ -64,6 +61,16 @@ module ActiveAdminIntegrationSpecHelper
     end
   end
 
+  # Sets up an Arbre::Builder context
+  def setup_arbre_context!
+    include Arbre::Builder
+    let(:assigns){ {} }
+    let(:helpers){ mock_action_view }
+    before do
+      @_helpers = helpers
+    end
+  end
+
   # Setup a describe block which uses capybara and rails integration
   # test methods.
   def describe_with_capybara(*args, &block)
@@ -85,9 +92,7 @@ module ActiveAdminIntegrationSpecHelper
 
 end
 
-ENV['RAILS'] ||= '3.0.0'
 ENV['RAILS_ENV'] = 'test'
-
 ENV['RAILS_ROOT'] = File.expand_path("../rails/rails-#{ENV["RAILS"]}", __FILE__)
 
 # Create the test app if it doesn't exists
@@ -95,6 +100,11 @@ 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'
 require 'rspec/rails'
 
@@ -105,8 +115,8 @@ reload_routes!
 
 # Disabling authentication in specs so that we don't have to worry about
 # it allover the place
-ActiveAdmin.authentication_method = false
-ActiveAdmin.current_user_method = false
+ActiveAdmin.application.authentication_method = false
+ActiveAdmin.application.current_user_method = false
 
 # Don't add asset cache timestamps. Makes it easy to integration
 # test for the presence of an asset file