Merge pull request #28 from biojs/develop

Megh-Thakkar · web-flow · commit a33436019997 · 2018-06-30T15:55:59.000+05:30
Develop
diff --git a/main/management/commands/updatecomponents.py b/main/management/commands/updatecomponents.py
@@ -105,11 +105,13 @@ def update_visualizations(component, commit_hash, test=False):
                 continue
             url = "https://cdn.rawgit.com/" + str(owner) + '/' + str(repo_name) + "/" + commit_hash + "/" + sniperData.snippets_dir_name + "/" + snippet['name']
             try:
-                req_snippet = Snippet.objects.get(name=snippet['name'], sniperData=sniperData)
+                name = snippet['name'].split('.')[0]
+                req_snippet = Snippet.objects.get(name=name, sniperData=sniperData)
                 req_snippet.url = url
                 req_snippet.save()
             except:
-                Snippet.objects.create(name=snippet['name'], sniperData=sniperData, url=url)
+                name = snippet['name'].split('.')[0]
+                Snippet.objects.create(name=name, sniperData=sniperData, url=url)
     except:
         pass
 
diff --git a/main/models.py b/main/models.py
@@ -46,7 +46,7 @@ class Component(models.Model):
 
     def save(self, *args, **kwargs):
         if not self.url_name:
-            self.url_name = (str(self.name).replace(' ', '-')).replace('/', '-').replace('@','').lower()
+            self.url_name = (str(self.name).replace(' ', '-')).replace('/', '-').replace('@','').replace('.', '-').lower()
         return super(Component, self).save(*args, **kwargs)
 
     def __unicode__(self):
diff --git a/main/templates/main/visualizations.html b/main/templates/main/visualizations.html
@@ -7,8 +7,15 @@
 (% for dependency in js_dependencies %) // Similarly for css dependencies
 URL = dependency.js_url
 {% endfor %}
-3. Snippet raw git URL : snippet.url
-4. Snippet name : snippet.name
-5. wzrd_url : sniper_data.wzrd_url
-6. no_browserify : sniper_data.no_browserify
-{% endcomment }
+3. Snippet raw git URL : {{snippet.url}}
+4. Snippet name : {{snippet.name}}
+5. wzrd_url : {{sniper_data.wzrd_url}}
+6. no_browserify : {{sniper_data.no_browserify}}
+{% endcomment %}
+
+<html>
+<body>
+    Hello World!
+    You requested {{snippet.name}} snippet of {{component.name}}. Wzrd URL is {{sniper_data.wzrd_url}}.
+</body>
+</html>
diff --git a/main/urls.py b/main/urls.py
@@ -9,5 +9,5 @@
 		url(r'^all/$', views.all_components, name="all_components"),
         url(r'^top/$', views.top_components, name="top_components"),
         url(r'^details/(?P<url_name>[\w-]+)/$', views.component_details, name="component_details"),
-		url(r'^visualization/(?P<url_name>[\w-]+)/(?P<visualization_name>\w+)/$', views.render_visualization, name="render_visualization"),
+		url(r'^visualization/(?P<url_name>[\w-]+)/(?P<visualization_name>[\w-]+)/$', views.render_visualization, name="render_visualization"),
 ]
diff --git a/main/views.py b/main/views.py
@@ -64,7 +64,7 @@ def render_visualization(request, url_name, visualization_name):
     js_dependencies = component.jsdependency_set.all()
     css_dependencies = component.cssdependency_set.all()
     sniper_data = component.sniperdata
-    snippet = Snippet.objects.get(sniperData=sniper_data, name=name)
+    snippet = Snippet.objects.get(sniperData=sniper_data, name=visualization_name)
     context = {
         'component' : component,
         'js_dependencies' : js_dependencies,
diff --git a/tests/test_views.py b/tests/test_views.py
@@ -368,7 +368,7 @@ def test_relevance_of_response(self):
 				if('cdn.rawgit.com' in url):
 					self.assertTrue(latest_commit_hash in url)
 		if 'snippets' in response_2.json():
-			snippets_list = ['animated-bfs.js', 'images.js', 'performance-tuning.js', 'visual.js']
+			snippets_list = ['animated-bfs', 'images', 'performance-tuning', 'visual']
 			for snippet in response_2.json()['snippets']:
 				latest_commit_hash = response_2.json()['details']['latest_commit_hash']
 				url = snippet['url']
@@ -393,7 +393,7 @@ def test_relevance_of_response(self):
 				if('cdn.rawgit.com' in url):
 					self.assertTrue(latest_commit_hash in url)
 		if 'snippets' in response_3.json():
-			snippets_list = ['one.js', 'two.js', 'three.js']
+			snippets_list = ['one', 'two', 'three']
 			for snippet in response_3.json()['snippets']:
 				latest_commit_hash = response_3.json()['details']['latest_commit_hash']
 				url = snippet['url']

Original file line number	Diff line number	Diff line change
`@@ -9,5 +9,5 @@`
`9`	`9`	`url(r'^all/$', views.all_components, name="all_components"),`
`10`	`10`	`url(r'^top/$', views.top_components, name="top_components"),`
`11`	`11`	`url(r'^details/(?P<url_name>[\w-]+)/$', views.component_details, name="component_details"),`
`12`		`- url(r'^visualization/(?P<url_name>[\w-]+)/(?P<visualization_name>\w+)/$', views.render_visualization, name="render_visualization"),`
	`12`	`+ url(r'^visualization/(?P<url_name>[\w-]+)/(?P<visualization_name>[\w-]+)/$', views.render_visualization, name="render_visualization"),`
`13`	`13`	`]`