cucumber-in-the-yard 1.3 → 1.4

data/lib/yard/handlers/{feature_handler.rb → cucumber/feature_handler.rb}

@@ -26,7 +26,8 @@ module YARD
         def process_scenario(scenario)
 
           scenario.steps.each do |step|
-            owner.step_definitions.each do |stepdef|
+            YARD::Registry.all(:stepdefinition).each do |stepdef|
+              #log.debug "Looking at step #{step} against #{stepdef}"
               
               if stepdef.compare_value =~ /.+\#\{[^\}]+\}.+/
                 #log.debug "Step definition has packed constant #{stepdef.compare_value}"
@@ -34,7 +35,7 @@ module YARD
                 if %r{#{stepdef.compare_value}}.match(step.value)
                   step.definition = stepdef
                   stepdef.steps << step
-                  log.debug "STEP #{step} has found its definition #{stepdef}"
+                  #log.debug "STEP #{step} has found its definition #{stepdef}"
                   break
                 end
               end

data/lib/yard/handlers/step_definition_handler.rb

@@ -0,0 +1,57 @@
+
+
+class StepDefinitionHandler < YARD::Handlers::Ruby::Legacy::Base
+  MATCH = /^((When|Given|And|Then)\s*(\/[^\/]+\/).+)$/
+  handles MATCH
+
+  @@unique_name = 0
+
+  def process
+    keyword = statement.tokens.to_s[MATCH,2]
+    step_definition = statement.tokens.to_s[MATCH,3]
+
+    @@unique_name = @@unique_name + 1
+
+    stepdef_instance = StepDefinitionObject.new(YARD::CodeObjects::Cucumber::CUCUMBER_STEPTRANSFORM_NAMESPACE, "definition_#{@@unique_name}") do |o| 
+      o.source = "#{keyword} #{step_definition} do #{statement.block.to_s =~ /^\s*\|.+/ ? '' : "\n  "}#{statement.block.to_s}\nend"
+      o.value = step_definition
+      o.keyword = keyword
+    end
+
+    begin
+      # Look for all constants within the step definitions
+      stepdef_instance.constants = stepdef_instance._value_constants.each do |stepdef_constant| 
+        owner.constants.each do |constant|
+          if stepdef_constant.to_sym == constant.name
+            #log.debug "Replacing #{constant.name} with its value in the step definition #{stepdef_instance.value}"
+            stepdef_instance.constants[constant.name] = unpack_constants(constant.value)
+          end
+        end
+      end
+      
+    rescue Exception => e
+      log.error "Failed to link step definition to constants. This will make step definition to step linking impossible if constants are present.  #{e}"
+    end
+    
+
+    obj = register stepdef_instance 
+
+
+    parse_block :owner => obj
+  rescue YARD::Handlers::NamespaceMissingError
+  end
+  
+  
+  def unpack_constants(constant_value)
+    constant_value.scan(/\#\{([^\}]+)\}/).flatten.collect { |value| value.strip }.each do |inner_constant|
+      inner_constant_match = owner.constants.find {|constant| constant.name.to_s == inner_constant }
+      if inner_constant_match
+        constant_value.gsub!(/\#\{#{inner_constant}\}/,unpack_constants(inner_constant_match.value))
+      end
+    end
+    
+    constant_value.gsub!(/^('|"|\/)|('|"|\/)$/,'')
+    constant_value
+  end
+  
+end

data/lib/yard/handlers/step_transform_handler.rb

@@ -0,0 +1,21 @@
+
+class StepTransformHandler < YARD::Handlers::Ruby::Legacy::Base
+  MATCH = /^Transform\s*(\/[^\/]+\/).+$/
+  handles MATCH
+
+  @@unique_name = 0
+  
+  def process
+    transform = statement.tokens.to_s[MATCH,1]
+    
+    obj = register StepTransformObject.new(YARD::CodeObjects::Cucumber::CUCUMBER_STEPTRANSFORM_NAMESPACE, "transform_#{@@unique_name}") do |o| 
+      o.source = "Transform #{transform} do #{statement.block.to_s}\nend"
+      o.source = statement.block.to_s 
+      o.value = transform
+    end
+
+    parse_block :owner => obj
+
+  rescue YARD::Handlers::NamespaceMissingError
+  end
+end

data/lib/yard/parser/source_parser.rb

@@ -0,0 +1,54 @@
+module YARD::Parser
+
+  class SourceParser
+    class << self
+
+      #
+      # Following the conventions of ordering as Cucumber performs it
+      #  
+      #  environment files - 'directory/support/env.rb,env_*.rb'
+      #  support files     - 'directory/support/*.rb' (but not env prefixed)
+      #  directory files   - 'directory/*.rb'
+      #  
+      #  feature files     - 'directory/*.feature'
+      #
+      def order_by_cucumber_standards(*files)
+        
+        non_feature_files = files.reject {|x| x =~ /^.+\.feature$/}
+        feature_files = files.find_all {|x| x =~ /^.+\.feature$/ }
+        
+        support_files = non_feature_files.find_all {|file| file =~ /support\/.+\.rb$/ }
+        other_files = non_feature_files - support_files
+        
+        environment_files = support_files.find_all {|file| file =~ /support\/env.*\.rb$/ }
+        environment_files.sort_by {|x| x.length if x }
+        
+        support_files = support_files - environment_files
+        
+        environment_files + support_files + other_files + feature_files
+      end
+
+      def parse_in_order(*files)
+        
+        files = order_by_cucumber_standards(*files)
+        
+        while file = files.shift
+          begin
+            if file.is_a?(Array) && file.last.is_a?(Continuation)
+              log.debug("Re-processing #{file.first}")
+              file.last.call
+            elsif file.is_a?(String)
+              log.debug("Processing #{file}...")
+              new(parser_type, true).parse(file)
+            end
+          rescue LoadOrderError => e
+            # Out of order file. Push the context to the end and we'll call it
+            files.push([file, e.message])
+          end
+        end
+      end
+      
+    end
+  end
+  
+end

data/lib/yard/rake/city_task.rb

@@ -4,7 +4,7 @@ module YARD::Rake
   
     def initialize(name = :yard)
       super
-      self.options += [ "-e", "#{ File.dirname(__FILE__)}/../../city.rb", "-p", "#{File.dirname(__FILE__)}/../templates" ]
+      self.options += [ "-e", "#{ File.dirname(__FILE__)}/../../city.rb", "-p", "#{File.dirname(__FILE__)}/../../templates" ]
     end
     
   end

data/lib/yard/templates/helpers/base_helper.rb

@@ -0,0 +1,20 @@
+module YARD::Templates::Helpers
+
+  module BaseHelper
+
+    def format_object_title(object)
+      if object.is_a?(YARD::CodeObjects::Cucumber::NamespaceObject)
+        "#{format_object_type(object)}#{object.value ? ": #{object.value}" : ''}"
+      else
+        case object
+        when YARD::CodeObjects::RootObject
+          "Top Level Namespace"
+        else
+          format_object_type(object) + ": " + object.path
+        end
+      end
+    end
+    
+  end
+
+end  

metadata

@@ -4,16 +4,16 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 3
-  version: "1.3"
+  - 4
+  version: "1.4"
 platform: ruby
 authors: 
-- Frank;lin Webber
+- Franklin Webber
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-10-13 00:00:00 -07:00
+date: 2010-10-17 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -54,39 +54,54 @@ extra_rdoc_files:
 - README.md
 - lib/city.rb
 - lib/cucumber/city_builder.rb
-- lib/yard/code_objects/base.rb
-- lib/yard/code_objects/feature.rb
-- lib/yard/code_objects/scenario.rb
-- lib/yard/code_objects/step.rb
-- lib/yard/code_objects/tags.rb
-- lib/yard/extensions.rb
-- lib/yard/handlers/base.rb
-- lib/yard/handlers/feature_handler.rb
-- lib/yard/parser/feature.rb
+- lib/templates/default/feature/html/background.erb
+- lib/templates/default/feature/html/feature.erb
+- lib/templates/default/feature/html/no_steps_defined.erb
+- lib/templates/default/feature/html/outline.erb
+- lib/templates/default/feature/html/pystring.erb
+- lib/templates/default/feature/html/scenario.erb
+- lib/templates/default/feature/html/steps.erb
+- lib/templates/default/feature/html/table.erb
+- lib/templates/default/feature/setup.rb
+- lib/templates/default/fulldoc/html/css/common.css
+- lib/templates/default/fulldoc/html/full_list.erb
+- lib/templates/default/fulldoc/html/full_list_features.erb
+- lib/templates/default/fulldoc/html/full_list_requirements.erb
+- lib/templates/default/fulldoc/html/full_list_scenarios.erb
+- lib/templates/default/fulldoc/html/full_list_stepdefinitions.erb
+- lib/templates/default/fulldoc/html/full_list_steps.erb
+- lib/templates/default/fulldoc/html/full_list_tags.erb
+- lib/templates/default/fulldoc/html/index.erb
+- lib/templates/default/fulldoc/html/js/cucumber.js
+- lib/templates/default/fulldoc/html/setup.rb
+- lib/templates/default/layout/html/headers.erb
+- lib/templates/default/layout/html/search.erb
+- lib/templates/default/scenario/html/scenario.erb
+- lib/templates/default/scenario/setup.rb
+- lib/templates/default/steptransformers/html/stepdefinition.erb
+- lib/templates/default/steptransformers/html/steptransformers.erb
+- lib/templates/default/steptransformers/setup.rb
+- lib/templates/default/tag/html/feature.erb
+- lib/templates/default/tag/html/scenario.erb
+- lib/templates/default/tag/html/tag.erb
+- lib/templates/default/tag/setup.rb
+- lib/yard/code_objects/cucumber/base.rb
+- lib/yard/code_objects/cucumber/feature.rb
+- lib/yard/code_objects/cucumber/namespace_object.rb
+- lib/yard/code_objects/cucumber/scenario.rb
+- lib/yard/code_objects/cucumber/step.rb
+- lib/yard/code_objects/cucumber/tag.rb
+- lib/yard/code_objects/namespace_object.rb
+- lib/yard/code_objects/step_definition.rb
+- lib/yard/code_objects/step_transform.rb
+- lib/yard/handlers/cucumber/base.rb
+- lib/yard/handlers/cucumber/feature_handler.rb
+- lib/yard/handlers/step_definition_handler.rb
+- lib/yard/handlers/step_transform_handler.rb
+- lib/yard/parser/cucumber/feature.rb
+- lib/yard/parser/source_parser.rb
 - lib/yard/rake/city_task.rb
-- lib/yard/rb_extensions.rb
-- lib/yard/templates/default/feature/html/feature.erb
-- lib/yard/templates/default/feature/setup.rb
-- lib/yard/templates/default/fulldoc/html/css/common.css
-- lib/yard/templates/default/fulldoc/html/full_list.erb
-- lib/yard/templates/default/fulldoc/html/full_list_features.erb
-- lib/yard/templates/default/fulldoc/html/full_list_scenarios.erb
-- lib/yard/templates/default/fulldoc/html/full_list_stepdefinitions.erb
-- lib/yard/templates/default/fulldoc/html/full_list_steps.erb
-- lib/yard/templates/default/fulldoc/html/full_list_tagusages.erb
-- lib/yard/templates/default/fulldoc/html/index.erb
-- lib/yard/templates/default/fulldoc/html/js/cucumber.js
-- lib/yard/templates/default/fulldoc/html/setup.rb
-- lib/yard/templates/default/layout/html/headers.erb
-- lib/yard/templates/default/layout/html/search.erb
-- lib/yard/templates/default/module/html/step_transforms.erb
-- lib/yard/templates/default/module/setup.rb
-- lib/yard/templates/default/scenario/html/scenario.erb
-- lib/yard/templates/default/scenario/setup.rb
-- lib/yard/templates/default/steptransformers/html/stepdefinition.erb
-- lib/yard/templates/default/steptransformers/setup.rb
-- lib/yard/templates/default/tagusage/html/tagusage.erb
-- lib/yard/templates/default/tagusage/setup.rb
+- lib/yard/templates/helpers/base_helper.rb
 files: 
 - History.txt
 - Manifest
@@ -94,52 +109,65 @@ files:
 - Rakefile
 - example/empty.feature
 - example/example.feature
-- example/example.step.rb
 - example/example.third.feature
 - example/second_example.feature
+- example/step_definitions/example.step.rb
+- example/step_definitions/support/env.rb
+- example/step_definitions/support/env_support.rb
+- example/step_definitions/support/support.rb
+- features/definitions/city_step.rb
+- features/definitions/test.setup.and.teardown.rb
+- features/features.feature
 - lib/city.rb
 - lib/cucumber/city_builder.rb
-- lib/yard/code_objects/base.rb
-- lib/yard/code_objects/feature.rb
-- lib/yard/code_objects/scenario.rb
-- lib/yard/code_objects/step.rb
-- lib/yard/code_objects/tags.rb
-- lib/yard/extensions.rb
-- lib/yard/handlers/base.rb
-- lib/yard/handlers/feature_handler.rb
-- lib/yard/parser/feature.rb
+- lib/templates/default/feature/html/background.erb
+- lib/templates/default/feature/html/feature.erb
+- lib/templates/default/feature/html/no_steps_defined.erb
+- lib/templates/default/feature/html/outline.erb
+- lib/templates/default/feature/html/pystring.erb
+- lib/templates/default/feature/html/scenario.erb
+- lib/templates/default/feature/html/steps.erb
+- lib/templates/default/feature/html/table.erb
+- lib/templates/default/feature/setup.rb
+- lib/templates/default/fulldoc/html/css/common.css
+- lib/templates/default/fulldoc/html/full_list.erb
+- lib/templates/default/fulldoc/html/full_list_features.erb
+- lib/templates/default/fulldoc/html/full_list_requirements.erb
+- lib/templates/default/fulldoc/html/full_list_scenarios.erb
+- lib/templates/default/fulldoc/html/full_list_stepdefinitions.erb
+- lib/templates/default/fulldoc/html/full_list_steps.erb
+- lib/templates/default/fulldoc/html/full_list_tags.erb
+- lib/templates/default/fulldoc/html/index.erb
+- lib/templates/default/fulldoc/html/js/cucumber.js
+- lib/templates/default/fulldoc/html/setup.rb
+- lib/templates/default/layout/html/headers.erb
+- lib/templates/default/layout/html/search.erb
+- lib/templates/default/scenario/html/scenario.erb
+- lib/templates/default/scenario/setup.rb
+- lib/templates/default/steptransformers/html/stepdefinition.erb
+- lib/templates/default/steptransformers/html/steptransformers.erb
+- lib/templates/default/steptransformers/setup.rb
+- lib/templates/default/tag/html/feature.erb
+- lib/templates/default/tag/html/scenario.erb
+- lib/templates/default/tag/html/tag.erb
+- lib/templates/default/tag/setup.rb
+- lib/yard/code_objects/cucumber/base.rb
+- lib/yard/code_objects/cucumber/feature.rb
+- lib/yard/code_objects/cucumber/namespace_object.rb
+- lib/yard/code_objects/cucumber/scenario.rb
+- lib/yard/code_objects/cucumber/step.rb
+- lib/yard/code_objects/cucumber/tag.rb
+- lib/yard/code_objects/namespace_object.rb
+- lib/yard/code_objects/step_definition.rb
+- lib/yard/code_objects/step_transform.rb
+- lib/yard/handlers/cucumber/base.rb
+- lib/yard/handlers/cucumber/feature_handler.rb
+- lib/yard/handlers/step_definition_handler.rb
+- lib/yard/handlers/step_transform_handler.rb
+- lib/yard/parser/cucumber/feature.rb
+- lib/yard/parser/source_parser.rb
 - lib/yard/rake/city_task.rb
-- lib/yard/rb_extensions.rb
-- lib/yard/templates/default/feature/html/feature.erb
-- lib/yard/templates/default/feature/setup.rb
-- lib/yard/templates/default/fulldoc/html/css/common.css
-- lib/yard/templates/default/fulldoc/html/full_list.erb
-- lib/yard/templates/default/fulldoc/html/full_list_features.erb
-- lib/yard/templates/default/fulldoc/html/full_list_scenarios.erb
-- lib/yard/templates/default/fulldoc/html/full_list_stepdefinitions.erb
-- lib/yard/templates/default/fulldoc/html/full_list_steps.erb
-- lib/yard/templates/default/fulldoc/html/full_list_tagusages.erb
-- lib/yard/templates/default/fulldoc/html/index.erb
-- lib/yard/templates/default/fulldoc/html/js/cucumber.js
-- lib/yard/templates/default/fulldoc/html/setup.rb
-- lib/yard/templates/default/layout/html/headers.erb
-- lib/yard/templates/default/layout/html/search.erb
-- lib/yard/templates/default/module/html/step_transforms.erb
-- lib/yard/templates/default/module/setup.rb
-- lib/yard/templates/default/scenario/html/scenario.erb
-- lib/yard/templates/default/scenario/setup.rb
-- lib/yard/templates/default/steptransformers/html/stepdefinition.erb
-- lib/yard/templates/default/steptransformers/setup.rb
-- lib/yard/templates/default/tagusage/html/tagusage.erb
-- lib/yard/templates/default/tagusage/setup.rb
-- spec/city/feature_parser_spec_examples.rb
-- spec/city/gherkin_loader_spec.rb
-- spec/city/test.feature
-- spec/city/yard_handlers_cucumber_spec.rb
-- spec/city/yard_namespace_object_spec.rb
-- spec/city/yard_parser_cucumber_spec.rb
-- spec/city/yard_rb_extensions_spec.rb
-- spec/spec_helper.rb
+- lib/yard/templates/helpers/base_helper.rb
 - cucumber-in-the-yard.gemspec
 has_rdoc: true
 homepage: http://github.com/burtlo/Cucumber-In-The-Yard

data/lib/yard/code_objects/tags.rb

@@ -1,55 +0,0 @@
-
-
-module YARD::CodeObjects::Cucumber
-
-  class Tag < Base
-
-    attr_accessor :value, :feature, :scenario
-    
-  end
-
-  
-  class TagUsage < Base
-
-    attr_reader :value
-
-    attr_accessor :tags
-
-
-    def push(tag)
-      @tags = [] unless @tags
-      @tags << tag
-
-      if tag.scenario
-        @scenario_count = 0 unless @scenario_count
-        @scenario_count += 1 
-      else
-        @feature_count = 0 unless @feature_count
-        @indirect_scenario_count = 0 unless @indirect_scenario_count
-        @feature_count += 1
-        @indirect_scenario_count += tag.feature.scenarios.length
-      end
-
-    end
-
-    def scenario_count
-      @scenario_count || 0
-    end
-
-    def feature_count
-      @feature_count || 0
-    end
-
-    def indirect_scenario_count
-      @indirect_scenario_count || 0
-    end
-
-    def total_scenario_count
-      scenario_count + indirect_scenario_count
-    end        
-
-    alias_method :<<, :push
-
-  end
-
-end