merb-admin 0.7.4 → 0.7.5

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.4"
+  dependency "merb-admin", "0.7.5"
 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.4
+0.7.5

data/lib/abstract_model.rb

@@ -7,7 +7,7 @@ module MerbAdmin
       @models = []
       orm = Merb.orm
       case orm
-      when :activerecord, :sequel
+      when :active_record, :sequel
         Dir.glob(Merb.dir_for(:model) / Merb.glob_for(:model)).each do |filename|
           File.read(filename).scan(/class ([\w\d_\-:]+)/).flatten.each do |model_name|
             add_model(model_name)
@@ -38,7 +38,7 @@ module MerbAdmin
       end
 
       case Merb.orm
-      when :activerecord
+      when :active_record
         model if superclasses(model).include?(ActiveRecord::Base)
       when :datamapper
         model if model.include?(DataMapper::Resource)
@@ -57,8 +57,8 @@ module MerbAdmin
       @model = model
       self.extend(GenericSupport)
       case orm
-      when :activerecord
-        require 'activerecord_support'
+      when :active_record
+        require 'active_record_support'
         self.extend(ActiverecordSupport)
       when :datamapper
         require 'datamapper_support'

data/lib/{activerecord_support.rb → active_record_support.rb}

@@ -1,4 +1,4 @@
-require 'activerecord'
+require 'active_record'
 
 module MerbAdmin
   class AbstractModel

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

data/lib/merb-admin/slicetasks.rb

@@ -17,16 +17,16 @@ namespace :slices do
     # end
 
     desc "Copies sample models, copies and runs sample migrations, and loads sample data into your app"
-    task :activerecord => ["activerecord:copy_sample_models", "activerecord:copy_sample_migrations", "activerecord:migrate", "load_sample_data"]
-    namespace :activerecord do
+    task :active_record => ["active_record:copy_sample_models", "active_record:copy_sample_migrations", "active_record:migrate", "load_sample_data"]
+    namespace :active_record do
       desc "Copies sample models into your app"
       task :copy_sample_models do
-        copy_models(:activerecord)
+        copy_models(:active_record)
       end
 
       desc "Copies sample migrations into your app"
       task :copy_sample_migrations do
-        copy_migrations(:activerecord)
+        copy_migrations(:active_record)
       end
 
       desc "Migrate the database to the latest version"

data/merb-admin.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{merb-admin}
-  s.version = "0.7.4"
+  s.version = "0.7.5"
 
   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-12}
+  s.date = %q{2009-12-14}
   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 = [
@@ -50,7 +50,7 @@ Gem::Specification.new do |s|
      "app/views/main/list.html.erb",
      "app/views/main/new.html.erb",
      "lib/abstract_model.rb",
-     "lib/activerecord_support.rb",
+     "lib/active_record_support.rb",
      "lib/datamapper_support.rb",
      "lib/generic_support.rb",
      "lib/merb-admin.rb",
@@ -132,21 +132,21 @@ Gem::Specification.new do |s|
      "public/stylesheets/rtl.css",
      "public/stylesheets/widgets.css",
      "spec/controllers/main_spec.rb",
-     "spec/migrations/activerecord/001_create_divisions_migration.rb",
-     "spec/migrations/activerecord/002_create_drafts_migration.rb",
-     "spec/migrations/activerecord/003_create_leagues_migration.rb",
-     "spec/migrations/activerecord/004_create_players_migration.rb",
-     "spec/migrations/activerecord/005_create_teams_migration.rb",
+     "spec/migrations/active_record/001_create_divisions_migration.rb",
+     "spec/migrations/active_record/002_create_drafts_migration.rb",
+     "spec/migrations/active_record/003_create_leagues_migration.rb",
+     "spec/migrations/active_record/004_create_players_migration.rb",
+     "spec/migrations/active_record/005_create_teams_migration.rb",
      "spec/migrations/sequel/001_create_divisions_migration.rb",
      "spec/migrations/sequel/002_create_drafts_migration.rb",
      "spec/migrations/sequel/003_create_leagues_migration.rb",
      "spec/migrations/sequel/004_create_players_migration.rb",
      "spec/migrations/sequel/005_create_teams_migration.rb",
-     "spec/models/activerecord/division.rb",
-     "spec/models/activerecord/draft.rb",
-     "spec/models/activerecord/league.rb",
-     "spec/models/activerecord/player.rb",
-     "spec/models/activerecord/team.rb",
+     "spec/models/active_record/division.rb",
+     "spec/models/active_record/draft.rb",
+     "spec/models/active_record/league.rb",
+     "spec/models/active_record/player.rb",
+     "spec/models/active_record/team.rb",
      "spec/models/datamapper/division.rb",
      "spec/models/datamapper/draft.rb",
      "spec/models/datamapper/league.rb",
@@ -174,21 +174,21 @@ Gem::Specification.new do |s|
   s.summary = %q{MerbAdmin is a Merb plugin that provides an easy-to-use interface for managing your data.}
   s.test_files = [
     "spec/controllers/main_spec.rb",
-     "spec/migrations/activerecord/001_create_divisions_migration.rb",
-     "spec/migrations/activerecord/002_create_drafts_migration.rb",
-     "spec/migrations/activerecord/003_create_leagues_migration.rb",
-     "spec/migrations/activerecord/004_create_players_migration.rb",
-     "spec/migrations/activerecord/005_create_teams_migration.rb",
+     "spec/migrations/active_record/001_create_divisions_migration.rb",
+     "spec/migrations/active_record/002_create_drafts_migration.rb",
+     "spec/migrations/active_record/003_create_leagues_migration.rb",
+     "spec/migrations/active_record/004_create_players_migration.rb",
+     "spec/migrations/active_record/005_create_teams_migration.rb",
      "spec/migrations/sequel/001_create_divisions_migration.rb",
      "spec/migrations/sequel/002_create_drafts_migration.rb",
      "spec/migrations/sequel/003_create_leagues_migration.rb",
      "spec/migrations/sequel/004_create_players_migration.rb",
      "spec/migrations/sequel/005_create_teams_migration.rb",
-     "spec/models/activerecord/division.rb",
-     "spec/models/activerecord/draft.rb",
-     "spec/models/activerecord/league.rb",
-     "spec/models/activerecord/player.rb",
-     "spec/models/activerecord/team.rb",
+     "spec/models/active_record/division.rb",
+     "spec/models/active_record/draft.rb",
+     "spec/models/active_record/league.rb",
+     "spec/models/active_record/player.rb",
+     "spec/models/active_record/team.rb",
      "spec/models/datamapper/division.rb",
      "spec/models/datamapper/draft.rb",
      "spec/models/datamapper/league.rb",

data/spec/spec_helper.rb

@@ -41,17 +41,17 @@ module Merb
         orm = set_orm(orm)
         orm = orm.to_s.downcase.to_sym
         case orm
-        when :activerecord
-          require 'activerecord'
+        when :active_record
+          require 'active_record'
           require_models(orm)
           unless ActiveRecord::Base.connected?
             ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:')
             ActiveRecord::Migration.verbose = false
-            ActiveRecord::Migrator.run(:up, File.join(File.dirname(__FILE__), "migrations", "activerecord"), 1)
-            ActiveRecord::Migrator.run(:up, File.join(File.dirname(__FILE__), "migrations", "activerecord"), 2)
-            ActiveRecord::Migrator.run(:up, File.join(File.dirname(__FILE__), "migrations", "activerecord"), 3)
-            ActiveRecord::Migrator.run(:up, File.join(File.dirname(__FILE__), "migrations", "activerecord"), 4)
-            ActiveRecord::Migrator.run(:up, File.join(File.dirname(__FILE__), "migrations", "activerecord"), 5)
+            ActiveRecord::Migrator.run(:up, File.join(File.dirname(__FILE__), "migrations", "active_record"), 1)
+            ActiveRecord::Migrator.run(:up, File.join(File.dirname(__FILE__), "migrations", "active_record"), 2)
+            ActiveRecord::Migrator.run(:up, File.join(File.dirname(__FILE__), "migrations", "active_record"), 3)
+            ActiveRecord::Migrator.run(:up, File.join(File.dirname(__FILE__), "migrations", "active_record"), 4)
+            ActiveRecord::Migrator.run(:up, File.join(File.dirname(__FILE__), "migrations", "active_record"), 5)
           end
         when :datamapper
           require 'dm-core'
@@ -83,7 +83,7 @@ module Merb
       end
 
       def set_orm(orm = nil)
-        orm || ENV['MERB_ORM'] || (Merb.orm != :none ? Merb.orm : nil) || :activerecord
+        orm || ENV['MERB_ORM'] || (Merb.orm != :none ? Merb.orm : nil) || :active_record
       end
 
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-admin
 version: !ruby/object:Gem::Version 
-  version: 0.7.4
+  version: 0.7.5
 platform: ruby
 authors: 
 - Erik Michaels-Ober
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-12 00:00:00 -08:00
+date: 2009-12-14 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -105,7 +105,7 @@ files:
 - app/views/main/list.html.erb
 - app/views/main/new.html.erb
 - lib/abstract_model.rb
-- lib/activerecord_support.rb
+- lib/active_record_support.rb
 - lib/datamapper_support.rb
 - lib/generic_support.rb
 - lib/merb-admin.rb
@@ -187,21 +187,21 @@ files:
 - public/stylesheets/rtl.css
 - public/stylesheets/widgets.css
 - spec/controllers/main_spec.rb
-- spec/migrations/activerecord/001_create_divisions_migration.rb
-- spec/migrations/activerecord/002_create_drafts_migration.rb
-- spec/migrations/activerecord/003_create_leagues_migration.rb
-- spec/migrations/activerecord/004_create_players_migration.rb
-- spec/migrations/activerecord/005_create_teams_migration.rb
+- spec/migrations/active_record/001_create_divisions_migration.rb
+- spec/migrations/active_record/002_create_drafts_migration.rb
+- spec/migrations/active_record/003_create_leagues_migration.rb
+- spec/migrations/active_record/004_create_players_migration.rb
+- spec/migrations/active_record/005_create_teams_migration.rb
 - spec/migrations/sequel/001_create_divisions_migration.rb
 - spec/migrations/sequel/002_create_drafts_migration.rb
 - spec/migrations/sequel/003_create_leagues_migration.rb
 - spec/migrations/sequel/004_create_players_migration.rb
 - spec/migrations/sequel/005_create_teams_migration.rb
-- spec/models/activerecord/division.rb
-- spec/models/activerecord/draft.rb
-- spec/models/activerecord/league.rb
-- spec/models/activerecord/player.rb
-- spec/models/activerecord/team.rb
+- spec/models/active_record/division.rb
+- spec/models/active_record/draft.rb
+- spec/models/active_record/league.rb
+- spec/models/active_record/player.rb
+- spec/models/active_record/team.rb
 - spec/models/datamapper/division.rb
 - spec/models/datamapper/draft.rb
 - spec/models/datamapper/league.rb
@@ -251,21 +251,21 @@ specification_version: 3
 summary: MerbAdmin is a Merb plugin that provides an easy-to-use interface for managing your data.
 test_files: 
 - spec/controllers/main_spec.rb
-- spec/migrations/activerecord/001_create_divisions_migration.rb
-- spec/migrations/activerecord/002_create_drafts_migration.rb
-- spec/migrations/activerecord/003_create_leagues_migration.rb
-- spec/migrations/activerecord/004_create_players_migration.rb
-- spec/migrations/activerecord/005_create_teams_migration.rb
+- spec/migrations/active_record/001_create_divisions_migration.rb
+- spec/migrations/active_record/002_create_drafts_migration.rb
+- spec/migrations/active_record/003_create_leagues_migration.rb
+- spec/migrations/active_record/004_create_players_migration.rb
+- spec/migrations/active_record/005_create_teams_migration.rb
 - spec/migrations/sequel/001_create_divisions_migration.rb
 - spec/migrations/sequel/002_create_drafts_migration.rb
 - spec/migrations/sequel/003_create_leagues_migration.rb
 - spec/migrations/sequel/004_create_players_migration.rb
 - spec/migrations/sequel/005_create_teams_migration.rb
-- spec/models/activerecord/division.rb
-- spec/models/activerecord/draft.rb
-- spec/models/activerecord/league.rb
-- spec/models/activerecord/player.rb
-- spec/models/activerecord/team.rb
+- spec/models/active_record/division.rb
+- spec/models/active_record/draft.rb
+- spec/models/active_record/league.rb
+- spec/models/active_record/player.rb
+- spec/models/active_record/team.rb
 - spec/models/datamapper/division.rb
 - spec/models/datamapper/draft.rb
 - spec/models/datamapper/league.rb