merb-admin 0.6.2 → 0.6.3

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.2"
+  dependency "merb-admin", "0.6.3"
 Add the following route to <tt>config/router.rb</tt>:
   add_slice(:merb_admin, :path_prefix => "admin")
 Then, run the following rake task:
@@ -37,6 +37,7 @@ There are many ways to contribute:
 * by writing documentation
 * by writing specifications
 * by writing code (no patch is too small: fix typos in comments or inconsistent whitespace)
+* by refactoring code
 * by reviewing patches
 * financially[http://pledgie.com/campaigns/5428]
 

data/Rakefile

@@ -9,8 +9,8 @@ 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.2"
-MERB_GEM_VERSION = "1.0.12"
+GEM_VERSION = "0.6.3"
+MERB_GEM_VERSION = "1.0.15"
 
 spec = Gem::Specification.new do |s|
   s.rubyforge_project = "merb"

data/app/controllers/main.rb

@@ -3,9 +3,10 @@ require File.join( File.dirname(__FILE__), '..', '..', 'lib', 'abstract_model' )
 class MerbAdmin::Main < MerbAdmin::Application
   include Merb::MerbAdmin::MainHelper
 
-  before :find_models, :only => ['index']
-  before :find_model, :exclude => ['index']
-  before :find_object, :only => ['edit', 'update', 'delete', 'destroy']
+  before :get_models, :only => ['index']
+  before :get_model, :exclude => ['index']
+  before :get_object, :only => ['edit', 'update', 'delete', 'destroy']
+  before :get_attributes, :only => ['create', 'update']
 
   def index
     render(:layout => 'dashboard')
@@ -13,29 +14,25 @@ class MerbAdmin::Main < MerbAdmin::Application
 
   def list
     options = {}
-    merge_query!(options)
-    merge_filter!(options)
-    merge_sort!(options)
-    merge_sort_reverse!(options)
-
+    options.merge!(sort)
+    options.merge!(sort_reverse)
+    options.merge!(query(options))
+    options.merge!(filter(options))
+    # merge_query!(options)
+    # merge_filter!(options)
+    per_page = MerbAdmin[:per_page]
     if params[:all]
-      options = {
-        :limit => MerbAdmin[:per_page] * 2,
-      }.merge(options)
+      options.merge!(:limit => per_page * 2)
       @objects = @abstract_model.all(options).reverse
     else
       @current_page = (params[:page] || 1).to_i
-      options = {
-        :page => @current_page,
-        :per_page => MerbAdmin[:per_page],
-      }.merge(options)
+      options.merge!(:page => @current_page, :per_page => per_page)
       @page_count, @objects = @abstract_model.paginated(options)
       options.delete(:page)
       options.delete(:per_page)
       options.delete(:offset)
       options.delete(:limit)
     end
-
     @record_count = @abstract_model.count(options)
     render(:layout => 'list')
   end
@@ -50,47 +47,19 @@ class MerbAdmin::Main < MerbAdmin::Application
   end
 
   def create
-    object = params[@abstract_model.singular_name] || {}
-    # Delete fields that are blank
-    object.each do |key, value|
-      object[key] = nil if value.blank?
-    end
-    has_one_associations = @abstract_model.has_one_associations.map{|association| [association, (params[:associations] || {}).delete(association[:name])]}
-    has_many_associations = @abstract_model.has_many_associations.map{|association| [association, (params[:associations] || {}).delete(association[:name])]}
-    @object = @abstract_model.new(object)
-    if @object.save && has_one_associations.each{|association, id| update_association(association, id)} && has_many_associations.each{|association, ids| update_associations(association, ids.to_a)}
-      if params[:_continue]
-        redirect(url(:merb_admin_edit, :model_name => @abstract_model.singular_name, :id => @object.id), :message => {:notice => "#{@abstract_model.pretty_name} was successfully created"})
-      elsif params[:_add_another]
-        redirect(url(:merb_admin_new, :model_name => @abstract_model.singular_name), :message => {:notice => "#{@abstract_model.pretty_name} was successfully created"})
-      else
-        redirect(url(:merb_admin_list, :model_name => @abstract_model.singular_name), :message => {:notice => "#{@abstract_model.pretty_name} was successfully created"})
-      end
+    @object = @abstract_model.new(@attributes)
+    if @object.save && update_all_associations
+      redirect_on_success
     else
-      message[:error] = "#{@abstract_model.pretty_name} failed to be created"
-      render(:new, :layout => 'form')
+      render_error
     end
   end
 
   def update
-    object = params[@abstract_model.singular_name] || {}
-    # Delete fields that are blank
-    object.each do |key, value|
-      object[key] = nil if value.blank?
-    end
-    has_one_associations = @abstract_model.has_one_associations.map{|association| [association, (params[:associations] || {}).delete(association[:name])]}
-    has_many_associations = @abstract_model.has_many_associations.map{|association| [association, (params[:associations] || {}).delete(association[:name])]}
-    if @object.update_attributes(object) && has_one_associations.each{|association, id| update_association(association, id)} && has_many_associations.each{|association, ids| update_associations(association, ids.to_a)}
-      if params[:_continue]
-        redirect(url(:merb_admin_edit, :model_name => @abstract_model.singular_name, :id => @object.id), :message => {:notice => "#{@abstract_model.pretty_name} was successfully updated"})
-      elsif params[:_add_another]
-        redirect(url(:merb_admin_new, :model_name => @abstract_model.singular_name), :message => {:notice => "#{@abstract_model.pretty_name} was successfully updated"})
-      else
-        redirect(url(:merb_admin_list, :model_name => @abstract_model.singular_name), :message => {:notice => "#{@abstract_model.pretty_name} was successfully updated"})
-      end
+    if @object.update_attributes(@attributes) && update_all_associations
+      redirect_on_success
     else
-      message[:error] = "#{@abstract_model.pretty_name} failed to be updated"
-      render(:edit, :layout => 'form')
+      render_error
     end
   end
 
@@ -108,70 +77,91 @@ class MerbAdmin::Main < MerbAdmin::Application
 
   private
 
-  def find_models
+  def get_models
     @abstract_models = MerbAdmin::AbstractModel.all
   end
 
-  def find_model
+  def get_model
     model_name = params[:model_name].camel_case
     @abstract_model = MerbAdmin::AbstractModel.new(model_name)
-    find_properties
+    get_properties
   end
 
-  def find_properties
+  def get_properties
     @properties = @abstract_model.properties
   end
 
-  def find_object
+  def get_object
     @object = @abstract_model.get(params[:id])
     raise NotFound unless @object
   end
 
-  def merge_query!(options)
-    return unless params[:query]
+  def sort
+    sort = params[:sort]
+    sort ? {:sort => sort} : {}
+  end
+
+  def sort_reverse
+    sort_reverse = params[:sort_reverse]
+    sort_reverse ? {:sort_reverse => sort_reverse == "true"} : {}
+  end
+
+  def query(options)
+    query = params[:query]
+    return {} unless query
     statements = []
     values = []
     conditions = options[:conditions] || [""]
-    @properties.each do |property|
-      next unless property[:type] == :string
+
+    @properties.select{|property| property[:type] == :string}.each do |property|
       statements << "#{property[:name]} LIKE ?"
-      values << "%#{params[:query]}%"
+      values << "%#{query}%"
     end
+
     conditions[0] += " AND " unless conditions == [""]
     conditions[0] += statements.join(" OR ")
     conditions += values
-    options.merge!(:conditions => conditions) unless conditions == [""]
+    conditions != [""] ? {:conditions => conditions} : {}
   end
 
-  def merge_filter!(options)
-    return unless params[:filter]
+  def filter(options)
+    filter = params[:filter]
+    return {} unless filter
     statements = []
     values = []
     conditions = options[:conditions] || [""]
-    params[:filter].each_pair do |key, value|
-      @properties.each do |property|
-        next unless property[:name] == key.to_sym
-        next unless property[:type] == :boolean
+
+    filter.each_pair do |key, value|
+      @properties.select{|property| property[:type] == :boolean && property[:name] == key.to_sym}.each do |property|
         statements << "#{key} = ?"
         values << (value == "true")
       end
     end
+
     conditions[0] += " AND " unless conditions == [""]
     conditions[0] += statements.join(" AND ")
     conditions += values
-    options.merge!(:conditions => conditions) unless conditions == [""]
+    conditions != [""] ? {:conditions => conditions} : {}
   end
 
-  def merge_sort!(options)
-    return unless params[:sort]
-    sort = params[:sort] || "id"
-    options.merge!(:sort => sort)
+  def get_attributes
+    @attributes = params[@abstract_model.singular_name] || {}
+    # Delete fields that are blank
+    @attributes.each do |key, value|
+      @attributes[key] = nil if value.blank?
+    end
   end
 
-  def merge_sort_reverse!(options)
-    return unless params[:sort_reverse]
-    reverse = params[:sort_reverse] == "true"
-    options.merge!(:sort_reverse => reverse)
+  def update_all_associations
+    @abstract_model.associations.each do |association|
+      ids = (params[:associations] || {}).delete(association[:name])
+      case association[:type]
+      when :has_one
+        update_association(association, ids)
+      when :has_many
+        update_associations(association, ids.to_a)
+      end
+    end
   end
 
   def update_association(association, id = nil)
@@ -190,4 +180,23 @@ class MerbAdmin::Main < MerbAdmin::Application
     end
   end
 
+  def redirect_on_success
+    singular_name = @abstract_model.singular_name
+    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"})
+    elsif params[:_add_another]
+      redirect(url(:merb_admin_new, :model_name => singular_name), :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"})
+    end
+  end
+
+  def render_error
+    action = params[:action]
+    message[:error] = "#{@abstract_model.pretty_name} failed to be #{action}d"
+    render(:new, :layout => 'form')
+  end
+
 end

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

@@ -5,8 +5,7 @@
   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
+  @properties.select{|property| property[:name] == child_key}.each do |property|
     required = true unless property[:nullable?]
   end
 %>

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

@@ -6,8 +6,7 @@
   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
+  @properties.select{|property| property[:name] == child_key}.each do |property|
     required = true unless property[:nullable?]
   end
 %>

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

@@ -1,11 +1,9 @@
             <fieldset class="module aligned">
               <% belongs_to_keys = @abstract_model.belongs_to_associations.map{|b| b[:child_key].first} %>
-              <% properties.each do |property| %>
+              <% properties.reject{|property| [:id, :created_at, :created_on, :deleted_at, :updated_at, :updated_on, :deleted_on].include?(property[:name]) || belongs_to_keys.include?(property[:name])}.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="<%= errors_exist ? "form-row errors" : "form-row" %>">
                 <% if errors_exist %>
                 <ul class="errorlist">

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

@@ -4,8 +4,7 @@
             <%= @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? %>
+              <% @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)) %>
               </li>

data/lib/abstract_model.rb

@@ -6,36 +6,27 @@ module MerbAdmin
     def self.all
       return @models if @models
       @models ||= []
-      case Merb.orm
-      when :activerecord
+      orm = Merb.orm
+      case orm
+      when :activerecord, :sequel
         Dir.glob(Merb.dir_for(:model) / Merb.glob_for(:model)).each do |filename|
-          # FIXME: This heuristic for finding ActiveRecord models could be too strict
-          File.read(filename).scan(/^class ([\w\d_\-:]+) < ActiveRecord::Base$/).flatten.each do |m|
-            model = lookup(m.to_s.to_sym)
+          File.read(filename).scan(/class ([\w\d_\-:]+)/).flatten.each do |model_name|
+            model = lookup(model_name.to_sym)
             @models << new(model) if model
           end
         end
-        @models.sort!{|a, b| a.model.to_s <=> b.model.to_s}
       when :datamapper
-        DataMapper::Resource.descendants.each do |m|
+        @models = []
+        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(m.to_s.to_sym)
+          model = lookup(model_name.to_s.to_sym)
           @models << new(model) if model
         end
-        @models.sort!{|a, b| a.model.to_s <=> b.model.to_s}
-      when :sequel
-        Dir.glob(Merb.dir_for(:model) / Merb.glob_for(:model)).each do |filename|
-          # FIXME: This heuristic for finding Sequel models could be too strict
-          File.read(filename).scan(/^class ([\w\d_\-:]+) < Sequel::Model$/).flatten.each do |m|
-            model = lookup(m.to_s.to_sym)
-            @models << new(model) if model
-          end
-        end
-        @models.sort!{|a, b| a.model.to_s <=> b.model.to_s}
       else
-        raise "MerbAdmin does not support the #{Merb.orm} ORM"
+        raise "MerbAdmin does not support the #{orm} ORM"
       end
+      @models.sort!{|x, y| x.model.to_s <=> y.model.to_s}
     end
 
     # Given a symbol +model_name+, finds the corresponding model class
@@ -48,22 +39,24 @@ module MerbAdmin
 
       case Merb.orm
       when :activerecord
-        return model if superclasses(model).include?(ActiveRecord::Base)
+        model if superclasses(model).include?(ActiveRecord::Base)
       when :datamapper
-        return model if model.include?(DataMapper::Resource)
+        model if model.include?(DataMapper::Resource)
       when :sequel
-        return model if superclasses(model).include?(Sequel::Model)
+        model if superclasses(model).include?(Sequel::Model)
+      else
+        nil
       end
-      nil
     end
 
     attr_accessor :model
 
     def initialize(model)
       model = self.class.lookup(model.to_s.camel_case) unless model.is_a?(Class)
+      orm = Merb.orm
       @model = model
       self.extend(GenericSupport)
-      case Merb.orm
+      case orm
       when :activerecord
         require 'activerecord_support'
         self.extend(ActiverecordSupport)
@@ -74,7 +67,7 @@ module MerbAdmin
         require 'sequel_support'
         self.extend(SequelSupport)
       else
-        raise "MerbAdmin does not support the #{Merb.orm} ORM"
+        raise "MerbAdmin does not support the #{orm} ORM"
       end
     end
 

data/lib/datamapper_support.rb

@@ -133,6 +133,10 @@ module MerbAdmin
       end
 
       module InstanceMethods
+        def update_attributes(attributes)
+          update(attributes)
+        end
+
         def clear_association(association)
           association.clear
         end

data/lib/merb-admin/slicetasks.rb

@@ -92,7 +92,7 @@ def load_data
   end
 
   puts "Loading current MLB leagues, divisions, teams, and players"
-  MLB::Teams.all.each do |mlb_team|
+  MLB::Team.all.each do |mlb_team|
     unless league = MerbAdmin::AbstractModel.new("League").first(:conditions => ["name = ?", mlb_team.league])
       league = MerbAdmin::AbstractModel.new("League").create(:name => mlb_team.league)
     end
@@ -102,8 +102,7 @@ def load_data
     unless team = MerbAdmin::AbstractModel.new("Team").first(:conditions => ["name = ?", mlb_team.name])
       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|
-      next if player.number.nil?
+    mlb_team.players.reject{|player| player.number.nil?}.each do |player|
       MerbAdmin::AbstractModel.new("Player").create(:name => player.name, :number => player.number, :position => player.position, :team => team)
     end
   end
@@ -114,8 +113,8 @@ def copy_models(orm = nil)
   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)
     next if seen.include?(source_filename)
+    destination_filename = Merb.dir_for(:model) / File.basename(source_filename)
     mirror_file(source_filename, destination_filename, copied, duplicated)
     seen << source_filename
   end
@@ -128,8 +127,8 @@ def copy_migrations(orm = nil)
   puts "Copying sample #{orm} migrations into host application - resolves any collisions"
   seen, copied, duplicated = [], [], []
   Dir.glob(File.dirname(__FILE__) / ".." / ".." / "spec" / "migrations" / orm.to_s.downcase / "*.rb").each do |source_filename|
-    destination_filename = Merb.root / "schema" / "migrations" / File.basename(source_filename)
     next if seen.include?(source_filename)
+    destination_filename = Merb.root / "schema" / "migrations" / File.basename(source_filename)
     mirror_file(source_filename, destination_filename, copied, duplicated)
     seen << source_filename
   end

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.6.2"
+    self.version = "0.6.3"
     self.author = "Erik Michaels-Ober"
 
     # Stub classes loaded hook - runs before LoadClasses BootLoader

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-admin
 version: !ruby/object:Gem::Version 
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors: 
 - Erik Michaels-Ober
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-02 00:00:00 -08:00
+date: 2009-11-05 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.12
+        version: 1.0.15
     version: 
 - !ruby/object:Gem::Dependency 
   name: merb-assets
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.12
+        version: 1.0.15
     version: 
 - !ruby/object:Gem::Dependency 
   name: merb-helpers
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.12
+        version: 1.0.15
     version: 
 - !ruby/object:Gem::Dependency 
   name: builder