jicksta-adhearsion 0.7.999 → 0.8.0

data/CHANGELOG

@@ -1,3 +1,6 @@
+0.8.0 rev 2
+ - Added a few non-critical files to the .gemspec. They were ignored
+
 Notes from before 0.8.0:
  - (NOTE: This is obviously not a comprehensive list of pre-0.8.0 work. 0.8.0 was a complete rewrite of the previous version)
  - Adding a deprecation warning about Fixnum#digit and Fixnum#digits

data/adhearsion.gemspec

@@ -11,6 +11,7 @@ ADHEARSION_FILES = %w{
   app_generators/ahn/templates/components/restful_rpc/example-client.rb
   app_generators/ahn/templates/components/restful_rpc/README.markdown
   app_generators/ahn/templates/components/restful_rpc/restful_rpc.rb
+  app_generators/ahn/templates/components/restful_rpc/spec/restful_rpc_spec.rb
   app_generators/ahn/templates/components/simon_game/simon_game.rb
   app_generators/ahn/templates/config/startup.rb
   app_generators/ahn/templates/dialplan.rb
@@ -27,6 +28,7 @@ ADHEARSION_FILES = %w{
   lib/adhearsion.rb
   lib/adhearsion/cli.rb
   lib/adhearsion/component_manager.rb
+  lib/adhearsion/component_manager/component_tester.rb
   lib/adhearsion/component_manager/spec_framework.rb
   lib/adhearsion/events_support.rb
   lib/adhearsion/foundation/all.rb
@@ -109,7 +111,7 @@ ADHEARSION_FILES = %w{
 
 Gem::Specification.new do |s|
   s.name = "adhearsion"
-  s.version = "0.7.999"
+  s.version = "0.8.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jay Phillips"]

data/app_generators/ahn/ahn_generator.rb

@@ -31,11 +31,11 @@ class AhnGenerator < RubiGen::Base
       m.file  *["components/disabled/stomp_gateway/config.yml"]*2
       m.file  *["components/disabled/stomp_gateway/README.markdown"]*2
       
-      m.file  *["components/restful_rpc/restful_rpc.rb"]*2
-      m.file  *["components/restful_rpc/config.yml"]*2
-      m.file  *["components/restful_rpc/README.markdown"]*2
-      m.file  *["components/restful_rpc/example-client.rb"]*2
-      m.file  *["components/restful_rpc/spec/restful_rpc_spec.rb"]*2
+      m.file  *["components/disabled/restful_rpc/restful_rpc.rb"]*2
+      m.file  *["components/disabled/restful_rpc/config.yml"]*2
+      m.file  *["components/disabled/restful_rpc/README.markdown"]*2
+      m.file  *["components/disabled/restful_rpc/example-client.rb"]*2
+      m.file  *["components/disabled/restful_rpc/spec/restful_rpc_spec.rb"]*2
       
       m.file  *["config/startup.rb"]*2
       m.file  *["dialplan.rb"]*2
@@ -81,7 +81,7 @@ EOS
       components/simon_game
       components/disabled/stomp_gateway
       components/ami_remote
-      components/restful_rpc/spec
+      components/disabled/restful_rpc/spec
       config
     )
 end

data/app_generators/ahn/templates/config/startup.rb

@@ -28,9 +28,6 @@ Adhearsion::Configuration.configure do |config|
   config.enable_asterisk
   # config.asterisk.enable_ami :host => "127.0.0.1", :username => "admin", :password => "password", :events => true
   
-  # To change the host IP or port on which the AGI server listens, use this:
-  # config.enable_asterisk :listening_port => 4574, :listening_host => "127.0.0.1"
-  
   # config.enable_drb
   
   # Streamlined Rails integration! The first argument should be a relative or absolute path to 
@@ -50,4 +47,4 @@ Adhearsion::Configuration.configure do |config|
   #                        :host     => 'db.example.org'
 end
 
-Adhearsion::Initializer.start_from_init_file(__FILE__, File.dirname(__FILE__) + "/..")
+Adhearsion::Initializer.start_from_init_file(__FILE__, File.dirname(__FILE__) + "/..")

data/app_generators/ahn/templates/events.rb

@@ -12,7 +12,7 @@
 # Asterisk Manager Interface example:
 #
 # events.asterisk.manager_interface.each do |event|
-#   p event
+#   ahn_log.events event.inspect
 # end
 #
 # This assumes you gave :events => true to the config.asterisk.enable_ami method in config/startup.rb

data/lib/adhearsion/component_manager/component_tester.rb

@@ -0,0 +1,55 @@
+module ComponentTester
+  
+  class << self
+    
+    ##
+    #
+    #
+    # @return [Module] an anonymous module which includes the ComponentTester module.
+    #
+    def new(component_name, component_directory)
+      component_directory = File.expand_path component_directory
+      main_file = component_directory + "/#{component_name}/#{component_name}.rb"
+      
+      component_manager = Adhearsion::Components::ComponentManager.new(component_directory)
+      component_module  = Adhearsion::Components::ComponentManager::ComponentDefinitionContainer.load_file main_file
+      
+      Module.new do
+        
+        extend ComponentTester
+        
+        (class << self; self; end).send(:define_method, :component_manager)   { component_manager   }
+        (class << self; self; end).send(:define_method, :component_name)      { component_name      }
+        (class << self; self; end).send(:define_method, :component_module)    { component_module    }
+        (class << self; self; end).send(:define_method, :component_directory) { component_directory }
+        
+        
+        define_method(:component_manager)   { component_manager   }
+        define_method(:component_name)      { component_name      }
+        define_method(:component_module)    { component_module    }
+        define_method(:component_directory) { component_directory }
+        
+        def self.const_missing(name)
+          component_module.const_get name
+        end
+        
+      end
+    end
+  end
+  
+  def helper_method(name)
+    Object.new.extend(component_module).method(name)
+  end
+  
+  def config
+    component_manager.configuration_for_component_named component_name
+  end
+  
+  def initialize!
+    metadata = component_module.metaclass.send(:instance_variable_get, :@metadata)
+    if metadata && metadata[:initialization_block].kind_of?(Proc)
+      metadata[:initialization_block].call
+    end
+  end
+  
+end

data/lib/adhearsion/version.rb

@@ -1,8 +1,8 @@
 module Adhearsion #:nodoc:
   module VERSION #:nodoc:
-    MAJOR = 0   unless defined? MAJOR
-    MINOR = 7   unless defined? MINOR
-    TINY  = 999 unless defined? TINY
+    MAJOR = 0 unless defined? MAJOR
+    MINOR = 8 unless defined? MINOR
+    TINY  = 0 unless defined? TINY
 
     STRING = [MAJOR, MINOR, TINY].join('.') unless defined? STRING
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jicksta-adhearsion
 version: !ruby/object:Gem::Version 
-  version: 0.7.999
+  version: 0.8.0
 platform: ruby
 authors: 
 - Jay Phillips
@@ -53,6 +53,7 @@ files:
 - app_generators/ahn/templates/components/restful_rpc/example-client.rb
 - app_generators/ahn/templates/components/restful_rpc/README.markdown
 - app_generators/ahn/templates/components/restful_rpc/restful_rpc.rb
+- app_generators/ahn/templates/components/restful_rpc/spec/restful_rpc_spec.rb
 - app_generators/ahn/templates/components/simon_game/simon_game.rb
 - app_generators/ahn/templates/config/startup.rb
 - app_generators/ahn/templates/dialplan.rb
@@ -69,6 +70,7 @@ files:
 - lib/adhearsion.rb
 - lib/adhearsion/cli.rb
 - lib/adhearsion/component_manager.rb
+- lib/adhearsion/component_manager/component_tester.rb
 - lib/adhearsion/component_manager/spec_framework.rb
 - lib/adhearsion/events_support.rb
 - lib/adhearsion/foundation/all.rb

data/app_generators/ahn/templates/components/restful_rpc/README.markdown

@@ -1,11 +0,0 @@
-Adhearsion RESTful RPC Component
-================================
-
-This is a component for people want to integrate their telephony systems with non-Ruby systems. When enabled, this component
-will start up a HTTP server within the Adhearsion process and accept POST requests to invoke Ruby methods shared in the
-`methods_for(:rpc)` context.
-
-Protocol Notes
---------------
-
-When POSTing your data to.

data/app_generators/ahn/templates/components/restful_rpc/config.yml

@@ -1,34 +0,0 @@
-# Use path_nesting to specify an arbitrarily nested. Could be used for additional security or in HTTP reverse proxy server.
-path_nesting: /
-
-port: 5000
-
-# The "handler" option here can be any valid Rack::Handler constant name.
-# Other options: WEBrick, EventedMongrel.
-# If you don't know the differences between these, "Mongrel" is definitely a good choice.
-handler: Mongrel
-
-# In a production system, you should make this "false" since
-show_exceptions: true
-
-# The "authentication" config option can either be "false" or key/value pairs representing allowed usernames and passwords.
-
-#authentication: false
-authentication:
-  jicksta: roflcopterz
-  foo: bar6213671682
-
-access: everyone   # When allowing "everyone" access, no IPs are blocked.
-#access: whitelist # When using a whitelist, the "whitelist" data below will be used.
-#access: blacklist # When using a blacklist, the "blacklist" data below will be used.
-
-# This is a list of IPs which are exclusively allowed to call this web service.
-# Note: whitelists are far more secure than blacklists.
-whitelist:
-  - 127.0.0.1
-  - 192.168.*.*
-
-# This is a list of the IPs which are explicitly NOT allowed to call this web service. This will only be used if "access" is
-# set to "blacklist" above.
-blacklist:
-  - 100.200.100.200

data/app_generators/ahn/templates/components/restful_rpc/example-client.rb

@@ -1,48 +0,0 @@
-require 'rubygems'
-require 'rest_client'
-require 'json'
-
-# You must have the "rest-client" and "json" gems installed for this file to work.
-
-class RESTfulAdhearsion
-  
-  DEFAULT_OPTIONS = {
-    # Note: :user and :password are non-existent by default
-    :host => "localhost",
-    :port => "5000",
-    :path_nesting => "/"
-  }
-  
-  def initialize(options={})
-    @options = DEFAULT_OPTIONS.merge options
-    
-    @path_nesting = @options.delete :path_nesting
-    @host = @options.delete :host
-    @port = @options.delete :port
-    
-    @url_beginning = "http://#{@host}:#{@port}#{@path_nesting}"
-  end
-  
-  def method_missing(method_name, *args)
-    JSON.parse RestClient::Resource.new(@url_beginning + method_name.to_s, @options).post(args.to_json)
-  end
-  
-end
-
-Adhearsion = RESTfulAdhearsion.new :host => "localhost", :port => 5000, :user => "jicksta", :password => "roflcopterz"
-
-# ### Sample component code. Try doing "ahn create component testing123" and pasting this code in.
-#
-# methods_for :rpc do
-#   def i_like_hashes(options={})
-#     options.has_key?(:foo)
-#   end
-#   def i_like_arrays(*args)
-#     args.reverse
-#   end
-# end
-
-# Note: everything returned will be wrapped in an Array
-
-p Adhearsion.i_like_hashes(:foo => "bar")
-p Adhearsion.i_like_arrays(1,2,3,4,5)

data/app_generators/ahn/templates/components/restful_rpc/restful_rpc.rb

@@ -1,87 +0,0 @@
-require 'rack'
-require 'json'
-
-# Don't you love regular expressions? Matches only 0-255 octets. Recognizes "*" as an octet wildcard.
-VALID_IP_ADDRESS = /^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?|\*)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?|\*)$/
-
-def ip_allowed?(ip)
-  raise ArgumentError, "#{ip.inspect} is not a valid IP address!" unless ip.kind_of?(String) && ip =~ VALID_IP_ADDRESS
-  
-  octets = ip.split "."
-  
-  case COMPONENTS.restful_rpc["access"]
-    when "everyone"
-      true
-    when "whitelist"
-      whitelist = COMPONENTS.restful_rpc["whitelist"]
-      !! whitelist.find do |pattern|
-        pattern_octets = pattern.split "."
-        # Traverse both arrays in parallel
-        octets.zip(pattern_octets).map do |octet, octet_pattern|
-          octet_pattern == "*" ? true : (octet == octet_pattern)
-        end == [true, true, true, true]
-      end
-    when "blacklist"
-      blacklist = COMPONENTS.restful_rpc["blacklist"]
-      ! blacklist.find do |pattern|
-        pattern_octets = pattern.split "."
-        # Traverse both arrays in parallel
-        octets.zip(pattern_octets).map do |octet, octet_pattern|
-          octet_pattern == "*" ? true : (octet == octet_pattern)
-        end == [true, true, true, true]
-      end
-    else
-      raise Adhearsion::Components::ConfigurationError, 'Unrecognized "access" configuration value!'
-  end
-end
-
-RESTFUL_API_HANDLER = lambda do |env|
-  json = env["rack.input"].read
-  
-  # Return "Bad Request" HTTP error if the client forgot
-  return [400, {}, "You must POST a valid JSON object!"] if json.blank?
-  
-  json = JSON.parse json
-  
-  nesting = COMPONENTS.restful_rpc["path_nesting"]
-  path = env["PATH_INFO"]
-  
-  return [404, {}, "This resource does not respond to #{path.inspect}"] unless path[0...nesting.size] == nesting
-  
-  path = path[nesting.size..-1]
-  
-  return [404, {"Content-Type" => "application/json"}, "You cannot nest method names!"] if path.include?("/")
-  
-  rpc_object = Adhearsion::Components.component_manager.extend_object_with(Object.new, :rpc)
-  
-  # TODO: set the content-type and other HTTP headers
-  response_object = Array rpc_object.send(path, *json)
-  [200, {"Content-Type" => "application/json"}, response_object.to_json]
-  
-end
-
-initialization do
-  config = COMPONENTS.restful_rpc
-  
-  api = RESTFUL_API_HANDLER
-
-  port            = config["port"] || 5000
-  authentication  = config["authentication"]
-  show_exceptions = config["show_exceptions"]
-  handler         = Rack::Handler.const_get(config["handler"] || "Mongrel")
-  
-  if authentication
-    api = Rack::Auth::Basic.new(api) do |username, password|
-      authentication[username] == password
-    end
-    api.realm = "Adhearsion API"
-  end
-  
-  if show_exceptions
-    api = Rack::ShowStatus.new(Rack::ShowExceptions.new(api))
-  end
-  
-  Thread.new do
-    handler.run api, :Port => port  
-  end
-end