merb-admin 0.6.0 → 0.6.1

data/README.rdoc

@@ -3,10 +3,13 @@
 It currently offers the features listed here[http://sferik.tadalist.com/lists/1352791/public].
 
 The status of the latest build is available here[http://runcoderun.com/sferik/merb-admin].
+== Screenshots
+http://github.com/sferik/merb-admin/raw/master/screenshots/list.png
+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.0"
+  dependency "merb-admin", "0.6.1"
 Add the following route to <tt>config/router.rb</tt>:
   add_slice(:merb_admin, :path_prefix => "admin")
 Then, run the following rake task:
@@ -32,6 +35,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 reviewing patches
 * financially[http://pledgie.com/campaigns/5428]
 
 All contributors will be added to the credits below and will receive the respect and gratitude of the author.
@@ -43,4 +47,5 @@ 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
 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.0"
+GEM_VERSION = "0.6.1"
 
 spec = Gem::Specification.new do |s|
   s.rubyforge_project = "merb"

data/app/controllers/application.rb

@@ -1,5 +1,5 @@
 class MerbAdmin::Application < Merb::Controller
-  include Merb::MerbAdmin::MainHelper
+  include Merb::MerbAdmin::ApplicationHelper
 
   controller_for_slice
 

data/lib/abstract_model.rb

@@ -48,11 +48,11 @@ module MerbAdmin
 
       case Merb.orm
       when :activerecord
-        return model if model.superclass == ActiveRecord::Base
+        return model if superclasses(model).include?(ActiveRecord::Base)
       when :datamapper
         return model if model.include?(DataMapper::Resource)
       when :sequel
-        return model if model.superclass == Sequel::Model
+        return model if superclasses(model).include?(Sequel::Model)
       end
       nil
     end
@@ -77,5 +77,17 @@ module MerbAdmin
         raise "MerbAdmin does not support the #{Merb.orm} ORM"
       end
     end
+
+    private
+
+    def self.superclasses(klass)
+      superclasses = []
+      while klass
+        superclasses << klass.superclass if klass && klass.superclass
+        klass = klass.superclass
+      end
+      superclasses
+    end
+
   end
 end

data/lib/activerecord_support.rb

@@ -143,33 +143,9 @@ module MerbAdmin
       end
 
       module InstanceMethods
-        def id
-          super
-        end
-
-        def save
-          super
-        end
-
-        def destroy
-          super
-        end
-
-        def update_attributes(attributes)
-          super
-        end
-
-        def errors
-          super
-        end
-
         def clear_association(association)
           association.clear
         end
-
-        def reset
-          super
-        end
       end
 
     end

data/lib/datamapper_support.rb

@@ -133,33 +133,9 @@ module MerbAdmin
       end
 
       module InstanceMethods
-        def id
-          super
-        end
-
-        def save
-          super
-        end
-
-        def destroy
-          super
-        end
-
-        def update_attributes(attributes)
-          super
-        end
-
-        def errors
-          super
-        end
-
         def clear_association(association)
           association.clear
         end
-
-        def reset
-          super
-        end
       end
 
     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.each do |mlb_team|
+  MLB::Teams.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

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

data/lib/sequel_support.rb

@@ -29,8 +29,7 @@ module MerbAdmin
 
       def count(options = {})
         if options[:conditions] && !options[:conditions].empty?
-          # If options[:conditions] isn't cloned, Sequel eats the first condition!
-          model.where(options[:conditions].clone).count
+          model.where(options[:conditions]).count
         else
           model.count
         end
@@ -41,8 +40,7 @@ module MerbAdmin
         sort_order = options.delete(:sort_reverse) ? :desc : :asc
 
         if options[:conditions] && !options[:conditions].empty?
-          # If options[:conditions] isn't cloned, Sequel eats the first condition!
-          model.order(sort.to_sym.send(sort_order)).first(options[:conditions].clone).extend(InstanceMethods)
+          model.order(sort.to_sym.send(sort_order)).first(options[:conditions]).extend(InstanceMethods)
         else
           model.order(sort.to_sym.send(sort_order)).first.extend(InstanceMethods)
         end
@@ -56,8 +54,7 @@ module MerbAdmin
         sort_order = options.delete(:sort_reverse) ? :desc : :asc
 
         if options[:conditions] && !options[:conditions].empty?
-          # If options[:conditions] isn't cloned, Sequel eats the first condition!
-          model.where(options[:conditions].clone).order(sort.to_sym.send(sort_order))
+          model.where(options[:conditions]).order(sort.to_sym.send(sort_order))
         else
           model.order(sort.to_sym.send(sort_order))
         end
@@ -72,8 +69,7 @@ module MerbAdmin
         sort_order = options.delete(:sort_reverse) ? :desc : :asc
 
         if options[:conditions] && !options[:conditions].empty?
-          # If options[:conditions] isn't cloned, Sequel eats the first condition!
-          [page_count, model.paginate(page.to_i, per_page).where(options[:conditions].clone).order(sort.to_sym.send(sort_order))]
+          [page_count, model.paginate(page.to_i, per_page).where(options[:conditions]).order(sort.to_sym.send(sort_order))]
         else
           [page_count, model.paginate(page.to_i, per_page).order(sort.to_sym.send(sort_order))]
         end
@@ -88,9 +84,7 @@ module MerbAdmin
       end
 
       def destroy_all!
-        model.all.each do |object|
-          object.destroy
-        end
+        model.destroy
       end
 
       def has_many_associations
@@ -197,7 +191,7 @@ module MerbAdmin
             association[:name]
           end
         when :many_to_one
-            association[:name]
+          association[:name]
         else
           raise "Unknown association type"
         end
@@ -271,36 +265,13 @@ module MerbAdmin
       end
 
       module InstanceMethods
-        def id
-          super
-        end
-
-        def save
-          super
-        end
-
-        def destroy
-          super
-        end
-
         def update_attributes(attributes)
-          # NOTE: Not sure why calling update(attributes) raises
-          # Argument Error: wrong number of arguments (1 for 0)
-          # but this seems to work:
-          set(attributes)
-          save
-        end
-
-        def errors
-          super
+          update(attributes)
         end
 
         def clear_association(association)
-          association.clear # FIXME!
-        end
-
-        def reset
-          super
+          # FIXME: This should be changed to use the remove_all_* association method.
+          association.clear
         end
       end
 

metadata

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