merb-admin 0.7.3 → 0.7.4

data/README.rdoc

@@ -13,7 +13,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.7.3"
+  dependency "merb-admin", "0.7.4"
 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.7.3
+0.7.4

data/lib/datamapper_support.rb

@@ -86,7 +86,7 @@ module MerbAdmin
             :pretty_name => property.name.to_s.gsub(/_id$/, "").gsub("_", " ").capitalize,
             :type => type_lookup(property),
             :length => property.length,
-            :nullable? => property.nullable?,
+            :nullable? => property.allow_nil?,
             :serial? => property.serial?,
           }
         end

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.7.3"
+    self.version = "0.7.4"
     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.7.3"
+  s.version = "0.7.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Erik Michaels-Ober"]
-  s.date = %q{2009-12-03}
+  s.date = %q{2009-12-12}
   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/models/datamapper/division.rb

@@ -4,8 +4,8 @@ class Division
   property(:id, Serial)
   property(:created_at, DateTime)
   property(:updated_at, DateTime)
-  property(:league_id, Integer, :nullable => false, :index => true)
-  property(:name, String, :nullable => false, :index => true)
+  property(:league_id, Integer, :required => true, :index => true)
+  property(:name, String, :required => true, :index => true)
 
   belongs_to(:league)
   has(n, :teams)

data/spec/models/datamapper/draft.rb

@@ -4,12 +4,12 @@ class Draft
   property(:id, Serial)
   property(:created_at, DateTime)
   property(:updated_at, DateTime)
-  property(:player_id, Integer, :nullable => false, :index => true)
-  property(:team_id, Integer, :nullable => false, :index => true)
-  property(:date, Date, :nullable => false)
-  property(:round, Integer, :nullable => false)
-  property(:pick, Integer, :nullable => false)
-  property(:overall, Integer, :nullable => false)
+  property(:player_id, Integer, :required => true, :index => true)
+  property(:team_id, Integer, :required => true, :index => true)
+  property(:date, Date, :required => true)
+  property(:round, Integer, :required => true)
+  property(:pick, Integer, :required => true)
+  property(:overall, Integer, :required => true)
   property(:college, String, :length => 100, :index => true)
   property(:notes, Text)
 

data/spec/models/datamapper/league.rb

@@ -4,7 +4,7 @@ class League
   property(:id, Serial)
   property(:created_at, DateTime)
   property(:updated_at, DateTime)
-  property(:name, String, :nullable => false, :index => true)
+  property(:name, String, :required => true, :index => true)
 
   has(n, :divisions)
   has(n, :teams)

data/spec/models/datamapper/player.rb

@@ -6,9 +6,9 @@ class Player
   property(:updated_at, DateTime)
   property(:deleted_at, ParanoidDateTime)
   property(:team_id, Integer, :index => true)
-  property(:name, String, :length => 100, :nullable => false, :index => true)
+  property(:name, String, :length => 100, :required => true, :index => true)
   property(:position, String, :index => true)
-  property(:number, Integer, :nullable => false)
+  property(:number, Integer, :required => true)
   property(:retired, Boolean, :default => false)
   property(:injured, Boolean, :default => false)
   property(:born_on, Date)

data/spec/models/datamapper/team.rb

@@ -4,17 +4,17 @@ class Team
   property(:id, Serial)
   property(:created_at, DateTime)
   property(:updated_at, DateTime)
-  property(:league_id, Integer, :nullable => false, :index => true)
-  property(:division_id, Integer, :nullable => false, :index => true)
+  property(:league_id, Integer, :required => true, :index => true)
+  property(:division_id, Integer, :required => true, :index => true)
   property(:name, String, :index => true)
   property(:logo_url, String, :length => 255)
-  property(:manager, String, :length => 100, :nullable => false, :index => true)
+  property(:manager, String, :length => 100, :required => true, :index => true)
   property(:ballpark, String, :length => 100, :index => true)
   property(:mascot, String, :length => 100, :index => true)
-  property(:founded, Integer, :nullable => false)
-  property(:wins, Integer, :nullable => false)
-  property(:losses, Integer, :nullable => false)
-  property(:win_percentage, Float, :nullable => false, :precision => 4, :scale => 3)
+  property(:founded, Integer, :required => true)
+  property(:wins, Integer, :required => true)
+  property(:losses, Integer, :required => true)
+  property(:win_percentage, Float, :required => true, :precision => 4, :scale => 3)
 
   belongs_to(:league)
   belongs_to(:division)

metadata

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