gitlab-elasticsearch-git 0.0.17 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a29bf85d996a734eafc1d569dc32f20795baedb
-  data.tar.gz: 72bc712f6d6c40fbca6e9ca2619282f49133cb9e
+  metadata.gz: c2f2e02dd07d4a8be46948d3bce7bb400fc85b01
+  data.tar.gz: 7351959ff7c27ac48360f9bca26ab7e2727763ca
 SHA512:
-  metadata.gz: 6079984bd4f4cd8603b21f878cce916ba97f51186dc6dcef9a58f3a72a8e1c0c03a5a2eb2633d818241303b17c85588c1c48a0e6818fd2e678c92bc4fd42202d
-  data.tar.gz: f4332529cb1985d21e97bca944a31f7e0a3fab69c8d96d8ffb80c9fb6bb0c26393d88bd358655ec8a777b4a870066cc711ec1fb84ec198735060e31eca1aea34
+  metadata.gz: 492e50d3b67c8b2a3adb03c4cd5a62ece0bda3a9d6199cef64b02e678e22414b3943f80581bb7141f002a7230db1c767c039025e61bc056f018f54a78b3027cf
+  data.tar.gz: 17086678943cdb815521fa196cb59a1f3d0926ae40b1e209ade66d8f19b75c1ccb4f12f7638a7da5c143b34ab6bb44fb76dd5183bc33d7c7964b826c6ca809f9

data/CHANGELOG

@@ -1,3 +1,6 @@
+1.0.0
+ - Blobs and Commits have a parent project
+
 0.0.17
  - Improve code analyzer
 

data/Gemfile

@@ -3,8 +3,8 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in elasticsearch-git.gemspec
 gemspec
 
-gem 'elasticsearch-model'
-gem 'elasticsearch-api'
+gem 'elasticsearch-model', '~> 0.1.9'
+gem 'elasticsearch-api', '~> 1.1.0'
 gem 'rugged', '~> 0.24'
 gem 'rake'
 gem 'pry'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gitlab-elasticsearch-git (0.0.15)
+    gitlab-elasticsearch-git (1.0.0)
       activemodel (~> 4.2)
       activesupport (~> 4.2)
       charlock_holmes (~> 0.7)
@@ -13,10 +13,10 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.2.5)
-      activesupport (= 4.2.5)
+    activemodel (4.2.7.1)
+      activesupport (= 4.2.7.1)
       builder (~> 3.1)
-    activesupport (4.2.5)
+    activesupport (4.2.7.1)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -26,16 +26,16 @@ GEM
     charlock_holmes (0.7.3)
     coderay (1.1.0)
     diff-lcs (1.2.5)
-    elasticsearch (1.0.15)
-      elasticsearch-api (= 1.0.15)
-      elasticsearch-transport (= 1.0.15)
-    elasticsearch-api (1.0.15)
+    elasticsearch (1.1.0)
+      elasticsearch-api (= 1.1.0)
+      elasticsearch-transport (= 1.1.0)
+    elasticsearch-api (1.1.0)
       multi_json
-    elasticsearch-model (0.1.8)
+    elasticsearch-model (0.1.9)
       activesupport (> 3)
       elasticsearch (> 0.4)
       hashie
-    elasticsearch-transport (1.0.15)
+    elasticsearch-transport (1.1.0)
       faraday
       multi_json
     escape_utils (1.1.0)
@@ -46,15 +46,15 @@ GEM
       escape_utils (~> 1.1.0)
       mime-types (>= 1.19)
       rugged (>= 0.23.0b)
-    hashie (3.4.3)
+    hashie (3.4.4)
     i18n (0.7.0)
     json (1.8.3)
     method_source (0.8.2)
     mime-types (3.0)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2015.1120)
-    minitest (5.8.3)
-    multi_json (1.11.2)
+    minitest (5.9.0)
+    multi_json (1.12.1)
     multipart-post (2.0.0)
     pry (0.10.3)
       coderay (~> 1.1.0)
@@ -85,8 +85,8 @@ PLATFORMS
 
 DEPENDENCIES
   charlock_holmes (~> 0.7.3)
-  elasticsearch-api
-  elasticsearch-model
+  elasticsearch-api (~> 1.1.0)
+  elasticsearch-model (~> 0.1.9)
   github-linguist (~> 4.7.0)
   gitlab-elasticsearch-git!
   pry
@@ -95,4 +95,4 @@ DEPENDENCIES
   rugged (~> 0.24)
 
 BUNDLED WITH
-   1.11.2
+   1.12.5

data/lib/elasticsearch/git/repository.rb

@@ -21,7 +21,7 @@ module Elasticsearch
         include Elasticsearch::Git::Model
         include Elasticsearch::Git::EncoderHelper
 
-        mapping _timestamp: { enabled: true } do
+        mapping _timestamp: { enabled: true }, _parent: { type: 'project' } do
           indexes :blob do
             indexes :id,          type: :string,
                                   index_options: 'offsets',
@@ -119,18 +119,26 @@ module Elasticsearch
           client_for_indexing.bulk body: bulk_operations
         end
 
-
         def delete_blob(blob)
           return unless blob.text?
-          { delete: { _index: "#{self.class.index_name}", _type: self.class.name.underscore, _id: "#{repository_id}_#{blob.path}" } }
+          {
+            delete: {
+              _index: "#{self.class.index_name}",
+              _type: self.class.name.underscore,
+              _id: "#{repository_id}_#{blob.path}",
+              _parent: project_id
+            }
+          }
         end
 
-
         def index_blob(blob, target_sha)
           return unless can_index_blob?(blob)
           {
             index:  {
-              _index: "#{self.class.index_name}", _type: self.class.name.underscore, _id: "#{repository_id}_#{blob.path}",
+              _index: "#{self.class.index_name}",
+              _type: self.class.name.underscore,
+              _id: "#{repository_id}_#{blob.path}",
+              _parent: project_id,
               data: {
                 blob: {
                   type: "blob",
@@ -206,7 +214,10 @@ module Elasticsearch
         def index_commit(commit)
           {
             index:  {
-              _index: "#{self.class.index_name}", _type: self.class.name.underscore, _id: "#{repository_id}_#{commit.oid}",
+              _index: "#{self.class.index_name}",
+              _type: self.class.name.underscore,
+              _id: "#{repository_id}_#{commit.oid}",
+              _parent: project_id,
               data: {
                 commit: {
                   type: "commit",
@@ -340,7 +351,7 @@ module Elasticsearch
         end
 
         # Repository id used for identity data from different repositories
-        # Update this value if need
+        # Update this value if needed
         def set_repository_id(id = nil)
           @repository_id = id || path_to_repo
         end
@@ -376,11 +387,6 @@ module Elasticsearch
       end
 
       module ClassMethods
-        # For Overwrite
-        def repositories_count
-          10
-        end
-
         def search(query, type: :all, page: 1, per: 20, options: {})
           results = { blobs: [], commits: []}
 
@@ -408,21 +414,12 @@ module Elasticsearch
                 must: [{
                   multi_match: {
                     fields: fields,
-                    query: "#{query}",
+                    query: query,
                     operator: :or
                   }
                 }]
               }
             },
-            aggs: {
-              commitRepositoryFaset: {
-                terms: {
-                  field: "commit.rid",
-                  all_terms: true,
-                  size: repositories_count
-                }
-              }
-            },
             size: per,
             from: per * (page - 1)
           }
@@ -440,6 +437,11 @@ module Elasticsearch
             }
           end
 
+          if options[:additional_filter]
+            query_hash[:query][:bool][:filter] ||= []
+            query_hash[:query][:bool][:filter] << options[:additional_filter]
+          end
+
           if options[:highlight]
             es_fields = fields.map { |field| field.split('^').first }.inject({}) do |memo, field|
               memo[field.to_sym] = {}
@@ -447,9 +449,9 @@ module Elasticsearch
             end
 
             query_hash[:highlight] = {
-                pre_tags: ["gitlabelasticsearch→"],
-                post_tags: ["←gitlabelasticsearch"],
-                fields: es_fields
+              pre_tags: ["gitlabelasticsearch→"],
+              post_tags: ["←gitlabelasticsearch"],
+              fields: es_fields
             }
           end
 
@@ -469,8 +471,7 @@ module Elasticsearch
           res = self.__elasticsearch__.search(query_hash)
           {
             results: res.results,
-            total_count: res.size,
-            repositories: res.response["aggregations"]["commitRepositoryFaset"]["buckets"]
+            total_count: res.size
           }
         end
 
@@ -489,22 +490,6 @@ module Elasticsearch
                 }
               }
             },
-            aggs: {
-              languageFacet: {
-                terms: {
-                  field: :language,
-                  all_terms: true,
-                  size: 20
-                }
-              },
-              blobRepositoryFaset: {
-                terms: {
-                  field: :rid,
-                  all_terms: true,
-                  size: repositories_count
-                }
-              }
-            },
             size: per,
             from: per * (page - 1)
           }
@@ -519,6 +504,11 @@ module Elasticsearch
             }
           end
 
+          if options[:additional_filter]
+            query_hash[:query][:bool][:filter] ||= []
+            query_hash[:query][:bool][:filter] << options[:additional_filter]
+          end
+
           if options[:language]
             query_hash[:query][:bool][:filter] << {
               terms: {
@@ -557,9 +547,7 @@ module Elasticsearch
 
           {
             results: res.results,
-            total_count: res.size,
-            languages: res.response["aggregations"]["languageFacet"]["buckets"],
-            repositories: res.response["aggregations"]["blobRepositoryFaset"]["buckets"]
+            total_count: res.size
           }
         end
 

data/lib/elasticsearch/git/version.rb

@@ -1,5 +1,5 @@
 module Elasticsearch
   module Git
-    VERSION = '0.0.17'
+    VERSION = '1.0.0'
   end
 end

data/spec/support/test_repository.rb

@@ -7,8 +7,9 @@ class TestRepository
 
   self.__elasticsearch__.client = CLIENT
 
-  def initialize(id = 'test_1')
+  def initialize(id = 'test_1', project_id = 1)
     @repo_id = id
+    @project_id = 1
   end
 
   def client_for_indexing
@@ -19,6 +20,10 @@ class TestRepository
     @repo_id
   end
 
+  def project_id
+    @project_id
+  end
+
   def path_to_repo
     TEST_REPO_PATH
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-elasticsearch-git
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 1.0.0
 platform: ruby
 authors:
 - Andrey Kumanyaev
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-15 00:00:00.000000000 Z
+date: 2016-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elasticsearch-model
@@ -159,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Elasticsearch integrations for git repositories.