jabbot 0.3.2 → 1.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 275301838af799f27e719e700580c9d4accd3b61
+  data.tar.gz: 537c0a93513ab40c135ec60e526b5983b36b56c8
+SHA512:
+  metadata.gz: 398e664b0beb9b285f7c3de5122449639b135913d98a43214240363757068d34a87537e88fe7cdef7efccf62ff6739c686f800a105bf84546a496c806999488f
+  data.tar.gz: 62509ecd7c7e52fce6bb59ed314d878f6f7f2ca908237f641e969ff426019476ba4f6d59614fc74ef32d86d74deaeb84ee7d308d9358ebcb5b1284f4730ba682

data/README.md

@@ -2,79 +2,79 @@
 
 ## Description
 
-Jabbot is a Ruby micro-framework for creating Jabber/MUC bots,
-heavily inspired by Sinatra and Twibot.
+Jabbot is a Ruby micro-framework for creating Jabber/MUC bots, heavily inspired by Sinatra and Twibot.
 
-I modified the code of Twibot to fit my needs.
-The original Twibot code is located at:
-http://github.com/cjohansen/twibot/tree/master
+I modified the code of Twibot to fit my needs. The original Twibot code is located at: <http://github.com/cjohansen/twibot>
 
-A big thank you to Christian Johansen, who wrote the code for Twibot.
-Jabbot is heavily based on his code.
+A big thank you to Christian Johansen, who wrote the code for Twibot. Jabbot is heavily based on his code.
 
 If your curious if this code is stable enough:
-I have a bot instance running on my server for quite some time now
-and it works great :)
+I have a bot instance running on my server for years now and it works great :)
 
-## Usage
+Just keep in mind that the code is not the most beautiful, maybe has bugs or rough edges. Feel free to improve it. I use it as is.
 
-### Simple example
 
-    # Receive messages, and post them publicly
-    message do |message, params|
-      post message.text
-    end
+## Usage
 
-    # Respond to query if they come from the right crowd
-    # query "message" => "user" is just some syntax sugar
-    # query "message", "user" will work, too
-    query :from => [:cjno, :irbno] do |message, params|
-      post "#{message.user} I agree" => message.user
-    end
+### Simple example
 
-    # Log every single line
-    # (you can use "message :all" too ;)
-    message do |message, params|
-      MyApp.log_message(message)
-    end
+~~~ruby
+configure do |conf|
+  conf.login    = "my_account"
+  conf.password = "my_account"
+  conf.nick     = "mybot"
+  conf.channel  = "mychannel"
+end
+
+# Receive messages, and post them publicly
+message do |message, params|
+  post message.text
+end
+
+# Respond to query if they come from the right crowd
+# query "message" => "user" is just some syntax sugar
+# query "message", "user" will work, too
+query :from => [:cjno, :irbno] do |message, params|
+  post "#{message.user} I agree" => message.user
+end
+
+# Log every single line
+# (you can use "message :all" too ;)
+message do |message, params|
+  MyApp.log_message(message)
+end
+~~~
 
 ### Running the bot
 
 To run the bot, simply do:
 
-    ruby bot.rb
+~~~
+ruby bot.rb
+~~~
 
 Jabbot uses the [at\_exit hook](http://ruby-doc.org/core/classes/Kernel.html#M005932) to start.
 
 ### Configuration
 
-_Deprecated: The option to configure by YAML files will be removed in the next stable release._
-
-Jabbot looks for a configuration file in ./config/bot.yml. It should contain
-atleast:
+You have to configure your bot via ruby:
 
-    login: jabber_login
-    password: jabber_password
-    channel: channel_to_join
-    server: server_to_connect_to
-    nick: mybot
+~~~ruby
+configure do |conf|
+  conf.login = "my_account"
+  conf.nick = "mybot"
+end
+~~~
 
-You can also configure with Ruby:
+If you don't specify login and/or password in any of these ways, Jabbot will fail. The nick is automatically set to "jabbot" unless something different is defined. If you want you can set the XMPP Resource:
 
-    configure do |conf|
-      conf.login = "my_account"
-      conf.nick = "mybot"
-    do
+~~~ruby
+configure do |conf|
+  conf.resource ="mybot_resource"
+end
+~~~
 
-If you don't specify login and/or password in any of these ways, Jabbot will fail
-Nick is automatically set to "jabbot" unless something different is defined
-If you want you can set the XMPP Resource:
-
-    configure do |conf|
-      conf.resource ="mybot_resource"
-    end
-
-Default is "jabbot".
+Default resource is "jabbot".
 
 ### "Routes"
 
@@ -91,39 +91,45 @@ Every matching block will be called.
 
 Jabbot also supports regular expressions as routes:
 
-    message /^time ([^\s]*) ([^\s]*)/ do |message, params|
-      # params is an array of matches when using regexp routes
-      time = MyTimeService.lookup(params[0], params[1])
-      post "Time is #{time} in #{params[:city]}, #{params[:country]}"
-    end
+~~~ruby
+message /^time ([^\s]*) ([^\s]*)/ do |message, params|
+  # params is an array of matches when using regexp routes
+  time = MyTimeService.lookup(params[0], params[1])
+  post "Time is #{time} in #{params[:city]}, #{params[:country]}"
+end
+~~~
 
 If all you need is exact word matching you can say so:
 
-    message :exact => "pattern" do |message, params|
-      ...
-    end
+~~~ruby
+message :exact => "pattern" do |message, params|
+  ...
+end
+~~~
 
 Internally this pattern is translated to `/\Apattern\Z/`, so you can use regex literals.
 
 ## Requirements
 
-xmpp4r. You'll need atleast 0.4.
-You can get it via rubygems:
-
-    gem install xmpp4r
+* xmpp4r. You'll need atleast 0.4. You can get it via rubygems: `gem install xmpp4r`
+* eventmachine. `gem install eventmachine`
 
-or get it from: http://home.gna.org/xmpp4r/
 
 ## Installation
 
 Jabbot is available via gem:
 
-    gem install jabbot
+~~~
+gem install jabbot
+~~~
 
 ## Is it Ruby 1.9?
 
-All tests passes on Ruby 1.9.
-Seems like it works :)
+Absolutely! I run it on 1.9.3 without problems (thanks to the updated xmpp4r).
+
+## Is it Ruby 2.x?
+
+It should, test pass. I'm not sure if it will work as expected.
 
 ## Samples
 
@@ -146,10 +152,6 @@ If you'd like to hack on jabbot, start by forking my repo on GitHub:
 
 http://github.com/badboy/jabbot
 
-jabbot needs xmpp4r, so just install it:
-
-    gem install xmpp4r
-
 Then:
 
 1. Clone down your fork

data/lib/jabbot.rb

@@ -6,14 +6,13 @@ require 'xmpp4r/version/helper/simpleresponder'
 require 'yaml'
 require File.join(File.dirname(__FILE__), 'hash')
 
+require 'jabbot/version.rb'
 require 'jabbot/bot.rb'
 require 'jabbot/config.rb'
 require 'jabbot/handlers.rb'
 require 'jabbot/macros.rb'
 
 module Jabbot
-  VERSION = '0.3.2'
-
   @@app_file = lambda do
     ignore = [
       /lib\/twibot.*\.rb/, # Library

data/lib/jabbot/bot.rb

@@ -5,6 +5,38 @@ require File.join(File.expand_path(File.dirname(__FILE__)), 'handlers')
 require 'eventmachine'
 
 module Jabbot
+  # A message consists of the username, the text, a time when it was received
+  # and the type of the message.
+  #
+  # The type could be one Symbol of:
+  #
+  #   * :public
+  #   * :private
+  #   * :join
+  #   * :leave
+  #   * :subject
+  #
+  Message = Struct.new(:user, :text, :time, :type) do
+    # Public: Converts the message to printable text.
+    #
+    # Returns a String containing the user's name and the text.
+    def to_s
+      "#{user}: #{text}"
+    end
+
+    # Public: Encode a message in JSON
+    #
+    # Returns the json-ified String of the Hash representation of this message.
+    def to_json(*a)
+      {
+        :user => user,
+        :text => text,
+        :time => time,
+        :type => type
+      }.to_json(*a)
+    end
+  end
+
   # The main Bot class.
   #
   # It handles the connection as well as the method dispatching.
@@ -13,29 +45,17 @@ module Jabbot
     attr_reader :client
     attr_reader :users
 
-    Message = Struct.new(:user, :text, :time, :type) do
-      def to_s
-        "#{user}: #{text}"
-      end
-
-      # Encode a message in JSON
-      # A message is just a hash of its values
-      def to_json(*a)
-        {
-          :user => user,
-          :text => text,
-          :time => time,
-          :type => type
-        }.to_json(*a)
-      end
-    end
 
     # Public: Initialize a Bot instance.
     #
-    # options - A Jabbot::Config options instance (default: nil).
-    def initialize(options=nil)
-      @conf = nil
-      @config = options || Jabbot::Config.default << Jabbot::FileConfig.new
+    # options - A Jabbot::Config options instance or a Hash of key-value
+    #           configuration options (default: {}).
+    def initialize(options={})
+      @config = if options.kind_of?(Jabbot::Config)
+        options
+      else
+        Jabbot::Config.new(options)
+      end
       @log = nil
       @abort = false
       @users = []
@@ -64,21 +84,21 @@ module Jabbot
     #
     # Returns nothing.
     def connect
-      @jid = Jabber::JID.new(login)
-      @mucjid = Jabber::JID.new("#{channel}@#{server}")
+      @jid = Jabber::JID.new(config.login)
+      @mucjid = Jabber::JID.new("#{config.channel}@#{config.server}")
 
       if @jid.node.nil?
         raise "Your Jabber ID must contain a user name and therefore contain one @ character."
       elsif @jid.resource
-        raise "If you intend to set a custom resource, put that in the right text field. Remove the slash!"
+        raise "If you intend to set a custom resource, define so in the config."
       elsif @mucjid.node.nil?
         raise "Please set a room name, e.g. myroom@conference.jabber.org"
       elsif @mucjid.resource
         raise "The MUC room must not contain a resource. Remove the slash!"
       else
-        @jid.resource = config[:resource] || "jabbot"
-        @mucjid.resource = config[:nick] || "jabbot"
-        @users << config[:nick]
+        @jid.resource = config.resource
+        @mucjid.resource = config.nick
+        @users << config.nick
       end
 
       @client = Jabber::Client.new(@jid)
@@ -92,10 +112,10 @@ module Jabbot
       end
       begin
         @client.connect
-        @client.auth(password)
+        @client.auth(config.password)
         @muc = Jabber::MUC::SimpleMUCClient.new(@client)
         muc_handlers.call(@muc)
-        @muc.join(@mucjid)
+        @muc.join(@mucjid, config.channel_password)
         @connected = true
       rescue => errmsg
         @connected = false
@@ -112,7 +132,7 @@ module Jabbot
     #
     # Returns nothing.
     def run!
-      puts "Jabbot #{Jabbot::VERSION} imposing as #{login} on #{channel}@#{server}"
+      puts "Jabbot #{Jabbot::VERSION} imposing as #{config.login} on #{config.channel}@#{config.server}"
 
       onclose_block = proc {
         close
@@ -121,11 +141,11 @@ module Jabbot
       }
 
       Kernel.trap(:INT, onclose_block)
-      Kernel.trap(:QUIT, onclose_block)
+      Kernel.trap(:QUIT, onclose_block) rescue nil
 
-      debug! if config[:debug]
+      debug! if config.debug
 
-      # connect the bot and keep it running
+      # Connect the bot and keep it running.
       EventMachine.run do
         connect
 
@@ -175,13 +195,13 @@ module Jabbot
     #   * leaves
     #   * subject changes
     #
-    # Returs nothing.
+    # Returs a Proc to be called to assign the handlers.
     def muc_handlers
       Proc.new do |muc|
         muc.on_message do |time, nick, text|
-          if time.nil?
+          if time.nil? # Don't process messages from the past.
             begin
-              dispatch_messages(:message, [Message.new(nick, text, Time.now, :public)]) unless nick == config[:nick]
+              dispatch_messages(:message, [Message.new(nick, text, Time.now, :public)]) unless nick == config.nick
             rescue Exception => boom
               log.fatal boom.inspect
               log.fatal boom.backtrace[0..5].join("\n")
@@ -190,9 +210,9 @@ module Jabbot
         end
 
         muc.on_private_message do |time, nick, text|
-          if time.nil?
+          if time.nil? # Don't process messages from the past.
             begin
-              dispatch_messages(:private, [Message.new(nick, text, Time.now, :query)]) unless nick == config[:nick]
+              dispatch_messages(:private, [Message.new(nick, text, Time.now, :private)]) unless nick == config.nick
             rescue Exception => boom
               log.fatal boom.inspect
               log.fatal boom.backtrace[0..5].join("\n")
@@ -204,9 +224,9 @@ module Jabbot
           unless @users.include? nick
             @users << nick
           end
-          if time.nil?
+          if time.nil? # Don't process messages from the past.
             begin
-              dispatch_messages(:join, [Message.new(nick, "join", Time.now, :join)]) unless nick == config[:nick]
+              dispatch_messages(:join, [Message.new(nick, "join", Time.now, :join)]) unless nick == config.nick
             rescue Exception => boom
               log.fatal boom.inspect
               log.fatal boom.backtrace[0..5].join("\n")
@@ -216,7 +236,7 @@ module Jabbot
 
         muc.on_leave do |time, nick|
           @users.delete(nick)
-          if time.nil?
+          if time.nil? # Don't process messages from the past.
             begin
               dispatch_messages(:leave, [Message.new(nick, "leave", Time.now, :leave)])
             rescue Exception => boom
@@ -227,7 +247,7 @@ module Jabbot
         end
 
         muc.on_subject do |time, nick, subject|
-          if time.nil?
+          if time.nil? # Don't process messages from the past.
             begin
               dispatch_messages(:subject, [Message.new(nick, subject, Time.now, :subject)])
             rescue Exception => boom
@@ -239,7 +259,7 @@ module Jabbot
       end
     end
 
-    # Dispatch a collection of messages.
+    # Internal: Dispatch a collection of messages.
     #
     # type     - The Symbol type to be processed.
     # messages - An Array of String messages to be dispatched.
@@ -255,9 +275,9 @@ module Jabbot
     # Returns logger instance.
     def log
       return @log if @log
-      os = config[:log_file] ? File.open(config[:log_file], "a") : $stdout
+      os = config.log_file ? File.open(config.log_file, "a") : $stdout
       @log = Logger.new(os)
-      @log.level = Logger.const_get(config[:log_level] ? config[:log_level].upcase : "INFO")
+      @log.level = Logger.const_get(config.log_level ? config.log_level.upcase : "INFO")
       @log
     end
 
@@ -266,26 +286,20 @@ module Jabbot
     # Returns the configure Hash.
     def configure
       yield @config
-      @conf = @config.to_hash
-    end
-
-    # Internal: Maps configuration settings to real methods.
-    #
-    # Returns the value of the configuration setting
-    #  or nil if none is found.
-    def method_missing(name, *args, &block)
-      return super unless config.key?(name)
-
-      self.class.send(:define_method, name) { config[name] }
-      config[name]
     end
 
     # Public: Get the current configuration settings.
     #
     # Returns the configuration Hash.
     def config
-      return @conf if @conf
-      @conf = @config.to_hash
+      @config
+    end
+
+    # Public: Easy access to the bot's nickname
+    #
+    # Returns the configured nick String.
+    def nick
+      @config.nick
     end
   end
 end

data/lib/jabbot/config.rb

@@ -1,108 +1,80 @@
-require 'optparse'
-
 module Jabbot
-  # Jabbot configuration. Use either Jabbot::CliConfig.new or
-  # JabbotFileConfig.new setup a new bot from either command line or file
-  # (respectively). Configurations can be chained so they override each other:
+  # Default configuration values.
+  # If an option is not set on creation,
+  # it gets the default value instead.
+  DEFAULT_CONFIG = {
+    :login            => nil,
+    :password         => nil,
+    :nick             => 'jabbot',
+    :server           => nil,
+    :channel          => nil,
+    :channel_password => nil,
+    :resource         => 'jabbot',
+    :log_level        => 'info',
+    :log_file         => nil,
+    :debug            => false
+  }
+
+  # The main configuration of Jabbot.
+  # It's nothing more than a simple struct of key-value pairs.
   #
-  #   config = Jabbot::FileConfig.new
-  #   config << Jabbot::CliConfig.new
-  #   config.to_hash
+  # Examples:
   #
-  # The preceding example will create a configuration which is based on a
-  # configuration file but have certain values overridden from the command line.
-  # This can be used for instance to store everything but the Twitter account
-  # password in your configuration file. Then you can just provide the password
-  # when running the bot.
+  #   Jabbot::Config.new({:login => "jabbot@server.com", :password => "secret",
+  #                       :debug => true})
+  #   # => #<struct Jabbot::Config login="jabbot@server.com", password="secret",
+  #        nick="jabbot", server=nil, channel=nil, resource="jabbot",
+  #        log_level="info", log_file=nil, debug=true>
   #
-  class Config
-    attr_reader :settings
-
-    DEFAULT = {
-      :log_level => 'info',
-      :log_file => nil,
-      :login => nil,
-      :password => nil,
-      :nick => 'jabbot',
-      :channel => nil,
-      :server => nil,
-      :resource => nil,
-      :debug => false
-    }
-
-    def initialize(settings = {})
-      @configs = []
-      @settings = settings
-    end
-
-    # Public: Add a configuration object to override given settings
-    #
-    # config -
+  #   Jabbot::Config.new("jabbot@server.com", "secret")
+  #   # => #<struct Jabbot::Config login="jabbot@server.com", password="secret",
+  #        nick="jabbot", server=nil, channel=nil, resource="jabbot",
+  #        log_level="info", log_file=nil, debug=false>
+  #
+  #   config.login
+  #   # => "jabbot@server.com"
+  #   config.channel
+  #   # => nil
+  #   config.channel = "room@conference.server.com"
+  #   # => "room@conference.server.com"
+  #
+  Config = Struct.new(
+    # We need the correct order here, so this is done manually.
+    :login,
+    :password,
+    :nick,
+    :server,
+    :channel,
+    :channel_password,
+    :resource,
+    :log_level,
+    :log_file,
+    :debug
+  ) do
+    # Public: Initialize new configuration object.
     #
-    # Returns the class object.
-    def add(config)
-      @configs << config
-      self
-    end
-    alias_method :<<, :add
+    # *args - Any number of valid arguments passed to the super class.
+    #         If there is only one argument and it is kind of a Hash,
+    #         it is treated as the key-value pairs are the options.
+    #         If there is a default value for an option key,
+    #         it is set if needed.
+    def initialize(*args)
+      # First: call the super class.
+      super
 
-    # Internal: Maps calls to non existant functions to
-    #           configuration values, if they exist.
-    #
-    # name, *args and &block as described in the core classes.
-    #
-    # Returns the configuration value if any.
-    def method_missing(name, *args, &block)
-      regex = /=$/
-      attr_name = name.to_s.sub(regex, '').to_sym
-      return super if name == attr_name && !@settings.key?(attr_name)
+      # If we got a hash, treat it as the configuration options.
+      if args.size == 1 && args.first.kind_of?(Hash)
+        self.login = nil # Reset first value.
 
-      if name != attr_name
-        @settings[attr_name] = args.first
+        args.first.each do |key, value|
+          send("#{key}=", value)
+        end
       end
 
-      @settings[attr_name]
-    end
-
-    # Public: Merges configurations and returns a hash with all options
-    #
-    # Returns a Hash of the configuration.
-    def to_hash
-      hash = {}.merge(@settings)
-      @configs.each { |conf| hash.merge!(conf.to_hash) }
-      hash
-    end
-
-    def self.default
-      Config.new({}.merge(DEFAULT))
-    end
-  end
-
-  # Deprecated: Configuration from files
-  class FileConfig < Config
-    # Public: Initializes a new FileConfig object.
-    #
-    #
-    # fos - Accepts a Stream or a String filename to read configuration from
-    #       (default: "./config/bot.yml")
-    #       If a stream is passed it is not closed from within the method.
-    def initialize(fos = File.expand_path("config/bot.yml"))
-      warn "Jabbot::FileConfig is deprecated and will be removed in the next version."
-
-      stream = fos.is_a?(String) ? File.open(fos, "r") : fos
-
-      begin
-        config = YAML.load(stream.read)
-        config.symbolize_keys! if config
-      rescue Exception => err
-        puts err.message
-        puts "Unable to load configuration, aborting"
-        exit
-      ensure
-        stream.close if fos.is_a?(String)
+      # Set defaults.
+      DEFAULT_CONFIG.each do |key, value|
+        self.send(key.to_s) || self.send("#{key}=", value)
       end
-
-      super config.is_a?(Hash) ? config : {}
     end
   end
 end

data/lib/jabbot/handlers.rb

@@ -29,21 +29,11 @@ module Jabbot
       @handlers ||= {
         :message => [],
         :private => [],
-        :join => [],
+        :join    => [],
         :subject => [],
-        :leave => []
+        :leave   => []
       }
     end
-
-    # Deprecated: Set the handler types and Arrays
-    #
-    # hash - A hash containing the handler types and associated Arrays
-    #        (see `handlers`).
-    #
-    # Returns nothing.
-    def handlers=(hash)
-      @handlers = hash
-    end
   end
 
   # A Handler consists of a pattern to match a given message,
@@ -171,9 +161,9 @@ module Jabbot
     attr_reader :pattern
 
     # Internal: Determines if this handler is suited to handle
-    #           an incoming message.
+    #           a message.
     #
-    # Returns a Boolean if it recognized the given message.
+    # Returns true if it recognized the given message, false otherwise.
     def recognize?(message)
       return false if @pattern && message.text !~ @pattern
 
@@ -209,6 +199,8 @@ module Jabbot
     # message - The incoming String message.
     # params  - The hash containing matched tokens.
     #
+    # Both arguments are passed to the underlying handler block.
+    #
     # Returns the return from the handler block.
     def handle(message, params)
       @handler.call(message, params) if @handler

data/lib/jabbot/version.rb

@@ -0,0 +1,3 @@
+module Jabbot
+  VERSION = '1.0.0'
+end

data/test/helper.rb

@@ -9,36 +9,6 @@ $LOAD_PATH.unshift(dir)
 
 require 'jabbot'
 
-module Test::Unit::Assertions
-  def assert_hashes_equal(expected, actual, message = nil)
-    full_message = build_message(message, <<EOT, expected.inspect, actual.inspect)
-<?> expected but was
-<?>.
-EOT
-    assert_block(full_message) do
-      break false if expected.keys.length != actual.keys.length
-      expected.keys.all? { |k| expected[k] == actual[k] }
-    end
-  end
-
-  def assert_hashes_not_equal(expected, actual, message = nil)
-    full_message = build_message(message, <<EOT, expected.inspect, actual.inspect)
-<?> expected but was
-<?>.
-EOT
-    assert_block(full_message) do
-      break false if expected.keys.length != actual.keys.length
-      expected.keys.any? { |k| expected[k] != actual[k] }
-    end
-  end
-end
-
-TEST_DIR = File.join(File.dirname(__FILE__), *%w[.])
-
-def testpath(path)
-  File.join(TEST_DIR, path)
-end
-
 # test/spec/mini 3
 # http://gist.github.com/25455
 # chris@ozmm.org
@@ -46,7 +16,7 @@ end
 def context(*args, &block)
   return super unless (name = args.first) && block
   require 'test/unit'
-  klass = Class.new(defined?(ActiveSupport::TestCase) ? ActiveSupport::TestCase : Test::Unit::TestCase) do
+  klass = Class.new(Test::Unit::TestCase) do
     def self.test(name, &block)
       define_method("test_#{name.gsub(/\W/,'_')}", &block) if block
     end

data/test/test_bot.rb

@@ -2,49 +2,21 @@ require 'helper'
 require 'fileutils'
 
 context "Bot" do
-  test "raise no exceptions when initialized" do
-    assert_nothing_raised do
-      Jabbot::Bot.new Jabbot::Config.new
-    end
-  end
-
-  test "raise exception when initialized without config file" do
-    assert_raise SystemExit do
-      Jabbot::Bot.new
-    end
-  end
-
-  test "raise no exception on initialize when config file exists" do
-    if File.exists?("config")
-      FileUtils.rm("config/bot.yml")
-    else
-      FileUtils.mkdir("config")
-    end
-
-    File.open("config/bot.yml", "w") { |f| f.puts "" }
-
-    assert_nothing_raised do
-      Jabbot::Bot.new
-    end
-
-    FileUtils.rm_rf("config")
-  end
-
   test "provide configuration settings as methods" do
-    bot = Jabbot::Bot.new Jabbot::Config.new(:login => "jabbot")
-    assert_equal "jabbot", bot.login
+    bot = Jabbot::Bot.new :login => "jabbot"
+    assert_equal "jabbot", bot.config.login
   end
 
   test "return logger instance" do
-    bot = Jabbot::Bot.new(Jabbot::Config.default << Jabbot::Config.new)
+    bot = Jabbot::Bot.new
     assert bot.log.is_a?(Logger)
   end
 
   test "respect configured log level" do
-    bot = Jabbot::Bot.new(Jabbot::Config.new(:log_level => "info"))
+    bot = Jabbot::Bot.new(:log_level => "info")
     assert_equal Logger::INFO, bot.log.level
 
-    bot = Jabbot::Bot.new(Jabbot::Config.new(:log_level => "warn"))
+    bot = Jabbot::Bot.new(:log_level => "warn")
     assert_equal Logger::WARN, bot.log.level
   end
 end

data/test/test_config.rb

@@ -2,80 +2,19 @@ require 'helper'
 require 'stringio'
 
 context "Config" do
-  test "default configuration be a hash" do
-    assert_not_nil Jabbot::Config::DEFAULT
-    assert Jabbot::Config::DEFAULT.is_a?(Hash)
-  end
-
-  test "initialize with no options" do
-    assert_hashes_equal({}, Jabbot::Config.new.settings)
-  end
-
-  test "return config from add" do
-    config = Jabbot::Config.new
-    assert_equal config, config.add(Jabbot::Config.new)
-  end
-
-  test "alias add to <<" do
+  test "default config is set" do
     config = Jabbot::Config.new
-    assert config.respond_to?(:<<)
-    assert config << Jabbot::Config.new
-  end
-
-  test "mirror method_missing as config getters" do
-    config = Jabbot::Config.default << Jabbot::Config.new
-    assert_equal Jabbot::Config::DEFAULT[:password], config.password
-    assert_equal Jabbot::Config::DEFAULT[:login], config.login
+    assert_equal Jabbot::DEFAULT_CONFIG[:password], config.password
+    assert_equal Jabbot::DEFAULT_CONFIG[:login], config.login
   end
 
   test "mirror missing methods as config setters" do
-    config = Jabbot::Config.default << Jabbot::Config.new
-    assert_equal Jabbot::Config::DEFAULT[:login], config.login
+    config = Jabbot::Config.new
+    assert_equal Jabbot::DEFAULT_CONFIG[:login], config.login
 
     val = "jabbot"
     config.login = val+'!'
-    assert_not_equal Jabbot::Config::DEFAULT[:login], config.login
+    assert_not_equal Jabbot::DEFAULT_CONFIG[:login], config.login
     assert_equal val+'!', config.login
   end
-
-  test "not override default hash" do
-    config = Jabbot::Config.default
-    hash = Jabbot::Config::DEFAULT
-
-    config.login = "jabbot"
-    config.password = "secret"
-
-    assert_hashes_not_equal Jabbot::Config::DEFAULT, config.to_hash
-    assert_hashes_equal hash, Jabbot::Config::DEFAULT
-  end
-
-  test "return merged configuration from to_hash" do
-    config = Jabbot::Config.new
-    config.login = "jabbot"
-    config.password = "secret"
-
-    config2 = Jabbot::Config.new({})
-    config2.login = "not_jabbot2"
-    config << config2
-    options = config.to_hash
-
-    assert_equal "secret", options[:password]
-    assert_equal "not_jabbot2", options[:login]
-  end
-end
-
-context "FileConfig" do
-  test "subclass config for file config" do
-    assert Jabbot::FileConfig.new(StringIO.new).is_a?(Jabbot::Config)
-  end
-
-  test "read settings from stream" do
-    config = Jabbot::FileConfig.new(StringIO.new <<-YAML)
-  login: jabbot
-  password: secret
-      YAML
-
-    assert_equal "jabbot", config.login
-    assert_equal "secret", config.password
-  end
 end

data/test/test_macros.rb

@@ -6,7 +6,7 @@ context "Macros" do
   end
 
   test "yield configuration" do
-    Jabbot::Macros.bot = Jabbot::Bot.new Jabbot::Config.default
+    Jabbot::Macros.bot = Jabbot::Bot.new
 
     conf = nil
     assert_nothing_raised { configure { |c| conf = c } }
@@ -14,7 +14,7 @@ context "Macros" do
   end
 
   test "add handler" do
-    Jabbot::Macros.bot = Jabbot::Bot.new Jabbot::Config.default
+    Jabbot::Macros.bot = Jabbot::Bot.new
 
     handler = add_handler(:message, ":command", :from => :cjno)
     assert handler.is_a?(Jabbot::Handler)

metadata

@@ -1,102 +1,111 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: jabbot
-version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.3.2
+version: !ruby/object:Gem::Version
+  version: 1.0.0
 platform: ruby
-authors: 
+authors:
 - badboy
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-25 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-04-10 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: xmpp4r
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "0.4"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: eventmachine
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "0.12"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+- !ruby/object:Gem::Dependency
+  name: eventmachine
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.12'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: shoulda
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.12'
+- !ruby/object:Gem::Dependency
+  name: shoulda
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
         version: 2.10.1
   type: :development
-  version_requirements: *id003
-description: "  Jabbot is a Ruby micro-framework for creating Jabber/MUC bots,\n  heavily inspired by Sinatra and Twibot.\n\n  I modified the code of Twibot to fit my needs.\n  The original Twibot code by Christian Johansen is located at:\n  http://github.com/cjohansen/twibot\n\n  It's as easy as definig a small message handler:\n    message {|message, params|\n      post message.text\n    }\n"
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.10.1
+description: |2
+    Jabbot is a Ruby micro-framework for creating Jabber/MUC bots,
+    heavily inspired by Sinatra and Twibot.
+
+    I modified the code of Twibot to fit my needs.
+    The original Twibot code by Christian Johansen is located at:
+    http://github.com/cjohansen/twibot
+
+    It's as easy as definig a small message handler:
+      message {|message, params|
+        post message.text
+      }
 email: badboy@archlinux.us
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
+- LICENSE
 - README.md
 - Rakefile
-- LICENSE
 - lib/hash.rb
 - lib/jabbot.rb
-- lib/jabbot/macros.rb
+- lib/jabbot/bot.rb
 - lib/jabbot/config.rb
 - lib/jabbot/handlers.rb
-- lib/jabbot/bot.rb
-- test/test_config.rb
-- test/test_macros.rb
-- test/test_bot.rb
+- lib/jabbot/macros.rb
+- lib/jabbot/version.rb
 - test/helper.rb
+- test/test_bot.rb
+- test/test_config.rb
 - test/test_handler.rb
 - test/test_hash.rb
-has_rdoc: true
+- test/test_macros.rb
 homepage: http://github.com/badboy/jabbot
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Simple framework for creating Jabber/MUC bots, inspired by Sinatra and Twibot
 test_files: []
-