adhearsion-asterisk 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2ddea2b59a1c227882eb159bdeb1390c1552c5e
-  data.tar.gz: 497f36c31c93b5c6140035795daeca42574f2536
+  metadata.gz: fad46f1b884dc030a946704f0c3c498afad3b7cd
+  data.tar.gz: b954e46179755d1b3cd583f0636fde91cc639066
 SHA512:
-  metadata.gz: 52e1ec5a20d253ab8e4d6bd50833b7dd2a5d59f86954aaa6a7c90b14fdece3109bc29bb1a4ede0d3e5df117a072faacd27f53f0897b2e7a7762ae022fc332b1e
-  data.tar.gz: 180b16a0260acd5bbdfc14ae77e03eb9af6eddff1d49ce7d3350fdbdad6d3b23df1b6e8a5afaa0a07e76936130869afc96155be971f626fa37758786689ed92c
+  metadata.gz: 15a1a3cf39c15181f02cc664b9d7ace9744bbda587686b61519e8d69a62e0e69c1d1c2bf7d1779f90918b6ffc6406c3c3115ee5ef866469043afdd8a02a63d43
+  data.tar.gz: e99a00e50859a3aeb92082ba1bba6ebf0c448fb4f6a97fb70a78cf0cf3bca68635d6fbfbd6b5094597ae8fdad68484f8a66da7ac069f73960e93b9ab85a678bc

data/.travis.yml

@@ -2,8 +2,12 @@ language: ruby
 rvm:
   - 1.9.2
   - 1.9.3
-  - jruby-19mode # JRuby in 1.9 mode
-  - rbx-19mode # currently in active development, may or may not work for your project
+  - jruby-19mode
+  - rbx-19mode
   - ruby-head
+matrix:
+  allow_failures:
+    - rvm: rbx-19mode
+    - rvm: ruby-head
 notifications:
   irc: "irc.freenode.org#adhearsion"

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # develop
 
+# v1.5.1
+  * Remove dependency on activesupport
+
 # v1.5.0
   * Feature: Add `#say_characters`, which uses `SayDigits` to override adhearsion's built in SSML-generating method
 

data/Gemfile

@@ -1,4 +1,3 @@
 source "http://rubygems.org"
 
-# Specify your gem's dependencies in ahn-asterisk.gemspec
 gemspec

data/Guardfile

@@ -1,4 +1,4 @@
-guard 'rspec', :version => 2, :cli => '--format documentation' do
+guard 'rspec', cmd: 'rspec --format documentation' do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')  { "spec/" }

data/adhearsion-asterisk.gemspec

@@ -19,7 +19,6 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_runtime_dependency %q<adhearsion>, ["~> 2.0"]
-  s.add_runtime_dependency %q<activesupport>, ["~> 3.0"]
   s.add_runtime_dependency %q<jruby-openssl> if RUBY_PLATFORM == 'java'
 
   s.add_development_dependency %q<bundler>, ["~> 1.0"]

data/lib/adhearsion/asterisk.rb

@@ -1,5 +1,4 @@
 require 'adhearsion'
-require 'active_support/dependencies/autoload'
 require 'adhearsion/asterisk/version'
 require 'adhearsion/asterisk/call_controller_methods'
 require 'adhearsion/asterisk/has_agi_context'
@@ -7,10 +6,6 @@ require 'adhearsion/asterisk/plugin'
 
 module Adhearsion
   module Asterisk
-    extend ActiveSupport::Autoload
-
-    autoload :QueueProxy
-
     #
     # Execute an AMI action synchronously
     #

data/lib/adhearsion/asterisk/call_controller_methods.rb

@@ -1,3 +1,5 @@
+require 'adhearsion/asterisk/queue_proxy'
+
 module Adhearsion
   module Asterisk
     PLAYBACK_SUCCESS = 'SUCCESS' unless defined? PLAYBACK_SUCCESS

data/lib/adhearsion/asterisk/config_generator.rb

@@ -1,11 +1,10 @@
+require 'adhearsion/asterisk/config_generator/agents'
+require 'adhearsion/asterisk/config_generator/queues'
+require 'adhearsion/asterisk/config_generator/voicemail'
+
 module Adhearsion
   module Asterisk
     class ConfigGenerator
-      extend ActiveSupport::Autoload
-
-      autoload :Agents
-      autoload :Queues
-      autoload :Voicemail
 
       SECTION_TITLE = /(\[[\w_-]+\])/
 

data/lib/adhearsion/asterisk/queue_proxy.rb

@@ -1,12 +1,10 @@
+require 'adhearsion/asterisk/queue_proxy/agent_proxy'
+require 'adhearsion/asterisk/queue_proxy/queue_agents_list_proxy'
+
 module Adhearsion
   module Asterisk
     class QueueProxy
 
-      extend ActiveSupport::Autoload
-
-      autoload :AgentProxy
-      autoload :QueueAgentsListProxy
-
       class << self
         def format_join_hash_key_arguments(options)
           bad_argument = lambda do |(key, value)|

data/lib/adhearsion/asterisk/version.rb

@@ -1,5 +1,5 @@
 module Adhearsion
   module Asterisk
-    VERSION = "1.5.0"
+    VERSION = "1.5.1"
   end
 end

data/spec/adhearsion/asterisk/call_controller_methods_spec.rb

@@ -4,7 +4,7 @@ module Adhearsion::Asterisk
   describe CallControllerMethods do
     describe "mixed in to a CallController" do
 
-      let(:call) { mock('Call') }
+      let(:call) { double('Call') }
 
       subject { Adhearsion::CallController.new call }
 

data/spec/adhearsion/asterisk/config_generators/agents_spec.rb

@@ -244,12 +244,12 @@ describe "AgentsConfigGeneratorTestHelper" do
   end
 
   it "generated_config_has_pair() works properly with one pair" do
-    @agents = mock "A fake agents with just one pair", :conf => "foo=bar"
+    @agents = double "A fake agents with just one pair", :conf => "foo=bar"
     generated_config_has_pair(:foo => "bar").should be true
   end
 
   it "generated_config_has_pair() works properly with two pairs" do
-    @agents = mock "A fake agents with just one pair"
+    @agents = double "A fake agents with just one pair"
     @agents.should_receive(:conf).twice.and_return("[general]\n\nqaz=qwerty\nagent => 1,2,3")
 
     generated_config_has_pair(:qaz => "qwerty").should be true

data/spec/adhearsion/asterisk/config_generators/queues_spec.rb

@@ -134,7 +134,7 @@ describe "The private, helper methods in QueueDefinition" do
   end
 
   it '#boolean should convert a boolean into "yes" or "no"' do
-    mock_of_properties = mock "mock of the properties instance variable of a QueueDefinition"
+    mock_of_properties = double "mock of the properties instance variable of a QueueDefinition"
     mock_of_properties.should_receive(:[]=).once.with("icanhascheezburger", "yes")
     queue.should_receive(:properties).and_return mock_of_properties
     queue.send(:boolean, "icanhascheezburger" => true)
@@ -147,38 +147,38 @@ describe "The private, helper methods in QueueDefinition" do
   end
 
   it '#int should coerce a String into a Numeric if possible' do
-    mock_of_properties = mock "mock of the properties instance variable of a QueueDefinition"
+    mock_of_properties = double "mock of the properties instance variable of a QueueDefinition"
     mock_of_properties.should_receive(:[]=).once.with("chimpanzee", 1337)
     queue.should_receive(:properties).and_return mock_of_properties
     queue.send(:int, "chimpanzee" => "1337")
   end
 
   it '#string should add the argument directly to the properties' do
-    mock_of_properties = mock "mock of the properties instance variable of a QueueDefinition"
+    mock_of_properties = double "mock of the properties instance variable of a QueueDefinition"
     mock_of_properties.should_receive(:[]=).once.with("eins", "zwei")
     queue.should_receive(:properties).and_return mock_of_properties
     queue.send(:string, "eins" => "zwei")
   end
 
   it '#one_of() should add its successful match to the properties attribute' do
-    mock_properties = mock "mock of the properties instance variable of a QueueDefinition"
+    mock_properties = double "mock of the properties instance variable of a QueueDefinition"
     mock_properties.should_receive(:[]=).once.with(:doesnt_matter, 5)
     queue.should_receive(:properties).once.and_return mock_properties
     queue.send(:one_of, 1..100, :doesnt_matter => 5)
   end
 
   it "one_of() should convert booleans to yes/no" do
-    mock_properties = mock "mock of the properties instance variable of a QueueDefinition"
+    mock_properties = double "mock of the properties instance variable of a QueueDefinition"
     mock_properties.should_receive(:[]=).once.with(:doesnt_matter, 'yes')
     queue.should_receive(:properties).once.and_return mock_properties
     queue.send(:one_of, [true, false, :strict], :doesnt_matter => true)
 
-    mock_properties = mock "mock of the properties instance variable of a QueueDefinition"
+    mock_properties = double "mock of the properties instance variable of a QueueDefinition"
     mock_properties.should_receive(:[]=).once.with(:doesnt_matter, :strict)
     queue.should_receive(:properties).once.and_return mock_properties
     queue.send(:one_of, [true, false, :strict], :doesnt_matter => :strict)
 
-    mock_properties = mock "mock of the properties instance variable of a QueueDefinition"
+    mock_properties = double "mock of the properties instance variable of a QueueDefinition"
     mock_properties.should_receive(:[]=).once.with(:doesnt_matter, 'no')
     queue.should_receive(:properties).once.and_return mock_properties
     queue.send(:one_of, [true, false, :strict], :doesnt_matter => false)
@@ -311,10 +311,10 @@ describe "ConfigGeneratorTestHelper" do
   attr_reader :queues
 
   it "generated_config_has_pair() works properly" do
-    @queues = mock "A fake queues with just one pair", :to_s => "foo=bar"
+    @queues = double "A fake queues with just one pair", :to_s => "foo=bar"
     generated_config_has_pair(:foo => "bar").should be true
 
-    @queues = mock "A fake queues with just one pair"
+    @queues = double "A fake queues with just one pair"
     @queues.should_receive(:to_s).twice.and_return("[general]\n\nqaz=qwerty\nagent => 1,2,3")
     generated_config_has_pair(:qaz => "qwerty").should be true
     generated_config_has_pair(:foo => "bar").should be false

data/spec/adhearsion/asterisk/config_generators/voicemail_spec.rb

@@ -76,7 +76,7 @@ describe 'Defining email-related Voicemail settings' do
   it 'the body must not be allowed to exceed 512 characters' do
     the_following_code {
       email.body "X" * 512
-    }.should_not raise_error ArgumentError
+    }.should_not raise_error
 
     the_following_code {
       email.body "X" * 513

data/spec/adhearsion/asterisk/plugin_spec.rb

@@ -4,7 +4,7 @@ module Adhearsion::Asterisk
   describe 'plugin loading' do
     before(:all) { Adhearsion::Plugin.init_plugins }
 
-    let(:mock_call) { mock(:call).as_null_object }
+    let(:mock_call) { double(:call).as_null_object }
 
     it 'should extend Adhearsion::CallController with Asterisk methods' do
       Adhearsion::CallController.new(mock_call).should respond_to :play_time

data/spec/adhearsion/asterisk/queue_proxy/agent_proxy_spec.rb

@@ -4,8 +4,8 @@ module Adhearsion::Asterisk
   class QueueProxy
     describe AgentProxy do
       let(:queue_name)  { 'foobar' }
-      let(:mock_ee)     { mock 'Adhearsion::DialPlan::ExecutionEnvironment' }
-      let(:mock_queue)  { mock('QueueProxy', :environment => mock_ee, :name => queue_name).as_null_object }
+      let(:mock_ee)     { double 'Adhearsion::DialPlan::ExecutionEnvironment' }
+      let(:mock_queue)  { double('QueueProxy', :environment => mock_ee, :name => queue_name).as_null_object }
 
       let(:agent_id) { 123 }
 

data/spec/adhearsion/asterisk/queue_proxy/queue_agents_list_proxy_spec.rb

@@ -5,8 +5,8 @@ module Adhearsion::Asterisk
     describe QueueAgentsListProxy do
       let(:queue_name)    { 'foobar' }
       let(:agent_channel) { "Agent/123" }
-      let(:mock_ee)       { mock 'Adhearsion::DialPlan::ExecutionEnvironment' }
-      let(:mock_queue)    { mock('QueueProxy', :environment => mock_ee, :name => queue_name).as_null_object }
+      let(:mock_ee)       { double 'Adhearsion::DialPlan::ExecutionEnvironment' }
+      let(:mock_queue)    { double('QueueProxy', :environment => mock_ee, :name => queue_name).as_null_object }
 
       subject { QueueAgentsListProxy.new mock_queue, true }
 

data/spec/adhearsion/asterisk/queue_proxy_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 module Adhearsion::Asterisk
   describe QueueProxy do
     let(:queue_name)  { 'foobar' }
-    let(:mock_ee)     { mock 'Adhearsion::DialPlan::ExecutionEnvironment' }
+    let(:mock_ee)     { double 'Adhearsion::DialPlan::ExecutionEnvironment' }
 
     subject { QueueProxy.new queue_name, mock_ee }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adhearsion-asterisk
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Ben Langfeld
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-28 00:00:00.000000000 Z
+date: 2013-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: adhearsion
@@ -26,20 +26,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -232,7 +218,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: adhearsion-asterisk
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Asterisk specific features for Adhearsion