resolve #7 handle duplicate names

grails · Jan 10, 2017 · 84668dd · 84668dd
1 parent 8850577
commit 84668dd
Show file tree

Hide file tree

Showing 10 changed files with 7,238 additions and 6,496 deletions.
diff --git a/grails-app/assets/javascripts/app/App.es6 b/grails-app/assets/javascripts/app/App.es6
@@ -27,15 +27,17 @@ grailsplugins.App = class {
     setupRouter() {
         page.base(this.baseUrl);
         page('/q/:q', (context, next) => {
-            // ga('send', 'pageview', canonicalPath);
             this.showSearch(context.params.q);
         });
         page('/plugin/:plugin', (context, next) => {
-            // ga('send', 'pageview', canonicalPath);
-            this.showPlugin(context.params.plugin);
+            let plugin = this.plugins.findByName(context.params.plugin);
+            this.showPlugin(plugin);
+        });
+        page('/plugin/:owner/:name', (context, next) => {
+            let plugin = this.plugins.findByOwnerAndName(context.params.owner, context.params.name);
+            this.showPlugin(plugin);
         });
         page('*', (context, next) => {
-            // ga('send', 'pageview', canonicalPath);
             this.showSearch('');
         });
     }
@@ -89,13 +91,12 @@ grailsplugins.App = class {
         }
     }
 
-    showPlugin(pluginName) {
+    showPlugin(plugin) {
         this._lastSearchScrollTop = $('body').scrollTop();
 
-        document.title = pluginName;
+        document.title = plugin.name;
         $('.search-section').addClass('hide');
         $('.plugin-section').removeClass('hide');
-        let plugin = this.plugins.findByName(pluginName);
         this.pluginView.showPlugin(plugin);
     }
 };
diff --git a/grails-app/assets/javascripts/app/Plugins.es6 b/grails-app/assets/javascripts/app/Plugins.es6
@@ -77,6 +77,10 @@ grailsplugins.Plugins = class {
         return _.findWhere(this._plugins, {name: name});
     }
 
+    findByOwnerAndName(owner, name) {
+        return _.findWhere(this._plugins, {owner: owner, name: name});
+    }
+
     getLabels() {
         return this._allLabels;
     }

diff --git a/grails-app/assets/javascripts/templates/plugin.hbs b/grails-app/assets/javascripts/templates/plugin.hbs
@@ -6,7 +6,7 @@
                 <i class="fa fa-github"></i> <span class="gh-text" id="gh-text">Star</span></a><a class="gh-count" id="gh-count" href="{{githubRepo.html_url}}/stargazers">{{githubRepo.stargazers_count}}</a>
             </span>
         {{/if}}
-        <a class="plugin-name" href="{{baseUrl}}/plugin/{{name}}" data-internal>{{name}}</a>
+        <a class="plugin-name" href="{{baseUrl}}/plugin/{{owner}}/{{name}}" data-internal>{{name}}</a>
     </div>
     <div class="attributes-bar">
         <ul class="attributes-list">

diff --git a/grails-app/assets/javascripts/templates/plugins.hbs b/grails-app/assets/javascripts/templates/plugins.hbs
@@ -10,7 +10,7 @@
     {{#each plugins}}
         <li>
             <div>
-                <a class="plugin-name" href="{{baseUrl}}/plugin/{{name}}" data-internal>{{name}}</a>
+                <a class="plugin-name" href="{{baseUrl}}/plugin/{{owner}}/{{name}}" data-internal>{{name}}</a>
                 <span class="external-links">
                     {{#if githubRepo}}
                         <a href="{{githubRepo.html_url}}" title="Github repository" target="_top"><img src="{{baseUrl}}/assets/plainicon.com-50224-svg.svg"></a>

diff --git a/grails-app/controllers/com/github/sheehan/PluginController.groovy b/grails-app/controllers/com/github/sheehan/PluginController.groovy
@@ -16,9 +16,14 @@ class PluginController {
     }
 
     def plugin() {
-        def plugins = Plugins.get()
-        Map plugin = plugins.find { it.name == params.plugin }
+        renderPlugin Plugins.get().find { it.name == params.pluginName }
+    }
+
+    def pluginWithOwner() {
+        renderPlugin Plugins.get().find { it.name == params.pluginName && it.owner == params.ownerName }
+    }
 
+    private renderPlugin(Map plugin) {
         Map json = [
             baseUrl: createLink(uri: '/')
         ]

diff --git a/grails-app/controllers/com/github/sheehan/UrlMappings.groovy b/grails-app/controllers/com/github/sheehan/UrlMappings.groovy
@@ -11,7 +11,8 @@ class UrlMappings {
 
         "/"(controller: 'plugin', action: 'index')
         "/plugin/json"(controller: 'plugin', action: 'json')
-        "/plugin/$plugin"(controller: 'plugin', action: 'plugin')
+        "/plugin/$pluginName"(controller: 'plugin', action: 'plugin')
+        "/plugin/$ownerName/$pluginName"(controller: 'plugin', action: 'pluginWithOwner')
         "/q/$query"(controller: 'plugin', action: 'index')
 
         "500"(view:'/error')

diff --git a/grails-app/services/com/github/sheehan/SyncPluginsJobService.groovy b/grails-app/services/com/github/sheehan/SyncPluginsJobService.groovy
@@ -20,9 +20,10 @@ class SyncPluginsJobService implements SchwartzJob {
 		Compare compare = pluginService.refreshPlugins()
 		if (compare) {
 			compare.newVersions.each { Compare.NewVersion newVersion ->
+				String owner = newVersion.plugin.owner
 				String name = newVersion.plugin.name
 				String version = newVersion.version
-				twitterService.tweet "$name $version released: http://plugins.grails.org/plugin/$name"
+				twitterService.tweet "$name $version released: http://plugins.grails.org/plugin/$owner/$name"
 			}
 		}
 

diff --git a/src/main/groovy/com/github/sheehan/Compare.groovy b/src/main/groovy/com/github/sheehan/Compare.groovy
@@ -6,7 +6,7 @@ class Compare {
 
     Compare(List<Map> oldJson, List<Map> newJson) {
         newJson.each { plugin ->
-            Map match = oldJson.find { it.name == plugin.name }
+            Map match = oldJson.find { it.name == plugin.name && it.owner == plugin.owner }
             if (!match) {
                 if (plugin.latest_version) {
                     newVersions << new NewVersion(version: plugin.latest_version, plugin: plugin)