merb-admin 0.7.6 → 0.8.0

data/Gemfile

@@ -0,0 +1,21 @@
+# dependencies are generated using a strict version, don't forget to edit the dependency versions when upgrading.
+merb_gems_version = "1.1.0"
+
+# If you did disable json for Merb, comment out this line.
+# If you want use json gem just change it.
+# Don't use json gem version lower than 1.1.7! Older versions has security bug!
+gem "json_pure", ">= 1.1.7", :require => "json"
+gem "merb-core", merb_gems_version
+gem "builder", "~> 2.1.2"
+
+group :test do
+  gem "activerecord", "~> 2.3.5", :require => "active_record"
+  gem "dm-core", "~> 0.10.2"
+  gem "dm-aggregates", "~> 0.10.2"
+  gem "dm-validations", "~> 0.10.2"
+  gem "data_objects", "~> 0.10.1"
+  gem "do_sqlite3", "~> 0.10.1.1"
+  gem "sequel", "~> 3.10.0"
+  gem "sqlite3-ruby", "~> 1.2.5", :require => "sqlite3"
+  gem "webrat", "~> 0.7.0"
+end

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.6"
+  dependency "merb-admin", "0.8.0"
 Add the following route to <tt>config/router.rb</tt>:
   add_slice(:merb_admin, :path_prefix => "admin")
 Then, run the following rake task:

data/Rakefile

@@ -7,7 +7,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."
-MERB_GEM_VERSION = "1.0.15"
+MERB_GEM_VERSION = "1.1"
 
 begin
   require 'jeweler'

data/VERSION

@@ -1 +1 @@
-0.7.6
+0.8.0

data/app/controllers/main.rb

@@ -3,12 +3,12 @@ require File.join( File.dirname(__FILE__), '..', '..', 'lib', 'abstract_model' )
 class MerbAdmin::Main < MerbAdmin::Application
   include Merb::MerbAdmin::MainHelper
 
-  before :get_models, :only => ['index']
   before :get_model, :exclude => ['index']
   before :get_object, :only => ['edit', 'update', 'delete', 'destroy']
   before :get_attributes, :only => ['create', 'update']
 
   def index
+    @abstract_models = MerbAdmin::AbstractModel.all
     render(:layout => 'dashboard')
   end
 
@@ -45,7 +45,7 @@ class MerbAdmin::Main < MerbAdmin::Application
     if @object.save && update_all_associations
       redirect_on_success
     else
-      render_error
+      render_error(:new)
     end
   end
 
@@ -57,7 +57,7 @@ class MerbAdmin::Main < MerbAdmin::Application
     if @object.update_attributes(@attributes) && update_all_associations
       redirect_on_success
     else
-      render_error
+      render_error(:edit)
     end
   end
 
@@ -75,17 +75,9 @@ class MerbAdmin::Main < MerbAdmin::Application
 
   private
 
-  def get_models
-    @abstract_models = MerbAdmin::AbstractModel.all
-  end
-
   def get_model
     model_name = to_model_name(params[:model_name])
     @abstract_model = MerbAdmin::AbstractModel.new(model_name)
-    get_properties
-  end
-
-  def get_properties
     @properties = @abstract_model.properties
   end
 
@@ -190,10 +182,10 @@ class MerbAdmin::Main < MerbAdmin::Application
     end
   end
 
-  def render_error
+  def render_error(template)
     action = params[:action]
     message[:error] = "#{@abstract_model.pretty_name} failed to be #{action}d"
-    render(:new, :layout => 'form')
+    render(template, :layout => 'form')
   end
 
 end

data/lib/merb-admin.rb

@@ -2,7 +2,6 @@ if defined?(Merb::Plugins)
 
   $:.unshift File.dirname(__FILE__)
 
-  dependency 'merb-slices', :immediate => true
   Merb::Plugins.add_rakefiles "merb-admin/merbtasks", "merb-admin/slicetasks", "merb-admin/spectasks"
 
   # Register the Slice for the current host application
@@ -24,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.7.6"
+    self.version = "0.8.0"
     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.6"
+  s.version = "0.8.0"
 
   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-19}
+  s.date = %q{2010-04-20}
   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 = [
@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".gitignore",
+     "Gemfile",
      "LICENSE",
      "README.rdoc",
      "Rakefile",
@@ -170,7 +171,7 @@ Gem::Specification.new do |s|
 }
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   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",
@@ -208,22 +209,22 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<merb-slices>, [">= 1.0.15"])
-      s.add_runtime_dependency(%q<merb-assets>, [">= 1.0.15"])
-      s.add_runtime_dependency(%q<merb-helpers>, [">= 1.0.15"])
+      s.add_runtime_dependency(%q<merb-slices>, [">= 1.1"])
+      s.add_runtime_dependency(%q<merb-assets>, [">= 1.1"])
+      s.add_runtime_dependency(%q<merb-helpers>, [">= 1.1"])
       s.add_runtime_dependency(%q<builder>, [">= 2.1.2"])
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
     else
-      s.add_dependency(%q<merb-slices>, [">= 1.0.15"])
-      s.add_dependency(%q<merb-assets>, [">= 1.0.15"])
-      s.add_dependency(%q<merb-helpers>, [">= 1.0.15"])
+      s.add_dependency(%q<merb-slices>, [">= 1.1"])
+      s.add_dependency(%q<merb-assets>, [">= 1.1"])
+      s.add_dependency(%q<merb-helpers>, [">= 1.1"])
       s.add_dependency(%q<builder>, [">= 2.1.2"])
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
     end
   else
-    s.add_dependency(%q<merb-slices>, [">= 1.0.15"])
-    s.add_dependency(%q<merb-assets>, [">= 1.0.15"])
-    s.add_dependency(%q<merb-helpers>, [">= 1.0.15"])
+    s.add_dependency(%q<merb-slices>, [">= 1.1"])
+    s.add_dependency(%q<merb-assets>, [">= 1.1"])
+    s.add_dependency(%q<merb-helpers>, [">= 1.1"])
     s.add_dependency(%q<builder>, [">= 2.1.2"])
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
   end

data/spec/requests/main_spec.rb

@@ -8,6 +8,10 @@ given "a draft exists" do
   @draft = MerbAdmin::AbstractModel.new("Draft").create(:player_id => rand(99999), :team_id => rand(99999), :date => Date.today, :round => rand(50), :pick => rand(30), :overall => rand(1500))
 end
 
+given "a league exists" do
+  @league = MerbAdmin::AbstractModel.new("League").create(:name => "League 1")
+end
+
 given "two players exist" do
   @players = []
   (1..2).each do |number|
@@ -22,35 +26,13 @@ given "three teams exist" do
   end
 end
 
-given "a player exists and a draft exists" do
-  @player = MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => 1, :name => "Player 1")
-  @draft = MerbAdmin::AbstractModel.new("Draft").create(:player_id => rand(99999), :team_id => rand(99999), :date => Date.today, :round => rand(50), :pick => rand(30), :overall => rand(1500))
-end
-
-given "a player exists and three teams exist" do
-  @player = MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => 1, :name => "Player 1")
-  @teams = []
-  (1..3).each do |number|
-    @teams << MerbAdmin::AbstractModel.new("Team").create(:league_id => rand(99999), :division_id => rand(99999), :name => "Team #{number}", :manager => "Manager #{number}", :founded => 1869 + rand(130), :wins => (wins = rand(163)), :losses => 162 - wins, :win_percentage => ("%.3f" % (wins.to_f / 162)).to_f)
-  end
-end
-
-given "a player exists and three teams with no name exist" do
-  @player = MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => 1, :name => "Player 1")
+given "three teams with no name exist" do
   @teams = []
   (1..3).each do |number|
     @teams << MerbAdmin::AbstractModel.new("Team").create(:league_id => rand(99999), :division_id => rand(99999), :manager => "Manager #{number}", :founded => 1869 + rand(130), :wins => (wins = rand(163)), :losses => 162 - wins, :win_percentage => ("%.3f" % (wins.to_f / 162)).to_f)
   end
 end
 
-given "a league exists and three teams exist" do
-  @league = MerbAdmin::AbstractModel.new("League").create(:name => "League 1")
-  @teams = []
-  (1..3).each do |number|
-    @teams << MerbAdmin::AbstractModel.new("Team").create(:league_id => rand(99999), :division_id => rand(99999), :name => "Team #{number}", :manager => "Manager #{number}", :founded => 1869 + rand(130), :wins => (wins = rand(163)), :losses => 162 - wins, :win_percentage => ("%.3f" % (wins.to_f / 162)).to_f)
-  end
-end
-
 given "twenty players exist" do
   @players = []
   (1..20).each do |number|
@@ -371,7 +353,7 @@ describe "MerbAdmin" do
     end
   end
 
-  describe "new with missing label", :given => "a player exists and three teams with no name exist" do
+  describe "new with missing label", :given => ["a player exists", "three teams with no name exist"] do
     before(:each) do
       @response = visit(url(:merb_admin_new, :model_name => "player"))
     end
@@ -533,7 +515,7 @@ describe "MerbAdmin" do
     end
   end
 
-  describe "edit with has-one association", :given => "a player exists and a draft exists" do
+  describe "edit with has-one association", :given => ["a player exists", "a draft exists"] do
     before(:each) do
       @response = visit(url(:merb_admin_edit, :model_name => "player", :id => @player.id))
     end
@@ -547,7 +529,7 @@ describe "MerbAdmin" do
     end
   end
 
-  describe "edit with has-many association", :given => "a player exists and three teams exist" do
+  describe "edit with has-many association", :given => ["a player exists", "three teams exist"] do
     before(:each) do
       @response = visit(url(:merb_admin_edit, :model_name => "player", :id => @player.id))
     end
@@ -571,7 +553,7 @@ describe "MerbAdmin" do
     end
   end
 
-  describe "edit with missing label", :given => "a player exists and three teams with no name exist" do
+  describe "edit with missing label", :given => ["a player exists", "three teams with no name exist"] do
     before(:each) do
       @response = visit(url(:merb_admin_edit, :model_name => "player", :id => @player.id))
     end
@@ -644,7 +626,7 @@ describe "MerbAdmin" do
     end
   end
 
-  describe "update with has-one association", :given => "a player exists and a draft exists" do
+  describe "update with has-one association", :given => ["a player exists", "a draft exists"] do
     before(:each) do
       visit(url(:merb_admin_edit, :model_name => "player", :id => @player.id))
       fill_in "Name", :with => "Jackie Robinson"
@@ -668,7 +650,7 @@ describe "MerbAdmin" do
     end
   end
 
-  describe "update with has-many association", :given => "a league exists and three teams exist" do
+  describe "update with has-many association", :given => ["a league exists", "three teams exist"] do
     before(:each) do
       visit(url(:merb_admin_edit, :model_name => "league", :id => @league.id))
       fill_in "Name", :with => "National League"

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: merb-admin
 version: !ruby/object:Gem::Version 
-  version: 0.7.6
+  prerelease: false
+  segments: 
+  - 0
+  - 8
+  - 0
+  version: 0.8.0
 platform: ruby
 authors: 
 - Erik Michaels-Ober
@@ -9,59 +14,76 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-19 00:00:00 -08:00
+date: 2010-04-20 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 1
+        version: "1.1"
   name: merb-slices
+  requirement: *id001
+  prerelease: false
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.15
-    version: 
-- !ruby/object:Gem::Dependency 
+        segments: 
+        - 1
+        - 1
+        version: "1.1"
   name: merb-assets
+  requirement: *id002
+  prerelease: false
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.15
-    version: 
-- !ruby/object:Gem::Dependency 
+        segments: 
+        - 1
+        - 1
+        version: "1.1"
   name: merb-helpers
+  requirement: *id003
+  prerelease: false
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.0.15
-    version: 
 - !ruby/object:Gem::Dependency 
-  name: builder
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 1
+        - 2
         version: 2.1.2
-    version: 
+  name: builder
+  requirement: *id004
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency 
-  name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 9
         version: 1.2.9
-    version: 
+  name: rspec
+  requirement: *id005
+  prerelease: false
+  type: :development
 description: MerbAdmin is a Merb plugin that provides an easy-to-use interface for managing your data.
 email: sferik@gmail.com
 executables: []
@@ -73,6 +95,7 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .gitignore
+- Gemfile
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -234,18 +257,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: MerbAdmin is a Merb plugin that provides an easy-to-use interface for managing your data.