chatterbot 0.2.7 → 0.2.8

data/lib/chatterbot/config.rb

@@ -216,7 +216,7 @@ module Chatterbot
     # load in the config from the assortment of places it can be specified.
     def load_config(params={})
       # load the flat-files first
-      @config  = global_config.merge(bot_config).merge(params)
+      @config  = global_config.merge(bot_config)
       @config[:db_uri] ||= ENV["chatterbot_db"] unless ENV["chatterbot_db"].nil?
 
       # if we have a key to load from the DB, do that now
@@ -224,7 +224,7 @@ module Chatterbot
         tmp = db_config
         @config = @config.merge(tmp) unless tmp.nil?
       end
-      @config
+      @config.merge(params)
     end
 
     #

data/lib/chatterbot/version.rb

@@ -1,3 +1,3 @@
 module Chatterbot
-  VERSION = "0.2.7"
+  VERSION = "0.2.8"
 end

data/spec/config_spec.rb

@@ -7,6 +7,12 @@ describe "Chatterbot::Config" do
   end
   
   describe "loading" do
+    it "overrides with incoming params" do
+      @bot.should_receive(:global_config).and_return({:foo => :bar})      
+      tmp = @bot.load_config({:foo => :baz})
+      tmp[:foo].should == :baz
+    end
+    
     it "loads config when we need a variable" do
       @bot.should_receive(:load_config).and_return({:foo => :bar})
       @bot.config = nil

data/spec/logging_spec.rb

@@ -10,7 +10,7 @@ describe "Chatterbot::Logging" do
 
     it "should call logger on debug" do
       @bot.should_receive(:logging?).and_return(true)
-      @logger.should_receive(:debug).with("hi!")
+      @logger.should_receive(:debug).with("rspec hi!")
       @bot.debug "hi!"
     end
 
@@ -22,7 +22,7 @@ describe "Chatterbot::Logging" do
 
     it "should call logger and also print output when critical" do
       @bot.should_receive(:logging?).and_return(true)
-      @logger.should_receive(:debug).with("hi!")      
+      @logger.should_receive(:debug).with("rspec hi!")      
       @bot.should_receive(:puts).with("hi!")
       @bot.critical "hi!"
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chatterbot
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-03 00:00:00.000000000Z
+date: 2011-06-15 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: twitter_oauth
-  requirement: &23656280 !ruby/object:Gem::Requirement
+  requirement: &23683200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23656280
+  version_requirements: *23683200
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &23655780 !ruby/object:Gem::Requirement
+  requirement: &23682700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23655780
+  version_requirements: *23682700
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &23655300 !ruby/object:Gem::Requirement
+  requirement: &23682220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23655300
+  version_requirements: *23682220
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &23654820 !ruby/object:Gem::Requirement
+  requirement: &23681740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23654820
+  version_requirements: *23681740
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &23654340 !ruby/object:Gem::Requirement
+  requirement: &23681260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *23654340
+  version_requirements: *23681260
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &23653860 !ruby/object:Gem::Requirement
+  requirement: &23711280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23653860
+  version_requirements: *23711280
 - !ruby/object:Gem::Dependency
   name: watchr
-  requirement: &23653380 !ruby/object:Gem::Requirement
+  requirement: &23710800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23653380
+  version_requirements: *23710800
 description: A framework for writing bots that run on Twitter. Comes with a simple
   DSL for easy coding.
 email: colin@muffinlabs.com