merb-admin 0.6.8 → 0.6.9

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.8"
+  dependency "merb-admin", "0.6.9"
 Add the following route to <tt>config/router.rb</tt>:
   add_slice(:merb_admin, :path_prefix => "admin")
 Then, run the following rake task:

data/VERSION

@@ -1 +1 @@
-0.6.8
+0.6.9

data/app/controllers/main.rb

@@ -170,9 +170,11 @@ class MerbAdmin::Main < MerbAdmin::Application
   end
 
   def update_associations(association, ids = [])
+    @object.send(association[:name]).clear
     ids.each do |id|
       update_association(association, id)
     end
+    @object.save
   end
 
   def redirect_on_success

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

data/merb-admin.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{merb-admin}
-  s.version = "0.6.8"
+  s.version = "0.6.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Erik Michaels-Ober"]
-  s.date = %q{2009-11-20}
+  s.date = %q{2009-11-23}
   s.description = %q{MerbAdmin is a Merb plugin that provides an easy-to-use interface for managing your data.}
   s.email = %q{sferik@gmail.com}
   s.extra_rdoc_files = [

data/spec/requests/main_spec.rb

@@ -613,7 +613,8 @@ describe "MerbAdmin" do
 
   describe "update with has-many association", :given => "a league exists and three teams exist" do
     before(:each) do
-      @response = request(url(:merb_admin_update, :model_name => "league", :id => @league.id), :method => "put", :params => {:league => {:name => "National League"}, :associations => {:teams => [@teams[0].id, @teams[1].id]}})
+      @teams[0].update_attributes(:league_id => @league.id)
+      @response = request(url(:merb_admin_update, :model_name => "league", :id => @league.id), :method => "put", :params => {:league => {:name => "National League"}, :associations => {:teams => [@teams[1].id]}})
     end
 
     it "should update an object that already exists" do
@@ -621,13 +622,13 @@ describe "MerbAdmin" do
     end
 
     it "should be associated with the correct objects" do
-      @teams[0].reload
-      MerbAdmin::AbstractModel.new("League").first.teams.should include(@teams[0])
       @teams[1].reload
       MerbAdmin::AbstractModel.new("League").first.teams.should include(@teams[1])
     end
 
     it "should not be associated with an incorrect object" do
+      @teams[0].reload
+      MerbAdmin::AbstractModel.new("League").first.teams.should_not include(@teams[0])
       MerbAdmin::AbstractModel.new("League").first.teams.should_not include(@teams[2])
     end
   end

data/spec/spec_helper.rb

@@ -83,7 +83,7 @@ module Merb
       end
 
       def set_orm(orm = nil)
-        orm || ENV['MERB_ORM'] || (Merb.orm != :none ? Merb.orm : nil) || :datamapper
+        orm || ENV['MERB_ORM'] || (Merb.orm != :none ? Merb.orm : nil) || :activerecord
       end
 
     end

metadata

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