merb-admin 0.8.6 → 0.8.7

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/Gemfile.lock CHANGED
@@ -1,9 +1,8 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- merb-admin (0.8.6)
4
+ merb-admin (0.8.7)
5
5
  builder (~> 2.1)
6
- json (~> 1.4)
7
6
  merb-assets (~> 1.1)
8
7
  merb-helpers (~> 1.1)
9
8
  merb-slices (~> 1.1)
@@ -12,10 +11,10 @@ GEM
12
11
  remote: http://rubygems.org/
13
12
  specs:
14
13
  abstract (1.0.0)
15
- activerecord (2.3.9)
16
- activesupport (= 2.3.9)
17
- activesupport (2.3.9)
18
- addressable (2.2.1)
14
+ activerecord (2.3.10)
15
+ activesupport (= 2.3.10)
16
+ activesupport (2.3.10)
17
+ addressable (2.2.2)
19
18
  builder (2.1.2)
20
19
  daemons (1.1.0)
21
20
  data_objects (0.10.2)
@@ -48,7 +47,6 @@ GEM
48
47
  eventmachine (0.12.10)
49
48
  extlib (0.9.15)
50
49
  fastercsv (1.5.3)
51
- json (1.4.6)
52
50
  json_pure (1.4.6)
53
51
  merb-assets (1.1.3)
54
52
  merb-core (~> 1.1.3)
@@ -69,7 +67,7 @@ GEM
69
67
  rack-test (0.5.6)
70
68
  rack (>= 1.0)
71
69
  rake (0.8.7)
72
- rspec (1.3.0)
70
+ rspec (1.3.1)
73
71
  sequel (3.16.0)
74
72
  sqlite3-ruby (1.3.1)
75
73
  stringex (1.1.0)
@@ -95,7 +93,6 @@ DEPENDENCIES
95
93
  dm-sqlite-adapter (~> 1.0)
96
94
  dm-types (~> 1.0)
97
95
  dm-validations (~> 1.0)
98
- json (~> 1.4)
99
96
  merb-admin!
100
97
  merb-assets (~> 1.1)
101
98
  merb-helpers (~> 1.1)
data/README.rdoc CHANGED
@@ -9,7 +9,7 @@ http://github.com/sferik/merb-admin/raw/master/screenshots/edit.png
9
9
  == Installation
10
10
  $ gem install merb-admin
11
11
  In your app, add the following dependency to <tt>Gemfile</tt>:
12
- gem "merb-admin"
12
+ gem "merb-admin", "~> 0.8.7"
13
13
  Add the following route to <tt>config/router.rb</tt>:
14
14
  add_slice(:merb_admin, :path_prefix => "admin")
15
15
  Then, run the following rake task:
data/lib/merb-admin.rb CHANGED
@@ -24,7 +24,7 @@ if defined?(Merb::Plugins)
24
24
 
25
25
  # Slice metadata
26
26
  self.description = "MerbAdmin is a Merb plugin that provides an easy-to-use interface for managing your data."
27
- self.version = "0.8.6"
27
+ self.version = VERSION
28
28
  self.author = "Erik Michaels-Ober"
29
29
 
30
30
  # Stub classes loaded hook - runs before LoadClasses BootLoader
@@ -1,3 +1,3 @@
1
1
  module MerbAdmin
2
- VERSION = "0.8.6"
2
+ VERSION = "0.8.7"
3
3
  end
data/merb-admin.gemspec CHANGED
@@ -2,23 +2,22 @@
2
2
  require File.expand_path("../lib/merb-admin/version", __FILE__)
3
3
 
4
4
  Gem::Specification.new do |s|
5
- s.add_development_dependency("activerecord", ["~> 2.3"])
6
- s.add_development_dependency("dm-core", ["~> 1.0"])
7
- s.add_development_dependency("dm-aggregates", ["~> 1.0"])
8
- s.add_development_dependency("dm-types", ["~> 1.0"])
9
- s.add_development_dependency("dm-migrations", ["~> 1.0"])
10
- s.add_development_dependency("dm-sqlite-adapter", ["~> 1.0"])
11
- s.add_development_dependency("dm-validations", ["~> 1.0"])
12
- s.add_development_dependency("thin", ["~> 1.2"])
13
- s.add_development_dependency("rspec", ["~> 1.3"])
14
- s.add_development_dependency("sequel", ["~> 3.16"])
15
- s.add_development_dependency("sqlite3-ruby", ["~> 1.3"])
16
- s.add_development_dependency("webrat", ["~> 0.7"])
17
- s.add_runtime_dependency("builder", ["~> 2.1"])
18
- s.add_runtime_dependency("json", ["~> 1.4"])
19
- s.add_runtime_dependency("merb-assets", ["~> 1.1"])
20
- s.add_runtime_dependency("merb-helpers", ["~> 1.1"])
21
- s.add_runtime_dependency("merb-slices", ["~> 1.1"])
5
+ s.add_development_dependency("activerecord", "~> 2.3")
6
+ s.add_development_dependency("dm-core", "~> 1.0")
7
+ s.add_development_dependency("dm-aggregates", "~> 1.0")
8
+ s.add_development_dependency("dm-types", "~> 1.0")
9
+ s.add_development_dependency("dm-migrations", "~> 1.0")
10
+ s.add_development_dependency("dm-sqlite-adapter", "~> 1.0")
11
+ s.add_development_dependency("dm-validations", "~> 1.0")
12
+ s.add_development_dependency("thin", "~> 1.2")
13
+ s.add_development_dependency("rspec", "~> 1.3")
14
+ s.add_development_dependency("sequel", "~> 3.16")
15
+ s.add_development_dependency("sqlite3-ruby", "~> 1.3")
16
+ s.add_development_dependency("webrat", "~> 0.7")
17
+ s.add_runtime_dependency("builder", "~> 2.1")
18
+ s.add_runtime_dependency("merb-assets", "~> 1.1")
19
+ s.add_runtime_dependency("merb-helpers", "~> 1.1")
20
+ s.add_runtime_dependency("merb-slices", "~> 1.1")
22
21
  s.authors = ["Erik Michaels-Ober"]
23
22
  s.description = %q{MerbAdmin is a Merb plugin that provides an easy-to-use interface for managing your data}
24
23
  s.email = "sferik@gmail.com"
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: merb-admin
3
3
  version: !ruby/object:Gem::Version
4
- hash: 51
4
+ hash: 49
5
5
  prerelease: false
6
6
  segments:
7
7
  - 0
8
8
  - 8
9
- - 6
10
- version: 0.8.6
9
+ - 7
10
+ version: 0.8.7
11
11
  platform: ruby
12
12
  authors:
13
13
  - Erik Michaels-Ober
@@ -15,7 +15,7 @@ autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
17
 
18
- date: 2010-10-02 00:00:00 -07:00
18
+ date: 2010-10-16 00:00:00 -07:00
19
19
  default_executable:
20
20
  dependencies:
21
21
  - !ruby/object:Gem::Dependency
@@ -213,25 +213,10 @@ dependencies:
213
213
  version: "2.1"
214
214
  type: :runtime
215
215
  version_requirements: *id013
216
- - !ruby/object:Gem::Dependency
217
- name: json
218
- prerelease: false
219
- requirement: &id014 !ruby/object:Gem::Requirement
220
- none: false
221
- requirements:
222
- - - ~>
223
- - !ruby/object:Gem::Version
224
- hash: 7
225
- segments:
226
- - 1
227
- - 4
228
- version: "1.4"
229
- type: :runtime
230
- version_requirements: *id014
231
216
  - !ruby/object:Gem::Dependency
232
217
  name: merb-assets
233
218
  prerelease: false
234
- requirement: &id015 !ruby/object:Gem::Requirement
219
+ requirement: &id014 !ruby/object:Gem::Requirement
235
220
  none: false
236
221
  requirements:
237
222
  - - ~>
@@ -242,11 +227,11 @@ dependencies:
242
227
  - 1
243
228
  version: "1.1"
244
229
  type: :runtime
245
- version_requirements: *id015
230
+ version_requirements: *id014
246
231
  - !ruby/object:Gem::Dependency
247
232
  name: merb-helpers
248
233
  prerelease: false
249
- requirement: &id016 !ruby/object:Gem::Requirement
234
+ requirement: &id015 !ruby/object:Gem::Requirement
250
235
  none: false
251
236
  requirements:
252
237
  - - ~>
@@ -257,11 +242,11 @@ dependencies:
257
242
  - 1
258
243
  version: "1.1"
259
244
  type: :runtime
260
- version_requirements: *id016
245
+ version_requirements: *id015
261
246
  - !ruby/object:Gem::Dependency
262
247
  name: merb-slices
263
248
  prerelease: false
264
- requirement: &id017 !ruby/object:Gem::Requirement
249
+ requirement: &id016 !ruby/object:Gem::Requirement
265
250
  none: false
266
251
  requirements:
267
252
  - - ~>
@@ -272,7 +257,7 @@ dependencies:
272
257
  - 1
273
258
  version: "1.1"
274
259
  type: :runtime
275
- version_requirements: *id017
260
+ version_requirements: *id016
276
261
  description: MerbAdmin is a Merb plugin that provides an easy-to-use interface for managing your data
277
262
  email: sferik@gmail.com
278
263
  executables: []