gemirro 1.5.0 → 2.0.0

data/lib/gemirro.rb

@@ -20,7 +20,6 @@ $LOAD_PATH.unshift(File.expand_path('../', __FILE__)) unless $LOAD_PATH.include?
 
 require 'gemirro/version'
 require 'gemirro/configuration'
-require 'gemirro/cache'
 require 'gemirro/utils'
 require 'gemirro/gem'
 require 'gemirro/gem_version'

data/spec/gemirro/configuration_spec.rb

@@ -39,8 +39,8 @@ module Gemirro
       expect(Configuration.marshal_identifier).to match(/Marshal\.(\d+)\.(\d+)/)
     end
 
-    it 'should return versions file' do
-      expect(Configuration.versions_file).to match(/specs\.(\d+)\.(\d+).gz/)
+    it 'should error on version since no source is defined' do
+      expect(Gemirro.configuration.versions_file).to match(nil)
     end
 
     it 'should return marshal file' do
@@ -84,5 +84,12 @@ module Gemirro
       expect(result.host).to eq('https://rubygems.org')
       expect(result.name).to eq('rubygems')
     end
+
+
+    it 'should return versions file with source' do
+      result = @config.define_source('RubyGems', 'https://rubygems.org') do
+      end
+      expect(@config.versions_file).to match(/rubygems_org_versions$/)
+    end
   end
 end

data/spec/gemirro/gems_fetcher_spec.rb

@@ -12,7 +12,7 @@ module Gemirro
 
     before(:each) do
       @source = Source.new('RubyGems', 'https://rubygems.org')
-      @versions_file = VersionsFile.new(['0.0.1', '0.0.2'])
+      @versions_file = VersionsFile.new(%(created_at: 2025-04-24T03:46:59Z\n---\nrack 3.0.0,3.0.1 d545a45462d63b1b4865bbb89a109366))
       @fetcher = GemsFetcher.new(@source, @versions_file)
       Gemirro.configuration.ignored_gems.clear
     end

data/spec/gemirro/indexer_spec.rb

@@ -24,7 +24,7 @@ module Gemirro
 
       dir = MirrorDirectory.new('/tmp')
       dir.add_directory('test')
-      indexer = Indexer.new('/tmp/test')
+      indexer = Indexer.new
 
       Struct.new('HttpGet', :code, :body)
       http_get = Struct::HttpGet.new(200, 'bad')
@@ -43,7 +43,7 @@ module Gemirro
       allow(::Gem.configuration).to receive(:really_verbose)
         .once.and_return(true)
 
-      indexer = Indexer.new('/tmp/test')
+      indexer = Indexer.new
       indexer.quick_marshal_dir = '/tmp/gem_generate_index/quick/Marshal.4.8'
       indexer.dest_directory = '/tmp/test'
       indexer.directory = '/tmp/gem_generate_index'
@@ -97,7 +97,7 @@ module Gemirro
     end
 
     it 'should build indices' do
-      indexer = Indexer.new('/')
+      indexer = Indexer.new
       dir = MirrorDirectory.new('/')
       dir.add_directory('gems')
       dir.add_directory('quick')
@@ -140,7 +140,7 @@ module Gemirro
     end
 
     it 'should update index and exit ruby gems' do
-      indexer = Indexer.new('/')
+      indexer = Indexer.new
       MirrorDirectory.new('/')
       MirrorFile.new('/specs.4.8').write('')
       expect { indexer.update_index }.to raise_error(::Gem::SystemExitException)
@@ -152,7 +152,7 @@ module Gemirro
       dir.add_directory('test/gems')
       dir.add_directory('test/quick')
 
-      indexer = Indexer.new('/tmp/test')
+      indexer = Indexer.new
       indexer.quick_marshal_dir = '/tmp/gem_generate_index/quick/Marshal.4.8'
       indexer.dest_directory = '/tmp/test'
       indexer.directory = '/tmp/gem_generate_index'

data/spec/gemirro/server_spec.rb

@@ -1,7 +1,9 @@
 require 'rack/test'
 require 'json'
 require 'parallel'
-require 'gemirro/cache'
+require 'sinatra/base'
+require 'thin'
+require 'base64'
 require 'gemirro/utils'
 require 'gemirro/mirror_directory'
 require 'gemirro/mirror_file'
@@ -37,15 +39,23 @@ module Gemirro
       Utils.instance_eval('@gems_orig_collection = nil')
       Utils.instance_eval('@gems_source_collection = nil')
       FakeFS::FileSystem.clone(Gemirro::Configuration.views_directory)
+      allow_any_instance_of(Indexer).to receive(:compress_indices)
+      allow_any_instance_of(Indexer).to receive(:rand).and_return('0')
+
+      source = Source.new('Rubygems', 'https://rubygems.org')
+      allow(Gemirro.configuration).to receive(:source).and_return(source)
     end
 
     context 'HTML render' do
       it 'should display index page' do
-        allow(Logger).to receive(:new).twice.and_return(@fake_logger)
+        allow(Logger).to receive(:new).exactly(3).times.and_return(@fake_logger)
         allow(@fake_logger).to receive(:tap)
           .and_return(nil)
           .and_yield(@fake_logger)
 
+
+        MirrorFile.new('/var/www/gemirro/versions.md5.aaa256.list').write('created_at: 2025-01-01T00:00:00Z\n---\nvolay 0.1.0\n')
+
         get '/'
         expect(last_response).to be_ok
       end
@@ -63,58 +73,53 @@ module Gemirro
       end
 
       it 'should display gem specifications' do
-        marshal_dump = Marshal.dump([['volay',
-                                      ::Gem::Version.create('0.1.0'),
-                                      'ruby']])
+        MirrorFile.new('/var/www/gemirro/versions.md5.aaa256.list').write(%(created_at: 2025-01-01T00:00:00Z\n---\nvolay 0.1.0 checksum))
 
-        MirrorFile.new('/var/www/gemirro/specs.4.8.gz.orig').write(marshal_dump)
-        Struct.new('SuccessGzipReader', :read)
-        gzip_reader = Struct::SuccessGzipReader.new(marshal_dump)
-        MirrorDirectory.new('/var/www/gemirro')
-                       .add_directory('quick/Marshal.4.8')
-        # rubocop:disable Metrics/LineLength
-        MirrorFile.new('/var/www/gemirro/quick/Marshal.4.8/' \
-                       'volay-0.1.0.gemspec.rz')
-                  .write("x\x9C\x8D\x94]\x8F\xD2@\x14\x86\x89Y\xBB\xB4|\xEC\x12\xD7h" \
-                         "\xD4h\xD3K\x13J\x01\x97\xC84n\x9A\xA8\xBBi\xE2\xC5\x06\xBB" \
-                         "{\xC3\x85)\xE5\x00\x13f:u:E\xD1\xC4\xDF\xE6\xB5\xBF\xCAiK" \
-                         "\x11\xE3GK\xEF\x98\xF7\xBC\xCFy\xCF\xC9\xCCQ=A\x0F\xAE\x80" \
-                         "\"\xF4>\x82\x00/p\xE0\v\xCC\xC2;\xC1\xDD\xA3\xFA\xF4\xA1k4" \
-                         "\x06\xA6e\xF6_(Hy\xEBa\xD55\xB4\r#\xFEV\xB1k\xDE\r\xEAdu" \
-                         "\xB7\xC0cY1U\xE4\xA1\x95\x8A\xD3C7A\xAA\x87)\xB4\x9C\x1FO" \
-                         "\xBE\xD7\xE4OA\xEA\x17\x16\x82k\xD4o\xBC\xD7\x99\xC2x\xEC" \
-                         "\xAD@\xBFe$\xA1\xA0\xC7\xDBX\x00\xD5\x05/\xBC\xEFg\xDE\x13" \
-                         "\xF8\x98`\x0E\x14B1U\xE4w\xEC\x1A\xC7\x17\xAF2\x85\xADd\xC4" \
-                         "\xBE96\x87\xF9\x1F\xEA\xDF%\x8A\x95\xE3T\x9E\xCC2\xF3i\x9B" \
-                         "\xA1\xB3\xCC\xFE\rD\x10\xCE!\f\xB6\x1A\xD2\x9C\xD0\xA7\xB2" \
-                         "\xBF\x13\x8A?\x13<\xEB\x06\x04\xA7b\xD4q\xF8\xAF&\x0E!\xDF" \
-                         ".~\xEF\xE3\xDC\xCC@\xD2Hl\#@M\x9E\x84BN\x00\x9D:\x11\a\x0E" \
-                         "\x04\xFC\x18.\xD1#g\x93\xCF\xEB\xC3\x81m\\\xC1\x97\xD9" \
-                         "\x9Af7\\\xE3l\xD7_\xBC\x02BX\"\xD23\xBB\xF9o\x83A\xB1\x12" \
-                         "\xBBe\xB7\xED\x93K\xFB\xB4\x82\xB6\x80\xA9K\xB1\x1E\x96" \
-                         "\x10\xEA\x03sP\xCD\xBFP\x16\xEE\x8D\x85\xBF\x86E\\\x96" \
-                         "\xC02G\xF9\b\xEC\x16:\x9D\xC3\x06\b\x8B\xD2\xA9\x95\x84" \
-                         "\xD9\x97\xED\xC3p\x89+\x81\xA9}\xAB`\xD9\x9D\xFF\x03\xF6" \
-                         "\xD2\xC2\xBF\xCD\xFD`\xDD\x15\x10\x97\xED\xA4.[\xAB\xC6(" \
-                         "\x94\x05B\xE3\xB1\xBC\xA5e\xF6\xC3\xAA\x11\n\xE5>A\x8CiD " \
-                         "`\x9B\xF2\x04\xE3\xCA\t\xC6\x87\by-f,`Q\xD9\x1E,sp^q\x0F" \
-                         "\x85\xD4r\x8Dg\x11\x06\xCE\xC1\xE4>\x9D\xF9\xC9\xFC\xE5" \
-                         "\xC8YR\x1F\x133`4\xBB\xF9R~\xEF:\x93\xE8\x93\\\x92\xBF\r" \
-                         "\xA3\t\xF8\x84l\xF5<\xBF\xBE\xF9\xE3Q\xD2?q,\x04\x84:\x0E" \
-                         "\xF5\xF4\x1D1\xF3\xBA\xE7+!\"\xD4\xEB-\xB1X%\xB3\x14\xD3" \
-                         "\xCB\xEDw\xEE\xBD\xFDk\xE99OSz\xF3\xEA\xFA]w7\xF5\xAF\xB5" \
-                         "\x9F+\xFEG\x96")
-        # rubocop:enable Metrics/LineLength
+        get '/gem/volay'
 
-        allow(Zlib::GzipReader).to receive(:open)
-          .once
-          .with('/var/www/gemirro/specs.4.8.gz.orig')
-          .and_return(gzip_reader)
+        expect(last_response.status).to eq(200)
+        expect(last_response).to be_ok
+      end
+      
+      it 'responds to compact_index /names' do
+        MirrorFile.new('/var/www/gemirro/names.md5.aaa256.list').write(%(---\nvolay))
 
-        get '/gem/volay'
+        get '/names'
+        expect(last_response.status).to eq(200)
+        expect(last_response).to be_ok
+
+
+        expect(last_response.body).to  eq(%(---\nvolay))
+        expect(last_response.headers['etag']).to eq('"md5"')
+        expect(last_response.headers['repr-digest']).to  eq(%(sha-256=#{Base64.strict_encode64(['aaa256'].pack('H*'))}))
+      end
+
+      it 'responds to compact_index /info/[gemname]' do
+        MirrorDirectory.new('/var/www/gemirro/info')
+        MirrorFile.new('/var/www/gemirro/info/volay.md5.aaa256.list').write('---\n 0.1.0 |checksum:sha256\n')
+        
+
+        get '/info/volay'
         expect(last_response.status).to eq(200)
         expect(last_response).to be_ok
+        expect(last_response.body).to eq('---\n 0.1.0 |checksum:sha256\n')
+        expect(last_response.headers['etag']).to eq('"md5"')
+        expect(last_response.headers['repr-digest']).to  eq(%(sha-256=#{Base64.strict_encode64(['aaa256'].pack('H*'))}))
       end
+      
+
+      it 'responds to compact_index /versions' do
+        MirrorFile.new('/var/www/gemirro/versions.md5.aaa256.list').write(%(created_at: 2025-01-01T00:00:00Z\n---\nvolay 0.1.0))
+      
+        get '/versions'
+        expect(last_response.status).to eq(200)
+        expect(last_response).to be_ok
+        expect(last_response.body).to eq(%(created_at: 2025-01-01T00:00:00Z\n---\nvolay 0.1.0))
+        expect(last_response.headers['etag']).to eq('"md5"')
+        expect(last_response.headers['repr-digest']).to  eq(%(sha-256=#{Base64.strict_encode64(['aaa256'].pack('H*'))}))
+      end
+      
+
     end
 
     context 'Download' do
@@ -150,8 +155,8 @@ module Gemirro
         allow(::Gem::SilentUI).to receive(:new).once.and_return(true)
 
         allow(Gemirro.configuration).to receive(:logger)
-          .exactly(3).and_return(@fake_logger)
-        allow(@fake_logger).to receive(:info).exactly(3)
+          .exactly(4).and_return(@fake_logger)
+        allow(@fake_logger).to receive(:info).exactly(4)
 
         get '/gems/gemirro-0.0.1.gem'
         expect(last_response).to_not be_ok
@@ -200,31 +205,20 @@ module Gemirro
     end
 
     context 'dependencies' do
-      it 'should retrieve nothing' do
+      it 'should retrieve nothing and give 404' do
         get '/api/v1/dependencies'
-        expect(last_response.headers['Content-Type'])
-          .to eq('application/octet-stream')
-        expect(last_response.body).to eq('')
-        expect(last_response).to be_ok
+        expect(last_response.status).to eq(404)
+        expect(last_response).to_not be_ok
       end
 
-      it 'should retrieve empty json' do
-        get '/api/v1/dependencies.json'
-        expect(last_response.headers['Content-Type'])
-          .to eq('application/json')
-        expect(last_response.body).to eq('')
-        expect(last_response).to be_ok
-      end
 
-      it 'should retrieve empty json when gem was not found' do
+      it 'should retrieve nothing and give 404' do
         get '/api/v1/dependencies.json?gems=gemirro'
-        expect(last_response.headers['Content-Type'])
-          .to eq('application/json')
-        expect(last_response.body).to eq('[]')
-        expect(last_response).to be_ok
+        expect(last_response.status).to eq(404)
+        expect(last_response).to_not be_ok
       end
 
-      it 'should retrieve json when gem was found' do
+      it 'should retrieve nothing and give 404' do
         MirrorDirectory.new('/var/www/gemirro')
                        .add_directory('quick/Marshal.4.8')
         # rubocop:disable Metrics/LineLength
@@ -261,16 +255,28 @@ module Gemirro
                          "\x9F+\xFEG\x96")
         # rubocop:enable Metrics/LineLength
 
+        MirrorFile.new('/var/www/gemirro/api/v1/dependencies/volay.md5.sha.list')
+        .write(Marshal.dump([
+          {
+            name: 'volay',
+            number: "0.1.0",
+            platform: 'ruby',
+            dependencies: [
+              {
+                name: 'json',
+                requirement: '~> 2.1'
+              }
+            ]
+          }
+        ]))
+
         gem = Gemirro::GemVersion.new('volay', '0.1.0', 'ruby')
         collection = Gemirro::GemVersionCollection.new([gem])
         allow(Utils).to receive(:gems_collection)
           .and_return(collection)
         get '/api/v1/dependencies.json?gems=volay'
-        expect(last_response.headers['Content-Type'])
-          .to eq('application/json')
-
-        expect(last_response.body).to match(/"name":"volay"/)
-        expect(last_response).to be_ok
+        expect(last_response.status).to eq(404)
+        expect(last_response).to_not be_ok
       end
     end
   end

data/spec/gemirro/source_spec.rb

@@ -21,20 +21,11 @@ module Gemirro
       Struct.new('FetchVersions', :body)
       result = Struct::FetchVersions.new(true)
       allow(Http).to receive(:get).once.with(
-        "https://rubygems.org/#{Configuration.versions_file}"
+        "https://rubygems.org/versions"
       ).and_return(result)
       expect(@source.fetch_versions).to be_truthy
     end
 
-    it 'should fetch prereleases versions' do
-      Struct.new('FetchPrereleaseVersions', :body)
-      result = Struct::FetchPrereleaseVersions.new(true)
-      allow(Http).to receive(:get).once.with(
-        "https://rubygems.org/#{Configuration.prerelease_versions_file}"
-      ).and_return(result)
-      expect(@source.fetch_prerelease_versions).to be_truthy
-    end
-
     it 'should fetch gem' do
       Struct.new('FetchGem', :body)
       result = Struct::FetchGem.new(true)

data/spec/gemirro/versions_fetcher_spec.rb

@@ -17,10 +17,9 @@ module Gemirro
 
     it 'should fetch versions' do
       allow(@source).to receive(:fetch_versions).once.and_return([])
-      allow(@source).to receive(:fetch_prerelease_versions).once.and_return([])
-      allow(VersionsFile).to receive(:load).with('nothing', 'nothing')
-      allow(File).to receive(:write).twice
-      allow(File).to receive(:read).twice.and_return('nothing')
+      allow(VersionsFile).to receive(:load).with('nothing')
+      allow(File).to receive(:write).once
+      allow(File).to receive(:read).once.and_return('nothing')
       expect(@fetcher.fetch).to be_nil
     end
   end

data/spec/gemirro/versions_file_spec.rb

@@ -7,44 +7,20 @@ module Gemirro
   describe 'VersionsFile' do
     include FakeFS::SpecHelpers
 
-    it 'should be initialized' do
-      @versions_file = VersionsFile.new([['gemirro', '0.0.1'],
-                                         ['gemirro', '0.0.2']])
-      expect(@versions_file.versions).to eq([['gemirro', '0.0.1'],
-                                             ['gemirro', '0.0.2']])
-      expect(@versions_file.versions_hash).to eq(
-        'gemirro' => [
-          ['gemirro', '0.0.1'],
-          ['gemirro', '0.0.2']
-        ]
-      )
-    end
-
     it 'should load versions file' do
-      spec = StringIO.new('w')
-      w_gz = Zlib::GzipWriter.new(spec)
-      w_gz.write(Marshal.dump([['gemirro', '0.0.1'],
-                               ['gemirro', '0.0.2']]))
-      w_gz.close
-      prerelease = StringIO.new('w')
-      w_gz = Zlib::GzipWriter.new(prerelease)
-      w_gz.write(Marshal.dump([['gemirro', '0.0.1.alpha1'],
-                               ['gemirro', '0.0.2.alpha2']]))
-      w_gz.close
+      spec = %(created_at: 2025-01-01T00:00:00Z\n---\ngemirro 0.0.1.alpha1,0.0.1,0.0.2.alpha2,0.0.2 checksum)
 
-      result = VersionsFile.load(spec.string, prerelease.string)
+      result = VersionsFile.new(spec)
       expect(result).to be_a(VersionsFile)
 
-      expect(result.versions).to eq([['gemirro', '0.0.1'],
-                                     ['gemirro', '0.0.2'],
-                                     ['gemirro', '0.0.1.alpha1'],
-                                     ['gemirro', '0.0.2.alpha2']])
+      expect(result.versions_string).to eq(%(created_at: 2025-01-01T00:00:00Z\n---\ngemirro 0.0.1.alpha1,0.0.1,0.0.2.alpha2,0.0.2 checksum))
+
       expect(result.versions_hash).to eq(
         'gemirro' => [
-          ['gemirro', '0.0.1'],
-          ['gemirro', '0.0.2'],
-          ['gemirro', '0.0.1.alpha1'],
-          ['gemirro', '0.0.2.alpha2']
+          ['gemirro', ::Gem::Version.new('0.0.1.alpha1'), 'ruby'],
+          ['gemirro', ::Gem::Version.new('0.0.1'), 'ruby'],
+          ['gemirro', ::Gem::Version.new('0.0.2.alpha2'), 'ruby'],
+          ['gemirro', ::Gem::Version.new('0.0.2'), 'ruby']
         ]
       )
     end

data/template/config.rb

@@ -23,6 +23,12 @@ Gemirro.configuration.configure do
   server.access_log File.expand_path('../logs/access.log', __FILE__)
   server.error_log File.expand_path('../logs/error.log', __FILE__)
 
+  # Number of parallel processes while indexing. Too many will kill
+  # your indexing process prematurely.
+  #
+  # update_threads Etc.nprocessors - 1
+  # update_threads 4
+
   # If you don't want to generate indexes after each fetched gem.
   #
   # update_on_fetch false
@@ -54,6 +60,6 @@ Gemirro.configuration.configure do
   # All gem in the block will be downloaded with the update command.
   # Other gems will be downloaded with the server.
   define_source 'rubygems', 'https://rubygems.org' do
-    gem 'rack', '>= 1.0.0'
+    gem 'rack', '>= 3.0.0'
   end
 end

data/template/public/dist/css/gemirro.css

@@ -1 +1,25 @@
-.pull-none {float:none;}
+body { max-width: 620px; margin: 0 auto; padding: 0; font-family: sans-serif; }
+
+dl { display: grid; grid-template-columns: 1fr min-content; }
+
+dt { grid-column: 1; margin: 0; padding: 8px 0; border-bottom: 1px solid #e2e2e2; }
+dd { grid-column: 2; margin: 0; padding: 8px 0; border-bottom: 1px solid #e2e2e2; }
+
+dd.full { grid-column: 1/2; border-bottom: 0; }
+dd.description, dd.authors, dd.dependencies { grid-column: 1/2; border-bottom: 0; }
+
+
+a, a:visited, a:active, a:hover { color: #007bff; }
+.btn { color: #fff; background: #007bff; padding: 5px; border-radius: 4px; text-decoration: none; }
+.btn:visited, .btn:active, .btn:hover { color: #fff; }
+
+
+ul { list-style-type: none; margin: 0; padding: 0 0 0 1em; }
+
+
+@media (prefers-color-scheme: dark) {
+  html, body { background: #16161d; color: #fff; }
+  a, a:visited, a:active, a:hover { color: lightskyblue; }
+  .btn { color: #16161d; background: lightskyblue; padding: 5px; border-radius: 4px; text-decoration: none; }
+  .btn:visited, .btn:active, .btn:hover { color: #16161d; }
+}

data/views/gem.erb

@@ -1,58 +1,67 @@
-<div class="col-lg-12">
-  <div class="col-lg-3 center-block pull-none text-center">
+
     <a class="btn btn-default" href="<%= url '/'%>">Back to Gem Index</a>
   </div>
 </div>
 
-<div class="col-lg-12">
+
+<article>
   <% gem.by_name do |name, versions| %>
-    <div class="col-lg-6 center-block pull-none">
-      <div class="panel panel-info">
-        <div class="panel-heading">
-          <a href="<%= url("gem/#{name}") %>">
-            <h2 class="panel-title"><%= escape(name) %> <span class="badge pull-right"><%= escape(versions.newest.number) %></span></h2>
-          </a>
-        </div>
-        <div class="panel-body">
-          <% newest_gem = versions.newest %>
-          <% if spec = spec_for(name, newest_gem.number, newest_gem.platform) %>
-            <p><%= escape(spec.description) %></p>
+    <dl>
+      <dt>
+        <h2><%= Rack::Utils.escape_html(name) %></h2>
+      </dt>
+      <dd>
+        <h2><%= Rack::Utils.escape_html(versions.newest.number) %></h2>
+      </dd>
+      <% newest_gem = versions.newest %>
+      <% spec = Gemirro::Utils.spec_for(name, newest_gem.number, newest_gem.platform) %>
+      <% if spec %>
+        <dd class="description">
+          <%= Rack::Utils.escape_html(spec.description) %>
+        </dd>
 
+        <% if spec.dependencies.size > 0 %>
+          <dd class="dependencies">
             <h3>Dependencies</h3>
-            <ul class="list-group">
+            <ul>
               <% spec.dependencies.each do |dependency| %>
                 <li class="list-group-item">
-                  <a href="<%= url("gem/#{dependency.name}") %>"><%= escape([dependency.name, dependency.requirement].join(' ')) %></a>
+                  <a href="<%= url("gem/#{dependency.name}") %>"><%= Rack::Utils.escape_html([dependency.name, dependency.requirement].join(' ')) %></a>
                 </li>
               <% end %>
             </ul>
+          </dd>
+        <% end %>
 
+        <% if spec.authors.size > 0 %>
+          <dd class="authors">
             <h3>Authors</h3>
-            <ul class="list-group">
+            <ul>
               <% spec.authors.each do |author| %>
                 <li class="list-group-item">
-                  <a href="<%= homepage(spec) %>"><%= escape(author) %></a>
+                  <a href="<%= URI.parse(Addressable::URI.escape(spec.homepage)) %>"><%= Rack::Utils.escape_html(author) %></a>
                 </li>
               <% end %>
             </ul>
-          <% end %>
-        </div>
+          </dd>
+        <% end %>
+      <% end %>
 
-        <ul class="list-group">
-          <% versions.each.reverse_each do |version| %>
-            <li class="list-group-item clearfix">
-              <p class="pull-left">
-                <code>gem install <%= escape(version.name) %> -v "<%= escape(version.number) %>"</code>
-                <% unless version.platform =~ /^ruby/i %>
-                  <small class="platform"><%= escape(version.platform) %></small>
-                <% end %>
-              </p>
-              <div class="pull-right">
-                <a class="btn btn-primary btn-sm" href="<%= url("/gems/#{version.gemfile_name}.gem") %>">Download</a>
-              </div>
-            </li>
-          <% end %>
-        </ul>
-    </div>
+      <% versions.each.reverse_each do |version| %>
+        <dt>
+          <code>
+            gem install
+            <%= Rack::Utils.escape_html(version.name) %>
+            --version "<%= Rack::Utils.escape_html(version.number) %>"
+            <% unless version.platform =~ /^ruby/i %>
+              --platform <%= Rack::Utils.escape_html(version.platform) %>
+            <% end %>
+          </code>
+        </dt>
+        <dd>
+          <a class="btn" href="<%= url("/gems/#{version.gemfile_name}.gem") %>">Download</a>
+        </dd>
+      <% end %>
+    </dl>
   <% end %>
-</div>
+</article>

data/views/index.erb

@@ -1,38 +1,46 @@
 
-<div class="col-lg-12">
-  <div class="col-lg-3 center-block pull-none">
-    <pre class="bg-info"><code>gem sources -a <%= url("/") %></code></pre>
-  </div>
-</div>
+<code>gem sources -a <%= url("/") %></code>
 
-<div class="col-lg-12">
-  <% if gems.any? %>
-    <div class="col-lg-6 center-block pull-none">
-      <% gems.by_name do |name, versions| %>
-        <div class="panel panel-info">
-          <div class="panel-heading">
-            <a href="<%= url("gem/#{name}") %>">
-              <h2 class="panel-title"><%= escape(name) %> <span class="badge pull-right"><%= escape(versions.newest.number) %></span></h2>
-            </a>
-          </div>
+<% if gems.any? %>
+  <article>
+    <% gems.by_name do |name, versions| %>
+      <dl>
+        <dt>
+          <a href="<%= url("gem/#{name}") %>">
+            <h2><%= Rack::Utils.escape_html(name) %></h2>
+          </a>
+        </dt>
+        <dd>
+          <h2><%= Rack::Utils.escape_html(versions.newest.number) %></h2>
+        </dd>
+        
+        <% spec = Gemirro::Utils.spec_for(name, versions.newest.number, versions.newest.platform) %>
+        <% if spec.is_a?(::Gem::Specification) %>
+          <dd class="description">
+            <%= Rack::Utils.escape_html(spec.description)  %>
+          </dd>
+        <% end %>
 
-          <div class="panel-body">
-            <% spec = spec_for(name, versions.newest.number) %>
-            <% if spec.is_a?(::Gem::Specification) %>
-              <%= escape(spec.description) %>
-            <% end %>
-
-            <% versions.reverse_each.first(5).each do |version| %>
-              <p>
-                <code>gem install <%= escape(version.name) %> <%= "--prerelease" if version.number.to_s.match(/[a-z]/i) %> -v "<%= escape(version.number) %>"</code>
+          <% versions.reverse_each.first(5).each do |version| %>
+            <dt class="version">
+              <code>
+                gem install
+                <%= Rack::Utils.escape_html(version.name) %>
+                <%= "--prerelease" if version.number.to_s.match(/[a-z]/i) %>
+                --version "<%= Rack::Utils.escape_html(version.number) %>"
                 <% unless version.platform =~ /^ruby/i %>
-                  <small class="platform"><%= escape(version.platform) %></small>
+                  --platform <%= Rack::Utils.escape_html(version.platform) %></small>
                 <% end %>
-              </p>
-            <% end %>
-          </div>
-        </div>
-      <% end %>
-    </div>
-  <% end %>
-</div>
+              </code>
+            </dt>
+            <dd>
+              <a class="btn btn-primary btn-sm" href="<%= url("/gems/#{version.gemfile_name}.gem") %>">Download</a>
+            </dd>
+          <% end %>
+          <% if versions.size > 5 %>
+            <dd class="full"><a href="<%= url("gem/#{name}") %>"><%= "And %d More..." % [versions.size - 5] %></a></dd>
+          <% end %>
+      </dl>
+    <% end %>
+  </article>
+<% end %>