dbla 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ec4c36f34bce118a8f7742e32040622e68c76d8
-  data.tar.gz: 44f112fa2dd872c43aaa9c93394c5f995a4ce733
+  metadata.gz: 75c9521ff855accf2dab0da8198d25967aa43751
+  data.tar.gz: 1ec160bbcea255947aee766adbcf51bb7b19a96a
 SHA512:
-  metadata.gz: fef1b5003cbb9895b39ec794e9eece9e5dfeb4bfd173c7d48e40fc9a80f9b1007b82fb657a18ae408595a2d2533140fd9ad62bb4b4c7dae72647e1e3b72155a5
-  data.tar.gz: 0b86c1b40dd2cae506feb38ec78dcae7e53d048e6bd6160895e75eb80bcae7ae65a4816bf6909f6032afa20633e4b4c1f86316f3aa7f09722659d770d083cdc3
+  metadata.gz: 9d664cf531f499dbe6f78f1948d4cda665d9b4bf4d410d3126edb71ebf816eeb96851c87d129132ac2f8508f2387e8389629b1a56ce70293850fafd34fc7a95d
+  data.tar.gz: b7882621624b0811c9d71c3776a2a7a2fa5a9dd1bc374b630ddab1b6a8e630fbe67165d58f1c8be773fc9c7c04f0e1989563056afecdb3da9545de09c0a48f7b

data/README.md

@@ -52,7 +52,7 @@ Replace the following code in your CatalogController:
     config.index.display_type_field = 'format'
 ```
 
-With the Dbla options.
+With Dbla options.
 
 ```ruby
     config.repository_class = Dbla::Repository
@@ -65,6 +65,12 @@ With the Dbla options.
     config.index.display_type_field = 'format'
 ```
 
+... or just copy the most recent mimicry of the DP.LA portal:
+
+```console
+rails g dbla:catalog
+```
+
 6. Fire it up!
 
 ```console

data/app/helpers/collections_helper.rb

@@ -0,0 +1,3 @@
+module CollectionsHelper
+	include Dbla::CollectionsHelperBehavior
+end

data/app/helpers/dbla/application_helper_behavior.rb

@@ -0,0 +1,10 @@
+module Dbla
+  module ApplicationHelperBehavior
+    def dbla_external_link(options, text='')
+      url = options[:value]
+      link_to(url, 'class' => 'dbla-view-object') do
+        content_tag(:span, text, 'class'=> 'glyphicon glyphicon-new-window')
+      end
+    end
+  end
+end

data/app/helpers/dbla/collections_helper_behavior.rb

@@ -0,0 +1,16 @@
+module Dbla::CollectionsHelperBehavior
+  def dbla_collection_link(options)
+    doc = options[:document]
+    type = doc['ingestType']
+    title = (type.eql? 'collection') ? doc['sourceResource.title'].first : doc['sourceResource.collection.title'].first
+    id = (type.eql? 'collection') ? doc['id'].first : doc['sourceResource.collection.id'].first
+    link_to(title, controller: :collections, action: 'show',:id=>id)
+  end
+  def dbla_collection_search_link(options)
+    doc = options[:document]
+    type = doc['ingestType']
+    title = (type.eql? 'collection') ? doc['sourceResource.title'].first : doc['sourceResource.collection.title'].first
+    id = (type.eql? 'collection') ? doc['id'].first : doc['sourceResource.collection.id'].first
+    link_to(title, controller: :catalog, action: 'index','f[sourceResource.collection.id][]'=>id,'q'=>'')
+  end
+end

data/lib/dbla.rb

@@ -8,6 +8,7 @@ module Dbla
     @config ||= YAML.load(File.read(config_path)).symbolize_keys
   end
   autoload :AbstractResponse, 'dbla/abstract_response'
+  autoload :Document, 'dbla/document'
   autoload :DocumentPresenter, 'dbla/document_presenter'
   autoload :Repository, 'dbla/repository'
   autoload :Response, 'dbla/response'

data/lib/dbla/document.rb

@@ -0,0 +1,40 @@
+module Dbla
+  module Document
+    # accessors for reading attribute
+    def [] *args
+      if args.first && args.first.to_s.index('.')
+        keys = args.first.to_s.split('.')
+        keys.inject(_source) do |m,key|
+          # Array() has a special behavior we do not want for hashes
+          m = (m.is_a? Array) ? m : [m]
+            m.inject([]) do |m2, a|
+            if (a.respond_to? :[])
+              r = a.send :[], *(args[1..-1].unshift(key))
+              if r
+                # Array() has a special behavior we do not want for hashes
+                r = (r.is_a? Array) ? r : [r]
+                m2 += r
+              else
+                m2
+              end
+            else
+              m2
+            end
+          end
+        end
+      else
+        _source.send :[], *args
+      end
+    end
+    def fetch(field, default)
+      (r = self[field]).empty? ? default : r
+    end
+    def has? f, *values
+      if values.empty?
+        !self[f].empty?
+      else
+        !(self[f] & values).empty?
+      end
+    end
+  end
+end

data/lib/dbla/document_presenter.rb

@@ -1,5 +1,5 @@
 module Dbla
-  class DocumentPresenter
+  class DocumentPresenter < Blacklight::DocumentPresenter
     include ActionView::Helpers::OutputSafetyHelper
     include ActionView::Helpers::TagHelper
     extend Deprecation
@@ -14,6 +14,9 @@ module Dbla
       @configuration = configuration
       @controller = controller
     end
+    def source_resource_title
+      @document[DESCRIPTIVE_METADATA_KEY] ? (@document[DESCRIPTIVE_METADATA_KEY]['title'] || @document['id']) : @document['id']
+    end
     ##
     # Get the value of the document's "title" field, or a placeholder
     # value (if empty)
@@ -21,7 +24,7 @@ module Dbla
     # @param [SolrDocument] document
     # @return [String]
     def document_heading
-      @document[DESCRIPTIVE_METADATA_KEY]['title']
+      source_resource_title
     end
     ##
     # Get the document's "title" to display in the <title> element.
@@ -30,7 +33,7 @@ module Dbla
     # @see #document_heading
     # @return [String]
     def document_show_html_title
-      @document[DESCRIPTIVE_METADATA_KEY]['title']
+      source_resource_title
     end
     ##
     # Render a value (or array of values) from a field
@@ -39,6 +42,7 @@ module Dbla
     # @param [Blacklight::Solr::Configuration::Field] solr field configuration
     # @return [String]
     def render_field_value value=nil, field_config=nil
+        super
     end
     ##
     # Render the document index heading
@@ -49,14 +53,7 @@ module Dbla
     # @option opts [String] :label Render the given string
     # @param [Symbol, Proc, String] field Render the given field or evaluate the proc or render the given string
     def render_document_index_label field, opts ={}
-      if Symbol === field
-        # these are shenanigans to find a nested field
-        field.to_s.split('.').inject(@document) {|m,v| m[v]}
-      elsif Proc === field
-        field.call
-      else
-        field
-      end
+      super
     end
     ##
     # Render the index field label for a document
@@ -67,7 +64,7 @@ module Dbla
     #   @param [Hash] opts
     #   @options opts [String] :value
     def render_index_field_value field, options = {}
-        field.to_s.split('.').inject(@document) {|m,v| m[v]}
+        super
     end
     ##
     # Render the show field value for a document
@@ -78,7 +75,7 @@ module Dbla
     #   @param [Hash] options
     #   @options opts [String] :value
     def render_document_show_field_value field, options={}
-        field.to_s.split('.').inject(@document) {|m,v| m[v]}
+        super
     end
 
     ##
@@ -97,6 +94,7 @@ module Dbla
     # @param [Blacklight::Solr::Configuration::Field] solr field configuration
     # @param [Hash] options additional options to pass to the rendering helpers
     def get_field_values field, field_config, options = {}
+        super
     end
 
     ##

data/lib/dbla/search_builder_behavior.rb

@@ -2,8 +2,8 @@ module Dbla
   module SearchBuilderBehavior
     def processed_parameters
       request.tap do |request_parameters|
-        if blacklight_params[:q]
-          request_parameters[:q] = blacklight_params[:q]
+        if blacklight_params[:q] || blacklight_params[:f]
+          request_parameters[:q] = blacklight_params.fetch(:q,'')
         end
       end
     end

data/lib/dbla/version.rb

@@ -1,3 +1,3 @@
 module Dbla
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/generators/dbla/catalog_generator.rb

@@ -5,6 +5,7 @@ module Dbla
 
     def assets
       copy_file "catalog_controller.rb", "app/controllers/catalog_controller.rb"
+      copy_file "collections_controller.rb", "app/controllers/collections_controller.rb"
     end
   end
 end

data/lib/generators/dbla/templates/catalog_controller.rb

@@ -4,6 +4,8 @@ class CatalogController < ApplicationController
 
   include Blacklight::Catalog
 
+  helper CollectionsHelper
+
   configure_blacklight do |config|
     ## Default parameters to send to solr for all search-like requests. See also SearchBuilder#processed_parameters
     config.default_solr_params = { 
@@ -36,7 +38,7 @@ class CatalogController < ApplicationController
     # solr field configuration for search results/index views
     config.index.title_field = 'sourceResource.title'
     config.index.thumbnail_field = 'object'
-    config.index.display_type_field = 'format'
+    config.index.display_type_field = 'ingestType'
 
     # solr field configuration for document/show views
     #config.show.title_field = 'title_display'
@@ -66,6 +68,7 @@ class CatalogController < ApplicationController
     config.add_facet_field 'provider.name', label: 'Partner'
     config.add_facet_field 'sourceResource.language.name', label: 'By Language'
     config.add_facet_field 'sourceResource.subject.name', label: 'By Subject'
+    config.add_facet_field 'sourceResource.collection.id', label: 'Collection', display: false
 
     # Have BL send all facet field names to Solr, which has been the default
     # previously. Simply remove these lines if you'd rather use Solr request
@@ -76,7 +79,8 @@ class CatalogController < ApplicationController
     #   The ordering of the field names is the order of the display 
     config.add_index_field 'sourceResource.format', :label => 'Format'
     config.add_index_field 'sourceResource.creator', :label => 'Creator'
-
+    config.add_index_field 'sourceResource.collection.title', label: 'In Collection', :helper_method => 'dbla_collection_search_link'
+    config.add_index_field 'isShownAt', :label => 'View Object', :helper_method => 'dbla_external_link'
     # solr fields to be displayed in the show (single result) view
     #   The ordering of the field names is the order of the display 
 

data/lib/generators/dbla/templates/collection.rb

@@ -2,7 +2,8 @@
 class Collection 
 
   include Blacklight::Solr::Document    
-      # The following shows how to setup this blacklight document to display marc documents
+  include Dbla::Document
+  # The following shows how to setup this blacklight document to display marc documents
   extension_parameters[:marc_source_field] = :marc_display
   extension_parameters[:marc_format_type] = :marcxml
   use_extension( Blacklight::Solr::Document::Marc) do |document|
@@ -33,13 +34,4 @@ class Collection
   # Recommendation: Use field names from Dublin Core
   use_extension( Blacklight::Document::DublinCore)    
 
-  def has? f, *values
-    # these are shenanigans to find a nested field
-    if f.is_a? String and f.index('.')
-      f = f.split('.')
-      f.inject(self) {|m,v| (m || {})[v]}
-    else
-      super
-    end
-  end
 end

data/lib/generators/dbla/templates/collections_controller.rb

@@ -0,0 +1,161 @@
+# -*- encoding : utf-8 -*-
+class CollectionsController < ApplicationController  
+  include Blacklight::Marc::Catalog
+
+  include Blacklight::Catalog
+
+  helper CollectionsHelper
+
+  def self.local_prefixes
+    super + ['catalog']
+  end
+  configure_blacklight do |config|
+    ## Default parameters to send to solr for all search-like requests. See also SearchBuilder#processed_parameters
+    config.default_solr_params = { 
+      :qt => 'search',
+      :rows => 10 
+    }
+    
+    # solr path which will be added to solr base url before the other solr params.
+    #config.solr_path = 'select' 
+    
+    # items to show per page, each number in the array represent another option to choose from.
+    #config.per_page = [10,20,50,100]
+
+    ## Default parameters to send on single-document requests to Solr. These settings are the Blackligt defaults (see SearchHelper#solr_doc_params) or
+    ## parameters included in the Blacklight-jetty document requestHandler.
+    #
+    #config.default_document_solr_params = {
+    #  :qt => 'document',
+    #  ## These are hard-coded in the blacklight 'document' requestHandler
+    #  # :fl => '*',
+    #  # :rows => 1
+    #  # :q => '{!raw f=id v=$id}' 
+    #}
+
+    config.repository_class = Dbla::Repository
+    config.document_model = Collection
+    config.response_model = Dbla::Response
+    config.document_presenter_class = Dbla::DocumentPresenter
+    config.search_builder_class = SearchBuilder
+    # solr field configuration for search results/index views
+    config.index.title_field = 'title'
+    config.index.thumbnail_field = 'object'
+    config.index.display_type_field = Proc.new {'default'}
+
+    # solr field configuration for document/show views
+    #config.show.title_field = 'title_display'
+    #config.show.display_type_field = 'format'
+
+    # solr fields that will be treated as facets by the blacklight application
+    #   The ordering of the field names is the order of the display
+    #
+    # Setting a limit will trigger Blacklight's 'more' facet values link.
+    # * If left unset, then all facet values returned by solr will be displayed.
+    # * If set to an integer, then "f.somefield.facet.limit" will be added to
+    # solr request, with actual solr request being +1 your configured limit --
+    # you configure the number of items you actually want _displayed_ in a page.    
+    # * If set to 'true', then no additional parameters will be sent to solr,
+    # but any 'sniffed' request limit parameters will be used for paging, with
+    # paging at requested limit -1. Can sniff from facet.limit or 
+    # f.specific_field.facet.limit solr request params. This 'true' config
+    # can be used if you set limits in :default_solr_params, or as defaults
+    # on the solr side in the request handler itself. Request handler defaults
+    # sniffing requires solr requests to be made with "echoParams=all", for
+    # app code to actually have it echo'd back to see it.  
+    #
+    # :show may be set to false if you don't want the facet to be drawn in the 
+    # facet bar
+    #config.add_facet_field 'sourceResource.format', label: 'By Format'
+    #config.add_facet_field 'dataProvider', label: 'Contributing Institution'
+    #config.add_facet_field 'provider.name', label: 'Partner'
+    #config.add_facet_field 'sourceResource.language.name', label: 'By Language'
+    #config.add_facet_field 'sourceResource.subject.name', label: 'By Subject'
+
+    # Have BL send all facet field names to Solr, which has been the default
+    # previously. Simply remove these lines if you'd rather use Solr request
+    # handler defaults, or have no facets.
+    config.add_facet_fields_to_solr_request!
+
+    # solr fields to be displayed in the index (search results) view
+    #   The ordering of the field names is the order of the display 
+    config.add_index_field 'description', :label => 'Description'
+    config.add_index_field 'ingestDate', :label => 'Ingest Date'
+    config.add_index_field 'id', :label => 'Search for', helper_method: 'dbla_collection_search_link'
+    # solr fields to be displayed in the show (single result) view
+    #   The ordering of the field names is the order of the display 
+
+    # "fielded" search configuration. Used by pulldown among other places.
+    # For supported keys in hash, see rdoc for Blacklight::SearchFields
+    #
+    # Search fields will inherit the :qt solr request handler from
+    # config[:default_solr_parameters], OR can specify a different one
+    # with a :qt key/value. Below examples inherit, except for subject
+    # that specifies the same :qt as default for our own internal
+    # testing purposes.
+    #
+    # The :key is what will be used to identify this BL search field internally,
+    # as well as in URLs -- so changing it after deployment may break bookmarked
+    # urls.  A display label will be automatically calculated from the :key,
+    # or can be specified manually to be different. 
+
+    # This one uses all the defaults set by the solr request handler. Which
+    # solr request handler? The one set in config[:default_solr_parameters][:qt],
+    # since we aren't specifying it otherwise. 
+    
+    config.add_search_field 'all_fields', :label => 'All Fields'
+    
+
+    # Now we see how to over-ride Solr request handler defaults, in this
+    # case for a BL "search field", which is really a dismax aggregate
+    # of Solr search fields. 
+    
+    config.add_search_field('title') do |field|
+      # solr_parameters hash are sent to Solr as ordinary url query params. 
+      field.solr_parameters = { :'spellcheck.dictionary' => 'title' }
+
+      # :solr_local_parameters will be sent using Solr LocalParams
+      # syntax, as eg {! qf=$title_qf }. This is neccesary to use
+      # Solr parameter de-referencing like $title_qf.
+      # See: http://wiki.apache.org/solr/LocalParams
+      field.solr_local_parameters = { 
+        :qf => '$title_qf',
+        :pf => '$title_pf'
+      }
+    end
+    
+    config.add_search_field('author') do |field|
+      field.solr_parameters = { :'spellcheck.dictionary' => 'author' }
+      field.solr_local_parameters = { 
+        :qf => '$author_qf',
+        :pf => '$author_pf'
+      }
+    end
+    
+    # Specifying a :qt only to show it's possible, and so our internal automated
+    # tests can test it. In this case it's the same as 
+    # config[:default_solr_parameters][:qt], so isn't actually neccesary. 
+    config.add_search_field('subject') do |field|
+      field.solr_parameters = { :'spellcheck.dictionary' => 'subject' }
+      field.qt = 'search'
+      field.solr_local_parameters = { 
+        :qf => '$subject_qf',
+        :pf => '$subject_pf'
+      }
+    end
+
+    # "sort results by" select (pulldown)
+    # label in pulldown is followed by the name of the SOLR field to sort by and
+    # whether the sort is ascending or descending (it must be asc or desc
+    # except in the relevancy case).
+    config.add_sort_field 'score desc, pub_date_sort desc, title_sort asc', :label => 'relevance'
+    config.add_sort_field 'pub_date_sort desc, title_sort asc', :label => 'year'
+    config.add_sort_field 'author_sort asc, title_sort asc', :label => 'author'
+    config.add_sort_field 'title_sort asc, pub_date_sort desc', :label => 'title'
+
+    # If there are more than this many search results, no spelling ("did you 
+    # mean") suggestion is offered.
+    config.spell_max = 5
+  end
+
+end

data/lib/generators/dbla/templates/item.rb

@@ -1,8 +1,9 @@
 # -*- encoding : utf-8 -*-
 class Item 
 
-  include Blacklight::Solr::Document    
-      # The following shows how to setup this blacklight document to display marc documents
+  include Blacklight::Solr::Document
+  include Dbla::Document
+  # The following shows how to setup this blacklight document to display marc documents
   extension_parameters[:marc_source_field] = :marc_display
   extension_parameters[:marc_format_type] = :marcxml
   use_extension( Blacklight::Solr::Document::Marc) do |document|
@@ -33,13 +34,4 @@ class Item
   # Recommendation: Use field names from Dublin Core
   use_extension( Blacklight::Document::DublinCore)    
 
-  def has? f, *values
-    # these are shenanigans to find a nested field
-    if f.is_a? String and f.index('.')
-      f = f.split('.')
-      f.inject(self) {|m,v| (m || {})[v]}
-    else
-      super
-    end
-  end
 end

data/spec/fixtures/doc-001.json

@@ -0,0 +1 @@
+{"@context":"http://dp.la/api/items/context","isShownAt":"http://digital.ncdcr.gov/u?/p15012coll10,2498","dataProvider":"North Carolina Department of Cultural Resources","@type":"ore:Aggregation","provider":{"@id":"http://dp.la/api/contributor/digitalnc","name":"North Carolina Digital Heritage Center"},"object":"http://digital.ncdcr.gov/utils/getthumbnail/collection/p15012coll10/id/2498","ingestionSequence":17,"ingestDate":"2015-03-30T21:39:40.943180Z","_rev":"2-81807c34b00ea3fd4eceeff3dec03b03","id":"45ebfcc104f740cf27d0db423b8f667f","aggregatedCHO":"#sourceResource","_id":"digitalnc--urn:brevard.lib.unc.edudcr_p15012coll10:oai:server16062.contentdm.oclc.org:p15012coll10/2498","admin":{"validation_message":null,"sourceResource":{"title":"Camp Lee, U.S. National Army Cantonment, Petersburg, Virginia"},"valid_after_enrich":true},"sourceResource":{"title":["Camp Lee, U.S. National Army Cantonment, Petersburg, Virginia"],"spatial":[{"county":"City of Petersburg","name":"Petersburg, Petersburg (city), Virginia, United States","state":"Virginia","coordinates":"37.22793, -77.40193","country":"United States"}],"description":["Camp Lee, U.S. National Army Cantonment, Petersburg, Virginia. Photograph printed by Everett Waddey Company, Richmond, Virginia."],"subject":[{"name":"(1900-1929) North Carolina's industrial revolution and World War One"},{"name":"World War, 1914-1918"},{"name":"United States. Army"},{"name":"Camp Lee (Va.)"}],"rights":"The SA of NC considers this item in the public domain by U.S. law but responsibility for permissions rests with researchers.","@id":"http://dp.la/api/items/45ebfcc104f740cf27d0db423b8f667f#sourceResource","format":["9.5\" x 50\" (sheet size) Panorama (Photographs)","Photographs"],"collection":{"id":"8091c81a295ff66e3b9b89e9241b422c","description":"","title":"World War I","@id":"http://dp.la/api/collections/8091c81a295ff66e3b9b89e9241b422c"},"stateLocatedIn":[{"name":"North Carolina"}],"isPartOf":["North Carolina in World War I"],"type":"image","identifier":["MilColl.WWI.Panoramas.23","5757.15.2.8","http://server16062.contentdm.oclc.org/u?/p15012coll10,2498"]},"@id":"http://dp.la/api/items/45ebfcc104f740cf27d0db423b8f667f","ingestType":"item","originalRecord":{"about":{"oaiProvenance:provenance":{"xsi:schemaLocation":"http://www.openarchives.org/OAI/2.0/provenance http://www.openarchives.org/OAI/2.0/provenance.xsd","xmlns:xsi":"http://www.w3.org/2001/XMLSchema-instance","xmlns:oaiProvenance":"http://www.openarchives.org/OAI/2.0/provenance","oaiProvenance:originDescription":{"oaiProvenance:datestamp":"2015-01-21","oaiProvenance:metadataNamespace":"http://www.openarchives.org/OAI/2.0/","altered":"true","oaiProvenance:baseURL":"https://server16062.contentdm.oclc.org/cgi-bin/oai.exe","harvestDate":"2015-01-21","oaiProvenance:identifier":"oai:server16062.contentdm.oclc.org:p15012coll10/2498"}}},"id":"urn:brevard.lib.unc.edudcr_p15012coll10:oai:server16062.contentdm.oclc.org:p15012coll10/2498","provider":{"@id":"http://dp.la/api/contributor/digitalnc","name":"North Carolina Digital Heritage Center"},"collection":{"id":"8091c81a295ff66e3b9b89e9241b422c","description":"","title":"World War I","@id":"http://dp.la/api/collections/8091c81a295ff66e3b9b89e9241b422c"},"header":{"identifier":"urn:brevard.lib.unc.edudcr_p15012coll10:oai:server16062.contentdm.oclc.org:p15012coll10/2498","setSpec":"dcr_p15012coll10","datestamp":"2015-01-21"},"metadata":{"mods":{"genre":"Image","location":[{"url":{"usage":"primary display","#text":"http://digital.ncdcr.gov/u?/p15012coll10,2498","access":"object in context"}},{"url":{"#text":"http://digital.ncdcr.gov/utils/getthumbnail/collection/p15012coll10/id/2498","access":"preview"}}],"subject":[{"geographic":"Petersburg, Petersburg (city), Virginia, United States"},{"topic":"(1900-1929) North Carolina's industrial revolution and World War One"},{"topic":"World War, 1914-1918"},{"topic":"United States. Army"},{"topic":"Camp Lee (Va.)"}],"originInfo":null,"relatedItem":{"titleInfo":{"title":"North Carolina in World War I"}},"physicalDescription":{"form":["9.5\" x 50\" (sheet size) Panorama (Photographs)","Photographs","image/jpeg"]},"xmlns":"http://www.loc.gov/mods/v3","titleInfo":{"title":"Camp Lee, U.S. National Army Cantonment, Petersburg, Virginia"},"xsi:schemaLocation":"http://www.loc.gov/mods/v3 http://www.loc.gov/standards/mods/v3/mods-3-4.xsd","xmlns:dc":"http://purl.org/dc/elements/1.1/","version":"3.4","accessCondition":"The SA of NC considers this item in the public domain by U.S. law but responsibility for permissions rests with researchers.","xmlns:oai_dc":"http://www.openarchives.org/OAI/2.0/oai_dc/","xmlns:xsi":"http://www.w3.org/2001/XMLSchema-instance","identifier":["MilColl.WWI.Panoramas.23","5757.15.2.8","http://server16062.contentdm.oclc.org/u?/p15012coll10,2498"],"note":[{"#text":"Camp Lee, U.S. National Army Cantonment, Petersburg, Virginia. Photograph printed by Everett Waddey Company, Richmond, Virginia.","type":"content"},{"#text":"North Carolina Department of Cultural Resources","type":"ownership"}]}}},"score":4.0575137}

data/spec/integration/document_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+describe Dbla::Document do
+	before(:all) do
+		class DocumentRig
+			include Blacklight::Solr::Document
+			include Dbla::Document
+		end 
+	end
+	after(:all) do
+		Object.send :remove_const, :DocumentRig
+	end
+	subject { DocumentRig.new(data) }
+	context "doc-001.json" do
+		let(:data) { fixture('doc-001.json') { |b| JSON.parse(b.read) } }
+		describe "[]" do
+			it do
+				expect(subject['sourceResource.title']).to eql(["Camp Lee, U.S. National Army Cantonment, Petersburg, Virginia"])
+				expect(subject['sourceResource.format']).to eql(["9.5\" x 50\" (sheet size) Panorama (Photographs)", "Photographs"])
+			end
+		end
+		describe "has?" do
+			it "should work with only a key" do
+				expect(subject.has? 'sourceResource.title').to be(true)
+			end
+			it "should work with a value" do
+			end
+		end
+	end
+end

data/spec/spec_helper.rb

@@ -4,8 +4,24 @@ ENV["environment"] ||= 'test'
 ENV["RAILS_ENV"] ||= 'test'
 require File.expand_path("../../spec/dummy/config/environment.rb",  __FILE__)
 require 'rspec/rails'
-
+require 'blacklight'
 RSpec.configure do |config|
   config.mock_with :mocha
 end
 
+def fixtures_path(path)
+	path = File.join("..","..","spec","fixtures",path)
+	puts path
+	path = File.expand_path(path, __FILE__)
+	puts path
+	path
+end
+
+def fixture(path)
+	path = fixtures_path(path)
+	if block_given?
+		open(path) {|b| yield b}
+	else
+		open(path)
+	end
+end

data/spec/unit/document_presenter_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+describe Dbla::DocumentPresenter do
+	subject { Dbla::DocumentPresenter.new(data,{},{}) }
+	describe "title methods" do
+		context "with field" do
+			let(:data) {{'sourceResource' => {'title' =>'foo'}}}
+			it do
+				expect(subject.document_heading).to eql('foo')
+				expect(subject.document_show_html_title).to eql('foo')
+			end
+		end
+		context "without field" do
+			let(:data) {{'sourceResource' => {},'id' => 'foo'}}
+			it do
+				expect(subject.document_heading).to eql('foo')
+				expect(subject.document_show_html_title).to eql('foo')
+			end
+		end
+	end
+end

data/spec/unit/document_spec.rb

@@ -0,0 +1,49 @@
+require 'spec_helper'
+describe Dbla::Document do
+	before(:all) do
+		class DocumentRig
+			include Blacklight::Solr::Document
+			include Dbla::Document
+		end 
+	end
+	after(:all) do
+		Object.send :remove_const, :DocumentRig
+	end
+	subject { DocumentRig.new(data) }
+	context "flat fields" do
+		let(:data) { {'foo' => 'bar', 'lol' => ['wut', 'no']} }
+		describe "[]" do
+			it do
+				expect(subject['foo']).to eql('bar')
+				expect(subject['lol']).to eql(['wut', 'no'])
+			end
+		end
+	end
+	context "nested document references" do
+		let(:data) { {'foo' => 'bar', 'lol' => ['wut', 'no'], 'o' => {'hai' => {'rly' => ['yarly','norly']}}} }
+		describe "[]" do
+			it do
+				expect(subject['foo']).to eql('bar')
+				expect(subject['lol']).to eql(['wut', 'no'])
+				expect(subject['o.hai.rly']).to eql(['yarly','norly'])
+				expect(subject['o.hai.wut']).to eql([])
+			end
+		end
+		describe "fetch" do
+			it do
+				expect(subject.fetch('o.hai.wut','foo')).to eql('foo')
+			end
+		end
+		describe "has?" do
+			it "should work with only a key" do
+				expect(subject.has? 'foo').to eql(true)
+				expect(subject.has? 'o.hai.rly').to eql(true)
+				expect(subject.has? 'o.hai.rly','norly').to eql(true)
+				expect(subject.has? 'o.hai.rly','gnarly').to eql(false)
+				expect(subject.has? 'o.hai.wut').to eql(false)
+			end
+			it "should work with a value" do
+			end
+		end
+	end
+end

data/spec/unit/search_builder_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+describe Dbla::SearchBuilderBehavior do
+	before(:all) do
+		class BuilderRig < Blacklight::SearchBuilder
+		  include Dbla::SearchBuilderBehavior
+		end 
+	end
+	after(:all) do
+		Object.send :remove_const, :BuilderRig
+	end
+	let(:blacklight_params) { [] }
+	subject { BuilderRig.new(blacklight_params,nil) }
+	describe "blacklight_params" do
+		it do
+			expect(subject.blacklight_params).to be
+		end
+	end
+	context "configured params" do
+		#TODO what should these be
+		let(:blacklight_params) { [] }
+		describe "facet_filters" do
+			it do
+				subject.facet_filters
+			end
+		end
+	end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dbla
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Audrey Altman
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-18 00:00:00.000000000 Z
+date: 2015-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -111,11 +111,14 @@ files:
 - app/assets/javascripts/dbla/application.js
 - app/assets/stylesheets/dbla/dbla.scss
 - app/controllers/dbla/application_controller.rb
-- app/helpers/dbla/application_helper.rb
+- app/helpers/collections_helper.rb
+- app/helpers/dbla/application_helper_behavior.rb
+- app/helpers/dbla/collections_helper_behavior.rb
 - app/views/layouts/dbla/application.html.erb
 - config/routes.rb
 - lib/dbla.rb
 - lib/dbla/abstract_response.rb
+- lib/dbla/document.rb
 - lib/dbla/document_presenter.rb
 - lib/dbla/engine.rb
 - lib/dbla/repository.rb
@@ -132,6 +135,7 @@ files:
 - lib/generators/dbla/search_builder_generator.rb
 - lib/generators/dbla/templates/catalog_controller.rb
 - lib/generators/dbla/templates/collection.rb
+- lib/generators/dbla/templates/collections_controller.rb
 - lib/generators/dbla/templates/dbla.css.scss
 - lib/generators/dbla/templates/item.rb
 - lib/generators/dbla/templates/search_builder.rb
@@ -172,7 +176,12 @@ files:
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
+- spec/fixtures/doc-001.json
+- spec/integration/document_spec.rb
 - spec/spec_helper.rb
+- spec/unit/document_presenter_spec.rb
+- spec/unit/document_spec.rb
+- spec/unit/search_builder_spec.rb
 homepage: https://github.com/barmintor/dbla
 licenses:
 - MIT
@@ -234,5 +243,10 @@ test_files:
 - spec/dummy/public/favicon.ico
 - spec/dummy/Rakefile
 - spec/dummy/README.rdoc
+- spec/fixtures/doc-001.json
+- spec/integration/document_spec.rb
 - spec/spec_helper.rb
+- spec/unit/document_presenter_spec.rb
+- spec/unit/document_spec.rb
+- spec/unit/search_builder_spec.rb
 has_rdoc: 

data/app/helpers/dbla/application_helper.rb

@@ -1,4 +0,0 @@
-module Dbla
-  module ApplicationHelper
-  end
-end