freec 0.2.0 → 0.2.1

data/Rakefile

@@ -1,16 +1,5 @@
 require 'rubygems'
 require 'rake'
-require 'echoe'
-
-Echoe.new('freec', '0.2.0') do |p|
-  p.description    = "Layer between your Ruby voice app and Freeswitch."
-  p.url            = "http://github.com/jankubr/freec"
-  p.author         = "Jan Kubr"
-  p.email          = "hi@jankubr.com"
-  p.ignore_pattern = []
-  p.runtime_dependencies = ['daemons']
-  p.development_dependencies = ['rspec']
-end
 
 desc 'Clean up files.'
 task :clean do |t|
@@ -20,12 +9,12 @@ end
 
 spec = Gem::Specification.new do |s| 
   s.name              = "freec"
-  s.version           = '0.2.0'
+  s.version           = '0.2.1'
   s.author            = "Jan Kubr"
-  s.email             = "hi@jankubr.com"
+  s.email             = "mail@jankubr.com"
   s.homepage          = "http://github.com/jankubr/freec"
   s.platform          = Gem::Platform::RUBY
-  s.summary           = "Layer between your Ruby voice app and Freeswitch."
+  s.summary           = "The layer between your Ruby voice app and FreeSWITCH."
   s.files             = FileList["README*",
                                  "Rakefile",
                                  "{lib,spec}/**/*"].to_a

data/lib/freec.rb

@@ -4,6 +4,7 @@ require "freec_base"
 require 'listener'
 
 require 'fileutils'
+require 'yaml'
 require 'daemons/daemonize'
 include Daemonize
 
@@ -37,7 +38,6 @@ def load_freec_app_config
   else
     @@config = {}
   end
-  @@config['listen_port'] ||= '8084' 
 end
 
 def freec_app_configuration_file
@@ -45,21 +45,20 @@ def freec_app_configuration_file
 end
 
 unless defined?(TEST)
-  at_exit do
-    ROOT = File.expand_path(File.dirname($0))
-    ENVIRONMENT = ARGV[0] == '-d' ? 'production' : 'development'
-    create_freec_app_log_dir
-    load_freec_app_config
-    if ARGV[0] == '-d'
-      puts 'Daemonizing...'
-      daemonize(freec_app_log_file)
-    end
-    open(freec_app_pid_file, "w") {|f| f.write(Process.pid) }
+  ROOT = File.expand_path(File.dirname($0))
+  ENVIRONMENT = ARGV[0] == '-d' ? 'production' : 'development'
+  create_freec_app_log_dir
+  load_freec_app_config
+  if ARGV[0] == '-d'
+    puts 'Daemonizing...'
+    daemonize(freec_app_log_file)
+  end
+  open(freec_app_pid_file, "w") {|f| f.write(Process.pid) }
 
-    server = Listener.new('0.0.0.0', @@config['listen_port'].to_i, freec_app_class_name)
+  at_exit do
+    server = Listener.new(freec_app_class_name, @@config)
     server.audit = true
     server.start
-    puts "Listening on port #{@@config['listen_port']}"
     loop do
       break if server.stopped?
       sleep(1)

data/lib/freec_base.rb

@@ -10,13 +10,14 @@ class Freec
   include FreeswitchApplications
   include CallVariables
   
-  attr_reader :call_vars, :event_body, :log
+  attr_reader :call_vars, :event_body, :log, :config
   
-  def initialize(io, log) #:nodoc:
+  def initialize(io, log, config) #:nodoc:
     @call_vars ||= {}
     @last_app_executed = 'initial_step'
     @io = io    
     @log = log
+    @config = config
   end
         
   def handle_call #:nodoc:

data/lib/listener.rb

@@ -2,17 +2,23 @@ require 'gserver'
 require 'freec_logger'
 
 class Listener < GServer  
-  def initialize(host, port, application_class_name) #:nodoc:
+  DEFAULT_PORT = '8084'
+  DEFAULT_IP = '127.0.0.1'
+  
+  def initialize(application_class_name, config) #:nodoc:
     @application_class_name = application_class_name
     @logger = FreecLogger.new(dev_or_test? ? STDOUT : @@log_file)
     @logger.level = Logger::INFO unless dev_or_test?
-    super(port, host, (1.0/0.0))
+    @config = config
+    host = @config['listen_ip'] || DEFAULT_IP
+    port = @config['listen_port'] || DEFAULT_PORT
+    super(port.to_i, host, (1.0/0.0))
     self.audit = true
     connect_to_database
   end
         
   def serve(io) #:nodoc:
-    app = Kernel.const_get(@application_class_name).new(io, @logger)
+    app = Kernel.const_get(@application_class_name).new(io, @logger, @config)
     app.handle_call
   rescue StandardError => e
     @logger.error e.message

data/spec/event_parser_spec.rb

@@ -5,7 +5,7 @@ describe Freec do
     io = stub(:io)
     log = FreecLogger.new(STDOUT)
     log.level = Logger::FATAL
-    @freec = Freec.new(io, log)
+    @freec = Freec.new(io, log, {})
   end
   
   describe "parses body-less event" do

data/spec/freec_base_spec.rb

@@ -16,9 +16,19 @@ describe Freec do
 
   before do
     @io = stub(:io)
-    log = FreecLogger.new(STDOUT)
-    log.level = Logger::FATAL
-    @freec = Freec.new(@io, log)
+    @log = FreecLogger.new(STDOUT)
+    @log.level = Logger::FATAL
+    @config = {:config1 => 'value'}
+    @freec = Freec.new(@io, @log, @config)
+  end
+  
+  describe "initialization" do
+
+    it "makes log and config available" do
+      @freec.log.should == @log
+      @freec.config.should == @config
+    end
+
   end
 
   describe "call initialization" do

data/spec/freeswitch_applications_spec.rb

@@ -17,7 +17,7 @@ describe Freec do
     io = stub(:io)
     log = FreecLogger.new(STDOUT)
     log.level = Logger::FATAL
-    @freec = Freec.new(io, log)
+    @freec = Freec.new(io, log, {})
   end
 
   describe "executes Freeswitch applications" do

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: freec
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Jan Kubr
@@ -9,62 +14,45 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-26 00:00:00 +01:00
+date: 2010-04-02 00:00:00 +02:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: daemons
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
-description: Layer between your Ruby voice app and Freeswitch.
-email: hi@jankubr.com
+  type: :development
+  version_requirements: *id001
+description: 
+email: mail@jankubr.com
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- lib/call_variables.rb
-- lib/freec.rb
-- lib/listener.rb
-- lib/freec_base.rb
-- lib/freec_logger.rb
-- lib/freeswitch_applications.rb
-- lib/tools.rb
 - README.rdoc
 files: 
+- README.rdoc
+- Rakefile
 - lib/call_variables.rb
 - lib/freec.rb
-- lib/listener.rb
 - lib/freec_base.rb
 - lib/freec_logger.rb
 - lib/freeswitch_applications.rb
+- lib/listener.rb
 - lib/tools.rb
-- Manifest
-- Rakefile
-- README.rdoc
+- spec/data/event.rb
+- spec/data/event_with_body.rb
 - spec/event_parser_spec.rb
 - spec/freec_base_spec.rb
 - spec/freeswitch_applications_spec.rb
 - spec/spec_helper.rb
-- spec/data/event.rb
-- spec/data/event_with_body.rb
-- freec.gemspec
 has_rdoc: true
 homepage: http://github.com/jankubr/freec
 licenses: []
@@ -73,30 +61,28 @@ post_install_message:
 rdoc_options: 
 - --line-numbers
 - --inline-source
-- --title
-- Freec
-- --main
-- README.rdoc
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: "1.2"
-  version: 
-requirements: []
-
+      segments: 
+      - 0
+      version: "0"
+requirements: 
+- daemons
 rubyforge_project: freec
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: Layer between your Ruby voice app and Freeswitch.
+summary: The layer between your Ruby voice app and FreeSWITCH.
 test_files: []
 

data/Manifest

@@ -1,17 +0,0 @@
-lib/call_variables.rb
-lib/freec.rb
-lib/listener.rb
-lib/freec_base.rb
-lib/freec_logger.rb
-lib/freeswitch_applications.rb
-lib/tools.rb
-Manifest
-Rakefile
-README.rdoc
-spec/event_parser_spec.rb
-spec/freec_base_spec.rb
-spec/freeswitch_applications_spec.rb
-spec/spec_helper.rb
-spec/data/event.rb
-spec/data/event_with_body.rb
-

data/freec.gemspec

@@ -1,36 +0,0 @@
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{freec}
-  s.version = "0.2.0"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Jan Kubr"]
-  s.date = %q{2009-10-26}
-  s.description = %q{Layer between your Ruby voice app and Freeswitch.}
-  s.email = %q{hi@jankubr.com}
-  s.extra_rdoc_files = ["lib/call_variables.rb", "lib/freec.rb", "lib/listener.rb", "lib/freec_base.rb", "lib/freec_logger.rb", "lib/freeswitch_applications.rb", "lib/tools.rb", "README.rdoc"]
-  s.files = ["lib/call_variables.rb", "lib/freec.rb", "lib/listener.rb", "lib/freec_base.rb", "lib/freec_logger.rb", "lib/freeswitch_applications.rb", "lib/tools.rb", "Manifest", "Rakefile", "README.rdoc", "spec/event_parser_spec.rb", "spec/freec_base_spec.rb", "spec/freeswitch_applications_spec.rb", "spec/spec_helper.rb", "spec/data/event.rb", "spec/data/event_with_body.rb", "freec.gemspec"]
-  s.homepage = %q{http://github.com/jankubr/freec}
-  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Freec", "--main", "README.rdoc"]
-  s.require_paths = ["lib"]
-  s.rubyforge_project = %q{freec}
-  s.rubygems_version = %q{1.3.5}
-  s.summary = %q{Layer between your Ruby voice app and Freeswitch.}
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<daemons>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, [">= 0"])
-    else
-      s.add_dependency(%q<daemons>, [">= 0"])
-      s.add_dependency(%q<rspec>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<daemons>, [">= 0"])
-    s.add_dependency(%q<rspec>, [">= 0"])
-  end
-end