gitlab-elasticsearch-git 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba4d3958d1aa1aa5ebc18dd268708607ea22cf59
-  data.tar.gz: a40a0d48a99aaf2d876ed4d733acf41e2b78ee8e
+  metadata.gz: 805299d2c9977f838c91ad88a5ae27415345ad8d
+  data.tar.gz: f4c2c5211cb767f10042b1373d4ebbcafe9e0b89
 SHA512:
-  metadata.gz: 90799948082455a0d6cde26b83b3f6b65664b3223ebd8e8edf8e4fbf6af8570c11d041874c088f2eac5d9608f0f7298f47ee1027482e6ad0000b8336e9dab6e7
-  data.tar.gz: 5f7c8eec4c6b73be317eeb394c6f6f928d4976290f1824934d311b4c638eb7c8e445f0fabe5740d7b99e8a84a5ba0602ae99c9f1f874a1fb1d69f626a2729812
+  metadata.gz: 73ce23ee1c90b94713d5b4dc49878cb6a110de5ebec9a002abc423249532337e0cf544ff0e6bb6b43c118373afd27b34e87645bb4e6a6b1c080e7497287e1b99
+  data.tar.gz: 9e1227a3b202f421667e45e3adfa1bef6db62096f2f00ab8eae3c35bafe60ef12b92bdc533413ccbcb1ead5f5e0d48f1d40b049a96d0ba032c64a05127002a34

data/CHANGELOG

@@ -1,3 +1,6 @@
+0.0.15
+ - Search through the filenames
+
 0.0.14
  - Improve code search analyzer (custom word delimeter of source code)
  - Fix encoding issues

data/lib/elasticsearch/git/repository.rb

@@ -28,6 +28,7 @@ module Elasticsearch
             indexes :oid,         type: :string, index_options: 'offsets', analyzer: :code_analyzer
             indexes :commit_sha,  type: :string, index_options: 'offsets', analyzer: :sha_analyzer
             indexes :path,        type: :string,                           analyzer: :path_analyzer
+            indexes :file_name,   type: :string,                           analyzer: :code_analyzer
             indexes :content,     type: :string, index_options: 'offsets', analyzer: :code_analyzer
             indexes :language,    type: :string, index: :not_analyzed
           end
@@ -119,6 +120,15 @@ module Elasticsearch
                   content: blob.data,
                   commit_sha: target_sha,
                   path: blob.path,
+
+                  # We're duplicating file_name parameter here because
+                  # we need another analyzer for it.
+                  # Ideally this should be done with copy_to: 'blob.file_name' option
+                  # but it does not work in ES v2.3.*. We're doing it so to not make users
+                  # install newest versions
+                  # https://github.com/elastic/elasticsearch-mapper-attachments/issues/124
+                  file_name: blob.path,
+
                   language: blob.language ? blob.language.name : "Text"
                 }
               }
@@ -455,7 +465,7 @@ module Elasticsearch
                   multi_match: {
                     query: query,
                     operator: :and,
-                    fields: [ 'blob.content', 'blob.path' ]
+                    fields: [ 'blob.content', 'blob.file_name' ]
                   }
                 }
               }
@@ -517,7 +527,7 @@ module Elasticsearch
               post_tags: ["←gitlabelasticsearch"],
               fields: {
                 "blob.content" => {},
-                "blob.path" => {},
+                "blob.file_name" => {},
                 "type" => "fvh",
                 "boundary_chars" => "\n"
               }

data/lib/elasticsearch/git/version.rb

@@ -1,5 +1,5 @@
 module Elasticsearch
   module Git
-    VERSION = "0.0.14"
+    VERSION = '0.0.15'
   end
 end

data/spec/main_spec.rb

@@ -42,6 +42,19 @@ describe TestRepository do
     expect(repo.search('def')[:blobs][:total_count]).to eq(4)
   end
 
+  it "searches through filename" do
+    repo = TestRepository.new
+    repo.index_blobs
+
+    TestRepository.__elasticsearch__.refresh_index!
+
+    found_version_file = repo.search('version')[:blobs][:results].any? do |result|
+      result["_source"]["blob"]["file_name"] == "VERSION"
+    end
+
+    expect(found_version_file).to be_truthy
+  end
+
   it "indexes specified commits" do
     repo = TestRepository.new
     repo.index_commits(

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-elasticsearch-git
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - Andrey Kumanyaev
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-11 00:00:00.000000000 Z
+date: 2016-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elasticsearch-model