apartment 0.13.0 → 0.13.0.1
Sign up to get free protection for your applications and to get access to all the features.
- data/HISTORY.md +30 -23
- data/apartment.gemspec +15 -12
- data/lib/apartment.rb +34 -21
- data/lib/apartment/adapters/abstract_adapter.rb +59 -59
- data/lib/apartment/adapters/postgresql_adapter.rb +38 -38
- data/lib/apartment/database.rb +22 -20
- data/lib/apartment/delayed_job/hooks.rb +5 -5
- data/lib/apartment/elevators/subdomain.rb +27 -11
- data/lib/apartment/version.rb +1 -1
- data/spec/adapters/postgresql_adapter_spec.rb +38 -29
- data/spec/apartment_spec.rb +1 -1
- data/spec/dummy/db/schema.rb +7 -1
- data/spec/integration/database_integration_spec.rb +44 -44
- data/spec/integration/middleware/subdomain_elevator_spec.rb +15 -15
- data/spec/spec_helper.rb +7 -3
- data/spec/support/apartment_helpers.rb +8 -8
- data/spec/unit/config_spec.rb +48 -18
- data/spec/unit/middleware/subdomain_elevator_spec.rb +11 -8
- data/spec/unit/reloader_spec.rb +6 -6
- metadata +106 -91
@@ -1,20 +1,23 @@
|
|
1
1
|
require 'spec_helper'
|
2
2
|
|
3
3
|
describe Apartment::Elevators::Subdomain do
|
4
|
-
|
4
|
+
|
5
5
|
describe "#subdomain" do
|
6
6
|
it "should parse subdomain" do
|
7
|
-
request = ActionDispatch::Request.new('HTTP_HOST' => 'foo.bar.com')
|
8
7
|
elevator = Apartment::Elevators::Subdomain.new(nil)
|
9
|
-
elevator.subdomain
|
8
|
+
elevator.send(:subdomain, 'foo.bar.com').should == 'foo'
|
10
9
|
end
|
11
|
-
|
10
|
+
|
12
11
|
it "should return nil when no subdomain" do
|
13
|
-
request = ActionDispatch::Request.new('HTTP_HOST' => 'bar.com')
|
14
12
|
elevator = Apartment::Elevators::Subdomain.new(nil)
|
15
|
-
elevator.subdomain
|
13
|
+
elevator.send(:subdomain, 'bar.com').should be_nil
|
16
14
|
end
|
17
|
-
|
15
|
+
|
16
|
+
it "should only care about first subdomain" do
|
17
|
+
elevator = Apartment::Elevators::Subdomain.new(nil)
|
18
|
+
elevator.send(:subdomain, 'foo.baz.bar.com').should == 'foo'
|
19
|
+
end
|
20
|
+
|
18
21
|
end
|
19
|
-
|
22
|
+
|
20
23
|
end
|
data/spec/unit/reloader_spec.rb
CHANGED
@@ -1,22 +1,22 @@
|
|
1
1
|
require 'spec_helper'
|
2
2
|
|
3
3
|
describe Apartment::Reloader do
|
4
|
-
|
4
|
+
|
5
5
|
context "using postgresql schemas" do
|
6
|
-
|
6
|
+
|
7
7
|
before do
|
8
8
|
Apartment.excluded_models = ["Company"]
|
9
9
|
Company.reset_table_name # ensure we're clean
|
10
10
|
end
|
11
|
-
|
11
|
+
|
12
12
|
subject{ Apartment::Reloader.new(mock("Rack::Application", :call => nil)) }
|
13
|
-
|
13
|
+
|
14
14
|
it "should initialize apartment when called" do
|
15
15
|
Company.table_name.should_not include('public.')
|
16
16
|
subject.call(mock('env'))
|
17
17
|
Company.table_name.should include('public.')
|
18
18
|
end
|
19
19
|
end
|
20
|
-
|
21
|
-
|
20
|
+
|
21
|
+
|
22
22
|
end
|
metadata
CHANGED
@@ -1,140 +1,158 @@
|
|
1
|
-
--- !ruby/object:Gem::Specification
|
1
|
+
--- !ruby/object:Gem::Specification
|
2
2
|
name: apartment
|
3
|
-
version: !ruby/object:Gem::Version
|
3
|
+
version: !ruby/object:Gem::Version
|
4
|
+
version: 0.13.0.1
|
4
5
|
prerelease:
|
5
|
-
version: 0.13.0
|
6
6
|
platform: ruby
|
7
|
-
authors:
|
7
|
+
authors:
|
8
8
|
- Ryan Brunner
|
9
9
|
- Brad Robertson
|
10
10
|
autorequire:
|
11
11
|
bindir: bin
|
12
12
|
cert_chain: []
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
name: rails
|
19
|
-
requirement: &id001 !ruby/object:Gem::Requirement
|
13
|
+
date: 2012-02-09 00:00:00.000000000Z
|
14
|
+
dependencies:
|
15
|
+
- !ruby/object:Gem::Dependency
|
16
|
+
name: activerecord
|
17
|
+
requirement: &2154769620 !ruby/object:Gem::Requirement
|
20
18
|
none: false
|
21
|
-
requirements:
|
19
|
+
requirements:
|
22
20
|
- - ~>
|
23
|
-
- !ruby/object:Gem::Version
|
21
|
+
- !ruby/object:Gem::Version
|
24
22
|
version: 3.0.10
|
25
23
|
type: :runtime
|
26
24
|
prerelease: false
|
27
|
-
version_requirements: *
|
28
|
-
- !ruby/object:Gem::Dependency
|
25
|
+
version_requirements: *2154769620
|
26
|
+
- !ruby/object:Gem::Dependency
|
27
|
+
name: rack
|
28
|
+
requirement: &2154769080 !ruby/object:Gem::Requirement
|
29
|
+
none: false
|
30
|
+
requirements:
|
31
|
+
- - ~>
|
32
|
+
- !ruby/object:Gem::Version
|
33
|
+
version: 1.2.5
|
34
|
+
type: :runtime
|
35
|
+
prerelease: false
|
36
|
+
version_requirements: *2154769080
|
37
|
+
- !ruby/object:Gem::Dependency
|
29
38
|
name: rake
|
30
|
-
requirement: &
|
39
|
+
requirement: &2154768420 !ruby/object:Gem::Requirement
|
31
40
|
none: false
|
32
|
-
requirements:
|
41
|
+
requirements:
|
33
42
|
- - ~>
|
34
|
-
- !ruby/object:Gem::Version
|
43
|
+
- !ruby/object:Gem::Version
|
35
44
|
version: 0.8.7
|
36
45
|
type: :development
|
37
46
|
prerelease: false
|
38
|
-
version_requirements: *
|
39
|
-
- !ruby/object:Gem::Dependency
|
47
|
+
version_requirements: *2154768420
|
48
|
+
- !ruby/object:Gem::Dependency
|
49
|
+
name: rails
|
50
|
+
requirement: &2154767940 !ruby/object:Gem::Requirement
|
51
|
+
none: false
|
52
|
+
requirements:
|
53
|
+
- - ~>
|
54
|
+
- !ruby/object:Gem::Version
|
55
|
+
version: 3.0.10
|
56
|
+
type: :development
|
57
|
+
prerelease: false
|
58
|
+
version_requirements: *2154767940
|
59
|
+
- !ruby/object:Gem::Dependency
|
40
60
|
name: sqlite3
|
41
|
-
requirement: &
|
61
|
+
requirement: &2154767520 !ruby/object:Gem::Requirement
|
42
62
|
none: false
|
43
|
-
requirements:
|
44
|
-
- -
|
45
|
-
- !ruby/object:Gem::Version
|
46
|
-
version:
|
63
|
+
requirements:
|
64
|
+
- - ! '>='
|
65
|
+
- !ruby/object:Gem::Version
|
66
|
+
version: '0'
|
47
67
|
type: :development
|
48
68
|
prerelease: false
|
49
|
-
version_requirements: *
|
50
|
-
- !ruby/object:Gem::Dependency
|
69
|
+
version_requirements: *2154767520
|
70
|
+
- !ruby/object:Gem::Dependency
|
51
71
|
name: rspec
|
52
|
-
requirement: &
|
72
|
+
requirement: &2154766780 !ruby/object:Gem::Requirement
|
53
73
|
none: false
|
54
|
-
requirements:
|
74
|
+
requirements:
|
55
75
|
- - ~>
|
56
|
-
- !ruby/object:Gem::Version
|
76
|
+
- !ruby/object:Gem::Version
|
57
77
|
version: 2.6.0
|
58
78
|
type: :development
|
59
79
|
prerelease: false
|
60
|
-
version_requirements: *
|
61
|
-
- !ruby/object:Gem::Dependency
|
80
|
+
version_requirements: *2154766780
|
81
|
+
- !ruby/object:Gem::Dependency
|
62
82
|
name: rspec-rails
|
63
|
-
requirement: &
|
83
|
+
requirement: &2154766260 !ruby/object:Gem::Requirement
|
64
84
|
none: false
|
65
|
-
requirements:
|
85
|
+
requirements:
|
66
86
|
- - ~>
|
67
|
-
- !ruby/object:Gem::Version
|
87
|
+
- !ruby/object:Gem::Version
|
68
88
|
version: 2.6.1
|
69
89
|
type: :development
|
70
90
|
prerelease: false
|
71
|
-
version_requirements: *
|
72
|
-
- !ruby/object:Gem::Dependency
|
91
|
+
version_requirements: *2154766260
|
92
|
+
- !ruby/object:Gem::Dependency
|
73
93
|
name: capybara
|
74
|
-
requirement: &
|
94
|
+
requirement: &2154765760 !ruby/object:Gem::Requirement
|
75
95
|
none: false
|
76
|
-
requirements:
|
77
|
-
- -
|
78
|
-
- !ruby/object:Gem::Version
|
96
|
+
requirements:
|
97
|
+
- - =
|
98
|
+
- !ruby/object:Gem::Version
|
79
99
|
version: 1.0.0
|
80
100
|
type: :development
|
81
101
|
prerelease: false
|
82
|
-
version_requirements: *
|
83
|
-
- !ruby/object:Gem::Dependency
|
102
|
+
version_requirements: *2154765760
|
103
|
+
- !ruby/object:Gem::Dependency
|
84
104
|
name: pg
|
85
|
-
requirement: &
|
105
|
+
requirement: &2154765300 !ruby/object:Gem::Requirement
|
86
106
|
none: false
|
87
|
-
requirements:
|
107
|
+
requirements:
|
88
108
|
- - ~>
|
89
|
-
- !ruby/object:Gem::Version
|
109
|
+
- !ruby/object:Gem::Version
|
90
110
|
version: 0.11.0
|
91
111
|
type: :development
|
92
112
|
prerelease: false
|
93
|
-
version_requirements: *
|
94
|
-
- !ruby/object:Gem::Dependency
|
113
|
+
version_requirements: *2154765300
|
114
|
+
- !ruby/object:Gem::Dependency
|
95
115
|
name: mysql2
|
96
|
-
requirement: &
|
116
|
+
requirement: &2154764600 !ruby/object:Gem::Requirement
|
97
117
|
none: false
|
98
|
-
requirements:
|
99
|
-
- -
|
100
|
-
- !ruby/object:Gem::Version
|
118
|
+
requirements:
|
119
|
+
- - =
|
120
|
+
- !ruby/object:Gem::Version
|
101
121
|
version: 0.2.7
|
102
122
|
type: :development
|
103
123
|
prerelease: false
|
104
|
-
version_requirements: *
|
105
|
-
- !ruby/object:Gem::Dependency
|
124
|
+
version_requirements: *2154764600
|
125
|
+
- !ruby/object:Gem::Dependency
|
106
126
|
name: silent-postgres
|
107
|
-
requirement: &
|
127
|
+
requirement: &2154764140 !ruby/object:Gem::Requirement
|
108
128
|
none: false
|
109
|
-
requirements:
|
129
|
+
requirements:
|
110
130
|
- - ~>
|
111
|
-
- !ruby/object:Gem::Version
|
131
|
+
- !ruby/object:Gem::Version
|
112
132
|
version: 0.1.1
|
113
133
|
type: :development
|
114
134
|
prerelease: false
|
115
|
-
version_requirements: *
|
116
|
-
- !ruby/object:Gem::Dependency
|
135
|
+
version_requirements: *2154764140
|
136
|
+
- !ruby/object:Gem::Dependency
|
117
137
|
name: delayed_job
|
118
|
-
requirement: &
|
138
|
+
requirement: &2154763560 !ruby/object:Gem::Requirement
|
119
139
|
none: false
|
120
|
-
requirements:
|
140
|
+
requirements:
|
121
141
|
- - ~>
|
122
|
-
- !ruby/object:Gem::Version
|
142
|
+
- !ruby/object:Gem::Version
|
123
143
|
version: 2.1.4
|
124
144
|
type: :development
|
125
145
|
prerelease: false
|
126
|
-
version_requirements: *
|
127
|
-
description: Apartment allows
|
128
|
-
|
146
|
+
version_requirements: *2154763560
|
147
|
+
description: Apartment allows applications using ActiveRecord to deal with database
|
148
|
+
multitenancy
|
149
|
+
email:
|
129
150
|
- ryan@ryanbrunner.com
|
130
151
|
- bradleyrobertson@gmail.com
|
131
152
|
executables: []
|
132
|
-
|
133
153
|
extensions: []
|
134
|
-
|
135
154
|
extra_rdoc_files: []
|
136
|
-
|
137
|
-
files:
|
155
|
+
files:
|
138
156
|
- .gitignore
|
139
157
|
- .rspec
|
140
158
|
- .rvmrc
|
@@ -212,39 +230,36 @@ files:
|
|
212
230
|
- spec/unit/middleware/subdomain_elevator_spec.rb
|
213
231
|
- spec/unit/migrator_spec.rb
|
214
232
|
- spec/unit/reloader_spec.rb
|
215
|
-
has_rdoc: true
|
216
233
|
homepage: http://github.com/bradrobertson/apartment
|
217
|
-
licenses:
|
234
|
+
licenses:
|
218
235
|
- MIT
|
219
236
|
post_install_message:
|
220
237
|
rdoc_options: []
|
221
|
-
|
222
|
-
require_paths:
|
238
|
+
require_paths:
|
223
239
|
- lib
|
224
|
-
required_ruby_version: !ruby/object:Gem::Requirement
|
240
|
+
required_ruby_version: !ruby/object:Gem::Requirement
|
225
241
|
none: false
|
226
|
-
requirements:
|
227
|
-
- -
|
228
|
-
- !ruby/object:Gem::Version
|
229
|
-
|
230
|
-
segments:
|
242
|
+
requirements:
|
243
|
+
- - ! '>='
|
244
|
+
- !ruby/object:Gem::Version
|
245
|
+
version: '0'
|
246
|
+
segments:
|
231
247
|
- 0
|
232
|
-
|
233
|
-
required_rubygems_version: !ruby/object:Gem::Requirement
|
248
|
+
hash: 4461626983545291699
|
249
|
+
required_rubygems_version: !ruby/object:Gem::Requirement
|
234
250
|
none: false
|
235
|
-
requirements:
|
236
|
-
- -
|
237
|
-
- !ruby/object:Gem::Version
|
238
|
-
|
239
|
-
segments:
|
251
|
+
requirements:
|
252
|
+
- - ! '>='
|
253
|
+
- !ruby/object:Gem::Version
|
254
|
+
version: '0'
|
255
|
+
segments:
|
240
256
|
- 0
|
241
|
-
|
257
|
+
hash: 4461626983545291699
|
242
258
|
requirements: []
|
243
|
-
|
244
259
|
rubyforge_project:
|
245
|
-
rubygems_version: 1.
|
260
|
+
rubygems_version: 1.8.10
|
246
261
|
signing_key:
|
247
262
|
specification_version: 3
|
248
|
-
summary: A Ruby gem for managing database multitenancy in
|
263
|
+
summary: A Ruby gem for managing database multitenancy in Rack applications using
|
264
|
+
ActiveRecord
|
249
265
|
test_files: []
|
250
|
-
|