merb-admin 0.5.5 → 0.5.6

data/README.rdoc

@@ -0,0 +1,34 @@
+= MerbAdmin
+==== MerbAdmin is a Merb plugin that provides an easy-to-use interface for managing your data.
+It currently offers the features listed here[http://sferik.tadalist.com/lists/1352791/public].
+
+The status of the current build can be seen here[http://runcoderun.com/sferik/merb-admin].
+== Installtion
+  $ 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.5.6"
+Add the following route to <tt>config/router.rb</tt>:
+  add_slice(:merb_admin, :path_prefix => "admin")
+Then, run the following rake task:
+  $ rake slices:merb-admin:install
+== Configuration (optional)
+If you're feeling crafty, you can set a couple configuration options in <tt>config/init.rb</tt>:
+  Merb::BootLoader.before_app_loads do
+    Merb::Slices::config[:merb_admin][:app_name] = "My App"
+    Merb::Slices::config[:merb_admin][:per_page] = 100
+  end
+== Usage
+Start the server:
+  $ merb
+You should now be able to administer your site at http://localhost:4000/admin.
+== Contact
+Please report any problems you encounter to mailto:sferik@gmail.com or {@sferik}[http://twitter.com/sferik] on Twitter.
+== WARNING
+MerbAdmin does not implement any authorization scheme. Make sure to apply authorization logic before deploying to production!
+== Credits
+Many thanks to:
+* {Wilson Miner}[http://www.wilsonminer.com] for contributing the stylesheets and javascripts from Django[http://www.djangoproject.com]
+* {Aaron Wheeler}[http://fightinjoe.com/] for contributing libraries from {Merb AutoScaffold}[http://github.com/fightinjoe/merb-autoscaffold]
+* {Lori Holden}[http://loriholden.com/] for contributing the merb-pagination[http://github.com/lholden/merb-pagination] helper
+* {Jacques Crocker}[http://merbjedi.com] for adding support for {namespaced models}[http://github.com/merbjedi/merb-admin/commit/8139e2241038baf9b72452056fcdc7c340d79275]
+Also, thanks to beer[http://www.21st-amendment.com].

data/Rakefile

@@ -9,7 +9,7 @@ AUTHOR = "Erik Michaels-Ober"
 EMAIL = "sferik@gmail.com"
 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.5.5"
+GEM_VERSION = "0.5.6"
 
 spec = Gem::Specification.new do |s|
   s.rubyforge_project = "merb"
@@ -17,7 +17,7 @@ spec = Gem::Specification.new do |s|
   s.version = GEM_VERSION
   s.platform = Gem::Platform::RUBY
   s.has_rdoc = false
-  s.extra_rdoc_files = ["README.markdown", "LICENSE"]
+  s.extra_rdoc_files = ["README.rdoc", "LICENSE"]
   s.summary = SUMMARY
   s.description = s.summary
   s.author = AUTHOR
@@ -25,9 +25,8 @@ 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.3")
   s.require_path = "lib"
-  s.files = %w(LICENSE README.markdown Rakefile) + Dir.glob("{app,lib,public,schema,spec,stubs}/**/*")
+  s.files = %w(LICENSE README.rdoc Rakefile) + Dir.glob("{app,lib,public,schema,spec,stubs}/**/*")
   s.post_install_message = <<-POST_INSTALL_MESSAGE
 #{"*" * 80}
 

data/lib/abstract_model.rb

@@ -34,7 +34,7 @@ module MerbAdmin
     # Given a symbol +model_name+, finds the corresponding model class
     def self.lookup(model_name)
       begin
-        model = const_get(model_name)
+        model = Object.full_const_get(model_name.to_s)
       rescue NameError
         raise "MerbAdmin could not find model #{model_name}"
       end

data/lib/merb-admin/slicetasks.rb

@@ -1,11 +1,8 @@
 require 'abstract_model'
-require 'mlb'
 
 namespace :slices do
   namespace :"merb-admin" do
 
-    # 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
@@ -20,9 +17,8 @@ namespace :slices do
     # end
 
     namespace :activerecord do
-
       desc "Loads sample ActiveRecord models and data"
-      task :load_sample => ["load_sample:activerecord:models", "load_sample:activerecord:data"]
+      task :load_sample => ["activerecord:load_sample:models", "activerecord:load_sample:data"]
       namespace :load_sample do
         desc "Loads sample ActiveRecord models"
         task :models do
@@ -37,13 +33,11 @@ namespace :slices do
           load_data
         end
       end
-
     end
 
     namespace :datamapper do
-
       desc "Loads sample DataMapper models and data"
-      task :load_sample => ["load_sample:datamapper:models", "load_sample:datamapper:data"]
+      task :load_sample => ["datamapper:load_sample:models", "datamapper:load_sample:data"]
       namespace :load_sample do
         desc "Loads sample DataMapper models"
         task :models do
@@ -57,7 +51,6 @@ namespace :slices do
           load_data
         end
       end
-
     end
 
   end
@@ -66,6 +59,14 @@ end
 private
 
 def load_data
+  begin
+    require "mlb"    
+  rescue LoadError => e
+    puts "LoadError: #{e}"
+    puts "gem install mlb -s http://gemcutter.org"
+    return
+  end
+  
   puts "Loading current MLB leagues, divisions, teams, and players"
   MLB.teams.each do |mlb_team|
     unless league = MerbAdmin::AbstractModel.new("League").first(:conditions => ["name = ?", mlb_team.league])

data/lib/merb-admin.rb

@@ -23,7 +23,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.5.5"
+    self.version = "0.5.6"
     self.author = "Erik Michaels-Ober"
 
     # Stub classes loaded hook - runs before LoadClasses BootLoader

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-admin
 version: !ruby/object:Gem::Version 
-  version: 0.5.5
+  version: 0.5.6
 platform: ruby
 authors: 
 - Erik Michaels-Ober
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-15 00:00:00 -07:00
+date: 2009-10-18 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,16 +32,6 @@ 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.3
-    version: 
 description: MerbAdmin is a Merb plugin that provides an easy-to-use interface for managing your data.
 email: sferik@gmail.com
 executables: []
@@ -49,11 +39,11 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README.markdown
+- README.rdoc
 - LICENSE
 files: 
 - LICENSE
-- README.markdown
+- README.rdoc
 - Rakefile
 - app/controllers/application.rb
 - app/controllers/main.rb

data/README.markdown

@@ -1,58 +0,0 @@
-# MerbAdmin
-
-**MerbAdmin is a Merb plugin that provides an easy-to-use interface for managing your data.**
-
-It currently offers the features listed [here](http://sferik.tadalist.com/lists/1352791/public).
-
-## Get it
-
-At the command prompt, type:
-
-    sudo gem install merb-admin -s http://gemcutter.org
-
-## Install it
-
-In your app, add the following dependency to `config/dependencies.rb`:
-
-    dependency "merb-admin", "0.5.5"
-
-Add the following route to `config/router.rb`:
-
-    add_slice(:merb_admin, :path_prefix => "admin")
-
-Then, run the following rake task:
-
-    rake slices:merb-admin:install
-
-## Configure it (optional)
-
-If you're feeling crafty, you can set a couple configuration options in `config/init.rb`:
-
-    Merb::BootLoader.before_app_loads do
-      Merb::Slices::config[:merb_admin][:app_name] = "My App"
-      Merb::Slices::config[:merb_admin][:per_page] = 100
-    end
-
-## Run it
-
-Start the server:
-
-    merb
-
-You should now be able to administer your site at [http://localhost:4000/admin](http://localhost:4000/admin).
-
-Please report any problems you encounter to <sferik@gmail.com> or [@sferik](http://twitter.com/home/?status=@sferik%20) on Twitter.
-
-## WARNING
-
-MerbAdmin does not implement any authorization scheme. Make sure to apply authorization logic before deploying to production!
-
-## Acknowledgements
-
-Many thanks to:
-
-* [Wilson Miner](http://www.wilsonminer.com) for contributing the stylesheets and javascripts from [Django](http://www.djangoproject.com)
-* [Aaron Wheeler](http://fightinjoe.com/) for contributing libraries from [Merb AutoScaffold](http://github.com/fightinjoe/merb-autoscaffold)
-* [Lori Holden](http://loriholden.com/) for contributing the [merb-pagination](http://github.com/lholden/merb-pagination) helper
-
-Also, thanks to [beer](http://www.21st-amendment.com).