merb-admin 0.4.7 → 0.4.8

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.7"
+    dependency "merb-admin", "0.4.8"
 
 Add the following route to `config/router.rb`:
 

data/Rakefile

@@ -9,7 +9,7 @@ AUTHOR = "Erik Michaels-Ober"
 EMAIL = "sferik@gmail.com"
 HOMEPAGE = "http://twitter.com/sferik"
 SUMMARY = "MerbAdmin is a Merb plugin that provides an easy-to-use interface for managing your data."
-GEM_VERSION = "0.4.7"
+GEM_VERSION = "0.4.8"
 
 spec = Gem::Specification.new do |s|
   s.rubyforge_project = "merb"

data/app/views/main/_text.html.erb

@@ -1,7 +1,7 @@
 <%
   name = property[:name]
   label = property[:pretty_name]
-  required = property[:nullable?]
+  required = !property[:nullable?]
 %>
                 <div>
                   <%= text_area(name, :cols => 80, :label => label) %>

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

data/spec/requests/main_spec.rb

@@ -70,7 +70,7 @@ describe "MerbAdmin" do
       @response.should be_successful
     end
 
-    it "should contain \"Site administration\"" do
+    it "should show \"Site administration\"" do
       @response.body.should contain("Site administration")
     end
   end
@@ -84,7 +84,7 @@ describe "MerbAdmin" do
       @response.should be_successful
     end
 
-    it "should contain \"Select model to edit\"" do
+    it "should show \"Select model to edit\"" do
       @response.body.should contain("Select player to edit")
     end
   end
@@ -132,7 +132,7 @@ describe "MerbAdmin" do
       @response.should be_successful
     end
 
-    it "should contain a correct result" do
+    it "should show a correct result" do
       @response.body.should contain("Jackie Robinson")
     end
 
@@ -154,7 +154,7 @@ describe "MerbAdmin" do
       @response.should be_successful
     end
 
-    it "should contain a correct result" do
+    it "should show a correct result" do
       @response.body.should contain("Sandy Koufax")
     end
 
@@ -177,7 +177,7 @@ describe "MerbAdmin" do
       @response.should be_successful
     end
 
-    it "should contain a correct result" do
+    it "should show a correct result" do
       @response.body.should contain("Moises Alou")
     end
 
@@ -199,7 +199,7 @@ describe "MerbAdmin" do
       @response.should be_successful
     end
 
-    it "should contain a correct result" do
+    it "should show a correct result" do
     end
 
     it "should not contain an incorrect result" do
@@ -220,7 +220,7 @@ describe "MerbAdmin" do
       @response.should be_successful
     end
 
-    it "should contain \"2 results\"" do
+    it "should show \"2 results\"" do
       @response.body.should contain("2 players")
     end
   end
@@ -236,7 +236,7 @@ describe "MerbAdmin" do
       @response.should be_successful
     end
 
-    it "should contain \"20 results\"" do
+    it "should show \"20 results\"" do
       @response.body.should contain("20 players")
     end
   end
@@ -294,7 +294,7 @@ describe "MerbAdmin" do
       @response.should be_successful
     end
 
-    it "should contain \"New model\"" do
+    it "should show \"New model\"" do
       @response.body.should contain("New player")
     end
   end
@@ -328,9 +328,24 @@ describe "MerbAdmin" do
       @response.should be_successful
     end
 
-    it "should contain \"Edit model\"" do
+    it "should show \"Edit model\"" do
       @response.body.should contain("Edit player")
     end
+
+    it "should show required fields as \"Required\"" do
+      @response.body.should contain(/Name\n\s*Required/)
+      @response.body.should contain(/Number\n\s*Required/)
+      @response.body.should contain(/Team\n\s*Required/)
+    end
+
+    it "should show non-required fields as \"Optional\"" do
+      @response.body.should contain(/Position\n\s*Optional/)
+      @response.body.should contain(/Batting average\n\s*Optional/)
+      @response.body.should contain(/Born on\n\s*Optional/)
+      @response.body.should contain(/Wake at\n\s*Optional/)
+      @response.body.should contain(/Notes\n\s*Optional/)
+      @response.body.should contain(/Draft\n\s*Optional/)
+    end
   end
 
   describe "edit with has-one association", :given => "a player exists and a draft exists" do
@@ -444,7 +459,7 @@ describe "MerbAdmin" do
       @response = request(url(:admin_create, :model_name => "player"), :method => "post", :params => {:player => {}})
     end
 
-    it "should contain an error message" do
+    it "should show an error message" do
       @response.body.should contain("Player failed to be created")
     end
   end
@@ -539,7 +554,7 @@ describe "MerbAdmin" do
       @response = request(url(:admin_update, :model_name => "player", :id => @player.id), :method => "put", :params => {:player => {:number => "a"}})
     end
 
-    it "should contain an error message" do
+    it "should show an error message" do
       @response.body.should contain("Player failed to be updated")
     end
   end
@@ -553,7 +568,7 @@ describe "MerbAdmin" do
       @response.should be_successful
     end
 
-    it "should contain \"Delete model\"" do
+    it "should show \"Delete model\"" do
       @response.body.should contain("Delete player")
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-admin
 version: !ruby/object:Gem::Version 
-  version: 0.4.7
+  version: 0.4.8
 platform: ruby
 authors: 
 - Erik Michaels-Ober