lucid 0.0.6 → 0.0.7

data/HISTORY.md

@@ -2,6 +2,19 @@ Change Log and History
 ======================
 
 
+Version 0.0.7 / 2013-05-17
+--------------------------
+
+This version mainly makes a lot of internal changes and many of those are predicated upon keeping pace with the changes that Cucumber is making as they move to their 2.0 release.
+
+Two specific changes worth calling out:
+
+* Lucid will now let you reliably configure a library path.
+* Lucid will allow you to configure the name of the driver file. (This was due to a [planned enhancement[(https://github.com/jnyman/lucid/issues/2)].)
+
+The driver file in Cucumber is env.rb. In Lucid this defaults to driver.rb. Now, however, you can override that default. Regarding the library path, this is equivalent to what Cucumber refers to as the "support" directory. The main reason for these changes is that Lucid is trying to be a little more configurable than Cucumber.
+
+
 Version 0.0.6 / 2013-05-09
 --------------------------
 

data/lib/lucid/ast.rb

@@ -7,6 +7,7 @@ require 'lucid/ast/scenario_outline'
 require 'lucid/ast/step_invocation'
 require 'lucid/ast/step_collection'
 require 'lucid/ast/step'
+require 'lucid/ast/step_result'
 require 'lucid/ast/table'
 require 'lucid/ast/tags'
 require 'lucid/ast/doc_string'

data/lib/lucid/ast/background.rb

@@ -9,6 +9,7 @@ module Lucid
       include Names
       include HasLocation
       attr_accessor :feature
+      attr_accessor :comment
 
       def initialize(language, location, comment, keyword, title, description, raw_steps)
         @language, @location, @comment, @keyword, @title, @description, @raw_steps = language, location, comment, keyword, title, description, raw_steps
@@ -36,14 +37,16 @@ module Lucid
 
       def accept(visitor)
         return if Lucid.wants_to_quit
-        visitor.visit_comment(@comment) unless @comment.empty?
-        visitor.visit_background_name(@keyword, name, file_colon_line, source_indent(first_line_length))
-        with_visitor(hook_context, visitor) do
-          visitor.runtime.before(hook_context)
-          skip_invoke! if failed?
-          visitor.visit_steps(step_invocations)
-          @failed = step_invocations.any? { |step_invocation| step_invocation.exception || step_invocation.status != :passed }
-          visitor.runtime.after(hook_context) if @failed || feature_elements.empty?
+        visitor.visit_background(self) do
+          comment.accept(visitor)
+          visitor.visit_background_name(@keyword, name, file_colon_line, source_indent(first_line_length))
+          with_visitor(hook_context, visitor) do
+            visitor.runtime.before(hook_context)
+            skip_invoke! if failed?
+            step_invocations.accept(visitor)
+            @failed = step_invocations.any? { |step_invocation| step_invocation.exception || step_invocation.status != :passed }
+            visitor.runtime.after(hook_context) if @failed || feature_elements.empty?
+          end
         end
       end
 

data/lib/lucid/ast/comment.rb

@@ -11,8 +11,12 @@ module Lucid
 
       def accept(visitor)
         return if Lucid.wants_to_quit
-        @value.strip.split("\n").each do |line|
-          visitor.visit_comment_line(line.strip)
+        return if empty?
+
+        visitor.visit_comment(self) do
+          @value.strip.split("\n").each do |line|
+            visitor.visit_comment_line(line.strip)
+          end
         end
       end
 

data/lib/lucid/ast/examples.rb

@@ -6,6 +6,7 @@ module Lucid
       include Names
       include HasLocation
       attr_writer :outline_table
+      attr_reader :comment, :keyword, :outline_table
 
       def initialize(location, comment, keyword, title, description, outline_table)
         @location, @comment, @keyword, @title, @description, @outline_table = location, comment, keyword, title, description, outline_table
@@ -20,9 +21,12 @@ module Lucid
 
       def accept(visitor)
         return if Lucid.wants_to_quit
-        visitor.visit_comment(@comment) unless @comment.empty?
-        visitor.visit_examples_name(@keyword, name)
-        visitor.visit_outline_table(@outline_table)
+
+        visitor.visit_examples(self) do
+          comment.accept(visitor)
+          visitor.visit_examples_name(keyword, name)
+          outline_table.accept(visitor)
+        end
       end
 
       def skip_invoke!
@@ -39,7 +43,7 @@ module Lucid
 
       def to_sexp
         sexp = [:examples, @keyword, name]
-        comment = @comment.to_sexp
+        comment = comment.to_sexp
         sexp += [comment] if comment
         sexp += [@outline_table.to_sexp]
         sexp

data/lib/lucid/ast/feature.rb

@@ -11,6 +11,7 @@ module Lucid
 
       attr_accessor :language
       attr_reader :feature_elements
+      attr_reader :comment, :background, :tags
 
       def initialize(location, background, comment, tags, keyword, title, description, feature_elements)
         @background, @comment, @tags, @keyword, @title, @description, @feature_elements = background, comment, tags, keyword, title, description, feature_elements
@@ -30,12 +31,14 @@ module Lucid
 
       def accept(visitor)
         return if Lucid.wants_to_quit
-        visitor.visit_comment(@comment) unless @comment.empty?
-        visitor.visit_tags(@tags)
-        visitor.visit_feature_name(@keyword, indented_name)
-        visitor.visit_background(@background) if !@background.is_a?(EmptyBackground)
-        @feature_elements.each do |feature_element|
-          visitor.visit_feature_element(feature_element)
+        visitor.visit_feature(self) do
+          comment.accept(visitor)
+          tags.accept(visitor)
+          visitor.visit_feature_name(@keyword, indented_name)
+          background.accept(visitor)
+          @feature_elements.each do |feature_element|
+            feature_element.accept(visitor)
+          end
         end
       end
 

data/lib/lucid/ast/outline_table.rb

@@ -5,26 +5,16 @@ module Lucid
         super(raw)
         @scenario_outline = scenario_outline
         @cells_class = ExampleRow
-        init
-      end
-
-      def init
-        create_step_invocations_for_example_rows!(@scenario_outline)
-      end
-
-      def to_sexp
-        init
-        super
+        example_rows.each do |cells|
+          cells.create_step_invocations!(scenario_outline)
+        end
       end
 
       def accept(visitor)
         return if Lucid.wants_to_quit
-        init
-        cells_rows.each_with_index do |row, n|
-          if(visitor.configuration.expand?)
+        visitor.visit_outline_table(self) do
+          cells_rows.each do |row|
             row.accept(visitor)
-          else
-            visitor.visit_table_row(row)
           end
         end
         nil
@@ -43,20 +33,11 @@ module Lucid
       end
 
       def skip_invoke!
-        init
         example_rows.each do |cells|
           cells.skip_invoke!
         end
       end
 
-      def create_step_invocations_for_example_rows!(scenario_outline)
-        return if @dunit
-        @dunit = true
-        example_rows.each do |cells|
-          cells.create_step_invocations!(scenario_outline)
-        end
-      end
-
       def example_rows
         cells_rows[1..-1]
       end
@@ -104,14 +85,21 @@ module Lucid
 
         def accept(visitor)
           return if Lucid.wants_to_quit
-          visitor.configuration.expand? ? accept_expand(visitor) : accept_plain(visitor)
+          #visitor.configuration.expand? ? accept_expand(visitor) : accept_plain(visitor)
+          if visitor.configuration.expand?
+            accept_expand(visitor)
+          else
+            visitor.visit_table_row(self) do
+              accept_plain(visitor)
+            end
+          end
         end
 
         def accept_plain(visitor)
           if header?
             @cells.each do |cell|
               cell.status = :skipped_param
-              visitor.visit_table_cell(cell)
+              cell.accept(visitor)
             end
           else
             visitor.runtime.with_hooks(self) do
@@ -121,7 +109,7 @@ module Lucid
               end
 
               @cells.each do |cell|
-                visitor.visit_table_cell(cell)
+                cell.accept(visitor)
               end
 
               visitor.visit_exception(@scenario_exception, :failed) if @scenario_exception
@@ -130,14 +118,12 @@ module Lucid
         end
 
         def accept_expand(visitor)
-          if header?
-          else
-            visitor.runtime.with_hooks(self) do
-              @table.visit_scenario_name(visitor, self)
-              @step_invocations.each do |step_invocation|
-                visitor.visit_step(step_invocation)
-                @exception ||= step_invocation.reported_exception
-              end
+          return if header?
+          visitor.runtime.with_hooks(self) do
+            @table.visit_scenario_name(visitor, self)
+            @step_invocations.each do |step_invocation|
+              step_invocation.accept(visitor)
+              @exception ||= step_invocation.reported_exception
             end
           end
         end

data/lib/lucid/ast/scenario.rb

@@ -13,6 +13,7 @@ module Lucid
 
       attr_reader   :feature_tags
       attr_accessor :feature
+      attr_reader   :comment, :tags, :keyword
 
       def initialize(language, location, background, comment, tags, feature_tags, keyword, title, description, raw_steps)
         @language, @location, @background, @comment, @tags, @feature_tags, @keyword, @title, @description, @raw_steps = language, location, background, comment, tags, feature_tags, keyword, title, description, raw_steps
@@ -23,15 +24,18 @@ module Lucid
       def accept(visitor)
         return if Lucid.wants_to_quit
 
-        visitor.visit_comment(@comment) unless @comment.empty?
-        visitor.visit_tags(@tags)
-        visitor.visit_scenario_name(@keyword, name, file_colon_line, source_indent(first_line_length))
+        visitor.visit_feature_element(self) do
+          comment.accept(visitor)
+          tags.accept(visitor)
+          visitor.visit_scenario_name(keyword, name, file_colon_line, source_indent(first_line_length))
 
-        skip_invoke! if @background.failed?
-        with_visitor(visitor) do
-          visitor.execute(self, skip_hooks?)
+          skip_invoke! if @background.failed?
+          with_visitor(visitor) do
+            visitor.execute(self, skip_hooks?)
+          end
+
+          @executed = true
         end
-        @executed = true
       end
 
       def to_units(background)

data/lib/lucid/ast/scenario_outline.rb

@@ -11,12 +11,17 @@ module Lucid
 
       attr_accessor :feature
       attr_reader :feature_tags
+      attr_reader :comment, :tags, :keyword
 
       module ExamplesArray #:nodoc:
         def accept(visitor)
           return if Lucid.wants_to_quit
-          each do |examples|
-            visitor.visit_examples(examples)
+          return if self.empty?
+
+          visitor.visit_examples_array(self) do
+            each do |examples|
+              examples.accept(visitor)
+            end
           end
         end
       end
@@ -32,13 +37,15 @@ module Lucid
         return if Lucid.wants_to_quit
         raise_missing_examples_error unless @example_sections
 
-        visitor.visit_comment(@comment) unless @comment.empty?
-        visitor.visit_tags(@tags)
-        visitor.visit_scenario_name(@keyword, name, file_colon_line, source_indent(first_line_length))
-        visitor.visit_steps(steps)
+        visitor.visit_feature_element(self) do
+          comment.accept(visitor)
+          tags.accept(visitor)
+          visitor.visit_scenario_name(keyword, name, file_colon_line, source_indent(first_line_length))
+          steps.accept(visitor)
 
-        skip_invoke! if @background.failed?
-        visitor.visit_examples_array(examples_array) unless examples_array.empty?
+          skip_invoke! if @background.failed?
+          examples_array.accept(visitor)
+        end
       end
 
       def to_units(background)
@@ -63,11 +70,7 @@ module Lucid
 
       def step_invocations(cells)
         step_invocations = steps.step_invocations_from_cells(cells)
-        if @background
-          @background.step_collection(step_invocations)
-        else
-          StepCollection.new(step_invocations)
-        end
+        @background.step_collection(step_invocations)
       end
 
       def each_example_row(&proc)

data/lib/lucid/ast/specs.rb

@@ -23,11 +23,16 @@ module Lucid
 
       def accept(visitor)
         return if Lucid.wants_to_quit
-        start = Time.now
-        self.each do |feature|
-          visitor.visit_feature(feature)
+
+        visitor.visit_features(self) do
+          start = Time.now
+
+          self.each do |feature|
+            feature.accept(visitor)
+          end
+
+          @duration = Time.now - start
         end
-        @duration = Time.now - start
       end
 
       def step_count

data/lib/lucid/ast/step.rb

@@ -50,11 +50,16 @@ module Lucid
         return if Lucid.wants_to_quit
         # The only time a Step is visited is when it is in a ScenarioOutline.
         # Otherwise it's always StepInvocation that gets visited instead.
-        visit_step_result(visitor, first_match(visitor), @multiline_arg, :skipped, nil, nil)
+        visitor.visit_step(self) do
+          visit_step_result(visitor, first_match(visitor), @multiline_arg, :skipped, nil, nil)
+        end
+
       end
 
       def visit_step_result(visitor, step_match, multiline_arg, status, exception, background)
-        visitor.visit_step_result(keyword, step_match, @multiline_arg, status, exception, source_indent, background, file_colon_line)
+        visitor.visit_step_result(
+          StepResult.new(keyword, step_match, @multiline_arg, status, exception, source_indent, background, file_colon_line)
+        )
       end
 
       def first_match(visitor)

data/lib/lucid/ast/step_collection.rb

@@ -15,8 +15,12 @@ module Lucid
 
       def accept(visitor)
         return if Lucid.wants_to_quit
-        @steps.each do |step|
-          visitor.visit_step(step)
+
+        visitor.visit_steps(self) do
+          @steps.each do |step|
+            #visitor.visit_step(step)
+            step.accept(visitor)
+          end
         end
       end
 

data/lib/lucid/ast/step_invocation.rb

@@ -6,8 +6,6 @@ require 'gherkin/rubify'
 module Lucid
   module AST
     class StepInvocation #:nodoc:
-      include Gherkin::Rubify
-
       attr_writer :step_collection, :background
       attr_reader :name, :matched_cells, :status, :reported_exception
       attr_accessor :exception
@@ -35,20 +33,25 @@ module Lucid
 
       def accept(visitor)
         return if Lucid.wants_to_quit
-        invoke(visitor.runtime, visitor.configuration)
-        visit_step_result(visitor)
+
+        visitor.visit_step(self) do
+          invoke(visitor.runtime, visitor.configuration)
+          visit_step_result(visitor)
+        end
       end
 
       def visit_step_result(visitor)
         visitor.visit_step_result(
-          keyword,
-          @step_match,
-          (@different_table || @multiline_arg),
-          @status,
-          @reported_exception,
-          source_indent,
-          @background,
-          file_colon_line
+          StepResult.new(
+            keyword,
+            @step_match,
+            (@different_table || @multiline_arg),
+            @status,
+            @reported_exception,
+            source_indent,
+            @background,
+            file_colon_line
+          )
         )
       end
 
@@ -144,11 +147,39 @@ module Lucid
       end
 
       def actual_keyword
-        repeat_keywords = rubify([language.keywords('but'), language.keywords('and')]).flatten.uniq.reject{|kw| kw == '* '}
-        if repeat_keywords.index(@step.keyword) && previous
+        #repeat_keywords = rubify([language.keywords('but'), language.keywords('and')]).flatten.uniq.reject{|kw| kw == '* '}
+        #if repeat_keywords.index(@step.keyword) && previous
+        keywords = Keywords.new(language)
+        if keywords.repeat_keyword?(keyword) && previous
           previous.actual_keyword
         else
-          keyword == '* ' ? language.code_keywords.first : keyword
+          #keyword == '* ' ? language.code_keywords.first : keyword
+          keyword == '* ' ? keywords.star_code_keyword : keyword
+        end
+      end
+
+      class Keywords
+        include Gherkin::Rubify
+
+        def initialize(language)
+          @language = language
+        end
+
+        def repeat_keyword?(keyword)
+          repeat_keywords.index(keyword)
+        end
+
+        def star_code_keyword
+          language.code_keywords.reject { |k| repeat_keywords.map(&:strip).include?(k) }.first
+        end
+
+        attr_reader :language
+        private     :language
+
+        private
+
+        def repeat_keywords
+          rubify([language.keywords('but'), language.keywords('and')]).flatten.uniq.reject{|kw| kw == '* '}
         end
       end