starscope 1.4.1 → 1.5.0

data/test/unit/fragment_extractor_test.rb

@@ -1,13 +1,13 @@
-require File.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 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 }
+      { 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
@@ -18,8 +18,8 @@ describe Starscope::FragmentExtractor do
   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
+    ::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
@@ -27,12 +27,12 @@ describe Starscope::FragmentExtractor do
   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)
+    ::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
+      args.must_equal line_no: 15, foo: :bar
     end
   end
 end

data/test/unit/langs/erb_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 describe Starscope::Lang::ERB do
   before do
@@ -20,17 +20,17 @@ describe Starscope::Lang::ERB do
   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 }]
+    @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

@@ -1,4 +1,4 @@
-require File.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 describe Starscope::Lang::Go do
   before do

data/test/unit/langs/javascript_test.rb

@@ -0,0 +1,68 @@
+require_relative '../../test_helper'
+
+describe Starscope::Lang::Javascript do
+  before do
+    @db = {}
+    Starscope::Lang::Javascript.extract(JAVASCRIPT_EXAMPLE, File.read(JAVASCRIPT_EXAMPLE)) do |tbl, name, args|
+      @db[tbl] ||= []
+      @db[tbl] << Starscope::DB.normalize_record(JAVASCRIPT_EXAMPLE, name, args)
+    end
+  end
+
+  it 'must match js files' do
+    Starscope::Lang::Javascript.match_file(JAVASCRIPT_EXAMPLE).must_equal true
+  end
+
+  it 'must not match non-js files' do
+    Starscope::Lang::Javascript.match_file(RUBY_SAMPLE).must_equal false
+    Starscope::Lang::Javascript.match_file(EMPTY_FILE).must_equal false
+  end
+
+  it 'must identify definitions' do
+    @db.keys.must_include :defs
+    defs = @db[:defs].map { |x| x[:name][-1] }
+
+    defs.must_include :Component
+    defs.must_include :StyleSheet
+    defs.must_include :styles
+    defs.must_include :NavigatorRouteMapper
+    defs.must_include :LeftButton
+    defs.must_include :RightButton
+    defs.must_include :_tabItem
+    defs.must_include :render
+    defs.must_include :setRef
+    defs.must_include :route
+    defs.must_include :foo
+    defs.must_include :MyStat
+    defs.must_include :myStatFunc
+
+    defs.wont_include :setStyle
+    defs.wont_include :setState
+    defs.wont_include :fontFamily
+    defs.wont_include :navigator
+  end
+
+  it 'must only tag static classes once' do
+    @db[:defs].count { |x| x[:name][-1] == :MyStat }.must_equal 1
+  end
+
+  it 'must identify endings' do
+    @db.keys.must_include :end
+    @db[:end].count.must_equal 11
+  end
+
+  it 'must identify function calls' do
+    @db.keys.must_include :calls
+    calls = @db[:calls].group_by { |x| x[:name][-1] }
+
+    calls.keys.must_include :create
+    calls.keys.must_include :setStyle
+    calls.keys.must_include :pop
+    calls.keys.must_include :fetchData
+    calls.keys.must_include :setState
+    calls.keys.must_include :func1
+
+    calls[:pop].count.must_equal 1
+    calls[:_tabItem].count.must_equal 3
+  end
+end

data/test/unit/langs/ruby_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 describe Starscope::Lang::Ruby do
   before do

data/test/unit/output_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 describe Starscope::Output do
   it 'must be quiet' do

data/test/unit/queryable_test.rb

@@ -1,23 +1,23 @@
-require File.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 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
     include Starscope::Queryable
     def initialize
       @tables = {
-        :mytable => SAMPLE_RECORDS,
-        :empty_table => []
+        mytable: SAMPLE_RECORDS,
+        empty_table: []
       }
       @meta = {
-        :files => {
-          :somefile => {
-            :lang => :ruby
+        files: {
+          somefile: {
+            lang: :ruby
           }
         }
       }
@@ -47,15 +47,15 @@ describe Starscope::Queryable do
   end
 
   it 'must handle simple filters' do
-    @mock.query(:mytable, '.*', :foo => 'bar').must_equal [SAMPLE_RECORDS[1]]
+    @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
+    @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]]
+    @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.4.1
+  version: 1.5.0
 platform: ruby
 authors:
 - Evan Huus
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-12 00:00:00.000000000 Z
+date: 2015-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -53,91 +53,119 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
-  name: backports
+  name: rkelly-remix
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: 0.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: 0.0.7
+- !ruby/object:Gem::Dependency
+  name: babel-transpiler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: sourcemap
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.4'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.1
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.8'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
 description: |2
-    Starscope is a code indexer, search and navigation tool for Ruby and Go.
+    Starscope is a code indexer, search and navigation tool for Ruby, Golang, and JavaScript.
     Inspired by the extremely popular Ctags and Cscope utilities, Starscope can
     answer a lot of questions about a lot of code.
 email: eapache@gmail.com
@@ -151,7 +179,6 @@ files:
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -165,6 +192,7 @@ files:
 - lib/starscope/fragment_extractor.rb
 - lib/starscope/langs/erb.rb
 - lib/starscope/langs/go.rb
+- lib/starscope/langs/javascript.rb
 - lib/starscope/langs/ruby.rb
 - lib/starscope/matcher.rb
 - lib/starscope/output.rb
@@ -182,6 +210,7 @@ files:
 - test/fixtures/empty
 - test/fixtures/sample_erb.erb
 - test/fixtures/sample_golang.go
+- test/fixtures/sample_javascript.js
 - test/fixtures/sample_ruby.rb
 - test/functional/starscope_test.rb
 - test/test_helper.rb
@@ -190,6 +219,7 @@ files:
 - test/unit/fragment_extractor_test.rb
 - test/unit/langs/erb_test.rb
 - test/unit/langs/golang_test.rb
+- test/unit/langs/javascript_test.rb
 - test/unit/langs/ruby_test.rb
 - test/unit/output_test.rb
 - test/unit/queryable_test.rb
@@ -205,7 +235,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.8.7
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -229,6 +259,7 @@ test_files:
 - test/fixtures/empty
 - test/fixtures/sample_erb.erb
 - test/fixtures/sample_golang.go
+- test/fixtures/sample_javascript.js
 - test/fixtures/sample_ruby.rb
 - test/functional/starscope_test.rb
 - test/test_helper.rb
@@ -237,6 +268,7 @@ test_files:
 - test/unit/fragment_extractor_test.rb
 - test/unit/langs/erb_test.rb
 - test/unit/langs/golang_test.rb
+- test/unit/langs/javascript_test.rb
 - test/unit/langs/ruby_test.rb
 - test/unit/output_test.rb
 - test/unit/queryable_test.rb

data/Gemfile.lock

@@ -1,41 +0,0 @@
-PATH
-  remote: .
-  specs:
-    starscope (1.4.1)
-      backports (~> 3.6)
-      oj (~> 2.9)
-      parser (~> 2.2.2)
-      ruby-progressbar (~> 1.5)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    ast (2.1.0)
-    backports (3.6.6)
-    coderay (1.1.0)
-    metaclass (0.0.4)
-    method_source (0.8.2)
-    minitest (5.8.0)
-    mocha (1.1.0)
-      metaclass (~> 0.0.1)
-    oj (2.12.13)
-    parser (2.2.2.6)
-      ast (>= 1.1, < 3.0)
-    pry (0.10.1)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    rake (10.4.2)
-    ruby-progressbar (1.7.5)
-    slop (3.6.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.5)
-  minitest
-  mocha
-  pry
-  rake
-  starscope!