adhearsion 0.7.4 → 0.7.5

data/.version

@@ -1 +1 @@
-0.7.4
+0.7.5

data/CHANGELOG

@@ -0,0 +1,18 @@
+CHANGELOG since 0.7.4
+----------------------------------------------------------------------
+Regexp for US number is a little more accurate
+Context names like foo-bar are converted to foo_bar in extensions.rb.
+Reverted the weather helper hack in trunk
+Added last_dial_successful? and last_dial_unsuccessful?
+Fixed bug in last_dial_status()
+Added join() method back. Now supports MeetMe options, specifying the PIN code, and named conferences from adhearsion.yml.
+Improved documentation for a few methods in adhearsion.rb
+Dialing timeouts can now be done with a syntax like "dial :jay, :for => 2.minutes"
+Dialing options can now be given with "dial :options => 'mwt'"
+Fixed a bug in voicemail() which caused special mailboxes (busy, unavailable) to be malformed when Asterisk got the command.
+Added the ability for voicemail() to skip Allison's standard instructions.
+Made the SIP,ZAP,IAX/Zap/IAX2 sugary classes accessible globally
+Implemented Object#is_a_group? and Object#is_a_user?. Return values for these found convention method.
+Added the lookup() method as the "lookup" helper. Provides reverse-lookups for phone numbers from WhitePages.com. Require hpricot.
+Cleaned up properize()
+Removed the properize() assumption that dialed national numbers should have the international code (1) before them.

data/Rakefile

@@ -112,4 +112,4 @@ end
 desc 'Creates the Trixbox RPM.'
 task :trixbox => [:repackage] do
   # Coming soon
-end
+end

data/ahn

@@ -38,8 +38,6 @@ ADHEARSION_VERSION = File.read(File.join(File.dirname(__FILE__), '.version')).st
 ARGV.unshift 'start'  if ARGV.empty? # Set the default operation
 
 require 'yaml'
-adhearsion_config = File.join('config', 'adhearsion.yml')
-CONFIG = File.readable?(adhearsion_config) ? YAML.load_file(adhearsion_config) : {}
 
 $HUTDOWN = []
 class << $HUTDOWN
@@ -54,9 +52,6 @@ end
   trap sig do $HUTDOWN.now! end
 end
 
-require 'logging'
-register_logger StandardLogger.new(STDOUT)
-
 case ARGV.shift
 when 'help', '-h', '--h', '-help', '--help' then puts usage
 when 'version' then puts "Adhearsion v#{ADHEARSION_VERSION}"
@@ -69,7 +64,7 @@ when /^create(:[\w_.]+)?$/
   base_dir = File.expand_path File.dirname(__FILE__)
   App = $&.index(':') ? $&.split(':')[1..-1] * ':' : "default"
   
-  abort %'No app "#{App}" found!' unless File.directory? "#{base_dir}/apps/#{App}"
+  abort %'No app "#{App}" found!' unless File.exists? "#{base_dir}/apps/#{App}"
   
   from, to = [], []
   (Dir["{#{base_dir}/apps/#{App},docs}/**/*"] + ["#{base_dir}/LICENSE"]).each do |key|
@@ -77,6 +72,7 @@ when /^create(:[\w_.]+)?$/
     value.sub! "apps/#{App}/", '' if value.index "apps/#{App}/"
     
     to   << dest_dir + value
+    
     from << key
   end
   
@@ -143,6 +139,12 @@ when 'start'
   
   Dir.chdir target
   
+  adhearsion_config = File.join('config', 'adhearsion.yml')
+  CONFIG = File.readable?(adhearsion_config) ? YAML.load_file(adhearsion_config) : {}
+  
+  require 'logging'
+  register_logger StandardLogger.new(STDOUT)
+  
   register_logger StandardLogger.new('logs/adhearsion.log')
   
   puts %{\nStarting Adhearsion v#{ADHEARSION_VERSION}
@@ -156,6 +158,7 @@ when 'start'
   require 'adhearsion'
   require 'database' if CONFIG['enable_database']
   require 'servlet_container'
+  require "constants"
   
   # Load appropriate helpers
   $HELPERS = {}

data/apps/default/config/adhearsion.yml

@@ -16,3 +16,8 @@ port: 4573
 #   state: Texas
 #   zip: 77777
 #   country: United States
+
+# conferences:
+#   management: 1000
+#   marketing: 1001
+#   development: 1002

data/apps/default/config/helpers/lookup.yml

@@ -0,0 +1 @@
+enabled: false

data/apps/default/helpers/lookup.rb

@@ -0,0 +1,34 @@
+=begin Adhearsion metadata
+  name: Number Metadata Lookup
+  author: Jay Phillips
+=end
+
+require "hpricot"
+require "open-uri"
+
+def lookup number
+  hash = {}
+  url = "http://www.whitepages.com/9901/search/ReversePhone?phone=#{number}"
+  doc = Hpricot open(url)
+  
+  # This div contains all the information we need
+  results = doc.at "#results_single_listing"
+  
+  # This div's h3 contains the name of the caller
+  hash[:first_name], hash[:last_name] = results.at('h3').inner_html.split(/,\s*/).reverse
+  
+  # Now we just need the rest of the information contained in p's.
+  meta = results/'p'
+  meta.pop # Discard the useless p element
+  
+  hash[:number] = meta.pop.inner_html
+  city_info = meta.pop.inner_html
+  city_info = city_info.match /(.+), ([A-Za-z]{2}) (\d{5})/
+  hash[:city]  = city_info[1]
+  hash[:state] = city_info[2]
+  hash[:zip]   = city_info[3]
+  
+  hash[:address] = meta.map(&:inner_html) * " "
+  
+  hash
+end

data/lib/adhearsion.rb

@@ -89,7 +89,7 @@ module Asterisk
   # within it will be recorded. If no arguments are given, a String
   # for the filename will be generated from the current time and a
   # sequence of random alphanumeric characters.
-  def record hash, &block
+  def record hash={}, &block
     defaults = {:file => "#{String.random(5)}", :folder => nil,
                 :channel => Thread.current[:VARS]['channel'], :format => 'wav', :mix => '1'}
     defaults = defaults.merge hash
@@ -109,7 +109,7 @@ module Asterisk
     return digit.chr if [32,45].include? digit
     digit - ?0
   end
-  
+
   # An abstracted remote mutator for setting Asterisk variables.
   # You may optionally pass as a third argument ":normally" to
   # have the variable set with Set() instead of AGI.
@@ -127,10 +127,90 @@ module Asterisk
 		result[0..12] == "200 result=0" ? default : result[13..-1]
 	end
 
-	def dial who, *options
-    #group = who.group if who.respond_to :group
-		exec :dial, properize(who)
+  # == Dialing Users
+  # 
+  # This method will be used in most dial plans written with Adhearsion.
+  # The first argument is the destination which can be given in a number
+  # of syntactically sweet formats:
+  #
+  #   - A "Group" of users. This is determined by whether the passed group
+  #     responds to the +members+, +users+, +member+, or +user+ methods. If
+  #     so, all members of that group will ring simultaneously. This would
+  #     be especially useful for, say, technical support groups which all
+  #     share the same line. When the first person picks up the line, the
+  #     rest of the phones will stop ringing. The array of users supplied
+  #     by one of the aforementioned methods can follow any of the
+  #     standards below.
+  #   - An Array of "Users".
+  #   - A single "User". A User is defined by something that responds to the
+  #     +extension+ or +extensions+ methods. The return value of these two
+  #     methods can either be any of the following formats:
+  #   - A String. The String can contain a simple number or be a fully
+  #     qualified Asterisk-ready String. e.g. 'SIP/codemecca@sipphone'.
+  #   - A Numeric or Symbol. In this case, the SIP technology is used by
+  #     default. See the examples below.
+  #
+  # == Dialing Examples
+  #
+  #   - dial 123             # => SIP/123
+  #   - dial "123"           # => SIP/123
+  #   - dial SIP/123         # => SIP/123
+  #   - dial "SIP/123"       # => SIP/123
+  #   - dial IAX/123         # => IAX2/123
+  #   - dial IAX/:jay        # => IAX2/jay
+  #   - dial IAX2/123        # => IAX2/123
+  #   - dial ZAP/123         # => Zap/123
+  #   - dial Zap/:out        # => Zap/out
+  #   - dial :mikey          # => SIP/mikey
+  #   - dial SIP/:mikey      # => SIP/mikey
+  #   - dial "SIP/:mikey"    # Don't do this
+  #   - dial SIP/'mikey'     # => SIP/mikey
+  #   - dial 1_555_123_7890  # => SIP/1_555_123_7890
+  #   - dial 'SIP/15551237890@sipphone' # => SIP/15551237890@sipphone
+  #
+  # Note, in the last example, the part following the @ sign is a section
+  # from sip.conf.
+  #
+  # == More complex usage
+  # 
+  # If you should want to have the phone ring for only a pre-determined set
+  # of time (which you likely will to have the call redirect to voicemail for
+  # example), then a :for => 15.seconds type of syntax can be used. Examples:
+  #
+  #   - dial :jay, :for => 2.minutes
+  #
+  # The result of the last call can be retrieved by using the dial plan
+  # methods +last_call_successful?+, +last_call_unsuccessful?+, or
+  # +last_dial_status+. Note: +last_dial_status+ returns a Symbol representing
+  # the result of the last call. For more information, see its appropriate
+  # documentation.
+  # 
+  # Additionally, you can use the :options hash key argument to specify options
+  # which Asterisk's Dial() application normally takes. For example:
+  # 
+  #   - dial :jay, :for => 30.seconds, :options => 'tmw'
+  #   - dial 1_444_555_6666, :options => 'S(30)'
+  #
+  # == Resources
+  #
+  # For more information, see the VoIP-Info.org page on dialing in Asterisk at
+  # http://www.voip-info.org/wiki-Asterisk+cmd+Dial
+	def dial who, hash={}
+    # if who.is_a_group? TODO: Set the CDR GROUP() value if a Group is dialed.
+		exec :dial, properize(who), *[hash[:for], hash[:options]]
 	end
+  
+  # As you might expect, last_call_successful? returns a boolean depending on whether
+  # the last call to dial() finished successfully. Success is determined only if the
+  # call was answered.
+  def last_call_successful?
+    last_dial_status == :answer
+  end
+  
+  # The opposite of last_call_successful?. Here for syntactical sugar.
+  def last_call_unsuccessful?
+    !last_call_successful?
+  end
 
   # The stream_file() method comes right over from the AGI protocol.
   # Its use is very similar to the Background() application from
@@ -183,12 +263,15 @@ module Asterisk
   # Usage: voicemail :busy, 4544
   #    or: voicemail 4544
   #    or: voicemail 4544, :unavailable, :at => 'codemecca'
-  def voicemail msg_or_who=nil, who_or_msg=nil, hash={}
-    opts = [msg_or_who, who_or_msg]
-    type = opts & [:normal, :busy, :unavailable]
-    box  = opts - type
-    box.last <<= "@#{hash[:at]}}" if hash[:at]
-    exec :Voicemail, *(type + box)
+  def voicemail *args
+    hash = args.last.is_a?(Hash) ? args.pop : {}
+    type = [:skip, :busy, :unavailable] & args
+
+    box = (args - type).to_s # Destination mailbox
+    box = type.map { |x| x.to_s[0].chr }.to_s + box
+    box += "@#{hash[:at]}" if hash[:at]
+
+    exec :Voicemail, box
   end
 
   # Execute VoiceMailMain behind the scenes to check a specified
@@ -203,6 +286,20 @@ module Asterisk
     exec :VoiceMailMain, args.compact
   end
 
+  # Used to join a particular conference with the MeetMe application. To
+  # use MeetMe, be sure you have a proper timing device configured on your
+  # Asterisk box. MeetMe is Asterisk's built-in conferencing program.
+  # More info: http://www.voip-info.org/wiki-Asterisk+cmd+MeetMe
+  def join conference=nil, hash={}
+    unless conference.kind_of? Numeric
+      raise ArgumentError, "If you want to use named conferences, " +
+                           "specify them in adhearsion.yml" unless CONFIG['conferences']
+      conference = CONFIG['conferences'][conference.to_s]
+    end
+    exec :MeetMe, conference, hash[:options], hash[:pin]
+  end
+  alias meetme join
+
   # Play is a long-overdue easy way to play audio files in a dialplan with Asterisk. It can take a
   # single String of the filename (defaults to /var/lib/asterisk/sounds) just as you
   # would give it to Playback(), or it can take any number of trailed on Strings.
@@ -247,36 +344,27 @@ module Asterisk
   # wouldn't be used much outside of dial(), but you may find it useful.
 	def properize who
 	  # These are the convention methods for Group-like objects
-		possible_methods = [:users, :members, :user, :member].select do |pm|
-		  who.respond_to? pm
-		end
+		group_method = who.is_a_group?
 		
 		# If 'who' has any of the possible_methods, replace 'who' with the return value
 		# of that method
-		who = who.send possible_methods.first if possible_methods.any?
+		who = who.send group_method if group_method
 		return nil unless who
 		
 		# In case we can't perform collection algorithms on 'who', let's encapsulate it in
 		# an Array
 		who = [who] unless who.kind_of?(Enumerable) && !who.kind_of?(String)
 		
+		user_method = who.first.is_a_user?
 		# If the first thing in the Enumerable responds to a User-like convention, then 
-	  #	set 'who' equal to the extension accessor of those objects. We refine the "who"
+	  #	set 'who' equal to the extension(s) accessor of those objects. We refine the "who"
 	  # argument more and more in this way until it's finally in a way Asterisk can read.
-		who.map! do |p|
-		  p.send possible_methods.first
-		end.compact! if (possible_methods = [:extension, :extensions].select do |pm|
-		  who.first.respond_to? pm
-		end).any?
+		who.map! { |p| p.send user_method }.compact! if user_method
 		
 		# Now replace each item in the Enumerable with its form converted to
 		# extension (assuming it's not already in that format)
 		who.map! do |ext|
-      if ext.kind_of?(String) && ext.index(?/) then ext
-      else
-        ext = "1#{ext}" if ext.is_national_number? && ext.to_s[0] != ?1
-        "SIP/#{ext}"
-      end
+      (ext.kind_of?(String) && ext.index(?/)) ? ext : "SIP/#{ext}"
     end
 		who * '&' # Finally, join() anything left in the Array with an '&'
 	end
@@ -289,7 +377,7 @@ module Asterisk
 	# probably doesn't exist. If :chanunavail, the callee
 	# phone may not be registered.
 	def last_dial_status
-		get_variable(:DIALSTATUS).downcase.to_sym
+		get_variable(:DIALSTATUS)[1..-2].downcase.to_sym
 	end
 	
 	# Answer the channel. Adhearsion is configured by default to automatically do this
@@ -301,41 +389,49 @@ module Asterisk
 	# Direct translation of the Asterisk NoOp() application. Used primarily for
 	# viewing debug information in the Asterisk CLI.
 	def noop(*options) rawr "NOOP #{options}" end	
+end
 
-  # This SIP class abstracts several SIP-related functions. In your dialplan,
-  # if you should want to set a SIP header specifically, simply use the class
-  # []= operator. For example, you may want to do SIP['Alert-Info'] = 'Ring-Answer'
-  # which will affect the next SIP call placed. Additionally, you can use this
-  # class's division operator to naturally represent "technology/channel"
-  # endpoints (e.g. SIP/1550 or SIP/:tweedledum)
-	class SIP
-	  def self.[](header)
-	    exec 
-    end
-		def self.[]=(header, value)
-		  exec :SipAddHeader, "#{header}: #{value}"
-		end
-		def self./(ext) "SIP/#{ext}" end
-	end
-  
-  class IAX
-    def self.[](arg=nil) IAX(arg) end
-    def self./(arg=nil) IAX(arg) end
-  end
-
+# This SIP class abstracts several SIP-related functions. In your dialplan,
+# if you should want to set a SIP header specifically, simply use the class
+# []= operator. For example, you may want to do SIP['Alert-Info'] = 'Ring-Answer'
+# which will affect the next SIP call placed. Additionally, you can use this
+# class's division operator to naturally represent "technology/channel"
+# endpoints (e.g. SIP/1550 or SIP/:tweedledum)
+class SIP
   
-  class ZAP
-    def self.[](arg=nil) ZAP(arg) end
-    def self./(arg=nil) ZAP(arg) end
-  end
+  # This will set the header value specified within the square bracked to the
+  # value given after the equals sign. Note: this can only be called if the
+  # current call's thread is handling an Asterisk call over AGI (i.e. dialplan).
+	def self.[]=(header, value)
+	  exec :SipAddHeader, "#{header}: #{value}"
+	end
+	
+	# Simple convenience method to make Adhearsion's DSL more Asterisk-like.
+	# Virtually anything can be provided after the "/", as long as its to_s()
+	# method is what you intended to represent.
+	def self./(ext) "SIP/#{ext}" end
+end
 
-  # For users who may try to use the (proper) IAX2 form. See IAX for more info.
-  class IAX2 < IAX; end
+class IAX
+  # Simple convenience method to make Adhearsion's DSL more Asterisk-like.
+	# Virtually anything can be provided after the "/", as long as its to_s()
+	# method is what you intended to represent.
+  def self./(arg=nil) IAX(arg) end
+end
 
-  # For users who may try to use the (common) "Zap" form. See ZAP for more info.
-  class Zap < ZAP; end
+class ZAP
+  # Simple convenience method to make Adhearsion's DSL more Asterisk-like.
+	# Virtually anything can be provided after the "/", as long as its to_s()
+	# method is what you intended to represent.
+  def self./(arg=nil) ZAP(arg) end
 end
 
+# For users who may try to use the (proper) IAX2 form. See IAX for more info.
+class IAX2 < IAX; end
+
+# For users who may try to use the (common) "Zap" form. See ZAP for more info.
+class Zap < ZAP; end
+
 # The PBX object is an object manifestation of the PBX with which Adhearsion will be
 # associated. Helpers often open up this class and add methods to it. Note: when doing
 # this in your own helpers, all methods will need to be class (a.k.a. static) methods

data/lib/constants.rb

@@ -17,4 +17,4 @@
 
 # Please help adjust these if they may be inaccurate!
 LOCAL_NUMBER = /^[1-9]\d{6}$/
-US_NUMBER = /^1?[1-9]\d{2})?[1-9]\d{6}$/
+US_NUMBER = /^1?[1-9]\d{2}[1-9]\d{6}$/

data/lib/core_extensions.rb

@@ -31,10 +31,12 @@ class Object
 		self
 	end
 	def is_a_group?
-	  # TODO: check if it responds to the conventions.
+	  [:users, :members, :user, :member].each { |x| return x if respond_to? x }
+	  nil
   end
   def is_a_user?
-    # TODO: check if it responds to the conventions.
+	  [:extension, :extensions].each { |x| return x if respond_to? x }
+	  nil
   end
   
   def is_local_number?
@@ -42,7 +44,7 @@ class Object
   end
 
   def is_national_number? 
-    to_s =~ national_number
+    to_s =~ US_NUMBER
   end
 
   def mutex() @mutex ||= Mutex.new end

data/lib/servlet_container.rb

@@ -97,6 +97,11 @@ class ServletContainer
     			end
 			
     			log "Parsing of extensions.rb complete"
+    			
+    			# Because Asterisk allows dashes in its context names and Ruby interprets
+    			# these as minuses, let's convert them to underscores.
+    			call_variables['context'].gsub! '-', '_'
+    			
           begin
     				target_context = call_variables['context']
             if target_context
@@ -127,8 +132,8 @@ class ServletContainer
            detail.backtrace.each do |msg| log " "*8 << msg end
       	end
 			  
-   			[$AFTER_CALl_HIGH, $AFTER_CALL, $AFTER_CALL_LOW].flatten.compact.each &:call
-   			+lambda { hangup if CONFIG.hangup_after_call }
+   			[$AFTER_CALL_HIGH, $AFTER_CALL, $AFTER_CALL_LOW].flatten.compact.each &:call
+   			+lambda { hangup if CONFIG['hangup_after_call'] }
 		end
 	end
 

data/test/asterisk_module_test.rb

@@ -0,0 +1,14 @@
+context "The Asterisk module"
+  specify "should properize properly" do
+    properize("123").should == 'SIP/123'
+    properize(1_555_444_1234).should == 'SIP/15554441234'
+    properize(:jay).should == 'SIP/jay'
+    properize("jay").should == 'SIP/jay'
+    properize("SIP/123").should == 'SIP/123'
+    properize("IAX2/jay").should == 'IAX2/jay'
+    properize((100..110).to_a).should == 'SIP/100&SIP/101&SIP/102&SIP/103&SIP/104&SIP/105&SIP/106&SIP/107&SIP/108&SIP/109&SIP/110'
+    properize(["SIP/123", "SIP/456"]).should == 'SIP/123&SIP/456'
+    # TODO: Should mock up dialing a user
+    # TODO: Should mock up dialing a group
+  end
+end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: adhearsion
 version: !ruby/object:Gem::Version 
-  version: 0.7.4
-date: 2007-01-20 00:00:00 -06:00
+  version: 0.7.5
+date: 2007-02-10 00:00:00 -06:00
 summary: Adhearsion is a professional integration system for integrating anything and everything.
 require_paths: 
 - lib
@@ -31,10 +31,10 @@ authors:
 files: 
 - ahn
 - apps
+- CHANGELOG
 - docs
 - lib
 - LICENSE
-- pkg
 - Rakefile
 - test
 - apps/codemeccollab
@@ -52,6 +52,7 @@ files:
 - apps/default/config/migration.rb
 - apps/default/config/helpers/drb_server.yml
 - apps/default/config/helpers/factorial.alien.c.yml
+- apps/default/config/helpers/lookup.yml
 - apps/default/config/helpers/manager_proxy.yml
 - apps/default/config/helpers/micromenus
 - apps/default/config/helpers/micromenus.yml
@@ -75,6 +76,7 @@ files:
 - apps/default/config/helpers/micromenus/stylesheets/firefox.xul.css
 - apps/default/helpers/drb_server.rb
 - apps/default/helpers/factorial.alien.c
+- apps/default/helpers/lookup.rb
 - apps/default/helpers/manager_proxy.rb
 - apps/default/helpers/micromenus.rb
 - apps/default/helpers/multi_messenger.rb
@@ -86,10 +88,10 @@ files:
 - lib/adhearsion.rb
 - lib/constants.rb
 - lib/core_extensions.rb
-- lib/database_functions.rb
 - lib/logging.rb
 - lib/rami.rb
 - lib/servlet_container.rb
+- test/asterisk_module_test.rb
 - test/core_extensions_test.rb
 - test/dial_test.rb
 - test/test_micromenus.rb

data/lib/database_functions.rb

@@ -1,76 +0,0 @@
-# Adhearsion, open source technology integrator
-# Copyright 2006 Jay Phillips
-# 
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-class Definition
-
-  def initialize(*constraints)
-    @options = {}
-    if constraints then @constraints = constraints.flatten!
-    else @constraints = []
-    end
-  end
-
-  attr_reader :options
-
-  # The method_missing method is a crown-jewel of Ruby. When a method is
-  # called on an object that doesn't exist, Ruby will invoke the method_missing
-  # method. The Kernel module holds the initial definition of this method and
-  # the Ruby interpreter raises a NameError when Kernel#method_missing is
-  # invoked.
-  def method_missing(name, *args)
-    # Let's ensure the names stay simple
-    super unless name.to_s =~ /^[a-z][\w_]*=?$/i || args.empty?
-    @options[name] = args.simplify
-  end
-end
-
-# The user(), group() and use_users_and_group() methods are presently alpha and
-# really shouldn't be used yet. They're experimental ways of establishing user
-# and group objects in the database.rb file.
-
-def user &options
-  establish_connection :internal
-  her = Definition.new
-  yield her
-  User.create her.options
-end
-
-def group &options
-  establish_connection :internal
-  her = Definition.new
-  yield her
-  Group.create her.options
-end
-
-def use_users_and_groups clause
-  estabish_connection :external
-  case clause.class.inspect.to_sym
-  when :Hash
-    group_table = clause[:from].delete :group_table
-    user_table = clause[:from].delete :user_table
-    # XXX: Note: User.table doesn't exist! Needs fixing!
-    User.table = user_table if user_table
-    Group.table = group_table if group_table
-
-    establish_connection :external, clause[:from]
-  when :String || :File
-    clause = File.open clause, 'a' if clause.is_a? String
-    raise ArgumentError.new("Not a directory!") unless clause.directory?
-  else raise ArgumentError.new("Wrong argument type!")
-  end
-end
-alias use_groups_and_users  use_users_and_groups