starscope 1.3.3 → 1.4.0

data/test/unit/exportable_test.rb

@@ -1,21 +1,20 @@
 require File.expand_path('../../test_helper', __FILE__)
 
 describe Starscope::Exportable do
-
   before do
     @db = Starscope::DB.new(Starscope::Output.new(:quiet))
     @db.add_paths([FIXTURES])
     @buf = StringIO.new
   end
 
-  it "must export to ctags" do
+  it 'must export to ctags' do
     @db.export_to(:ctags, @buf)
     @buf.rewind
     lines = @buf.lines.to_a
     lines.must_include "NoTableError\t#{FIXTURES}/sample_ruby.rb\t/^  class NoTableError < StandardError; end$/;\"\tkind:c\tlanguage:Ruby\n"
   end
 
-  it "must export to cscope" do
+  it 'must export to cscope' do
     @db.export_to(:cscope, @buf)
     @buf.rewind
     lines = @buf.lines.to_a
@@ -24,11 +23,10 @@ describe Starscope::Exportable do
     lines.must_include "\tgSunday\n"
     lines.must_include "\t`add_file\n"
     lines.must_include "\t}}\n"
-    lines.must_include "13 class \n"
+    lines.must_include "12 class \n"
 
     lines.wont_include "= [\n"
     lines.wont_include "4 LANGS = [\n"
     lines.wont_include "116 tmpdb[entry[:file]][entry[:line_no]] ||= []\n"
   end
-
 end

data/test/unit/fragment_extractor_test.rb

@@ -0,0 +1,38 @@
+require File.expand_path('../../test_helper', __FILE__)
+
+describe Starscope::FragmentExtractor do
+  module ::Starscope::Lang::Dummy; end
+
+  before do
+    @extractor = Starscope::FragmentExtractor.new(:Dummy, [
+      { :frag => "def foo; end\n", :line_no => 12 },
+      { :frag => "def bar\n", :line_no => 15 },
+      { :frag => "end\n", :line_no => 29 }
+    ])
+    @reconstructed = "def foo; end\ndef bar\nend"
+  end
+
+  it 'must pass reconstructed text to the child' do
+    ::Starscope::Lang::Dummy.expects(:extract).with(:foo, @reconstructed)
+    @extractor.extract(:foo, '---')
+  end
+
+  it 'must pass along extractor metadata from the child' do
+    ::Starscope::Lang::Dummy.expects(:extract).returns :a => 1, :b => 3
+    @extractor.extract(:foo, '---').must_equal :a => 1, :b => 3
+  end
+
+  it 'must pass along the name from the child' do
+    @extractor.name.must_equal ::Starscope::Lang::Dummy.name
+  end
+
+  it 'must override-merge yielded args based on line number' do
+    ::Starscope::Lang::Dummy.expects(:extract).yields(:foo, :bar, :line_no => 2, :foo => :bar)
+
+    @extractor.extract(:foo, '---') do |tbl, name, args|
+      tbl.must_equal :foo
+      name.must_equal :bar
+      args.must_equal :line_no => 15, :foo => :bar
+    end
+  end
+end

data/test/unit/langs/erb_test.rb

@@ -0,0 +1,36 @@
+require File.expand_path('../../../test_helper', __FILE__)
+
+describe Starscope::Lang::ERB do
+  before do
+    @frags = []
+    Starscope::Lang::ERB.extract(ERB_SAMPLE, File.read(ERB_SAMPLE)) do |tbl, name, args|
+      tbl.must_equal FRAGMENT
+      name.must_equal :Ruby
+      @frags << args
+    end
+  end
+
+  it 'must match erb files' do
+    Starscope::Lang::ERB.match_file(ERB_SAMPLE).must_equal true
+  end
+
+  it 'must not match non-erb files' do
+    Starscope::Lang::ERB.match_file(GOLANG_SAMPLE).must_equal false
+    Starscope::Lang::ERB.match_file(EMPTY_FILE).must_equal false
+  end
+
+  it 'must identify all fragments' do
+    @frags.must_equal [{ :frag => ' if foo ', :line_no => 1 },
+                       { :frag => ' elsif bar ', :line_no => 3 },
+                       { :frag => ' end ', :line_no => 5 },
+                       { :frag => ' case x', :line_no => 8 },
+                       { :frag => 'when :bar ', :line_no => 9 },
+                       { :frag => ' magic ', :line_no => 9 },
+                       { :frag => ' when :baz', :line_no => 9 },
+                       { :frag => 'when :foo ', :line_no => 10 },
+                       { :frag => ' end ', :line_no => 12 },
+                       { :frag => ' foo ', :line_no => 14 },
+                       { :frag => ' bar ', :line_no => 14 },
+                       { :frag => ' baz ', :line_no => 14 }]
+  end
+end

data/test/unit/langs/golang_test.rb

@@ -3,24 +3,24 @@ require File.expand_path('../../../test_helper', __FILE__)
 describe Starscope::Lang::Go do
   before do
     @db = {}
-    Starscope::Lang::Go.extract(GOLANG_SAMPLE) do |tbl, name, args|
+    Starscope::Lang::Go.extract(GOLANG_SAMPLE, File.read(GOLANG_SAMPLE)) do |tbl, name, args|
       @db[tbl] ||= []
       @db[tbl] << Starscope::DB.normalize_record(GOLANG_SAMPLE, name, args)
     end
   end
 
-  it "must match golang files" do
+  it 'must match golang files' do
     Starscope::Lang::Go.match_file(GOLANG_SAMPLE).must_equal true
   end
 
-  it "must not match non-golang files" do
+  it 'must not match non-golang files' do
     Starscope::Lang::Go.match_file(RUBY_SAMPLE).must_equal false
     Starscope::Lang::Go.match_file(EMPTY_FILE).must_equal false
   end
 
-  it "must identify definitions" do
+  it 'must identify definitions' do
     @db.keys.must_include :defs
-    defs = @db[:defs].map {|x| x[:name][-1]}
+    defs = @db[:defs].map { |x| x[:name][-1] }
 
     defs.must_include :a
     defs.must_include :b
@@ -40,14 +40,14 @@ describe Starscope::Lang::Go do
     defs.wont_include :"0x03"
   end
 
-  it "must identify endings" do
+  it 'must identify endings' do
     @db.keys.must_include :end
     @db[:end].count.must_equal 7
   end
 
-  it "must identify function calls" do
+  it 'must identify function calls' do
     @db.keys.must_include :calls
-    calls = @db[:calls].group_by {|x| x[:name][-1]}
+    calls = @db[:calls].group_by { |x| x[:name][-1] }
 
     calls.keys.must_include :a
     calls.keys.must_include :b
@@ -62,9 +62,9 @@ describe Starscope::Lang::Go do
     calls[:Errorf].count.must_equal 1
   end
 
-  it "must identify variable assignments" do
+  it 'must identify variable assignments' do
     @db.keys.must_include :assigns
-    assigns = @db[:assigns].group_by {|x| x[:name][-1]}
+    assigns = @db[:assigns].group_by { |x| x[:name][-1] }
 
     assigns.keys.must_include :x
     assigns.keys.must_include :y
@@ -80,14 +80,14 @@ describe Starscope::Lang::Go do
     assigns[:m].count.must_equal 2
   end
 
-  it "must identify imports" do
+  it 'must identify imports' do
     @db.keys.must_include :imports
-    imports = @db[:imports].group_by {|x| x[:name][-1]}
+    imports = @db[:imports].group_by { |x| x[:name][-1] }
 
     imports.keys.must_include :fmt
   end
 
-  it "must correctly find the end of string constants" do
+  it 'must correctly find the end of string constants' do
     Starscope::Lang::Go.find_end_of_string('"123"foo', 0).must_equal 4
     Starscope::Lang::Go.find_end_of_string('a"123"foo', 0).must_equal 1
     Starscope::Lang::Go.find_end_of_string('a"123"foo', 1).must_equal 5

data/test/unit/langs/ruby_test.rb

@@ -3,25 +3,25 @@ require File.expand_path('../../../test_helper', __FILE__)
 describe Starscope::Lang::Ruby do
   before do
     @db = {}
-    Starscope::Lang::Ruby.extract(RUBY_SAMPLE) do |tbl, name, args|
+    Starscope::Lang::Ruby.extract(RUBY_SAMPLE, File.read(RUBY_SAMPLE)) do |tbl, name, args|
       @db[tbl] ||= []
       @db[tbl] << Starscope::DB.normalize_record(RUBY_SAMPLE, name, args)
     end
   end
 
-  it "must match ruby files" do
+  it 'must match ruby files' do
     Starscope::Lang::Ruby.match_file(RUBY_SAMPLE).must_equal true
     Starscope::Lang::Ruby.match_file('bin/starscope').must_equal true
   end
 
-  it "must not match non-ruby files" do
+  it 'must not match non-ruby files' do
     Starscope::Lang::Ruby.match_file(GOLANG_SAMPLE).must_equal false
     Starscope::Lang::Ruby.match_file(EMPTY_FILE).must_equal false
   end
 
-  it "must identify function definitions" do
+  it 'must identify function definitions' do
     @db.keys.must_include :defs
-    defs = @db[:defs].map {|x| x[:name][-1]}
+    defs = @db[:defs].map { |x| x[:name][-1] }
 
     defs.must_include :DB
     defs.must_include :NoTableError
@@ -30,18 +30,18 @@ describe Starscope::Lang::Ruby do
     defs.must_include :files_from_path
   end
 
-  it "must identify constant definitions" do
-    @db[:defs].map {|x| x[:name][-1]}.must_include :PBAR_FORMAT
+  it 'must identify constant definitions' do
+    @db[:defs].map { |x| x[:name][-1] }.must_include :PBAR_FORMAT
   end
 
-  it "must identify endings" do
+  it 'must identify endings' do
     @db.keys.must_include :end
     @db[:end].count.must_equal 13
   end
 
-  it "must identify function calls" do
+  it 'must identify function calls' do
     @db.keys.must_include :calls
-    calls = @db[:calls].group_by {|x| x[:name][-1]}
+    calls = @db[:calls].group_by { |x| x[:name][-1] }
 
     calls.keys.must_include :add_file
     calls.keys.must_include :each
@@ -49,9 +49,9 @@ describe Starscope::Lang::Ruby do
     calls[:each].count.must_equal 8
   end
 
-  it "must identify variable assignments" do
+  it 'must identify variable assignments' do
     @db.keys.must_include :assigns
-    assigns = @db[:assigns].group_by {|x| x[:name][-1]}
+    assigns = @db[:assigns].group_by { |x| x[:name][-1] }
 
     assigns.keys.must_include :pbar
     assigns.keys.must_include :PBAR_FORMAT
@@ -60,7 +60,7 @@ describe Starscope::Lang::Ruby do
     assigns[:PBAR_FORMAT].count.must_equal 1
     assigns[:foo].count.must_equal 1
 
-    assigns.keys.wont_include "=".to_sym
-    assigns.keys.wont_include "<".to_sym
+    assigns.keys.wont_include '='.to_sym
+    assigns.keys.wont_include '<'.to_sym
   end
 end

data/test/unit/output_test.rb

@@ -1,29 +1,27 @@
 require File.expand_path('../../test_helper', __FILE__)
 
 describe Starscope::Output do
-
-  it "must be quiet" do
+  it 'must be quiet' do
     buf = StringIO.new
     out = Starscope::Output.new(:quiet, buf)
-    out.normal("foo")
-    out.extra("foo")
+    out.normal('foo')
+    out.extra('foo')
     buf.size.must_equal 0
   end
 
-  it "must be normal" do
+  it 'must be normal' do
     buf = StringIO.new
     out = Starscope::Output.new(:normal, buf)
-    out.normal("foo")
-    out.extra("foo")
+    out.normal('foo')
+    out.extra('foo')
     buf.size.must_equal 4
   end
 
-  it "must be verbose" do
+  it 'must be verbose' do
     buf = StringIO.new
     out = Starscope::Output.new(:verbose, buf)
-    out.normal("foo")
-    out.extra("foo")
+    out.normal('foo')
+    out.extra('foo')
     buf.size.must_equal 8
   end
-
 end

data/test/unit/queryable_test.rb

@@ -1,11 +1,10 @@
 require File.expand_path('../../test_helper', __FILE__)
 
 describe Starscope::Queryable do
-
   SAMPLE_RECORDS = [
-    {:name => [:"[abc"], :foo => "baz"},
-    {:name => [:"not a match"], :foo => "bar", :x => "y"},
-    {:name => [:a, :b, :c, :d], :file => :somefile},
+    { :name => [:"[abc"], :foo => 'baz' },
+    { :name => [:"not a match"], :foo => 'bar', :x => 'y' },
+    { :name => [:a, :b, :c, :d], :file => :somefile }
   ]
 
   class MockQuerable
@@ -29,34 +28,34 @@ describe Starscope::Queryable do
     @mock = MockQuerable.new
   end
 
-  it "must handle empty input" do
-    @mock.query(:empty_table, "foo").must_be_empty
+  it 'must handle empty input' do
+    @mock.query(:empty_table, 'foo').must_be_empty
   end
 
-  it "must handle scoped queries" do
-    @mock.query(:mytable, "a::b::").must_equal [SAMPLE_RECORDS[2]]
+  it 'must handle scoped queries' do
+    @mock.query(:mytable, 'a::b::').must_equal [SAMPLE_RECORDS[2]]
   end
 
-  it "must handle regex queries" do
-    @mock.query(:mytable, "a[bc]{2}").must_equal [SAMPLE_RECORDS[0]]
+  it 'must handle regex queries' do
+    @mock.query(:mytable, 'a[bc]{2}').must_equal [SAMPLE_RECORDS[0]]
 
-    @mock.query(:mytable, "a.*d").must_equal [SAMPLE_RECORDS[2]]
+    @mock.query(:mytable, 'a.*d').must_equal [SAMPLE_RECORDS[2]]
   end
 
-  it "must handle malformed regexes" do
-    @mock.query(:mytable, "[abc").must_equal [SAMPLE_RECORDS[0]]
+  it 'must handle malformed regexes' do
+    @mock.query(:mytable, '[abc').must_equal [SAMPLE_RECORDS[0]]
   end
 
-  it "must handle simple filters" do
-    @mock.query(:mytable, ".*", :foo => "bar").must_equal [SAMPLE_RECORDS[1]]
+  it 'must handle simple filters' do
+    @mock.query(:mytable, '.*', :foo => 'bar').must_equal [SAMPLE_RECORDS[1]]
   end
 
-  it "must handle multiple filters" do
-    @mock.query(:mytable, ".*", :foo => "bar", :x => "y").must_equal [SAMPLE_RECORDS[1]]
-    @mock.query(:mytable, ".*", :foo => "bar", :x => "nope").must_be_empty
+  it 'must handle multiple filters' do
+    @mock.query(:mytable, '.*', :foo => 'bar', :x => 'y').must_equal [SAMPLE_RECORDS[1]]
+    @mock.query(:mytable, '.*', :foo => 'bar', :x => 'nope').must_be_empty
   end
 
-  it "must handle filters on file properties" do
-    @mock.query(:mytable, ".*", :lang => "ruby").must_equal [SAMPLE_RECORDS[2]]
+  it 'must handle filters on file properties' do
+    @mock.query(:mytable, '.*', :lang => 'ruby').must_equal [SAMPLE_RECORDS[2]]
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: starscope
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.4.0
 platform: ruby
 authors:
 - Evan Huus
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-08 00:00:00.000000000 Z
+date: 2015-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0.3
+        version: 2.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0.3
+        version: 2.2.2
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
@@ -144,6 +144,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
@@ -158,7 +159,8 @@ files:
 - lib/starscope.rb
 - lib/starscope/db.rb
 - lib/starscope/exportable.rb
-- lib/starscope/langs/coffeescript.rb
+- lib/starscope/fragment_extractor.rb
+- lib/starscope/langs/erb.rb
 - lib/starscope/langs/go.rb
 - lib/starscope/langs/ruby.rb
 - lib/starscope/matcher.rb
@@ -167,18 +169,23 @@ files:
 - lib/starscope/version.rb
 - starscope.gemspec
 - test/fixtures/db_added_files.json
+- test/fixtures/db_missing_language.json
 - test/fixtures/db_old.json.gz
 - test/fixtures/db_old_extractor.json
+- test/fixtures/db_old_subextractor.json
 - test/fixtures/db_out_of_date.json
 - test/fixtures/db_removed_files.json
 - test/fixtures/db_up_to_date.json
 - test/fixtures/empty
+- test/fixtures/sample_erb.erb
 - test/fixtures/sample_golang.go
 - test/fixtures/sample_ruby.rb
 - test/functional/starscope_test.rb
 - test/test_helper.rb
 - test/unit/db_test.rb
 - test/unit/exportable_test.rb
+- test/unit/fragment_extractor_test.rb
+- test/unit/langs/erb_test.rb
 - test/unit/langs/golang_test.rb
 - test/unit/langs/ruby_test.rb
 - test/unit/output_test.rb
@@ -203,24 +210,29 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.3
 signing_key: 
 specification_version: 4
 summary: A code indexer and analyzer
 test_files:
 - test/fixtures/db_added_files.json
+- test/fixtures/db_missing_language.json
 - test/fixtures/db_old.json.gz
 - test/fixtures/db_old_extractor.json
+- test/fixtures/db_old_subextractor.json
 - test/fixtures/db_out_of_date.json
 - test/fixtures/db_removed_files.json
 - test/fixtures/db_up_to_date.json
 - test/fixtures/empty
+- test/fixtures/sample_erb.erb
 - test/fixtures/sample_golang.go
 - test/fixtures/sample_ruby.rb
 - test/functional/starscope_test.rb
 - test/test_helper.rb
 - test/unit/db_test.rb
 - test/unit/exportable_test.rb
+- test/unit/fragment_extractor_test.rb
+- test/unit/langs/erb_test.rb
 - test/unit/langs/golang_test.rb
 - test/unit/langs/ruby_test.rb
 - test/unit/output_test.rb