punchblock 2.3.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a847554d66bf45ee14cc93803271b60890cfff96
-  data.tar.gz: 43d698af41a3b374c3b39bacdf29dbce822020bc
+  metadata.gz: 9e6afe18610ec58e92290615347d829d84df0f35
+  data.tar.gz: 67ab1a85edc0cb9603f47739e661a6cd5f13492e
 SHA512:
-  metadata.gz: 6c9373c2cb2e3831e1938924197c8c141fda152423a4f985e9f3c84c38f099185cdeaeed8275f8e111c2d9f77dd39c4caad635b9031fe63786b09eb3fb53d6df
-  data.tar.gz: 6474dd87f25053eb002212c18744f2c216cc153c4d9df1b7938f4e45faa224988b6f5ff296b4729bbd0c538887e43897aac1c9fff83f3eccc995fc726793a313
+  metadata.gz: 204717279e74f4f6c892c2a832e2e81ac947473011e2249a7b5fc3cf7847dc133ea3eb7dccf61523898a9c79ef3e913f96562414b48477c2e668d52b67b9b17e
+  data.tar.gz: a7465ef83df1050746b6eb1c6e47b04ca8d9f68fdf29a51ebc96958940e69b868410a9459535b6e961c4206277764f0fe9bc9cfa903fb7c3dc68f1934cf40c76

data/.travis.yml

@@ -1,15 +1,13 @@
 language: ruby
 rvm:
-  - 1.9.2
   - 1.9.3
   - 2.0.0
   - 2.1.0
-  - jruby-19mode
+  - jruby
   - rbx-2.1.1
   - ruby-head
 matrix:
   allow_failures:
-    - rvm: 1.9.2
     - rvm: ruby-head
     - rvm: rbx-2.1.1
 notifications:

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # [develop](https://github.com/adhearsion/punchblock)
 
+# [v2.3.1](https://github.com/adhearsion/punchblock/compare/v2.3.0...v2.3.1) - [2014-02-13](https://rubygems.org/gems/punchblock/versions/2.3.1)
+  * Bugfix: Ensure commands can be associated on the wire even before they're executed
+  * Bugfix: Ensure a command is always transitioned to is requested state prior to receiving a response
+
 # [v2.3.0](https://github.com/adhearsion/punchblock/compare/v2.2.2...v2.3.0) - [2014-01-30](https://rubygems.org/gems/punchblock/versions/2.3.0)
   * Feature: Add input-timers-started event
   * Feature: Allow client to send XMPP messages through Blather

data/Gemfile

@@ -2,4 +2,3 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'bluecloth' unless RUBY_PLATFORM =~ /java/
-gem 'activesupport', '~> 3.0' if RUBY_VERSION == "1.9.2"

data/lib/punchblock/command_node.rb

@@ -4,6 +4,8 @@ require 'state_machine'
 module Punchblock
   class CommandNode < RayoNode
 
+    attribute :request_id, String, default: ->(*) { Punchblock.new_request_id }
+
     def initialize(*args)
       super
       @response = FutureResource.new
@@ -31,6 +33,9 @@ module Punchblock
       return if @response.set_yet?
       @response.resource = other
       execute!
+    rescue StateMachine::InvalidTransition => e
+      e.message << " for command #{self}"
+      raise e
     rescue FutureResource::ResourceAlreadySetException
     end
   end # CommandNode

data/lib/punchblock/component/component_node.rb

@@ -53,6 +53,9 @@ module Punchblock
         client.delete_component_registration self if client
         complete!
         @complete_event_resource.resource = other
+      rescue StateMachine::InvalidTransition => e
+        e.message << " for component #{self}"
+        raise e
       end
 
       ##

data/lib/punchblock/connection/xmpp.rb

@@ -45,6 +45,7 @@ module Punchblock
 
       def write(command, options = {})
         iq = prep_command_for_execution command, options
+        command.request!
         client.write_with_handler iq do |response|
           if response.result?
             handle_iq_result response, command
@@ -52,7 +53,6 @@ module Punchblock
             handle_error response, command
           end
         end
-        command.request!
       end
 
       def prep_command_for_execution(command, options = {})
@@ -64,7 +64,7 @@ module Punchblock
         if command.is_a?(Command::Join) && command.mixer_name
           @joined_mixers << command.mixer_name
         end
-        create_iq(jid_for_command(command)).tap do |iq|
+        create_iq(jid_for_command(command), command.request_id).tap do |iq|
           command.to_rayo(iq)
         end
       end
@@ -183,8 +183,8 @@ module Punchblock
         end
       end
 
-      def create_iq(jid = nil)
-        Blather::Stanza::Iq.new :set, jid || @call_id
+      def create_iq(jid, id)
+        Blather::Stanza::Iq.new :set, jid, id
       end
     end
   end

data/lib/punchblock/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Punchblock
-  VERSION = "2.3.0"
+  VERSION = "2.3.1"
 end

data/lib/punchblock.rb

@@ -61,6 +61,10 @@ module Punchblock
       SecureRandom.uuid
     end
 
+    def new_request_id
+      new_uuid
+    end
+
     def jruby?
       @jruby ||= !!(RUBY_PLATFORM =~ /java/)
     end

data/punchblock.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new(">= 1.3.7") if s.respond_to? :required_rubygems_version=
 
   s.add_runtime_dependency %q<nokogiri>, ["~> 1.5", ">= 1.5.6"]
-  s.add_runtime_dependency %q<blather>, [">= 0.7.0"]
+  s.add_runtime_dependency %q<blather>, ["~> 1.0"]
   s.add_runtime_dependency %q<activesupport>, [">= 3.0.0", "< 5.0.0"]
   s.add_runtime_dependency %q<state_machine>, ["~> 1.0"]
   s.add_runtime_dependency %q<future-resource>, ["~> 1.0"]

data/spec/punchblock/command_node_spec.rb

@@ -11,6 +11,7 @@ module Punchblock
       end
 
       its(:state_name) { should be == :new }
+      its(:request_id) { should be == @uuid }
 
       describe "#new" do
         describe "with a call/component ID" do

data/spec/punchblock/connection/xmpp_spec.rb

@@ -104,8 +104,35 @@ module Punchblock
         output.component_id.should be == 'fgh4590'
       end
 
+      let(:client) { connection.send :client }
+      before { client.stub :write }
+
+      describe "sending a command" do
+        let(:command) { Punchblock::Command::Answer.new request_id: 'fooobarrr', target_call_id: 'foo', domain: 'bar.com' }
+
+        it "should write an IQ containing the command to the socket" do
+          client.should_receive(:write).once.with do |stanza|
+            stanza.should be_a Blather::Stanza::Iq
+            stanza.to.should be == 'foo@bar.com'
+            stanza.type.should be == :set
+          end
+          connection.write command
+        end
+
+        it "should put the command in a requested state" do
+          connection.write command
+          command.should be_requested
+        end
+
+        it "should use the command's request_id as the ID id" do
+          client.should_receive(:write).once.with do |stanza|
+            stanza.id.should be == 'fooobarrr'
+          end
+          connection.write command
+        end
+      end
+
       it 'should send a "Chat" presence when ready' do
-        client = connection.send :client
         client.should_receive(:write).once.with do |stanza|
           stanza.to.should be == 'rayo.net'
           stanza.should be_a Blather::Stanza::Presence::Status
@@ -115,7 +142,6 @@ module Punchblock
       end
 
       it 'should send a "Do Not Disturb" presence when not_ready' do
-        client = connection.send :client
         client.should_receive(:write).once.with do |stanza|
           stanza.to.should be == 'rayo.net'
           stanza.should be_a Blather::Stanza::Presence::Status
@@ -126,7 +152,6 @@ module Punchblock
 
       describe '#send_message' do
         it 'should send a "normal" message to the given user and domain' do
-          client = connection.send :client
           client.should_receive(:write).once.with do |stanza|
             stanza.to.should be == 'someone@example.org'
             stanza.should be_a Blather::Stanza::Message
@@ -138,7 +163,6 @@ module Punchblock
         end
 
         it 'should default to the root domain' do
-          client = connection.send :client
           client.should_receive(:write).once.with do |stanza|
             stanza.to.should be == 'someone@rayo.net'
           end
@@ -146,7 +170,6 @@ module Punchblock
         end
 
         it 'should send a message with the given subject' do
-          client = connection.send :client
           client.should_receive(:write).once.with do |stanza|
             stanza.subject.should be == "Important Message"
           end
@@ -350,7 +373,7 @@ module Punchblock
       describe "receiving events from a mixer" do
         context "after joining the mixer" do
           before do
-            subject.send(:client).should_receive :write_with_handler
+            client.should_receive :write_with_handler
             subject.write Command::Join.new(:mixer_name => 'foomixer')
           end
 

data/spec/spec_helper.rb

@@ -24,6 +24,11 @@ RSpec.configure do |config|
     Punchblock.logger.define_singleton_method :trace, Punchblock.logger.method(:debug)
   end
 
+  config.before do
+    @uuid = SecureRandom.uuid
+    Punchblock.stub new_request_id: @uuid
+  end
+
   config.after :each do
     if defined?(:Celluloid)
       Celluloid.shutdown

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: punchblock
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1
 platform: ruby
 authors:
 - Jason Goecke
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-30 00:00:00.000000000 Z
+date: 2014-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -36,16 +36,16 @@ dependencies:
   name: blather
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement