merb-admin 0.6.1 → 0.6.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
data/README.rdoc CHANGED
@@ -3,13 +3,15 @@
3
3
  It currently offers the features listed here[http://sferik.tadalist.com/lists/1352791/public].
4
4
 
5
5
  The status of the latest build is available here[http://runcoderun.com/sferik/merb-admin].
6
+
7
+ Various code metrics are available here[http://devver.net/caliper/project?repo=git://github.com/sferik/merb-admin.git].
6
8
  == Screenshots
7
9
  http://github.com/sferik/merb-admin/raw/master/screenshots/list.png
8
10
  http://github.com/sferik/merb-admin/raw/master/screenshots/edit.png
9
11
  == Installation
10
12
  $ gem install merb-admin -s http://gemcutter.org
11
13
  In your app, add the following dependency to <tt>config/dependencies.rb</tt>:
12
- dependency "merb-admin", "0.6.1"
14
+ dependency "merb-admin", "0.6.2"
13
15
  Add the following route to <tt>config/router.rb</tt>:
14
16
  add_slice(:merb_admin, :path_prefix => "admin")
15
17
  Then, run the following rake task:
data/Rakefile CHANGED
@@ -9,7 +9,8 @@ AUTHOR = "Erik Michaels-Ober"
9
9
  EMAIL = "sferik@gmail.com"
10
10
  HOMEPAGE = "http://github.com/sferik/merb-admin"
11
11
  SUMMARY = "MerbAdmin is a Merb plugin that provides an easy-to-use interface for managing your data."
12
- GEM_VERSION = "0.6.1"
12
+ GEM_VERSION = "0.6.2"
13
+ MERB_GEM_VERSION = "1.0.12"
13
14
 
14
15
  spec = Gem::Specification.new do |s|
15
16
  s.rubyforge_project = "merb"
@@ -23,7 +24,9 @@ spec = Gem::Specification.new do |s|
23
24
  s.author = AUTHOR
24
25
  s.email = EMAIL
25
26
  s.homepage = HOMEPAGE
26
- s.add_dependency("merb-slices", ">= 1.0.12")
27
+ s.add_dependency("merb-slices", ">= #{MERB_GEM_VERSION}")
28
+ s.add_dependency("merb-assets", ">= #{MERB_GEM_VERSION}")
29
+ s.add_dependency("merb-helpers", ">= #{MERB_GEM_VERSION}")
27
30
  s.add_dependency("builder", ">= 2.1.2")
28
31
  s.require_path = "lib"
29
32
  s.files = %w(LICENSE README.rdoc Rakefile) + Dir.glob("{app,lib,public,schema,spec,stubs}/**/*")
data/lib/merb-admin.rb CHANGED
@@ -23,7 +23,7 @@ if defined?(Merb::Plugins)
23
23
 
24
24
  # Slice metadata
25
25
  self.description = "MerbAdmin is a Merb plugin that provides an easy-to-use interface for managing your data."
26
- self.version = "0.6.1"
26
+ self.version = "0.6.2"
27
27
  self.author = "Erik Michaels-Ober"
28
28
 
29
29
  # Stub classes loaded hook - runs before LoadClasses BootLoader
@@ -327,6 +327,10 @@ describe "MerbAdmin" do
327
327
  it "should respond sucessfully" do
328
328
  @response.should be_successful
329
329
  end
330
+
331
+ it "should show associated objects" do
332
+ @response.body.should contain(/DraftDraft #\d+/)
333
+ end
330
334
  end
331
335
 
332
336
  describe "new with has-many association", :given => "three teams exist" do
@@ -337,6 +341,10 @@ describe "MerbAdmin" do
337
341
  it "should respond sucessfully" do
338
342
  @response.should be_successful
339
343
  end
344
+
345
+ it "should show associated objects" do
346
+ @response.body.should contain(/TeamTeam 1Team 2Team 3/)
347
+ end
340
348
  end
341
349
 
342
350
  describe "edit", :given => "a player exists" do
@@ -374,6 +382,10 @@ describe "MerbAdmin" do
374
382
  it "should respond sucessfully" do
375
383
  @response.should be_successful
376
384
  end
385
+
386
+ it "should show associated objects" do
387
+ @response.body.should contain(/DraftDraft #\d+/)
388
+ end
377
389
  end
378
390
 
379
391
  describe "edit with has-many association", :given => "a player exists and three teams exist" do
@@ -384,6 +396,10 @@ describe "MerbAdmin" do
384
396
  it "should respond sucessfully" do
385
397
  @response.should be_successful
386
398
  end
399
+
400
+ it "should show associated objects" do
401
+ @response.body.should contain(/TeamTeam 1Team 2Team 3/)
402
+ end
387
403
  end
388
404
 
389
405
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: merb-admin
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.6.1
4
+ version: 0.6.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Erik Michaels-Ober
@@ -22,6 +22,26 @@ dependencies:
22
22
  - !ruby/object:Gem::Version
23
23
  version: 1.0.12
24
24
  version:
25
+ - !ruby/object:Gem::Dependency
26
+ name: merb-assets
27
+ type: :runtime
28
+ version_requirement:
29
+ version_requirements: !ruby/object:Gem::Requirement
30
+ requirements:
31
+ - - ">="
32
+ - !ruby/object:Gem::Version
33
+ version: 1.0.12
34
+ version:
35
+ - !ruby/object:Gem::Dependency
36
+ name: merb-helpers
37
+ type: :runtime
38
+ version_requirement:
39
+ version_requirements: !ruby/object:Gem::Requirement
40
+ requirements:
41
+ - - ">="
42
+ - !ruby/object:Gem::Version
43
+ version: 1.0.12
44
+ version:
25
45
  - !ruby/object:Gem::Dependency
26
46
  name: builder
27
47
  type: :runtime