merb-admin 0.6.6 → 0.6.7

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.6"
+  dependency "merb-admin", "0.6.7"
 Add the following route to <tt>config/router.rb</tt>:
   add_slice(:merb_admin, :path_prefix => "admin")
 Then, run the following rake task:
@@ -21,7 +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]
+    Merb::Slices::config[:merb_admin][:excluded_models] = ["Top", "Secret"]
   end
 == Usage
 Start the server:

data/app/controllers/main.rb

@@ -67,7 +67,7 @@ class MerbAdmin::Main < MerbAdmin::Application
 
   def destroy
     if @object.destroy
-      redirect(url(:merb_admin_list, :model_name => @abstract_model.singular_name), :message => {:notice => "#{@abstract_model.pretty_name} was successfully destroyed"})
+      redirect(url(:merb_admin_list, :model_name => @abstract_model.to_param), :message => {:notice => "#{@abstract_model.pretty_name} was successfully destroyed"})
     else
       raise BadRequest
     end
@@ -80,7 +80,7 @@ class MerbAdmin::Main < MerbAdmin::Application
   end
 
   def get_model
-    model_name = params[:model_name].camel_case
+    model_name = to_model_name(params[:model_name])
     @abstract_model = MerbAdmin::AbstractModel.new(model_name)
     get_properties
   end
@@ -143,7 +143,7 @@ class MerbAdmin::Main < MerbAdmin::Application
   end
 
   def get_attributes
-    @attributes = params[@abstract_model.singular_name] || {}
+    @attributes = params[@abstract_model.to_param] || {}
     # Delete fields that are blank
     @attributes.each do |key, value|
       @attributes[key] = nil if value.blank?
@@ -170,24 +170,21 @@ class MerbAdmin::Main < MerbAdmin::Application
   end
 
   def update_associations(association, ids = [])
-    associated_object = @object.send(association[:name])
-    @object.clear_association(associated_object)
-    @object.save
     ids.each do |id|
       update_association(association, id)
     end
   end
 
   def redirect_on_success
-    singular_name = @abstract_model.singular_name
+    param = @abstract_model.to_param
     pretty_name = @abstract_model.pretty_name
     action = params[:action]
     if params[:_continue]
-      redirect(url(:merb_admin_edit, :model_name => singular_name, :id => @object.id), :message => {:notice => "#{pretty_name} was successfully #{action}d"})
+      redirect(url(:merb_admin_edit, :model_name => param, :id => @object.id), :message => {:notice => "#{pretty_name} was successfully #{action}d"})
     elsif params[:_add_another]
-      redirect(url(:merb_admin_new, :model_name => singular_name), :message => {:notice => "#{pretty_name} was successfully #{action}d"})
+      redirect(url(:merb_admin_new, :model_name => param), :message => {:notice => "#{pretty_name} was successfully #{action}d"})
     else
-      redirect(url(:merb_admin_list, :model_name => singular_name), :message => {:notice => "#{pretty_name} was successfully #{action}d"})
+      redirect(url(:merb_admin_list, :model_name => param), :message => {:notice => "#{pretty_name} was successfully #{action}d"})
     end
   end
 

data/app/helpers/main_helper.rb

@@ -2,6 +2,10 @@ require 'builder'
 module Merb
   module MerbAdmin
     module MainHelper
+      def to_model_name(param)
+        param.split("__").map{|x| x.camel_case}.join("::")
+      end
+
       def object_label(object)
         if object.nil?
           nil

data/app/views/layout/form.html.erb

@@ -32,7 +32,7 @@
       </div>
       <div class="breadcrumbs">
         <%= link_to("Home", url(:merb_admin_dashboard)) %> &rsaquo;
-        <%= link_to(@abstract_model.plural_name.to_s.capitalize, url(:merb_admin_list, :model_name => @abstract_model.singular_name)) %> &rsaquo;
+        <%= link_to(@abstract_model.pretty_name, url(:merb_admin_list, :model_name => @abstract_model.to_param)) %> &rsaquo;
         <%= page_name %>
       </div>
 <%= partial('layout/message', :message => message) unless message.blank? -%>

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

@@ -27,7 +27,7 @@
       </div>
       <div class="breadcrumbs">
         <%= link_to("Home", url(:merb_admin_dashboard)) %> &rsaquo;
-        <%= @abstract_model.plural_name.to_s.capitalize %>
+        <%= @abstract_model.pretty_name %>
       </div>
 <%= partial('layout/message', :message => message) unless message.blank? -%>
       <div id="content" class="flex">

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

@@ -1,7 +1,7 @@
         <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_label(@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.to_param, :id => @object.id)) %>
             <ul>
               <% @abstract_model.has_many_associations.each do |association| %>
               <% @object.send(association[:name]).reject{|child| child.nil?}.each do |child| %>
@@ -20,7 +20,7 @@
             </ul>
           </li>
         </ul>
-        <%= form_for(@object, :action => url(:merb_admin_destroy, :model_name => @abstract_model.singular_name, :id => @object.id), :method => :delete) do %>
+        <%= form_for(@object, :action => url(:merb_admin_destroy, :model_name => @abstract_model.to_param, :id => @object.id), :method => :delete) do %>
           <div>
             <%= submit "Yes, I'm sure" %>
           </div>

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

@@ -1,5 +1,5 @@
         <div id="content-main">
-        <%= form_for(@object, :action => url(:merb_admin_update, :model_name => @abstract_model.singular_name, :id => @object.id)) do %>
+        <%= form_for(@object, :action => url(:merb_admin_update, :model_name => @abstract_model.to_param, :id => @object.id)) do %>
           <div>
 <%= partial('properties', :properties => @properties) -%>
 <%= partial('belongs_to', :with => @abstract_model.belongs_to_associations, :as => :association) -%>
@@ -8,7 +8,7 @@
             <div class="submit-row" >
               <%= submit "Save", :class => "default", :name => "_save" %>
               <p class="deletelink-box">
-                <%= link_to("Delete", url(:merb_admin_delete, :model_name => @abstract_model.singular_name, :id => @object.id), :class => "deletelink") %>
+                <%= link_to("Delete", url(:merb_admin_delete, :model_name => @abstract_model.to_param, :id => @object.id), :class => "deletelink") %>
               </p>
               <%= submit "Save and add another", :name => "_add_another" %>
               <%= submit "Save and continue editing", :name => "_continue" %>

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

@@ -7,13 +7,13 @@
               <% @abstract_models.each do |abstract_model| %>
               <tr>
                 <th scope="row">
-                  <%= link_to(abstract_model.plural_name.to_s.capitalize, url(:merb_admin_list, :model_name => abstract_model.singular_name)) %>
+                  <%= link_to(abstract_model.pretty_name, url(:merb_admin_list, :model_name => abstract_model.to_param)) %>
                 </th>
                 <td>
-                  <%= link_to("Add", url(:merb_admin_new, :model_name => abstract_model.singular_name), :class => "addlink") %>
+                  <%= link_to("Add", url(:merb_admin_new, :model_name => abstract_model.to_param), :class => "addlink") %>
                 </td>
                 <td>
-                  <%= link_to("Edit", url(:merb_admin_list, :model_name => abstract_model.singular_name), :class => "changelink") %>
+                  <%= link_to("Edit", url(:merb_admin_list, :model_name => abstract_model.to_param), :class => "changelink") %>
                 </td>
               </tr>
               <% end %>

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

@@ -9,7 +9,7 @@
         <div id="content-main">
           <ul class="object-tools">
             <li>
-              <%= link_to("Add #{@abstract_model.pretty_name.downcase}", url(:merb_admin_new, :model_name => @abstract_model.singular_name), :class => "addlink") %>
+              <%= link_to("Add #{@abstract_model.pretty_name.downcase}", url(:merb_admin_new, :model_name => @abstract_model.to_param), :class => "addlink") %>
             </li>
           </ul>
           <div class="<%= filters_exist ? "module filtered" : "module" %>" id="changelist">
@@ -72,7 +72,7 @@
                 <tr class="row<%= index % 2 == 0 ? "1" : "2" %>">
                   <% @properties.each do |property| %>
                   <td>
-                    <%= link_to(object_property(object, property), url(:merb_admin_edit, :model_name => @abstract_model.singular_name, :id => object.id)) %>
+                    <%= link_to(object_property(object, property), url(:merb_admin_edit, :model_name => @abstract_model.to_param, :id => object.id)) %>
                   </td>
                   <% end %>
                 </tr>

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

@@ -1,5 +1,5 @@
         <div id="content-main">
-        <%= form_for(@object, :action => url(:merb_admin_create, :model_name => @abstract_model.singular_name)) do %>
+        <%= form_for(@object, :action => url(:merb_admin_create, :model_name => @abstract_model.to_param)) do %>
           <div>
 <%= partial('properties', :properties => @properties) -%>
 <%= partial('belongs_to', :with => @abstract_model.belongs_to_associations, :as => :association) -%>

data/lib/abstract_model.rb

@@ -10,29 +10,29 @@ module MerbAdmin
       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|
-            add_model(model_name.to_sym)
+            add_model(model_name)
           end
         end
       when :datamapper
-        DataMapper::Model.descendants.each do |model_name|
-          add_model(model_name.to_s.to_sym)
+        DataMapper::Model.descendants.each do |model|
+          add_model(model.to_s)
         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)
-      return if MerbAdmin[:excluded_models].include?(name)
-      model = lookup(name)
+
+    def self.add_model(model_name)
+      model = lookup(model_name)
       @models << new(model) if model
     end
 
-    # Given a symbol +model_name+, finds the corresponding model class
+    # Given a string +model_name+, finds the corresponding model class
     def self.lookup(model_name)
+      return nil if MerbAdmin[:excluded_models].include?(model_name)
       begin
-        model = Object.full_const_get(model_name.to_s)
+        model = Object.full_const_get(model_name)
       rescue NameError
         raise "MerbAdmin could not find model #{model_name}"
       end

data/lib/activerecord_support.rb

@@ -39,7 +39,7 @@ module MerbAdmin
       end
 
       def create(params = {})
-        model.create(params)
+        model.create(params).extend(InstanceMethods)
       end
 
       def new(params = {})
@@ -143,9 +143,6 @@ module MerbAdmin
       end
 
       module InstanceMethods
-        def clear_association(association)
-          association.clear
-        end
       end
 
     end

data/lib/datamapper_support.rb

@@ -39,7 +39,7 @@ module MerbAdmin
       end
 
       def create(params = {})
-        model.create(params)
+        model.create(params).extend(InstanceMethods)
       end
 
       def new(params = {})
@@ -136,10 +136,6 @@ module MerbAdmin
         def update_attributes(attributes)
           update(attributes)
         end
-
-        def clear_association(association)
-          association.clear
-        end
       end
 
     end

data/lib/generic_support.rb

@@ -1,12 +1,8 @@
 module MerbAdmin
   class AbstractModel
     module GenericSupport
-      def singular_name
-        model.to_s.snake_case.to_sym
-      end
-
-      def plural_name
-        model.to_s.snake_case.pluralize.to_sym
+      def to_param
+        model.to_s.snake_case.gsub("::", "__")
       end
 
       def pretty_name

data/lib/merb-admin.rb

@@ -24,7 +24,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.6.6"
+    self.version = "0.6.7"
     self.author = "Erik Michaels-Ober"
 
     # Stub classes loaded hook - runs before LoadClasses BootLoader

data/lib/sequel_support.rb

@@ -76,7 +76,7 @@ module MerbAdmin
       end
 
       def create(params = {})
-        model.create(params)
+        model.create(params).extend(InstanceMethods)
       end
 
       def new(params = {})
@@ -268,11 +268,6 @@ module MerbAdmin
         def update_attributes(attributes)
           update(attributes)
         end
-
-        def clear_association(association)
-          # FIXME: This should be changed to use the remove_all_* association method.
-          association.clear
-        end
       end
 
     end

data/spec/requests/main_spec.rb

@@ -80,16 +80,13 @@ 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]
+      MerbAdmin[:excluded_models] = ["Player"]
       @response = request(url(:merb_admin_dashboard))
+      MerbAdmin[:excluded_models] = []
     end
 
     it "should respond sucessfully" do
@@ -245,9 +242,9 @@ describe "MerbAdmin" do
 
   describe "list with 2 objects", :given => "two players exist" do
     before(:each) do
-      MerbAdmin[:paginate] = true
       MerbAdmin[:per_page] = 1
       @response = request(url(:merb_admin_list, :model_name => "player"))
+      MerbAdmin[:per_page] = 100
     end
 
     it "should respond sucessfully" do
@@ -261,9 +258,9 @@ describe "MerbAdmin" do
 
   describe "list with 20 objects", :given => "twenty players exist" do
     before(:each) do
-      MerbAdmin[:paginate] = true
       MerbAdmin[:per_page] = 1
       @response = request(url(:merb_admin_list, :model_name => "player"))
+      MerbAdmin[:per_page] = 100
     end
 
     it "should respond sucessfully" do
@@ -277,9 +274,9 @@ describe "MerbAdmin" do
 
   describe "list with 20 objects, page 8", :given => "twenty players exist" do
     before(:each) do
-      MerbAdmin[:paginate] = true
       MerbAdmin[:per_page] = 1
       @response = request(url(:merb_admin_list, :model_name => "player"), :params => {:page => 8})
+      MerbAdmin[:per_page] = 100
     end
 
     it "should respond sucessfully" do
@@ -293,9 +290,9 @@ describe "MerbAdmin" do
 
   describe "list with 20 objects, page 17", :given => "twenty players exist" do
     before(:each) do
-      MerbAdmin[:paginate] = true
       MerbAdmin[:per_page] = 1
       @response = request(url(:merb_admin_list, :model_name => "player"), :params => {:page => 17})
+      MerbAdmin[:per_page] = 100
     end
 
     it "should respond sucessfully" do
@@ -309,9 +306,9 @@ describe "MerbAdmin" do
 
   describe "list show all", :given => "two players exist" do
     before(:each) do
-      MerbAdmin[:paginate] = true
       MerbAdmin[:per_page] = 1
       @response = request(url(:merb_admin_list, :model_name => "player"), :params => {:all => true})
+      MerbAdmin[:per_page] = 100
     end
 
     it "should respond sucessfully" do

data/spec/spec_helper.rb

@@ -64,7 +64,6 @@ module Merb
           end
         when :sequel
           require 'sequel'
-          require 'sequel/extensions/blank'
           require 'sequel/extensions/migration'
           Sequel::Migrator.apply(Sequel.sqlite, File.join(File.dirname(__FILE__), "migrations", "sequel"))
           require_models(orm)

metadata

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