Fix author field

Author: Ilja Bobkevic

lib/puppet_forge_server/api/v1/modules.rb

@@ -29,16 +29,20 @@ def get_modules(metadata)
           modules[element.metadata.name][:releases] = (modules[element.metadata.name][:releases] + releases_version(element.metadata)).uniq.sort_by { |r| Gem::Version.new(r[:version]) }.reverse
           modules[element.metadata.name][:tag_list] = (modules[element.metadata.name][:tag_list] + element.tags).uniq.compact
         else
-          name = element.metadata.name.sub(/^[^-]+-/, '')
+          author, name = element.metadata.name.split('-')
+          unless name
+            name = author
+            author = element.metadata.author
+          end
           modules[element.metadata.name] = {
-            :author => element.metadata.author,
+            :author => author,
             :full_name => element.metadata.name.sub('-', '/'),
             :name => name,
             :desc => element.metadata.description,
             :version => element.metadata.version,
             :project_url => element.metadata.project_page,
             :releases => releases_version(element.metadata),
-            :tag_list =>  element.tags ? element.tags : [element.metadata.author, name],
+            :tag_list =>  element.tags ? element.tags : [author, name],
             :private => element.private
           }
         end

lib/puppet_forge_server/api/v3/modules.rb

@@ -30,14 +30,19 @@ def get_modules(metadata)
           end
           modules[element.metadata.name][:releases] = (modules[element.metadata.name][:releases] + releases_version(element.metadata)).uniq.sort_by { |r| Gem::Version.new(r[:version]) }.reverse
         else
+          author, name = element.metadata.name.split('-')
+          unless name
+            name = author
+            author = element.metadata.author
+          end
           modules[element.metadata.name] = {
               :uri => "/v3/modules/#{element.metadata.name}",
-              :name => element.metadata.name.sub(/^[^-]+-/, ''),
+              :name => name,
               :homepage_url => element.metadata.project_page,
               :issues_url => element.metadata.issues_url,
               :releases => releases_version(element.metadata),
               :current_release => get_releases([element]).first,
-              :owner => {:username => element.metadata.author, :uri => "/v3/users/#{element.metadata.author}"},
+              :owner => {:username => author, :uri => "/v3/users/#{author}"},
               :private => element.private
           }
         end

lib/puppet_forge_server/api/v3/releases.rb

@@ -18,8 +18,11 @@ module PuppetForgeServer::Api::V3
   module Releases
     def get_releases(metadata)
       metadata.map do |element|
-        name = element.metadata.name.sub(/^[^-]+-/, '')
-        author = element.metadata.name.split('-')[0]
+        author, name = element.metadata.name.split('-')
+        unless name
+          name = author
+          author = element.metadata.author
+        end
         {
             :uri => "/v3/releases/#{element.metadata.name}-#{element.metadata.version}",
             :module => {
@@ -29,7 +32,7 @@ def get_releases(metadata)
             },
             :metadata => element.metadata.to_hash,
             :version => element.metadata.version,
-            :tags => element.tags ? element.tags : [element.metadata.author, name],
+            :tags => element.tags ? element.tags : [author, name],
             :file_uri => "/v3/files#{element.path}",
             :file_md5 => element.checksum,
             :deleted_at => element.deleted_at,