CoffeeTags 0.1.1 → 0.1.2

data/lib/CoffeeTags/parser.rb

@@ -23,7 +23,9 @@ module Coffeetags
       @token_regex = /([@a-zA-Z0-9_]*)\s*[:=]{1}/
       @iterator_regex = /^\s*for\s*([a-zA-Z0-9_]*)\s*/
       @comment_regex = /^\s*#/
-      @block_comment_regex = /^\s*###/
+      @start_block_comment_regex = /^\s*###/
+      @end_block_comment_regex = /^.*###/
+      @oneline_block_comment_regex = /^\s*###.*###/
       @comment_lines = mark_commented_lines
     end
 
@@ -34,12 +36,18 @@ module Coffeetags
       [].tap do |reg|
         in_block_comment = false
         line_no = 0
+        start_block = 0
+        end_block = 0
         @source.each_line do |line|
           line_no = line_no+1
 
-          in_block_comment =  !(in_block_comment) if line =~ @block_comment_regex
-          reg << line_no if in_block_comment
-          reg << line_no if line =~ @comment_regex and not in_block_comment
+          start_block = line_no if !in_block_comment and line =~ @start_block_comment_regex
+          end_block = line_no if start_block < line_no and line =~ @end_block_comment_regex
+          end_block = line_no if line =~ @oneline_block_comment_regex
+
+          in_block_comment = end_block < start_block
+
+          reg << line_no if in_block_comment or end_block == line_no or line =~ @comment_regex
         end
       end
     end

data/lib/CoffeeTags/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Coffeetags
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/fixtures/blockcomment.coffee

@@ -5,3 +5,22 @@ echoes
 ###
 
 echo2 :-> console.log 'echo'
+
+### One line blockcomment ###
+foo2 : (x) -> console.log 'bar #{x}'
+
+###
+not so well formatted blockcomment
+echo4 :-> console.log 'echo4' ###
+baz : (x, y) ->
+  console.log 'baz #{x} : #{y}'
+
+###
+well formatted
+block comment
+###
+
+echo3 :-> console.log 'echo'
+
+### One line blockcomment ###
+foo : (x) -> console.log 'bar #{x}'

data/spec/fixtures/blockcomment.ctags

@@ -3,5 +3,9 @@
 !_TAG_PROGRAM_AUTHOR	Łukasz Korecki /lukasz@coffeesounds.com/
 !_TAG_PROGRAM_NAME	CoffeeTags	//
 !_TAG_PROGRAM_URL	https://github.com/lukaszkorecki/CoffeeTags	/GitHub repository/
-!_TAG_PROGRAM_VERSION	0.1.0	//
+!_TAG_PROGRAM_VERSION	0.1.2	//
+baz	spec/fixtures/blockcomment.coffee	/^baz : (x, y) ->$/;"	f	lineno:15	object:window	type:function
 echo2	spec/fixtures/blockcomment.coffee	/^echo2 :-> console.log 'echo'$/;"	f	lineno:7	object:window	type:function
+echo3	spec/fixtures/blockcomment.coffee	/^echo3 :-> console.log 'echo'$/;"	f	lineno:23	object:window	type:function
+foo	spec/fixtures/blockcomment.coffee	/^foo : (x) -> console.log 'bar #{x}'$/;"	f	lineno:26	object:window	type:function
+foo2	spec/fixtures/blockcomment.coffee	/^foo2 : (x) -> console.log 'bar #{x}'$/;"	f	lineno:10	object:window	type:function

data/spec/fixtures/campfire.js.tags

@@ -3,7 +3,7 @@
 !_TAG_PROGRAM_AUTHOR	Łukasz Korecki /lukasz@coffeesounds.com/
 !_TAG_PROGRAM_NAME	CoffeeTags	//
 !_TAG_PROGRAM_URL	https://github.com/lukaszkorecki/CoffeeTags	/GitHub repository/
-!_TAG_PROGRAM_VERSION	0.1.0	//
+!_TAG_PROGRAM_VERSION	0.1.1	//
 bump	spec/fixtures/campfire.coffee	/^  bump : ->$/;"	f	lineno:46	object:Test	type:function
 constructor	spec/fixtures/campfire.coffee	/^  constructor: (api_key, host) ->$/;"	f	lineno:8	object:Campfire	type:function
 handlers	spec/fixtures/campfire.coffee	/^  handlers: (callbacks) ->$/;"	f	lineno:14	object:Campfire	type:function

data/spec/fixtures/out.test-two.ctags

@@ -3,7 +3,7 @@
 !_TAG_PROGRAM_AUTHOR	Łukasz Korecki /lukasz@coffeesounds.com/
 !_TAG_PROGRAM_NAME	CoffeeTags	//
 !_TAG_PROGRAM_URL	https://github.com/lukaszkorecki/CoffeeTags	/GitHub repository/
-!_TAG_PROGRAM_VERSION	0.1.0	//
+!_TAG_PROGRAM_VERSION	0.1.2	//
 @filter	spec/fixtures/test.coffee	/^    @filter = ->$/;"	f	lineno:14	object:Wat.ho	type:function
 _loop	spec/fixtures/test.coffee	/^_loop = (x) ->$/;"	f	lineno:19	object:window	type:function
 beam_magnum	spec/fixtures/test.coffee	/^beam_magnum : -> deployed(true)$/;"	f	lineno:44	object:window	type:function

data/spec/fixtures/out.test.ctags

@@ -3,7 +3,7 @@
 !_TAG_PROGRAM_AUTHOR	Łukasz Korecki /lukasz@coffeesounds.com/
 !_TAG_PROGRAM_NAME	CoffeeTags	//
 !_TAG_PROGRAM_URL	https://github.com/lukaszkorecki/CoffeeTags	/GitHub repository/
-!_TAG_PROGRAM_VERSION	0.1.0	//
+!_TAG_PROGRAM_VERSION	0.1.2	//
 @filter	spec/fixtures/test.coffee	/^    @filter = ->$/;"	f	lineno:14	object:Wat.ho	type:function
 _loop	spec/fixtures/test.coffee	/^_loop = (x) ->$/;"	f	lineno:19	object:window	type:function
 beam_magnum	spec/fixtures/test.coffee	/^beam_magnum : -> deployed(true)$/;"	f	lineno:44	object:window	type:function

data/spec/parser_spec.rb

@@ -186,7 +186,37 @@ describe 'CoffeeTags::Parser' do
           :source=>"echo2 :-> console.log 'echo'",
           :line=>7,
           :kind=>"f",
-          :name=>"echo2"}]
+          :name=>"echo2"},
+          {:level=>0,
+          :parent=>"window",
+          :source=>"foo2 : (x) -> console.log 'bar \#{x}'",
+          :line=>10,
+          :kind=>"f",
+          :name=>"foo2"},
+          {:level=>0,
+          :parent=>"window",
+          :source=>"baz : (x, y) ->",
+          :line=>15,
+          :kind=>"f",
+          :name=>"baz"},
+          {:level=>2,
+           :parent=>"baz",
+           :source=>"  console.log 'baz \#{x} : \#{y}'",
+           :line=>16,
+           :kind=>"o",
+           :name=>""},
+          {:level=>0,
+          :parent=>"window",
+          :source=>"echo3 :-> console.log 'echo'",
+          :line=>23,
+          :kind=>"f",
+          :name=>"echo3"},
+          {:level=>0,
+          :parent=>"window",
+          :source=>"foo : (x) -> console.log 'bar \#{x}'",
+          :line=>26,
+          :kind=>"f",
+          :name=>"foo"}]
       }
 
       subject {
@@ -196,7 +226,9 @@ describe 'CoffeeTags::Parser' do
       }
 
       it 'ignores block comments when parsing the contents' do
-        subject.tree.first.should == blockcomment_tree.first
+        subject.tree.zip(blockcomment_tree).each do |subject_node, blockcomment_node|
+          subject_node.should == blockcomment_node
+        end
       end
 
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: CoffeeTags
 version: !ruby/object:Gem::Version
-  version: 0.1.1
   prerelease: 
+  version: 0.1.2
 platform: ruby
 authors:
 - Łukasz Korecki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-14 00:00:00.000000000 Z
+date: 2013-07-31 00:00:00.000000000 Z
 dependencies: []
 description: CoffeeTags generates ctags compatibile tags for CoffeeScript.
 email:
@@ -60,38 +60,27 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
+      segments:
+      - 0
+      hash: 2580621725479967409
       version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
+      segments:
+      - 0
+      hash: 2580621725479967409
       version: '0'
+  none: false
 requirements: []
 rubyforge_project: CoffeeTags
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: tags generator for CoffeeScript
-test_files:
-- spec/coffeetags_spec.rb
-- spec/fixtures/blockcomment.coffee
-- spec/fixtures/blockcomment.ctags
-- spec/fixtures/campfire.coffee
-- spec/fixtures/campfire.js
-- spec/fixtures/campfire.js.tags
-- spec/fixtures/class_with_at.coffee
-- spec/fixtures/class_with_dot.coffee
-- spec/fixtures/exported_class.coffee
-- spec/fixtures/out.test-two.ctags
-- spec/fixtures/out.test.ctags
-- spec/fixtures/test.coffee
-- spec/fixtures/test_tree.yaml
-- spec/fixtures/tree.yaml
-- spec/formatter_spec.rb
-- spec/parser_spec.rb
-- spec/spec_helper.rb
+test_files: []