chatterbot 0.9.0 → 0.9.1

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 (7) hide show
  1. checksums.yaml +4 -4
  2. data/lib/chatterbot/blacklist.rb +0 -3
  3. data/lib/chatterbot/config.rb +1 -1
  4. data/lib/chatterbot/dsl.rb +0 -1
  5. data/lib/chatterbot/version.rb +1 -1
  6. data/spec/config_spec.rb +8 -0
  7. metadata +29 -29
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: d6cc3315231e205c177354dd5673822215379086
4
- data.tar.gz: d4b0c0bb2d9ce6d2aa3d06ab17250a43868f1050
3
+ metadata.gz: 7d6048b3fe526c7dc7cdf2007b9f086ea9b84a41
4
+ data.tar.gz: 8fcae3ba935e6d6703dad6dcdee8ebbea139d268
5
5
  SHA512:
6
- metadata.gz: 2a8a816511a450286f76f0a7e7650c57fda15d9fcf58492473883402253997817a450e55d586858612acf2cf05741afc76567af25c319c7aea1ba0279f4359de
7
- data.tar.gz: a66dc9d98fa5f1b40270ac88231b7849a13861a97b565ed0a40f1e582bbae93ef19daf804ce7ae629bd9f3ab06b2db236fea15e3092d1449014d4106edcd782e
6
+ metadata.gz: c85326eb7f64cc05bfd670195a18855f4ee474a362226b0be3aa56ce91298542efe0afc30a74b1db12bee1bc5baa84226f8c349b899826f45d8a337e2a16609a
7
+ data.tar.gz: 8415e97f10e4b6900e7f07a9c50616803fe71623de6c10743171bb2965a197f58eaa1c83bd71fbc0101fb74c6c848655d81fd98ddf9feb41b2e1f809bc7ff9a1
data/lib/chatterbot/blacklist.rb CHANGED
@@ -29,9 +29,6 @@ module Chatterbot
29
29
  #
30
30
  # Is this tweet from a user on our blacklist?
31
31
  def on_blacklist?(s)
32
- puts s.inspect
33
- puts blacklist.inspect
34
-
35
32
  search = (s.respond_to?(:user) ? from_user(s) : s).downcase
36
33
  blacklist.any? { |b| search.include?(b.downcase) } ||
37
34
  on_global_blacklist?(search)
data/lib/chatterbot/config.rb CHANGED
@@ -265,7 +265,7 @@ module Chatterbot
265
265
  :consumer_secret => ENV["chatterbot_consumer_secret"],
266
266
  :token => ENV["chatterbot_token"],
267
267
  :secret => ENV["chatterbot_secret"]
268
- }.merge(slurp_file(config_file) || {})
268
+ }.delete_if { |k, v| v.nil? }.merge(slurp_file(config_file) || {})
269
269
  end
270
270
 
271
271
  #
data/lib/chatterbot/dsl.rb CHANGED
@@ -108,7 +108,6 @@ module Chatterbot
108
108
  # generate a Bot object. if the DSL is being called from a Bot object, just return it
109
109
  # otherwise create a bot and return that
110
110
  def bot
111
- puts @bot.inspect
112
111
  return @bot unless @bot.nil?
113
112
 
114
113
 
data/lib/chatterbot/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Chatterbot
2
- VERSION = "0.9.0"
2
+ VERSION = "0.9.1"
3
3
  end
data/spec/config_spec.rb CHANGED
@@ -62,6 +62,14 @@ describe "Chatterbot::Config" do
62
62
  expect(@bot.config[:token]).to eq("env_chatterbot_token")
63
63
  expect(@bot.config[:secret]).to eq("env_chatterbot_secret")
64
64
  end
65
+
66
+ it "works if env var is nil" do
67
+ ENV["chatterbot_consumer_key"] = nil
68
+ @bot.config = nil
69
+ allow(@bot).to receive(:slurp_file).and_return({:chatterbot_consumer_key => "foo"})
70
+
71
+ expect(@bot.config[:chatterbot_consumer_key]).to eq("foo")
72
+ end
65
73
  end
66
74
 
67
75
  it "update_config? is true by default" do
metadata CHANGED
@@ -1,41 +1,41 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: chatterbot
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.9.0
4
+ version: 0.9.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Colin Mitchell
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-07-21 00:00:00.000000000 Z
11
+ date: 2014-08-05 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: redcarpet
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - '>='
17
+ - - ">="
18
18
  - !ruby/object:Gem::Version
19
19
  version: '0'
20
20
  type: :development
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - '>='
24
+ - - ">="
25
25
  - !ruby/object:Gem::Version
26
26
  version: '0'
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: oauth
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - '>='
31
+ - - ">="
32
32
  - !ruby/object:Gem::Version
33
33
  version: 0.4.7
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - '>='
38
+ - - ">="
39
39
  - !ruby/object:Gem::Version
40
40
  version: 0.4.7
41
41
  - !ruby/object:Gem::Dependency
@@ -56,126 +56,126 @@ dependencies:
56
56
  name: launchy
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
- - - '>='
59
+ - - ">="
60
60
  - !ruby/object:Gem::Version
61
61
  version: 2.1.2
62
62
  type: :runtime
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
- - - '>='
66
+ - - ">="
67
67
  - !ruby/object:Gem::Version
68
68
  version: 2.1.2
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: yard
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
- - - '>='
73
+ - - ">="
74
74
  - !ruby/object:Gem::Version
75
75
  version: '0'
76
76
  type: :development
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
- - - '>='
80
+ - - ">="
81
81
  - !ruby/object:Gem::Version
82
82
  version: '0'
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: shoulda
85
85
  requirement: !ruby/object:Gem::Requirement
86
86
  requirements:
87
- - - '>='
87
+ - - ">="
88
88
  - !ruby/object:Gem::Version
89
89
  version: '0'
90
90
  type: :development
91
91
  prerelease: false
92
92
  version_requirements: !ruby/object:Gem::Requirement
93
93
  requirements:
94
- - - '>='
94
+ - - ">="
95
95
  - !ruby/object:Gem::Version
96
96
  version: '0'
97
97
  - !ruby/object:Gem::Dependency
98
98
  name: rake
99
99
  requirement: !ruby/object:Gem::Requirement
100
100
  requirements:
101
- - - '>='
101
+ - - ">="
102
102
  - !ruby/object:Gem::Version
103
103
  version: '0'
104
104
  type: :development
105
105
  prerelease: false
106
106
  version_requirements: !ruby/object:Gem::Requirement
107
107
  requirements:
108
- - - '>='
108
+ - - ">="
109
109
  - !ruby/object:Gem::Version
110
110
  version: '0'
111
111
  - !ruby/object:Gem::Dependency
112
112
  name: rspec
113
113
  requirement: !ruby/object:Gem::Requirement
114
114
  requirements:
115
- - - ~>
115
+ - - "~>"
116
116
  - !ruby/object:Gem::Version
117
117
  version: 3.0.0
118
118
  type: :development
119
119
  prerelease: false
120
120
  version_requirements: !ruby/object:Gem::Requirement
121
121
  requirements:
122
- - - ~>
122
+ - - "~>"
123
123
  - !ruby/object:Gem::Version
124
124
  version: 3.0.0
125
125
  - !ruby/object:Gem::Dependency
126
126
  name: rspec-mocks
127
127
  requirement: !ruby/object:Gem::Requirement
128
128
  requirements:
129
- - - ~>
129
+ - - "~>"
130
130
  - !ruby/object:Gem::Version
131
131
  version: 3.0.2
132
132
  type: :development
133
133
  prerelease: false
134
134
  version_requirements: !ruby/object:Gem::Requirement
135
135
  requirements:
136
- - - ~>
136
+ - - "~>"
137
137
  - !ruby/object:Gem::Version
138
138
  version: 3.0.2
139
139
  - !ruby/object:Gem::Dependency
140
140
  name: rdoc
141
141
  requirement: !ruby/object:Gem::Requirement
142
142
  requirements:
143
- - - '>='
143
+ - - ">="
144
144
  - !ruby/object:Gem::Version
145
145
  version: '0'
146
146
  type: :development
147
147
  prerelease: false
148
148
  version_requirements: !ruby/object:Gem::Requirement
149
149
  requirements:
150
- - - '>='
150
+ - - ">="
151
151
  - !ruby/object:Gem::Version
152
152
  version: '0'
153
153
  - !ruby/object:Gem::Dependency
154
154
  name: simplecov
155
155
  requirement: !ruby/object:Gem::Requirement
156
156
  requirements:
157
- - - '>='
157
+ - - ">="
158
158
  - !ruby/object:Gem::Version
159
159
  version: '0'
160
160
  type: :development
161
161
  prerelease: false
162
162
  version_requirements: !ruby/object:Gem::Requirement
163
163
  requirements:
164
- - - '>='
164
+ - - ">="
165
165
  - !ruby/object:Gem::Version
166
166
  version: '0'
167
167
  - !ruby/object:Gem::Dependency
168
168
  name: observr
169
169
  requirement: !ruby/object:Gem::Requirement
170
170
  requirements:
171
- - - '>='
171
+ - - ">="
172
172
  - !ruby/object:Gem::Version
173
173
  version: '0'
174
174
  type: :development
175
175
  prerelease: false
176
176
  version_requirements: !ruby/object:Gem::Requirement
177
177
  requirements:
178
- - - '>='
178
+ - - ">="
179
179
  - !ruby/object:Gem::Version
180
180
  version: '0'
181
181
  description: A ruby framework for writing bots that run on Twitter. Comes with a simple
@@ -188,9 +188,9 @@ executables:
188
188
  extensions: []
189
189
  extra_rdoc_files: []
190
190
  files:
191
- - .document
192
- - .gitignore
193
- - .travis.yml
191
+ - ".document"
192
+ - ".gitignore"
193
+ - ".travis.yml"
194
194
  - Gemfile
195
195
  - LICENSE.txt
196
196
  - README.markdown
@@ -261,12 +261,12 @@ require_paths:
261
261
  - lib
262
262
  required_ruby_version: !ruby/object:Gem::Requirement
263
263
  requirements:
264
- - - '>='
264
+ - - ">="
265
265
  - !ruby/object:Gem::Version
266
266
  version: '0'
267
267
  required_rubygems_version: !ruby/object:Gem::Requirement
268
268
  requirements:
269
- - - '>='
269
+ - - ">="
270
270
  - !ruby/object:Gem::Version
271
271
  version: '0'
272
272
  requirements: []