use RepoHelper instead of Repo in SM

Author: Rizziepit

elasticgit/search.py

@@ -1,5 +1,6 @@
 import os
 from urllib import quote
+from urlparse import urlparse
 
 from git import Repo
 
@@ -8,6 +9,7 @@
     ObjectSearchResults, DictSearchResults, ListSearchResults)
 
 from elasticgit.utils import introspect_properties
+from elasticgit.storage.remote import RemoteStorageManager
 
 
 def index_name(prefix, name):
@@ -163,6 +165,30 @@ def get_results_class(self):
         }.get(results_class)
 
 
+class RepoHelper(object):
+
+    def __init__(self, repo_url):
+        self.repo_url = repo_url
+        if any([
+                repo_url.startswith('http://'),
+                repo_url.startswith('https://')]):
+            self.repo_obj = RemoteStorageManager(repo_url)
+        else:
+            self.repo_obj = Repo(repo_url)
+
+    def active_branch_name(self):
+        if isinstance(self.repo_obj, Repo):
+            return self.repo_obj.active_branch.name
+        return self.repo_obj.active_branch()
+
+    def default_index_prefix(self):
+        name = os.path.basename(self.repo_url)
+        name_no_ext, ext = os.path.splitext(name)
+        if ext in ('.git', '.json'):
+            return name_no_ext
+        return name
+
+
 class SM(S):
     """
     A search interface similar to :py:class:`elasticutils.S` to
@@ -191,12 +217,15 @@ def __init__(self, model_class, in_, index_prefixes=None):
         self.index_prefixes = index_prefixes
 
         self.repos = map(
-            lambda repo: (repo if isinstance(repo, Repo) else Repo(repo)),
+            lambda repo:
+                repo
+                if isinstance(repo, RepoHelper)
+                else RepoHelper(repo),
             self.repos)
 
         if not self.index_prefixes:
             self.index_prefixes = map(
-                lambda r: os.path.basename(r.working_dir),
+                lambda repo: repo.default_index_prefix(),
                 self.repos)
 
     def get_repo_indexes(self):
@@ -209,7 +238,7 @@ def get_repo_indexes(self):
             return []
 
         return map(
-            lambda (ip, r): index_name(ip, r.active_branch.name),
+            lambda (ip, r): index_name(ip, r.active_branch_name()),
             zip(self.index_prefixes, self.repos))
 
     def _clone(self, next_step=None):

elasticgit/tests/test_search.py

@@ -26,17 +26,19 @@ def test_init(self):
         repos = [self.repo1, self.repo2]
         repo_workdirs = map(lambda r: r.working_dir, repos)
 
-        s_obj = SM(TestPerson, in_=repos)
-        self.assertEqual(s_obj.repos, [self.repo1, self.repo2])
+        s_obj = SM(TestPerson, in_=repo_workdirs)
+        self.assertEqual(
+            [r.repo_obj for r in s_obj.repos],
+            [self.repo1, self.repo2])
         self.assertEqual(s_obj.index_prefixes, [
             os.path.basename(self.repo1.working_dir),
             os.path.basename(self.repo2.working_dir)
         ])
 
         s_obj = SM(TestPerson, in_=repo_workdirs, index_prefixes=['i1', 'i2'])
         self.assertEqual(
-            map(lambda r: r.working_dir, s_obj.repos),
-            repo_workdirs)
+            [r.repo_obj for r in s_obj.repos],
+            [self.repo1, self.repo2])
         self.assertEqual(s_obj.index_prefixes, ['i1', 'i2'])
 
     def test_get_repo_indexes(self):
@@ -46,12 +48,12 @@ def test_get_repo_indexes(self):
             os.path.basename(self.repo1.working_dir),
             self.repo1.active_branch.name)
 
-        s_obj = SM(TestPerson, in_=[self.repo1])
+        s_obj = SM(TestPerson, in_=[self.repo1.working_dir])
         self.assertEqual(s_obj.get_repo_indexes(), [default_index1])
 
         s_obj = SM(
             TestPerson,
-            in_=[self.repo1, self.repo2],
+            in_=[self.repo1.working_dir, self.repo2.working_dir],
             index_prefixes=[self.index_prefix1, self.index_prefix2])
         self.assertEqual(
             s_obj.get_repo_indexes(),
@@ -61,7 +63,7 @@ def test_get_repo_indexes(self):
             self.workspace1.im.index_name(self.repo1.active_branch.name))
 
     def test_get_indexes(self):
-        s_obj = SM(TestPerson, in_=[self.repo1])
+        s_obj = SM(TestPerson, in_=[self.repo1.working_dir])
         self.assertEqual(
             s_obj.get_indexes(),
             [index_name(
@@ -83,7 +85,7 @@ def test_get_es(self):
     def test_clone(self):
         s_obj = SM(
             TestPerson,
-            in_=[self.repo1],
+            in_=[self.repo1.working_dir],
             index_prefixes=[self.index_prefix1])
         s_obj_cloned = s_obj._clone(next_step=('indexes', []))
 
@@ -139,7 +141,7 @@ def test_multi_index_query(self):
 
         objects = SM(
             TestPerson,
-            in_=[self.repo1, self.repo2],
+            in_=[self.repo1.working_dir, self.repo2.working_dir],
             index_prefixes=[self.index_prefix1, self.index_prefix2]) \
             .everything()
         self.assertEqual(len(objects), 2)