yard_ast_editable 0.1.2 → 0.1.3

data/Gemfile

@@ -3,7 +3,7 @@ source "http://rubygems.org"
 # Example:
 #   gem "activesupport", ">= 2.3.5"
 
-gem "yard", ">= 0.6.3"
+gem "yard", "= 0.6.3"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/yard_ast_editable.rb

@@ -30,11 +30,11 @@ module YardAstEditable
       result = block.source
       case block.type
       when :do_block then
-        result.sub!(/^do\s*(\|.*?\|)?\n?/, '')
-        result.sub!(/end$/, '')
+        result.sub!(/\Ado\s*(\|.*?\|)?\n?/, '')
+        result.sub!(/end[\s\n]*\Z/, '')
       when :brace_block then
         result.sub!(/^\{\s*(\|.*?\|)?\n?/, '')
-        result.sub!(/\}$/, '')
+        result.sub!(/\}[\s\n]*\Z/, '')
       end
       result
     end

data/spec/yard_ast_editable_spec.rb

@@ -64,18 +64,18 @@ describe "YardAstEditable" do
   end
 
   describe :children_source do
-    
+
     it "do...endブロックの中身を取得" do
       node = @ast.fcall_by_ident(:foo1){|fcall|
         fcall.arguments.length == 2 && (n = fcall.arguments.first; n.source == ":name2")
       }
-      fcall = YardAstEditable::Fcall.new(node)      
+      fcall = YardAstEditable::Fcall.new(node)
       fcall.block_content_source.should == %q{  # bar1 #3 S
   bar1{ puts "name2 bar1" }
   # bar1 #3 E
 }
     end
-    
+
     it "{}ブロックの中身を取得" do
       node = @ast.fcall_by_ident(:bar1){|fcall|
         fcall.arguments.length == 1 && (n = fcall.arguments.first; n.source == '"name2"')
@@ -86,7 +86,7 @@ describe "YardAstEditable" do
       # b2 E
     }
     end
-    
+
   end
 
 

data/spec/yard_ast_spec.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "YardAst" do
@@ -142,4 +143,42 @@ describe "YardAst" do
     end
   end
 
+
+ describe YardAstEditable::Fcall do
+    before do
+      script = <<-EOS
+instance("i-12345678") do
+  agent("mm_system_agent") do
+    service("system")
+  end
+end
+EOS
+      ast = YARD::Parser::Ruby::RubyParser.new(script, nil).parse.root
+      node = ast.fcall_by_ident(:instance){|fcall|
+        !fcall.arguments.empty? && (n = fcall.arguments.first; n.first.source == "i-12345678")
+      }
+      @caller = YardAstEditable::Fcall.new(node)
+    end
+
+    describe :block_content_source do
+      # reported by totty. ありがとー
+      it "[BUG] ネストしているブロックの内部のendの処理がおかしい" do
+        # バグ修正前は以下のようになっていました。
+        # -  agent("mm_system_agent") do
+        # +agent("mm_system_agent") do
+        #      service("system")
+        # -  end
+        # +  
+        # +end
+        @caller.block.nil?.should be_false
+        result = @caller.block_content_source
+        result.should == <<-EXPECT
+agent("mm_system_agent") do
+    service("system")
+  end
+EXPECT
+      end
+    end
+  end
+
 end

data/yard_ast_editable.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{yard_ast_editable}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["akimatter"]
-  s.date = %q{2010-12-06}
+  s.date = %q{2011-01-27}
   s.description = %q{yard extension to modify source code by using AST Node}
   s.email = %q{akm2000@gmail.com}
   s.extra_rdoc_files = [
@@ -46,20 +46,20 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<yard>, [">= 0.6.3"])
+      s.add_runtime_dependency(%q<yard>, ["= 0.6.3"])
       s.add_development_dependency(%q<rspec>, ["~> 2.1.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.1"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
     else
-      s.add_dependency(%q<yard>, [">= 0.6.3"])
+      s.add_dependency(%q<yard>, ["= 0.6.3"])
       s.add_dependency(%q<rspec>, ["~> 2.1.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
       s.add_dependency(%q<rcov>, [">= 0"])
     end
   else
-    s.add_dependency(%q<yard>, [">= 0.6.3"])
+    s.add_dependency(%q<yard>, ["= 0.6.3"])
     s.add_dependency(%q<rspec>, ["~> 2.1.0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.1"])

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - akimatter
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-06 00:00:00 +09:00
+date: 2011-01-27 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,7 +22,7 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
@@ -126,7 +126,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3450069555588162524
+      hash: -2766169714054516106
       segments: 
       - 0
       version: "0"