chatterbot 0.2.9 → 0.3.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.
- data/lib/chatterbot/db.rb +7 -1
- data/lib/chatterbot/version.rb +1 -1
- data/spec/db_spec.rb +8 -0
- metadata +15 -15
data/lib/chatterbot/db.rb
CHANGED
|
@@ -11,12 +11,18 @@ module Chatterbot
|
|
|
11
11
|
@_db ||= connect_and_validate
|
|
12
12
|
end
|
|
13
13
|
|
|
14
|
+
def display_db_config_notice
|
|
15
|
+
puts "ERROR: You have specified a DB connection, but you need to install the sequel gem to use it"
|
|
16
|
+
end
|
|
17
|
+
|
|
14
18
|
protected
|
|
15
19
|
|
|
16
20
|
#
|
|
17
21
|
# get a DB object from Sequel
|
|
18
22
|
def get_connection
|
|
19
|
-
if has_sequel?
|
|
23
|
+
if ! has_sequel? && config.has_key?(:db_uri)
|
|
24
|
+
display_db_config_notice
|
|
25
|
+
elsif has_sequel?
|
|
20
26
|
Sequel.connect(config[:db_uri])
|
|
21
27
|
end
|
|
22
28
|
end
|
data/lib/chatterbot/version.rb
CHANGED
data/spec/db_spec.rb
CHANGED
|
@@ -10,6 +10,14 @@ describe "Chatterbot::DB" do
|
|
|
10
10
|
@bot = Chatterbot::Bot.new
|
|
11
11
|
@bot.config[:db_uri] = @db_uri
|
|
12
12
|
end
|
|
13
|
+
|
|
14
|
+
describe "get_connection" do
|
|
15
|
+
it "should make sure sequel is actually installed" do
|
|
16
|
+
@bot.stub!(:has_sequel?).and_return(false)
|
|
17
|
+
@bot.should_receive(:display_db_config_notice)
|
|
18
|
+
@bot.db
|
|
19
|
+
end
|
|
20
|
+
end
|
|
13
21
|
|
|
14
22
|
describe "table creation" do
|
|
15
23
|
[:blacklist, :tweets, :config].each do |table|
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: chatterbot
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.
|
|
4
|
+
version: 0.3.0
|
|
5
5
|
prerelease:
|
|
6
6
|
platform: ruby
|
|
7
7
|
authors:
|
|
@@ -13,7 +13,7 @@ date: 2011-10-15 00:00:00.000000000Z
|
|
|
13
13
|
dependencies:
|
|
14
14
|
- !ruby/object:Gem::Dependency
|
|
15
15
|
name: twitter_oauth
|
|
16
|
-
requirement: &
|
|
16
|
+
requirement: &11890200 !ruby/object:Gem::Requirement
|
|
17
17
|
none: false
|
|
18
18
|
requirements:
|
|
19
19
|
- - ! '>='
|
|
@@ -21,10 +21,10 @@ dependencies:
|
|
|
21
21
|
version: '0'
|
|
22
22
|
type: :runtime
|
|
23
23
|
prerelease: false
|
|
24
|
-
version_requirements: *
|
|
24
|
+
version_requirements: *11890200
|
|
25
25
|
- !ruby/object:Gem::Dependency
|
|
26
26
|
name: shoulda
|
|
27
|
-
requirement: &
|
|
27
|
+
requirement: &11889700 !ruby/object:Gem::Requirement
|
|
28
28
|
none: false
|
|
29
29
|
requirements:
|
|
30
30
|
- - ! '>='
|
|
@@ -32,10 +32,10 @@ dependencies:
|
|
|
32
32
|
version: '0'
|
|
33
33
|
type: :development
|
|
34
34
|
prerelease: false
|
|
35
|
-
version_requirements: *
|
|
35
|
+
version_requirements: *11889700
|
|
36
36
|
- !ruby/object:Gem::Dependency
|
|
37
37
|
name: rspec
|
|
38
|
-
requirement: &
|
|
38
|
+
requirement: &11889220 !ruby/object:Gem::Requirement
|
|
39
39
|
none: false
|
|
40
40
|
requirements:
|
|
41
41
|
- - ! '>='
|
|
@@ -43,10 +43,10 @@ dependencies:
|
|
|
43
43
|
version: '0'
|
|
44
44
|
type: :development
|
|
45
45
|
prerelease: false
|
|
46
|
-
version_requirements: *
|
|
46
|
+
version_requirements: *11889220
|
|
47
47
|
- !ruby/object:Gem::Dependency
|
|
48
48
|
name: rdoc
|
|
49
|
-
requirement: &
|
|
49
|
+
requirement: &11888740 !ruby/object:Gem::Requirement
|
|
50
50
|
none: false
|
|
51
51
|
requirements:
|
|
52
52
|
- - ! '>='
|
|
@@ -54,10 +54,10 @@ dependencies:
|
|
|
54
54
|
version: '0'
|
|
55
55
|
type: :development
|
|
56
56
|
prerelease: false
|
|
57
|
-
version_requirements: *
|
|
57
|
+
version_requirements: *11888740
|
|
58
58
|
- !ruby/object:Gem::Dependency
|
|
59
59
|
name: bundler
|
|
60
|
-
requirement: &
|
|
60
|
+
requirement: &11888260 !ruby/object:Gem::Requirement
|
|
61
61
|
none: false
|
|
62
62
|
requirements:
|
|
63
63
|
- - ~>
|
|
@@ -65,10 +65,10 @@ dependencies:
|
|
|
65
65
|
version: 1.0.0
|
|
66
66
|
type: :development
|
|
67
67
|
prerelease: false
|
|
68
|
-
version_requirements: *
|
|
68
|
+
version_requirements: *11888260
|
|
69
69
|
- !ruby/object:Gem::Dependency
|
|
70
70
|
name: simplecov
|
|
71
|
-
requirement: &
|
|
71
|
+
requirement: &11887780 !ruby/object:Gem::Requirement
|
|
72
72
|
none: false
|
|
73
73
|
requirements:
|
|
74
74
|
- - ! '>='
|
|
@@ -76,10 +76,10 @@ dependencies:
|
|
|
76
76
|
version: '0'
|
|
77
77
|
type: :development
|
|
78
78
|
prerelease: false
|
|
79
|
-
version_requirements: *
|
|
79
|
+
version_requirements: *11887780
|
|
80
80
|
- !ruby/object:Gem::Dependency
|
|
81
81
|
name: watchr
|
|
82
|
-
requirement: &
|
|
82
|
+
requirement: &11887300 !ruby/object:Gem::Requirement
|
|
83
83
|
none: false
|
|
84
84
|
requirements:
|
|
85
85
|
- - ! '>='
|
|
@@ -87,7 +87,7 @@ dependencies:
|
|
|
87
87
|
version: '0'
|
|
88
88
|
type: :development
|
|
89
89
|
prerelease: false
|
|
90
|
-
version_requirements: *
|
|
90
|
+
version_requirements: *11887300
|
|
91
91
|
description: A framework for writing bots that run on Twitter. Comes with a simple
|
|
92
92
|
DSL for easy coding.
|
|
93
93
|
email: colin@muffinlabs.com
|