merb-admin 0.4.9 → 0.5.0

data/README.markdown

@@ -16,7 +16,7 @@ At the command prompt, type:
 
 In your app, add the following dependency to `config/dependencies.rb`:
 
-    dependency "merb-admin", "0.4.9"
+    dependency "merb-admin", "0.5.0"
 
 Add the following route to `config/router.rb`:
 

data/Rakefile

@@ -7,9 +7,9 @@ require "merb-core/tasks/merb"
 GEM_NAME = "merb-admin"
 AUTHOR = "Erik Michaels-Ober"
 EMAIL = "sferik@gmail.com"
-HOMEPAGE = "http://twitter.com/sferik"
+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.4.9"
+GEM_VERSION = "0.5.0"
 
 spec = Gem::Specification.new do |s|
   s.rubyforge_project = "merb"
@@ -25,6 +25,7 @@ spec = Gem::Specification.new do |s|
   s.homepage = HOMEPAGE
   s.add_dependency("merb-slices", ">= 1.0.12")
   s.add_dependency("builder", ">= 2.1.2")
+  s.add_dependency("mlb", ">= 0.0.1")
   s.require_path = "lib"
   s.files = %w(LICENSE README.markdown Rakefile) + Dir.glob("{app,lib,public,schema,spec,stubs}/**/*")
   s.post_install_message = <<-POST_INSTALL_MESSAGE

data/lib/merb-admin/merbtasks.rb

@@ -1,13 +1,13 @@
 namespace :slices do
   namespace :"merb-admin" do
-  
+
     desc "Install MerbAdmin"
     task :install => [:preflight, :setup_directories, :copy_assets, :migrate]
-    
+
     desc "Test for any dependencies"
     task :preflight do # see slicetasks.rb
     end
-  
+
     desc "Setup directories"
     task :setup_directories do
       puts "Creating directories for host application"
@@ -21,7 +21,7 @@ namespace :slices do
         end
       end
     end
-    
+
     # desc "Copy stub files to host application"
     # task :stubs do
     #   puts "Copying stubs for MerbAdmin - resolves any collisions"
@@ -30,10 +30,10 @@ namespace :slices do
     #   copied.each { |f| puts "- copied #{f}" }
     #   preserved.each { |f| puts "! preserved override as #{f}" }
     # end
-    
+
     # desc "Copy stub files and views to host application"
     # task :patch => [ "stubs", "freeze:views" ]
-  
+
     desc "Copy public assets to host application"
     task :copy_assets do
       puts "Copying assets for MerbAdmin - resolves any collisions"
@@ -42,22 +42,22 @@ namespace :slices do
       copied.each { |f| puts "- copied #{f}" }
       preserved.each { |f| puts "! preserved override as #{f}" }
     end
-    
+
     desc "Migrate the database"
     task :migrate do # see slicetasks.rb
     end
-    
+
     desc "Freeze MerbAdmin into your app (only merb-admin/app)" 
     task :freeze => [ "freeze:app" ]
 
     namespace :freeze do
-      
+
       # desc "Freezes MerbAdmin by installing the gem into application/gems"
       # task :gem do
       #   ENV["GEM"] ||= "merb-admin"
       #   Rake::Task['slices:install_as_gem'].invoke
       # end
-      
+
       desc "Freezes MerbAdmin by copying all files from merb-admin/app to your application"
       task :app do
         puts "Copying all merb-admin/app files to your application - resolves any collisions"
@@ -66,7 +66,7 @@ namespace :slices do
         copied.each { |f| puts "- copied #{f}" }
         preserved.each { |f| puts "! preserved override as #{f}" }
       end
-      
+
       desc "Freeze all views into your application for easy modification" 
       task :views do
         puts "Copying all view templates to your application - resolves any collisions"
@@ -75,7 +75,7 @@ namespace :slices do
         copied.each { |f| puts "- copied #{f}" }
         preserved.each { |f| puts "! preserved override as #{f}" }
       end
-      
+
       desc "Freeze all models into your application for easy modification" 
       task :models do
         puts "Copying all models to your application - resolves any collisions"
@@ -84,10 +84,10 @@ namespace :slices do
         copied.each { |f| puts "- copied #{f}" }
         preserved.each { |f| puts "! preserved override as #{f}" }
       end
-      
+
       desc "Freezes MerbAdmin as a gem and copies over merb-admin/app"
       task :app_with_gem => [:gem, :app]
-      
+
       desc "Freezes MerbAdmin by unpacking all files into your application"
       task :unpack do
         puts "Unpacking MerbAdmin files to your application - resolves any collisions"
@@ -96,8 +96,8 @@ namespace :slices do
         copied.each { |f| puts "- copied #{f}" }
         preserved.each { |f| puts "! preserved override as #{f}" }
       end
-      
+
     end
-    
+
   end
 end

data/lib/merb-admin/slicetasks.rb

@@ -1,8 +1,37 @@
+require 'mlb'
+require 'abstract_model'
+
 namespace :slices do
-  namespace :"merb-admin" do 
-    
+  namespace :"merb-admin" do
+
+    desc "Loads sample DataMapper models and data"
+    task :load_sample => ["load_sample:datamapper"]
+
+    namespace :load_sample do
+
+      desc "Loads sample ActiveRecord models"
+      task :activerecord do
+        puts "Copying sample ActiveRecord models into host application - resolves any collisions"
+        copy_models(:activerecord)
+        puts "Copying sample ActiveRecord migrations into host application - resolves any collisions"
+        copy_migrations
+        Rake::Task["db:migrate"].reenable
+        Rake::Task["db:migrate"].invoke
+        load_data
+      end
+
+      desc "Loads sample DataMapper models"
+      task :datamapper do
+        puts "Copying sample DataMapper models into host application - resolves any collisions"
+        copy_models(:datamapper)
+        Rake::Task["db:automigrate"].reenable
+        Rake::Task["db:automigrate"].invoke
+        load_data
+      end
+    end
+
     # add your own merb-admin tasks here
-    
+
     # # Uncomment the following lines and edit the pre defined tasks
     #
     # # implement this to test for structural/code dependencies
@@ -10,11 +39,93 @@ namespace :slices do
     # desc "Test for any dependencies"
     # task :preflight do
     # end
-    # 
+    #
     # # implement this to perform any database related setup steps
     # desc "Migrate the database"
     # task :migrate do
     # end
-    
+
+  end
+end
+
+private
+
+def load_data
+  puts "Loading current MLB leagues, divisions, mlb_teams, and players"
+  MLB.teams.each do |mlb_team|
+    unless league = MerbAdmin::AbstractModel.new("League").first(:conditions => ["name = ?", mlb_team['league']['name']])
+      league = MerbAdmin::AbstractModel.new("League").create(:name => mlb_team['league']['name'])
+    end
+    unless division = MerbAdmin::AbstractModel.new("Division").first(:conditions => ["name = ?", mlb_team['division']['name']])
+      division = MerbAdmin::AbstractModel.new("Division").create(:name => mlb_team['division']['name'], :league => league)
+    end
+    unless team = MerbAdmin::AbstractModel.new("Team").first(:conditions => ["name = ?", mlb_team['name']])
+      team = MerbAdmin::AbstractModel.new("Team").create(:name => mlb_team['name'], :division => division, :league => league)
+    end
+    mlb_team['current_roster'].each do |player|
+      MerbAdmin::AbstractModel.new("Player").create(:name => player['player'], :number => player['number'], :position => player['position'], :team => team)
+    end
+  end
+end
+
+def copy_models(orm = nil)
+  orm ||= set_orm
+  seen, copied, duplicated = [], [], []
+  Dir.glob(File.dirname(__FILE__) / ".." / ".." / "spec" / "models" / orm.to_s.downcase / MerbAdmin.glob_for(:model)).each do |source_filename|
+    destination_filename = Merb.dir_for(:model) / File.basename(source_filename)
+    next if seen.include?(source_filename)
+    mirror_file(source_filename, destination_filename, copied, duplicated)
+    seen << source_filename
+  end
+  copied.each { |f| puts "- copied #{f}" }
+  duplicated.each { |f| puts "! duplicated override as #{f}" }
+end
+
+def copy_migrations
+  seen, copied, duplicated = [], [], []
+  Dir.glob(File.dirname(__FILE__) / ".." / ".." / "schema" / "migrations" / "*.rb").each do |source_filename|
+    destination_filename = Merb.root / "schema" / "migrations" / File.basename(source_filename)
+    next if seen.include?(source_filename)
+    mirror_file(source_filename, destination_filename, copied, duplicated)
+    seen << source_filename
   end
+  copied.each { |f| puts "- copied #{f}" }
+  duplicated.each { |f| puts "! duplicated override as #{f}" }
+end
+
+def require_models(orm = nil)
+  orm ||= set_orm
+  Dir.glob(File.dirname(__FILE__) / "models" / orm.to_s.downcase / Merb.glob_for(:model)).each do |model_filename|
+    require model_filename
+  end
+end
+
+def set_orm(orm = nil)
+  orm || ENV['MERB_ORM'] || (Merb.orm != :none ? Merb.orm : nil) || :datamapper
+end
+
+def mirror_file(source, dest, copied = [], duplicated = [], postfix = '_override')
+  base, rest = split_name(source)
+  dst_dir = File.dirname(dest)
+  dup_path = dst_dir / "#{base}#{postfix}.#{rest}"
+  if File.file?(source)
+    FileUtils.mkdir_p(dst_dir) unless File.directory?(dst_dir)
+    if File.exists?(dest) && !File.exists?(dup_path) && !FileUtils.identical?(source, dest)
+      # copy app-level override to *_override.ext
+      FileUtils.copy_entry(dest, dup_path, false, false, true)
+      duplicated << dup_path.relative_path_from(Merb.root)
+    end
+    # copy gem-level original to location
+    if !File.exists?(dest) || (File.exists?(dest) && !FileUtils.identical?(source, dest))
+      FileUtils.copy_entry(source, dest, false, false, true)
+      copied << dest.relative_path_from(Merb.root)
+    end
+  end
+end
+
+def split_name(name)
+  file_name = File.basename(name)
+  mres = /^([^\/\.]+)\.(.+)$/i.match(file_name)
+  mres.nil? ? [file_name, ''] : [mres[1], mres[2]]
 end
+

data/lib/merb-admin/spectasks.rb

@@ -1,20 +1,20 @@
 namespace :slices do
   namespace :"merb-admin" do
-      
+
     desc "Run slice specs within the host application context"
     task :spec => [ "spec:explain", "spec:default" ]
-    
+
     namespace :spec do
-      
+
       slice_root = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
-      
+
       task :explain do
         puts "\nNote: By running MerbAdmin specs inside the application context any\n" +
              "overrides could break existing specs. This isn't always a problem,\n" +
              "especially in the case of views. Use these spec tasks to check how\n" +
              "well your application conforms to the original slice implementation."
       end
-      
+
       Spec::Rake::SpecTask.new('default') do |t|
         t.spec_opts = ["--format", "specdoc", "--colour"]
         t.spec_files = Dir["#{slice_root}/spec/**/*_spec.rb"].sort
@@ -46,8 +46,8 @@ namespace :slices do
         t.libs = ['lib', 'server/lib' ]
         t.spec_files = Dir["#{slice_root}/spec/**/*_spec.rb"].sort
       end
-      
+
     end
-    
+
   end
 end

data/lib/merb-admin.rb

@@ -11,19 +11,19 @@ if defined?(Merb::Plugins)
   # Slice configuration - set this in a before_app_loads callback.
   # By default a Slice uses its own layout, so you can swicht to 
   # the main application layout or no layout at all if needed.
-  # 
+  #
   # Configuration options:
   # :layout - the layout to use; defaults to :merb-admin
   # :mirror - which path component types to use on copy operations; defaults to all
   Merb::Slices::config[:merb_admin][:layout] ||= :merb_admin
   Merb::Slices::config[:merb_admin][:per_page] ||= 100
-  
+
   # All Slice code is expected to be namespaced inside a module
   module MerbAdmin
 
     # Slice metadata
     self.description = "MerbAdmin is a Merb plugin that provides an easy-to-use interface for managing your data."
-    self.version = "0.4.9"
+    self.version = "0.5.0"
     self.author = "Erik Michaels-Ober"
 
     # Stub classes loaded hook - runs before LoadClasses BootLoader

data/schema/migrations/002_create_drafts_migration.rb

@@ -13,6 +13,7 @@ class CreateDraftsMigration < ActiveRecord::Migration
     end
     add_index :drafts, :player_id
     add_index :drafts, :team_id
+    add_index :drafts, :college
   end
 
   def self.down

data/schema/migrations/004_create_players_migration.rb

@@ -12,6 +12,9 @@ class CreatePlayersMigration < ActiveRecord::Migration
       t.date :born_on
       t.text :notes
     end
+    add_index :players, :team_id
+    add_index :players, :name
+    add_index :players, :position
   end
 
   def self.down

data/schema/migrations/005_create_teams_migration.rb

@@ -18,6 +18,8 @@ class CreateTeamsMigration < ActiveRecord::Migration
     add_index :teams, :league_id
     add_index :teams, :name
     add_index :teams, :manager
+    add_index :teams, :ballpark
+    add_index :teams, :mascot
   end
 
   def self.down

data/spec/models/datamapper/draft.rb

@@ -10,7 +10,7 @@ class Draft
   property :round, Integer, :nullable => false
   property :pick, Integer, :nullable => false
   property :overall, Integer, :nullable => false
-  property :college, String, :length => 100
+  property :college, String, :length => 100, :index => true
   property :notes, Text
 
   belongs_to :team

data/spec/models/datamapper/player.rb

@@ -5,9 +5,9 @@ class Player
   property :created_at, DateTime
   property :updated_at, DateTime
   property :deleted_at, ParanoidDateTime
-  property :team_id, Integer
+  property :team_id, Integer, :index => true
   property :name, String, :length => 100, :nullable => false, :index => true
-  property :position, String
+  property :position, String, :index => true
   property :number, Integer, :nullable => false
   property :retired, Boolean, :default => false
   property :injured, Boolean, :default => false

data/spec/models/datamapper/team.rb

@@ -9,8 +9,8 @@ class Team
   property :name, String, :nullable => false, :index => true
   property :logo_image_url, String, :length => 255
   property :manager, String, :length => 100, :nullable => false, :index => true
-  property :ballpark, String, :length => 100
-  property :mascot, String, :length => 100
+  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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-admin
 version: !ruby/object:Gem::Version 
-  version: 0.4.9
+  version: 0.5.0
 platform: ruby
 authors: 
 - Erik Michaels-Ober
@@ -32,6 +32,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 2.1.2
     version: 
+- !ruby/object:Gem::Dependency 
+  name: mlb
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.0.1
+    version: 
 description: MerbAdmin is a Merb plugin that provides an easy-to-use interface for managing your data.
 email: sferik@gmail.com
 executables: []
@@ -171,7 +181,7 @@ files:
 - spec/requests/main_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
-homepage: http://twitter.com/sferik
+homepage: http://github.com/sferik/merb-admin
 licenses: []
 
 post_install_message: |