merb-admin 0.8.3 → 0.8.5

Sign up to get free protection for your applications and to get access to all the features.
data/Gemfile CHANGED
@@ -10,13 +10,12 @@ gem 'json'
10
10
 
11
11
  group :test do
12
12
  gem 'activerecord', '~> 2.3', :require => 'active_record'
13
- gem 'dm-core', '~> 0.10'
14
- gem 'dm-aggregates', '~> 0.10'
15
- gem 'dm-types', '~> 0.10'
16
- gem 'dm-migrations', '~> 0.10'
17
- gem 'dm-validations', '~> 0.10'
18
- gem 'data_objects', '~> 0.10'
19
- gem 'do_sqlite3', '~> 0.10'
13
+ gem 'dm-core', '~> 1.0'
14
+ gem 'dm-aggregates', '~> 1.0'
15
+ gem 'dm-types', '~> 1.0'
16
+ gem 'dm-migrations', '~> 1.0'
17
+ gem 'dm-sqlite-adapter', '~> 1.0'
18
+ gem 'dm-validations', '~> 1.0'
20
19
  gem 'rspec'
21
20
  gem 'sequel', '~> 3.6.0'
22
21
  gem 'sqlite3-ruby', :require => 'sqlite3'
@@ -6,26 +6,30 @@ GEM
6
6
  activesupport (= 2.3.9)
7
7
  activesupport (2.3.9)
8
8
  addressable (2.2.1)
9
- bcrypt-ruby (2.1.2)
10
9
  builder (2.1.2)
11
10
  data_objects (0.10.2)
12
11
  addressable (~> 2.1)
13
- dm-aggregates (0.10.2)
14
- dm-core (~> 0.10.2)
15
- dm-core (0.10.2)
16
- addressable (~> 2.1)
17
- extlib (~> 0.9.14)
18
- dm-migrations (0.10.2)
19
- dm-core (~> 0.10.2)
20
- dm-types (0.10.2)
21
- bcrypt-ruby (~> 2.1.2)
22
- dm-core (~> 0.10.2)
23
- fastercsv (~> 1.5.0)
24
- json_pure (~> 1.2.0)
12
+ dm-aggregates (1.0.2)
13
+ dm-core (~> 1.0.2)
14
+ dm-core (1.0.2)
15
+ addressable (~> 2.2)
16
+ extlib (~> 0.9.15)
17
+ dm-do-adapter (1.0.2)
18
+ data_objects (~> 0.10.2)
19
+ dm-core (~> 1.0.2)
20
+ dm-migrations (1.0.2)
21
+ dm-core (~> 1.0.2)
22
+ dm-sqlite-adapter (1.0.2)
23
+ dm-do-adapter (~> 1.0.2)
24
+ do_sqlite3 (~> 0.10.2)
25
+ dm-types (1.0.2)
26
+ dm-core (~> 1.0.2)
27
+ fastercsv (~> 1.5.3)
28
+ json_pure (~> 1.4)
25
29
  stringex (~> 1.1.0)
26
30
  uuidtools (~> 2.1.1)
27
- dm-validations (0.10.2)
28
- dm-core (~> 0.10.2)
31
+ dm-validations (1.0.2)
32
+ dm-core (~> 1.0.2)
29
33
  do_sqlite3 (0.10.2)
30
34
  data_objects (= 0.10.2)
31
35
  erubis (2.6.6)
@@ -33,7 +37,7 @@ GEM
33
37
  extlib (0.9.15)
34
38
  fastercsv (1.5.3)
35
39
  json (1.4.6)
36
- json_pure (1.2.4)
40
+ json_pure (1.4.6)
37
41
  merb-assets (1.1.3)
38
42
  merb-core (~> 1.1.3)
39
43
  merb-core (1.1.3)
@@ -69,13 +73,12 @@ PLATFORMS
69
73
  DEPENDENCIES
70
74
  activerecord (~> 2.3)
71
75
  builder
72
- data_objects (~> 0.10)
73
- dm-aggregates (~> 0.10)
74
- dm-core (~> 0.10)
75
- dm-migrations (~> 0.10)
76
- dm-types (~> 0.10)
77
- dm-validations (~> 0.10)
78
- do_sqlite3 (~> 0.10)
76
+ dm-aggregates (~> 1.0)
77
+ dm-core (~> 1.0)
78
+ dm-migrations (~> 1.0)
79
+ dm-sqlite-adapter (~> 1.0)
80
+ dm-types (~> 1.0)
81
+ dm-validations (~> 1.0)
79
82
  json
80
83
  merb-assets (~> 1.1)
81
84
  merb-helpers (~> 1.1)
data/LICENSE CHANGED
@@ -1,4 +1,4 @@
1
- Copyright (c) 2009 Erik Michaels-Ober
1
+ Copyright (c) 2010 Erik Michaels-Ober
2
2
 
3
3
  Permission is hereby granted, free of charge, to any person obtaining
4
4
  a copy of this software and associated documentation files (the
@@ -7,9 +7,9 @@ Take it for a test drive with sample data here[http://merb-admin.heroku.com/].
7
7
  http://github.com/sferik/merb-admin/raw/master/screenshots/list.png
8
8
  http://github.com/sferik/merb-admin/raw/master/screenshots/edit.png
9
9
  == Installation
10
- $ gem install merb-admin -s http://gemcutter.org
11
- In your app, add the following dependency to <tt>config/dependencies.rb</tt>:
12
- dependency "merb-admin", "0.8.3"
10
+ $ gem install merb-admin
11
+ In your app, add the following dependency to <tt>Gemfile</tt>:
12
+ gem "merb-admin"
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:
@@ -119,11 +119,13 @@ module MerbAdmin
119
119
  DataMapper::Types::Text => :text,
120
120
  Date => :date,
121
121
  DateTime => :datetime,
122
+ FalseClass => :boolean,
122
123
  Fixnum => :integer,
123
124
  Float => :float,
124
125
  Integer => :integer,
125
126
  String => :string,
126
127
  Time => :time,
128
+ TrueClass => :boolean,
127
129
  }
128
130
  type[property.type] || type[property.primitive]
129
131
  end
@@ -2,6 +2,7 @@ if defined?(Merb::Plugins)
2
2
 
3
3
  $:.unshift File.dirname(__FILE__)
4
4
 
5
+ require 'merb-slices'
5
6
  Merb::Plugins.add_rakefiles "merb-admin/merbtasks", "merb-admin/slicetasks", "merb-admin/spectasks"
6
7
 
7
8
  # Register the Slice for the current host application
@@ -23,7 +24,7 @@ if defined?(Merb::Plugins)
23
24
 
24
25
  # Slice metadata
25
26
  self.description = "MerbAdmin is a Merb plugin that provides an easy-to-use interface for managing your data."
26
- self.version = "0.8.3"
27
+ self.version = "0.8.5"
27
28
  self.author = "Erik Michaels-Ober"
28
29
 
29
30
  # Stub classes loaded hook - runs before LoadClasses BootLoader
@@ -1,3 +1,3 @@
1
1
  module MerbAdmin
2
- VERSION = "0.8.3"
2
+ VERSION = "0.8.5"
3
3
  end
@@ -3,13 +3,12 @@ require File.expand_path("../lib/merb-admin/version", __FILE__)
3
3
 
4
4
  Gem::Specification.new do |s|
5
5
  s.add_development_dependency("activerecord", ["~> 2.3"])
6
- s.add_development_dependency("dm-core", ["~> 0.10"])
7
- s.add_development_dependency("dm-aggregates", ["~> 0.10"])
8
- s.add_development_dependency("dm-types", ["~> 0.10"])
9
- s.add_development_dependency("dm-migrations", ["~> 0.10"])
10
- s.add_development_dependency("dm-validations", ["~> 0.10"])
11
- s.add_development_dependency("data_objects", ["~> 0.10"])
12
- s.add_development_dependency("do_sqlite3", ["~> 0.10"])
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"])
13
12
  s.add_development_dependency("rspec", ["~> 1.3"])
14
13
  s.add_development_dependency("sequel", ["~> 3.6.0"])
15
14
  s.add_development_dependency("sqlite3-ruby", ["~> 1.3"])
@@ -13,7 +13,7 @@ class Player
13
13
  property(:born_on, Date)
14
14
  property(:notes, Text)
15
15
 
16
- validates_is_unique(:number, :scope => :team_id, :message => "There is already a player with that number on this team")
16
+ validates_uniqueness_of(:number, :scope => :team_id, :message => "There is already a player with that number on this team")
17
17
 
18
18
  belongs_to(:team)
19
19
  has(1, :draft)
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: 57
4
+ hash: 53
5
5
  prerelease: false
6
6
  segments:
7
7
  - 0
8
8
  - 8
9
- - 3
10
- version: 0.8.3
9
+ - 5
10
+ version: 0.8.5
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-09-11 00:00:00 -07:00
18
+ date: 2010-09-12 00:00:00 -07:00
19
19
  default_executable:
20
20
  dependencies:
21
21
  - !ruby/object:Gem::Dependency
@@ -41,11 +41,11 @@ dependencies:
41
41
  requirements:
42
42
  - - ~>
43
43
  - !ruby/object:Gem::Version
44
- hash: 31
44
+ hash: 15
45
45
  segments:
46
+ - 1
46
47
  - 0
47
- - 10
48
- version: "0.10"
48
+ version: "1.0"
49
49
  type: :development
50
50
  version_requirements: *id002
51
51
  - !ruby/object:Gem::Dependency
@@ -56,11 +56,11 @@ dependencies:
56
56
  requirements:
57
57
  - - ~>
58
58
  - !ruby/object:Gem::Version
59
- hash: 31
59
+ hash: 15
60
60
  segments:
61
+ - 1
61
62
  - 0
62
- - 10
63
- version: "0.10"
63
+ version: "1.0"
64
64
  type: :development
65
65
  version_requirements: *id003
66
66
  - !ruby/object:Gem::Dependency
@@ -71,11 +71,11 @@ dependencies:
71
71
  requirements:
72
72
  - - ~>
73
73
  - !ruby/object:Gem::Version
74
- hash: 31
74
+ hash: 15
75
75
  segments:
76
+ - 1
76
77
  - 0
77
- - 10
78
- version: "0.10"
78
+ version: "1.0"
79
79
  type: :development
80
80
  version_requirements: *id004
81
81
  - !ruby/object:Gem::Dependency
@@ -86,62 +86,47 @@ dependencies:
86
86
  requirements:
87
87
  - - ~>
88
88
  - !ruby/object:Gem::Version
89
- hash: 31
89
+ hash: 15
90
90
  segments:
91
+ - 1
91
92
  - 0
92
- - 10
93
- version: "0.10"
93
+ version: "1.0"
94
94
  type: :development
95
95
  version_requirements: *id005
96
96
  - !ruby/object:Gem::Dependency
97
- name: dm-validations
97
+ name: dm-sqlite-adapter
98
98
  prerelease: false
99
99
  requirement: &id006 !ruby/object:Gem::Requirement
100
100
  none: false
101
101
  requirements:
102
102
  - - ~>
103
103
  - !ruby/object:Gem::Version
104
- hash: 31
104
+ hash: 15
105
105
  segments:
106
+ - 1
106
107
  - 0
107
- - 10
108
- version: "0.10"
108
+ version: "1.0"
109
109
  type: :development
110
110
  version_requirements: *id006
111
111
  - !ruby/object:Gem::Dependency
112
- name: data_objects
112
+ name: dm-validations
113
113
  prerelease: false
114
114
  requirement: &id007 !ruby/object:Gem::Requirement
115
115
  none: false
116
116
  requirements:
117
117
  - - ~>
118
118
  - !ruby/object:Gem::Version
119
- hash: 31
119
+ hash: 15
120
120
  segments:
121
+ - 1
121
122
  - 0
122
- - 10
123
- version: "0.10"
123
+ version: "1.0"
124
124
  type: :development
125
125
  version_requirements: *id007
126
- - !ruby/object:Gem::Dependency
127
- name: do_sqlite3
128
- prerelease: false
129
- requirement: &id008 !ruby/object:Gem::Requirement
130
- none: false
131
- requirements:
132
- - - ~>
133
- - !ruby/object:Gem::Version
134
- hash: 31
135
- segments:
136
- - 0
137
- - 10
138
- version: "0.10"
139
- type: :development
140
- version_requirements: *id008
141
126
  - !ruby/object:Gem::Dependency
142
127
  name: rspec
143
128
  prerelease: false
144
- requirement: &id009 !ruby/object:Gem::Requirement
129
+ requirement: &id008 !ruby/object:Gem::Requirement
145
130
  none: false
146
131
  requirements:
147
132
  - - ~>
@@ -152,11 +137,11 @@ dependencies:
152
137
  - 3
153
138
  version: "1.3"
154
139
  type: :development
155
- version_requirements: *id009
140
+ version_requirements: *id008
156
141
  - !ruby/object:Gem::Dependency
157
142
  name: sequel
158
143
  prerelease: false
159
- requirement: &id010 !ruby/object:Gem::Requirement
144
+ requirement: &id009 !ruby/object:Gem::Requirement
160
145
  none: false
161
146
  requirements:
162
147
  - - ~>
@@ -168,11 +153,11 @@ dependencies:
168
153
  - 0
169
154
  version: 3.6.0
170
155
  type: :development
171
- version_requirements: *id010
156
+ version_requirements: *id009
172
157
  - !ruby/object:Gem::Dependency
173
158
  name: sqlite3-ruby
174
159
  prerelease: false
175
- requirement: &id011 !ruby/object:Gem::Requirement
160
+ requirement: &id010 !ruby/object:Gem::Requirement
176
161
  none: false
177
162
  requirements:
178
163
  - - ~>
@@ -183,11 +168,11 @@ dependencies:
183
168
  - 3
184
169
  version: "1.3"
185
170
  type: :development
186
- version_requirements: *id011
171
+ version_requirements: *id010
187
172
  - !ruby/object:Gem::Dependency
188
173
  name: webrat
189
174
  prerelease: false
190
- requirement: &id012 !ruby/object:Gem::Requirement
175
+ requirement: &id011 !ruby/object:Gem::Requirement
191
176
  none: false
192
177
  requirements:
193
178
  - - ~>
@@ -198,11 +183,11 @@ dependencies:
198
183
  - 7
199
184
  version: "0.7"
200
185
  type: :development
201
- version_requirements: *id012
186
+ version_requirements: *id011
202
187
  - !ruby/object:Gem::Dependency
203
188
  name: builder
204
189
  prerelease: false
205
- requirement: &id013 !ruby/object:Gem::Requirement
190
+ requirement: &id012 !ruby/object:Gem::Requirement
206
191
  none: false
207
192
  requirements:
208
193
  - - ~>
@@ -213,11 +198,11 @@ dependencies:
213
198
  - 1
214
199
  version: "2.1"
215
200
  type: :runtime
216
- version_requirements: *id013
201
+ version_requirements: *id012
217
202
  - !ruby/object:Gem::Dependency
218
203
  name: json
219
204
  prerelease: false
220
- requirement: &id014 !ruby/object:Gem::Requirement
205
+ requirement: &id013 !ruby/object:Gem::Requirement
221
206
  none: false
222
207
  requirements:
223
208
  - - ~>
@@ -228,11 +213,11 @@ dependencies:
228
213
  - 4
229
214
  version: "1.4"
230
215
  type: :runtime
231
- version_requirements: *id014
216
+ version_requirements: *id013
232
217
  - !ruby/object:Gem::Dependency
233
218
  name: merb-assets
234
219
  prerelease: false
235
- requirement: &id015 !ruby/object:Gem::Requirement
220
+ requirement: &id014 !ruby/object:Gem::Requirement
236
221
  none: false
237
222
  requirements:
238
223
  - - ~>
@@ -243,11 +228,11 @@ dependencies:
243
228
  - 1
244
229
  version: "1.1"
245
230
  type: :runtime
246
- version_requirements: *id015
231
+ version_requirements: *id014
247
232
  - !ruby/object:Gem::Dependency
248
233
  name: merb-helpers
249
234
  prerelease: false
250
- requirement: &id016 !ruby/object:Gem::Requirement
235
+ requirement: &id015 !ruby/object:Gem::Requirement
251
236
  none: false
252
237
  requirements:
253
238
  - - ~>
@@ -258,11 +243,11 @@ dependencies:
258
243
  - 1
259
244
  version: "1.1"
260
245
  type: :runtime
261
- version_requirements: *id016
246
+ version_requirements: *id015
262
247
  - !ruby/object:Gem::Dependency
263
248
  name: merb-slices
264
249
  prerelease: false
265
- requirement: &id017 !ruby/object:Gem::Requirement
250
+ requirement: &id016 !ruby/object:Gem::Requirement
266
251
  none: false
267
252
  requirements:
268
253
  - - ~>
@@ -273,7 +258,7 @@ dependencies:
273
258
  - 1
274
259
  version: "1.1"
275
260
  type: :runtime
276
- version_requirements: *id017
261
+ version_requirements: *id016
277
262
  description: MerbAdmin is a Merb plugin that provides an easy-to-use interface for managing your data
278
263
  email: sferik@gmail.com
279
264
  executables: []