adhearsion 0.7.6 → 0.7.7

data/apps/default/config/helpers/micromenus/stylesheets/columnav.css

@@ -0,0 +1,135 @@
+/*
+ * Copyright (c) 2007, David A. Lindquist (stringify.com)
+ * Some Rights Reserved
+ *
+ * This code is licensed under the Creative Commons Attribution 2.5 License
+ * (http://creativecommons.org/licenses/by/2.5/). Please maintain the above
+ * license and copyright statements when using this code.
+ *
+ * $Id: columnav.css 476 2007-02-20 23:43:22Z david $
+ */
+
+/* DO NOT CHANGE ANYTHING IN THIS SECTION
+
+   Styles below override defaults in carousel.css and govern fundamental layout
+   and behavior.
+
+------------------------------------------------------------------------------*/
+
+.carousel-component {
+    background: transparent;
+    color: black;
+    overflow: auto !important;
+    padding: 0;
+}
+
+.carousel-component ul.carousel-list li {
+    color: black;
+    font-family: inherit;
+    font-size: 1em;
+    text-align: left;
+}
+
+.carousel-component ul.carousel-list li div {
+    overflow: auto;
+    overflow-y: scroll;
+    position: relative;
+}
+
+.carousel-component ul.carousel-list li a {
+    display: block;
+    overflow-x: hidden;
+    position: relative;
+}
+
+.carousel-component ul.carousel-list li a span {
+    display: block;
+    position: relative;
+}
+
+
+/* CUSTOMIZE ANYTHING IN THIS SECTION
+
+   Styles below can be changed to customize colors, margins, padding, fonts,
+   etc., as well as the icons that appear before each item. At minimum, set the
+   width of .carousel-component and its list items, and the height of the div
+   it contains.
+
+------------------------------------------------------------------------------*/
+
+.carousel-component {
+}
+
+.carousel-component ul.carousel-list li {
+    width: 348px;
+}
+
+.carousel-component ul.carousel-list li div {
+    height: 348px;
+}
+
+.carousel-component ul.carousel-list li a {
+    color: black;
+    cursor: default;
+    font-family: 'Lucida Grande', Helvetica, Arial, sans-serif;
+    font-size: 12px;
+    margin: 0 1px;
+    padding: 2px;
+    text-decoration: none;
+}
+
+.carousel-component ul.carousel-list li a.columnav-has-menu {
+    background-image: url(../images/arrow-off.gif);
+    background-position: right center;
+    background-repeat: no-repeat;
+}
+
+.carousel-component ul.carousel-list li a.columnav-active {
+    background-color: #3875d7;
+}
+
+/* IE6 cannot grok element selectors with chained class names */
+html>body .carousel-component ul.carousel-list li a.columnav-has-menu.columnav-active {
+    background-image: url(../images/arrow-on.gif);
+}
+
+.carousel-component ul.carousel-list li a.columnav-error span {
+    background-image: url(../images/error.gif);
+    color: red;
+}
+
+.carousel-component ul.carousel-list li a span {
+    background-repeat: no-repeat;
+    background-position: 0px center;
+    margin-right: 14px;
+    padding-left: 20px;
+}
+
+.carousel-component ul.carousel-list li a.columnav-active span {
+    color: white;
+}
+
+.carousel-component ul.carousel-list li a.columnav-has-menu span {
+    background-image: url(../images/folder-off.gif);
+}
+
+/* IE6 cannot grok element selectors with chained class names */
+html>body .carousel-component ul.carousel-list li a.columnav-has-menu.columnav-active span {
+    background-image: url(../images/folder-on.gif);
+}
+
+.prevButton { }
+  .prevButton a {
+    color: black;
+    font-family: 'Lucida Grande', Helvetica, Arial;
+    font-size: 10px;
+    line-height: 22px;
+    position: relative;
+    text-align: center;
+    text-decoration: none;
+}
+
+.prevButton a:hover {
+    background-color: #3875d7;
+    color: white;
+}

data/apps/default/config/helpers/micromenus/stylesheets/microbrowsers.css

@@ -0,0 +1,42 @@
+body {
+  background: url(/images/ggbridge.jpg) top left no-repeat; }
+
+div.microbrowser {
+    background: url(/images/microbrowser.bg.gif) top left no-repeat;}
+  div.microbrowser .hd {}
+  div.microbrowser .ft {
+    display: none; }
+  div.microbrowser h1 {
+    color: white;
+    text-shadow: black 0px 0px 5px;
+    margin: 0; padding: 6px 0;
+    text-align: center;
+    font-size: 20px; }
+
+.yui-panel {
+  width: 400px;}
+  
+.yui-panel .hd {
+	padding:0;
+	border:none;
+	color:#000;
+	height:44px;
+	margin-left:33px;
+	margin-right:33px;
+	text-align:center;
+	overflow:visible; }
+
+.yui-panel .hd .tl {
+	width:30px;
+	height:22px;
+	top: 4px;
+	left:10px;
+	position:absolute; }
+
+.yui-panel .hd .tr {
+	width:30px;
+	height:22px;
+	line-height: 22px;
+	top:6px;
+	left:315px;
+	position:absolute; }

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

@@ -2,4 +2,8 @@
 # be any Jabber/XMPP account.
 username: test@adhearsion.com
 password: password
-enabled: false
+enabled: false
+
+# Specify whether incoming subscription requests should
+# be automatically accepted.
+accept_subscriptions: false

data/apps/default/config/migration.rb

@@ -47,3 +47,13 @@ class CreateGroups < ActiveRecord::Migration
     drop_table :groups
   end
 end
+
+
+CreateUsers.up
+CreateGroups.up
+
+### If you'd like to create any initial users, do it here by
+### requiring your database.rb file and performing your logic.
+#
+# require 'config/database.rb'
+# User.create :name => "Jay Phillips", :extension => 123

data/apps/default/extensions.rb

@@ -7,7 +7,7 @@
 # your extensions.conf file for Adhearsion as so:
 #
 # [internal]
-#     exten => _X.,1,AGI(agi://192.168.1.3)
+#     exten => _.,1,AGI(agi://192.168.1.3)
 #
 # then, when Adhearsion receives that call, it sees it came from
 # the "internal" context and invokes this.

data/apps/default/helpers/factorial.alien.c

@@ -24,9 +24,9 @@
 */
 
 int fast_factorial(int input) {
-  int sum = 0, count = 1;
+  int prod = 1, count = 1;
   while(count <= input) {
-    sum += count++;
+    prod *= count++;
   }
-  return sum;
+  return prod;
 }

data/apps/default/helpers/lookup.rb

@@ -15,7 +15,8 @@ def lookup number
   if (results = doc.at "#results_single_listing") then
     # This div's h3 contains the name of the caller
     hash[:first_name], hash[:last_name] = results.at('h3').inner_html.split(/,\s*/).reverse
-
+    hash[:name] = hash[:first_name] + " " + hash[:last_name]
+    
     # Now we just need the rest of the information contained in p's.
     meta = results/'p'
     meta.pop # Discard the useless p element

data/apps/default/helpers/manager_proxy.rb

@@ -38,23 +38,75 @@ class PBX
     @@sip_users[:users]
   end
   
-  def self.originate hash
-    # This is an ugly hack to use until RAI's AMI work is ported in.
-    h = {}
-    h['Application'] = hash.delete :app
-    hash.each { |k,v| h[k.to_s.titleize] = v }
-    @@rami_client.originate h
-  end
+  class << self
+    
+    # An introduction connects two endpoints together. The first argument is
+    # the first person the PBX will call. When she's picked up, Asterisk will
+    # play ringing while the second person is being dialed.
+    #
+    # The first argument is the person called first. Pass this as a canonical
+    # IAX2/server/user type argument. Destination takes the same format, but
+    # comma-separated Dial() arguments can be optionally passed after the
+    # technology.
+    #
+    # TODO: Provide an example when this works.
+    def introduce src, dst, hash={}
+      cid     = hash.delete(:callerid) || hash.delete(:cid)
+      options = hash.delete(:options) || hash.delete(:opts)
+      dst << "|" << options if options
+      call_and_exec src, "Dial", dst, cid
+    end
+    
+    def call_and_exec channel, app, args=nil, callerid=nil
+      args = { :channel => channel
+               :application => app }
+      args[:data] = args if args
+      args[:callerid] = callerid if callerid
+      originate args
+    end
+    
+    def overhear their_channel, your_channel
+      
+    end
+    
+    
+    def call chan, code=nil, &block
+      raise "Cannot provide both a String and a block!" if code && block_given?
+      ip = 'localhost' # TODO: How to get this?!
+      originate :application => "AGI",
+                :data => "agi://#{ip}/?call_id=",
+                :channel => chan
+      
+      # TODO: Initiate an origination that comes back
+      # into Adhearsion and runs either a certain block
+      # of code or eval()s a String of dialplan code.
+    end
+    
+    def originate hash
+      # This is an ugly hack to use until RAI's AMI work is ported in.
+      h = {}
+      h['Application'] = hash.delete :app
+      hash.each { |k,v| h[k.to_s.titleize] = v }
+      @@rami_client.originate h
+    end
   
-  def self.record hash={}, &block
-    # TODO: Implement me!
-    raise NotImplementedError
+    def record hash={}, &block
+      # TODO: Implement me!
+      raise NotImplementedError
     
-    # defaults = {:file => "#{String.random(5)}", :folder => nil,
-    #             :channel => Thread.current[:VARS]['channel'], :format => 'wav', :mix => '1'}
-    # defaults = defaults.merge hash
-    # PBX.rami_client.... # TODO
+      # defaults = {:file => "#{String.random(5)}", :folder => nil,
+      #             :channel => Thread.current[:VARS]['channel'], :format => 'wav', :mix => '1'}
+      # defaults = defaults.merge hash
+      # PBX.rami_client.... # TODO
+    end
+    
+    # private
+    # CALL_BLOCK_CACHE = {}
+    # def handle_call_specifically expiration=3.minutes.from_now, &block
+    #   # Find a random, unused id
+    #   while CALL_BLOCK_CACHE[id = rand(1_073_741_823)]; end  # 1073741823 is the Fixnum max
+    #   CALL_BLOCK_CACHE[id] = [expiration, block]
+    # end
   end
   
-  
 end

data/apps/default/helpers/micromenus.rb

@@ -51,8 +51,8 @@ class MicromenusServlet < WEBrick::HTTPServlet::AbstractServlet
       
       if route.empty?
         start "Error" do
-          build_text "Bad URL!"
-          build_text "Must point to a micromenu!"
+          build_text "Whoops!"
+          build_text "You forgot to include the target Micromenu in the URL path!"
         end
         return
       end
@@ -63,9 +63,10 @@ class MicromenusServlet < WEBrick::HTTPServlet::AbstractServlet
       load_menu filename
       until route.empty?
         segment = route.shift
-        broken = segment.match(/^([\w_.]+);?(\d*)$/)
-        segment, id = broken[1], broken[2]
-        id = nil if id.empty?
+        broken = segment.match(/^([\w_.]+)(;(\d*))?$/)
+        
+        segment, id = broken[1], broken[3]
+        id = nil if id && id.empty?
         
         matches = @config.select do |x|
           x[:type] == :menu && x[:text].nameify == segment
@@ -111,13 +112,12 @@ class MicromenusServlet < WEBrick::HTTPServlet::AbstractServlet
         end
       end
     end
-
     def load_menu filename
       @config.clear
       file = File.join('config','helpers', 'micromenus', filename + '.rb')
       unless File.readable? file
-        item "Bad URL!"
-        item "File inexistent!"
+        item "Target Micromenu doesn't exist!"
+        item "Did you input the URL correctly?"
       else
         eval File.read(File.join('config','helpers', 'micromenus', filename + '.rb'))
       end
@@ -131,8 +131,49 @@ class MicromenusServlet < WEBrick::HTTPServlet::AbstractServlet
         ((url[-1] == ?/) ? url : url + "/") + pages * '/'
       end
     end
-    
     def get_refresh() @refresh end
+
+
+  module AjaxResponse
+    
+    def content_type() "application/xml" end
+    
+    def start name='', &block
+      @xml.ul do
+        yield
+      end
+    end
+    
+    def build_menu str, uri, request
+      #build_menu item[:text], item[:uri], request
+      #request.flatten! if request.is_a? Array
+      @xml.li do
+        @xml.a str, :href => join_url('ajax', request, uri), :rel => 'ajax'
+      end
+    end
+    
+    def build_text str
+      @xml.li { @xml.span str }
+    end
+    
+    def build_prompt
+      
+    end
+    
+    def build_image filename, hash=nil
+      @xml.img :src => "/images/#{filename}"
+    end
+    
+    def build_header str
+      @xml.li { @xml.h1 str }
+    end
+    
+    def build_call number, name=number
+      @xml.a name, :href => "javascript:dial(#{number})"
+      @xml.br
+    end
+  end
+
 	
     module PolycomPhone
       
@@ -176,7 +217,7 @@ class MicromenusServlet < WEBrick::HTTPServlet::AbstractServlet
         @xml.br
       end
     end
-    
+
     module XulUi
       
 	    include PolycomPhone
@@ -220,29 +261,122 @@ class MicromenusServlet < WEBrick::HTTPServlet::AbstractServlet
       end
       
     end
-    
-    
-    module FirefoxUi
+    module ModernUi
+      
+      CSSs = %w"carousel columnav microbrowsers"
+      JAVASCRIPTS = %w"yahoo event dom animation connection container dragdrop carousel columnav"
+      INIT = %{
+        try { document.execCommand('BackgroundImageCache', false, true); } catch(e) {}
+        function init() {
+            var cn_cfg = { prevElement: 'columnav-prev', source: document.getElementById('main') };
+            var cn = new YAHOO.extension.ColumNav('columnav', cn_cfg);
+            
+            YAHOO.namespace("example.container");
+            
+            YAHOO.example.container.panel1 = new YAHOO.widget.Panel("unique", { width:"350px", visible:true, draggable:true, close:true } );
+            YAHOO.example.container.panel1.render();
+            
+            /*
+  					YAHOO.example.container.panel2 = new YAHOO.widget.Panel("panel2", { width:"300px", visible:true, draggable:true, close:true } );
+  					YAHOO.example.container.panel2.setHeader("Panel #2 from Script");
+  					YAHOO.example.container.panel2.setBody("This is a dynamically generated Panel.");
+  					YAHOO.example.container.panel2.setFooter("End of Panel #2");
+  					YAHOO.example.container.panel2.render(document.body);
+          	*/
+          	
+          	YAHOO.util.Event.addListener("show1", "click", YAHOO.example.container.panel1.show, YAHOO.example.container.panel1, true);
+          	YAHOO.util.Event.addListener("hide1", "click", YAHOO.example.container.panel1.hide, YAHOO.example.container.panel1, true);
+          	
+          	/*
+          	YAHOO.util.Event.addListener("show2", "click", YAHOO.example.container.panel2.show, YAHOO.example.container.panel2, true);
+          	YAHOO.util.Event.addListener("hide2", "click", YAHOO.example.container.panel2.hide, YAHOO.example.container.panel2, true);
+          	*/
+        }
+        YAHOO.util.Event.addListener(window, 'load', init);
+        
+      }
+      
+      def content_type() "text/html" end
       
-	    include PolycomPhone
-	    
       def start name='', &block
         @xml.html do
           @xml.head do
             @xml.title name
-            @xml.link :rel => 'stylesheet', :media => 'all', :href => '/stylesheets/firefox.css'
+            CSSs.each { |css| @xml.link :rel => 'stylesheet', :type => 'text/css', :href => "/stylesheets/#{css}.css"}
+            
+            JAVASCRIPTS.each { |script| @xml.script :type => 'text/javascript', :src => "/javascripts/#{script}.js" do end }
+            @xml.script INIT, :type => 'text/javascript'
           end
           @xml.body do
-            yield
+            
+            @xml.div :id => "unique", :class => 'microbrowser' do
+              
+              @xml.div :class => "hd" do
+                @xml.div :class => "tl" do
+                  @xml.div :class => 'prevButton' do
+                    @xml.a "Back", :href => "javascript:void(0)", :id => "columnav-prev"
+                  end  
+                end
+                @xml.h1 name
+                @xml.div :class => 'tr' do
+                  @xml.span "Close", :class => "container-close"
+                end
+              end 
+              
+              @xml.div :class => 'bd' do
+                @xml.div :id => 'columnav', :class => "carousel-component" do
+                  @xml.div :class => "carousel-clip-region" do
+                    @xml.ul :class => "carousel-list" do end
+                  end
+                end
+            
+                @xml.ul :id => 'main', :style => 'display:none' do
+                  yield
+                  # @xml << %{
+                  #   <li><a href="/viewaddressbook">View Address book again</a>
+                  #     <ul><li>
+                  #       <a href="http://google.com">Jicksta.com</a>
+                  #     </li></ul></li>
+                  #   <li><a href='#'>Linking to Somewhere</a></li>
+                  #   <li><strong>Not</strong> linking to somewhere</li>
+                  #   }
+                end
+              end
+              
+              @xml.div :class => "ft" do
+                @xml.hr           
+              end
+              
+            end
           end
         end
       end
+      
+      def build_menu str, uri, request
+        #build_menu item[:text], item[:uri], request
+        #request.flatten! if request.is_a? Array
+        @xml.li { @xml.a str, :rel => 'ajax', :href => join_url('ajax', request, uri) }
+      end
+      
+      def build_text str
+        @xml.li { @xml.span str }
+      end
+      
+      def build_prompt
+        
+      end
+      
+      def build_image filename, hash=nil
+        @xml.li { @xml.img :src => "/images/#{filename}" }
+      end
+      
+      def build_header str
+        @xml.li { @xml.h1 str }
+      end
+      
       def build_call number, name=number
-        # The tel:// UI doesn't do Firefox much good. Mexuar, maybe?
-        @xml.a name, :href => "tel://#{number}"
-        @xml.br
+        @xml.li { @xml.a name, :href => "javascript:call(#{number})" }
       end
-
     end
     
 
@@ -253,11 +387,9 @@ class MicromenusServlet < WEBrick::HTTPServlet::AbstractServlet
       name += '.bmp' unless name.index ?.
       @config << {:type => :image, :text => name}
     end
-	
-  	def refresh_every time
+	  def refresh_every time
         @refresh = time
   	end
-
     def heading str
       @config << {:type => :heading, :text => str}
     end
@@ -302,8 +434,7 @@ class MicromenusServlet < WEBrick::HTTPServlet::AbstractServlet
   end
   
   USER_AGENT_MAP = {
-    "Polycom" => MicromenuGenerator::PolycomPhone,
-    "Firefox" => MicromenuGenerator::XulUi#FirefoxUi
+    "Polycom" => MicromenuGenerator::PolycomPhone
   }
   
   def do_GET(request, response)
@@ -311,6 +442,13 @@ class MicromenusServlet < WEBrick::HTTPServlet::AbstractServlet
     log "Request from: " + request['User-Agent']
     
     route = request.path[1..-1].split '/'
+    handler = nil
+    
+    if route.first == 'ajax'
+      handler = MicromenuGenerator::AjaxResponse
+      route.shift
+    end
+    
     if route.first == 'images'
       file = File.join(%w(config helpers micromenus images), route[1..-1])
       # TODO: Handle missing files
@@ -321,17 +459,21 @@ class MicromenusServlet < WEBrick::HTTPServlet::AbstractServlet
       file = File.join %w(config helpers micromenus stylesheets), route[1..-1]
       response.content_type = 'text/css'
       response.body = File.read file
+    elsif route.first == 'javascripts'
+        file = File.join %w(config helpers micromenus javascripts), route[1..-1]
+        response.content_type = 'text/javascript'
+        response.body = File.read file
     else
-      mg = MicromenuGenerator.new request, resolve_brand(request['User-Agent']), StringIO.new
+      mg = MicromenuGenerator.new request, handler || resolve_brand(request['User-Agent']), StringIO.new
       response.content_type = mg.content_type
       response['Expires'] = 2
 
       mg.process route
 
       refresh = mg.get_refresh
-	  response['Refresh'] = refresh if refresh
+  	  response['Refresh'] = refresh if refresh
 
-	  response.body = mg.io.string
+  	  response.body = mg.io.string
     end
   end
   
@@ -339,12 +481,12 @@ class MicromenusServlet < WEBrick::HTTPServlet::AbstractServlet
     USER_AGENT_MAP.each do |k,v|
       return v if useragent.index k
     end
-    MicromenuGenerator::PolycomPhone # Polycom's the default since it's XHTML
+    MicromenuGenerator::ModernUi # Default to Class A browser
   end
 end
 
 $MICROMENUS_SERVER = Thread.new do
-  micromenu_server = WEBrick::HTTPServer.new :Port => ($HELPERS.micromenus.port || 1337)
+  micromenu_server = WEBrick::HTTPServer.new :Port => ($HELPERS['micromenus']['port'] || 1337)
 
   micromenu_server.mount '/', MicromenusServlet
   $HUTDOWN.hook {