yard-minitest-spec 0.1.2 → 0.1.4

data/examples/spec_abc.rb

@@ -0,0 +1,108 @@
+# encoding: utf-8
+
+require 'minitest/spec'
+require 'minitest/autorun'
+
+module A
+  module B
+    class C
+      def itest
+        'test instance test'
+      end
+     def self.ctest
+        'test class test'
+      end
+      class D
+        class E
+          def self.test
+            'test e'
+          end
+        end
+        def test
+          'test d'
+        end
+      end
+    end
+  end
+end
+
+module A::B
+  describe 'C#itest' do
+    it 'has a new method' do
+      C.new.ctest.must_be_instance_of String
+    end
+  end
+  describe 'X#bob' do
+    it 'has a new method' do
+      A::B::C.ctest.must_be_instance_of String
+    end
+  end
+  describe 'X#bob' do
+    it 'new' do
+      A::B::C.ctest.must_be_instance_of String
+    end
+  end
+end
+
+  describe 'X#bob' do
+    it 'old' do
+      A::B::C.ctest.must_be_instance_of String
+    end
+  end
+
+describe 'X#bob' do
+  it 'has a new method' do
+    A::B::C.ctest.must_be_instance_of String
+  end
+end
+
+describe A::B::C do
+  describe ':ctest' do
+    it 'has a new method' do
+      A::B::C.ctest.must_be_instance_of String
+    end
+  end
+  describe '#itest' do
+    it 'has a new method' do
+      A::B::C.new.itest.must_be_instance_of String
+    end
+  end
+  describe ':ctest' do
+    it 'has a new method' do
+      A::B::C.ctest.must_be_instance_of String
+      A::B::C.ctest.must_equal 'test class test'
+    end
+    it 'has a old method' do
+      A::B::C.ctest.must_be_instance_of String
+      A::B::C.ctest.must_equal 'test class test'
+    end
+  end
+end
+
+describe A do
+  describe B do
+    describe C do
+      describe ':ctest' do
+        it 'has a new method' do
+          A::B::C.ctest.must_be_instance_of String
+        end
+      end
+      describe '#itest' do
+        it 'has a new method' do
+          A::B::C.new.itest.must_be_instance_of String
+        end
+      end
+      describe ':ctest' do
+        it 'has a new method' do
+          A::B::C.ctest.must_be_instance_of String
+          A::B::C.ctest.must_equal 'test class test'
+        end
+        it 'has a old method' do
+          A::B::C.ctest.must_be_instance_of String
+          A::B::C.ctest.must_equal 'test class test'
+        end
+      end
+    end
+  end
+end
+

data/lib/yard-minitest-spec/handler.rb

@@ -1,37 +1,58 @@
 
 class YardMiniTestSpecDescribeHandler < YARD::Handlers::Ruby::Base
-  VERSION = YardMiniTestSpec::VERSION
   handles method_call(:describe)
   
   def process
-    objname = statement.parameters.first.jump(:string_content).source
-    if statement.parameters[1]
-      src = statement.parameters[1].jump(:string_content).source
-      objname += (src[0] == "#" ? "" : "::") + src
-    end
-    obj = {:spec => owner ? (owner[:spec] || "") : ""}
-    obj[:spec] += objname
-    parse_block(statement.last.last, owner: obj)
+    meth = statement.method_name(true).to_s
+    mod = register ModuleObject.new(namespace, 'spec')
+
+    name = statement.parameters.first.jump(:string_content).source
+    (mod[:bob] ||= []).push name
+    parse_block(statement.last.last, owner: mod)
+    mod[:bob].pop
   rescue YARD::Handlers::NamespaceMissingError
   end
 end
 
 class YardMiniTestSpecItHandler < YARD::Handlers::Ruby::Base
-  VERSION = YardMiniTestSpec::VERSION
   handles method_call(:it)
   
   def process
-    return if owner.nil?
-    obj = P(owner[:spec])
-    return if obj.is_a?(Proxy)
-    # ignore comments etc
-    if statement.last.last.source.chomp.size > 0
-      (obj[:specifications] ||= []) << {
-        name: statement.parameters.first.jump(:string_content).source,
-        file: statement.file,
-        line: statement.line,
-        source: statement.last.last.source.chomp
-      }
+    array = owner[:bob].dup
+
+    if array.size > 1
+      last = array.pop
+      start = array.join('::')
+      if last.match(/\A[A-Z]/)
+        name = start + '::' + last
+      else
+        name = start + last
+      end
+    else
+      name = array[0]
+    end
+
+    if name.match(/:[a-z]([^:]*)/)
+      name.gsub!(/:([a-z][^:]*)/, '.\1')
+    end
+    if obj = YARD::Registry.resolve(namespace, name)
+      # ignore :it with empty body
+      if statement.last.last.source.chomp.size > 0
+        (obj[:specifications] ||= []) << {
+          name: statement.parameters.first.jump(:string_content).source,
+          file: statement.file,
+          line: statement.line,
+          source: statement.last.last.source.chomp
+        }
+      end
+    else
+      if namespace.root?
+        text = "Nothing to describe for #{name}"
+      else
+        text = "Nothing to describe for #{name} in (#{namespace})"
+      end
+      log.warn text unless namespace[:duplicate] and namespace[:duplicate][name]
+      ( namespace[:duplicate] ||= {} )[name] = true 
     end
   end
 end

data/lib/yard-minitest-spec.rb

@@ -1,11 +1,7 @@
 
-class YardMiniTestSpec
-  VERSION = '0.1.2'
-end
-
 begin
-  YARD::Templates::Engine.register_template_path File.dirname(__FILE__) + '/../templates'
-  require File.join(File.dirname(__FILE__), 'yard-minitest-spec', 'handler') if RUBY19
-rescue
+YARD::Templates::Engine.register_template_path File.dirname(__FILE__) + '/../templates'
+require File.join(File.dirname(__FILE__), 'yard-minitest-spec', 'handler.rb') if RUBY19
+rescue => x
+  puts x
 end
-

data/templates/default/method_details/html/specs.erb

@@ -25,4 +25,4 @@
     <% end %>
   </ul>
 </div>
-<% end %>
+<% end %>

data/yard-minitest-spec.gemspec

@@ -7,7 +7,7 @@ require 'yard-minitest-spec'
 
 Gem::Specification.new do |s|
   s.name = "yard-minitest-spec"
-  s.version = YardMiniTestSpec::VERSION
+  s.version = '0.1.4'
 
   s.summary = "YARD plugin to list MiniTest::Spec specifications inside documentation"
   s.description = %q{
@@ -17,12 +17,13 @@ Gem::Specification.new do |s|
   }
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["G. Allen Morris III"]
-  s.date = "2012-03-15"
+  s.date = "2013-07-01"
   s.email = "gam3@gam3.net"
   s.homepage = "http://yardoc.org"
   s.require_paths = ["lib"]
   s.rubyforge_project = "yard-minitest-spec"
   s.rubygems_version = "1.8.11"
+  s.files = Dir['ChangeLog']
   s.files = Dir['lib/*/*.rb'] + Dir['lib/*.rb']
   s.files += Dir['*.gemspec']
   s.files += Dir['examples/*'] 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yard-minitest-spec
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-15 00:00:00.000000000 Z
+date: 2013-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
@@ -37,6 +37,7 @@ files:
 - lib/yard-minitest-spec/handler.rb
 - lib/yard-minitest-spec.rb
 - yard-minitest-spec.gemspec
+- examples/spec_abc.rb
 - templates/default/method_details/html/specs.erb
 - templates/default/method_details/setup.rb
 - templates/default/method_details/text/specs.erb