solr_ead 0.0.4 → 0.1.0

data/.gitignore

@@ -3,7 +3,6 @@
 .bundle
 .config
 .yardoc
-Gemfile.lock
 InstalledFiles
 _yardoc
 coverage

data/.rvmrc

@@ -1,48 +1 @@
-#!/usr/bin/env bash
-
-# This is an RVM Project .rvmrc file, used to automatically load the ruby
-# development environment upon cd'ing into the directory
-
-# First we specify our desired <ruby>[@<gemset>], the @gemset name is optional,
-# Only full ruby name is supported here, for short names use:
-#     echo "rvm use 1.9.3" > .rvmrc
-environment_id="ruby-1.9.3-p125@solr_ead"
-
-# Uncomment the following lines if you want to verify rvm version per project
-# rvmrc_rvm_version="1.14.3 (version)" # 1.10.1 seams as a safe start
-# eval "$(echo ${rvm_version}.${rvmrc_rvm_version} | awk -F. '{print "[[ "$1*65536+$2*256+$3" -ge "$4*65536+$5*256+$6" ]]"}' )" || {
-#   echo "This .rvmrc file requires at least RVM ${rvmrc_rvm_version}, aborting loading."
-#   return 1
-# }
-
-# First we attempt to load the desired environment directly from the environment
-# file. This is very fast and efficient compared to running through the entire
-# CLI and selector. If you want feedback on which environment was used then
-# insert the word 'use' after --create as this triggers verbose mode.
-if [[ -d "${rvm_path:-$HOME/.rvm}/environments"
-  && -s "${rvm_path:-$HOME/.rvm}/environments/$environment_id" ]]
-then
-  \. "${rvm_path:-$HOME/.rvm}/environments/$environment_id"
-  [[ -s "${rvm_path:-$HOME/.rvm}/hooks/after_use" ]] &&
-    \. "${rvm_path:-$HOME/.rvm}/hooks/after_use" || true
-else
-  # If the environment file has not yet been created, use the RVM CLI to select.
-  rvm --create  "$environment_id" || {
-    echo "Failed to create RVM environment '${environment_id}'."
-    return 1
-  }
-fi
-
-# If you use bundler, this might be useful to you:
-# if [[ -s Gemfile ]] && {
-#   ! builtin command -v bundle >/dev/null ||
-#   builtin command -v bundle | GREP_OPTIONS= \grep $rvm_path/bin/bundle >/dev/null
-# }
-# then
-#   printf "%b" "The rubygem 'bundler' is not installed. Installing it now.\n"
-#   gem install bundler
-# fi
-# if [[ -s Gemfile ]] && builtin command -v bundle >/dev/null
-# then
-#   bundle install | GREP_OPTIONS= \grep -vE '^Using|Your bundle is complete'
-# fi
+rvm use ruby-1.9.3-p286@solr_ead --create

data/Gemfile.lock

@@ -0,0 +1,79 @@
+PATH
+  remote: .
+  specs:
+    solr_ead (0.0.4)
+      om (~> 1.8.0)
+      rsolr
+      sanitize
+      solrizer (~> 2.0.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (3.2.9)
+      activesupport (= 3.2.9)
+      builder (~> 3.0.0)
+    activesupport (3.2.9)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    builder (3.0.4)
+    columnize (0.3.6)
+    daemons (1.1.9)
+    debugger (1.2.2)
+      columnize (>= 0.3.1)
+      debugger-linecache (~> 1.1.1)
+      debugger-ruby_core_source (~> 1.1.5)
+    debugger-linecache (1.1.2)
+      debugger-ruby_core_source (>= 1.1.1)
+    debugger-ruby_core_source (1.1.5)
+    deprecation (0.0.5)
+      activesupport
+    diff-lcs (1.1.3)
+    i18n (0.6.1)
+    json (1.7.5)
+    mediashelf-loggable (0.4.9)
+    multi_json (1.4.0)
+    nokogiri (1.5.5)
+    om (1.8.0)
+      activemodel
+      activesupport
+      deprecation
+      mediashelf-loggable
+      nokogiri (>= 1.4.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    redcarpet (2.2.2)
+    rsolr (1.0.8)
+      builder (>= 2.1.2)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.1)
+    rspec-expectations (2.12.0)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.12.0)
+    sanitize (2.0.3)
+      nokogiri (>= 1.4.4, < 1.6)
+      nokogiri (>= 1.4.4, < 1.6)
+    solrizer (2.0.0)
+      daemons
+      mediashelf-loggable (~> 0.4.7)
+      nokogiri
+      om (>= 1.5.0)
+      stomp
+      xml-simple
+    stomp (1.2.7)
+    xml-simple (1.1.2)
+    yard (0.8.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  debugger
+  rdoc
+  redcarpet
+  rspec
+  solr_ead!
+  yard

data/lib/solr_ead/component.rb

@@ -5,8 +5,8 @@ class SolrEad::Component
 
   # Define each term in your ead that you want put into the solr document
   set_terminology do |t|
-    t.root(:path=>"c", :index_as => [:not_searchable, :not_displayable])
-    t.ref(:path=>"/c/@id")
+    t.root(:path=>"c")
+    t.ref_(:path=>"/c/@id", :index_as=>[:string])
     t.level(:path=>"/c/@level", :index_as => [:facetable])
 
     t.title(:path=>"unittitle", :attributes=>{ :type => :none }, :index_as=>[:searchable, :displayable])
@@ -21,10 +21,10 @@ class SolrEad::Component
     t.subject(:index_as=>[:facetable])
 
     # Archival material
-    t.container(:attributes=>{ :type => "Box" }, :index_as => [:not_searchable, :not_displayable]) {
-      t.label(:path=>{ :attribute=>"label" }, :index_as => [:facetable])
+    t.container(:attributes=>{ :type => "Box" }) {
+      t.label(:path=>{ :attribute=>"label" })
     }
-    t.material(:proxy=>[:container, :label])
+    t.material(:proxy=>[:container, :label], :index_as => [:facetable])
 
     # These terms are proxied to match with Blacklight's default facets, but otherwise
     # you can remove them or rename the above facet terms to match with your solr
@@ -32,36 +32,36 @@ class SolrEad::Component
     t.subject_geo(:proxy=>[:geogname])
     t.subject_topic(:proxy=>[:subject])
 
-    t.accessrestrict(:path=>"accessrestrict/p")
-    t.accessrestrict_heading(:path=>"accessrestrict/head", :index_as=>[:not_searchable, :displayable])
-    t.accruals(:path=>"accruals/p")
-    t.accruals_heading(:path=>"accruals/head", :index_as=>[:not_searchable, :displayable])
-    t.acqinfo(:path=>"acqinfo/p")
-    t.acqinfo_heading(:path=>"acqinfo/head", :index_as=>[:not_searchable, :displayable])
-    t.altformavail(:path=>"altformavail/p")
-    t.altformavail_heading(:path=>"altformavail/head", :index_as=>[:not_searchable, :displayable])
-    t.appraisal(:path=>"appraisal/p")
-    t.appraisal_heading(:path=>"appraisal/head", :index_as=>[:not_searchable, :displayable])
-    t.arrangement(:path=>"arrangement/p")
-    t.arrangement_heading(:path=>"arrangement/head", :index_as=>[:not_searchable, :displayable])
-    t.custodhist(:path=>"custodhist/p")
-    t.custodhist_heading(:path=>"custodhist/head", :index_as=>[:not_searchable, :displayable])
-    t.fileplan(:path=>"fileplan/p")
-    t.fileplan_heading(:path=>"fileplan/head", :index_as=>[:not_searchable, :displayable])
-    t.originalsloc(:path=>"originalsloc/p")
-    t.originalsloc_heading(:path=>"originalsloc/head", :index_as=>[:not_searchable, :displayable])
-    t.phystech(:path=>"phystech/p")
-    t.phystech_heading(:path=>"phystech/head", :index_as=>[:not_searchable, :displayable])
-    t.processinfo(:path=>"processinfo/p")
-    t.processinfo_heading(:path=>"processinfo/head", :index_as=>[:not_searchable, :displayable])
-    t.relatedmaterial(:path=>"relatedmaterial/p")
-    t.relatedmaterial_heading(:path=>"relatedmaterial/head", :index_as=>[:not_searchable, :displayable])
-    t.separatedmaterial(:path=>"separatedmaterial/p")
-    t.separatedmaterial_heading(:path=>"separatedmaterial/head", :index_as=>[:not_searchable, :displayable])
-    t.scopecontent(:path=>"scopecontent/p")
-    t.scopecontent_heading(:path=>"scopecontent/head", :index_as=>[:not_searchable, :displayable])
-    t.userestrict(:path=>"userestrict/p")
-    t.userestrict_heading(:path=>"userestrict/head", :index_as=>[:not_searchable, :displayable])
+    t.accessrestrict(:path=>"accessrestrict/p", :index_as=>[:searchable])
+    t.accessrestrict_heading(:path=>"accessrestrict/head", :index_as=>[:displayable])
+    t.accruals(:path=>"accruals/p", :index_as=>[:searchable])
+    t.accruals_heading(:path=>"accruals/head", :index_as=>[:displayable])
+    t.acqinfo(:path=>"acqinfo/p", :index_as=>[:searchable])
+    t.acqinfo_heading(:path=>"acqinfo/head", :index_as=>[:displayable])
+    t.altformavail(:path=>"altformavail/p", :index_as=>[:searchable])
+    t.altformavail_heading(:path=>"altformavail/head", :index_as=>[:displayable])
+    t.appraisal(:path=>"appraisal/p", :index_as=>[:searchable])
+    t.appraisal_heading(:path=>"appraisal/head", :index_as=>[:displayable])
+    t.arrangement(:path=>"arrangement/p", :index_as=>[:searchable])
+    t.arrangement_heading(:path=>"arrangement/head", :index_as=>[:displayable])
+    t.custodhist(:path=>"custodhist/p", :index_as=>[:searchable])
+    t.custodhist_heading(:path=>"custodhist/head", :index_as=>[:displayable])
+    t.fileplan(:path=>"fileplan/p", :index_as=>[:searchable])
+    t.fileplan_heading(:path=>"fileplan/head", :index_as=>[:displayable])
+    t.originalsloc(:path=>"originalsloc/p", :index_as=>[:searchable])
+    t.originalsloc_heading(:path=>"originalsloc/head", :index_as=>[:displayable])
+    t.phystech(:path=>"phystech/p", :index_as=>[:searchable])
+    t.phystech_heading(:path=>"phystech/head", :index_as=>[:displayable])
+    t.processinfo(:path=>"processinfo/p", :index_as=>[:searchable])
+    t.processinfo_heading(:path=>"processinfo/head", :index_as=>[:displayable])
+    t.relatedmaterial(:path=>"relatedmaterial/p", :index_as=>[:searchable])
+    t.relatedmaterial_heading(:path=>"relatedmaterial/head", :index_as=>[:displayable])
+    t.separatedmaterial(:path=>"separatedmaterial/p", :index_as=>[:searchable])
+    t.separatedmaterial_heading(:path=>"separatedmaterial/head", :index_as=>[:displayable])
+    t.scopecontent(:path=>"scopecontent/p", :index_as=>[:searchable])
+    t.scopecontent_heading(:path=>"scopecontent/head", :index_as=>[:displayable])
+    t.userestrict(:path=>"userestrict/p", :index_as=>[:searchable])
+    t.userestrict_heading(:path=>"userestrict/head", :index_as=>[:displayable])
 
   end
 
@@ -69,6 +69,7 @@ class SolrEad::Component
     super(solr_doc)
     solr_doc.merge!({"format"          => "Archival Item"})
     solr_doc["parent_unittitles_display"].length > 0 ? solr_doc.merge!({"heading_display" => [ solr_doc["parent_unittitles_display"], self.title.first].join(" >> ")  }) : solr_doc.merge!({"heading_display" => self.title.first  })
+    solr_doc.merge!({"ref_s" => self.ref.first})
   end
 
 end

data/lib/solr_ead/document.rb

@@ -6,7 +6,7 @@ class SolrEad::Document
 
   # Define each term in your ead that you want put into the solr document
   set_terminology do |t|
-    t.root(:path=>"ead", :index_as => [:not_searchable])
+    t.root(:path=>"ead")
 
     t.eadid
     t.corpname(:index_as=>[:facetable])
@@ -24,39 +24,39 @@ class SolrEad::Document
     t.subject_topic(:proxy=>[:subject])
 
     t.title(:path=>"titleproper", :attributes=>{ :type => :none }, :index_as=>[:searchable, :displayable])
-    t.title_filing(:path=>"titleproper", :attributes=>{ :type => "filing" }, :index_as=>[:not_searchable, :sortable])
+    t.title_filing(:path=>"titleproper", :attributes=>{ :type => "filing" }, :index_as=>[:sortable])
 
     # General field available within archdesc
-    t.accessrestrict(:path=>"archdesc/accessrestrict/p")
-    t.accessrestrict_heading(:path=>"archdesc/accessrestrict/head", :index_as=>[:not_searchable, :displayable])
-    t.accruals(:path=>"archdesc/accruals/p")
-    t.accruals_heading(:path=>"archdesc/accruals/head", :index_as=>[:not_searchable, :displayable])
-    t.acqinfo(:path=>"archdesc/acqinfo/p")
-    t.acqinfo_heading(:path=>"archdesc/acqinfo/head", :index_as=>[:not_searchable, :displayable])
-    t.altformavail(:path=>"archdesc/altformavail/p")
-    t.altformavail_heading(:path=>"archdesc/altformavail/head", :index_as=>[:not_searchable, :displayable])
-    t.appraisal(:path=>"archdesc/appraisal/p")
-    t.appraisal_heading(:path=>"archdesc/appraisal/head", :index_as=>[:not_searchable, :displayable])
-    t.arrangement(:path=>"archdesc/arrangement/p")
-    t.arrangement_heading(:path=>"archdesc/arrangement/head", :index_as=>[:not_searchable, :displayable])
-    t.custodhist(:path=>"archdesc/custodhist/p")
-    t.custodhist_heading(:path=>"archdesc/custodhist/head", :index_as=>[:not_searchable, :displayable])
-    t.fileplan(:path=>"archdesc/fileplan/p")
-    t.fileplan_heading(:path=>"archdesc/fileplan/head", :index_as=>[:not_searchable, :displayable])
-    t.originalsloc(:path=>"archdesc/originalsloc/p")
-    t.originalsloc_heading(:path=>"archdesc/originalsloc/head", :index_as=>[:not_searchable, :displayable])
-    t.phystech(:path=>"archdesc/phystech/p")
-    t.phystech_heading(:path=>"archdesc/phystech/head", :index_as=>[:not_searchable, :displayable])
-    t.processinfo(:path=>"archdesc/processinfo/p")
-    t.processinfo_heading(:path=>"archdesc/processinfo/head", :index_as=>[:not_searchable, :displayable])
-    t.relatedmaterial(:path=>"archdesc/relatedmaterial/p")
-    t.relatedmaterial_heading(:path=>"archdesc/relatedmaterial/head", :index_as=>[:not_searchable, :displayable])
-    t.separatedmaterial(:path=>"archdesc/separatedmaterial/p")
-    t.separatedmaterial_heading(:path=>"archdesc/separatedmaterial/head", :index_as=>[:not_searchable, :displayable])
-    t.scopecontent(:path=>"archdesc/scopecontent/p")
-    t.scopecontent_heading(:path=>"archdesc/scopecontent/head", :index_as=>[:not_searchable, :displayable])
-    t.userestrict(:path=>"archdesc/userestrict/p")
-    t.userestrict_heading(:path=>"archdesc/userestrict/head", :index_as=>[:not_searchable, :displayable])
+    t.accessrestrict(:path=>"archdesc/accessrestrict/p", :index_as=>[:searchable])
+    t.accessrestrict_heading(:path=>"archdesc/accessrestrict/head", :index_as=>[:displayable])
+    t.accruals(:path=>"archdesc/accruals/p", :index_as=>[:searchable])
+    t.accruals_heading(:path=>"archdesc/accruals/head", :index_as=>[:displayable])
+    t.acqinfo(:path=>"archdesc/acqinfo/p", :index_as=>[:searchable])
+    t.acqinfo_heading(:path=>"archdesc/acqinfo/head", :index_as=>[:displayable])
+    t.altformavail(:path=>"archdesc/altformavail/p", :index_as=>[:searchable])
+    t.altformavail_heading(:path=>"archdesc/altformavail/head", :index_as=>[:displayable])
+    t.appraisal(:path=>"archdesc/appraisal/p", :index_as=>[:searchable])
+    t.appraisal_heading(:path=>"archdesc/appraisal/head", :index_as=>[:displayable])
+    t.arrangement(:path=>"archdesc/arrangement/p", :index_as=>[:searchable])
+    t.arrangement_heading(:path=>"archdesc/arrangement/head", :index_as=>[:displayable])
+    t.custodhist(:path=>"archdesc/custodhist/p", :index_as=>[:searchable])
+    t.custodhist_heading(:path=>"archdesc/custodhist/head", :index_as=>[:displayable])
+    t.fileplan(:path=>"archdesc/fileplan/p", :index_as=>[:searchable])
+    t.fileplan_heading(:path=>"archdesc/fileplan/head", :index_as=>[:displayable])
+    t.originalsloc(:path=>"archdesc/originalsloc/p", :index_as=>[:searchable])
+    t.originalsloc_heading(:path=>"archdesc/originalsloc/head", :index_as=>[:displayable])
+    t.phystech(:path=>"archdesc/phystech/p", :index_as=>[:searchable])
+    t.phystech_heading(:path=>"archdesc/phystech/head", :index_as=>[:displayable])
+    t.processinfo(:path=>"archdesc/processinfo/p", :index_as=>[:searchable])
+    t.processinfo_heading(:path=>"archdesc/processinfo/head", :index_as=>[:displayable])
+    t.relatedmaterial(:path=>"archdesc/relatedmaterial/p", :index_as=>[:searchable])
+    t.relatedmaterial_heading(:path=>"archdesc/relatedmaterial/head", :index_as=>[:displayable])
+    t.separatedmaterial(:path=>"archdesc/separatedmaterial/p", :index_as=>[:searchable])
+    t.separatedmaterial_heading(:path=>"archdesc/separatedmaterial/head", :index_as=>[:displayable])
+    t.scopecontent(:path=>"archdesc/scopecontent/p", :index_as=>[:searchable])
+    t.scopecontent_heading(:path=>"archdesc/scopecontent/head", :index_as=>[:displayable])
+    t.userestrict(:path=>"archdesc/userestrict/p", :index_as=>[:searchable])
+    t.userestrict_heading(:path=>"archdesc/userestrict/head", :index_as=>[:displayable])
 
   end
 

data/lib/solr_ead/version.rb

@@ -1,3 +1,3 @@
 module SolrEad
-  VERSION = "0.0.4"
+  VERSION = "0.1.0"
 end

data/solr_ead.gemspec

@@ -16,8 +16,8 @@ Gem::Specification.new do |gem|
   gem.version       = SolrEad::VERSION
 
   # Dependencies
-  gem.add_dependency('om')
-  gem.add_dependency('solrizer')
+  gem.add_dependency('om',       '~> 1.8.0')
+  gem.add_dependency('solrizer', '~> 2.0.0')
   gem.add_dependency('rsolr')
   gem.add_dependency('sanitize')
   gem.add_development_dependency('yard')

data/spec/component_spec.rb

@@ -9,21 +9,31 @@ describe SolrEad::Component do
 
   describe "the solr document" do
 
-    it "should accept additional fields from a hash" do
-      additional_fields = {
-        "id"                        => "TEST-0001:ref010",
-        "eadid_s"                   => "TEST-0001",
-        "parent_id_s"               => "ref001",
-        "parent_ids_display"        => ["ref001", "ref002", "ref003"],
-        "parent_unittitles_display" => ["Series I", "Subseries A", "Subseries 1"],
-        "component_children_b"      => FALSE
-      }
-      solr_doc = @doc.to_solr(additional_fields)
-      solr_doc["id"].should == "TEST-0001:ref010"
-      solr_doc["level_facet"].should include "item"
-      solr_doc["heading_display"].should == "Series I >> Subseries A >> Subseries 1 >> Internal Revenue Service Form Information Return [RESTRICTED]"
-      solr_doc["accessrestrict_t"].first.should match /^This item .* is available.$/
-      solr_doc["accessrestrict_heading_display"].should include "Access Restrictions"
+    describe "for item-level components" do
+
+      before :each do
+        additional_fields = {
+          "id"                        => "TEST-0001:ref010",
+          "eadid_s"                   => "TEST-0001",
+          "parent_id_s"               => "ref001",
+          "parent_ids_display"        => ["ref001", "ref002", "ref003"],
+          "parent_unittitles_display" => ["Series I", "Subseries A", "Subseries 1"],
+          "component_children_b"      => FALSE
+        }
+        @solr_doc = @doc.to_solr(additional_fields)
+      end
+
+      it "should accept additional fields from a hash" do
+        @solr_doc["id"].should == "TEST-0001:ref010"
+        @solr_doc["level_facet"].should include "item"
+        @solr_doc["heading_display"].should == "Series I >> Subseries A >> Subseries 1 >> Internal Revenue Service Form Information Return [RESTRICTED]"
+        @solr_doc["accessrestrict_t"].first.should match /^This item .* is available.$/
+        @solr_doc["accessrestrict_heading_display"].should include "Access Restrictions"
+      end
+
+      it "should create fields using type" do
+        @solr_doc["ref_s"].should == "ref215"
+      end
 
     end
 
@@ -42,8 +52,7 @@ describe SolrEad::Component do
       solr_doc["heading_display"].should == "Internal Revenue Service Form Information Return [RESTRICTED]"
       solr_doc["accessrestrict_t"].first.should match /^This item .* is available.$/
       solr_doc["accessrestrict_heading_display"].should include "Access Restrictions"
-
-    end
+    end       
 
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solr_ead
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,40 +9,40 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-15 00:00:00.000000000 Z
+date: 2012-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: om
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: solrizer
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: rsolr
   requirement: !ruby/object:Gem::Requirement
@@ -167,6 +167,7 @@ files:
 - .gitignore
 - .rvmrc
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile