yard-cucumber 2.0.0 → 2.0.1

data/History.txt

@@ -1,3 +1,7 @@
+=== 2.0.1 / 2011-03-14
+
+- YARD 0.6.5 compatibility
+
 === 2.0.0 / 2011-02-08
 
 * Cucumber In The YARD becomes `yard-cucumber` and with that gains the

data/Rakefile

@@ -1,6 +1,6 @@
 require 'rake'
 
-task :default => :yardoc
+task :default => :gendoc
 
 task :clean do
   `rm -rf doc`
@@ -8,7 +8,7 @@ task :clean do
 end
 
 task :gendoc => :clean do
-  `yardoc -e ./lib/city.rb -p ./lib/templates 'example/**/*' --debug`
+  `yardoc -e ./lib/yard-cucumber.rb 'example/**/*' --debug`
 end
 
 task :gem do

data/lib/cucumber/city_builder.rb

@@ -191,19 +191,13 @@ module Cucumber
 
       private
       def matrix(gherkin_table)
-        gherkin_table.map do |gherkin_row|
-          row = gherkin_row.cells
-          class << row
-            attr_accessor :line
-          end
-          row.line = gherkin_row.line
-          row
-        end
+        gherkin_table.map {|gherkin_row| gherkin_row.cells }
       end
 
       def clone_table(base)
         base.map {|row| row.map {|cell| cell.dup }}
       end
+      
     end
   end
 end

data/lib/yard-cucumber.rb

@@ -4,7 +4,7 @@ require 'gherkin/formatter/tag_count_formatter'
 
 
 module CucumberInTheYARD
-  VERSION = '2.0.0' unless defined?(CucumberInTheYARD::VERSION)
+  VERSION = '2.0.1' unless defined?(CucumberInTheYARD::VERSION)
 end
 
 require File.dirname(__FILE__) + "/yard/code_objects/cucumber/base.rb"
@@ -37,6 +37,7 @@ require File.dirname(__FILE__) + "/yard/handlers/legacy/step_transform_handler.r
 require File.dirname(__FILE__) + "/yard/parser/source_parser.rb"
 require File.dirname(__FILE__) + "/yard/templates/helpers/base_helper.rb"
 
+require File.dirname(__FILE__) + "/yard/server/adapter.rb"
 require File.dirname(__FILE__) + "/yard/server/commands/list_command.rb"
 require File.dirname(__FILE__) + "/yard/server/router.rb"
 
@@ -44,10 +45,6 @@ require File.dirname(__FILE__) + "/yard/server/router.rb"
 # This registered template works for yardoc
 YARD::Templates::Engine.register_template_path File.dirname(__FILE__) + '/templates'
 
-# This template is for yard server but will raise an error if included here, it
-# is patched in the adapter setup.
-#YARD::Templates::Engine.register_template_path File.dirname(__FILE__) + '/docserver'
-
 # The following static paths and templates are for yard server
 YARD::Server.register_static_path File.dirname(__FILE__) + "/templates/default/fulldoc/html"
 YARD::Server.register_static_path File.dirname(__FILE__) + "/docserver/default/fulldoc/html"

data/lib/yard/parser/source_parser.rb

@@ -28,6 +28,10 @@ module YARD::Parser
         environment_files + support_files + other_files + feature_files
       end
 
+      #
+      # Overriding the parse_in_order method was necessary so that step definitions
+      # match to steps utilizing the load ordering that is used by Cucumber.
+      #
       def parse_in_order(*files)
         
         files = order_by_cucumber_standards(*files)

data/lib/yard/server/adapter.rb

@@ -7,6 +7,15 @@ module YARD
       
         alias_method :yard_setup, :setup
       
+        #
+        # To provide the templates necessary for `yard-cucumber` to integrate
+        # with YARD the adapter has to around-alias the setup method to place
+        # the `yard-cucumber` server templates as the last template in the list.
+        #
+        # When they are normally loaded with the plugin they cause an error with 
+        # the `yardoc` command. They are also not used because the YARD server
+        # templates are placed after all plugin templates. 
+        #
         def setup
           yard_setup
           YARD::Templates::Engine.template_paths += 
@@ -15,7 +24,12 @@ module YARD
         
         alias_method :yard_shutdown, :shutdown
 
-        def yard_shutdown
+        #
+        # Similar to the addition, it is good business to tear down the templates
+        # that were added by again around-aliasing the shutdown method.
+        #
+        def shutdown
+          yard_shutdown
           YARD::Templates::Engine.template_paths -= 
           [File.dirname(__FILE__) + '/../../templates',File.dirname(__FILE__) + '/../../docserver']
         end  

data/lib/yard/server/commands/list_command.rb

@@ -2,6 +2,9 @@ module YARD
   module Server
     module Commands
       
+      #
+      # List Features powers the features menu option in `yard server`
+      #
       class ListFeaturesCommand < ListCommand
         def type; :features end
         
@@ -11,6 +14,9 @@ module YARD
         end
       end
       
+      #
+      # List Tags powers the tags menu option in `yard server`
+      #
       class ListTagsCommand < ListCommand
         def type; :tags end
         

data/lib/yard/server/router.rb

@@ -3,7 +3,8 @@ module YARD
 
     #
     # The YARD::Server::Router needs the following modification,
-    # otherwise it perfectly suited for the requirements documents
+    # so that it will provide routing for the features and tags commands
+    # to their appropriate definitions
     #
     Router.class_eval do
 

metadata

@@ -2,7 +2,7 @@
 name: yard-cucumber
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors: 
 - Franklin Webber
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-08 00:00:00 -08:00
+date: 2011-03-14 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -134,7 +134,6 @@ files:
 - 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/server/adapter.rb
 - lib/yard/server/commands/list_command.rb
 - lib/yard/server/router.rb
@@ -144,7 +143,7 @@ homepage: http://github.com/burtlo/yard-cucumber
 licenses: []
 
 post_install_message: "\n\
-  (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::)\n\n  Thank you for installing yard-cucumber 2.0.0 / 2011-02-08.\n  \n  Changes:\n    \n  * Cucumber In The YARD becomes `yard-cucumber` and with that gains the\n    benefits of being a YARD plugin\n  \n\n\
+  (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::)\n\n  Thank you for installing yard-cucumber 2.0.1 / 2011-03-14.\n  \n  Changes:\n    \n  - YARD 0.6.5 compatibility\n  \n\n\
   (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::)\n\n"
 rdoc_options: 
 - --charset=UTF-8
@@ -165,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Cucumber Features in YARD

data/lib/yard/rake/city_task.rb

@@ -1,12 +0,0 @@
-module YARD::Rake
-  
-  class CitydocTask < YardocTask
-  
-    def initialize(name = :yard)
-      super
-      self.options += [ "-e", "#{ File.dirname(__FILE__)}/../../city.rb", "-p", "#{File.dirname(__FILE__)}/../../templates" ]
-    end
-    
-  end
-  
-end