puppet-forge-server 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3fc878b60f808ff3ccfd744ef972e0acd5896be2
-  data.tar.gz: a4c0e1961bb1fe2eb452ca1036efac07b05aeccb
+  metadata.gz: 28febe12a43d2784047f7ff01e604133d403d1c8
+  data.tar.gz: d99f6193d61655797445bf4ac8d4d7979f1af571
 SHA512:
-  metadata.gz: b0ffedd8529f0e510ecdafbfbcfa4e30ef5994a726fc9a3617702ef511527159897f5ff4037842f49ce71272cb9c9a47875e74501d840edaab9b4e3219132452
-  data.tar.gz: b4a98a5d8e131399f6ca7b28207edd604a46c469118f0a46ee3508f96a1e69dcea4c30db30d5f1fb36aeb1272e137e4d03beab8168cc97aa7b29372509772570
+  metadata.gz: b0be3a7fa83dcebef6f88c8fb93f8250244c9490dd6a7e9a32a0a74cb5ee66125eac7995b4489bcc37d9d6c52bea887ab427dba0a430a77ef6aed30470f0fcae
+  data.tar.gz: f6f396a4cb6cbf4c8586b797bff5d978d6fcf305a3341afc5e3599ede7dbc1fc1c0c7a8a6e9f660fbbebc830063b2e459854269560dc96d1ba7c9f7bad5bc1da

data/lib/puppet_forge_server/api/v3/modules.rb

@@ -30,19 +30,19 @@ module PuppetForgeServer::Api::V3
           modules[element[:metadata].name][:releases] = (modules[element[:metadata].name][:releases] + releases_version(element[:metadata])).version_sort_by { |r| r[:version] }.reverse
         else
           name = element[:metadata].name.sub(/^[^-]+-/, '')
+          author = element[:metadata].name.split('-')[0]
           modules[element[:metadata].name] = {
               :uri => "/v3/modules/#{element[:metadata].name}",
               :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
+              :current_release => get_releases([element]).first,
+              :owner => {:username => author, :uri => "/v3/users/#{author}"}
           }
         end
       end
-
-      PuppetForgeServer::Logger.get.error "Requested module count is more than 1:\n#{modules.values}" if modules.values.count > 1
-      modules.values.first
+      modules.values
     end
 
     private

data/lib/puppet_forge_server/api/v3/releases.rb

@@ -19,12 +19,13 @@ module PuppetForgeServer::Api::V3
     def get_releases(metadata)
       metadata.map do |element|
         name = element[:metadata].name.sub(/^[^-]+-/, '')
-
+        author = element[:metadata].name.split('-')[0]
         {
             :uri => "/v3/releases/#{element[:metadata].name}-#{element[:metadata].version}",
             :module => {
                 :uri => "/v3/modules/#{element[:metadata].name}",
-                :name => name
+                :name => name,
+                :owner => {:username => author, :uri => "/v3/users/#{author}"}
             },
             :metadata => element[:metadata].to_hash,
             :version => element[:metadata].version,

data/lib/puppet_forge_server/app/version3.rb

@@ -73,7 +73,23 @@ module PuppetForgeServer::App
         backend.get_metadata(author, name)
       end.flatten.compact.uniq
       halt 404, json({:errors => ['404 Not found']}) if metadata.empty?
-      json get_modules(metadata)
+      PuppetForgeServer::Logger.get(:server).error "Requested module count is more than 1:\n#{metadata}" if metadata.count > 1
+      json get_modules(metadata).first
+    end
+
+    get '/v3/modules' do
+      query = params[:query]
+      metadata = @backends.map do |backend|
+        backend.query_metadata(query)
+      end.flatten.compact.uniq
+      modules = metadata.empty? ? nil : get_modules(metadata)
+      halt 200, json({:pagination => {:next => false}, :results => []}) unless modules
+      json :pagination => {:next => false, :total => modules.count}, :results => modules
+    end
+
+    get '/v3/users/:author' do
+      author = params[:author]
+      json :username => author, :uri => "/v3/users/#{author}"
     end
 
     private

data/lib/puppet_forge_server/backends/proxy_v3.rb

@@ -27,10 +27,9 @@ module PuppetForgeServer::Backends
     end
 
     def get_metadata(author, name, options = {})
-      options = ({:with_checksum => true}).merge(options)
       query ="#{author}-#{name}"
       begin
-        releases = options[:version] ? [JSON.parse(get("/v3/releases/#{query}-#{options[:version]}"))] : get_all_release_pages("/v3/releases?module=#{query}")
+        releases = options[:version] ? [JSON.parse(get("/v3/releases/#{query}-#{options[:version]}"))] : get_all_result_pages("/v3/releases?module=#{query}")
         get_release_metadata(releases)
       rescue OpenURI::HTTPError
         #ignore
@@ -38,23 +37,23 @@ module PuppetForgeServer::Backends
     end
 
     def query_metadata(query, options = {})
-      author, name = query.split('-')
       begin
-        get_metadata(author, name, options) if author && name
+        releases = get_all_result_pages("/v3/modules?query=#{query}").map {|element| element['current_release']}
+        get_release_metadata(releases)
       rescue OpenURI::HTTPError
         #ignore
       end
     end
 
     private
-    def get_all_release_pages(next_page)
-      releases = []
+    def get_all_result_pages(next_page)
+      results = []
       begin
-        result = JSON.parse(get(next_page))
-        releases += result['results']
-        next_page = result['pagination']['next']
+        current_page = JSON.parse(get(next_page))
+        results += current_page['results']
+        next_page = current_page['pagination']['next']
       end while next_page
-      releases
+      results
     end
 
     def normalize_metadata(metadata)

data/lib/puppet_forge_server/version.rb

@@ -15,5 +15,5 @@
 # limitations under the License.
 
 module PuppetForgeServer
-    VERSION = '1.2.0'
+    VERSION = '1.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-forge-server
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Ilja Bobkevic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-08 00:00:00.000000000 Z
+date: 2015-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra