merb_sequel 0.4.2 → 0.4.3
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.
- data/README +0 -1
- data/Rakefile +2 -2
- data/lib/merb/orms/sequel/connection.rb +5 -2
- metadata +3 -3
data/README
CHANGED
|
@@ -5,7 +5,6 @@ A plugin for the Merb framework that provides Sequel access
|
|
|
5
5
|
After you install the plugin, you have access to the sequel_migration generator in your merb projects
|
|
6
6
|
example: /merb/root/script/generate sequel_migration new_migration
|
|
7
7
|
|
|
8
|
-
|
|
9
8
|
= Contributors
|
|
10
9
|
|
|
11
10
|
originally written by Duane Johnson (canadaduane@gmail.com).
|
data/Rakefile
CHANGED
|
@@ -3,7 +3,7 @@ require "rake/gempackagetask"
|
|
|
3
3
|
|
|
4
4
|
PLUGIN = "merb_sequel"
|
|
5
5
|
NAME = "merb_sequel"
|
|
6
|
-
VERSION = "0.4.
|
|
6
|
+
VERSION = "0.4.3"
|
|
7
7
|
AUTHOR = "Wayne E. Seguin"
|
|
8
8
|
EMAIL = "wayneeseguin@gmail.com"
|
|
9
9
|
HOMEPAGE = "http://merb-plugins.rubyforge.org/merb_sequel/"
|
|
@@ -23,7 +23,7 @@ specification = Gem::Specification.new do |spec|
|
|
|
23
23
|
spec.require_path = "lib"
|
|
24
24
|
spec.extra_rdoc_files = ["README", "LICENSE", 'TODO']
|
|
25
25
|
# Dependencies
|
|
26
|
-
spec.add_dependency("merb", ">= 0.4.
|
|
26
|
+
spec.add_dependency("merb", ">= 0.4.2")
|
|
27
27
|
spec.add_dependency("sequel", ">= 1.0.0")
|
|
28
28
|
spec.add_dependency("sequel_model", ">= 0.2")
|
|
29
29
|
spec.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,specs,sequel_generators}/**/*")
|
|
@@ -18,7 +18,9 @@ module Merb
|
|
|
18
18
|
# Convert string keys to symbols
|
|
19
19
|
full_config = Erubis.load_yaml_file(config_file)
|
|
20
20
|
config = (Merb::Plugins.config[:merb_sequel] = {})
|
|
21
|
-
(full_config[MERB_ENV.to_sym] || full_config[MERB_ENV]).each
|
|
21
|
+
(full_config[MERB_ENV.to_sym] || full_config[MERB_ENV]).each do |key, value|
|
|
22
|
+
config[key.to_sym] = value
|
|
23
|
+
end
|
|
22
24
|
config
|
|
23
25
|
end
|
|
24
26
|
end
|
|
@@ -29,9 +31,10 @@ module Merb
|
|
|
29
31
|
require "sequel_model"
|
|
30
32
|
|
|
31
33
|
if File.exists?(config_file)
|
|
32
|
-
puts "#{Time.now.httpdate}: Connecting to the '#{config[:
|
|
34
|
+
puts "#{Time.now.httpdate}: Connecting to the '#{config[:database]}' database on '#{config[:host]}' using '#{config[:adapter]}' ..."
|
|
33
35
|
connection = ::Sequel.connect(config_options(config))
|
|
34
36
|
MERB_LOGGER.error("Connection Error: #{e}") unless connection
|
|
37
|
+
connection
|
|
35
38
|
else
|
|
36
39
|
copy_sample_config
|
|
37
40
|
puts "#{Time.now.httpdate}: No database.yml file found in #{MERB_ROOT}/config."
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: merb_sequel
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.4.
|
|
4
|
+
version: 0.4.3
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Wayne E. Seguin
|
|
@@ -9,7 +9,7 @@ autorequire: merb_sequel
|
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
11
|
|
|
12
|
-
date: 2008-01-
|
|
12
|
+
date: 2008-01-07 00:00:00 -05:00
|
|
13
13
|
default_executable:
|
|
14
14
|
dependencies:
|
|
15
15
|
- !ruby/object:Gem::Dependency
|
|
@@ -19,7 +19,7 @@ dependencies:
|
|
|
19
19
|
requirements:
|
|
20
20
|
- - ">="
|
|
21
21
|
- !ruby/object:Gem::Version
|
|
22
|
-
version: 0.4.
|
|
22
|
+
version: 0.4.2
|
|
23
23
|
version:
|
|
24
24
|
- !ruby/object:Gem::Dependency
|
|
25
25
|
name: sequel
|