sinatra-activerecord 1.0.1 → 1.1.0

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.
Files changed (2) hide show
  1. data/lib/sinatra/activerecord.rb +4 -1
  2. metadata +13 -13
data/lib/sinatra/activerecord.rb CHANGED
@@ -18,7 +18,8 @@ module Sinatra
18
18
  def database
19
19
  @database ||= begin
20
20
  ActiveRecord::Base.logger = activerecord_logger
21
- ActiveRecord::Base.establish_connection(database_url.sub(/^sqlite/, "sqlite3"))
21
+ url = database_url.sub(/^sqlite/, "sqlite3") rescue nil
22
+ ActiveRecord::Base.establish_connection(url)
22
23
  ActiveRecord::Base
23
24
  end
24
25
  end
@@ -27,6 +28,8 @@ module Sinatra
27
28
 
28
29
  def self.registered(app)
29
30
  app.set :activerecord_logger, Logger.new(STDOUT)
31
+ app.set :database_url, ENV['DATABASE_URL']
32
+ app.database if ENV['DATABASE_URL'] # Force connection if DATABASE_URL is set
30
33
  app.helpers ActiveRecordHelper
31
34
 
32
35
  # re-connect if database connection dropped
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: sinatra-activerecord
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.1
4
+ version: 1.1.0
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-05-25 00:00:00.000000000 Z
12
+ date: 2012-05-29 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: sinatra
16
- requirement: &70335807282240 !ruby/object:Gem::Requirement
16
+ requirement: &70208111245800 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ~>
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '1.0'
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *70335807282240
24
+ version_requirements: *70208111245800
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: activerecord
27
- requirement: &70335807278940 !ruby/object:Gem::Requirement
27
+ requirement: &70208111244360 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ~>
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: '3.0'
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *70335807278940
35
+ version_requirements: *70208111244360
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: bundler
38
- requirement: &70335807277920 !ruby/object:Gem::Requirement
38
+ requirement: &70208111243500 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ~>
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: '1.0'
44
44
  type: :development
45
45
  prerelease: false
46
- version_requirements: *70335807277920
46
+ version_requirements: *70208111243500
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: rake
49
- requirement: &70335807292660 !ruby/object:Gem::Requirement
49
+ requirement: &70208111242040 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ~>
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: '0.9'
55
55
  type: :development
56
56
  prerelease: false
57
- version_requirements: *70335807292660
57
+ version_requirements: *70208111242040
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: rspec
60
- requirement: &70335807290560 !ruby/object:Gem::Requirement
60
+ requirement: &70208111240560 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ! '>='
@@ -68,7 +68,7 @@ dependencies:
68
68
  version: '3'
69
69
  type: :development
70
70
  prerelease: false
71
- version_requirements: *70335807290560
71
+ version_requirements: *70208111240560
72
72
  description: Extends Sinatra with ActiveRecord helpers.
73
73
  email: janko.marohnic@gmail.com
74
74
  executables: []
@@ -101,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
101
101
  version: '0'
102
102
  segments:
103
103
  - 0
104
- hash: -4391965596865588664
104
+ hash: 2210364565815214899
105
105
  requirements: []
106
106
  rubyforge_project:
107
107
  rubygems_version: 1.8.11