sferik-merb-admin 0.3.1 → 0.3.2

data/README.markdown

@@ -14,7 +14,7 @@ At the command prompt, type:
 
 In your app, add the following dependency to `config/dependencies.rb`:
 
-    dependency "sferik-merb-admin", "0.3.1", :require_as => "merb-admin"
+    dependency "sferik-merb-admin", "0.3.2", :require_as => "merb-admin"
     dependency "dm-is-paginated", "0.0.1" # if you want pagination support
 
 Add the following route to `config/router.rb`:

data/Rakefile

@@ -12,7 +12,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.3.1"
+GEM_VERSION = "0.3.2"
 
 spec = Gem::Specification.new do |s|
   s.rubyforge_project = "merb"

data/app/controllers/application.rb

@@ -1,4 +1,5 @@
 class MerbAdmin::Application < Merb::Controller  
+  include Merb::MerbAdmin::MainHelper
 
   controller_for_slice
 

data/app/controllers/main.rb

@@ -2,6 +2,7 @@ require File.join( File.dirname(__FILE__), '..', '..', 'lib', 'abstract_model' )
 require File.join( File.dirname(__FILE__), '..', '..', 'lib', 'metaid' )
 
 class MerbAdmin::Main < MerbAdmin::Application
+  include Merb::MerbAdmin::MainHelper
 
   before :find_models, :only => ['index']
   before :find_model, :exclude => ['index']

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

@@ -1,3 +1,10 @@
+<%
+required = false
+@properties.each do |property|
+  next unless property[:name] == association[:child_key].first
+  required = true unless property[:nullable?]
+end
+%>
             <fieldset class="module aligned">
               <h2><%= association[:pretty_name].capitalize %></h2>
               <div class="<%= @object.errors[association[:child_key].first] ? "form-row errors" : "form-row"%>">
@@ -11,11 +18,6 @@
                 <div>
                   <%= select(association[:child_key].first, :collection => MerbAdmin::AbstractModel.new(association[:parent_model]).find_all.map{|o| [o.id, object_title(o)]}.sort_by{|o| o[1]}, :include_blank => true, :selected => @object.send(association[:child_key].first).to_s, :label => association[:pretty_name].capitalize) %>
                   <p class="help">
-                    <% required = false %>
-                    <% @properties.each do |property| %>
-                    <% next unless property[:name] == association[:child_key].first %>
-                    <% required = true unless property[:nullable?] %>
-                    <% end %>
                     <%= required ? "Required." : "Optional." %>
                   </p>
                 </div>

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

@@ -0,0 +1,25 @@
+<%
+required = false
+@properties.each do |property|
+  next unless property[:name] == association[:child_key].first
+  required = true unless property[:nullable?]
+end
+%>
+            <fieldset class="module aligned">
+              <h2><%= association[:pretty_name].capitalize %></h2>
+              <div class="<%= @object.errors[association[:child_key].first] ? "form-row errors" : "form-row"%>">
+                <% if @object.errors[association[:child_key].first] %>
+                <ul class="errorlist">
+                  <% @object.errors[association[:child_key].first].each do |error| %>
+                  <li><%= error %></li>
+                  <% end %>
+                </ul>
+                <% end %>
+                <div>
+                  <%= select(:name => "associations[#{association[:name]}][]", :id => association[:name], :collection => MerbAdmin::AbstractModel.new(association[:child_model]).find_all.map{|o| [o.id, object_title(o)]}.sort_by{|o| o[1]}, :include_blank => true, :selected => @object.send(association[:parent_key].first).to_s, :label => association[:pretty_name].capitalize) %>
+                  <p class="help">
+                    <%= required ? "Required." : "Optional." %>
+                  </p>
+                </div>
+              </div>
+            </fieldset>

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

@@ -0,0 +1,17 @@
+            <fieldset class="module aligned">
+              <% belongs_to_keys = @abstract_model.belongs_to_associations.map{|b| b[:child_key].first} %>
+              <% properties.each do |property| %>
+              <% next if [:id, :created_at, :created_on, :deleted_at, :updated_at, :updated_on, :deleted_on].include?(property[:name]) %>
+              <% next if belongs_to_keys.include?(property[:name]) %>
+              <div class="<%= @object.errors[property[:name]] ? "form-row errors" : "form-row" %>">
+                <% if @object.errors[property[:name]] %>
+                <ul class="errorlist">
+                  <% @object.errors[property[:name]].each do |error| %>
+                  <li><%= error %></li>
+                  <% end %>
+                </ul>
+                <% end %>
+<%= partial(property[:type].to_s, :property => property) -%>
+              </div>
+              <% end %>
+            </fieldset> 

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

@@ -6,25 +6,12 @@
         </ul>
         <%= form_for(@object, :action => slice_url(:admin_update, :model_name => @abstract_model.singular_name, :id => @object.id)) do %>
           <div>
-            <fieldset class="module aligned">
-              <% belongs_to_keys = @abstract_model.belongs_to_associations.map{|b| b[:child_key].first} %>
-              <% @properties.each do |property| %>
-              <% next if [:id, :created_at, :created_on, :deleted_at, :updated_at, :updated_on, :deleted_on].include?(property[:name]) %>
-              <% next if belongs_to_keys.include?(property[:name]) %>
-              <div class="<%= @object.errors[property[:name]] ? "form-row errors" : "form-row"%>">
-                <% if @object.errors[property[:name]] %>
-                <ul class="errorlist">
-                  <% @object.errors[property[:name]].each do |error| %>
-                  <li><%= error %></li>
-                  <% end %>
-                </ul>
-                <% end %>
-<%= partial(property[:type].to_s, :property => property) -%>
-              </div>
-              <% end %>
-            </fieldset>
+<%= partial('properties', :properties => @properties) -%>
             <% @abstract_model.belongs_to_associations.each do |association| %>
 <%= partial('belongs_to', :association => association) -%>
+            <% end %>
+            <% @abstract_model.has_one_associations.each do |association| %>
+<%= partial('has_one', :association => association) -%>
             <% end %>
             <% @abstract_model.has_many_associations.each do |association| %>
 <%= partial('has_many', :association => association) -%>

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

@@ -1,25 +1,12 @@
         <div id="content-main">
         <%= form_for(@object, :action => slice_url(:admin_create, :model_name => @abstract_model.singular_name)) do %>
           <div>
-            <fieldset class="module aligned">
-              <% belongs_to_keys = @abstract_model.belongs_to_associations.map{|b| b[:child_key].first} %>
-              <% @properties.each do |property| %>
-              <% next if [:id, :created_at, :created_on, :deleted_at, :updated_at, :updated_on, :deleted_on].include?(property[:name]) %>
-              <% next if belongs_to_keys.include?(property[:name]) %>
-              <div class="<%= @object.errors[property[:name]] ? "form-row errors" : "form-row"%>">
-                <% if @object.errors[property[:name]] %>
-                <ul class="errorlist">
-                  <% @object.errors[property[:name]].each do |error| %>
-                  <li><%= error %></li>
-                  <% end %>
-                </ul>
-                <% end %>
-<%= partial(property[:type].to_s, :property => property) -%>
-              </div>
-              <% end %>
-            </fieldset>
+<%= partial('properties', :properties => @properties) -%>
             <% @abstract_model.belongs_to_associations.each do |association| %>
 <%= partial('belongs_to', :association => association) -%>
+            <% end %>
+            <% @abstract_model.has_one_associations.each do |association| %>
+<%= partial('has_one', :association => association) -%>
             <% end %>
             <% @abstract_model.has_many_associations.each do |association| %>
 <%= partial('has_many', :association => association) -%>

data/lib/abstract_model.rb

@@ -15,7 +15,7 @@ module MerbAdmin
           model = lookup(m.to_s.to_sym)
           @models << new(model) if model
         end
-        @models.sort{|a, b| a.to_s <=> b.to_s}
+        @models.sort!{|a, b| a.model.to_s <=> b.model.to_s}
       else
         raise "MerbAdmin does not currently support the #{Merb.orm} ORM"
       end

data/lib/datamapper_support.rb

@@ -51,12 +51,6 @@ module MerbAdmin
         end
       end
 
-      def association_names
-        associations.map do |association|
-          association[:type] == :belongs_to ? association[:parent_name] : association[:child_name]
-        end
-      end
-
       def properties
         model.properties.map do |property|
           {
@@ -86,19 +80,20 @@ module MerbAdmin
 
       def type_lookup(property)
         type = {
-          DataMapper::Types::Serial => :integer,
+          BigDecimal => :big_decimal,
           DataMapper::Types::Boolean => :boolean,
-          DataMapper::Types::Text => :text,
+          DataMapper::Types::ParanoidBoolean => :boolean,
           DataMapper::Types::ParanoidDateTime => :date_time,
-          Integer => :integer,
+          DataMapper::Types::Serial => :integer,
+          DataMapper::Types::Text => :text,
+          Date => :date,
+          DateTime => :date_time,
           Fixnum => :integer,
           Float => :float,
-          BigDecimal => :big_decimal,
-          TrueClass => :boolean,
+          Integer => :integer,
           String => :string,
-          DateTime => :date_time,
-          Date => :date,
           Time => :time,
+          TrueClass => :boolean,
         }
         type[property.type] || type[property.primitive]
       end

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

data/spec/fixtures/division_fixture.rb

@@ -12,6 +12,6 @@ class Division
 end
 
 Division.fixture {{
-  :league_id => /\d{1,2}/.gen,
+  :league_id => /\d{1,5}/.gen,
   :name => /\w{5,10}/.gen.capitalize,
 }}

data/spec/fixtures/draft_fixture.rb

@@ -0,0 +1,29 @@
+class Draft
+  include DataMapper::Resource
+
+  property :id, Serial
+  property :created_at, DateTime
+  property :updated_at, DateTime
+  property :player_id, Integer, :nullable => false, :index => true
+  property :team_id, Integer, :nullable => false, :index => true
+  property :date, Date, :nullable => false
+  property :round, Integer, :nullable => false
+  property :pick, Integer, :nullable => false
+  property :overall, Integer, :nullable => false
+  property :college, String, :length => 100
+  property :notes, Text
+
+  belongs_to :team
+  belongs_to :player
+end
+
+Draft.fixture {{
+  :player_id => /\d{1,5}/.gen,
+  :team_id => /\d{1,5}/.gen,
+  :date => Date.today,
+  :round => /\d/.gen,
+  :pick => /\d{1,2}/.gen,
+  :overall => /\d{1,3}/.gen,
+  :college => "#{/\w{5,10}/.gen.capitalize} University",
+  :notes => /[:sentence:]/.gen,
+}}

data/spec/fixtures/league_fixture.rb

@@ -11,5 +11,5 @@ class League
 end
 
 League.fixture {{
-  :name => /\w{5,10}/.gen.capitalize,
+  :name => "#{/\w{5,10}/.gen.capitalize} League",
 }}

data/spec/fixtures/player_fixture.rb

@@ -18,10 +18,11 @@ class Player
   property :notes, Text
 
   belongs_to :team
+  has 1, :draft
 end
 
 Player.fixture {{
-  :team_id => /\d{1,2}/.gen,
+  :team_id => /\d{1,5}/.gen,
   :number => /\d{1,2}/.gen,
   :name => "#{/\w{3,10}/.gen.capitalize} #{/\w{5,10}/.gen.capitalize}",
   :position => Player.properties[:position].type.flag_map.values[rand(Player.properties[:position].type.flag_map.length)],

data/spec/fixtures/team_fixture.rb

@@ -14,7 +14,7 @@ class Team
 end
 
 Team.fixture {{
-  :league_id => /\d{1,2}/.gen,
-  :division_id => /\d{1,2}/.gen,
-  :name => /\w{5,10}/.gen.capitalize,
+  :league_id => /\d{1,5}/.gen,
+  :division_id => /\d{1,5}/.gen,
+  :name => "The #{/\w{5,10}/.gen.pluralize.capitalize}",
 }}

data/spec/requests/main_spec.rb

@@ -1,22 +1,54 @@
 require File.join(File.dirname(__FILE__), '..', 'spec_helper.rb')
 
-given "an object exists" do
+given "a player exists" do
   @player = Player.gen
 end
 
 given "two players exist" do
-  @players = 2.times{Player.gen}
+  @players = []
+  2.times do
+    @players << Player.gen
+  end
+end
+
+given "three teams exists" do
+  @teams = []
+  3.times do
+    @teams << Team.gen
+  end
+end
+
+given "a player exists and three teams exist" do
+  @player = Player.gen
+  @teams = []
+  3.times do
+    @teams << Team.gen
+  end
+end
+
+given "a league exists and three teams exist" do
+  @league = League.gen
+  @teams = []
+  3.times do
+    @teams << Team.gen
+  end
 end
 
 given "twenty players exist" do
-  @players = 20.times{Player.gen}
+  @players = []
+  20.times do
+    @players << Player.gen
+  end
 end
 
 describe "MerbAdmin" do
 
   before(:each) do
     mount_slice
+    Division.all.destroy!
+    League.all.destroy!
     Player.all.destroy!
+    Team.all.destroy!
   end
 
   describe "dashboard" do
@@ -31,6 +63,10 @@ describe "MerbAdmin" do
     it "should contain \"Site administration\"" do
       @response.body.should contain("Site administration")
     end
+
+    it "should be ordered correctly" do
+      @response.body.should contain(/Division.*League.*Player.*Team/m)
+    end
   end
 
   describe "list" do
@@ -58,11 +94,11 @@ describe "MerbAdmin" do
       @response.should be_successful
     end
 
-    it "should contain matching results" do
+    it "should contain correct results" do
       @response.body.should contain("Jackie Robinson")
     end
 
-    it "should not contain non-matching results" do
+    it "should not contain incorrect results" do
       @response.body.should_not contain("Sandy Koufax")
     end
   end
@@ -110,15 +146,35 @@ describe "MerbAdmin" do
       @response.should be_successful
     end
 
-    it "should contain matching results" do
+    it "should contain correct results" do
       @response.body.should contain("Jackie Robinson")
     end
 
-    it "should not contain non-matching results" do
+    it "should not contain incorrect results" do
       @response.body.should_not contain("David Wright")
     end
   end
 
+  describe "list with enum filter" do
+    before(:each) do
+      Player.gen(:name => "Jackie Robinson", :sex => :male)
+      Player.gen(:name => "Dottie Hinson", :sex => :female)
+      @response = request(url(:admin_list, :model_name => "player"), :params => {:filter => {:sex => :male}})
+    end
+
+    it "should respond sucessfully" do
+      @response.should be_successful
+    end
+
+    it "should contain correct results" do
+      @response.body.should contain("Jackie Robinson")
+    end
+
+    it "should not contain incorrect results" do
+      @response.body.should_not contain("Dottie Hinson")
+    end
+  end
+
   describe "list with 2 objects", :given => "two players exist" do
     before(:each) do
       MerbAdmin[:paginate] = true
@@ -209,7 +265,18 @@ describe "MerbAdmin" do
     end
   end
 
-  describe "edit", :given => "an object exists" do
+  describe "new with has-many association", :given => "three teams exists" do
+    before(:each) do
+      @response = request(url(:admin_new, :model_name => "player"))
+    end
+
+    it "should respond sucessfully" do
+      @response.should be_successful
+    end
+  end
+
+
+  describe "edit", :given => "a player exists" do
     before(:each) do
       @response = request(url(:admin_edit, :model_name => "player", :id => @player.id))
     end
@@ -223,6 +290,17 @@ describe "MerbAdmin" do
     end
   end
 
+  describe "edit with has-many association", :given => "a player exists and three teams exist" do
+    before(:each) do
+      @response = request(url(:admin_edit, :model_name => "player", :id => @player.id))
+    end
+
+    it "should respond sucessfully" do
+      @response.should be_successful
+    end
+  end
+
+
   describe "edit with missing object" do
     before(:each) do
       @response = request(url(:admin_edit, :model_name => "player", :id => 1))
@@ -242,7 +320,7 @@ describe "MerbAdmin" do
       @response.should redirect_to(url(:admin_list, :model_name => "player"))
     end
 
-    it "should create a new player" do
+    it "should create a new object" do
       Player.first.should_not be_nil
     end
   end
@@ -256,7 +334,7 @@ describe "MerbAdmin" do
       @response.should redirect_to(url(:admin_edit, :model_name => "player", :id => Player.first.id))
     end
 
-    it "should create a new player" do
+    it "should create a new object" do
       Player.first.should_not be_nil
     end
   end
@@ -270,11 +348,30 @@ describe "MerbAdmin" do
       @response.should redirect_to(url(:admin_new, :model_name => "player"))
     end
 
-    it "should create a new player" do
+    it "should create a new object" do
       Player.first.should_not be_nil
     end
   end
 
+  describe "create with has-many association", :given => "three teams exists" do
+    before(:each) do
+      @response = request(url(:admin_create, :model_name => "league"), :method => "post", :params => {:league => {:name => "National League"}, :associations => {:teams => [@teams[0].id, @teams[1].id]}})
+    end
+
+    it "should create a new object" do
+      League.first.should_not be_nil
+    end
+
+    it "should include correct associations" do
+      League.first.teams.should include(@teams[0])
+      League.first.teams.should include(@teams[1])
+    end
+
+    it "should not include incorrect associations" do
+      League.first.teams.should_not include(@teams[2])
+    end
+  end
+
   describe "create with invalid object" do
     before(:each) do
       @response = request(url(:admin_create, :model_name => "player"), :method => "post", :params => {:player => {}})
@@ -285,7 +382,7 @@ describe "MerbAdmin" do
     end
   end
 
-  describe "update", :given => "an object exists" do
+  describe "update", :given => "a player exists" do
     before(:each) do
       @response = request(url(:admin_update, :model_name => "player", :id => @player.id), :method => "put", :params => {:player => {:name => "Jackie Robinson", :number => 42, :team_id => 1, :sex => :male}})
     end
@@ -299,7 +396,7 @@ describe "MerbAdmin" do
     end
   end
 
-  describe "update and edit", :given => "an object exists" do
+  describe "update and edit", :given => "a player exists" do
     before(:each) do
       @response = request(url(:admin_update, :model_name => "player", :id => @player.id), :method => "put", :params => {:player => {:name => "Jackie Robinson", :number => 42, :team_id => 1, :sex => :male}, :_continue => true})
     end
@@ -313,7 +410,7 @@ describe "MerbAdmin" do
     end
   end
 
-  describe "update and add another", :given => "an object exists" do
+  describe "update and add another", :given => "a player exists" do
     before(:each) do
       @response = request(url(:admin_update, :model_name => "player", :id => @player.id), :method => "put", :params => {:player => {:name => "Jackie Robinson", :number => 42, :team_id => 1, :sex => :male}, :_add_another => true})
     end
@@ -327,6 +424,25 @@ describe "MerbAdmin" do
     end
   end
 
+  describe "update with has-many association", :given => "a league exists and three teams exist" do
+    before(:each) do
+      @response = request(url(:admin_update, :model_name => "league", :id => @league.id), :method => "put", :params => {:league => {:name => "National League"}, :associations => {:teams => [@teams[0].id, @teams[1].id]}})
+    end
+
+    it "should update an object that already exists" do
+      League.first(:id => @league.id).name.should eql("National League")
+    end
+
+    it "should include correct associations" do
+      League.first.teams.should include(@teams[0])
+      League.first.teams.should include(@teams[1])
+    end
+
+    it "should not include incorrect associations" do
+      League.first.teams.should_not include(@teams[2])
+    end
+  end
+
   describe "update with missing object" do
     before(:each) do
       @response = request(url(:admin_update, :model_name => "player", :id => 1), :method => "put", :params => {:player => {:name => "Jackie Robinson", :number => 42, :team_id => 1, :sex => :male}})
@@ -337,7 +453,7 @@ describe "MerbAdmin" do
     end
   end
 
-  describe "update with invalid object", :given => "an object exists" do
+  describe "update with invalid object", :given => "a player exists" do
     before(:each) do
       @response = request(url(:admin_update, :model_name => "player", :id => @player.id), :method => "put", :params => {:player => {:number => "a"}})
     end
@@ -347,7 +463,7 @@ describe "MerbAdmin" do
     end
   end
 
-  describe "delete", :given => "an object exists" do
+  describe "delete", :given => "a player exists" do
     before(:each) do
       @response = request(url(:admin_delete, :model_name => "player", :id => @player.id))
     end
@@ -371,7 +487,7 @@ describe "MerbAdmin" do
     end
   end
 
-  describe "destroy", :given => "an object exists" do
+  describe "destroy", :given => "a player exists" do
     before(:each) do
       @response = request(url(:admin_destroy, :model_name => "player", :id => @player.id), :method => "delete")
     end

data/spec/spec_helper.rb

@@ -24,8 +24,7 @@ Merb.start_environment(
   :session_store => 'memory'
 )
 
-# DataMapper.setup(:default, 'sqlite3::memory:') && DataMapper.auto_migrate!
-DataMapper.setup(:default, 'sqlite3:test.db')
+DataMapper.setup(:default, 'sqlite3::memory:') && DataMapper.auto_migrate!
 
 module Merb
   module Test
@@ -58,8 +57,7 @@ Merb::Test.add_helpers do
   def mount_slice
     if standalone?
       Merb::Router.reset!
-      Merb::Router.prepare { add_slice(:MerbAdmin, :name_prefix => nil, :path_prefix => "", :default_routes => false) }
+      Merb::Router.prepare{add_slice(:MerbAdmin, :name_prefix => nil, :path_prefix => "admin", :default_routes => false)}
     end
   end
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sferik-merb-admin
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors: 
 - Erik Michaels-Ober
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-24 00:00:00 -07:00
+date: 2009-08-31 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -68,6 +68,7 @@ files:
 - spec/controllers/main_spec.rb
 - spec/fixtures
 - spec/fixtures/division_fixture.rb
+- spec/fixtures/draft_fixture.rb
 - spec/fixtures/league_fixture.rb
 - spec/fixtures/player_fixture.rb
 - spec/fixtures/team_fixture.rb
@@ -95,7 +96,9 @@ files:
 - app/views/main/_date_time.html.erb
 - app/views/main/_float.html.erb
 - app/views/main/_has_many.html.erb
+- app/views/main/_has_one.html.erb
 - app/views/main/_integer.html.erb
+- app/views/main/_properties.html.erb
 - app/views/main/_string.html.erb
 - app/views/main/_text.html.erb
 - app/views/main/_time.html.erb