adhearsion 0.7.0 → 0.7.1

data/Rakefile

@@ -3,7 +3,7 @@ require 'rake/testtask'
 require 'rake/rdoctask'
 require 'rake/gempackagetask'
 
-ADHEARSION_VERSION = `grep ahn -e '^\s*\$ADHEARSION_VERSION' | sed 's/[^[:digit:].]/''/g'`.strip
+ADHEARSION_VERSION = File.read '.version'
 Summary = %{Adhearsion is a professional integration system for
 integrating anything and everything.}
 
@@ -105,4 +105,9 @@ task :update => [:repackage] do
   puts `gem uninstall adhearsion`
   `gem install pkg/adhearsion*.gem`
   puts "Done."
+end
+
+desc 'Create both the gem and the Trixbox RPM. Called "d" for "distribute"'
+task :d => [:repackage] do
+  # Coming soon
 end

data/ahn

@@ -34,12 +34,12 @@ usage = %"Usage:
 The helper management system is still under development. Not all of these
 commands will work. It's coming soon, though!  :)"
 
-$ADHEARSION_VERSION = "0.7.0"
+ADHEARSION_VERSION = File.read File.join(File.dirname(__FILE__), '.version')
 ARGV.unshift 'start' if ARGV.empty?
 
 case ARGV.shift
 when /help|-h|--h|-help|--help/ then puts usage
-when 'version' then puts "Adhearsion v#{$ADHEARSION_VERSION}"
+when 'version' then puts "Adhearsion v#{ADHEARSION_VERSION}"
 when 'create'
   require 'fileutils'
   include FileUtils
@@ -120,7 +120,7 @@ when 'start'
   
   Dir.chdir app
   
-  puts %{\nStarting Adhearsion v#{$ADHEARSION_VERSION}
+  puts %{\nStarting Adhearsion v#{ADHEARSION_VERSION}
   Written by Jay Phillips of Codemecca LLC, et al.
   http://adhearsion.com\n\n}
   
@@ -146,7 +146,7 @@ when 'start'
   end
   
   require 'adhearsion'
-  require 'database'
+  require 'database' if CONFIG['enable_database']
   require 'servlet_container'
   
   # Load appropriate helpers

data/lib/core_extensions.rb

@@ -124,7 +124,7 @@ end
 #  end
 #end
 
-class Fixnum
+class Module
   
   # One ring is approximately six seconds.
 	def rings() self*6 end
@@ -135,6 +135,9 @@ class Fixnum
 		to_s =~ other
 	end
 	
+	def am() self end
+	def pm() self+12 end
+	
 	# Used by __case__ statements. For Adhearsion's purposes, passing
 	# a Fixnum to a case statement will convert both the Fixnum operand
 	# and other operand to Strings and then return their === equivalency.
@@ -143,6 +146,18 @@ class Fixnum
 	end
 end
 
+class Time
+  def weekday?() (1..5).include? wday end
+  def weekend?() !weekday? end
+  def    sunday?() wday == 0 end
+  def    monday?() wday == 1 end
+  def   tuesday?() wday == 2 end
+  def wednesday?() wday == 3 end
+  def  thursday?() wday == 4 end
+  def    friday?() wday == 5 end
+  def  saturday?() wday == 6 end
+end
+
 class Hash
 	def method_missing name, *args
     if name.to_s[-1] == ?= then self[name.to_s.chop.to_sym] = args.first

data/new_projects/Rakefile

@@ -1,52 +1,10 @@
 require 'rubygems'
 require 'rake/testtask'
 require 'rake/rdoctask'
-require 'rake/gempackagetask'
 
-ADHEARSION_VERSION = '0.7.0'
 Summary = 'Adhearsion is a professional integration system for
 integrating anything and everything.'
 
-#task :default => [:test]
-
-#desc "Run the Adhearsion unit tests"
-#task :test do
-#  Dir['test/*.rb'].each do |f| require f end
-#end
-
-gem_spec = Gem::Specification.new do |s|
-  
-  s.name     = 'adhearsion'
-  s.rubyforge_project = 'adhearsion'
-  s.author   = 'Jay Phillips'
-  s.email    = 'admin -at- jicksta dot com'
-  s.version  = ADHEARSION_VERSION
-  s.summary  = Summary
-  s.homepage = 'http://adhearsion.com'
-
-  s.add_dependency 'activerecord', '>= 1.14.4'
-  s.add_dependency 'activesupport', '>= 1.3.1'
-  s.add_dependency 'rake', '>= 0.7.1'
-
-  s.platform = Gem::Platform::RUBY
-  s.require_path = 'lib'
-  s.executables = 'start_adhearsion' # ['start_adhearsion', 'ahn']
-  s.bindir = '.'
-  #s.extra_rdoc_files = ['LICENSE']
-
-  include = Dir['**/*']
-  exclude = Dir['{log,pkg}/**/*']
-  
-  s.files = include - exclude
-  
-  # test_files = Dir['tests/*.rb'] # Will be added when not so buggy
-end
-
-Rake::GemPackageTask.new gem_spec do |pkg|
-  pkg.need_zip = false
-  pkg.need_tar = false
-end
-
 #desc "Generate documentation for Adhearsion"
 #Rake::RDocTask.new do |rdoc|
 #  rdoc.rdoc_dir 'doc'
@@ -64,16 +22,16 @@ task :wiki => [:rm_wiki] do
   puts `find docs/wiki`
 end
 
-desc "Removes all cached compiled RubyInline shared objects"
-task :purge_objects do
-  `rm -rf ~/.ruby_inline/*`
-end
-
 desc "Removes the local copy of the wiki"
 task :rm_wiki do
   `rm -rf wiki.zip docs/wiki/`
 end
 
+desc "Removes all cached compiled RubyInline shared objects"
+task :purge_objects do
+  `rm -rf ~/.ruby_inline/*`
+end
+
 desc "Prepares Adhearsion for a new release"
 task :prepare_release do
   # Remove log files
@@ -87,9 +45,6 @@ task :prepare_release do
   puts "WARNING: These files are not under version control:\n#{unversioned_files}" unless unversioned_files.empty? 
 end
 
-desc "Simply prints the Adhearsion version."
-task :version do puts ADHEARSION_VERSION end
-
 desc 'Create sample databases per the config/migration.rb and database.yml files.'
 task :migrate do
   require 'config/migration'

data/new_projects/config/adhearsion.yml

@@ -1,11 +1,17 @@
 answer_before_call: true
 hangup_after_call: true
+enable_database: false
 
-info:
-  name: Codemecca LLC
-  main_number: 409/767-2813
-  street_address:
-  city:
-  state:
-  zip:
-  country: United States
+# This information is completely optional. It may be the
+# case that a particular helper you're using will need
+# information about your company. If this is the case,
+# it may be beneficial to fill in this information.
+#
+# info:
+#   name: Super Ultra Mega Corp
+#   main_number: 18005555555
+#   street_address: 123 Onetwothree Blvd
+#   city: Dallas
+#   state: Texas
+#   zip: 77777
+#   country: United States

data/new_projects/config/database.rb

@@ -16,20 +16,18 @@
 #   * No database
 #     | 
 #     | If you simply have no use for keeping any information about
-#     | users, groups, or anything else, you can leave this entire
-#     | file commented. You don't even need ActiveRecord installed.
+#     | users, groups, or anything else, change the "enable_database"
+#     | field to "false" in database.yml.
 #     '____________________________________________________________
 #
 ### SETTING UP YOUR DATABASE WITH A SAMPLE SCHEMA
 #
-# If you would like run
+# To make your Adhearsion app database-driven, you'll need to take a moment
+# to configure your database.
 #
 # ActiveRecord resources:
 #  * http://slash7.com/cheats/activerecord_cheatsheet.pdf
 #
-#
-# Uncomment the =begin/=end blocks to enable database access.
-#=begin
 
 require 'active_record'
 ActiveRecord::Base.logger = Logger.new 'logs/database.log', 10, 1.megabyte
@@ -38,13 +36,15 @@ ActiveRecord::Base.establish_connection YAML.load_file('config/database.yml')
 # When Adhearsion first encounters this Group class, it will automatically associate it
 # to the "groups" database. 
 class Group < ActiveRecord::Base
-  has_many :user
+  has_many :users
 end
 
 class User < ActiveRecord::Base
   validates_uniqueness_of :name
   validates_presence_of :name
   belongs_to :group
+  def busy?
+    # Include your own logic here!
+    false
+  end
 end
-
-#=end

data/new_projects/config/database.yml

@@ -1,3 +1,5 @@
+# To use sqlite3, you'll need to have it installed. Try installing
+# it with your system's package manager.
 adapter: sqlite3 # can also be "sqlite" for sqlite v2
 dbfile: config/adhearsion.sqlite3
 

data/new_projects/extensions.rb

@@ -1,56 +1,41 @@
+# This is an example dialplan. Feel free to remove this file and
+# start your dialplan from scratch.
 
-from_pwnyourphone {
-  # You rock! Be awesome and record us a message! We'll put supportive messages on the podcast!"
-  # Get ready to record. 5, 4, 3, 1 *BEEP*
-  play %(you-rock record-us-a-message we-put-messages-on-podcast get-ready five-countdown beep)
-  record :for => 3.minutes, :to => "/recordings/pwner.#{Time.now.to_i}.#{calleridnumber}.gsm"
-}
 
+# This "internal" context would map over if Adhearsion were invoked
+# in Asterisk's own "internal" context. For example, if you set up
+# your extensions.conf file for Adhearsion as so:
+#
+# [internal]
+#     exten => _X.,1,AGI(agi://192.168.1.3)
+#
+# then, when Adhearsion receives that call, it sees it came from
+# the "internal" context and invokes this.
 internal {
-	callee = User.find_by_ivr_extension extension
-	if callee
-
-    voicemail extension if last_dial_status != :answer
-  
-	#elsif extension.to_s =~ //#/^(((\d{1,3})?\d{1{3})?[1-9]\d{2})?[1-9]\d{6}$/
-  #    puts "got here"
-  #    dial "SIP/#{extension}@sipphone"
-  else
-	  case extension
-      when 21 then play weather_report
-      when 32 then dial "SIP/zoip@demo.zoip.org"
-      when 888 then loop { print '.'; XBMC.sendkey XBMC.translate(wait_for_digit) }
-      when 9999
-        if rand(20) == 0
-    	    play %W(a-connect-charge-of #{rand(50) + 10} cents-per-minute will-apply)
-      	  sleep 1.second
-      	  play %w(just-kidding-not-upset)
-        end
-        check_voicemail caller.voicemailbox
+  # In this example context you'll see use of a User object. This
+  # is intended to be an ActiveRecord object created from your
+  # config/database.rb file.
+  case extension
+    when 101...200
+      employee = Employee.find_by_extension extension
+      unless employee.busy? then dial employee
       else
-        play 'all-your-base'
-    end
-	end
-}
+        voicemail extension
+      end
 
-old {
-  case extension
-    when 1 then play weather_report("Richardson, Texas")
-    when 2 then play weather_report(input(5, :play => 'zip-code'))
-    when 3 then +xbmc
-    when 4
-      dial :tweedledee
+    when 888 then play weather_report("Dallas, Texas")
+    when 999 then check_voicemail extension
+    
+    # This is simply an example of including another context in
+    # the block of another context. Simply place a plus sign before
+    # its name. No need to even declare it above the context you
+    # enter it into.
+    when 999 then +joker_voicemail
   end
 }
-
-xbmc {
-  loop {
-    print '.'
-    XBMC.sendkey XBMC.translate(wait_for_digit)
-  }
-}
-
-from_gizmo {
-  #dial :tweedledum
-  +xbmc
-}
+joker_voicemail {
+  play %w(a-connect-charge-of 22 cents-per-minute will-apply)
+  sleep 2.seconds
+  play 'just-kidding-not-upset'
+  check_voicemail extension
+}

data/new_projects/helpers/xbmc.rb

@@ -1,12 +1,39 @@
+=begin Adhearsion metadata
+
+  name: Xbox Media Center Controller
+  author:
+    name: Jay Phillips
+    blog: http://jicksta.com
+    email: Jicksta -at- Gmail.com
+  instructions: >
+      Hacked xbox owners can use this helper to remotely control
+      their Xbox Media Center (XBMC) application. It works by
+      sending HTTP requests to XBMC's web server (which must be
+      enabled first), potentially emulating many different tasks.
+      
+      See the XBMC's HTTP API at 
+      http://www.xboxmediacenter.com/wiki/index.php?title=WebServerHTTP-API
+      for a full list of the available commands. Most often you'll
+      want to use the SendKey command in a loop, though, to take
+      in input. Here is how you may do that:
+        
+      <pre>
+      loop { XBMC.sendkey XBMC.translate!(wait_for_digit) }
+      </pre>
+      
+      That will take an infinite loop receiving keypad input,
+      converting it to the appropriate numerical key codes, then
+      sending a "SendKey" command with the translated argument.
+
+=end
 class XBMC
   KEY_MAPPING = { '1'=>37, '2'=>166, '4'=>169, '5'=>11, '6'=>168, '8'=>167 }
   KEY_MAPPING.default = 0
   def XBMC.translate(key) KEY_MAPPING[key] end
   def XBMC.method_missing name, hash={}
-    puts 'method missinggg'
     args = []
-    hash = { :parameter => hash} unless hash.is_a? Hash
+    hash = { :parameter => hash} unless hash.kind_of? Hash
     hash.merge({:command => name}).each { |k,v| args << "#{k}=#{v}" }
-    open("http://#{hash.ip || $HELPERS.xbmc.ip}/xbmcCmds/xbmcHttp?#{args * '&'}").read
+    open("http://#{hash['ip'] || $HELPERS['xbmc']['ip']}/xbmcCmds/xbmcHttp?#{args * '&'}").read
   end
 end

data/new_projects/old.extensions.rb

@@ -0,0 +1,49 @@
+# This is an example dialplan. Be sure to use
+internal {
+	callee = User.find_by_ivr_extension extension
+	if callee
+
+    voicemail extension if last_dial_status != :answer
+  
+	#elsif extension.to_s =~ //#/^(((\d{1,3})?\d{1{3})?[1-9]\d{2})?[1-9]\d{6}$/
+  #    puts "got here"
+  #    dial "SIP/#{extension}@sipphone"
+  else
+	  case extension
+      when 21 then play weather_report
+      when 32 then dial "SIP/zoip@demo.zoip.org"
+      when 888 then loop { print '.'; XBMC.sendkey XBMC.translate(wait_for_digit) }
+      when 9999
+        if rand(20) == 0
+    	    play %W(a-connect-charge-of #{rand(50) + 10} cents-per-minute will-apply)
+      	  sleep 1.second
+      	  play %w(just-kidding-not-upset)
+        end
+        check_voicemail caller.voicemailbox
+      else
+        play 'all-your-base'
+    end
+	end
+}
+
+old {
+  case extension
+    when 1 then play weather_report("Richardson, Texas")
+    when 2 then play weather_report(input(5, :play => 'zip-code'))
+    when 3 then +xbmc
+    when 4
+      dial :tweedledee
+  end
+}
+
+xbmc {
+  loop {
+    print '.'
+    XBMC.sendkey XBMC.translate(wait_for_digit)
+  }
+}
+
+from_gizmo {
+  #dial :tweedledum
+  +xbmc
+}

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: adhearsion
 version: !ruby/object:Gem::Version 
-  version: 0.7.0
-date: 2006-12-26 00:00:00 -06:00
+  version: 0.7.1
+date: 2006-12-29 00:00:00 -06:00
 summary: Adhearsion is a professional integration system for integrating anything and everything.
 require_paths: 
 - lib
@@ -46,6 +46,7 @@ files:
 - new_projects/extensions.rb
 - new_projects/helpers
 - new_projects/logs
+- new_projects/old.extensions.rb
 - new_projects/Rakefile
 - new_projects/config/adhearsion.sqlite3
 - new_projects/config/adhearsion.yml
@@ -85,10 +86,7 @@ files:
 - new_projects/logs/database.log
 - test/core_extensions_test.rb
 - test/dial_test.rb
-- test/stress_tests
 - test/test_micromenus.rb
-- test/stress_tests/test.rb
-- test/stress_tests/test.yml
 test_files: []
 
 rdoc_options: []

data/test/stress_tests/test.rb

@@ -1,13 +0,0 @@
-require 'yaml'
-x = YAML.load_file 'test.yml'
-threads = []
-x[x.keys.first].keys.grep(/\d+_times/)
-
-
-1_000.times do
-	threads.push(Thread.new do
-		
-	end)
-end
-
-threads.select { |s| s.start }

data/test/stress_tests/test.yml

@@ -1,13 +0,0 @@
-outboundcalls:
-    100_times:
-        extension: 14097672813
-        context: outbound
-
-testjaysextension:
-    120_times:
-        context: internal
-
-testmikesextension:
-    100_times:
-        extension: 1404
-        context: default