sferik-merb-admin 0.2.5 → 0.2.6

data/README.markdown

@@ -1,6 +1,6 @@
 # MerbAdmin
 
-**MerbAdmin is a merb slice that provides an easy-to-use interface for managing your data.**
+**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).
 
@@ -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.2.5", :require_as => "merb-admin"
+    dependency "sferik-merb-admin", "0.2.6", :require_as => "merb-admin"
 
 Add the following route to `config/router.rb`:
 

data/Rakefile

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

data/app/views/forms/_date_time.html.erb

@@ -1,6 +1,6 @@
 <% value = eval("@instance.#{property.field}") %>
                 <div>
-                  <%= text_field(property.name, :class => "vDateField", :label => property.field.capitalize.gsub('_', ' '), :value => value.respond_to?(:strftime) ? value.strftime("%Y-%m-%d %H:%M:%S") ? nil) %>
+                  <%= text_field(property.name, :class => "vDateField", :label => property.field.capitalize.gsub('_', ' '), :value => value.respond_to?(:strftime) ? value.strftime("%Y-%m-%d %H:%M:%S") : nil) %>
                   <p class="help">
                     <%= !property.nullable? ? "Required." : "Optional." %>
                   </p>

data/lib/merb-admin.rb

@@ -7,7 +7,7 @@ if defined?(Merb::Plugins)
 
   # Register the Slice for the current host application
   Merb::Slices::register(__FILE__)
-  
+
   # 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.
@@ -19,32 +19,30 @@ if defined?(Merb::Plugins)
   
   # All Slice code is expected to be namespaced inside a module
   module MerbAdmin
-    
+
     # Slice metadata
     self.description = "MerbAdmin is a merb slice that uses your DataMapper models to provide an easy-to-use, Django-style interface for content managers."
-    self.version = "0.2.5"
+    self.version = "0.2.6"
     self.author = "Erik Michaels-Ober"
-    
+
     # Stub classes loaded hook - runs before LoadClasses BootLoader
     # right after a slice's classes have been loaded internally.
     def self.loaded
-      require "dm-is-paginated"
     end
-    
+
     # Initialization hook - runs before AfterAppLoads BootLoader
     def self.init
     end
-    
+
     # Activation hook - runs after AfterAppLoads BootLoader
     def self.activate
     end
-    
+
     # Deactivation hook - triggered by Merb::Slices.deactivate(MerbAdmin)
     def self.deactivate
     end
-    
-    def self.setup_router(scope)
 
+    def self.setup_router(scope)
       scope.match("/admin(/index)", :method => :get).
         to(:controller => "forms", :action => "index").
         name(:admin_dashboard)
@@ -76,11 +74,10 @@ if defined?(Merb::Plugins)
       scope.match("/admin/:model_name/:id(.:format)", :method => :delete).
         to(:controller => "forms", :action => "destroy").
         name(:admin_destroy)
-
     end
-    
+
   end
-  
+
   # Setup the slice layout for MerbAdmin
   #
   # Use MerbAdmin.push_path and MerbAdmin.push_app_path
@@ -94,8 +91,8 @@ if defined?(Merb::Plugins)
   #
   # Or just call setup_default_structure! to setup a basic Merb MVC structure.
   MerbAdmin.setup_default_structure!
-  
+
   # Add dependencies for other MerbAdmin classes below. Example:
   # dependency "merb-admin/other"
-  
+
 end

data/spec/controllers/forms_spec.rb

@@ -0,0 +1,20 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe MerbAdmin::Forms do 
+
+  before(:each) do
+    mount_slice
+  end
+
+  it "should have helper methods for dealing with public paths" do
+    @controller = dispatch_to(MerbAdmin::Forms, :index)
+    @controller.public_path_for(:image).should == "/slices/merb-admin/images"
+    @controller.public_path_for(:javascript).should == "/slices/merb-admin/javascripts"
+    @controller.public_path_for(:stylesheet).should == "/slices/merb-admin/stylesheets"
+    
+    @controller.image_path.should == "/slices/merb-admin/images"
+    @controller.javascript_path.should == "/slices/merb-admin/javascripts"
+    @controller.stylesheet_path.should == "/slices/merb-admin/stylesheets"
+  end
+
+end

data/spec/fixtures/user_fixture.rb

@@ -0,0 +1,26 @@
+class Player
+  include DataMapper::Resource
+
+  property :id, Serial
+  property :created_at, DateTime
+  property :updated_at, DateTime
+  property :deleted_at, ParanoidDateTime
+  property :team_id, Integer, :nullable => false, :index => true
+  property :name, String, :length => 100, :nullable => false, :index => true
+  property :position, Flag[:pitcher, :catcher, :first, :second, :third, :shortstop, :left, :center, :right]
+  property :sex, Enum[:male, :female]
+  property :batting_average, Float, :default => 0.0, :precision => 4, :scale => 3
+  property :injured, Boolean, :default => false
+  property :retired, TrueClass, :default => false
+  property :born_on, Date
+  property :wake_at, Time
+  property :notes, Text
+
+  # belongs_to :team
+end
+
+Player.fixture {{
+  :name => "#{/\w{3,10}/.gen.capitalize} #{/\w{5,10}/.gen.capitalize}",
+  :sex => Player.properties[:sex].type.flag_map.values[rand(Player.properties[:sex].type.flag_map.length)],
+  :team_id => 1,
+}}

data/spec/fixtures.rb

@@ -0,0 +1,10 @@
+# Learn more at http://github.com/datamapper/dm-more/tree/master/dm-sweatshop
+require 'dm-sweatshop'
+# Learn more at http://github.com/datamapper/dm-more/tree/master/dm-types
+require 'dm-types'
+require 'dm-aggregates'
+require 'dm-validations'
+
+Dir['spec/fixtures/**/*_fixture.rb'].sort.each do |fixture_file|
+  require fixture_file
+end

data/spec/requests/forms_spec.rb

@@ -0,0 +1,204 @@
+require File.join(File.dirname(__FILE__), '..', 'spec_helper.rb')
+
+given "a model exists" do
+  @model_name = 'Player'
+  @model = eval(@model_name)
+  @model.all.destroy!
+end
+
+given "an instance exists" do
+  @model_name = 'Player'
+  @model = eval(@model_name)
+  @model.all.destroy!
+  @instance = @model.gen
+end
+
+describe "MerbAdmin" do
+
+  before(:each) do
+    mount_slice
+  end
+
+  describe "dashboard" do
+    before(:each) do
+      @response = request(url(:admin_dashboard))
+    end
+
+    it "should respond sucessfully" do
+      @response.should be_successful
+    end
+
+    it "should should contain \"Site administration\"" do
+      @response.body.should contain("Site administration")
+    end
+  end
+
+  describe "list", :given => "a model exists" do
+    before(:each) do
+      @response = request(url(:admin_list, :model_name => @model_name.snake_case))
+    end
+
+    it "should respond sucessfully" do
+      @response.should be_successful
+    end
+
+    it "should contain \"Select model to edit\"" do
+      @response.body.should contain("Select #{@model_name.snake_case.gsub('_', ' ')} to edit")
+    end
+  end
+
+  describe "list with query", :given => "a model exists" do
+    before(:each) do
+      @response = request(url(:admin_list, :model_name => @model_name.snake_case), :params => {:query => "Jackie Robinson"})
+    end
+
+    it "should respond sucessfully" do
+      @response.should be_successful
+    end
+
+    it "should contain \"results\"" do
+      @response.body.should contain("results")
+    end
+  end
+
+  describe "new", :given => "a model exists" do
+    before(:each) do
+      @response = request(url(:admin_new, :model_name => @model_name.snake_case))
+    end
+
+    it "should respond sucessfully" do
+      @response.should be_successful
+    end
+
+    it "should contain \"New model\"" do
+      @response.body.should contain("New #{@model_name.snake_case.gsub('_', ' ')}")
+    end
+  end
+
+  describe "edit", :given => "an instance exists" do
+    before(:each) do
+      @response = request(url(:admin_edit, :model_name => @model_name.snake_case, :id => @instance.id))
+    end
+
+    it "should respond sucessfully" do
+      @response.should be_successful
+    end
+
+    it "should contain \"Edit model\"" do
+      @response.body.should contain("Edit #{@model_name.snake_case.gsub('_', ' ')}")
+    end
+  end
+
+  describe "create", :given => "a model exists" do
+    before(:each) do
+      @response = request(url(:admin_create, :model_name => @model_name.snake_case), :method => "post", :params => {:player => {:name => "Jackie Robinson", :team_id => 1, :sex => :male}})
+    end
+
+    it "should create a new instance" do
+      @model.first.should_not be_nil
+    end
+
+    it "should redirect to list" do
+      @response.should redirect_to(url(:admin_list, :model_name => @model_name.snake_case))
+    end
+  end
+
+  describe "create and edit", :given => "a model exists" do
+    before(:each) do
+      @response = request(url(:admin_create, :model_name => @model_name.snake_case), :method => "post", :params => {:player => {:name => "Jackie Robinson", :team_id => 1, :sex => :male}, :_continue => true})
+    end
+
+    it "should create a new instance" do
+      @model.first.should_not be_nil
+    end
+
+    it "should redirect to edit" do
+      @response.should redirect_to(url(:admin_edit, :model_name => @model_name.snake_case, :id => @model.first.id))
+    end
+  end
+
+  describe "create and add another", :given => "a model exists" do
+    before(:each) do
+      @response = request(url(:admin_create, :model_name => @model_name.snake_case), :method => "post", :params => {:player => {:name => "Jackie Robinson", :team_id => 1, :sex => :male}, :_add_another => true})
+    end
+
+    it "should create a new instance" do
+      @model.first.should_not be_nil
+    end
+
+    it "should redirect to new" do
+      @response.should redirect_to(url(:admin_new, :model_name => @model_name.snake_case))
+    end
+  end
+
+  describe "update", :given => "an instance exists" do
+    before(:each) do
+      @response = request(url(:admin_update, :model_name => @model_name.snake_case, :id => @instance.id), :method => "put", :params => {:player => {:name => "Jackie Robinson", :team_id => 1, :sex => :male}})
+    end
+
+    it "should update an instance that already exists" do
+      @model.first(:id => @instance.id).name.should eql("Jackie Robinson")
+    end
+
+    it "should redirect to list" do
+      @response.should redirect_to(url(:admin_list, :model_name => @model_name.snake_case))
+    end
+  end
+
+  describe "update and edit", :given => "an instance exists" do
+    before(:each) do
+      @response = request(url(:admin_update, :model_name => @model_name.snake_case, :id => @instance.id), :method => "put", :params => {:player => {:name => "Jackie Robinson", :team_id => 1, :sex => :male}, :_continue => true})
+    end
+
+    it "should update an instance that already exists" do
+      @model.first(:id => @instance.id).name.should eql("Jackie Robinson")
+    end
+
+    it "should redirect to edit" do
+      @response.should redirect_to(url(:admin_edit, :model_name => @model_name.snake_case, :id => @instance.id))
+    end
+  end
+
+  describe "update and add another", :given => "an instance exists" do
+    before(:each) do
+      @response = request(url(:admin_update, :model_name => @model_name.snake_case, :id => @instance.id), :method => "put", :params => {:player => {:name => "Jackie Robinson", :team_id => 1, :sex => :male}, :_add_another => true})
+    end
+
+    it "should update an instance that already exists" do
+      @model.first(:id => @instance.id).name.should eql("Jackie Robinson")
+    end
+
+    it "should redirect to new" do
+      @response.should redirect_to(url(:admin_new, :model_name => @model_name.snake_case))
+    end
+  end
+
+  describe "delete", :given => "an instance exists" do
+    before(:each) do
+      @response = request(url(:admin_delete, :model_name => @model_name.snake_case, :id => @instance.id))
+    end
+
+    it "should respond sucessfully" do
+      @response.should be_successful
+    end
+
+    it "should contain \"Delete model\"" do
+      @response.body.should contain("Delete #{@model_name.snake_case.gsub('_', ' ')}")
+    end
+  end
+
+  describe "destroy", :given => "an instance exists" do
+    before(:each) do
+      @response = request(url(:admin_update, :model_name => @model_name.snake_case, :id => @instance.id), :method => "delete")
+    end
+
+    it "should destroy an instance" do
+      @model.first(:id => @instance.id).should be_nil
+    end
+
+    it "should redirect to list" do
+      @response.should redirect_to(url(:admin_list, :model_name => @model_name.snake_case))
+    end
+  end
+
+end

data/spec/spec_helper.rb

@@ -3,7 +3,9 @@ require 'merb-core'
 require 'merb-slices'
 require 'merb-helpers'
 require 'merb-assets'
+require 'merb-action-args'
 require 'spec'
+require 'spec/fixtures'
 
 # Add merb-admin.rb to the search path
 Merb::Plugins.config[:merb_slices][:auto_register] = true
@@ -19,9 +21,13 @@ Merb.start_environment(
   :testing => true, 
   :adapter => 'runner', 
   :environment => ENV['MERB_ENV'] || 'test',
+  :merb_root => Merb.root,
   :session_store => 'memory'
 )
 
+# DataMapper.setup(:default, 'sqlite3::memory:') && DataMapper.auto_migrate!
+DataMapper.setup(:default, 'sqlite3:test.db')
+
 module Merb
   module Test
     module SliceHelper
@@ -51,10 +57,10 @@ end
 #
 Merb::Test.add_helpers do
   def mount_slice
-    Merb::Router.prepare { add_slice(:MerbAdmin) } if standalone?
+    if standalone?
+      Merb::Router.reset!
+      Merb::Router.prepare { add_slice(:MerbAdmin, :name_prefix => nil, :path_prefix => "", :default_routes => false) }
+    end
   end
 
-  def dismount_slice
-    Merb::Router.reset! if standalone?
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sferik-merb-admin
 version: !ruby/object:Gem::Version 
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors: 
 - Erik Michaels-Ober
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-11 00:00:00 -07:00
+date: 2009-08-18 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -52,7 +52,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.0.1
     version: 
-description: MerbAdmin is a merb slice that provides an easy-to-use interface for managing your data.
+description: MerbAdmin is a Merb plugin that provides an easy-to-use interface for managing your data.
 email: sferik@gmail.com
 executables: []
 
@@ -70,9 +70,13 @@ files:
 - lib/merb-admin/slicetasks.rb
 - lib/merb-admin/spectasks.rb
 - lib/merb-admin.rb
-- spec/controller
-- spec/controller/forms_spec.rb
-- spec/merb-admin_spec.rb
+- spec/controllers
+- spec/controllers/forms_spec.rb
+- spec/fixtures
+- spec/fixtures/user_fixture.rb
+- spec/fixtures.rb
+- spec/requests
+- spec/requests/forms_spec.rb
 - spec/spec_helper.rb
 - app/controllers
 - app/controllers/application.rb
@@ -208,6 +212,6 @@ rubyforge_project: merb
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: MerbAdmin is a merb slice that provides an easy-to-use interface for managing your data.
+summary: MerbAdmin is a Merb plugin that provides an easy-to-use interface for managing your data.
 test_files: []
 

data/spec/controller/forms_spec.rb

@@ -1,41 +0,0 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper.rb')
-
-describe  "MerbAdmin::Forms (controller)" do
-
-  before(:each) do
-    mount_slice
-  end
-
-  after(:each) do
-    dismount_slice
-  end
-
-  it "should have access to the slice module" do
-    controller = dispatch_to(MerbAdmin::Forms, :index)
-    controller.slice.should == MerbAdmin
-    controller.slice.should == MerbAdmin::Forms.slice
-  end
-
-  it "should have an index action" do
-    controller = dispatch_to(MerbAdmin::Forms, :index)
-    controller.status.should == 200
-    controller.body.should contain("MerbAdmin")
-  end
-
-  it "should have helper methods for dealing with public paths" do
-    controller = dispatch_to(MerbAdmin::Forms, :index)
-    controller.public_path_for(:image).should == "/slices/merb-admin/images"
-    controller.public_path_for(:javascript).should == "/slices/merb-admin/javascripts"
-    controller.public_path_for(:stylesheet).should == "/slices/merb-admin/stylesheets"
-    
-    controller.image_path.should == "/slices/merb-admin/images"
-    controller.javascript_path.should == "/slices/merb-admin/javascripts"
-    controller.stylesheet_path.should == "/slices/merb-admin/stylesheets"
-  end
-  
-  it "should have a slice-specific _template_root" do
-    MerbAdmin::Forms._template_root.should == MerbAdmin.dir_for(:view)
-    MerbAdmin::Forms._template_root.should == MerbAdmin::Application._template_root
-  end
-
-end

data/spec/merb-admin_spec.rb

@@ -1,5 +0,0 @@
-require File.dirname(__FILE__) + '/spec_helper'
-
-describe "MerbAdmin (module)" do
-    
-end