solr_ead 0.4.5 → 0.5.0

data/solr_ead.gemspec

@@ -14,17 +14,19 @@ Gem::Specification.new do |gem|
   gem.name          = "solr_ead"
   gem.require_paths = ["lib"]
   gem.version       = SolrEad::VERSION
+  gem.license       = "Apache 2"
 
   # Dependencies
-  gem.add_dependency('om')
-  gem.add_dependency('solrizer', '~> 2.1.0')
-  gem.add_dependency('rsolr')
-  gem.add_dependency('sanitize')
-  gem.add_development_dependency('yard')
-  gem.add_development_dependency('redcarpet')
-  # For Development
+  gem.add_dependency 'om', '~> 3.0.0'
+  gem.add_dependency 'solrizer', '~> 3.1.0'
+  gem.add_dependency 'rsolr'
+  gem.add_dependency 'sanitize'
+
+  gem.add_development_dependency 'yard'
+  gem.add_development_dependency 'redcarpet'
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec'
   gem.add_development_dependency 'debugger'
   gem.add_development_dependency 'rdoc'
+  gem.add_development_dependency 'jettywrapper'
 end

data/spec/component_spec.rb

@@ -13,25 +13,25 @@ describe SolrEad::Component do
 
       before :each do
         additional_fields = {
-          "id"                        => "TEST-0001ref010",
-          "ead_id"                    => "TEST-0001",
-          "parent_id"                 => "ref001",
-          "parent_id_s"               => ["ref001", "ref002", "ref003"],
-          "parent_unittitles_display" => ["Series I", "Subseries A", "Subseries 1"],
-          "component_children_b"      => FALSE
+          "id" => "TEST-0001ref010",
+          Solrizer.solr_name("ead", :stored_sortable)                          => "TEST-0001",
+          Solrizer.solr_name("parent", :stored_sortable)                       => "ref001",
+          Solrizer.solr_name("parent", :displayable)                  => ["ref001", "ref002", "ref003"],
+          Solrizer.solr_name("parent_unittitles", :displayable)       => ["Series I", "Subseries A", "Subseries 1"],
+          Solrizer.solr_name("component_children", :type => :boolean) => FALSE
         }
         @solr_doc = @doc.to_solr(additional_fields)
       end
 
       it "should accept additional fields from a hash" do
         @solr_doc["id"].should == "TEST-0001ref010"
-        @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_display"].first.should match /^This item .* is available.$/
+        @solr_doc[Solrizer.solr_name("level", :facetable)].should include "item"
+        @solr_doc[Solrizer.solr_name("heading", :displayable)].first.should == "Series I >> Subseries A >> Subseries 1 >> Internal Revenue Service Form Information Return [RESTRICTED]"
+        @solr_doc[Solrizer.solr_name("accessrestrict", :displayable)].first.should match /^This item .* is available.$/
       end
 
       it "should create fields using type" do
-        @solr_doc["ref_id"].should == "ref215"
+        @solr_doc[Solrizer.solr_name("ref", :stored_sortable)].should == "ref215"
       end
 
     end
@@ -39,17 +39,17 @@ describe SolrEad::Component do
     it "should format heading_display with only one element" do
       additional_fields = {
         "id"                        => "TEST-0001ref010",
-        "eadid_s"                   => "TEST-0001",
-        "parent_id_s"               => "ref001",
-        "parent_ids_display"        => ["ref001", "ref002", "ref003"],
-        "parent_unittitles_display" => [],
-        "component_children_b"      => FALSE
+        Solrizer.solr_name("ead", :stored_sortable)                          => "TEST-0001",
+        Solrizer.solr_name("parent", :stored_sortable)                       => "ref001",
+        Solrizer.solr_name("parent", :displayable)                  => ["ref001", "ref002", "ref003"],
+        Solrizer.solr_name("parent_unittitles", :displayable)       => [],
+        Solrizer.solr_name("component_children", :type => :boolean) => FALSE
       }
       solr_doc = @doc.to_solr(additional_fields)
       solr_doc["id"].should == "TEST-0001ref010"
-      solr_doc["level_facet"].should include "item"
-      solr_doc["heading_display"].should == "Internal Revenue Service Form Information Return [RESTRICTED]"
-      solr_doc["accessrestrict_display"].first.should match /^This item .* is available.$/
+      solr_doc[Solrizer.solr_name("level", :facetable)].should include "item"
+      solr_doc[Solrizer.solr_name("heading", :displayable)].first.should == "Internal Revenue Service Form Information Return [RESTRICTED]"
+      solr_doc[Solrizer.solr_name("accessrestrict", :displayable)].first.should match /^This item .* is available.$/
     end       
 
   end

data/spec/document_spec.rb

@@ -3,7 +3,6 @@ require "spec_helper"
 describe SolrEad::Document do
 
   before(:all) do
-    Solrizer.default_field_mapper = EadMapper.new
     @ex1 = SolrEad::Document.from_xml(fixture "ARC-0005.xml")
     @ex2 = SolrEad::Document.from_xml(fixture "pp002010.xml")
     @ex3 = SolrEad::Document.from_xml(fixture "ARC-0161.xml")
@@ -56,23 +55,22 @@ describe SolrEad::Document do
   describe ".to_solr" do
 
     it "should have the appropriate id fields" do
-      @solr_ex1["ead_id"].should  == "ARC-0005"
-      @solr_ex1["id"].should      == "ARC-0005"
-      @solr_ex2["ead_id"].should  == "http://hdl.loc.gov/loc.pnp/eadpnp.pp002010"
       @solr_ex2["id"].should      == "http://hdl.loc.gov/loc.pnp/eadpnp.pp002010"
-
+      @solr_ex1["id"].should      == "ARC-0005"
+      @solr_ex2[Solrizer.solr_name("ead", :stored_sortable)].should  == "http://hdl.loc.gov/loc.pnp/eadpnp.pp002010"
+      @solr_ex1[Solrizer.solr_name("ead", :stored_sortable)].should  == "ARC-0005"
     end
 
     it "should have faceted terms created from subject headings" do
-      @solr_ex1["persname_facet"].should include "Cochran, Eddie, 1938-1960"
-      @solr_ex1["genreform_facet"].should include "Newspapers"
-      @solr_ex1["subject_facet"].should include "Rockabilly music"
-      @solr_ex2["corpname_facet"].should include "Tuskegee Normal and Industrial Institute--1880-1940."
-      @solr_ex2["genreform_facet"].should include "Group portraits--1880-1940."
-      @solr_ex2["geogname_facet"].should include "Washington, D.C."
-      @solr_ex2["name_facet"].should include "Bell, J.S., Portland, OR"
-      @solr_ex2["persname_facet"].should include "Johnston, Frances Benjamin, 1864-1952, photographer."
-      @solr_ex2["subject_facet"].should include "Buildings--1880-1940."
+      @solr_ex1[Solrizer.solr_name("persname", :facetable)].should include "Cochran, Eddie, 1938-1960"
+      @solr_ex1[Solrizer.solr_name("genreform", :facetable)].should include "Newspapers"
+      @solr_ex1[Solrizer.solr_name("subject", :facetable)].should include "Rockabilly music"
+      @solr_ex2[Solrizer.solr_name("corpname", :facetable)].should include "Tuskegee Normal and Industrial Institute--1880-1940."
+      @solr_ex2[Solrizer.solr_name("genreform", :facetable)].should include "Group portraits--1880-1940."
+      @solr_ex2[Solrizer.solr_name("geogname", :facetable)].should include "Washington, D.C."
+      @solr_ex2[Solrizer.solr_name("name", :facetable)].should include "Bell, J.S., Portland, OR"
+      @solr_ex2[Solrizer.solr_name("persname", :facetable)].should include "Johnston, Frances Benjamin, 1864-1952, photographer."
+      @solr_ex2[Solrizer.solr_name("subject", :facetable)].should include "Buildings--1880-1940."
     end
 
   end

data/spec/indexer_spec.rb

@@ -14,20 +14,20 @@ describe SolrEad::Indexer do
 
     it "should index a new ead from a file" do
       @indexer.create(@file)
-      q = @indexer.solr.get 'select', :params => {:q=>'ead_id:"ARC-0005"', :qt=>'document'}
+      q = @indexer.solr.get 'select', :params => {:q=>Solrizer.solr_name("ead", :stored_sortable)+':"ARC-0005"', :qt=>'document'}
       q["response"]["numFound"].should == 136
     end
 
 
     it "should update an ead from a file" do
       @indexer.update(@file)
-      q = @indexer.solr.get 'select', :params => {:q=>'ead_id:"ARC-0005"', :qt=>'document'}
+      q = @indexer.solr.get 'select', :params => {:q=>Solrizer.solr_name("ead", :stored_sortable)+':"ARC-0005"', :qt=>'document'}
       q["response"]["numFound"].should == 136
     end
 
     it "should delete and ead give an id" do
       @indexer.delete("ARC-0005")
-      q = @indexer.solr.get 'select', :params => {:q=>'ead_id:"ARC-0005"', :qt=>'document'}
+      q = @indexer.solr.get 'select', :params => {:q=>Solrizer.solr_name("ead", :stored_sortable)+':"ARC-0005"', :qt=>'document'}
       q["response"]["numFound"].should == 0
     end
 
@@ -45,13 +45,13 @@ describe SolrEad::Indexer do
 
     it "should index a new ead from a file as a single solr document" do
       @simple_indexer.create(@file)
-      q = @simple_indexer.solr.get 'select', :params => {:q=>'ead_id:"ARC-0005"', :qt=>'document'}
+      q = @simple_indexer.solr.get 'select', :params => {:q=>Solrizer.solr_name("ead", :stored_sortable)+':"ARC-0005"', :qt=>'document'}
       q["response"]["numFound"].should == 1
     end
 
     it "should delete a single ead" do
       @simple_indexer.delete("ARC-0005")
-      q = @simple_indexer.solr.get 'select', :params => {:q=>'ead_id:"ARC-0005"', :qt=>'document'}
+      q = @simple_indexer.solr.get 'select', :params => {:q=>Solrizer.solr_name("ead", :stored_sortable)+':"ARC-0005"', :qt=>'document'}
       q["response"]["numFound"].should == 0
     end
 
@@ -62,7 +62,7 @@ describe SolrEad::Indexer do
     before :all do
       class CustomDocument < SolrEad::Document
         include OM::XML::Document
-        include Solrizer::XML::TerminologyBasedSolrizer
+        include OM::XML::TerminologyBasedSolrizer
         include SolrEad::OmBehaviors
         set_terminology do |t|
           t.root(:path=>"ead", :index_as => [:not_searchable])
@@ -74,7 +74,7 @@ describe SolrEad::Indexer do
 
       class CustomComponent < SolrEad::Component
         include OM::XML::Document
-        include Solrizer::XML::TerminologyBasedSolrizer
+        include OM::XML::TerminologyBasedSolrizer
         set_terminology do |t|
           t.root(:path=>"c", :index_as => [:not_searchable, :not_displayable])
           t.ref(:path=>"/c/@id")
@@ -99,7 +99,7 @@ describe SolrEad::Indexer do
     end
 
     it "should accept a simple custom document definition" do
-      indexer = SolrEad::Indexer.new(:document => CustomDocument, :simple=>true)
+      indexer = SolrEad::Indexer.new(:document => CustomDocument, :stored_sortable=>true)
       indexer.create(@file)
     end
 

metadata

@@ -1,52 +1,46 @@
 --- !ruby/object:Gem::Specification
 name: solr_ead
 version: !ruby/object:Gem::Version
-  version: 0.4.5
-  prerelease: 
+  version: 0.5.0
 platform: ruby
 authors:
 - Adam Wead
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-07 00:00:00.000000000 Z
+date: 2013-11-01 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: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: solrizer
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: rsolr
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sanitize
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -110,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -126,7 +111,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -134,7 +118,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -142,7 +125,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: debugger
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -150,7 +132,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -158,7 +139,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -166,7 +146,20 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: jettywrapper
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -182,14 +175,14 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rvmrc
+- .travis.yml
 - Gemfile
-- Gemfile.lock
 - History.txt
 - LICENSE
 - README.md
 - Rakefile
+- config/jetty.yml
 - config/solr.yml
-- lib/ead_mapper.rb
 - lib/solr_ead.rb
 - lib/solr_ead/behaviors.rb
 - lib/solr_ead/component.rb
@@ -199,6 +192,8 @@ files:
 - lib/solr_ead/railtie.rb
 - lib/solr_ead/version.rb
 - lib/tasks/solr_ead.rake
+- lib/tasks/solr_ead_dev.rake
+- solr/schema.xml
 - solr_ead.gemspec
 - spec/behaviors_spec.rb
 - spec/component_spec.rb
@@ -213,34 +208,28 @@ files:
 - spec/indexer_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/awead/solr_ead
-licenses: []
+licenses:
+- Apache 2
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3066311826305966167
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3066311826305966167
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.1.8
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A gem for indexing ead into solr using OM
 test_files:
 - spec/behaviors_spec.rb

data/Gemfile.lock

@@ -1,80 +0,0 @@
-PATH
-  remote: .
-  specs:
-    solr_ead (0.4.5)
-      om
-      rsolr
-      sanitize
-      solrizer (~> 2.1.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activemodel (3.2.13)
-      activesupport (= 3.2.13)
-      builder (~> 3.0.0)
-    activesupport (3.2.13)
-      i18n (= 0.6.1)
-      multi_json (~> 1.0)
-    builder (3.0.4)
-    columnize (0.3.6)
-    daemons (1.1.9)
-    debugger (1.5.0)
-      columnize (>= 0.3.1)
-      debugger-linecache (~> 1.2.0)
-      debugger-ruby_core_source (~> 1.2.0)
-    debugger-linecache (1.2.0)
-    debugger-ruby_core_source (1.2.0)
-    deprecation (0.0.5)
-      activesupport
-    diff-lcs (1.2.1)
-    i18n (0.6.1)
-    json (1.7.7)
-    mediashelf-loggable (0.4.9)
-    multi_json (1.7.1)
-    nokogiri (1.5.8)
-    om (1.8.0)
-      activemodel
-      activesupport
-      deprecation
-      mediashelf-loggable
-      nokogiri (>= 1.4.2)
-    rake (10.0.3)
-    rdoc (4.0.0)
-      json (~> 1.4)
-    redcarpet (2.2.2)
-    rsolr (1.0.8)
-      builder (>= 2.1.2)
-    rspec (2.13.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    rspec-core (2.13.1)
-    rspec-expectations (2.13.0)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.0)
-    sanitize (2.0.3)
-      nokogiri (>= 1.4.4, < 1.6)
-    solrizer (2.1.0)
-      activesupport
-      daemons
-      mediashelf-loggable (~> 0.4.7)
-      nokogiri
-      om (>= 1.5.0)
-      stomp
-      xml-simple
-    stomp (1.2.8)
-    xml-simple (1.1.2)
-    yard (0.8.5.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  debugger
-  rake
-  rdoc
-  redcarpet
-  rspec
-  solr_ead!
-  yard

data/lib/ead_mapper.rb

@@ -1,13 +0,0 @@
-class EadMapper < Solrizer::FieldMapper
-  id_field 'id'
-  index_as :displayable, :suffix => '_display'
-  index_as :searchable,  :suffix => '_t'
-  index_as :unstemmed,   :suffix => '_unstem_search'
-  index_as :string,      :suffix => '_s'
-  index_as :date,        :suffix => '_dt'
-  index_as :integer,     :suffix => '_i'
-  index_as :boolean,     :suffix => '_b'
-  index_as :facetable,   :suffix => '_facet'
-  index_as :sortable,    :suffix => '_sort'
-  index_as :keyed,       :suffix => '_id'
-end