cucumber-core 1.0.0.beta.4 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92d80d8c2127d6475aef16ab947d0bb6123cb65d
-  data.tar.gz: 17c84ce6fef0048f020350837ea4ce963a2983d8
+  metadata.gz: f2cd168ae1424fa32f265677b4a2dfc7ae18a94d
+  data.tar.gz: ebbf8b1933b4bb5e7cc16bce682ee62c5887a19c
 SHA512:
-  metadata.gz: 1bd15d9ca8acc459edfe0be347c0de3e4e3a6fc60dbec47f03e3c71824ba71a08dd707c7363a98e55a1d1ea0fea3b43d519a9daf598fc81120061fb28d6d5179
-  data.tar.gz: 3dc08914e80026d9eedc136b4d47f0efda584ebc2094213aebcb06c6886df6cd6091f1da7458b7c6f27e5f706cd1f6f3b628736997c3d6059324ef289f293cc4
+  metadata.gz: 2ed2fa52877d2ddae9912e9a4db6c2c019bebd424709b759997826ef7d5e061d01a5a31c8f37829b33dc8ba32b9969b6003fc3d65eeaa5403af9845424fb613d
+  data.tar.gz: c63b934c43c8e8e57869d8f52db24f4e1dd6fa6352c1a1e69569a290eb70f6a71f8a3ac37da0b7b7b208996e32b621f26698c1fda2470e763a7f4e5eab40bad6

data/.travis.yml

@@ -1,4 +1,5 @@
 rvm:
+  - 2.2
   - 2.1
   - 2.0.0
   - 1.9.3

data/CONTRIBUTING.md

@@ -0,0 +1,14 @@
+Release Process
+===============
+
+* Bump the version number in `lib/cucumber/core/version.rb`
+* Update `HISTORY.md` is updated with the upcoming version number and entries
+  for all changes recorded.
+* Now release it
+
+```
+bundle update
+bundle exec rake
+git commit -m "Release X.Y.Z"
+rake release
+```

data/HISTORY.md

@@ -1,4 +1,17 @@
-## [In Git](https://github.com/cucumber/cucumber-ruby-core/compare/v1.0.0.beta.3...master)
+## [In Git](https://github.com/cucumber/cucumber-ruby-core/compare/v1.0.0...master)
+
+## [v1.0.0](https://github.com/cucumber/cucumber-ruby-core/compare/v1.0.0.beta.4...v1.0.0)
+
+### Features Removed
+
+  * Removed the Mapper DSL (@mattwynne, @tooky)
+  * Removed Cucumber.initializer (@tooky)
+
+### New Features
+
+  * Added dynamic filter class constructor (@mattwynne)
+
+## [v1.0.0.beta.4](https://github.com/cucumber/cucumber-ruby-core/compare/v1.0.0.beta.3...v1.0.0.beta.4)
 
 ### New Features
 

data/README.md

@@ -15,9 +15,8 @@ The entry-point is a single method on the module `Cucumber::Core` called [`#exec
 
 1. Parses the plain-text Gherkin documents into an **AST**
 2. Compiles the AST down to **test cases**
-3. Passes the test cases through your **mappings** to activate them
-4. Passes the activated test cases through any **filters**
-5. Executes the test cases, calling back to the **report**
+3. Passes the activated test cases through any **filters**
+4. Executes the test cases, calling back to the **report**
 
 We've introduced a number of concepts here, so let's go through them in detail.
 
@@ -31,19 +30,13 @@ These are immutable value objects.
 
 Your gherkin might contain scenarios, as well as examples from tables beneath a scenario outline.
 
-Test cases represent the general case of both of these. We compile the AST down to instances of [`Cucumber::Core::Test::Case`](http://rubydoc.info/gems/cucumber-core/Cucumber/Core/Test/Case), each containing a number of instances of [`Cucumber::Core::Test::Step`](http://rubydoc.info/gems/cucumber-core/Cucumber/Core/Test/Step). It's these that are then mapped, filtered, and executed.
+Test cases represent the general case of both of these. We compile the AST down to instances of [`Cucumber::Core::Test::Case`](http://rubydoc.info/gems/cucumber-core/Cucumber/Core/Test/Case), each containing a number of instances of [`Cucumber::Core::Test::Step`](http://rubydoc.info/gems/cucumber-core/Cucumber/Core/Test/Step). It's these that are then filtered and executed.
 
 Test cases and their test steps are also immutable value objects.
 
-### Mappings
-
-When test cases are first compiled from the AST, they contain no information about how to execute them. Mappings are how we connect them to the code they need to run in order to execute your tests.
-
 ### Filters
 
-Once we have the test cases, and they've been activated by the mappings, you may want to pass them through a filter or two. Filters can be used to do things like sort, replace or remove some of the test cases or their steps before they're executed.
-
-In fact, the mappings are just a special case of a filter.
+Once we have the test cases, and they've been activated by the mappings, you may want to pass them through a filter or two. Filters can be used to do things like activate, sort, replace or remove some of the test cases or their steps before they're executed.
 
 ### Report
 
@@ -65,42 +58,50 @@ Here's an example of how you might use [`Cucumber::Core#execute`](http://rubydoc
 
 ```ruby
 require 'cucumber/core'
+require 'cucumber/core/filter'
 
 class MyRunner
   include Cucumber::Core
+end
 
-  def run(features)
-    execute features, Mappings.new, Report.new
-  end
-
-  class Mappings
-    def test_case(test_case, mapper)
+class ActivateSteps < Cucumber::Core::Filter.new
+  def test_case(test_case)
+    test_steps = test_case.test_steps.map do |step|
+      activate(step)
     end
 
-    def test_step(test_step, mapper)
-      mapper.map { fail } if test_step.name =~ /fail/
-      mapper.map { } if test_step.name =~ /pass/
-    end
+    test_case.with_steps(test_steps).describe_to(receiver)
   end
 
-  class Report
-    def before_test_step(test_step)
+  private
+  def activate(step)
+    case step.name
+    when /fail/
+      step.with_action { raise Failure }
+    when /pass/
+      step.with_action {}
+    else
+      step
     end
+  end
+end
 
-    def after_test_step(test_step, result)
-      puts "#{test_step.name} #{result}"
-    end
+class Report
+  def before_test_step(test_step)
+  end
 
-    def before_test_case(test_case)
-    end
+  def after_test_step(test_step, result)
+    puts "#{test_step.name} #{result}"
+  end
 
-    def after_test_case(test_case, result)
-    end
+  def before_test_case(test_case)
+  end
 
-    def done
-    end
+  def after_test_case(test_case, result)
   end
 
+  def done
+  end
 end
 
 feature = Cucumber::Core::Gherkin::Document.new(__FILE__, <<-GHERKIN)
@@ -111,7 +112,7 @@ Feature:
     And undefined
 GHERKIN
 
-MyRunner.new.run([feature])
+MyRunner.new.execute([feature], Report.new, [ActivateSteps.new])
 ```
 
 If you run this little Ruby script, you should see the following output:

data/lib/cucumber/core.rb

@@ -2,14 +2,12 @@ require 'cucumber/core/gherkin/parser'
 require 'cucumber/core/gherkin/document'
 require 'cucumber/core/compiler'
 require 'cucumber/core/test/runner'
-require 'cucumber/core/test/mapper'
 
 module Cucumber
   module Core
 
-    def execute(gherkin_documents, mapping_definition, report, filters = [])
+    def execute(gherkin_documents, report, filters = [])
       receiver = Test::Runner.new(report)
-      filters << [Test::Mapper, [mapping_definition]]
       compile gherkin_documents, receiver, filters
       self
     end
@@ -33,8 +31,8 @@ module Cucumber
     end
 
     def compose(filters, last_receiver)
-      filters.reverse.reduce(last_receiver) do |receiver, (filter_type, args)|
-        filter_type.new(*args + [receiver])
+      filters.reverse.reduce(last_receiver) do |receiver, filter|
+        filter.with_receiver(receiver)
       end
     end
 

data/lib/cucumber/core/ast/background.rb

@@ -1,4 +1,3 @@
-require 'cucumber/initializer'
 require 'cucumber/core/ast/names'
 require 'cucumber/core/ast/location'
 require 'cucumber/core/ast/describes_itself'
@@ -11,7 +10,19 @@ module Cucumber
         include HasLocation
         include DescribesItself
 
-        include Cucumber.initializer(:gherkin_statement, :language, :location, :comments, :keyword, :title, :description, :raw_steps)
+        def initialize(gherkin_statement, language, location, comments, keyword, title, description, raw_steps)
+          @gherkin_statement = gherkin_statement
+          @language = language
+          @location = location
+          @comments = comments
+          @keyword = keyword
+          @title = title
+          @description = description
+          @raw_steps = raw_steps
+        end
+
+        attr_reader :language, :title, :description, :raw_steps
+        private     :language, :title, :description, :raw_steps
 
         attr_accessor :feature
         attr_accessor :comments, :keyword, :location

data/lib/cucumber/core/ast/comment.rb

@@ -1,4 +1,3 @@
-require 'cucumber/initializer'
 require 'cucumber/core/ast/location'
 
 module Cucumber
@@ -6,7 +5,14 @@ module Cucumber
     module Ast
       class Comment
         include HasLocation
-        include Cucumber.initializer :location, :value
+
+        attr_reader :location, :value
+        private :location, :value
+
+        def initialize(location, value)
+          @location = location
+          @value = value
+        end
 
         def to_s
           value

data/lib/cucumber/core/ast/examples_table.rb

@@ -1,4 +1,3 @@
-require 'cucumber/initializer'
 require 'cucumber/core/ast/describes_itself'
 require 'cucumber/core/ast/location'
 require 'cucumber/core/ast/names'
@@ -12,11 +11,21 @@ module Cucumber
         include HasLocation
         include DescribesItself
 
-        attr_reader :header, :keyword, :tags, :comments, :location, :gherkin_statement
+        def initialize(gherkin_statement, location, comments, tags, keyword, title, description, header, example_rows)
+          @gherkin_statement = gherkin_statement
+          @location = location
+          @comments = comments
+          @tags = tags
+          @keyword = keyword
+          @title = title
+          @description = description
+          @header = header
+          @example_rows = example_rows
+        end
 
-        include Cucumber.initializer(
-          :gherkin_statement, :location, :comments, :tags, :keyword, :title, :description, :header, :example_rows
-        )
+        attr_reader :gherkin_statement, :location, :comments, :tags, :keyword,
+                    :title, :description, :header, :example_rows
+        private :title, :description, :example_rows
 
         private
 

data/lib/cucumber/core/ast/feature.rb

@@ -1,4 +1,3 @@
-require 'cucumber/initializer'
 require 'cucumber/core/ast/describes_itself'
 require 'cucumber/core/ast/names'
 require 'cucumber/core/ast/location'
@@ -12,12 +11,22 @@ module Cucumber
         include HasLocation
         include DescribesItself
 
-        attr_reader :feature_elements, :language
-        attr_reader :comments, :background, :tags, :keyword, :location, :title, :gherkin_statement
+        attr_reader :gherkin_statement, :language, :location, :background,
+                    :comments, :tags, :keyword, :title, :description,
+                    :feature_elements
+        private :description
 
-        include Cucumber.initializer(:gherkin_statement, :language, :location, :background, :comments, :tags, :keyword, :title, :description, :feature_elements)
-        def initialize(*)
-          super
+        def initialize(gherkin_statement, language, location, background, comments, tags, keyword, title, description, feature_elements)
+          @gherkin_statement = gherkin_statement
+          @language = language
+          @location = location
+          @background = background
+          @comments = comments
+          @tags = tags
+          @keyword = keyword
+          @title = title
+          @description = description
+          @feature_elements = feature_elements
         end
 
         def children

data/lib/cucumber/core/ast/scenario.rb

@@ -1,4 +1,3 @@
-require 'cucumber/initializer'
 require 'cucumber/core/ast/describes_itself'
 require 'cucumber/core/ast/names'
 require 'cucumber/core/ast/empty_background'
@@ -12,10 +11,24 @@ module Cucumber
         include HasLocation
         include DescribesItself
 
-        attr_reader   :feature_tags
-        attr_reader   :comments, :tags, :keyword, :background, :title, :location, :gherkin_statement
+        attr_reader :gherkin_statement, :language, :location, :background,
+                    :comments, :tags, :feature_tags, :keyword, :title,
+                    :description, :raw_steps
+        private :raw_steps, :description
 
-        include Cucumber.initializer(:gherkin_statement, :language, :location, :background, :comments, :tags, :feature_tags, :keyword, :title, :description, :raw_steps)
+        def initialize(gherkin_statement, language, location, background, comments, tags, feature_tags, keyword, title, description, raw_steps)
+          @gherkin_statement = gherkin_statement
+          @language          = language
+          @location          = location
+          @background        = background
+          @comments          = comments
+          @tags              = tags
+          @feature_tags      = feature_tags
+          @keyword           = keyword
+          @title             = title
+          @description       = description
+          @raw_steps         = raw_steps
+        end
 
         def children
           raw_steps

data/lib/cucumber/core/ast/scenario_outline.rb

@@ -13,14 +13,26 @@ module Cucumber
 
         MissingExamples = Class.new(StandardError)
 
-        attr_reader :feature_tags
-
-        attr_reader :line
-        private :line
-
-        include Cucumber.initializer(:gherkin_statement, :language, :location, :background, :comments, :tags, :feature_tags, :keyword, :title, :description, :steps, :examples_tables)
-
-        attr_reader :comments, :tags, :keyword, :background, :location, :gherkin_statement
+        attr_reader :gherkin_statement, :language, :background, :comments,
+                    :tags, :feature_tags, :keyword, :title, :description,
+                    :steps, :examples_tables, :line
+        private :language, :background, :comments, :feature_tags,
+                :line
+
+        def initialize(gherkin_statement, language, location, background, comments, tags, feature_tags, keyword, title, description, steps, examples_tables)
+          @gherkin_statement = gherkin_statement
+          @language          = language
+          @location          = location
+          @background        = background
+          @comments          = comments
+          @tags              = tags
+          @feature_tags      = feature_tags
+          @keyword           = keyword
+          @title             = title
+          @description       = description
+          @steps             = steps
+          @examples_tables   = examples_tables
+        end
 
         private
 

data/lib/cucumber/core/ast/tag.rb

@@ -1,13 +1,15 @@
-require 'cucumber/initializer'
 module Cucumber
   module Core
     module Ast
       class Tag
         include HasLocation
 
-        include Cucumber.initializer(:location, :name)
-
         attr_reader :name
+
+        def initialize(location, name)
+          @location = location
+          @name = name
+        end
       end
     end
   end

data/lib/cucumber/core/compiler.rb

@@ -1,4 +1,3 @@
-require 'cucumber/initializer'
 require 'cucumber/core/test/case'
 require 'cucumber/core/test/step'
 
@@ -7,7 +6,12 @@ module Cucumber
 
     # Compiles the AST into test cases
     class Compiler
-      include Cucumber.initializer(:receiver)
+      attr_reader :receiver
+      private     :receiver
+
+      def initialize(receiver)
+        @receiver = receiver
+      end
 
       def feature(feature)
         compiler = FeatureCompiler.new(TestCaseBuilder.new(receiver))
@@ -22,7 +26,12 @@ module Cucumber
 
       # @private
       class TestCaseBuilder
-        include Cucumber.initializer(:receiver)
+        attr_reader :receiver
+        private     :receiver
+
+        def initialize(receiver)
+          @receiver = receiver
+        end
 
         def on_background_step(source)
           background_test_steps << Test::Step.new(source)
@@ -53,7 +62,12 @@ module Cucumber
 
       # @private
       class FeatureCompiler
-        include Cucumber.initializer(:receiver)
+        attr_reader :receiver
+        private     :receiver
+
+        def initialize(receiver)
+          @receiver = receiver
+        end
 
         def feature(feature, &descend)
           @feature = feature
@@ -86,7 +100,13 @@ module Cucumber
 
       # @private
       class ScenarioOutlineCompiler
-        include Cucumber.initializer(:source, :receiver)
+        attr_reader :source, :receiver
+        private     :source, :receiver
+
+        def initialize(source, receiver)
+          @source   = source
+          @receiver = receiver
+        end
 
         def outline_step(outline_step)
           outline_steps << outline_step
@@ -120,7 +140,13 @@ module Cucumber
 
       # @private
       class ScenarioCompiler
-        include Cucumber.initializer(:source, :receiver)
+        attr_reader :source, :receiver
+        private     :source, :receiver
+
+        def initialize(source, receiver)
+          @source   = source
+          @receiver = receiver
+        end
 
         def step(step)
           receiver.on_step(source + [step])
@@ -130,7 +156,13 @@ module Cucumber
 
       # @private
       class BackgroundCompiler
-        include Cucumber.initializer(:source, :receiver)
+        attr_reader :source, :receiver
+        private     :source, :receiver
+
+        def initialize(source, receiver)
+          @source   = source
+          @receiver = receiver
+        end
 
         def step(step)
           receiver.on_background_step(source + [step])