merb-admin 0.8.3 → 0.8.5

data/Gemfile

@@ -10,13 +10,12 @@ gem 'json'
 
 group :test do
   gem 'activerecord', '~> 2.3', :require => 'active_record'
-  gem 'dm-core', '~> 0.10'
-  gem 'dm-aggregates', '~> 0.10'
-  gem 'dm-types', '~> 0.10'
-  gem 'dm-migrations', '~> 0.10'
-  gem 'dm-validations', '~> 0.10'
-  gem 'data_objects', '~> 0.10'
-  gem 'do_sqlite3', '~> 0.10'
+  gem 'dm-core', '~> 1.0'
+  gem 'dm-aggregates', '~> 1.0'
+  gem 'dm-types', '~> 1.0'
+  gem 'dm-migrations', '~> 1.0'
+  gem 'dm-sqlite-adapter', '~> 1.0'
+  gem 'dm-validations', '~> 1.0'
   gem 'rspec'
   gem 'sequel', '~> 3.6.0'
   gem 'sqlite3-ruby', :require => 'sqlite3'

data/Gemfile.lock

@@ -6,26 +6,30 @@ GEM
       activesupport (= 2.3.9)
     activesupport (2.3.9)
     addressable (2.2.1)
-    bcrypt-ruby (2.1.2)
     builder (2.1.2)
     data_objects (0.10.2)
       addressable (~> 2.1)
-    dm-aggregates (0.10.2)
-      dm-core (~> 0.10.2)
-    dm-core (0.10.2)
-      addressable (~> 2.1)
-      extlib (~> 0.9.14)
-    dm-migrations (0.10.2)
-      dm-core (~> 0.10.2)
-    dm-types (0.10.2)
-      bcrypt-ruby (~> 2.1.2)
-      dm-core (~> 0.10.2)
-      fastercsv (~> 1.5.0)
-      json_pure (~> 1.2.0)
+    dm-aggregates (1.0.2)
+      dm-core (~> 1.0.2)
+    dm-core (1.0.2)
+      addressable (~> 2.2)
+      extlib (~> 0.9.15)
+    dm-do-adapter (1.0.2)
+      data_objects (~> 0.10.2)
+      dm-core (~> 1.0.2)
+    dm-migrations (1.0.2)
+      dm-core (~> 1.0.2)
+    dm-sqlite-adapter (1.0.2)
+      dm-do-adapter (~> 1.0.2)
+      do_sqlite3 (~> 0.10.2)
+    dm-types (1.0.2)
+      dm-core (~> 1.0.2)
+      fastercsv (~> 1.5.3)
+      json_pure (~> 1.4)
       stringex (~> 1.1.0)
       uuidtools (~> 2.1.1)
-    dm-validations (0.10.2)
-      dm-core (~> 0.10.2)
+    dm-validations (1.0.2)
+      dm-core (~> 1.0.2)
     do_sqlite3 (0.10.2)
       data_objects (= 0.10.2)
     erubis (2.6.6)
@@ -33,7 +37,7 @@ GEM
     extlib (0.9.15)
     fastercsv (1.5.3)
     json (1.4.6)
-    json_pure (1.2.4)
+    json_pure (1.4.6)
     merb-assets (1.1.3)
       merb-core (~> 1.1.3)
     merb-core (1.1.3)
@@ -69,13 +73,12 @@ PLATFORMS
 DEPENDENCIES
   activerecord (~> 2.3)
   builder
-  data_objects (~> 0.10)
-  dm-aggregates (~> 0.10)
-  dm-core (~> 0.10)
-  dm-migrations (~> 0.10)
-  dm-types (~> 0.10)
-  dm-validations (~> 0.10)
-  do_sqlite3 (~> 0.10)
+  dm-aggregates (~> 1.0)
+  dm-core (~> 1.0)
+  dm-migrations (~> 1.0)
+  dm-sqlite-adapter (~> 1.0)
+  dm-types (~> 1.0)
+  dm-validations (~> 1.0)
   json
   merb-assets (~> 1.1)
   merb-helpers (~> 1.1)

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 Erik Michaels-Ober
+Copyright (c) 2010 Erik Michaels-Ober
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -7,9 +7,9 @@ Take it for a test drive with sample data here[http://merb-admin.heroku.com/].
 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.8.3"
+  $ gem install merb-admin
+In your app, add the following dependency to <tt>Gemfile</tt>:
+  gem "merb-admin"
 Add the following route to <tt>config/router.rb</tt>:
   add_slice(:merb_admin, :path_prefix => "admin")
 Then, run the following rake task:

data/lib/datamapper_support.rb

@@ -119,11 +119,13 @@ module MerbAdmin
           DataMapper::Types::Text => :text,
           Date => :date,
           DateTime => :datetime,
+          FalseClass => :boolean,
           Fixnum => :integer,
           Float => :float,
           Integer => :integer,
           String => :string,
           Time => :time,
+          TrueClass => :boolean,
         }
         type[property.type] || type[property.primitive]
       end

data/lib/merb-admin.rb

@@ -2,6 +2,7 @@ if defined?(Merb::Plugins)
 
   $:.unshift File.dirname(__FILE__)
 
+  require 'merb-slices'
   Merb::Plugins.add_rakefiles "merb-admin/merbtasks", "merb-admin/slicetasks", "merb-admin/spectasks"
 
   # Register the Slice for the current host application
@@ -23,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.8.3"
+    self.version = "0.8.5"
     self.author = "Erik Michaels-Ober"
 
     # Stub classes loaded hook - runs before LoadClasses BootLoader

data/lib/merb-admin/version.rb

@@ -1,3 +1,3 @@
 module MerbAdmin
-  VERSION = "0.8.3"
+  VERSION = "0.8.5"
 end

data/merb-admin.gemspec

@@ -3,13 +3,12 @@ require File.expand_path("../lib/merb-admin/version", __FILE__)
 
 Gem::Specification.new do |s|
   s.add_development_dependency("activerecord", ["~> 2.3"])
-  s.add_development_dependency("dm-core", ["~> 0.10"])
-  s.add_development_dependency("dm-aggregates", ["~> 0.10"])
-  s.add_development_dependency("dm-types", ["~> 0.10"])
-  s.add_development_dependency("dm-migrations", ["~> 0.10"])
-  s.add_development_dependency("dm-validations", ["~> 0.10"])
-  s.add_development_dependency("data_objects", ["~> 0.10"])
-  s.add_development_dependency("do_sqlite3", ["~> 0.10"])
+  s.add_development_dependency("dm-core", ["~> 1.0"])
+  s.add_development_dependency("dm-aggregates", ["~> 1.0"])
+  s.add_development_dependency("dm-types", ["~> 1.0"])
+  s.add_development_dependency("dm-migrations", ["~> 1.0"])
+  s.add_development_dependency("dm-sqlite-adapter", ["~> 1.0"])
+  s.add_development_dependency("dm-validations", ["~> 1.0"])
   s.add_development_dependency("rspec", ["~> 1.3"])
   s.add_development_dependency("sequel", ["~> 3.6.0"])
   s.add_development_dependency("sqlite3-ruby", ["~> 1.3"])

data/spec/models/datamapper/player.rb

@@ -13,7 +13,7 @@ class Player
   property(:born_on, Date)
   property(:notes, Text)
 
-  validates_is_unique(:number, :scope => :team_id, :message => "There is already a player with that number on this team")
+  validates_uniqueness_of(:number, :scope => :team_id, :message => "There is already a player with that number on this team")
 
   belongs_to(:team)
   has(1, :draft)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: merb-admin
 version: !ruby/object:Gem::Version 
-  hash: 57
+  hash: 53
   prerelease: false
   segments: 
   - 0
   - 8
-  - 3
-  version: 0.8.3
+  - 5
+  version: 0.8.5
 platform: ruby
 authors: 
 - Erik Michaels-Ober
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-11 00:00:00 -07:00
+date: 2010-09-12 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -41,11 +41,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 15
         segments: 
+        - 1
         - 0
-        - 10
-        version: "0.10"
+        version: "1.0"
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -56,11 +56,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 15
         segments: 
+        - 1
         - 0
-        - 10
-        version: "0.10"
+        version: "1.0"
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -71,11 +71,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 15
         segments: 
+        - 1
         - 0
-        - 10
-        version: "0.10"
+        version: "1.0"
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -86,62 +86,47 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 15
         segments: 
+        - 1
         - 0
-        - 10
-        version: "0.10"
+        version: "1.0"
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: dm-validations
+  name: dm-sqlite-adapter
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 15
         segments: 
+        - 1
         - 0
-        - 10
-        version: "0.10"
+        version: "1.0"
   type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: data_objects
+  name: dm-validations
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 15
         segments: 
+        - 1
         - 0
-        - 10
-        version: "0.10"
+        version: "1.0"
   type: :development
   version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: do_sqlite3
-  prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 0
-        - 10
-        version: "0.10"
-  type: :development
-  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -152,11 +137,11 @@ dependencies:
         - 3
         version: "1.3"
   type: :development
-  version_requirements: *id009
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: sequel
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -168,11 +153,11 @@ dependencies:
         - 0
         version: 3.6.0
   type: :development
-  version_requirements: *id010
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: sqlite3-ruby
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -183,11 +168,11 @@ dependencies:
         - 3
         version: "1.3"
   type: :development
-  version_requirements: *id011
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: webrat
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -198,11 +183,11 @@ dependencies:
         - 7
         version: "0.7"
   type: :development
-  version_requirements: *id012
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: builder
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -213,11 +198,11 @@ dependencies:
         - 1
         version: "2.1"
   type: :runtime
-  version_requirements: *id013
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   name: json
   prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -228,11 +213,11 @@ dependencies:
         - 4
         version: "1.4"
   type: :runtime
-  version_requirements: *id014
+  version_requirements: *id013
 - !ruby/object:Gem::Dependency 
   name: merb-assets
   prerelease: false
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -243,11 +228,11 @@ dependencies:
         - 1
         version: "1.1"
   type: :runtime
-  version_requirements: *id015
+  version_requirements: *id014
 - !ruby/object:Gem::Dependency 
   name: merb-helpers
   prerelease: false
-  requirement: &id016 !ruby/object:Gem::Requirement 
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -258,11 +243,11 @@ dependencies:
         - 1
         version: "1.1"
   type: :runtime
-  version_requirements: *id016
+  version_requirements: *id015
 - !ruby/object:Gem::Dependency 
   name: merb-slices
   prerelease: false
-  requirement: &id017 !ruby/object:Gem::Requirement 
+  requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -273,7 +258,7 @@ dependencies:
         - 1
         version: "1.1"
   type: :runtime
-  version_requirements: *id017
+  version_requirements: *id016
 description: MerbAdmin is a Merb plugin that provides an easy-to-use interface for managing your data
 email: sferik@gmail.com
 executables: []