merb-admin 0.5.4 → 0.5.5

data/README.markdown

@@ -14,7 +14,7 @@ At the command prompt, type:
 
 In your app, add the following dependency to `config/dependencies.rb`:
 
-    dependency "merb-admin", "0.5.4"
+    dependency "merb-admin", "0.5.5"
 
 Add the following route to `config/router.rb`:
 

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.5.4"
+GEM_VERSION = "0.5.5"
 
 spec = Gem::Specification.new do |s|
   s.rubyforge_project = "merb"

data/app/helpers/main_helper.rb

@@ -2,7 +2,7 @@ require 'builder'
 module Merb
   module MerbAdmin
     module MainHelper
-      def object_title(object)
+      def object_name(object)
         if object.nil?
           nil
         elsif object.respond_to?(:name)
@@ -24,7 +24,7 @@ module Merb
           else
             Builder::XmlMarkup.new.img(:src => image_path("icon-no.gif"), :alt => "False")
           end
-        when :date_time
+        when :datetime
           value = object.send(property_name)
           value.respond_to?(:strftime) ? value.strftime("%b. %d, %Y, %I:%M%p") : nil
         when :date
@@ -34,13 +34,17 @@ module Merb
           value = object.send(property_name)
           value.respond_to?(:strftime) ? value.strftime("%I:%M%p") : nil
         when :string
-          object.send(property_name).to_s.truncate(50)
+          if property_name.to_s =~ /(image|logo|photo|photograph|picture|thumb|thumbnail)_ur(i|l)/i
+            Builder::XmlMarkup.new.img(:src => object.send(property_name), :width => 10, :height => 10)
+          else
+            object.send(property_name).to_s.truncate(50)
+          end
         when :text
           object.send(property_name).to_s.truncate(50)
         when :integer
           association = @abstract_model.belongs_to_associations.select{|a| a[:child_key].first == property_name}.first
           if association
-            object_title(object.send(association[:name]))
+            object_name(object.send(association[:name]))
           else
             object.send(property_name)
           end

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

@@ -1,9 +1,10 @@
 <%
   child_key = association[:child_key].first
-  collection = MerbAdmin::AbstractModel.new(association[:parent_model]).all.map{|o| [o.id, object_title(o)]}.sort_by{|o| o[1]}
+  collection = MerbAdmin::AbstractModel.new(association[:parent_model]).all.map{|o| [o.id, object_name(o)]}.sort_by{|o| o[1]}
   selected = @object.send(child_key)
   label = association[:pretty_name]
   required = false
+  errors_exist = !(@object.errors[child_key].nil? || @object.errors[child_key].empty?)
   @properties.each do |property|
     next unless property[:name] == child_key
     required = true unless property[:nullable?]
@@ -11,8 +12,8 @@
 %>
             <fieldset class="module aligned">
               <h2><%= label %></h2>
-              <div class="<%= @object.errors[child_key] ? "form-row errors" : "form-row"%>">
-                <% if @object.errors[child_key] %>
+              <div class="<%= errors_exist ? "form-row errors" : "form-row"%>">
+                <% if errors_exist %>
                 <ul class="errorlist">
                   <% @object.errors[child_key].each do |error| %>
                   <li><%= error %></li>

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

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

@@ -1,10 +1,11 @@
 <%
   child_key = association[:child_key].first
   association_name = association[:name]
-  collection = MerbAdmin::AbstractModel.new(association[:child_model]).all.map{|o| [o.id, object_title(o)]}.sort_by{|o| o[1]}
+  collection = MerbAdmin::AbstractModel.new(association[:child_model]).all.map{|o| [o.id, object_name(o)]}.sort_by{|o| o[1]}
   selected = @object.send(association_name)
   label = association[:pretty_name]
   required = false
+  errors_exist = !(@object.errors[child_key].nil? || @object.errors[child_key].empty?)
   @properties.each do |property|
     next unless property[:name] == child_key
     required = true unless property[:nullable?]
@@ -12,8 +13,8 @@
 %>
             <fieldset class="module aligned">
               <h2><%= label %></h2>
-              <div class="<%= @object.errors[child_key] ? "form-row errors" : "form-row" %>">
-                <% if @object.errors[child_key] %>
+              <div class="<%= errors_exist ? "form-row errors" : "form-row" %>">
+                <% if errors_exist %>
                 <ul class="errorlist">
                   <% @object.errors[child_key].each do |error| %>
                   <li><%= error %></li>

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

@@ -3,10 +3,11 @@
               <% properties.each do |property| %>
               <% property_name = property[:name] %>
               <% property_type = property[:type] %>
+              <% errors_exist = !(@object.errors[property_name].nil? || @object.errors[property_name].empty?) %>
               <% next if [:id, :created_at, :created_on, :deleted_at, :updated_at, :updated_on, :deleted_on].include?(property_name) %>
               <% next if belongs_to_keys.include?(property_name) %>
-              <div class="<%= @object.errors[property_name] ? "form-row errors" : "form-row" %>">
-                <% if @object.errors[property_name] %>
+              <div class="<%= errors_exist ? "form-row errors" : "form-row" %>">
+                <% if errors_exist %>
                 <ul class="errorlist">
                   <% @object.errors[property_name].each do |error| %>
                   <li><%= error %></li>

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

@@ -6,6 +6,9 @@
 %>
                 <div>
                   <%= text_field(property_name, :size => [50, length].min, :maxlength => length, :label => label) %>
+                  <% if property_name.to_s =~ /(image|logo|photo|photograph|picture|thumb|thumbnail)_ur(i|l)/i %>
+                    <img src="<%= @object.send(property_name) %>" width="10" height"10" />
+                  <% end %>
                   <p class="help">
                     <%= required ? "Required." : "Optional." %> <%= length %> <%= length == 1 ? "character." : "characters or fewer." %>
                   </p>

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

@@ -1,7 +1,24 @@
-        <p>Are you sure you want to delete the <%= @abstract_model.pretty_name.downcase %>? 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_name(@object) %>&rdquo;? All of the following related items will be deleted:</p>
         <ul>
           <li>
-            <%= link_to(@model_name, url(:merb_admin_edit, :model_name => @abstract_model.singular_name, :id => @object.id))%>
+            <%= @abstract_model.pretty_name %>: <%= link_to(object_name(@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]).each do |child| %>
+              <% next if child.nil? %>
+              <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)) %>
+              </li>
+              <% end %>
+              <% end %>
+              <% @abstract_model.has_one_associations.each do |association| %>
+              <% 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)) %>
+              </li>
+              <% end %>
+            </ul>
           </li>
         </ul>
         <%= form_for(@object, :action => url(:merb_admin_destroy, :model_name => @abstract_model.singular_name, :id => @object.id), :method => :delete) do %>

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

@@ -4,6 +4,7 @@
   filter = params[:filter]
   sort = params[:sort]
   sort_reverse = params[:sort_reverse]
+  filters_exist = !@properties.select{|property| property[:type] == :boolean}.empty?
 %>
         <div id="content-main">
           <ul class="object-tools">
@@ -11,7 +12,7 @@
               <%= link_to("Add #{@abstract_model.pretty_name.downcase}", url(:merb_admin_new, :model_name => @abstract_model.singular_name), :class => "addlink") %>
             </li>
           </ul>
-          <div class="module filtered" id="changelist">
+          <div class="<%= filters_exist ? "module filtered" : "module" %>" id="changelist">
             <div id="toolbar">
               <form id="changelist-search" action="" method="get">
               <div>
@@ -30,6 +31,7 @@
               </form>
             </div>
             <script type="text/javascript">document.getElementById("searchbar").focus();</script>
+            <% if filters_exist %>
             <div id="changelist-filter">
               <h2>Filter</h2>
               <% @properties.each do |property| %>
@@ -52,13 +54,14 @@
               <% end %>
               <% end %>
             </div>
+            <% end %>
             <table cellspacing="0">
               <thead>
                 <tr>
                   <% @properties.each do |property| %>
                   <% property_name = property[:name] %>
                   <% property_pretty_name = property[:pretty_name] %>
-                  <th class="<%= sort == property_name.to_s ? sort_reverse ? 'sorted descending' : 'sorted ascending' : nil %>">
+                  <th class="<%= sort == property_name.to_s ? sort_reverse ? "sorted descending" : "sorted ascending" : nil %>">
                     <%= link_to(property_pretty_name, "?" + Merb::Parse.params_to_query_string(params.merge(:sort => property_name).reject{|key, value| key.to_sym == :sort_reverse}.merge(sort == property_name.to_s && sort_reverse != "true" ? {:sort_reverse => "true"} : {}))) %>
                   </th>
                   <% end %>

data/lib/merb-admin/slicetasks.rb

@@ -4,32 +4,6 @@ require 'mlb'
 namespace :slices do
   namespace :"merb-admin" do
 
-    desc "Loads sample DataMapper models and data"
-    task :load_sample => ["load_sample:datamapper"]
-
-    namespace :load_sample do
-
-      desc "Loads sample ActiveRecord models"
-      task :activerecord do
-        puts "Copying sample ActiveRecord models into host application - resolves any collisions"
-        copy_models(:activerecord)
-        puts "Copying sample ActiveRecord migrations into host application - resolves any collisions"
-        copy_migrations
-        Rake::Task["db:migrate"].reenable
-        Rake::Task["db:migrate"].invoke
-        load_data
-      end
-
-      desc "Loads sample DataMapper models"
-      task :datamapper do
-        puts "Copying sample DataMapper models into host application - resolves any collisions"
-        copy_models(:datamapper)
-        Rake::Task["db:automigrate"].reenable
-        Rake::Task["db:automigrate"].invoke
-        load_data
-      end
-    end
-
     # add your own merb-admin tasks here
 
     # # Uncomment the following lines and edit the pre defined tasks
@@ -45,6 +19,47 @@ namespace :slices do
     # task :migrate do
     # end
 
+    namespace :activerecord do
+
+      desc "Loads sample ActiveRecord models and data"
+      task :load_sample => ["load_sample:activerecord:models", "load_sample:activerecord:data"]
+      namespace :load_sample do
+        desc "Loads sample ActiveRecord models"
+        task :models do
+          copy_models(:activerecord)
+          copy_migrations(:activerecord)
+        end
+
+        desc "Loads sample ActiveRecord data"
+        task :data do
+          Rake::Task["db:migrate"].reenable
+          Rake::Task["db:migrate"].invoke
+          load_data
+        end
+      end
+
+    end
+
+    namespace :datamapper do
+
+      desc "Loads sample DataMapper models and data"
+      task :load_sample => ["load_sample:datamapper:models", "load_sample:datamapper:data"]
+      namespace :load_sample do
+        desc "Loads sample DataMapper models"
+        task :models do
+          copy_models(:datamapper)
+        end
+
+        desc "Loads sample DataMapper data"
+        task :data do
+          Rake::Task["db:automigrate"].reenable
+          Rake::Task["db:automigrate"].invoke
+          load_data
+        end
+      end
+
+    end
+
   end
 end
 
@@ -60,7 +75,7 @@ def load_data
       division = MerbAdmin::AbstractModel.new("Division").create(:name => mlb_team.division, :league => league)
     end
     unless team = MerbAdmin::AbstractModel.new("Team").first(:conditions => ["name = ?", mlb_team.name])
-      team = MerbAdmin::AbstractModel.new("Team").create(:name => mlb_team.name, :logo_image_url => mlb_team.logo_url, :manager => mlb_team.manager, :ballpark => mlb_team.ballpark, :mascot => mlb_team.mascot, :founded => mlb_team.founded, :wins => mlb_team.wins, :losses => mlb_team.losses, :win_percentage => ("%.3f" % (mlb_team.wins.to_f / (mlb_team.wins + mlb_team.losses))).to_f, :division => division, :league => league)
+      team = MerbAdmin::AbstractModel.new("Team").create(:name => mlb_team.name, :logo_url => mlb_team.logo_url, :manager => mlb_team.manager, :ballpark => mlb_team.ballpark, :mascot => mlb_team.mascot, :founded => mlb_team.founded, :wins => mlb_team.wins, :losses => mlb_team.losses, :win_percentage => ("%.3f" % (mlb_team.wins.to_f / (mlb_team.wins + mlb_team.losses))).to_f, :division => division, :league => league)
     end
     mlb_team.players.each do |player|
       MerbAdmin::AbstractModel.new("Player").create(:name => player.name, :number => player.number, :position => player.position, :team => team)
@@ -70,6 +85,7 @@ end
 
 def copy_models(orm = nil)
   orm ||= set_orm
+  puts "Copying sample #{orm} models into host application - resolves any collisions"
   seen, copied, duplicated = [], [], []
   Dir.glob(File.dirname(__FILE__) / ".." / ".." / "spec" / "models" / orm.to_s.downcase / MerbAdmin.glob_for(:model)).each do |source_filename|
     destination_filename = Merb.dir_for(:model) / File.basename(source_filename)
@@ -81,7 +97,9 @@ def copy_models(orm = nil)
   duplicated.each { |f| puts "! duplicated override as #{f}" }
 end
 
-def copy_migrations
+def copy_migrations(orm = nil)
+  orm ||= set_orm
+  puts "Copying sample #{orm} migrations into host application - resolves any collisions"
   seen, copied, duplicated = [], [], []
   Dir.glob(File.dirname(__FILE__) / ".." / ".." / "schema" / "migrations" / "*.rb").each do |source_filename|
     destination_filename = Merb.root / "schema" / "migrations" / File.basename(source_filename)

data/lib/merb-admin.rb

@@ -23,7 +23,7 @@ if defined?(Merb::Plugins)
 
     # Slice metadata
     self.description = "MerbAdmin is a Merb plugin that provides an easy-to-use interface for managing your data."
-    self.version = "0.5.4"
+    self.version = "0.5.5"
     self.author = "Erik Michaels-Ober"
 
     # Stub classes loaded hook - runs before LoadClasses BootLoader

data/schema/migrations/005_create_teams_migration.rb

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

data/spec/models/datamapper/team.rb

@@ -7,7 +7,7 @@ class Team
   property :league_id, Integer, :nullable => false, :index => true
   property :division_id, Integer, :nullable => false, :index => true
   property :name, String, :nullable => false, :index => true
-  property :logo_image_url, String, :length => 255
+  property :logo_url, String, :length => 255
   property :manager, String, :length => 100, :nullable => false, :index => true
   property :ballpark, String, :length => 100, :index => true
   property :mascot, String, :length => 100, :index => true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-admin
 version: !ruby/object:Gem::Version 
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors: 
 - Erik Michaels-Ober
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-07 00:00:00 -07:00
+date: 2009-10-15 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency