activeadmin 0.2.1 → 0.2.2

data/lib/active_admin/views/pages/dashboard.rb

@@ -21,8 +21,6 @@ module ActiveAdmin
         end
 
         def render_sections(sections)
-          p "Rendering sections"
-          p sections.count
           table :class => "dashboard" do
             sections.in_groups_of(3, false).each do |row|
               tr do

data/lib/active_admin/views/pages/index.rb

@@ -20,7 +20,9 @@ module ActiveAdmin
           renderer_class = find_index_renderer_class(config[:as])
 
           paginated_collection(collection, :entry_name => active_admin_config.resource_name) do
-            insert_tag(renderer_class, config, collection)
+            div :class => 'index_content' do
+              insert_tag(renderer_class, config, collection)
+            end
           end
         end
 

data/lib/active_admin/views/templates/active_admin/devise/sessions/new.html.erb

@@ -4,7 +4,7 @@
   <% scope = Devise::Mapping.find_scope!(resource_name) %>
   <%= active_admin_form_for(resource, :as => resource_name, :url => send(:"#{scope}_session_path"), :html => { :id => "session_new" }) do |f| 
     f.inputs do
-      f.input :email
+      Devise.authentication_keys.each { |key| f.input key }
       f.input :password
       f.input :remember_me, :as => :boolean, :if =>  false  #devise_mapping.rememberable? }
     end

data/lib/active_admin/views/templates/layouts/active_admin_logged_out.html.erb

@@ -19,7 +19,7 @@
         <%= content_tag :div, message, :class => "flash flash_#{type}" %>
       <% end %>
     <% end %>
-    <div id="content">
+    <div id="active_admin_content">
       <%= yield %>
     </div>
   </div>

data/lib/generators/active_admin/devise/devise_generator.rb

@@ -35,9 +35,13 @@ module ActiveAdmin
       end
 
       def add_default_user_to_migration
-        inject_into_file  Dir["db/migrate/*_devise_create_#{table_name}.rb"].first, 
-                          "# Create a default user\n    #{class_name}.create!(:email => 'admin@example.com', :password => 'password', :password_confirmation => 'password')\n\n    ",
-                          :before => "add_index :#{table_name}, :email"
+        # Don't assume that we have a migration!
+        devise_migrations = Dir["db/migrate/*_devise_create_#{table_name}.rb"]
+        if devise_migrations.size > 0
+          inject_into_file  Dir["db/migrate/*_devise_create_#{table_name}.rb"].first, 
+                            "# Create a default user\n    #{class_name}.create!(:email => 'admin@example.com', :password => 'password', :password_confirmation => 'password')\n\n    ",
+                            :before => "add_index :#{table_name}, :email"
+        end
       end
 
     end

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

@@ -43,16 +43,17 @@ ActiveAdmin.setup do |config|
   # This setting changes the method which Active Admin calls
   # to return the currently logged in user.
   config.current_user_method = :current_admin_user
-  
 
-  # == Admin Notes
-  # 
+
+  # == Admin Comments
+  #
   # Admin notes allow you to add notes to any model
   #
-  # Admin notes are enabled by default, but can be disabled
-  # by uncommenting this line:
+  # Admin notes are enabled by default in the default
+  # namespace only. You can turn them on in a namesapce
+  # by adding them to the comments array.
   #
-  config.admin_notes = true
+  # config.allow_comments_in = [:admin]
 
 
   # == Controller Filters

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

@@ -8,9 +8,10 @@ ActiveAdmin::Dashboards.build do
   # 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)))
+  #     ul do
+  #       Post.recent(5).collect do |post|
+  #         li link_to(post.title, admin_post_path(post))
+  #       end
   #     end
   #   end
   

data/spec/{integration → controllers}/index_as_csv_spec.rb

@@ -1,40 +1,35 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
-describe_with_render "Index as CSV" do
-
-  before :all do
-    load_defaults!
-    reload_routes!
-  end
-
-  before(:each) do
-    Admin::PostsController.reset_index_config!
-  end
-  
+describe_with_render Admin::PostsController do
   describe "get index with format csv" do
+
     before do
       Post.create :title => "Hello World"
       Post.create :title => "Goodbye World"
     end
+
     it "should return csv" do
       get :index, 'format' => 'csv'
       response.content_type.should == 'text/csv'
     end
+
     it "should return a header and a line for each item" do
       get :index, 'format' => 'csv'
       response.body.split("\n").size.should == 3
     end
+
     Post.columns.each do |column|
       it "should include a header for #{column.name}" do
         get :index, 'format' => 'csv'
         response.body.split("\n").first.should include(column.name.titleize)
       end
     end
+
     it "should set a much higher per page pagination" do
       100.times{ Post.create :title => "woot" }
       get :index, 'format' => 'csv'
       response.body.split("\n").size.should == 103
     end
-  end
 
+  end
 end

data/spec/integration/belongs_to_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 describe_with_capybara "Belongs To" do
 

data/spec/spec_helper.rb

@@ -59,7 +59,7 @@ module ActiveAdminIntegrationSpecHelper
     describe *args do
       include RSpec::Rails::ControllerExampleGroup
       render_views  
-      metadata[:behaviour][:describes] = ActiveAdmin.namespaces[:admin].resources['Post'].controller
+      # metadata[:behaviour][:describes] = ActiveAdmin.namespaces[:admin].resources['Post'].controller
       module_eval &block
     end
   end
@@ -67,7 +67,6 @@ module ActiveAdminIntegrationSpecHelper
   # Setup a describe block which uses capybara and rails integration
   # test methods.
   def describe_with_capybara(*args, &block)
-    require 'integration_example_group'
     describe *args do
       include RSpec::Rails::IntegrationExampleGroup
       module_eval &block
@@ -113,15 +112,22 @@ ActiveAdmin.current_user_method = false
 # test for the presence of an asset file
 ENV["RAILS_ASSET_ID"] = ''
 
-Rspec.configure do |config|
+RSpec.configure do |config|
   config.use_transactional_fixtures = true
   config.use_instantiated_fixtures = false
 end
 
+# All RSpec configuration needs to happen before any examples
+# or else it whines.
+require 'integration_example_group'
+RSpec.configure do |c|
+  c.include RSpec::Rails::IntegrationExampleGroup, :example_group => { :file_path => /\bspec\/integration\// }
+end
+
 # Ensure this is defined for Ruby 1.8
 module MiniTest; class Assertion < Exception; end; end
 
-Rspec::Matchers.define :have_tag do |*args|
+RSpec::Matchers.define :have_tag do |*args|
 
   match_unless_raises Test::Unit::AssertionFailedError do |response|
     tag = args.shift

data/spec/support/integration_example_group.rb

@@ -28,10 +28,6 @@ module RSpec
           @router = ::Rails.application.routes
         end
       end
-
-      RSpec.configure do |c|
-        c.include self, :example_group => { :file_path => /\bspec\/integration\// }
-      end
     end
   end
 end

data/spec/support/rails_template.rb

@@ -8,8 +8,9 @@ gsub_file 'config/database.yml', /\z/, "\ncucumber:\n  <<: *test\n  database: db
 # Generate some test models
 generate :model, "post title:string body:text published_at:datetime author_id:integer category_id:integer"
 inject_into_file 'app/models/post.rb', "  belongs_to :author, :class_name => 'User'\n  belongs_to :category\n  accepts_nested_attributes_for :author\n", :after => "class Post < ActiveRecord::Base\n"
-generate :model, "user first_name:string last_name:string username:string"
+generate :model, "user type:string first_name:string last_name:string username:string"
 inject_into_file 'app/models/user.rb', "  has_many :posts, :foreign_key => 'author_id'\n", :after => "class User < ActiveRecord::Base\n"
+generate :model, "publisher --migration=false --parent=User"
 generate :model, 'category name:string description:text'
 inject_into_file 'app/models/category.rb', "  has_many :posts\n", :after => "class Category < ActiveRecord::Base\n"
 

data/spec/unit/action_builder_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') 
+require 'spec_helper' 
 
 describe 'defining new actions from registration blocks' do
 

data/spec/unit/action_items_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') 
+require 'spec_helper' 
 
 describe ActiveAdmin::ActionItems do
 

data/spec/unit/active_admin_spec.rb

@@ -1,4 +1,5 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
+require 'fileutils'
 
 describe ActiveAdmin do
 
@@ -13,11 +14,11 @@ describe ActiveAdmin do
   it "should remove app/admin from the eager load paths (Active Admin deals with loading)" do
     Rails.application.config.eager_load_paths.should_not include(File.join(Rails.root, "app/admin"))
   end
-  
+
   it "should default the application name" do
     ActiveAdmin.site_title.should == Rails.application.class.to_s.split('::').first
   end
-  
+
   it "should set the site title" do
     old_title = ActiveAdmin.site_title.dup
     ActiveAdmin.site_title = "New Title"
@@ -28,13 +29,25 @@ describe ActiveAdmin do
   it "should have a view factory" do
     ActiveAdmin.view_factory.should be_an_instance_of(ActiveAdmin::ViewFactory)
   end
-  
+
   it "should have admin notes by default" do
     ActiveAdmin.admin_notes.should be_true
   end
-  
+
   it "should have a default current_user_method" do
     ActiveAdmin.current_user_method.should == false
   end
-  
+
+  describe "files in load path" do
+    it "should load files in the first level directory" do
+      ActiveAdmin.files_in_load_path.should include(File.expand_path("app/admin/dashboards.rb", Rails.root))
+    end
+    it "should load files from subdirectories" do
+      FileUtils.mkdir_p(File.expand_path("app/admin/public", Rails.root))
+      test_file = File.expand_path("app/admin/public/posts.rb", Rails.root)
+      FileUtils.touch(test_file)
+      ActiveAdmin.files_in_load_path.should include(test_file)
+    end
+  end
+
 end

data/spec/unit/arbre/html_spec.rb

@@ -148,6 +148,27 @@ HTML
     end
   end
 
+  describe "self-closing nodes" do
+    it "should not self-close script tags" do
+      tag = script :type => 'text/javascript'
+      tag.to_html.should == <<-HTML
+<script type="text/javascript"></script>
+HTML
+    end
+    it "should self-close meta tags" do
+      tag = meta :content => "text/html; charset=utf-8"
+      tag.to_html.should == <<-HTML
+<meta content="text/html; charset=utf-8\"/>
+HTML
+    end
+    it "should self-close link tags" do
+      tag = link :rel => "stylesheet"
+      tag.to_html.should == <<-HTML
+<link rel="stylesheet"/>
+HTML
+    end
+  end
+
   describe "html safe" do
     it "should escape the contents" do
       span("<br />").to_html.should == <<-HTML
@@ -179,7 +200,11 @@ HTML
 HTML
     end
 
-    it "should escape the contents of attributes"
+    it "should escape the contents of attributes" do
+      span(:class => "<br />").to_html.should == <<-HTML
+<span class="&lt;br /&gt;"></span>
+HTML
+    end
   end
 
 end

data/spec/unit/asset_registration_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') 
+require 'spec_helper' 
 
 module MockRegistration
   extend ActiveAdmin::AssetRegistration

data/spec/unit/belongs_to_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') 
+require 'spec_helper' 
 
 module ActiveAdmin
   class Resource

data/spec/unit/breadcrumbs_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') 
+require 'spec_helper' 
 
 describe "Breadcrumbs" do
 

data/spec/unit/comments_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe "Configuration" do
   it "should have an array of namespaces which allow comments" do

data/spec/unit/controller_filters_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') 
+require 'spec_helper' 
 
 describe ActiveAdmin, "filters" do
 

data/spec/unit/dashboard_controller_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') 
+require 'spec_helper' 
 
 
 module Admin

data/spec/unit/dashboard_section_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') 
+require 'spec_helper' 
 
 describe ActiveAdmin::Dashboards::Section do
 

data/spec/unit/dashboards_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') 
+require 'spec_helper' 
 
 describe ActiveAdmin::Dashboards do
 

data/spec/unit/filter_form_builder_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') 
+require 'spec_helper' 
 
 
 describe ActiveAdmin::ViewHelpers::FilterFormHelper do

data/spec/unit/form_builder_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') 
+require 'spec_helper' 
 
 describe ActiveAdmin::FormBuilder do
   include Arbre::HTML

data/spec/unit/menu_item_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') 
+require 'spec_helper' 
 
 module ActiveAdmin
   describe MenuItem do

data/spec/unit/menu_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') 
+require 'spec_helper' 
 
 describe ActiveAdmin::Menu do
 

data/spec/unit/namespace_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') 
+require 'spec_helper' 
 
 describe ActiveAdmin::Namespace do
 

data/spec/unit/registration_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') 
+require 'spec_helper' 
 
 describe "Registering an object to administer" do
 

data/spec/unit/renderer_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 include ActiveAdmin
 

data/spec/unit/resource_controller/collection_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+describe ActiveAdmin::ResourceController::Collection do
+  let(:params) do
+    {}
+  end
+
+  let(:controller) do
+    rc = Admin::PostsController.new
+    rc.stub!(:params) do
+      params
+    end
+    rc
+  end
+
+  describe ActiveAdmin::ResourceController::Collection::Search do
+    let(:params){ {:q => {} }}
+    it "should call the metasearch method" do
+      chain = mock("ChainObj")
+      chain.should_receive(:metasearch).with(params[:q]).once.and_return(Post.search)
+      controller.send :search, chain
+    end
+  end
+
+  describe ActiveAdmin::ResourceController::Collection::Sorting do
+    let(:params){ {:order => "id_asc" }}
+    it "should prepend the table name" do
+      chain = mock("ChainObj")
+      chain.should_receive(:order).with("posts.id asc").once.and_return(Post.search)
+      controller.send :sort_order, chain
+    end
+  end
+
+end