adhearsion 1.0.0 → 1.0.1

data/lib/adhearsion/voip/asterisk/config_generators/config_generator.rb

@@ -11,8 +11,9 @@ module Adhearsion
             # Converts a config file into a Hash of contexts mapping to two dimensional array of pairs
             def create_sanitary_hash_from(config_file_content)
               almost_sanitized = Hash[*config_file_content.
+                split("\n").          # Split the lines into an Array
                 grep(/^\s*[^;\s]/).   # Grep lines that aren't commented out
-                join.                 # Convert them into one String again
+                join("\n").           # Convert them into one String again
                 split(SECTION_TITLE). # Separate them into sections
                 map(&:strip).         # Remove all whitespace
                 reject(&:empty?).     # Get rid of indices that were only whitespace
@@ -98,4 +99,4 @@ module Adhearsion
       end
     end
   end
-end
+end

data/lib/adhearsion/voip/asterisk/config_manager.rb

@@ -40,7 +40,7 @@ module Adhearsion
 
         def read_configuration
           normalized_file = self.class.normalize_configuration execute(read_command)
-          normalized_file.split(/^\[([-_\w]+)\]$/)[1..-1].enum_slice(2).map do |(name,properties)|
+          normalized_file.split(/^\[([-_\w]+)\]$/)[1..-1].each_slice(2).map do |(name,properties)|
             [name, hash_from_properties(properties)]
           end
         end

data/lib/adhearsion/voip/asterisk/manager_interface.rb

@@ -31,7 +31,7 @@ module Adhearsion
 
           CAUSAL_EVENT_NAMES = %w[queuestatus sippeers iaxpeers parkedcalls
                                   dahdishowchannels coreshowchannels dbget
-                                  status konferencelist] unless defined? CAUSAL_EVENT_NAMES
+                                  status agents konferencelist] unless defined? CAUSAL_EVENT_NAMES
 
           RETRY_SLEEP = 5
 
@@ -364,8 +364,8 @@ module Adhearsion
             options = options.clone
             options[:callerid] = options.delete :caller_id if options.has_key? :caller_id
             options[:exten] = options.delete :extension if options.has_key? :extension
-            if options[:variables] && options[:variables].kind_of?(Hash)
-              options[:variable] = options[:variables].map {|pair| pair.join('=')}.join(@coreSettings["ArgumentDelimiter"])
+            if options.has_key?(:variables) && options[:variables].kind_of?(Hash)
+              options[:variable] = options.delete(:variables).map {|pair| pair.join('=')}.join(@coreSettings["ArgumentDelimiter"])
             end
             send_action "Originate", options
           end

data/lib/adhearsion/voip/asterisk/manager_interface/ami_lexer.rb

@@ -40,9 +40,10 @@ module Adhearsion
             @data = ""
             @current_pointer = 0
             @ragel_stack = []
+            @ami_version = 0.0
 
 
-# line 46 "lib/adhearsion/voip/asterisk/manager_interface/ami_lexer.rb"
+# line 47 "lib/adhearsion/voip/asterisk/manager_interface/ami_lexer.rb"
 class << self
 	attr_accessor :_ami_protocol_parser_actions
 	private :_ami_protocol_parser_actions, :_ami_protocol_parser_actions=
@@ -859,7 +860,7 @@ end
 self.ami_protocol_parser_en_response_follows = 268;
 
 
-# line 863 "lib/adhearsion/voip/asterisk/manager_interface/ami_lexer.rb"
+# line 864 "lib/adhearsion/voip/asterisk/manager_interface/ami_lexer.rb"
 begin
 	     @current_pointer ||= 0
 	    @data_ending_pointer ||=   @data.length
@@ -870,7 +871,7 @@ begin
 	   @ragel_act = 0
 end
 
-# line 98 "lib/adhearsion/voip/asterisk/manager_interface/ami_lexer.rl.rb"
+# line 99 "lib/adhearsion/voip/asterisk/manager_interface/ami_lexer.rl.rb"
 ##
 
           end
@@ -882,7 +883,7 @@ end
 
           def resume!
 
-# line 886 "lib/adhearsion/voip/asterisk/manager_interface/ami_lexer.rb"
+# line 887 "lib/adhearsion/voip/asterisk/manager_interface/ami_lexer.rb"
 begin
 	_klen, _trans, _keys, _acts, _nacts = nil
 	_goto_level = 0
@@ -916,7 +917,7 @@ begin
 		begin
     @token_start =      @current_pointer
 		end
-# line 920 "lib/adhearsion/voip/asterisk/manager_interface/ami_lexer.rb"
+# line 921 "lib/adhearsion/voip/asterisk/manager_interface/ami_lexer.rb"
 		end # from state action switch
 	end
 	if _trigger_goto
@@ -936,9 +937,9 @@ begin
 	        break if _upper < _lower
 	        _mid = _lower + ( (_upper - _lower) >> 1 )
 
-	        if   @data[     @current_pointer] < _ami_protocol_parser_trans_keys[_mid]
+	        if   @data[     @current_pointer].ord < _ami_protocol_parser_trans_keys[_mid]
 	           _upper = _mid - 1
-	        elsif   @data[     @current_pointer] > _ami_protocol_parser_trans_keys[_mid]
+	        elsif   @data[     @current_pointer].ord > _ami_protocol_parser_trans_keys[_mid]
 	           _lower = _mid + 1
 	        else
 	           _trans += (_mid - _keys)
@@ -957,9 +958,9 @@ begin
 	     loop do
 	        break if _upper < _lower
 	        _mid = _lower + (((_upper-_lower) >> 1) & ~1)
-	        if   @data[     @current_pointer] < _ami_protocol_parser_trans_keys[_mid]
+	        if   @data[     @current_pointer].ord < _ami_protocol_parser_trans_keys[_mid]
 	          _upper = _mid - 2
-	        elsif   @data[     @current_pointer] > _ami_protocol_parser_trans_keys[_mid+1]
+	        elsif   @data[     @current_pointer].ord > _ami_protocol_parser_trans_keys[_mid+1]
 	          _lower = _mid + 2
 	        else
 	          _trans += ((_mid - _keys) >> 1)
@@ -1388,7 +1389,7 @@ end
 end
 end
 			end
-# line 1392 "lib/adhearsion/voip/asterisk/manager_interface/ami_lexer.rb"
+# line 1393 "lib/adhearsion/voip/asterisk/manager_interface/ami_lexer.rb"
 			end # action switch
 		end
 	end
@@ -1413,7 +1414,7 @@ when 29 then
 		begin
    @ragel_act = 0
 		end
-# line 1417 "lib/adhearsion/voip/asterisk/manager_interface/ami_lexer.rb"
+# line 1418 "lib/adhearsion/voip/asterisk/manager_interface/ami_lexer.rb"
 		end # to state action switch
 	end
 	if _trigger_goto
@@ -1444,7 +1445,7 @@ end
 	end
 	end
 
-# line 108 "lib/adhearsion/voip/asterisk/manager_interface/ami_lexer.rl.rb"
+# line 109 "lib/adhearsion/voip/asterisk/manager_interface/ami_lexer.rl.rb"
 ##
           end
 

data/lib/adhearsion/voip/asterisk/manager_interface/ami_lexer.rl.rb

@@ -77,6 +77,7 @@ module Adhearsion
             @data = ""
             @current_pointer = 0
             @ragel_stack = []
+            @ami_version = 0.0
 
             %%{
               # All other variables become local, letting Ruby garbage collect them. This

data/lib/adhearsion/voip/call.rb

@@ -293,6 +293,7 @@ module Adhearsion
 
       def define_singleton_accessor_with_pair(key, value, recipient=self)
         recipient.metaclass.send :attr_accessor, key unless recipient.class.respond_to?("#{key}=")
+        recipient.metaclass.send :public, key, "#{key}=".to_sym
         recipient.send "#{key}=", value
       end
 
@@ -456,7 +457,7 @@ module Adhearsion
           end
 
           def separate_line_into_key_value_pair(line)
-            line.match(/^([^:]+):\s?(.+)/).captures
+            line.match(/^([^:]+):(?:\s?(.+)|$)/).captures
           end
         end
 

data/lib/adhearsion/voip/dial_plan.rb

@@ -15,7 +15,11 @@ begin
     puts "https://adhearsion.lighthouseapp.com/projects/5871/tickets/92-menu-method-under-jruby-does-not-appear-to-work"
     puts "****************************************************************************"
   end
-rescue NameError # In case JRUBY_VERSION is not defined.
+rescue NameError
+  # In case JRUBY_VERSION is not defined.
+rescue ArgumentError
+  # Needed to handle ActiveSupport's handling of missing constants
+  # with anonymous modules under Ruby 1.9
 end
 
 module Adhearsion

data/lib/adhearsion/voip/dsl/dialplan/parser.rb

@@ -45,8 +45,8 @@ module Adhearsion
 
         class ContextsEnvelope
 
-          keep = %w"define_method instance_eval meta_def meta_eval metaclass"
-          (instance_methods - keep).each { |m| undef_method m unless m =~ /^__/ }
+          keep = [:define_method, :instance_eval, :meta_def, :meta_eval, :metaclass, :methods, :object_id]
+          (instance_methods.map{|m| m.to_sym} - keep).each { |m| undef_method m unless m.to_s =~ /^__/ }
 
           def initialize
             @parsed_contexts = {}

data/lib/adhearsion/voip/dsl/numerical_string.rb

@@ -19,7 +19,7 @@ module Adhearsion
           end
         end
 
-        (instance_methods - %w{instance_eval object_id}).each { |m| undef_method m unless m =~ /^__/ }
+        (instance_methods.map{|m| m.to_sym} - [:instance_eval, :object_id, :class]).each { |m| undef_method m unless m.to_s =~ /^__/ }
 
         attr_reader :__real_num, :__real_string
 
@@ -36,6 +36,19 @@ module Adhearsion
           @__real_string.respond_to?(m) || m == :__real_num || m == :__real_string
         end
 
+        def ==(x)
+          return x.is_a?(Fixnum) ? x == @__real_num : x == @__real_string
+        end
+        alias :=== :==
+
+        def is_a?(obj)
+          case obj.to_s
+          when "Fixnum" then true
+          when "String" then true
+          end
+        end
+        alias :kind_of? :is_a?
+
       end
 
       # The PhoneNumber class is used by one object throughout Adhearsion: the AGI
@@ -74,7 +87,7 @@ end
 # These monkey patches are necessary for the NumericalString to work, unfortunately.
 class Class
   def alias_method_once(new_name, old_name)
-    unless instance_methods.include?(new_name.to_s)
+    unless instance_methods.map{|m| m.to_sym}.include?(new_name.to_sym)
       alias_method(new_name, old_name)
     end
   end
@@ -112,4 +125,4 @@ class << String
   def ===(arg)
     arg.respond_to?(:__real_string) || original_threequal(arg)
   end
-end
+end

data/lib/adhearsion/voip/freeswitch/basic_connection_manager.rb

@@ -33,7 +33,7 @@ module Adhearsion
         end
 
         def separate_pairs(lines)
-          lines.inject({}) do |h,line|
+          lines.split("\n").inject({}) do |h,line|
             h.tap do |hash|
               k,v = line.split(/\s*:\s*/)
               hash[k] = URI.unescape(v).strip if k && v

data/lib/adhearsion/voip/menu_state_machine/menu_builder.rb

@@ -10,7 +10,6 @@ module Adhearsion
       end
 
       def method_missing(match_payload, *patterns, &block)
-        name_string = match_payload.to_s
         if patterns.any?
           patterns.each do |pattern|
             @patterns << MatchCalculator.build_with_pattern(pattern, match_payload)

data/lib/theatre/callback_definition_loader.rb

@@ -61,7 +61,7 @@ module Theatre
 
     class BlankSlateMessageRecorder
 
-      (instance_methods - %w{instance_eval object_id}).each { |method| undef_method method unless method =~ /^__/ }
+      (instance_methods.map{|m| m.to_sym} - [:instance_eval, :object_id]).each { |method| undef_method method unless method.to_s =~ /^__/ }
 
       def initialize(&notify_on_completion)
         @notify_on_completion = notify_on_completion
@@ -81,4 +81,4 @@ module Theatre
     end
 
   end
-end
+end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: adhearsion
 version: !ruby/object:Gem::Version 
-  hash: 23
   prerelease: false
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Jay Phillips
@@ -17,115 +16,138 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-28 00:00:00 -04:00
+date: 2011-02-22 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: log4r
+  name: bundler
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 29
         segments: 
         - 1
         - 0
-        - 5
-        version: 1.0.5
+        - 10
+        version: 1.0.10
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: activesupport
+  name: log4r
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
         segments: 
-        - 2
         - 1
         - 0
-        version: 2.1.0
+        - 5
+        version: 1.0.5
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rubigen
+  name: activesupport
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
         segments: 
+        - 2
         - 1
         - 0
-        - 6
-        version: 1.0.6
-  type: :development
+        version: 2.1.0
+  type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: i18n
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - <
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
         segments: 
-        - 2
-        - 0
         - 0
-        version: 2.0.0
-  type: :development
+        version: "0"
+  type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: test-unit
+  name: rubigen
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
+        - 1
+        - 5
+        - 6
+        version: 1.5.6
+  type: :runtime
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: rubigen
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 5
+        - 6
+        version: 1.5.6
+  type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 4
         - 0
-        version: "0"
+        version: 2.4.0
   type: :development
-  version_requirements: *id005
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: flexmock
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
-  version_requirements: *id006
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: active_record
+  name: activerecord
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
-  version_requirements: *id007
+  version_requirements: *id009
 description: Adhearsion is an open-source telephony development framework
 email: dev&Adhearsion.com
 executables: 
@@ -160,6 +182,7 @@ files:
 - app_generators/ahn/templates/dialplan.rb
 - app_generators/ahn/templates/events.rb
 - app_generators/ahn/templates/Rakefile
+- app_generators/ahn/templates/Gemfile
 - app_generators/ahn/templates/README
 - app_generators/ahn/USAGE
 - bin/ahn
@@ -252,11 +275,12 @@ files:
 - lib/theatre/version.rb
 - LICENSE
 - Rakefile
+- Gemfile
 has_rdoc: true
 homepage: http://adhearsion.com
 licenses: []
 
-post_install_message: "    *******************************************************************\n    * NOTE: You must manually install the \"rubigen\" gem to create     *\n    * new Adhearsion applications.                                    *\n    *                                                                 *\n    * The Rubigen package is no longer automatically installed due to *\n    * dependency conflicts with ActiveSupport 3.0.                    *\n    * Users of existing Adhearsion applications can safely ignore     *\n    * this message.                                                   *\n    *******************************************************************\n"
+post_install_message: 
 rdoc_options: []
 
 require_paths: 
@@ -266,7 +290,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -275,7 +298,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"