sinatra_resource 0.3.5 → 0.3.6
Sign up to get free protection for your applications and to get access to all the features.
- data/README.mdown +1 -1
- data/Rakefile +5 -5
- data/VERSION +1 -1
- data/examples/datacatalog/config/config.rb +2 -2
- data/examples/datacatalog/models/categorization.rb +2 -2
- data/examples/datacatalog/models/category.rb +3 -1
- data/examples/datacatalog/models/note.rb +1 -1
- data/examples/datacatalog/models/source.rb +7 -2
- data/examples/datacatalog/test/models/categorization_test.rb +1 -1
- data/examples/datacatalog/test/models/category_test.rb +50 -7
- data/sinatra_resource.gemspec +17 -17
- metadata +15 -6
data/README.mdown
CHANGED
@@ -15,7 +15,7 @@ You will need gemcutter if you don't have it already:
|
|
15
15
|
|
16
16
|
I recommend a user-level install:
|
17
17
|
|
18
|
-
gem install
|
18
|
+
gem install resource_sinatra
|
19
19
|
|
20
20
|
Note: in general, beware of `sudo gem install <project_name>` -- it gives elevated privileges. Do you trust `<project name>`? Better to be safe and use a local install to `~/.gem`.
|
21
21
|
|
data/Rakefile
CHANGED
@@ -11,16 +11,16 @@ begin
|
|
11
11
|
gem.homepage = "http://github.com/djsun/sinatra_resource"
|
12
12
|
gem.authors = ["David James"]
|
13
13
|
|
14
|
-
gem.add_dependency 'djsun-mongo_mapper', '>= 0.5.
|
15
|
-
gem.add_dependency 'mongo', '>= 0.
|
16
|
-
gem.add_dependency 'sinatra', '>= 0.9.4'
|
14
|
+
gem.add_dependency 'djsun-mongo_mapper', '>= 0.5.8.2', '< 0.6'
|
15
|
+
gem.add_dependency 'mongo', '>= 0.16', '< 1.0'
|
16
|
+
gem.add_dependency 'sinatra', '>= 0.9.4', '< 1.0'
|
17
17
|
gem.add_dependency 'query_string_filter', '>= 0.1.2'
|
18
18
|
|
19
19
|
gem.add_development_dependency 'crack', '>= 0.1.4'
|
20
20
|
gem.add_development_dependency 'djsun-context', '>= 0.5.6'
|
21
21
|
gem.add_development_dependency 'jeremymcanally-pending', '>= 0.1'
|
22
|
-
gem.add_development_dependency 'rspec'
|
23
|
-
gem.add_development_dependency 'yard'
|
22
|
+
gem.add_development_dependency 'rspec', '>= 1.2.9'
|
23
|
+
gem.add_development_dependency 'yard', '>= 0.2.3.5'
|
24
24
|
|
25
25
|
# gem is a Gem::Specification ...
|
26
26
|
# ... see http://www.rubygems.org/read/chapter/20 for additional settings
|
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
0.3.
|
1
|
+
0.3.6
|
@@ -8,14 +8,14 @@ module Config
|
|
8
8
|
end
|
9
9
|
|
10
10
|
def self.setup_mongomapper
|
11
|
-
gem 'djsun-mongo_mapper', '>= 0.5.
|
11
|
+
gem 'djsun-mongo_mapper', '>= 0.5.8.2', '< 0.6'
|
12
12
|
require 'mongo_mapper'
|
13
13
|
MongoMapper.connection = new_mongo_connection
|
14
14
|
MongoMapper.database = environment_config['mongo_database']
|
15
15
|
end
|
16
16
|
|
17
17
|
def self.new_mongo_connection
|
18
|
-
gem 'mongo', "
|
18
|
+
gem 'mongo', ">= 0.16", '< 1.0'
|
19
19
|
require 'mongo'
|
20
20
|
Mongo::Connection.new(environment_config["mongo_hostname"])
|
21
21
|
end
|
@@ -17,8 +17,13 @@ module DataCatalog
|
|
17
17
|
|
18
18
|
# == Associations
|
19
19
|
|
20
|
-
many :usages
|
21
|
-
|
20
|
+
many :usages,
|
21
|
+
:class_name => 'DataCatalog::Usage',
|
22
|
+
:foreign_key => :source_id
|
23
|
+
|
24
|
+
many :categorizations,
|
25
|
+
:class_name => 'DataCatalog::Categorization',
|
26
|
+
:foreign_key => :source_id
|
22
27
|
|
23
28
|
def categories
|
24
29
|
categorizations.map(&:category)
|
@@ -31,7 +31,7 @@ class CategorizationTest < ModelTestCase
|
|
31
31
|
test "Source#categorization is correct" do
|
32
32
|
assert_equal [@categorization], @source.categorizations
|
33
33
|
end
|
34
|
-
|
34
|
+
|
35
35
|
test "Category#categorization is correct" do
|
36
36
|
assert_equal [@categorization], @category.categorizations
|
37
37
|
end
|
@@ -4,13 +4,13 @@ class CategoryTest < ModelTestCase
|
|
4
4
|
|
5
5
|
include DataCatalog
|
6
6
|
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
7
|
+
before do
|
8
|
+
@required = {
|
9
|
+
:name => "Science & Technology"
|
10
|
+
}
|
11
|
+
end
|
12
|
+
|
13
|
+
context "Category#new" do
|
14
14
|
context "correct params" do
|
15
15
|
before do
|
16
16
|
@category = Category.new(@required)
|
@@ -32,4 +32,47 @@ class CategoryTest < ModelTestCase
|
|
32
32
|
end
|
33
33
|
end
|
34
34
|
|
35
|
+
context "Category with 0 categorizations" do
|
36
|
+
before do
|
37
|
+
@category = Category.create(@required)
|
38
|
+
end
|
39
|
+
|
40
|
+
test "#sources should be empty" do
|
41
|
+
assert_equal [], @category.sources
|
42
|
+
end
|
43
|
+
end
|
44
|
+
|
45
|
+
context "Category with 3 categorizations" do
|
46
|
+
before do
|
47
|
+
@category = Category.create(@required)
|
48
|
+
@sources = 3.times.map do |i|
|
49
|
+
create_source(
|
50
|
+
:title => "Source #{i}"
|
51
|
+
)
|
52
|
+
end
|
53
|
+
@categorizations = 3.times.map do |i|
|
54
|
+
create_categorization(
|
55
|
+
:category_id => @category.id,
|
56
|
+
:source_id => @sources[i].id
|
57
|
+
)
|
58
|
+
end
|
59
|
+
end
|
60
|
+
|
61
|
+
test "#sources should have 3 categorizations" do
|
62
|
+
categorizations = @category.categorizations
|
63
|
+
assert_equal 3, categorizations.length
|
64
|
+
3.times do |i|
|
65
|
+
assert_include @categorizations[i], categorizations
|
66
|
+
end
|
67
|
+
end
|
68
|
+
|
69
|
+
test "#sources should have 3 sources" do
|
70
|
+
sources = @category.sources
|
71
|
+
assert_equal 3, sources.length
|
72
|
+
3.times do |i|
|
73
|
+
assert_include @sources[i], sources
|
74
|
+
end
|
75
|
+
end
|
76
|
+
end
|
77
|
+
|
35
78
|
end
|
data/sinatra_resource.gemspec
CHANGED
@@ -5,11 +5,11 @@
|
|
5
5
|
|
6
6
|
Gem::Specification.new do |s|
|
7
7
|
s.name = %q{sinatra_resource}
|
8
|
-
s.version = "0.3.
|
8
|
+
s.version = "0.3.6"
|
9
9
|
|
10
10
|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
11
11
|
s.authors = ["David James"]
|
12
|
-
s.date = %q{2009-
|
12
|
+
s.date = %q{2009-11-04}
|
13
13
|
s.description = %q{A DSL for creating RESTful actions with Sinatra and MongoMapper. It embraces the Resource Oriented Architecture as explained by Leonard Richardson and Sam Ruby.}
|
14
14
|
s.email = %q{djames@sunlightfoundation.com}
|
15
15
|
s.extra_rdoc_files = [
|
@@ -196,36 +196,36 @@ Gem::Specification.new do |s|
|
|
196
196
|
s.specification_version = 3
|
197
197
|
|
198
198
|
if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
|
199
|
-
s.add_runtime_dependency(%q<djsun-mongo_mapper>, [">= 0.5.
|
200
|
-
s.add_runtime_dependency(%q<mongo>, [">= 0.
|
201
|
-
s.add_runtime_dependency(%q<sinatra>, [">= 0.9.4"])
|
199
|
+
s.add_runtime_dependency(%q<djsun-mongo_mapper>, [">= 0.5.8.2", "< 0.6"])
|
200
|
+
s.add_runtime_dependency(%q<mongo>, [">= 0.16", "< 1.0"])
|
201
|
+
s.add_runtime_dependency(%q<sinatra>, [">= 0.9.4", "< 1.0"])
|
202
202
|
s.add_runtime_dependency(%q<query_string_filter>, [">= 0.1.2"])
|
203
203
|
s.add_development_dependency(%q<crack>, [">= 0.1.4"])
|
204
204
|
s.add_development_dependency(%q<djsun-context>, [">= 0.5.6"])
|
205
205
|
s.add_development_dependency(%q<jeremymcanally-pending>, [">= 0.1"])
|
206
|
-
s.add_development_dependency(%q<rspec>, [">=
|
207
|
-
s.add_development_dependency(%q<yard>, [">= 0"])
|
206
|
+
s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
|
207
|
+
s.add_development_dependency(%q<yard>, [">= 0.2.3.5"])
|
208
208
|
else
|
209
|
-
s.add_dependency(%q<djsun-mongo_mapper>, [">= 0.5.
|
210
|
-
s.add_dependency(%q<mongo>, [">= 0.
|
211
|
-
s.add_dependency(%q<sinatra>, [">= 0.9.4"])
|
209
|
+
s.add_dependency(%q<djsun-mongo_mapper>, [">= 0.5.8.2", "< 0.6"])
|
210
|
+
s.add_dependency(%q<mongo>, [">= 0.16", "< 1.0"])
|
211
|
+
s.add_dependency(%q<sinatra>, [">= 0.9.4", "< 1.0"])
|
212
212
|
s.add_dependency(%q<query_string_filter>, [">= 0.1.2"])
|
213
213
|
s.add_dependency(%q<crack>, [">= 0.1.4"])
|
214
214
|
s.add_dependency(%q<djsun-context>, [">= 0.5.6"])
|
215
215
|
s.add_dependency(%q<jeremymcanally-pending>, [">= 0.1"])
|
216
|
-
s.add_dependency(%q<rspec>, [">=
|
217
|
-
s.add_dependency(%q<yard>, [">= 0"])
|
216
|
+
s.add_dependency(%q<rspec>, [">= 1.2.9"])
|
217
|
+
s.add_dependency(%q<yard>, [">= 0.2.3.5"])
|
218
218
|
end
|
219
219
|
else
|
220
|
-
s.add_dependency(%q<djsun-mongo_mapper>, [">= 0.5.
|
221
|
-
s.add_dependency(%q<mongo>, [">= 0.
|
222
|
-
s.add_dependency(%q<sinatra>, [">= 0.9.4"])
|
220
|
+
s.add_dependency(%q<djsun-mongo_mapper>, [">= 0.5.8.2", "< 0.6"])
|
221
|
+
s.add_dependency(%q<mongo>, [">= 0.16", "< 1.0"])
|
222
|
+
s.add_dependency(%q<sinatra>, [">= 0.9.4", "< 1.0"])
|
223
223
|
s.add_dependency(%q<query_string_filter>, [">= 0.1.2"])
|
224
224
|
s.add_dependency(%q<crack>, [">= 0.1.4"])
|
225
225
|
s.add_dependency(%q<djsun-context>, [">= 0.5.6"])
|
226
226
|
s.add_dependency(%q<jeremymcanally-pending>, [">= 0.1"])
|
227
|
-
s.add_dependency(%q<rspec>, [">=
|
228
|
-
s.add_dependency(%q<yard>, [">= 0"])
|
227
|
+
s.add_dependency(%q<rspec>, [">= 1.2.9"])
|
228
|
+
s.add_dependency(%q<yard>, [">= 0.2.3.5"])
|
229
229
|
end
|
230
230
|
end
|
231
231
|
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: sinatra_resource
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.3.
|
4
|
+
version: 0.3.6
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- David James
|
@@ -9,7 +9,7 @@ autorequire:
|
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
11
|
|
12
|
-
date: 2009-
|
12
|
+
date: 2009-11-04 00:00:00 -05:00
|
13
13
|
default_executable:
|
14
14
|
dependencies:
|
15
15
|
- !ruby/object:Gem::Dependency
|
@@ -20,7 +20,10 @@ dependencies:
|
|
20
20
|
requirements:
|
21
21
|
- - ">="
|
22
22
|
- !ruby/object:Gem::Version
|
23
|
-
version: 0.5.
|
23
|
+
version: 0.5.8.2
|
24
|
+
- - <
|
25
|
+
- !ruby/object:Gem::Version
|
26
|
+
version: "0.6"
|
24
27
|
version:
|
25
28
|
- !ruby/object:Gem::Dependency
|
26
29
|
name: mongo
|
@@ -30,7 +33,10 @@ dependencies:
|
|
30
33
|
requirements:
|
31
34
|
- - ">="
|
32
35
|
- !ruby/object:Gem::Version
|
33
|
-
version: 0.
|
36
|
+
version: "0.16"
|
37
|
+
- - <
|
38
|
+
- !ruby/object:Gem::Version
|
39
|
+
version: "1.0"
|
34
40
|
version:
|
35
41
|
- !ruby/object:Gem::Dependency
|
36
42
|
name: sinatra
|
@@ -41,6 +47,9 @@ dependencies:
|
|
41
47
|
- - ">="
|
42
48
|
- !ruby/object:Gem::Version
|
43
49
|
version: 0.9.4
|
50
|
+
- - <
|
51
|
+
- !ruby/object:Gem::Version
|
52
|
+
version: "1.0"
|
44
53
|
version:
|
45
54
|
- !ruby/object:Gem::Dependency
|
46
55
|
name: query_string_filter
|
@@ -90,7 +99,7 @@ dependencies:
|
|
90
99
|
requirements:
|
91
100
|
- - ">="
|
92
101
|
- !ruby/object:Gem::Version
|
93
|
-
version:
|
102
|
+
version: 1.2.9
|
94
103
|
version:
|
95
104
|
- !ruby/object:Gem::Dependency
|
96
105
|
name: yard
|
@@ -100,7 +109,7 @@ dependencies:
|
|
100
109
|
requirements:
|
101
110
|
- - ">="
|
102
111
|
- !ruby/object:Gem::Version
|
103
|
-
version:
|
112
|
+
version: 0.2.3.5
|
104
113
|
version:
|
105
114
|
description: A DSL for creating RESTful actions with Sinatra and MongoMapper. It embraces the Resource Oriented Architecture as explained by Leonard Richardson and Sam Ruby.
|
106
115
|
email: djames@sunlightfoundation.com
|