adhearsion-drb 1.0.0 → 1.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 4f4baa8f80dc36c1547ba0f0a0e6e407846bd243
+  data.tar.gz: 446db4156541d6eba3beedf3aa4d431e45fc4813
+SHA512:
+  metadata.gz: 028068c753729f5e06861af215c0176ae7543a0034f240f9496a8b4113995a4078f1acb02f2faca6aa8fb378bddf8f825d33eedc7233e9930bc30013b8bf8cbe
+  data.tar.gz: 51aeee02aace6c956c917cf366fc4dbf661296bed9b21af825871aba641547a712e989b813675061f0fc3ca3f825a70b391cca0f3cf8657a53cad2320fad99f7

data/.travis.yml

@@ -0,0 +1,12 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - 2.1.0
+  - jruby-19mode
+  - rbx-2.1.1
+  - ruby-head
+matrix:
+  allow_failures:
+    - rvm: rbx-2.1.1
+    - rvm: ruby-head

data/CHANGELOG.md

@@ -1,2 +1,6 @@
+# 1.1.0
+  * Make the server restart when it goes away
+  * Add travis config
+
 # v1.0.0
   * First release

data/README.md

@@ -1,12 +1,7 @@
-adhearsion-drb
+adhearsion-drb [![Build Status](http://ci.mojolingo.com/job/adhearsion-drb/badge/icon)](http://ci.mojolingo.com/job/adhearsion-drb/)
 =======
 
-adhearsion-drb is an Adhearsion Plugin providing DRb connectivity.
-
-Features
---------
-
-* FIXME (list of features and unsolved problems)
+adhearsion-drb is an Adhearsion Plugin providing DRb connectivity. It allows third party ruby clients to connect to an Adhearsion instance for RPC.
 
 Requirements
 ------------
@@ -29,9 +24,55 @@ Adhearsion.config[:adhearsion_drb] do |config|
   config.port = "DRB service port".to_i
   config.acl.allow = ["127.0.0.1"] # list of allowed IPs (optional)
   config.acl.deny = [] # list of denied IPs (optional)
+  config.shared_object = some_shared_object
+end
+```
+
+The `shared_object` in the config is the endpoint to which a 3rd-party client will be bound on connection. The most basic scenario looks something like this:
+
+```ruby
+class DrbEndpoint
+  def foo
+    :bar
+  end
+end
+
+Adhearsion.config.adhearsion_drb.shared_object = DrbEndpoint.new
+```
+
+with the following client:
+
+```ruby
+require 'drb'
+adhearsion_api = DRbObject.new_with_uri 'druby://localhost:9050'
+p adhearsion_api.foo
+```
+
+When the Adhearsion application is running, and the client script runs, it should print `:foo` to stdout.
+
+A more useful example to return the number of active calls:
+
+```ruby
+class DrbEndpoint
+  def call_count
+    Adhearsion.active_calls.count
+  end
 end
 ```
 
+Or to trigger an outbound call:
+
+```ruby
+class DrbEndpoint
+  def place_call(number, provider)
+    call = Adhearsion::OutboundCall.originate "SIP/#{number}@#{provider}", controller: FooController
+    call.id
+  end
+end
+```
+
+NB: Be careful not to define `#call` on your shared object, else it will be evaluated by the config system incorrectly.
+
 Author
 ------
 

data/adhearsion-drb.gemspec

@@ -19,12 +19,12 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_runtime_dependency "adhearsion", ["~> 2.0"]
-  s.add_runtime_dependency "activesupport", [">= 3.0.10"]
   s.add_runtime_dependency "i18n", ">= 0.5.0"
+  s.add_runtime_dependency "jruby-openssl" if RUBY_PLATFORM == 'java'
 
   s.add_development_dependency "rspec", "~> 2.7.0"
   s.add_development_dependency "flexmock"
   s.add_development_dependency "guard-rspec"
   s.add_development_dependency "rake", ">= 0.9.2"
+  s.add_development_dependency "thor", "~> 0.14.0"
 end
-

data/lib/adhearsion/drb/plugin.rb

@@ -1,3 +1,5 @@
+require 'adhearsion/drb/service'
+
 module Adhearsion
   module Drb
 
@@ -5,10 +7,6 @@ module Adhearsion
     # Adhearsion Plugin definition that defines the DRb configuration options
     # and includes a hook to start the DRb service in Adhearsion initialization process
     class Plugin < Adhearsion::Plugin
-      extend ActiveSupport::Autoload
-
-      autoload :Service
-
       # Default configuration
       config :adhearsion_drb do
         host "localhost", :desc => "DRb service host"

data/lib/adhearsion/drb/service.rb

@@ -0,0 +1,101 @@
+require 'drb'
+require 'drb/acl'
+
+module Adhearsion
+  module Drb
+    class Service
+      include Singleton
+
+      attr_accessor :user_stopped
+
+      def initialize
+        @user_stopped = false
+        acl = create_acl config.acl.allow, config.acl.deny
+        DRb.install_acl ACL.new(acl) unless acl.empty?
+      end
+
+      ##
+      # Start the DRb service
+      def start
+        logger.info "Starting DRb on #{config.host}:#{config.port}"
+        DRb.start_service "druby://#{config.host}:#{config.port}", create_drb_door
+        logger.info "DRB Started on #{DRb.uri}"
+        keep_service_running!
+      end
+
+      ##
+      # Stop the DRb service
+      def stop
+        @user_stopped = true
+        logger.info "Stopping DRb on #{config.host}:#{config.port}"
+        DRb.stop_service
+      end
+
+    private
+
+      ##
+      # Access to Drb plugin configuration
+      def config
+        @config ||= Adhearsion.config[:adhearsion_drb]
+      end
+
+      ##
+      # Creates a plain object and injects the Adhearsion RPC methods configured via plugins
+      # @return [Object]
+      def create_drb_door
+        config[:shared_object]
+      end
+
+      ##
+      # Creates an array that maps the DRb ACL format, that is:
+      # - a set of zero or more allowed IP addresses. Any allowed IP address is preceded by an "allow" element
+      #       ["allow", "127.0.0.1", "allow", "www.adhearsion.com"]
+      # - a set of zero or more allowed IP addresses. Any denied IP address is preceded by an "deny" element
+      #       ["deny", "192.168.2.*", "deny", "192.168.3.*"]
+      #
+      # - All together:
+      #       ["allow", "127.0.0.1", "allow", "www.adhearsion.com", "deny", "192.168.2.*", "deny", "192.168.3.*"]
+      #
+      # @param allow [String, Array] zero or more allowed IPs
+      # @param deny [String, Array] zero or more denied IPs
+      #
+      # @return [Array]
+      def create_acl allow = nil, deny = nil
+        if allow.is_a?(String) && allow.empty?
+          allow = nil
+        end
+        if deny.is_a?(String) && deny.empty?
+          deny = nil
+        end
+
+        allow = Array(allow)
+        deny  = Array(deny)
+        value = String.new
+
+        unless allow.empty? && deny.empty?
+          value.concat("allow ").concat(allow.join(" allow ")) unless allow.empty?
+          value.concat(" ") if !allow.empty? && !deny.empty?
+          value.concat("deny ").concat(deny.join(" deny ")) unless deny.empty?
+        end
+
+        value.split
+      end
+
+      def keep_service_running!
+        Thread.new do
+          DRb.thread.join
+          if user_stopped
+            logger.info "DRb process stopped."
+          else
+            logger.warn "DRb thread finished, restarting..."
+            start
+          end
+        end
+      end
+
+      def self.method_missing(method_name, *args, &block)
+        instance.send method_name, *args, &block
+      end
+    end
+  end
+end

data/lib/adhearsion/drb/version.rb

@@ -1,5 +1,5 @@
 module Adhearsion
   module Drb
-    VERSION = "1.0.0"
+    VERSION = "1.1.0"
   end
 end

data/lib/adhearsion/drb.rb

@@ -1,13 +1,9 @@
 require "adhearsion"
-require "active_support/dependencies/autoload"
-
-require "adhearsion/drb/plugin"
-require "adhearsion/drb/version"
 
 module Adhearsion
   module Drb
-    extend ActiveSupport::Autoload
-
-    autoload :Plugin
   end
 end
+
+require "adhearsion/drb/plugin"
+require "adhearsion/drb/version"

data/spec/adhearsion/drb/plugin_spec.rb

@@ -9,19 +9,19 @@ describe Adhearsion::Drb::Plugin do
       Adhearsion.config.adhearsion_drb.should be_instance_of Loquacious::Configuration
     end
 
-    it "should configure properly the host" do
+    it "should listen on localhost by default" do
       Adhearsion.config.adhearsion_drb.host.should == "localhost"
     end
 
-    it "should configure properly the port" do
+    it "should use the default port of 9050" do
       Adhearsion.config.adhearsion_drb.port.should == 9050
     end
 
-    it "should configure properly the deny access" do
+    it "should default to an empty deny acl" do
       Adhearsion.config.adhearsion_drb.acl.deny.should have(0).hosts
     end
 
-    it "should configure properly the allow access" do
+    it "should default to an allow acl of only 127.0.0.1" do
       subject.adhearsion_drb.acl.allow.should == ["127.0.0.1"]
     end
 
@@ -75,10 +75,12 @@ describe Adhearsion::Drb::Plugin do
 
   describe "while initializing" do
 
+    after { Adhearsion::Drb::Service.stop }
+
     it "should start the service" do
-      Adhearsion::Drb::Plugin::Service.should_receive(:start).and_return true
+      Adhearsion::Drb::Service.user_stopped = false
+      Adhearsion::Drb::Service.should_receive(:start).and_return true
       Adhearsion::Plugin.init_plugins
     end
-
   end
-end
+end

data/spec/adhearsion/drb/{plugin/service_spec.rb → service_spec.rb}

@@ -1,12 +1,16 @@
 require 'spec_helper'
 
-describe Adhearsion::Drb::Plugin::Service do
+describe Adhearsion::Drb::Service do
 
   before :all do
     @host = Adhearsion.config[:adhearsion_drb].host
     @port = Adhearsion.config[:adhearsion_drb].port
     @allow = Adhearsion.config[:adhearsion_drb].acl.allow.dup
     @deny = Adhearsion.config[:adhearsion_drb].acl.deny.dup
+    # Use a random high port to prevent concurrent test runs from getting
+    # Errno::EADDRINUSE
+    # Ruby 1.9.2 version of #rand only allows 1 arg; do some math to keep the range right
+    Adhearsion.config[:adhearsion_drb].port = rand(65535 - 1024) + 1024
   end
 
   after :all do
@@ -19,25 +23,25 @@ describe Adhearsion::Drb::Plugin::Service do
   describe "while creating the acl value" do
 
     it "should return <allow 127.0.0.1> as default value" do
-      Adhearsion::Drb::Plugin::Service.create_acl(Adhearsion.config.adhearsion_drb.acl.allow, Adhearsion.config.adhearsion_drb.acl.deny).should == %w<allow 127.0.0.1>
+      described_class.create_acl(Adhearsion.config.adhearsion_drb.acl.allow, Adhearsion.config.adhearsion_drb.acl.deny).should == %w<allow 127.0.0.1>
     end
 
     it "should return an empty string when no rule is defined" do
       Adhearsion.config.adhearsion_drb.acl.allow = []
       Adhearsion.config.adhearsion_drb.acl.deny = []
-      Adhearsion::Drb::Plugin::Service.create_acl(Adhearsion.config.adhearsion_drb.acl.allow, Adhearsion.config.adhearsion_drb.acl.deny).should == []
+      described_class.create_acl(Adhearsion.config.adhearsion_drb.acl.allow, Adhearsion.config.adhearsion_drb.acl.deny).should == []
     end
 
     it "should return an empty string when allow and deny are nil" do
       Adhearsion.config.adhearsion_drb.acl.allow = nil
       Adhearsion.config.adhearsion_drb.acl.deny = nil
-      Adhearsion::Drb::Plugin::Service.create_acl(Adhearsion.config.adhearsion_drb.acl.allow, Adhearsion.config.adhearsion_drb.acl.deny).should == []
+      described_class.create_acl(Adhearsion.config.adhearsion_drb.acl.allow, Adhearsion.config.adhearsion_drb.acl.deny).should == []
     end
 
     it "should return an empty string when allow and deny are empty" do
       Adhearsion.config.adhearsion_drb.acl.allow = ""
       Adhearsion.config.adhearsion_drb.acl.deny = ""
-      Adhearsion::Drb::Plugin::Service.create_acl(Adhearsion.config.adhearsion_drb.acl.allow, Adhearsion.config.adhearsion_drb.acl.deny).should == []
+      described_class.create_acl(Adhearsion.config.adhearsion_drb.acl.allow, Adhearsion.config.adhearsion_drb.acl.deny).should == []
     end
 
     describe "having configured deny" do
@@ -47,12 +51,12 @@ describe Adhearsion::Drb::Plugin::Service do
 
       it "should return an array with <deny 10.1.*.* deny 10.0.*.*>" do
         Adhearsion.config.adhearsion_drb.acl.deny = %w<10.1.*.* 10.0.*.*>
-        Adhearsion::Drb::Plugin::Service.create_acl(Adhearsion.config.adhearsion_drb.acl.allow, Adhearsion.config.adhearsion_drb.acl.deny).should == %w<deny 10.1.*.* deny 10.0.*.*>
+        described_class.create_acl(Adhearsion.config.adhearsion_drb.acl.allow, Adhearsion.config.adhearsion_drb.acl.deny).should == %w<deny 10.1.*.* deny 10.0.*.*>
       end
 
       it "should return an array with <deny 10.1.*.*>" do
         Adhearsion.config.adhearsion_drb.acl.deny = "10.1.*.*"
-        Adhearsion::Drb::Plugin::Service.create_acl(Adhearsion.config.adhearsion_drb.acl.allow, Adhearsion.config.adhearsion_drb.acl.deny).should == %w<deny 10.1.*.*>
+        described_class.create_acl(Adhearsion.config.adhearsion_drb.acl.allow, Adhearsion.config.adhearsion_drb.acl.deny).should == %w<deny 10.1.*.*>
       end
     end
 
@@ -63,12 +67,12 @@ describe Adhearsion::Drb::Plugin::Service do
 
       it "should return an array with <allow 127.0.0.1 allow 10.0.0.1> when another IP is allowed" do
         Adhearsion.config.adhearsion_drb.acl.allow = %w<127.0.0.1 10.0.0.1>
-        Adhearsion::Drb::Plugin::Service.create_acl(Adhearsion.config.adhearsion_drb.acl.allow, Adhearsion.config.adhearsion_drb.acl.deny).should == %w<allow 127.0.0.1 allow 10.0.0.1>
+        described_class.create_acl(Adhearsion.config.adhearsion_drb.acl.allow, Adhearsion.config.adhearsion_drb.acl.deny).should == %w<allow 127.0.0.1 allow 10.0.0.1>
       end
 
       it "should return an array with <allow 10.0.0.1> when another IP is allowed" do
         Adhearsion.config.adhearsion_drb.acl.allow = "10.0.0.1"
-        Adhearsion::Drb::Plugin::Service.create_acl(Adhearsion.config.adhearsion_drb.acl.allow, Adhearsion.config.adhearsion_drb.acl.deny).should == %w<allow 10.0.0.1>
+        described_class.create_acl(Adhearsion.config.adhearsion_drb.acl.allow, Adhearsion.config.adhearsion_drb.acl.deny).should == %w<allow 10.0.0.1>
       end
     end
 
@@ -77,13 +81,13 @@ describe Adhearsion::Drb::Plugin::Service do
       it "should return an array with <allow 127.0.0.1 allow 10.2.*.* deny 10.1.*.* deny 10.0.*.*>" do
         Adhearsion.config.adhearsion_drb.acl.allow = %w<127.0.0.1 10.2.*.*>
         Adhearsion.config.adhearsion_drb.acl.deny = %w<10.1.*.* 10.0.*.*>
-        Adhearsion::Drb::Plugin::Service.create_acl(Adhearsion.config.adhearsion_drb.acl.allow, Adhearsion.config.adhearsion_drb.acl.deny).should == %w<allow 127.0.0.1 allow 10.2.*.* deny 10.1.*.* deny 10.0.*.*>
+        described_class.create_acl(Adhearsion.config.adhearsion_drb.acl.allow, Adhearsion.config.adhearsion_drb.acl.deny).should == %w<allow 127.0.0.1 allow 10.2.*.* deny 10.1.*.* deny 10.0.*.*>
       end
 
       it "should return an array with <allow 127.0.0.1 deny 10.1.*.*>" do
         Adhearsion.config.adhearsion_drb.acl.allow = "127.0.0.1"
         Adhearsion.config.adhearsion_drb.acl.deny = "10.1.*.*"
-        Adhearsion::Drb::Plugin::Service.create_acl(Adhearsion.config.adhearsion_drb.acl.allow, Adhearsion.config.adhearsion_drb.acl.deny).should == %w<allow 127.0.0.1 deny 10.1.*.*>
+        described_class.create_acl(Adhearsion.config.adhearsion_drb.acl.allow, Adhearsion.config.adhearsion_drb.acl.deny).should == %w<allow 127.0.0.1 deny 10.1.*.*>
       end
     end
   end
@@ -97,22 +101,21 @@ describe Adhearsion::Drb::Plugin::Service do
       def foo
         [3,2,1]
       end
-    end
 
-    let :client do
-      DRbObject.new nil, DRb.uri
+      def halt_drb_directly!
+        DRb.stop_service
+      end
     end
 
-    before do
-      Adhearsion.config.adhearsion_drb.acl.allow = %q<127.0.0.1>
-      Adhearsion.config.adhearsion_drb.acl.deny = nil
+    let(:client) { DRbObject.new nil, DRb.uri }
+
+    before(:all) do
+      Adhearsion.config.adhearsion_drb.acl.allow     = %q<127.0.0.1>
+      Adhearsion.config.adhearsion_drb.acl.deny      = nil
       Adhearsion.config.adhearsion_drb.shared_object = Blah.new
-      
-      Adhearsion::Plugin.init_plugins
-    end
 
-    after do
-      Adhearsion::Drb::Plugin::Service.stop
+      Adhearsion::Drb::Service.user_stopped = false
+      Adhearsion::Drb::Service.start
     end
 
     it "should return normal Ruby data structures properly over DRb" do
@@ -123,6 +126,17 @@ describe Adhearsion::Drb::Plugin::Service do
       lambda { client.interface.bad_interface.should be [3, 2, 1] }.should raise_error NoMethodError
     end
 
-  end
+    it "restarts the server if DRb's thread ends" do
+      client.halt_drb_directly!
+      sleep 2
+      client.foo.should == [3, 2, 1]
+    end
 
+    it "does not start up again if Service.stop is called" do
+      Adhearsion::Drb::Service.should_not_receive :start
+      Adhearsion::Drb::Service.stop
+      sleep 0.10
+      lambda { client.foo }.should raise_error DRb::DRbServerNotFound
+    end
+  end
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adhearsion-drb
 version: !ruby/object:Gem::Version
-  version: 1.0.0
-  prerelease: 
+  version: 1.1.0
 platform: ruby
 authors:
 - juandebravo
@@ -11,12 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-11 00:00:00.000000000 Z
+date: 2014-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: adhearsion
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -24,47 +22,27 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.0.10
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.0.10
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -72,7 +50,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -80,51 +57,59 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: flexmock
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.9.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.9.2
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.14.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.14.0
 description: This gem is an Adhearsion plugin that handles the Drb related stuff
 email:
 - juandebravo@gmail.com
@@ -136,6 +121,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - Guardfile
@@ -146,44 +132,38 @@ files:
 - lib/adhearsion-drb.rb
 - lib/adhearsion/drb.rb
 - lib/adhearsion/drb/plugin.rb
-- lib/adhearsion/drb/plugin/service.rb
+- lib/adhearsion/drb/service.rb
 - lib/adhearsion/drb/version.rb
-- spec/adhearsion/drb/plugin/service_spec.rb
 - spec/adhearsion/drb/plugin_spec.rb
+- spec/adhearsion/drb/service_spec.rb
 - spec/adhearsion/drb_spec.rb
 - spec/spec_helper.rb
 homepage: ''
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1407999279563995289
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1407999279563995289
 requirements: []
 rubyforge_project: adhearsion-drb
-rubygems_version: 1.8.21
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: This gem is an Adhearsion plugin that handles the Drb related stuff
 test_files:
-- spec/adhearsion/drb/plugin/service_spec.rb
 - spec/adhearsion/drb/plugin_spec.rb
+- spec/adhearsion/drb/service_spec.rb
 - spec/adhearsion/drb_spec.rb
 - spec/spec_helper.rb
+has_rdoc: 

data/lib/adhearsion/drb/plugin/service.rb

@@ -1,81 +0,0 @@
-require 'drb'
-require 'drb/acl'
-
-module Adhearsion
-  module Drb
-    class Plugin
-      class Service
-
-        class << self
-
-          ##
-          # Start the DRb service
-          def start
-            acl = create_acl config.acl.allow, config.acl.deny
-
-            DRb.install_acl ACL.new(acl) unless acl.empty?
-
-            logger.info "Starting DRb on #{config.host}:#{config.port}"
-            DRb.start_service "druby://#{config.host}:#{config.port}", create_drb_door
-          end
-
-          ##
-          # Stop the DRb service
-          def stop
-            logger.info "Stopping DRb on #{config.host}:#{config.port}"
-            DRb.stop_service
-          end
-
-          ##
-          # Access to Drb plugin configuration
-          def config
-            @config ||= Adhearsion.config[:adhearsion_drb]
-          end
-
-          ##
-          # Creates a plain object and injects the Adhearsion RPC methods configured via plugins
-          # @return [Object]
-          def create_drb_door
-            config[:shared_object]
-          end
-
-          ##
-          # Creates an array that maps the DRb ACL format, that is:
-          # - a set of zero or more allowed IP addresses. Any allowed IP address is preceded by an "allow" element
-          #       ["allow", "127.0.0.1", "allow", "www.adhearsion.com"]
-          # - a set of zero or more allowed IP addresses. Any denied IP address is preceded by an "deny" element
-          #       ["deny", "192.168.2.*", "deny", "192.168.3.*"]
-          #
-          # - All together:
-          #       ["allow", "127.0.0.1", "allow", "www.adhearsion.com", "deny", "192.168.2.*", "deny", "192.168.3.*"]
-          #
-          # @param allow [String, Array] zero or more allowed IPs
-          # @param deny [String, Array] zero or more denied IPs
-          #
-          # @return [Array]
-          def create_acl allow = nil, deny = nil
-            if allow.is_a?(String) && allow.empty?
-              allow = nil
-            end
-            if deny.is_a?(String) && deny.empty?
-              deny = nil
-            end
-
-            allow = Array(allow)
-            deny  = Array(deny)
-            value = String.new
-
-            unless allow.empty? && deny.empty?
-              value.concat("allow ").concat(allow.join(" allow ")) unless allow.empty?
-              value.concat(" ") if !allow.empty? && !deny.empty?
-              value.concat("deny ").concat(deny.join(" deny ")) unless deny.empty?
-            end
-
-            value.split
-          end
-
-        end
-      end
-    end
-  end
-end