birds 0.0.0 → 0.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6903ae4e8cfca9e4b0d8663336f1ad83ade93a95
-  data.tar.gz: 284b6418f84970f9b9205a877f243fe8f7bdd9d2
+  metadata.gz: 7fe5c975045c5cd3f27f17496e5fe94c89517e2f
+  data.tar.gz: 125796780f21a82f7266294d4f3e64a4671b25e4
 SHA512:
-  metadata.gz: 8662c707d852a14a8d970c3b829f34c0c2ffcc5e095a72cab3a6bd62af574ac3b2cab19497797df28fc519d6edd8f5e2423859dbe3702f0abfd2fa3e92ec9c0e
-  data.tar.gz: 340986eb90f47f8a881d4295ecf4c1bc0dea99b478d3214a1100075b6216d7ba43b4dbecf82cb332a01fc7fa847f47694fa72e1bdd80647861e8232a5e9ce6e3
+  metadata.gz: 6036a21f6e4b8e32d5fec07ce207fddf108e942ca488e2e29690512af14c5447fbd310866170de79307f5ec8730435646f255880ab30db01b96ba5a9ab3ecde9
+  data.tar.gz: f6f880fc852613a626cb2cf8274ab5602bdc05fa03ee62599ce1dd1aa81113df646dfc42dd41066b98478cf3e152be1c6ab6ce6bca7a97c17858f2fd694c4102

data/ChangeLog

@@ -2,6 +2,10 @@
 
 = Revision history for Birds
 
+== 0.0.1 [2016-10-12]
+
+* Initial release.
+
 == 0.0.0 [2014-03-19]
 
 * Birthday :-)

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to Birds version 0.0.0
+This documentation refers to Birds version 0.0.1
 
 
 == DESCRIPTION
@@ -25,7 +25,7 @@ RubyGem::       https://rubygems.org/gems/birds
 
 == LICENSE AND COPYRIGHT
 
-Copyright (C) 2014-2015 Jens Wille
+Copyright (C) 2014-2016 Jens Wille
 
 Birds is free software: you can redistribute it and/or modify it under the
 terms of the GNU Affero General Public License as published by the Free

data/Rakefile

@@ -1,4 +1,4 @@
-require File.expand_path(%q{../lib/birds/version}, __FILE__)
+require_relative 'lib/birds/version'
 
 begin
   require 'hen'
@@ -15,8 +15,8 @@ begin
       homepage:     :blackwinter,
       extra_files:  FileList['*.sample', 'lib/**/{public,views}/*'].to_a,
       dependencies: {
-        'sinatra-bells' => ['~> 0.0', '>= 0.0.2'],
-        'solr4r'        => ['~> 0.0', '>= 0.0.4'],
+        'sinatra-bells' => '~> 0.4',
+        'solr4r'        => '~> 0.3',
         'unicode'       => '~> 0.4'
       },
 
@@ -27,19 +27,23 @@ rescue LoadError => err
   warn "Please install the `hen' gem. (#{err})"
 end
 
-task c: :_ do
+desc 'Run IRB console'
+task console: :load do
   require 'irb'; IRB.start
 end
 
-task r: :_ do
+desc 'Run rackup command'
+task rackup: :load do
   load Gem.bin_path('rack', 'rackup')
 end
 
-task :_ do
+task :load do
   ARGV.clear
 
-  b = File.expand_path('~/devel')  # XXX
-  $:.unshift(*%w[birds solr4r sinatra-bells].map { |i| File.join(b, i, 'lib') })
+  b = ENV['DEVEL'] and %w[sinatra-bells solr4r].each { |i|
+    $:.unshift(File.join(File.expand_path(b), i, 'lib')) }
+
+  $:.unshift('lib')
 
   require 'birds'
   require 'birds/app'

data/lib/birds/app/controllers.rb

@@ -5,7 +5,7 @@
 #                                                                             #
 # Birds -- Bibliographic information retrieval & document search              #
 #                                                                             #
-# Copyright (C) 2014-2015 Jens Wille                                          #
+# Copyright (C) 2014-2016 Jens Wille                                          #
 #                                                                             #
 # Birds is free software: you can redistribute it and/or modify it under the  #
 # terms of the GNU Affero General Public License as published by the Free     #
@@ -28,8 +28,10 @@ require 'unicode'
 class Birds::App
 
   get '/', render: :index do
-    result = settings.solr.count
-    @page_title, @page_title_extra = 'Home', "#{result.to_i} documents"
+    @page_title, @page_title_extra = 'Home',
+      '%d documents' % count = settings.solr.count.to_i
+
+    @page_title_query = settings.solr_match_all_query if count > 0
   end
 
   get '/search', render: :index do
@@ -38,9 +40,14 @@ class Birds::App
     @query, @filter = params[:q] || params[:qq], Array(params[:fq])
 
     paginate_query(@query, :results,
-      facet_params(debug: 'results', fq: @filter))
+      highlighting_params(facet_params(debug: 'results', fq: @filter)))
+
+    @explain      = explain_result
+    @facets       = facet_counts
+    @highlighting = highlighting
 
-    @explain, @facets = explain_result(@result), facet_counts(@result)
+    @spellcheck = spellcheck_collations(
+      spell_query(@query, spellcheck_params(fq: @filter))).to_a
   end
 
   get '/browse', render: :browse do
@@ -100,16 +107,17 @@ class Birds::App
     bad_request if id.empty?
     not_found unless @document = search_document(id)
 
-    @similar = @document.more_like_this(settings.mlt_fields,
-      debugQuery: true, mlt: { boost: true, mintf: 1, minwl: 4 })
+    mlt_fields, @similar, @explain = settings.mlt_fields, {}, {}
+    mlt_fields = { nil => mlt_fields } unless mlt_fields.is_a?(Hash)
 
-    @explain = explain_result(@similar)
+    mlt_fields.each { |key, fields|
+      mlt = @document.more_like_this(fields,
+        debug: 'results', mlt: { boost: true, mintf: 1, minwl: 4 })
 
-    @page_title, @page_title_extra = 'Document', "##{id}"
-  end
+      @similar[key], @explain[key] = mlt, explain_result(mlt) unless mlt.empty?
+    }
 
-  get 'schema.xml' do
-    erb :schema
+    @page_title, @page_title_extra = 'Document', "##{id}"
   end
 
 end

data/lib/birds/app/helpers/controller.rb

@@ -5,7 +5,7 @@
 #                                                                             #
 # Birds -- Bibliographic information retrieval & document search              #
 #                                                                             #
-# Copyright (C) 2014-2015 Jens Wille                                          #
+# Copyright (C) 2014-2016 Jens Wille                                          #
 #                                                                             #
 # Birds is free software: you can redistribute it and/or modify it under the  #
 # terms of the GNU Affero General Public License as published by the Free     #
@@ -23,84 +23,128 @@
 ###############################################################################
 #++
 
-class Birds::App
+class Birds
 
-  module Helpers
+  class App
 
-    module Controller
+    module Helpers
 
-      def search(params)
-        settings.solr.json_query(params)
-      end
+      module Controller
 
-      def search_query(query, params = {})
-        search(params.merge(q: query, fl: '*,score', defType: 'edismax'))
-      end
+        def solr_query(path, params = {}, options = {}, &block)
+          settings.solr.json_query(params, options, path, &block)
+        end
 
-      def search_document(id)
-        search(q: { id: id }).first
-      end
+        def search(params)
+          solr_query(settings.solr_select_path, params)
+        end
 
-      def paginate_query(query, what, query_params = {}, per_page = 20)
-        return unless query
+        def spell_query(query, params = {})
+          solr_query(settings.solr_spell_path, params.merge(q: query))
+        end
 
-        page = params[:page].to_i
-        page = 1 if page < 1
+        def search_query(query, params = {})
+          search(params.merge(q: query, fl: '*,score', defType: 'edismax'))
+        end
 
-        @prev_page, @next_page = page - 1, page + 1
+        def search_document(id)
+          search(q: { id: id }).first
+        end
 
-        @result = search_query(query, query_params.merge(
-          rows: per_page, start: @offset = @prev_page * per_page))
+        def paginate_query(query, what, query_params = {})
+          return unless query
 
-        @page_title_extra = '%d %s, page %d of %d' % [
-          @result, what, page, @total_pages = (@result.to_i / per_page.to_f).ceil]
+          page, per_page = clip(params[:page].to_i),
+            clip(Integer(params[:per_page] || settings.default_per_page))
 
-        @prev_page = nil if @prev_page < 1
-        @next_page = nil if @next_page > @total_pages
-      end
+          @prev_page, @next_page = page - 1, page + 1
 
-      def facet_params(params = {})
-        params.merge(f: f = params[:f] || {}, facet: {
-          field: fields = [], range: ranges = [], mincount: 1
-        }).tap { settings.facet_fields.each { |facet, (_, options)|
-          options.nil? ? fields << facet : begin ranges << facet
-            ((f[facet] ||= {})[:facet] ||= {})[:range] = options
-          end
-        } }
-      end
+          @result = search_query(query, query_params.merge(
+            rows: per_page, start: @offset = @prev_page * per_page))
 
-      def terms(f = @field)
-        settings.solr.json('terms', terms: { fl: f, limit: -1 }).to_h[f].sort
-      end
+          @page_title_extra = '%d %s, page %d of %d' % [@result, what,
+            page, @total_pages = clip(@result.to_i.fdiv(per_page).ceil)]
 
-      def explain_result(result)
-        result % %w[debug explain] if result
-      end
+          @prev_page = nil if @prev_page < 1
+          @next_page = nil if @next_page > @total_pages
+        end
+
+        def facet_params(params = {})
+          params.merge(f: f = params[:f] || {}, facet: {
+            field: fields = [], range: ranges = [], mincount: 1
+          }).tap { settings.facet_fields.each { |facet, (_, options)|
+            options.nil? ? fields << facet : begin ranges << facet
+              ((f[facet] ||= {})[:facet] ||= {})[:range] = options
+            end
+          } }
+        end
+
+        def highlighting_params(params = {})
+          params.merge(hl: {
+            fl:              settings.highlighting_fields,
+            snippets:        settings.highlighting_snippets,
+            fragsize:        settings.highlighting_fragsize,
+            mergeContiguous: true,
+            preserveMulti:   true,
+            simple: {
+              pre:  settings.highlighting_prefix,
+              post: settings.highlighting_postfix
+            }
+          })
+        end
 
-      def facet_counts(result)
-        return {} unless result && result.to_i > 1
+        def spellcheck_params(params = {})
+          params.merge(spellcheck: { collate: true })
+        end
 
-        exclude, prepare = [@query, *@filter], lambda { |facet_hash, &block|
-          facet_hash.delete_if { |key, hash|
-            gap = block[hash] if block
+        def terms(f = @field)
+          settings.solr.json('terms', terms: { fl: f, limit: -1 }).to_h[f].sort
+        end
 
-            hash.delete_if { |term,|
-              exclude.include?(facet_query(key, term, *gap)) }.size < 2
+        def explain_result(result = @result)
+          result.debug_explain if result && result.debug?
+        end
+
+        def facet_counts(result = @result)
+          return {} unless result && result.to_i > 1 && result.facet_counts?
+
+          exclude, prepare = [@query, *@filter], lambda { |facet_hash, &block|
+            facet_hash.delete_if { |key, hash|
+              gap = block[hash] if block
+
+              hash.delete_if { |term,|
+                exclude.include?(facet_query(key, term, *gap)) }.size < 2
+            }
           }
-        }
 
-        prepare.(result.facet_fields.to_h).merge(
-        prepare.(result.facet_ranges.to_h) { |hash|
-          counts, before, start, gap = hash
-            .values_at(*%w[counts before start gap])
+          prepare.(result.facet_fields.to_h).merge(
+          prepare.(result.facet_ranges.to_h) { |hash|
+            counts, before, start, gap = hash
+              .values_at(*%w[counts before start gap])
+
+            hash.clear
+            hash[-start] = before if before && before > 1
+            counts.each { |value, count| hash[value.to_i] = count }
+
+            hash.singleton_class.send(:define_method, :gap) { gap }
+            gap
+          })
+        end
+
+        def highlighting(result = @result)
+          result.highlighting if result && result.highlighting?
+        end
+
+        def spellcheck_collations(result = @result, limit = nil)
+          result.spellcheck_collations(limit) if result && result.spellcheck?
+        end
+
+        private
 
-          hash.clear
-          hash[-start] = before if before > 1
-          counts.each { |value, count| hash[value.to_i] = count }
+        def clip(num, min = 1)
+          num < min ? min : num
+        end
 
-          hash.singleton_class.send(:define_method, :gap) { gap }
-          gap
-        })
       end
 
     end

data/lib/birds/app/helpers/view.rb

@@ -5,7 +5,7 @@
 #                                                                             #
 # Birds -- Bibliographic information retrieval & document search              #
 #                                                                             #
-# Copyright (C) 2014-2015 Jens Wille                                          #
+# Copyright (C) 2014-2016 Jens Wille                                          #
 #                                                                             #
 # Birds is free software: you can redistribute it and/or modify it under the  #
 # terms of the GNU Affero General Public License as published by the Free     #
@@ -23,105 +23,131 @@
 ###############################################################################
 #++
 
-class Birds::App
+class Birds
+
+  class App
+
+    module Helpers
+
+      module View
+
+        def nav_item(path, name, title = nil)
+          li_(link_to(name, path, title: title), class: active?(path))
+        end
+
+        def hl(text)
+          h(text)
+            .gsub(h(settings.highlighting_prefix),  settings.highlighting_prefix)
+            .gsub(h(settings.highlighting_postfix), settings.highlighting_postfix)
+        end
+
+        def cl(text)
+          text
+            .gsub(settings.highlighting_prefix,  '')
+            .gsub(settings.highlighting_postfix, '')
+        end
+
+        def link_to_document(document, highlighting = {})
+          label = format_label(settings.document_label) { |k|
+            h, d = highlighting.delete(k), document[k]
+            h ? d.map { |v| h.find { |w| cl(w) == v } || v } : d
+          }
+
+          label = "##{document.id}" if label.empty?
+
+          link_to(hl(label), :document, document.id)
+        end
+
+        def link_to_search(text, query, *filters)
+          options = filters.last.is_a?(Hash) ? filters.pop : {}
+
+          link_to(text, :search, options.merge(params:
+            query ? query_params(query, filters) : { q: filters.first }))
+        end
+
+        def link_to_filter(text, query, filter)
+          link_to_search(hl(text), query, cl(filter), *@filter)
+        end
+
+        def link_to_field(field, value, query = nil)
+          link_to_filter(value, query, field_query(field, value))
+        end
+
+        def link_to_facet(field, value, gap = nil)
+          link_to_filter(
+            gap ? range_label(value, gap) : value,
+            @query, facet_query(field, value, gap))
+        end
+
+        def facet_query(field, value, gap = nil)
+          gap ? range_query(field, value, gap) : field_query(field, value)
+        end
+
+        def field_query(field, value)
+          %Q{#{field}:"#{value}"}
+        end
+
+        def range_query(field, value, gap)
+          value < 0 ?
+            %Q|#{field}:[* TO #{-value}}| :
+            %Q|#{field}:[#{value} TO #{value + gap}}|
+        end
+
+        def range_label(value, gap)
+          value < 0 ? "before #{-value}" : "#{value}–#{value + gap - 1}"
+        end
+
+        def query_params(q = @query, fq = @filter)
+          { q: q, 'fq[]' => fq }
+        end
+
+        def pagination_for(*args)
+          params = args.last.is_a?(Hash) ?
+            args.pop.reject { |_, v| v.nil? } : {}
+
+          ul_([
+            [@prev_page, :first, 1],
+            [@prev_page, :prev,  @prev_page],
+            [@next_page, :next,  @next_page],
+            [@next_page, :last,  @total_pages]
+          ], class: 'pagination') { |condition, type, page|
+            [link_to_if(condition, pagination_icon(type), *args, rel: type,
+              params: params.merge(page: page)), class: disabled?(condition)]
+          }
+        end
+
+        def pagination_icon(type)
+          tag_(:span, glyphicon(*{
+            first: [:fast_backward, title: 'First page'],
+            prev:  [:backward,      title: 'Previous page'],
+            next:  [:forward,       title: 'Next page'],
+            last:  [:fast_forward,  title: 'Last page']
+          }[type]))
+        end
+
+        def glyphicon(name, options = {})
+          name, options = name.to_s.tr('_', '-'), options.dup
+
+          options[:class] = %W[glyphicon glyphicon-#{name}]
+            .push(*options.delete(:class)).compact.join(' ')
+
+          tag_(:span, options)
+        end
+
+        def values_for(key, document = @document)
+          Array(document[key = key.to_s]).dup.tap { |values|
+            return if values.empty?
+
+            if settings.browse_fields.include?(key)
+              values.map! { |v| link_to(v = hl(v), :browse, key, v) }
+            elsif field = settings.linkable_fields[key]
+              values.map! { |v| link_to_field(field, v) }
+            else
+              values.map!(&method(:hl))
+            end
+          }
+        end
 
-  module Helpers
-
-    module View
-
-      def nav_item(path, name, title = nil)
-        li_(link_to(name, path, title: title), class: active?(path))
-      end
-
-      def link_to_document(document)
-        label = format_label(settings.document_label, document)
-        link_to(h(label), :document, document['id'])
-      end
-
-      def link_to_search(text, query, *filters)
-        options = filters.last.is_a?(Hash) ? filters.pop : {}
-
-        link_to(text, :search, options.merge(params:
-          query ? query_params(query, filters) : { q: filters.first }))
-      end
-
-      def link_to_filter(text, query, filter)
-        link_to_search(h(text), query, filter, *@filter)
-      end
-
-      def link_to_field(field, value, query = nil)
-        link_to_filter(value, query, field_query(field, value))
-      end
-
-      def link_to_facet(field, value, gap = nil)
-        link_to_filter(
-          gap ? range_label(value, gap) : value,
-          @query, facet_query(field, value, gap))
-      end
-
-      def facet_query(field, value, gap = nil)
-        gap ? range_query(field, value, gap) : field_query(field, value)
-      end
-
-      def field_query(field, value)
-        %Q{#{field}:"#{value}"}
-      end
-
-      def range_query(field, value, gap)
-        value < 0 ?
-          %Q|#{field}:[* TO #{-value}}| :
-          %Q|#{field}:[#{value} TO #{value + gap}}|
-      end
-
-      def range_label(value, gap)
-        value < 0 ? "before #{-value}" : "#{value}–#{value + gap - 1}"
-      end
-
-      def query_params(q = @query, fq = @filter)
-        { q: q, 'fq[]' => fq }
-      end
-
-      def pagination_for(*args)
-        params = args.last.is_a?(Hash) ? args.pop.reject { |_, v| v.nil? } : {}
-
-        ul_([
-          [@prev_page, :first, 1],
-          [@prev_page, :prev,  @prev_page],
-          [@next_page, :next,  @next_page],
-          [@next_page, :last,  @total_pages]
-        ], class: 'pagination') { |condition, type, page|
-          li_(link_to_if(condition, pagination_icon(type),
-            *args, params: params.merge(page: page)),
-            class: disabled?(condition))
-        }
-      end
-
-      def pagination_icon(type)
-        tag_(:span, glyphicon(*{
-          first: [:fast_backward, 'First page'],
-          prev:  [:backward,      'Previous page'],
-          next:  [:forward,       'Next page'],
-          last:  [:fast_forward,  'Last page']
-        }[type]))
-      end
-
-      def glyphicon(name, title = nil)
-        name = name.to_s.tr('_', '-')
-        tag_(:span, class: "glyphicon glyphicon-#{name}", title: title)
-      end
-
-      def values_for(key, document = @document)
-        Array(document[key = key.to_s]).dup.tap { |values|
-          return if values.empty?
-
-          if settings.browse_fields.include?(key)
-            values.map! { |v| link_to(v = h(v), :browse, key, v) }
-          elsif field = settings.linkable_fields[key]
-            values.map! { |v| link_to_field(field, v) }
-          else
-            values.map!(&method(:h))
-          end
-        }
       end
 
     end

data/lib/birds/app/settings.rb

@@ -5,7 +5,7 @@
 #                                                                             #
 # Birds -- Bibliographic information retrieval & document search              #
 #                                                                             #
-# Copyright (C) 2014-2015 Jens Wille                                          #
+# Copyright (C) 2014-2016 Jens Wille                                          #
 #                                                                             #
 # Birds is free software: you can redistribute it and/or modify it under the  #
 # terms of the GNU Affero General Public License as published by the Free     #
@@ -49,38 +49,72 @@ class Birds::App
     settings.solr_client.new(settings.solr_opts)
   end
 
-  set_hash :display_fields, %w[
-    title author year abstract language theme subject
+  set :solr_select_path do
+    settings.solr_client::DEFAULT_SELECT_PATH
+  end
+
+  set :solr_spell_path do
+    settings.solr_client::DEFAULT_SPELL_PATH
+  end
+
+  set :solr_match_all_query do
+    settings.solr_client::MATCH_ALL_QUERY
+  end
+
+  set_hash :display_fields1, %w[
+    editor author title issue source imprint year pages isbn series
+    abstract content footnote theme field form object location area aid
   ], %w[_txt] do |f, l| [f, l.capitalize] end
 
+  set_hash :display_fields2, %w[
+    compass lcsh precis rswk bk asb ddc sbb sfb ghbs kab lcc ssd rvk
+  ], %w[_txt] do |f, l| [f, l.upcase] end
+
+  set :display_fields do
+    settings.display_fields1.merge(settings.display_fields2)
+  end
+
   set_hash :linkable_fields, %w[
-    author theme subject
+    editor author
+    theme field object
+    compass lcsh precis rswk bk asb ddc sbb sfb ghbs kab lcc ssd rvk
   ], %w[_txt _ss]
 
   set_hash :facet_fields, %w[
-    author language theme subject
-  ].insert(2,
+    author language type theme subject classification
+  ].insert(1,
     [:year, start: 1900, end: 2100, gap: 10, other: 'before']
   ) do |f, o| ["#{f}_#{o ? :i : :ss}", ["#{f}s".capitalize, o]] end
 
-  set :mlt_fields, %w[
-    author_txt title_txt abstract_txt subject_txt
-  ]
+  set :mlt_fields,
+    author:  %w[author_txt],
+    content: %w[title_txt abstract_txt subject_txt]
 
   set :browse_fields, {
-#     'cat'        => %w[Category     Categories],
-#     'manu_exact' => %w[Manufacturer Manufacturers]
+#TODO     'cat'        => %w[Category     Categories],
+#TODO     'manu_exact' => %w[Manufacturer Manufacturers]
   }
 
   set :scroll_fields, {
-#     'author_s' => 'Author'
+#TODO     'author_s' => 'Author'
   }
 
-  set :sample_queries, {
-    'Sample query 1' => 'author_txt:fugmann',
-    'Sample query 2' => 'fugmann -author_txt:fugmann'
-  }
+  set :highlighting_fields, '*'
+
+  set :highlighting_snippets, 4
+
+  set :highlighting_fragsize, 0
+
+  set :highlighting_prefix, '<mark>'
+
+  set :highlighting_postfix, '</mark>'
+
+  set :sample_queries do
+    { 'All documents' => settings.solr_match_all_query }
+  end
+
+  set :document_label, '{author_txt:%s: }{title_txt( : )}{year_txt: (%s)}'
 
-  set :document_label, '{author_ss:%s: }{title_ss( : )}{year_ss: (%s)}'
+  set :default_per_page, 20
 
 end

data/lib/birds/app/views/_display.erb

@@ -0,0 +1,6 @@
+<dl class="dl-horizontal<%= ' info-display bg-info' if defined?(info) && info %>">
+<% for key, label in fields; values = values_for(key, document) or next %>
+  <dt class="text-muted"><%=h label || key %></dt>
+  <dd><%= values.join('<br />') %></dd>
+<% end %>
+</dl>

data/lib/birds/app/views/_documents.erb

@@ -1,13 +1,14 @@
-<ol start="<%= defined?(start) && start || 1 %>" style="margin-top: 1em"><!-- XXX -->
-<% for document in documents; id, score = document['id'], h('%.2f' % document['score']); next if @document && id == @document['id'] %>
+<ol start="<%= defined?(start) && start || 1 %>">
+<% for document in documents; id, score = document.id, h('%.2f' % document.score) %>
   <li>
-    <%= link_to_document(document) %>
+    <%= link_to_document(document, hl = defined?(highlighting) == 'local-variable' ? highlighting[id] : {}) %>
   <% unless defined?(explain) && explain %>
     <span class="badge"><%= score %></span>
   <% else; eid = h("explain-#{id}") %>
     <span class="badge toggle-explain" data-toggle="collapse" data-target="#<%= eid %>" title="Toggle score explanation"><%= score %></span>
     <pre id="<%= eid %>" class="collapse small"><%=h explain[id] %></pre>
   <% end %>
+  <%= partial :display, fields: hl.keys.sort.map { |k| [k, settings.display_fields[k] || k.split('_')[0..-2].join('_').capitalize] }.uniq { |_, l| l }, document: hl, info: true unless hl.empty? %>
   </li>
 <% end %>
 </ol>

data/lib/birds/app/views/_facets.erb

@@ -1,9 +1,26 @@
-<% position = 0; for facet, (label, _) in settings.facet_fields; counts = @facets[facet] or next; collapse = max = nil %>
+<%
+  position = 0
+  for facet, (label, _) in settings.facet_fields
+    counts = @facets[facet] or next
+
+    fid = "facet-#{h(facet)}"
+    ffid = fid + '-filter'
+
+    expand = (position += 1) < 4
+
+    collapse = max = nil
+%>
   <div class="panel panel-default">
     <div class="panel-heading">
-      <h4 class="panel-title toggle-facet" data-toggle="collapse" data-target="#<%= fid = "facet-#{h(facet)}" %>" title="Toggle facet list"><%=h label %></h4>
+      <h4 class="panel-title toggle-facet" data-toggle="collapse" data-target="#<%= fid %>, #<%= ffid %>" title="Toggle facet list"><%=h label %></h4>
+    <% if counts.size > 8 %>
+      <div class="facet-filter collapse<%= ' in' if expand %>" id="<%= ffid %>">
+        <div class="pull-right"><%= glyphicon(:remove, title: 'Clear facet filter') %></div>
+        <form><input class="form-control" type="text" placeholder="Filter <%=h label.downcase %>" /></form>
+      </div>
+    <% end %>
     </div>
-    <ul class="list-group compact-list-group collapse<%= ' in' if (position += 1) < 4 %>" id="<%= fid %>">
+    <ul class="facet-group list-group compact-list-group collapse<%= ' in' if expand %>" id="<%= fid %>">
   <% if counts.respond_to?(:gap) %>
     <% for (value, count), index in counts.reverse_each.with_index %>
       <li class="list-group-item clearfix<%= ' facet-collapse collapse' if collapse ||= index > 2 %>">

data/lib/birds/app/views/_spellcheck.erb

@@ -0,0 +1,9 @@
+<ul class="list-inline">
+  <li class="text-warning">Did you mean:</li>
+<% for query, hits in @spellcheck %>
+  <li>
+    <strong><%= link_to_search(h(query), query, *@filter) %></strong>
+    <span class="badge"><%=h hits %></span>
+  </li>
+<% end %>
+</ul>

data/lib/birds/app/views/document.erb

@@ -1,12 +1,7 @@
-<dl class="dl-horizontal">
-<% for key, label in settings.display_fields; values = values_for(key) or next %>
-  <dt class="text-muted" title="<%=h key %>:"><%=h label || key %></dt>
-  <dd><%= values.join('<br />') %></dd>
-<% end %>
-</dl>
+<%= partial :display, fields: settings.display_fields, document: @document %>
 
-<% unless @similar.empty? %>
-<h2>Similar documents</h2>
+<% for key, mlt in @similar %>
+<h2>Similar documents<%= " (#{key})" if key %></h2>
 
-<%= erb :_documents, locals: { documents: @similar, explain: @explain } %>
+<%= partial :documents, documents: mlt, explain: @explain[key] %>
 <% end %>

data/lib/birds/app/views/index.erb

@@ -16,9 +16,9 @@
     </form>
 
   <% if @filter %>
-    <ul class="list-inline" style="margin-top: 0.5em"><!-- XXX -->
+    <ul class="filter-list list-inline">
     <% for filter in @filter %>
-      <li style="line-height: 1.7em"><!-- XXX -->
+      <li>
         <%= link_to_search('&times;', @query, *@filter - [filter], class: 'close', title: 'Remove filter') %>
         <code><%=h filter %></code>
       </li>
@@ -27,11 +27,12 @@
   <% end %>
 
   <% if @result %>
-    <%= erb :_documents, locals: { documents: @result, explain: @explain, start: @offset + 1 } %>
+    <%= partial :spellcheck unless @spellcheck.empty? %>
+    <%= partial :documents, documents: @result, explain: @explain, highlighting: @highlighting, start: @offset + 1 %>
     <%= pagination_for(:search, query_params) %>
   </div>
   <div class="col-md-3">
-    <%= erb :_facets %>
+    <%= partial :facets %>
   <% else %>
     <h2>Query syntax</h2>
 

data/lib/birds/app/views/layout.erb

@@ -39,7 +39,7 @@
             <%= nav_item('/scroll', 'Scroll', 'Scroll through indexes') unless settings.scroll_fields.empty? %>
           </ul>
           <ul class="nav navbar-nav navbar-right">
-            <li><a href="<%= url('/help') %>" title="View help pages">Help</a></li>
+            <li><a class="btn disabled" href="<%= url('/help') %>" title="View help pages">Help</a></li>
           </ul>
           <form action="<%= url('/search') %>" method="GET" class="navbar-form navbar-right" role="search">
             <div class="form-group">
@@ -56,7 +56,12 @@
       <% if @code && @error %>
         <p><big>Oops... <%=h @code %> – <%=h @error %></big></p>
       <% else %>
-        <h1><%=h @page_title %><% if @page_title_extra %> <small>(<%=h @page_title_extra %>)</small><% end %></h1>
+        <h1>
+          <%=h @page_title %>
+        <% if pte = @page_title_extra %>
+          <small>(<%= @page_title_query ? link_to_search(h(pte), @page_title_query) : h(pte) %>)</small>
+        <% end %>
+        </h1>
         <%= yield %>
       <% end %>
       </div>

data/lib/birds/version.rb

@@ -4,7 +4,7 @@ class Birds
 
     MAJOR = 0
     MINOR = 0
-    TINY  = 0
+    TINY  = 1
 
     class << self
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: birds
 version: !ruby/object:Gem::Version
-  version: 0.0.0
+  version: 0.0.1
 platform: ruby
 authors:
 - Jens Wille
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-12 00:00:00.000000000 Z
+date: 2016-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra-bells
@@ -16,40 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: solr4r
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: unicode
   requirement: !ruby/object:Gem::Requirement
@@ -73,7 +61,7 @@ dependencies:
         version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.3.pre1
+        version: 0.8.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -83,7 +71,7 @@ dependencies:
         version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.3.pre1
+        version: 0.8.6
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -120,8 +108,10 @@ files:
 - lib/birds/app/helpers/view.rb
 - lib/birds/app/public/favicon.ico
 - lib/birds/app/settings.rb
+- lib/birds/app/views/_display.erb
 - lib/birds/app/views/_documents.erb
 - lib/birds/app/views/_facets.erb
+- lib/birds/app/views/_spellcheck.erb
 - lib/birds/app/views/browse.erb
 - lib/birds/app/views/document.erb
 - lib/birds/app/views/index.erb
@@ -135,13 +125,13 @@ licenses:
 metadata: {}
 post_install_message: |2+
 
-  birds-0.0.0 [2014-03-19]:
+  birds-0.0.1 [2016-10-12]:
 
-  * Birthday :-)
+  * Initial release.
 
 rdoc_options:
 - "--title"
-- birds Application documentation (v0.0.0)
+- birds Application documentation (v0.0.1)
 - "--charset"
 - UTF-8
 - "--line-numbers"
@@ -162,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Bibliographic information retrieval & document search.