cucumber 2.3.1 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a58e91116e3be0964048ef8b17f2ede1d9dc4ecd
-  data.tar.gz: 6b9daa16cca6ad0fee4509a1393ce2de08ef0570
+  metadata.gz: 3ea4c325d27aa0512732b572a494fccee6e4dff0
+  data.tar.gz: 1defb0bb6842a9995ec302dcc7b2864d9a0e4498
 SHA512:
-  metadata.gz: 32101af5bb836a75f4a9efab29bc3afa660cf48bc297b71a4c6255811a1e287c75003435001d0d96036ce9b4322fab5206086fbb1c2330ff1356f122bd9610a4
-  data.tar.gz: 7b76da05692427b9120f43909641be7cb0bff1622260ecd21d4d65855925336182f867b617d4a8fa0e33e3c4aedcb335d77a5c31730cc942fd8a75f36617a3c4
+  metadata.gz: 8bc0298eda9a2055a26b030a32149a16ecf96d05ee5623538f0055c3c7515439298aff445cc8fb2341550ddb2f036618e29a742900f5cd056775e1838abf6299
+  data.tar.gz: 47b7a3f1f9cb191af39730bac8506264231df606fa7a63ac13017a01628ef43b74e11f7b5322ea64ee69e28af7251a78435584ce9d1e5a302db3fadab8a9e8ac

data/History.md

@@ -1,12 +1,12 @@
 ## [In Git](https://github.com/cucumber/cucumber-ruby/compare/v2.3.1...master)
 
-### New Features
+... your change here?
 
-### Bugfixes
+## [v2.3.2](https://github.com/cucumber/cucumber-ruby/compare/v2.3.1...v2.3.2)
 
-### Refactoring
+Brought the event bus code back into Cucumber to avoid https://github.com/fedux-org/event-bus/issues/6
 
-## [In Git](https://github.com/cucumber/cucumber-ruby/compare/v2.3.0...v2.3.1)
+## [v2.3.1](https://github.com/cucumber/cucumber-ruby/compare/v2.3.0...v2.3.1)
 
 Better deprecation warnings to help fix https://github.com/cucumber/cucumber-ruby/issues/942
 

data/cucumber.gemspec

@@ -18,7 +18,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'multi_json', '>= 1.7.5', '< 2.0'
   s.add_dependency 'multi_test', '>= 0.1.2'
   s.add_dependency 'cucumber-wire', '~> 0.0.1'
-  s.add_dependency 'event-bus', '~> 0.1.0'
 
   s.add_development_dependency 'aruba', '~> 0.6.1'
   s.add_development_dependency 'json', '~> 1.7'

data/features/docs/defining_steps/skip_scenario.feature

@@ -60,5 +60,5 @@ Feature: Skip Scenario
       """
     And the stderr should contain:
       """
-      WARNING: skip_invoke! is deprecated
+      deprecated
       """

data/lib/cucumber/configuration.rb

@@ -3,9 +3,6 @@ require 'cucumber/cli/rerun_file'
 require 'cucumber/events'
 require 'forwardable'
 require 'cucumber/core/gherkin/tag_expression'
-require 'cucumber'
-require 'event/bus'
-require 'event/name_resolver'
 
 module Cucumber
   # The base class for configuring settings for a Cucumber run.
@@ -234,7 +231,7 @@ module Cucumber
         :snippets            => true,
         :source              => true,
         :duration            => true,
-        :event_bus           => Event::Bus.new(Event::NameResolver.new(Cucumber::Events))
+        :event_bus           => Events::Bus.new(Cucumber::Events)
       }
     end
 

data/lib/cucumber/events/bus.rb

@@ -0,0 +1,86 @@
+module Cucumber
+  module Events
+
+    # Event bus
+    #
+    # Implements and in-process pub-sub events broadcaster allowing multiple observers
+    # to subscribe to different events that fire as your tests are executed.
+    #
+    # @private
+    class Bus
+
+      def initialize(default_namespace)
+        @default_namespace = default_namespace.to_s
+        @handlers = {}
+      end
+
+      # Register for an event
+      def register(event_id, handler_object = nil, &handler_proc)
+        handler = handler_proc || handler_object
+        raise ArgumentError.new("Please pass either an object or a handler block") unless handler
+        event_class = parse_event_id(event_id)
+        handlers_for(event_class) << handler
+      end
+
+      # Broadcast an event
+      def notify(event)
+        handlers_for(event.class).each { |handler| handler.call(event) }
+      end
+
+      private
+
+      def handlers_for(event_class)
+        @handlers[event_class.to_s] ||= []
+      end
+
+      def parse_event_id(event_id)
+        case event_id
+        when Class
+          return event_id
+        when String
+          constantize(event_id)
+        else
+          constantize("#{@default_namespace}::#{camel_case(event_id)}")
+        end
+      end
+
+      def camel_case(underscored_name)
+        underscored_name.to_s.split("_").map { |word| word.upcase[0] + word[1..-1] }.join
+      end
+
+      # Thanks ActiveSupport
+      # (Only needed to support Ruby 1.9.3 and JRuby)
+      def constantize(camel_cased_word)
+        names = camel_cased_word.split('::')
+
+        # Trigger a built-in NameError exception including the ill-formed constant in the message.
+        Object.const_get(camel_cased_word) if names.empty?
+
+        # Remove the first blank element in case of '::ClassName' notation.
+        names.shift if names.size > 1 && names.first.empty?
+
+        names.inject(Object) do |constant, name|
+          if constant == Object
+            constant.const_get(name)
+          else
+            candidate = constant.const_get(name)
+            next candidate if constant.const_defined?(name, false)
+            next candidate unless Object.const_defined?(name)
+
+            # Go down the ancestors to check if it is owned directly. The check
+            # stops when we reach Object or the end of ancestors tree.
+            constant = constant.ancestors.inject do |const, ancestor|
+              break const    if ancestor == Object
+              break ancestor if ancestor.const_defined?(name, false)
+              const
+            end
+
+            # owner is in Object, so raise
+            constant.const_get(name, false)
+          end
+        end
+      end
+
+    end
+  end
+end

data/lib/cucumber/version

@@ -1 +1 @@
-2.3.1
+2.3.2

data/spec/cucumber/events/bus_spec.rb

@@ -0,0 +1,94 @@
+require "cucumber/events/bus"
+
+module Cucumber
+  module Events
+    class TestEvent
+    end
+
+    class AnotherTestEvent
+    end
+
+    describe Bus do
+      let(:bus) { Bus.new(Cucumber::Events) }
+      let(:test_event) { TestEvent.new }
+      let(:another_test_event) { AnotherTestEvent.new }
+
+      it "calls subscriber with event payload" do
+        received_payload = nil
+        bus.register(TestEvent) do |event|
+          received_payload = event
+        end
+
+        bus.notify test_event
+
+        expect(received_payload).to eq(test_event)
+      end
+
+      it "does not call subscribers for other events" do
+        handler_called = false
+        bus.register(TestEvent) do |event|
+          handler_called = true
+        end
+
+        bus.notify another_test_event
+
+        expect(handler_called).to eq(false)
+      end
+
+      it "broadcasts to multiple subscribers" do
+        received_events = []
+        bus.register(TestEvent) do |event|
+          received_events << event
+        end
+        bus.register(TestEvent) do |event|
+          received_events << event
+        end
+
+        bus.notify test_event
+
+        expect(received_events.length).to eq 2
+        expect(received_events).to all eq test_event
+      end
+
+      it "allows subscription by string" do
+        received_payload = nil
+        bus.register('Cucumber::Events::TestEvent') do |event|
+          received_payload = event
+        end
+
+        bus.notify test_event
+
+        expect(received_payload).to eq(test_event)
+      end
+
+      it "allows subscription by symbol (for events in the Cucumber::Events namespace)" do
+        received_payload = nil
+        bus.register(:test_event) do |event|
+          received_payload = event
+        end
+
+        bus.notify test_event
+
+        expect(received_payload).to eq(test_event)
+      end
+
+      it "allows handlers that are objects with a `call` method" do
+        class MyHandler
+          attr_reader :received_payload
+
+          def call(event)
+            @received_payload = event
+          end
+        end
+
+        handler = MyHandler.new
+        bus.register(TestEvent, handler)
+
+        bus.notify test_event
+
+        expect(handler.received_payload).to eq test_event
+      end
+
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cucumber
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.3.2
 platform: ruby
 authors:
 - Aslak Hellesøy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-20 00:00:00.000000000 Z
+date: 2016-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber-core
@@ -116,20 +116,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.1
-- !ruby/object:Gem::Dependency
-  name: event-bus
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
@@ -705,6 +691,7 @@ files:
 - lib/cucumber/events/after_test_step.rb
 - lib/cucumber/events/before_test_case.rb
 - lib/cucumber/events/before_test_step.rb
+- lib/cucumber/events/bus.rb
 - lib/cucumber/events/step_match.rb
 - lib/cucumber/file_specs.rb
 - lib/cucumber/filters.rb
@@ -799,6 +786,7 @@ files:
 - spec/cucumber/configuration_spec.rb
 - spec/cucumber/constantize_spec.rb
 - spec/cucumber/core_ext/instance_exec_spec.rb
+- spec/cucumber/events/bus_spec.rb
 - spec/cucumber/file_specs_spec.rb
 - spec/cucumber/filters/activate_steps_spec.rb
 - spec/cucumber/filters/gated_receiver_spec.rb
@@ -864,7 +852,7 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: cucumber-2.3.1
+summary: cucumber-2.3.2
 test_files:
 - features/docs/api/list_step_defs_as_json.feature
 - features/docs/api/listen_for_events.feature
@@ -951,6 +939,7 @@ test_files:
 - spec/cucumber/configuration_spec.rb
 - spec/cucumber/constantize_spec.rb
 - spec/cucumber/core_ext/instance_exec_spec.rb
+- spec/cucumber/events/bus_spec.rb
 - spec/cucumber/file_specs_spec.rb
 - spec/cucumber/filters/activate_steps_spec.rb
 - spec/cucumber/filters/gated_receiver_spec.rb