ably 1.0.5 → 1.0.6

data/spec/support/event_emitter_helper.rb

@@ -0,0 +1,31 @@
+module Ably
+  module Modules
+    module EventEmitter
+      # Unplugs currently registered listener callbacks
+      # Ensures multiple calls to unplug is not destructive
+      def unplug_listeners
+        unplugged_callbacks[:callbacks] = unplugged_callbacks.fetch(:callbacks).merge(callbacks)
+        unplugged_callbacks[:callbacks_any] = unplugged_callbacks.fetch(:callbacks_any) + callbacks_any
+        callbacks.clear
+        callbacks_any.clear
+      end
+
+      # Plug in previously unplugged listener callbacks
+      # But merge them together in case other listners have been added in the mean time
+      def plugin_listeners
+        @callbacks = callbacks.merge(unplugged_callbacks.fetch(:callbacks))
+        @callbacks_any = callbacks_any + unplugged_callbacks.fetch(:callbacks_any)
+        unplugged_callbacks.fetch(:callbacks).clear
+        unplugged_callbacks.fetch(:callbacks_any).clear
+      end
+
+      private
+      def unplugged_callbacks
+        @unplugged_callbacks ||= {
+          callbacks: Hash.new { |hash, key| hash[key] = [] },
+          callbacks_any: []
+        }
+      end
+    end
+  end
+end

data/spec/support/event_machine_helper.rb

@@ -124,7 +124,7 @@ RSpec.configure do |config|
     example_block          = example.example.instance_variable_get('@example_block')
     example_group_instance = example.example.instance_variable_get('@example_group_instance')
 
-    event_machine_block = Proc.new do
+    event_machine_block = lambda do |*args|
       RSpec::EventMachine.run_reactor(timeout) do
         example_group_instance.instance_exec(example, &example_block)
       end

data/spec/support/test_logger_helper.rb

@@ -0,0 +1,42 @@
+# Class with standard Ruby Logger interface
+#   but it keeps a record of the lof entries for later inspection
+#
+# Recommendation: Use :prevent_log_stubbing attibute on tests that use this logger
+#
+class TestLogger
+  def initialize
+    @messages = []
+  end
+
+  SEVERITIES = [:fatal, :error, :warn, :info, :debug]
+  SEVERITIES.each do |severity_sym|
+    define_method(severity_sym) do |*args, &block|
+      if block
+        @messages << [severity_sym, block.call]
+      else
+        @messages << [severity_sym, args.join(', ')]
+      end
+    end
+  end
+
+  def logs(options = {})
+    min_severity = options[:min_severity]
+    if min_severity
+      severity_level = SEVERITIES.index(min_severity)
+      raise "Unknown severity: #{min_severity}" if severity_level.nil?
+
+      @messages.select do |severity, message|
+        SEVERITIES.index(severity) <= severity_level
+      end
+    else
+      @messages
+    end
+  end
+
+  def level
+    1
+  end
+
+  def level=(new_level)
+  end
+end

data/spec/unit/logger_spec.rb

@@ -121,15 +121,7 @@ describe Ably::Logger do
     end
 
     context 'with a valid interface' do
-      let(:custom_logger) do
-        Class.new do
-          extend Forwardable
-          def initialize
-            @logger = Logger.new(STDOUT)
-          end
-          def_delegators :@logger, :fatal, :error, :warn, :info, :debug, :level, :level=
-        end
-      end
+      let(:custom_logger) { TestLogger }
       let(:custom_logger_object) { custom_logger.new }
 
       subject { Ably::Logger.new(rest_client, Logger::INFO, custom_logger_object) }

data/spec/unit/modules/async_wrapper_spec.rb

@@ -31,7 +31,7 @@ describe Ably::Modules::AsyncWrapper, :api_private do
   context '#async_wrap blocking block' do
     context 'returns result' do
       let(:block) do
-        proc do
+        lambda do
           sleep sleep_time
           result
         end
@@ -104,7 +104,7 @@ describe Ably::Modules::AsyncWrapper, :api_private do
 
     context 'raises an Exception' do
       let(:block) do
-        proc do
+        lambda do
           sleep sleep_time
           raise RuntimeError, 'Intentional'
         end

data/spec/unit/modules/event_emitter_spec.rb

@@ -38,7 +38,7 @@ describe Ably::Modules::EventEmitter do
 
     context 'with coercion', :api_private do
       let(:options) do
-        { coerce_into: Proc.new { |event| String(event) } }
+        { coerce_into: lambda { |event| String(event) } }
       end
 
       it 'calls the provided proc to coerce the event name' do
@@ -244,7 +244,7 @@ describe Ably::Modules::EventEmitter do
   end
 
   context '#off' do
-    let(:callback) { Proc.new { |msg| obj.received_message msg } }
+    let(:callback) { lambda { |msg| obj.received_message msg } }
 
     context 'with event specified in on handler' do
       before do
@@ -356,7 +356,7 @@ describe Ably::Modules::EventEmitter do
   end
 
   context '#unsafe_off' do
-    let(:callback) { Proc.new { |msg| obj.received_message msg } }
+    let(:callback) { lambda { |msg| obj.received_message msg } }
 
     context 'with unsafe_on subscribers' do
       before do

data/spec/unit/modules/state_emitter_spec.rb

@@ -85,7 +85,7 @@ describe Ably::Modules::StateEmitter do
     context 'without :else option block' do
       let(:block_calls) { [] }
       let(:block) do
-        proc do
+        lambda do
           block_calls << Time.now
         end
       end
@@ -116,7 +116,7 @@ describe Ably::Modules::StateEmitter do
     context 'with an array of targets' do
       let(:block_calls) { [] }
       let(:block) do
-        proc do
+        lambda do
           block_calls << Time.now
         end
       end
@@ -158,14 +158,14 @@ describe Ably::Modules::StateEmitter do
     context 'with :else option block', :api_private do
       let(:success_calls) { [] }
       let(:success_block) do
-        proc do
+        lambda do
           success_calls << Time.now
         end
       end
 
       let(:failure_calls) { [] }
       let(:failure_block) do
-        proc do |*args|
+        lambda do |*args|
           failure_calls << args
         end
       end
@@ -244,7 +244,7 @@ describe Ably::Modules::StateEmitter do
       end
 
       specify 'are passed to else blocks' do
-        else_block = proc { |arguments| expect(arguments).to eql(arguments) }
+        else_block = lambda { |arguments| expect(arguments).to eql(arguments) }
         subject.once_or_if(:connected, else: else_block) do
           raise 'Success should not be called'
         end
@@ -254,11 +254,11 @@ describe Ably::Modules::StateEmitter do
 
     context 'with blocks that raise exceptions' do
       let(:success_block) do
-        proc { raise 'Success exception' }
+        lambda { raise 'Success exception' }
       end
 
       let(:failure_block) do
-        proc { raise 'Failure exception' }
+        lambda { raise 'Failure exception' }
       end
 
       let(:target_state) { :connected }
@@ -291,11 +291,11 @@ describe Ably::Modules::StateEmitter do
     let(:target_state) { :connected }
 
     let(:success_block) do
-      proc { raise 'Success exception' }
+      lambda { raise 'Success exception' }
     end
 
     let(:failure_block) do
-      proc { raise 'Failure exception' }
+      lambda { raise 'Failure exception' }
     end
 
     before do
@@ -318,7 +318,7 @@ describe Ably::Modules::StateEmitter do
   context '#once_state_changed', :api_private do
     let(:block_calls) { [] }
     let(:block) do
-      proc do |*args|
+      lambda do |*args|
         block_calls << args
       end
     end

data/spec/unit/realtime/channel_spec.rb

@@ -203,7 +203,7 @@ describe Ably::Realtime::Channel do
 
     context '#unsubscribe' do
       let(:callback) do
-        Proc.new { |message| message_history[:received] += 1 }
+        lambda { |message| message_history[:received] += 1 }
       end
 
       before do

data/spec/unit/realtime/connection_spec.rb

@@ -56,7 +56,7 @@ describe Ably::Realtime::Connection do
     describe '#off_resume' do
       it 'registers a callback' do
         subject.on_resume { callbacks << true }
-        additional_proc = proc { raise 'This should not be called' }
+        additional_proc = lambda { raise 'This should not be called' }
         subject.off_resume(&additional_proc)
         subject.trigger_resumed
         expect(callbacks.count).to eql(1)

data/spec/unit/realtime/presence_spec.rb

@@ -98,7 +98,7 @@ describe Ably::Realtime::Presence do
 
     context '#unsubscribe' do
       let(:callback) do
-        Proc.new { |message| message_history[:received] += 1 }
+        lambda { |message| message_history[:received] += 1 }
       end
       before do
         subject.subscribe(enter_action, &callback)

data/spec/unit/rest/channel_spec.rb

@@ -22,6 +22,19 @@ describe Ably::Rest::Channel do
       end
     end
 
+    context 'as frozen UTF_8 string' do
+      let(:channel_name) { 'unique'.freeze }
+      let(:encoding) { Encoding::UTF_8 }
+
+      it 'is permitted' do
+        expect(subject.name).to eql(channel_name)
+      end
+
+      it 'remains as UTF-8' do
+        expect(subject.name.encoding).to eql(encoding)
+      end
+    end
+
     context 'as SHIFT_JIS string' do
       let(:encoding) { Encoding::SHIFT_JIS }
 
@@ -74,6 +87,15 @@ describe Ably::Rest::Channel do
       end
     end
 
+    context 'as frozen UTF_8 string' do
+      let(:encoded_value) { 'unique'.freeze }
+      let(:encoding) { Encoding::UTF_8 }
+
+      it 'is permitted' do
+        expect(subject.publish(encoded_value, 'data')).to eql(true)
+      end
+    end
+
     context 'as SHIFT_JIS string' do
       let(:encoding) { Encoding::SHIFT_JIS }
 

data/spec/unit/util/pub_sub_spec.rb

@@ -26,7 +26,7 @@ describe Ably::Util::PubSub do
 
     context 'with coercion', api_private: true do
       let(:options) do
-        { coerce_into: Proc.new { |event| String(event) } }
+        { coerce_into: lambda { |event| String(event) } }
       end
 
       it 'calls the provided proc to coerce the event name' do
@@ -36,7 +36,7 @@ describe Ably::Util::PubSub do
       end
 
       context 'and two different configurations but sharing the same class' do
-        let!(:exception_pubsub) { Ably::Util::PubSub.new(coerce_into: Proc.new { raise KeyError }) }
+        let!(:exception_pubsub) { Ably::Util::PubSub.new(coerce_into: lambda { |event| raise KeyError }) }
 
         it 'does not share state' do
           expect(obj).to receive(:received_message).with(msg).once
@@ -58,7 +58,7 @@ describe Ably::Util::PubSub do
   end
 
   context '#unsubscribe' do
-    let(:callback) { Proc.new { |msg| obj.received_message msg } }
+    let(:callback) { lambda { |msg| obj.received_message msg } }
 
     before do
       subject.subscribe(:message, &callback)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ably
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Lewis Marshall
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-23 00:00:00.000000000 Z
+date: 2018-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.2.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.2.6
 - !ruby/object:Gem::Dependency
   name: em-http-request
   requirement: !ruby/object:Gem::Requirement
@@ -59,14 +59,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.12'
+- !ruby/object:Gem::Dependency
+  name: excon
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.55'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.55'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -87,14 +101,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: msgpack
   requirement: !ruby/object:Gem::Requirement
@@ -390,6 +404,7 @@ files:
 - spec/spec_helper.rb
 - spec/support/api_helper.rb
 - spec/support/debug_failure_helper.rb
+- spec/support/event_emitter_helper.rb
 - spec/support/event_machine_helper.rb
 - spec/support/markdown_spec_formatter.rb
 - spec/support/private_api_formatter.rb
@@ -397,6 +412,7 @@ files:
 - spec/support/random_helper.rb
 - spec/support/rest_testapp_before_retry.rb
 - spec/support/test_app.rb
+- spec/support/test_logger_helper.rb
 - spec/unit/auth_spec.rb
 - spec/unit/logger_spec.rb
 - spec/unit/models/auth_details_spec.rb
@@ -493,6 +509,7 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/api_helper.rb
 - spec/support/debug_failure_helper.rb
+- spec/support/event_emitter_helper.rb
 - spec/support/event_machine_helper.rb
 - spec/support/markdown_spec_formatter.rb
 - spec/support/private_api_formatter.rb
@@ -500,6 +517,7 @@ test_files:
 - spec/support/random_helper.rb
 - spec/support/rest_testapp_before_retry.rb
 - spec/support/test_app.rb
+- spec/support/test_logger_helper.rb
 - spec/unit/auth_spec.rb
 - spec/unit/logger_spec.rb
 - spec/unit/models/auth_details_spec.rb