merb-admin 0.6.4 → 0.6.5

data/README.rdoc

@@ -11,7 +11,7 @@ http://github.com/sferik/merb-admin/raw/master/screenshots/edit.png
 == Installation
   $ gem install merb-admin -s http://gemcutter.org
 In your app, add the following dependency to <tt>config/dependencies.rb</tt>:
-  dependency "merb-admin", "0.6.4"
+  dependency "merb-admin", "0.6.5"
 Add the following route to <tt>config/router.rb</tt>:
   add_slice(:merb_admin, :path_prefix => "admin")
 Then, run the following rake task:
@@ -21,6 +21,7 @@ If you're feeling crafty, you can set a couple configuration options in <tt>conf
   Merb::BootLoader.before_app_loads do
     Merb::Slices::config[:merb_admin][:app_name] = "My App"
     Merb::Slices::config[:merb_admin][:per_page] = 100
+    Merb::Slices::config[:merb_admin][:excluded_models] = [:Top, :Secret]
   end
 == Usage
 Start the server:
@@ -50,5 +51,6 @@ Many thanks to:
 * {Aaron Wheeler}[http://fightinjoe.com/] for contributing libraries from {Merb AutoScaffold}[http://github.com/fightinjoe/merb-autoscaffold]
 * {Lori Holden}[http://loriholden.com/] for contributing the merb-pagination[http://github.com/lholden/merb-pagination] helper
 * {Jacques Crocker}[http://merbjedi.com] for adding support for {namespaced models}[http://github.com/merbjedi/merb-admin/commit/8139e2241038baf9b72452056fcdc7c340d79275]
-* {Jeremy Evans}[http://code.jeremyevans.net] and {Pavel Kunc}[http://www.merboutpost.com] reviewing the {patch}[http://github.com/sferik/merb-admin/commit/061fa28f652fc9214e9cf480d66870140181edef] to add Sequel[http://sequel.rubyforge.org/] support
+* {Jeremy Evans}[http://code.jeremyevans.net] and {Pavel Kunc}[http://www.merboutpost.com] for reviewing the {patch}[http://github.com/sferik/merb-admin/commit/061fa28f652fc9214e9cf480d66870140181edef] to add Sequel[http://sequel.rubyforge.org/] support
+* {Jonah Honeyman}[http://twitter.com/jonuts] for fixing a bug[http://github.com/sferik/merb-admin/commit/9064d10382eadd1ed7a882ef40e2c6a65edfef2c] and adding the {:excluded_models option}[http://github.com/sferik/merb-admin/commit/f6157d1c471dd85162481d6926578164be1b9673]
 Also, thanks to beer[http://www.21st-amendment.com].

data/Rakefile

@@ -9,7 +9,7 @@ AUTHOR = "Erik Michaels-Ober"
 EMAIL = "sferik@gmail.com"
 HOMEPAGE = "http://github.com/sferik/merb-admin"
 SUMMARY = "MerbAdmin is a Merb plugin that provides an easy-to-use interface for managing your data."
-GEM_VERSION = "0.6.4"
+GEM_VERSION = "0.6.5"
 MERB_GEM_VERSION = "1.0.15"
 
 spec = Gem::Specification.new do |s|

data/app/helpers/main_helper.rb

@@ -2,12 +2,12 @@ require 'builder'
 module Merb
   module MerbAdmin
     module MainHelper
-      def object_name(object)
+      def object_label(object)
         if object.nil?
           nil
-        elsif object.respond_to?(:name)
+        elsif object.respond_to?(:name) && object.name
           object.name
-        elsif object.respond_to?(:title)
+        elsif object.respond_to?(:title) && object.title
           object.title
         else
           "#{object.class.to_s} ##{object.id}"
@@ -44,7 +44,7 @@ module Merb
         when :integer
           association = @abstract_model.belongs_to_associations.select{|a| a[:child_key].first == property_name}.first
           if association
-            object_name(object.send(association[:name]))
+            object_label(object.send(association[:name]))
           else
             object.send(property_name)
           end

data/app/views/main/_belongs_to.html.erb

@@ -1,6 +1,6 @@
 <%
   child_key = association[:child_key].first
-  collection = MerbAdmin::AbstractModel.new(association[:parent_model]).all.map{|o| [o.id, object_name(o)]}.sort_by{|o| o[1]}
+  collection = MerbAdmin::AbstractModel.new(association[:parent_model]).all.map{|object| [object.id, object_label(object)]}.sort_by{|object| object[1]}
   selected = @object.send(child_key)
   label = association[:pretty_name]
   required = false

data/app/views/main/_has_many.html.erb

@@ -1,6 +1,6 @@
 <%
   association_name = association[:name]
-  collection = MerbAdmin::AbstractModel.new(association[:child_model]).all.map{|o| [o.id, object_name(o)]}.sort_by{|o| o[1]}
+  collection = MerbAdmin::AbstractModel.new(association[:child_model]).all.map{|object| [object.id, object_label(object)]}.sort_by{|object| object[1]}
   selected = @object.send(association_name)
   label = association[:pretty_name]
 %>

data/app/views/main/_has_one.html.erb

@@ -1,7 +1,7 @@
 <%
   child_key = association[:child_key].first
   association_name = association[:name]
-  collection = MerbAdmin::AbstractModel.new(association[:child_model]).all.map{|o| [o.id, object_name(o)]}.sort_by{|o| o[1]}
+  collection = MerbAdmin::AbstractModel.new(association[:child_model]).all.map{|object| [object.id, object_label(object)]}.sort_by{|object| object[1]}
   selected = @object.send(association_name)
   label = association[:pretty_name]
   required = false

data/app/views/main/delete.html.erb

@@ -1,12 +1,12 @@
-        <p>Are you sure you want to delete the <%= @abstract_model.pretty_name.downcase %> &ldquo;<%= object_name(@object) %>&rdquo;? All of the following related items will be deleted:</p>
+        <p>Are you sure you want to delete the <%= @abstract_model.pretty_name.downcase %> &ldquo;<%= object_label(@object) %>&rdquo;? All of the following related items will be deleted:</p>
         <ul>
           <li>
-            <%= @abstract_model.pretty_name %>: <%= link_to(object_name(@object), url(:merb_admin_edit, :model_name => @abstract_model.singular_name, :id => @object.id)) %>
+            <%= @abstract_model.pretty_name %>: <%= link_to(object_label(@object), url(:merb_admin_edit, :model_name => @abstract_model.singular_name, :id => @object.id)) %>
             <ul>
               <% @abstract_model.has_many_associations.each do |association| %>
               <% @object.send(association[:name]).reject{|child| child.nil?}.each do |child| %>
               <li>
-                One or more <%= @abstract_model.pretty_name.pluralize.downcase %> in <%= association[:pretty_name].downcase %>: <%= link_to(object_name(child), url(:merb_admin_edit, :model_name => association[:name].to_s.singularize.to_sym, :id => child.id)) %>
+                One or more <%= @abstract_model.pretty_name.pluralize.downcase %> in <%= association[:pretty_name].downcase %>: <%= link_to(object_label(child), url(:merb_admin_edit, :model_name => association[:name].to_s.singularize.to_sym, :id => child.id)) %>
               </li>
               <% end %>
               <% end %>
@@ -14,7 +14,7 @@
               <% child = @object.send(association[:name]) %>
               <% next if child.nil? %>
               <li>
-                A <%= @abstract_model.pretty_name.downcase %> in <%= association[:pretty_name].downcase %>: <%= link_to(object_name(child), url(:merb_admin_edit, :model_name => association[:name], :id => child.id)) %>
+                A <%= @abstract_model.pretty_name.downcase %> in <%= association[:pretty_name].downcase %>: <%= link_to(object_label(child), url(:merb_admin_edit, :model_name => association[:name], :id => child.id)) %>
               </li>
               <% end %>
             </ul>

data/lib/abstract_model.rb

@@ -4,29 +4,31 @@ module MerbAdmin
   class AbstractModel
     # Returns all models for a given Merb app
     def self.all
-      return @models if @models
       @models = []
       orm = Merb.orm
       case orm
       when :activerecord, :sequel
         Dir.glob(Merb.dir_for(:model) / Merb.glob_for(:model)).each do |filename|
           File.read(filename).scan(/class ([\w\d_\-:]+)/).flatten.each do |model_name|
-            model = lookup(model_name.to_sym)
-            @models << new(model) if model
+            add_model(model_name.to_sym)
           end
         end
       when :datamapper
         DataMapper::Model.descendants.each do |model_name|
-          # Remove DataMapperSessionStore because it's included by default
-          next if m == Merb::DataMapperSessionStore if Merb.const_defined?(:DataMapperSessionStore)
-          model = lookup(model_name.to_s.to_sym)
-          @models << new(model) if model
+          add_model(model_name.to_s.to_sym)
         end
       else
         raise "MerbAdmin does not support the #{orm} ORM"
       end
       @models.sort!{|x, y| x.model.to_s <=> y.model.to_s}
     end
+    
+    def self.add_model(name)
+      puts MerbAdmin[:excluded_models].inspect
+      return if MerbAdmin[:excluded_models].include?(name)
+      model = lookup(name)
+      @models << new(model) if model
+    end
 
     # Given a symbol +model_name+, finds the corresponding model class
     def self.lookup(model_name)

data/lib/merb-admin.rb

@@ -17,13 +17,14 @@ if defined?(Merb::Plugins)
   # :mirror - which path component types to use on copy operations; defaults to all
   Merb::Slices::config[:merb_admin][:layout] ||= :merb_admin
   Merb::Slices::config[:merb_admin][:per_page] ||= 100
+  Merb::Slices::config[:merb_admin][:excluded_models] ||= []
 
   # All Slice code is expected to be namespaced inside a module
   module MerbAdmin
 
     # Slice metadata
     self.description = "MerbAdmin is a Merb plugin that provides an easy-to-use interface for managing your data."
-    self.version = "0.6.4"
+    self.version = "0.6.5"
     self.author = "Erik Michaels-Ober"
 
     # Stub classes loaded hook - runs before LoadClasses BootLoader

data/spec/migrations/activerecord/005_create_teams_migration.rb

@@ -4,7 +4,7 @@ class CreateTeamsMigration < ActiveRecord::Migration
       t.timestamps
       t.integer(:league_id)
       t.integer(:division_id)
-      t.string(:name, :limit => 50, :null => false)
+      t.string(:name, :limit => 50)
       t.string(:logo_url, :limit => 255)
       t.string(:manager, :limit => 100, :null => false)
       t.string(:ballpark, :limit => 100)

data/spec/migrations/sequel/005_create_teams_migration.rb

@@ -6,7 +6,7 @@ class CreateTeams < Sequel::Migration
       DateTime(:updated_at)
       foreign_key(:league_id, :table => :leagues)
       foreign_key(:division_id, :table => :divisions)
-      String(:name, :limit => 50, :null => false)
+      String(:name, :limit => 50)
       String(:logo_url, :limit => 255)
       String(:manager, :limit => 100, :null => false)
       String(:ballpark, :limit => 100)

data/spec/models/activerecord/team.rb

@@ -1,7 +1,6 @@
 class Team < ActiveRecord::Base
   validates_numericality_of(:league_id, :only_integer => true)
   validates_numericality_of(:division_id, :only_integer => true)
-  validates_presence_of(:name)
   validates_presence_of(:manager)
   validates_numericality_of(:founded, :only_integer => true)
   validates_numericality_of(:wins, :only_integer => true)

data/spec/models/datamapper/team.rb

@@ -6,7 +6,7 @@ class Team
   property(:updated_at, DateTime)
   property(:league_id, Integer, :nullable => false, :index => true)
   property(:division_id, Integer, :nullable => false, :index => true)
-  property(:name, String, :nullable => false, :index => true)
+  property(:name, String, :index => true)
   property(:logo_url, String, :length => 255)
   property(:manager, String, :length => 100, :nullable => false, :index => true)
   property(:ballpark, String, :length => 100, :index => true)

data/spec/models/sequel/team.rb

@@ -12,7 +12,6 @@ class Team < Sequel::Model
   def validate
     validates_numeric(:league_id, :only_integer => true)
     validates_numeric(:division_id, :only_integer => true)
-    validates_presence(:name)
     validates_presence(:manager)
     validates_numeric(:founded, :only_integer => true)
     validates_numeric(:wins, :only_integer => true)

data/spec/requests/main_spec.rb

@@ -10,15 +10,15 @@ end
 
 given "two players exist" do
   @players = []
-  2.times do |i|
-    @players << MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => i + 1, :name => "Player #{i + 1}")
+  (1..2).each do |number|
+    @players << MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => number, :name => "Player #{number}")
   end
 end
 
 given "three teams exist" do
   @teams = []
-  3.times do |i|
-    @teams << MerbAdmin::AbstractModel.new("Team").create(:league_id => rand(99999), :division_id => rand(99999), :name => "Team #{i + 1}", :manager => "Manager #{i + 1}", :founded => 1869 + rand(130), :wins => (wins = rand(163)), :losses => 162 - wins, :win_percentage => ("%.3f" % (wins.to_f / 162)).to_f)
+  (1..3).each do |number|
+    @teams << MerbAdmin::AbstractModel.new("Team").create(:league_id => rand(99999), :division_id => rand(99999), :name => "Team #{number}", :manager => "Manager #{number}", :founded => 1869 + rand(130), :wins => (wins = rand(163)), :losses => 162 - wins, :win_percentage => ("%.3f" % (wins.to_f / 162)).to_f)
   end
 end
 
@@ -30,23 +30,31 @@ end
 given "a player exists and three teams exist" do
   @player = MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => 1, :name => "Player 1")
   @teams = []
-  3.times do |i|
-    @teams << MerbAdmin::AbstractModel.new("Team").create(:league_id => rand(99999), :division_id => rand(99999), :name => "Team #{i + 1}", :manager => "Manager #{i + 1}", :founded => 1869 + rand(130), :wins => (wins = rand(163)), :losses => 162 - wins, :win_percentage => ("%.3f" % (wins.to_f / 162)).to_f)
+  (1..3).each do |number|
+    @teams << MerbAdmin::AbstractModel.new("Team").create(:league_id => rand(99999), :division_id => rand(99999), :name => "Team #{number}", :manager => "Manager #{number}", :founded => 1869 + rand(130), :wins => (wins = rand(163)), :losses => 162 - wins, :win_percentage => ("%.3f" % (wins.to_f / 162)).to_f)
+  end
+end
+
+given "a player exists and three teams with no name exist" do
+  @player = MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => 1, :name => "Player 1")
+  @teams = []
+  (1..3).each do |number|
+    @teams << MerbAdmin::AbstractModel.new("Team").create(:league_id => rand(99999), :division_id => rand(99999), :manager => "Manager #{number}", :founded => 1869 + rand(130), :wins => (wins = rand(163)), :losses => 162 - wins, :win_percentage => ("%.3f" % (wins.to_f / 162)).to_f)
   end
 end
 
 given "a league exists and three teams exist" do
-  @league = League.create(:name => "League 1")
+  @league = MerbAdmin::AbstractModel.new("League").create(:name => "League 1")
   @teams = []
-  3.times do |i|
-    @teams << MerbAdmin::AbstractModel.new("Team").create(:league_id => rand(99999), :division_id => rand(99999), :name => "Team #{i + 1}", :manager => "Manager #{i + 1}", :founded => 1869 + rand(130), :wins => (wins = rand(163)), :losses => 162 - wins, :win_percentage => ("%.3f" % (wins.to_f / 162)).to_f)
+  (1..3).each do |number|
+    @teams << MerbAdmin::AbstractModel.new("Team").create(:league_id => rand(99999), :division_id => rand(99999), :name => "Team #{number}", :manager => "Manager #{number}", :founded => 1869 + rand(130), :wins => (wins = rand(163)), :losses => 162 - wins, :win_percentage => ("%.3f" % (wins.to_f / 162)).to_f)
   end
 end
 
 given "twenty players exist" do
   @players = []
-  20.times do |i|
-    @players << MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => i + 1, :name => "Player #{i + 1}")
+  (1..20).each do |number|
+    @players << MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => number, :name => "Player #{number}")
   end
 end
 
@@ -72,6 +80,25 @@ describe "MerbAdmin" do
     it "should show \"Site administration\"" do
       @response.body.should contain("Site administration")
     end
+
+    it "should be sorted correctly" do
+      @response.body.should contain(/Division.*Draft.*League.*Player.*Team/m)
+    end
+  end
+
+  describe "dashboard with excluded models" do
+    before(:each) do
+      MerbAdmin[:excluded_models] = [:Player]
+      @response = request(url(:merb_admin_dashboard))
+    end
+
+    it "should respond sucessfully" do
+      @response.should be_successful
+    end
+
+    it "should not contain excluded models" do
+      @response.body.should_not contain(/Player/)
+    end
   end
 
   describe "list" do
@@ -347,6 +374,16 @@ describe "MerbAdmin" do
     end
   end
 
+  describe "new with missing label", :given => "a player exists and three teams with no name exist" do
+    before(:each) do
+      @response = request(url(:merb_admin_new, :model_name => "player"))
+    end
+
+    it "should respond sucessfully" do
+      @response.should be_successful
+    end
+  end
+
   describe "edit", :given => "a player exists" do
     before(:each) do
       @response = request(url(:merb_admin_edit, :model_name => "player", :id => @player.id))
@@ -402,7 +439,6 @@ describe "MerbAdmin" do
     end
   end
 
-
   describe "edit with missing object" do
     before(:each) do
       @response = request(url(:merb_admin_edit, :model_name => "player", :id => 1))
@@ -413,6 +449,16 @@ describe "MerbAdmin" do
     end
   end
 
+  describe "edit with missing label", :given => "a player exists and three teams with no name exist" do
+    before(:each) do
+      @response = request(url(:merb_admin_edit, :model_name => "player", :id => @player.id))
+    end
+
+    it "should respond sucessfully" do
+      @response.should be_successful
+    end
+  end
+
   describe "create" do
     before(:each) do
       @response = request(url(:merb_admin_create, :model_name => "player"), :method => "post", :params => {:player => {:name => "Jackie Robinson", :number => 42, :team_id => 1, :position => "Second baseman"}})
@@ -633,6 +679,18 @@ describe "MerbAdmin" do
     end
   end
 
+  describe "delete with missing label" do
+    before(:each) do
+      @league = MerbAdmin::AbstractModel.new("League").create(:name => "League 1")
+      @team = MerbAdmin::AbstractModel.new("Team").create(:league_id => @league.id, :division_id => rand(99999), :manager => "Manager 1", :founded => 1869 + rand(130), :wins => (wins = rand(163)), :losses => 162 - wins, :win_percentage => ("%.3f" % (wins.to_f / 162)).to_f)
+      @response = request(url(:merb_admin_delete, :model_name => "league", :id => @league.id))
+    end
+
+    it "should respond sucessfully" do
+      @response.should be_successful
+    end
+  end
+
   describe "destroy", :given => "a player exists" do
     before(:each) do
       @response = request(url(:merb_admin_destroy, :model_name => "player", :id => @player.id), :method => "delete")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-admin
 version: !ruby/object:Gem::Version 
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors: 
 - Erik Michaels-Ober
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-06 00:00:00 -08:00
+date: 2009-11-12 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency