sinatra-dm 0.1.3 → 0.1.4
Sign up to get free protection for your applications and to get access to all the features.
- data/README.rdoc +1 -2
- data/Rakefile +7 -5
- data/VERSION +1 -1
- data/lib/sinatra/dm.rb +2 -3
- data/sinatra-dm.gemspec +18 -15
- data/spec/sinatra/dm_sqlite3_spec.rb +3 -3
- data/spec/spec_helper.rb +18 -5
- metadata +59 -26
data/README.rdoc
CHANGED
@@ -172,8 +172,7 @@ There are a number of things I'd love to have help with through a fork:
|
|
172
172
|
* Add tests for it. This is important so I don't break it in a
|
173
173
|
future version unintentionally.
|
174
174
|
* Commit, do not mess with rakefile, version, or history.
|
175
|
-
(if you want to have your own version, that is fine but
|
176
|
-
bump version in a commit by itself I can ignore when I pull)
|
175
|
+
* (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
|
177
176
|
* Send me a pull request. Bonus points for topic branches.
|
178
177
|
|
179
178
|
== Copyright
|
data/Rakefile
CHANGED
@@ -3,6 +3,7 @@ require 'rake'
|
|
3
3
|
|
4
4
|
begin
|
5
5
|
require 'jeweler'
|
6
|
+
|
6
7
|
Jeweler::Tasks.new do |gem|
|
7
8
|
gem.name = "sinatra-dm"
|
8
9
|
gem.summary = %Q{Sinatra Extension for working with DataMapper}
|
@@ -10,13 +11,14 @@ begin
|
|
10
11
|
gem.email = "kematzy@gmail.com"
|
11
12
|
gem.homepage = "http://github.com/kematzy/sinatra-dm"
|
12
13
|
gem.authors = ["kematzy"]
|
13
|
-
gem.add_dependency('sinatra'
|
14
|
-
gem.add_dependency('dm-core', '
|
15
|
-
gem.add_dependency('kematzy-tasks'
|
14
|
+
gem.add_dependency('sinatra')
|
15
|
+
gem.add_dependency('dm-core', '1.0.0')
|
16
|
+
gem.add_dependency('kematzy-tasks')
|
16
17
|
# gem.add_dependency('dependency', '>=x.x.x')
|
17
|
-
gem.add_development_dependency("sinatra-tests", '
|
18
|
-
|
18
|
+
gem.add_development_dependency("sinatra-tests", '0.1.6')
|
19
|
+
gem.add_development_dependency('dm-migrations', '1.0.0')
|
19
20
|
end
|
21
|
+
|
20
22
|
rescue LoadError
|
21
23
|
puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
|
22
24
|
end
|
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
0.1.
|
1
|
+
0.1.4
|
data/lib/sinatra/dm.rb
CHANGED
@@ -1,5 +1,4 @@
|
|
1
1
|
|
2
|
-
require 'sinatra/base'
|
3
2
|
require 'dm-core'
|
4
3
|
|
5
4
|
module Sinatra
|
@@ -145,7 +144,7 @@ module Sinatra
|
|
145
144
|
#
|
146
145
|
module DataMapperExtension
|
147
146
|
|
148
|
-
VERSION = '0.1.
|
147
|
+
VERSION = '0.1.4' unless const_defined?(:VERSION)
|
149
148
|
def self.version; "Sinatra::DataMapperExtension v#{VERSION}"; end
|
150
149
|
|
151
150
|
module Helpers
|
@@ -331,6 +330,6 @@ module Sinatra
|
|
331
330
|
|
332
331
|
end #/ DataMapperExtension
|
333
332
|
|
334
|
-
|
333
|
+
register(Sinatra::DataMapperExtension)
|
335
334
|
|
336
335
|
end #/ Sinatra
|
data/sinatra-dm.gemspec
CHANGED
@@ -5,11 +5,11 @@
|
|
5
5
|
|
6
6
|
Gem::Specification.new do |s|
|
7
7
|
s.name = %q{sinatra-dm}
|
8
|
-
s.version = "0.1.
|
8
|
+
s.version = "0.1.4"
|
9
9
|
|
10
10
|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
11
11
|
s.authors = ["kematzy"]
|
12
|
-
s.date = %q{2010-
|
12
|
+
s.date = %q{2010-06-09}
|
13
13
|
s.description = %q{Sinatra Extension for working with DataMapper (another Sinatra-Sequel Rip-off)}
|
14
14
|
s.email = %q{kematzy@gmail.com}
|
15
15
|
s.extra_rdoc_files = [
|
@@ -36,7 +36,7 @@ Gem::Specification.new do |s|
|
|
36
36
|
s.homepage = %q{http://github.com/kematzy/sinatra-dm}
|
37
37
|
s.rdoc_options = ["--charset=UTF-8"]
|
38
38
|
s.require_paths = ["lib"]
|
39
|
-
s.rubygems_version = %q{1.3.
|
39
|
+
s.rubygems_version = %q{1.3.6}
|
40
40
|
s.summary = %q{Sinatra Extension for working with DataMapper}
|
41
41
|
s.test_files = [
|
42
42
|
"spec/dm_bootstrap.rb",
|
@@ -50,21 +50,24 @@ Gem::Specification.new do |s|
|
|
50
50
|
s.specification_version = 3
|
51
51
|
|
52
52
|
if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
|
53
|
-
s.add_runtime_dependency(%q<sinatra>, [">= 0
|
54
|
-
s.add_runtime_dependency(%q<dm-core>, ["
|
55
|
-
s.add_runtime_dependency(%q<kematzy-tasks>, [">= 0
|
56
|
-
s.add_development_dependency(%q<sinatra-tests>, ["
|
53
|
+
s.add_runtime_dependency(%q<sinatra>, [">= 0"])
|
54
|
+
s.add_runtime_dependency(%q<dm-core>, ["= 1.0.0"])
|
55
|
+
s.add_runtime_dependency(%q<kematzy-tasks>, [">= 0"])
|
56
|
+
s.add_development_dependency(%q<sinatra-tests>, ["= 0.1.6"])
|
57
|
+
s.add_development_dependency(%q<dm-migrations>, ["= 1.0.0"])
|
57
58
|
else
|
58
|
-
s.add_dependency(%q<sinatra>, [">= 0
|
59
|
-
s.add_dependency(%q<dm-core>, ["
|
60
|
-
s.add_dependency(%q<kematzy-tasks>, [">= 0
|
61
|
-
s.add_dependency(%q<sinatra-tests>, ["
|
59
|
+
s.add_dependency(%q<sinatra>, [">= 0"])
|
60
|
+
s.add_dependency(%q<dm-core>, ["= 1.0.0"])
|
61
|
+
s.add_dependency(%q<kematzy-tasks>, [">= 0"])
|
62
|
+
s.add_dependency(%q<sinatra-tests>, ["= 0.1.6"])
|
63
|
+
s.add_dependency(%q<dm-migrations>, ["= 1.0.0"])
|
62
64
|
end
|
63
65
|
else
|
64
|
-
s.add_dependency(%q<sinatra>, [">= 0
|
65
|
-
s.add_dependency(%q<dm-core>, ["
|
66
|
-
s.add_dependency(%q<kematzy-tasks>, [">= 0
|
67
|
-
s.add_dependency(%q<sinatra-tests>, ["
|
66
|
+
s.add_dependency(%q<sinatra>, [">= 0"])
|
67
|
+
s.add_dependency(%q<dm-core>, ["= 1.0.0"])
|
68
|
+
s.add_dependency(%q<kematzy-tasks>, [">= 0"])
|
69
|
+
s.add_dependency(%q<sinatra-tests>, ["= 0.1.6"])
|
70
|
+
s.add_dependency(%q<dm-migrations>, ["= 1.0.0"])
|
68
71
|
end
|
69
72
|
end
|
70
73
|
|
@@ -71,7 +71,7 @@ describe "Sinatra" do
|
|
71
71
|
describe "#database" do
|
72
72
|
|
73
73
|
it "should return an SQLite3 Adapter" do
|
74
|
-
app.database.should be_a_kind_of(DataMapper::Adapters::
|
74
|
+
app.database.should be_a_kind_of(DataMapper::Adapters::SqliteAdapter)
|
75
75
|
end
|
76
76
|
|
77
77
|
it "should be configured with the correct DB path [../db/db.< environment >.db]" do
|
@@ -132,7 +132,7 @@ describe "Sinatra" do
|
|
132
132
|
describe "#database" do
|
133
133
|
|
134
134
|
it "should return an SQLite3 Adapter" do
|
135
|
-
MyTestApp.database.should be_a_kind_of(DataMapper::Adapters::
|
135
|
+
MyTestApp.database.should be_a_kind_of(DataMapper::Adapters::SqliteAdapter)
|
136
136
|
end
|
137
137
|
|
138
138
|
it "should be configured with the correct DB path [../db/db.< environment >.db]" do
|
@@ -248,7 +248,7 @@ describe "Sinatra" do
|
|
248
248
|
describe "#database" do
|
249
249
|
|
250
250
|
it "should return an SQLite3 Adapter" do
|
251
|
-
app.database.should be_a_kind_of(DataMapper::Adapters::
|
251
|
+
app.database.should be_a_kind_of(DataMapper::Adapters::SqliteAdapter)
|
252
252
|
end
|
253
253
|
|
254
254
|
it "should be configured with the correct DB path [../db/db.my_custom_test_app.db]" do
|
data/spec/spec_helper.rb
CHANGED
@@ -4,10 +4,23 @@
|
|
4
4
|
$LOAD_PATH.unshift(File.dirname(__FILE__))
|
5
5
|
$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
|
6
6
|
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
7
|
+
#--
|
8
|
+
# DEPENDENCIES
|
9
|
+
#++
|
10
|
+
%w(
|
11
|
+
sinatra/base
|
12
|
+
dm-core
|
13
|
+
dm-migrations
|
14
|
+
).each {|lib| require lib }
|
15
|
+
|
16
|
+
#--
|
17
|
+
## SINATRA EXTENSIONS
|
18
|
+
#++
|
19
|
+
%w(
|
20
|
+
sinatra/dm
|
21
|
+
sinatra/tests
|
22
|
+
).each {|ext| require ext }
|
23
|
+
|
11
24
|
|
12
25
|
ENV['RACK_ENV'] = 'test'
|
13
26
|
|
@@ -15,7 +28,7 @@ ENV['RACK_ENV'] = 'test'
|
|
15
28
|
Spec::Runner.configure do |config|
|
16
29
|
config.include RspecHpricotMatchers
|
17
30
|
config.include Sinatra::Tests::TestCase
|
18
|
-
config.include Sinatra::Tests::SharedSpecs
|
31
|
+
config.include Sinatra::Tests::RSpec::SharedSpecs
|
19
32
|
end
|
20
33
|
|
21
34
|
def fixtures_path
|
metadata
CHANGED
@@ -1,7 +1,12 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: sinatra-dm
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
|
4
|
+
prerelease: false
|
5
|
+
segments:
|
6
|
+
- 0
|
7
|
+
- 1
|
8
|
+
- 4
|
9
|
+
version: 0.1.4
|
5
10
|
platform: ruby
|
6
11
|
authors:
|
7
12
|
- kematzy
|
@@ -9,49 +14,75 @@ autorequire:
|
|
9
14
|
bindir: bin
|
10
15
|
cert_chain: []
|
11
16
|
|
12
|
-
date: 2010-
|
17
|
+
date: 2010-06-09 00:00:00 +08:00
|
13
18
|
default_executable:
|
14
19
|
dependencies:
|
15
20
|
- !ruby/object:Gem::Dependency
|
16
21
|
name: sinatra
|
17
|
-
|
18
|
-
|
19
|
-
version_requirements: !ruby/object:Gem::Requirement
|
22
|
+
prerelease: false
|
23
|
+
requirement: &id001 !ruby/object:Gem::Requirement
|
20
24
|
requirements:
|
21
25
|
- - ">="
|
22
26
|
- !ruby/object:Gem::Version
|
23
|
-
|
24
|
-
|
27
|
+
segments:
|
28
|
+
- 0
|
29
|
+
version: "0"
|
30
|
+
type: :runtime
|
31
|
+
version_requirements: *id001
|
25
32
|
- !ruby/object:Gem::Dependency
|
26
33
|
name: dm-core
|
27
|
-
|
28
|
-
|
29
|
-
version_requirements: !ruby/object:Gem::Requirement
|
34
|
+
prerelease: false
|
35
|
+
requirement: &id002 !ruby/object:Gem::Requirement
|
30
36
|
requirements:
|
31
|
-
- - "
|
37
|
+
- - "="
|
32
38
|
- !ruby/object:Gem::Version
|
33
|
-
|
34
|
-
|
39
|
+
segments:
|
40
|
+
- 1
|
41
|
+
- 0
|
42
|
+
- 0
|
43
|
+
version: 1.0.0
|
44
|
+
type: :runtime
|
45
|
+
version_requirements: *id002
|
35
46
|
- !ruby/object:Gem::Dependency
|
36
47
|
name: kematzy-tasks
|
37
|
-
|
38
|
-
|
39
|
-
version_requirements: !ruby/object:Gem::Requirement
|
48
|
+
prerelease: false
|
49
|
+
requirement: &id003 !ruby/object:Gem::Requirement
|
40
50
|
requirements:
|
41
51
|
- - ">="
|
42
52
|
- !ruby/object:Gem::Version
|
43
|
-
|
44
|
-
|
53
|
+
segments:
|
54
|
+
- 0
|
55
|
+
version: "0"
|
56
|
+
type: :runtime
|
57
|
+
version_requirements: *id003
|
45
58
|
- !ruby/object:Gem::Dependency
|
46
59
|
name: sinatra-tests
|
60
|
+
prerelease: false
|
61
|
+
requirement: &id004 !ruby/object:Gem::Requirement
|
62
|
+
requirements:
|
63
|
+
- - "="
|
64
|
+
- !ruby/object:Gem::Version
|
65
|
+
segments:
|
66
|
+
- 0
|
67
|
+
- 1
|
68
|
+
- 6
|
69
|
+
version: 0.1.6
|
47
70
|
type: :development
|
48
|
-
|
49
|
-
|
71
|
+
version_requirements: *id004
|
72
|
+
- !ruby/object:Gem::Dependency
|
73
|
+
name: dm-migrations
|
74
|
+
prerelease: false
|
75
|
+
requirement: &id005 !ruby/object:Gem::Requirement
|
50
76
|
requirements:
|
51
|
-
- - "
|
77
|
+
- - "="
|
52
78
|
- !ruby/object:Gem::Version
|
53
|
-
|
54
|
-
|
79
|
+
segments:
|
80
|
+
- 1
|
81
|
+
- 0
|
82
|
+
- 0
|
83
|
+
version: 1.0.0
|
84
|
+
type: :development
|
85
|
+
version_requirements: *id005
|
55
86
|
description: Sinatra Extension for working with DataMapper (another Sinatra-Sequel Rip-off)
|
56
87
|
email: kematzy@gmail.com
|
57
88
|
executables: []
|
@@ -90,18 +121,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
90
121
|
requirements:
|
91
122
|
- - ">="
|
92
123
|
- !ruby/object:Gem::Version
|
124
|
+
segments:
|
125
|
+
- 0
|
93
126
|
version: "0"
|
94
|
-
version:
|
95
127
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
96
128
|
requirements:
|
97
129
|
- - ">="
|
98
130
|
- !ruby/object:Gem::Version
|
131
|
+
segments:
|
132
|
+
- 0
|
99
133
|
version: "0"
|
100
|
-
version:
|
101
134
|
requirements: []
|
102
135
|
|
103
136
|
rubyforge_project:
|
104
|
-
rubygems_version: 1.3.
|
137
|
+
rubygems_version: 1.3.6
|
105
138
|
signing_key:
|
106
139
|
specification_version: 3
|
107
140
|
summary: Sinatra Extension for working with DataMapper
|