stanford-mods 0.0.8 → 0.0.9

data/README.rdoc

@@ -60,6 +60,7 @@ Example Using SearchWorks Mixins:
 
 == Releases
 
+* <b>0.0.9</b> add sw_subject_names and sw_subject_titles methods to searchworks mixin
 * <b>0.0.8</b> require stanford-mods/searchworks in stanford-mods (top level)
 * <b>0.0.7</b> added sw_geographic_search to searchworks mixin
 * <b>0.0.6</b> various title methods added to searchworks mixin

data/lib/stanford-mods/searchworks.rb

@@ -122,7 +122,7 @@ module Stanford
       #   subject/hierarchicalGeographic
       #   subject/geographicCode  (only include the translated value if it isn't already present from other mods geo fields)
       # @param [String] sep - the separator string for joining hierarchicalGeographic sub elements
-      # @return [Array<String>] values for geographic_search Solr field for this document or nil if none
+      # @return [Array<String>] values for geographic_search Solr field for this document or [] if none
       def sw_geographic_search(sep = ' ')
         result = term_values([:subject, :geographic]) || []
         
@@ -142,9 +142,35 @@ module Stanford
           }
         end
 
-        return nil if result.empty?
         result    
       end
+      
+      # Values are the contents of:
+      #   subject/name/namePart
+      #  "Values from namePart subelements should be concatenated in the order they appear (e.g. "Shakespeare, William, 1564-1616")"
+      # @param [String] sep - the separator string for joining namePart sub elements
+      # @return [Array<String>] values for names inside subject elements or [] if none
+      def sw_subject_names(sep = ', ')
+        result = []
+        @mods_ng_xml.subject.name_el.select { |n_el| n_el.namePart }.each { |name_el_w_np|  
+          parts = name_el_w_np.namePart.map { |npn| npn.text unless npn.text.empty? }.compact
+          result << parts.join(sep).strip unless parts.empty?
+        }
+        result
+      end
+      
+      # Values are the contents of:
+      #   subject/titleInfo/(subelements)
+      # @param [String] sep - the separator string for joining titleInfo sub elements
+      # @return [Array<String>] values for titles inside subject elements or [] if none
+      def sw_subject_titles(sep = ' ')
+        result = []
+        @mods_ng_xml.subject.titleInfo.each { |ti_el|
+          parts = ti_el.element_children.map { |el| el.text unless el.text.empty? }.compact
+          result << parts.join(sep).strip unless parts.empty?
+        }
+        result
+      end
             
     end # class Record
   end # Module Mods

data/lib/stanford-mods/version.rb

@@ -1,5 +1,6 @@
 module Stanford
   module Mods
-    VERSION = "0.0.8"
+    # this is the Ruby Gem version
+    VERSION = "0.0.9"
   end
 end

data/spec/searchworks_spec.rb

@@ -177,195 +177,4 @@ describe "Searchworks mixin for Stanford::Mods::Record" do
     end
   end # content sw title methods
 
-  context "sw subject methods" do
-    before(:all) do
-      @genre = 'genre top level'
-      @cart_coord = '6 00 S, 71 30 E'
-      @s_genre = 'genre in subject'
-      @geo = 'Somewhere'
-      @geo_code = 'us'
-      @hier_geo_country = 'France'
-      @s_name = 'name in subject'
-      @occupation = 'worker bee'
-      @temporal = 'temporal'
-      @s_title = 'title in subject'
-      @topic = 'topic'
-      m = "<mods #{@ns_decl}>
-        <genre>#{@genre}</genre>
-        <subject><cartographics><coordinates>#{@cart_coord}</coordinates></cartographics></subject>
-        <subject><genre>#{@s_genre}</genre></subject>
-        <subject><geographic>#{@geo}</geographic></subject>
-        <subject><geographicCode authority='iso3166'>#{@geo_code}</geographicCode></subject>
-        <subject><hierarchicalGeographic><country>#{@hier_geo_country}</country></hierarchicalGeographic></subject>
-        <subject><name><namePart>#{@s_name}</namePart></name></subject>
-        <subject><occupation>#{@occupation}</occupation></subject>
-        <subject><temporal>#{@temporal}</temporal></subject>
-        <subject><titleInfo><title>#{@s_title}</title></titleInfo></subject>
-        <subject><topic>#{@topic}</topic></subject>      
-      </mods>"
-      @smods_rec.from_str m
-      @sw_geographic_search = @smods_rec.sw_geographic_search   
-    end
-    
-    context "sw_geographic_search" do
-      it "should contain subject <geographic> subelement data" do
-        @sw_geographic_search.should include(@geo)
-      end
-      it "should contain subject <hierarchicalGeographic> subelement data" do
-        @sw_geographic_search.should include(@hier_geo_country)
-      end
-      it "should contain translation of <geographicCode> subelement data with translated authorities" do
-        m = "<mods #{@ns_decl}><subject><geographicCode authority='marcgac'>e-er</geographicCode></subject></mods>"
-        @smods_rec.from_str m
-        @smods_rec.sw_geographic_search.should include('Estonia')
-      end
-      it "should not contain other subject element data" do
-        @sw_geographic_search.should_not include(@genre)
-        @sw_geographic_search.should_not include(@cart_coord)
-        @sw_geographic_search.should_not include(@s_genre)
-        @sw_geographic_search.should_not include(@s_name)
-        @sw_geographic_search.should_not include(@occupation)
-        @sw_geographic_search.should_not include(@temporal)
-        @sw_geographic_search.should_not include(@topic)
-        @sw_geographic_search.should_not include(@s_title)
-      end
-      it "should be nil if there are no values in the MODS" do
-        m = "<mods #{@ns_decl}><note>notit</note></mods>"
-        @smods_rec.from_str m
-        @smods_rec.sw_geographic_search.should == nil
-      end
-      it "should not be nil if there are only subject/geographic elements" do
-        m = "<mods #{@ns_decl}><subject><geographic>#{@geo}</geographic></subject></mods>"
-        @smods_rec.from_str m
-        @smods_rec.sw_geographic_search.should == [@geo]
-      end
-      it "should not be nil if there are only subject/hierarchicalGeographic" do
-        m = "<mods #{@ns_decl}><subject><hierarchicalGeographic><country>#{@hier_geo_country}</country></hierarchicalGeographic></subject></mods>"
-        @smods_rec.from_str m
-        @smods_rec.sw_geographic_search.should == [@hier_geo_country]
-      end
-      it "should not be nil if there are only subject/geographicCode elements" do
-        m = "<mods #{@ns_decl}><subject><geographicCode authority='marcgac'>e-er</geographicCode></subject></mods>"
-        @smods_rec.from_str m
-        @smods_rec.sw_geographic_search.should == ['Estonia']
-      end
-      context "geographic subelement" do
-        it "should have a separate value for each geographic element" do
-          m = "<mods #{@ns_decl}>
-                <subject>
-                <geographic>Mississippi</geographic>
-                <geographic>Tippah County</geographic>
-                </subject>
-                <subject><geographic>Washington (D.C.)</geographic></subject>
-              </mods>"
-          @smods_rec.from_str m
-          @smods_rec.sw_geographic_search.should == ['Mississippi', 'Tippah County', 'Washington (D.C.)']
-        end
-        it "should be nil if there are only empty values in the MODS" do
-          m = "<mods #{@ns_decl}><subject><geographic/></subject><note>notit</note></mods>"
-          @smods_rec.from_str m
-          @smods_rec.sw_geographic_search.should == nil
-        end
-      end
-      context "hierarchicalGeographic subelement" do
-        it "should have a separate value for each hierarchicalGeographic element" do
-          m = "<mods #{@ns_decl}>
-                <subject>
-                  <hierarchicalGeographic><area>first</area></hierarchicalGeographic>
-                  <hierarchicalGeographic><area>second</area></hierarchicalGeographic>
-                </subject>
-                <subject><hierarchicalGeographic><area>third</area></hierarchicalGeographic></subject>
-              </mods>"
-          @smods_rec.from_str m
-          @smods_rec.sw_geographic_search.should == ['first', 'second', 'third']
-        end
-        it "should be nil if there are only empty values in the MODS" do
-          m = "<mods #{@ns_decl}><subject><hierarchicalGeographic/></subject><note>notit</note></mods>"
-          @smods_rec.from_str m
-          @smods_rec.sw_geographic_search.should == nil
-        end
-        context "combining subelements" do
-          before(:all) do
-            m = "<mods #{@ns_decl}>
-            <subject>
-              <hierarchicalGeographic>
-              	<country>Canada</country>
-              	<province>British Columbia</province>
-              	<city>Vancouver</city>
-              </hierarchicalGeographic>
-            </subject></mods>"
-            @smods_rec.from_str m
-          end
-          it "uses a space as the separator by default" do
-            @smods_rec.sw_geographic_search.should == ['Canada British Columbia Vancouver']
-          end          
-          it "honors any string value passed in for the separator" do
-            @smods_rec.sw_geographic_search(' --').should == ['Canada --British Columbia --Vancouver']
-          end
-        end
-      end # hierarchicalGeographic
-      context "geographicCode subelement" do
-        before(:all) do
-          m = "<mods #{@ns_decl}>
-            <subject><geographicCode authority='marcgac'>n-us-md</geographicCode></subject>
-            <subject><geographicCode authority='marcgac'>e-er</geographicCode></subject>
-            <subject><geographicCode authority='marccountry'>mg</geographicCode></subject>
-            <subject><geographicCode authority='iso3166'>us</geographicCode></subject>
-          </mods>"
-          @smods_rec.from_str m
-          @geo_search_from_codes = @smods_rec.sw_geographic_search   
-        end
-        it "should not add untranslated values" do
-          @geo_search_from_codes.should_not include('n-us-md')
-          @geo_search_from_codes.should_not include('e-er')
-          @geo_search_from_codes.should_not include('mg')
-          @geo_search_from_codes.should_not include('us')
-        end
-        it "should translate marcgac codes" do
-          @geo_search_from_codes.should include('Estonia')
-        end
-        it "should translate marccountry codes" do
-          @geo_search_from_codes.should include('Madagascar')
-        end
-        it "should not translate other codes" do
-          @geo_search_from_codes.should_not include('United States')
-        end
-        it "should have a separate value for each geographicCode element" do
-          m = "<mods #{@ns_decl}>
-                <subject>
-                  <geographicCode authority='marcgac'>e-er</geographicCode>
-                	<geographicCode authority='marccountry'>mg</geographicCode>
-                </subject>
-                <subject><geographicCode authority='marcgac'>n-us-md</geographicCode></subject>
-              </mods>"
-          @smods_rec.from_str m
-          @smods_rec.sw_geographic_search.should == ['Estonia', 'Madagascar', 'Maryland']
-        end
-        it "should be nil if there are only empty values in the MODS" do
-          m = "<mods #{@ns_decl}><subject><geographicCode/></subject><note>notit</note></mods>"
-          @smods_rec.from_str m
-          @smods_rec.sw_geographic_search.should == nil
-        end
-        it "should add the translated value if it wasn't present already" do
-          m = "<mods #{@ns_decl}>
-            <subject><geographic>Somewhere</geographic></subject>
-            <subject><geographicCode authority='marcgac'>e-er</geographicCode></subject>
-          </mods>"
-          @smods_rec.from_str m
-          @smods_rec.sw_geographic_search.size.should == 2
-          @smods_rec.sw_geographic_search.should include('Estonia')
-        end
-        it "should not add the translated value if it was already present" do
-          m = "<mods #{@ns_decl}>
-            <subject><geographic>Estonia</geographic></subject>
-            <subject><geographicCode authority='marcgac'>e-er</geographicCode></subject>
-          </mods>"
-          @smods_rec.from_str m
-          @smods_rec.sw_geographic_search.size.should == 1
-          @smods_rec.sw_geographic_search.should == ['Estonia']
-        end
-      end
-    end # sw_geographic_search
-  end # context sw subject methods
-
 end

data/spec/searchworks_subject_spec.rb

@@ -0,0 +1,384 @@
+# encoding: UTF-8
+require 'spec_helper'
+
+describe "Searchworks mixin for Stanford::Mods::Record" do
+
+  before(:all) do
+    @smods_rec = Stanford::Mods::Record.new
+    @ns_decl = "xmlns='#{Mods::MODS_NS}'"
+  end
+
+  context "sw subject methods" do
+    before(:all) do
+      @genre = 'genre top level'
+      @cart_coord = '6 00 S, 71 30 E'
+      @s_genre = 'genre in subject'
+      @geo = 'Somewhere'
+      @geo_code = 'us'
+      @hier_geo_country = 'France'
+      @s_name = 'name in subject'
+      @occupation = 'worker bee'
+      @temporal = 'temporal'
+      @s_title = 'title in subject'
+      @topic = 'topic'
+      m = "<mods #{@ns_decl}>
+        <genre>#{@genre}</genre>
+        <subject><cartographics><coordinates>#{@cart_coord}</coordinates></cartographics></subject>
+        <subject><genre>#{@s_genre}</genre></subject>
+        <subject><geographic>#{@geo}</geographic></subject>
+        <subject><geographicCode authority='iso3166'>#{@geo_code}</geographicCode></subject>
+        <subject><hierarchicalGeographic><country>#{@hier_geo_country}</country></hierarchicalGeographic></subject>
+        <subject><name><namePart>#{@s_name}</namePart></name></subject>
+        <subject><occupation>#{@occupation}</occupation></subject>
+        <subject><temporal>#{@temporal}</temporal></subject>
+        <subject><titleInfo><title>#{@s_title}</title></titleInfo></subject>
+        <subject><topic>#{@topic}</topic></subject>      
+      </mods>"
+      @smods_rec.from_str m
+      @sw_geographic_search = @smods_rec.sw_geographic_search 
+      @sw_subject_titles = @smods_rec.sw_subject_titles
+      @sw_subject_names = @smods_rec.sw_subject_names
+    end
+    
+    context "sw_subject_names" do
+      it "should contain <subject><name><namePart> values" do
+        @sw_subject_names.should include(@s_name)
+      end
+      it "should not contain non-name subject subelements" do
+        @sw_subject_names.should_not include(@cart_coord)
+        @sw_subject_names.should_not include(@s_genre)
+        @sw_subject_names.should_not include(@geo)
+        @sw_subject_names.should_not include(@geo_code)
+        @sw_subject_names.should_not include(@hier_geo_country)
+        @sw_subject_names.should_not include(@occupation)
+        @sw_subject_names.should_not include(@temporal)
+        @sw_subject_names.should_not include(@topic)
+        @sw_subject_names.should_not include(@s_title)
+      end
+      it "should not contain subject/name/role" do
+        m = "<mods #{@ns_decl}>
+              <subject><name type='personal'>
+              	<namePart>Alterman, Eric</namePart>
+              	<displayForm>Eric Alterman</displayForm>
+              	<role>
+              	  	<roleTerm type='text'>creator</roleTerm>
+              	  	<roleTerm type='code'>cre</roleTerm>
+              	</role>
+              </name></subject></mods>"
+        @smods_rec.from_str m
+        @smods_rec.sw_subject_names.find { |sn| sn =~ /cre/ }.should == nil
+      end
+      it "should not contain subject/name/affiliation" do
+        m = "<mods #{@ns_decl}>
+              <subject><name type='personal'>
+              	<namePart type='termsOfAddress'>Dr.</namePart>
+              	<namePart>Brown, B. F.</namePart>
+              	<affiliation>Chemistry Dept., American University</affiliation>
+              </name></subject></mods>"
+        @smods_rec.from_str m
+        @smods_rec.sw_subject_names.find { |sn| sn =~ /Chemistry/ }.should == nil
+      end
+      it "should not contain subject/name/description" do
+        m = "<mods #{@ns_decl}>
+              <subject><name type='personal'>
+              	<namePart>Abrams, Michael</namePart>
+              	<description>American artist, 20th c.</description>
+              </name></subject></mods>"
+        @smods_rec.from_str m
+        @smods_rec.sw_subject_names.find { |sn| sn =~ /artist/ }.should == nil
+      end
+      it "should not include top level name element" do
+        m = "<mods #{@ns_decl}>
+              <name type='personal'>
+              	<namePart>Abrams, Michael</namePart>
+              	<description>American artist, 20th c.</description>
+              </name></mods>"
+        @smods_rec.from_str m
+        @smods_rec.sw_subject_names.should == []
+      end
+      it "should have one value for each name element" do
+        m = "<mods #{@ns_decl}>
+              <subject>
+                <name><namePart>first</namePart></name>
+                <name><namePart>second</namePart></name>
+              </subject>
+              <subject>
+                <name><namePart>third</namePart></name>
+              </subject>
+              </mods>"
+        @smods_rec.from_str m
+        @smods_rec.sw_subject_names.should == ['first', 'second', 'third']
+      end
+      it "should be an empty Array if there are no values in the mods" do
+        m = "<mods #{@ns_decl}><note>notit</note></mods>"
+        @smods_rec.from_str m
+        @smods_rec.sw_subject_names.should == []
+      end
+      it "should be an empty Array if there are empty values in the mods" do
+        m = "<mods #{@ns_decl}><subject><name><namePart/></name></subject><note>notit</note></mods>"
+        @smods_rec.from_str m
+        @smods_rec.sw_subject_names.should == []
+      end
+      context "combining subelements" do
+        before(:all) do
+          m = "<mods #{@ns_decl}>
+                <subject>
+                  <name>
+                    <namePart>first</namePart>
+                    <namePart>second</namePart>
+                  </name>
+                </subject>
+              </mods>"
+          @smods_rec.from_str m
+        end
+        it "uses a ', ' as the separator by default" do
+          @smods_rec.sw_subject_names.should == ['first, second']
+        end          
+        it "honors any string value passed in for the separator" do
+          @smods_rec.sw_subject_names(' --').should == ['first --second']
+        end
+      end
+    end # sw_subject_names
+    
+    context "sw_subject_titles" do
+      it "should contain <subject><titleInfo> subelement values" do
+        @sw_subject_titles.should include(@s_title)
+      end
+      it "should not contain non-name subject subelements" do
+        @sw_subject_titles.should_not include(@cart_coord)
+        @sw_subject_titles.should_not include(@s_genre)
+        @sw_subject_titles.should_not include(@geo)
+        @sw_subject_titles.should_not include(@geo_code)
+        @sw_subject_titles.should_not include(@hier_geo_country)
+        @sw_subject_titles.should_not include(@s_name)
+        @sw_subject_titles.should_not include(@occupation)
+        @sw_subject_titles.should_not include(@temporal)
+        @sw_subject_titles.should_not include(@topic)
+      end
+      it "should not include top level titleInfo element" do
+        m = "<mods #{@ns_decl}><titleInfo><title>Oklahoma</title></titleInfo></mods>"
+        @smods_rec.from_str m
+        @smods_rec.sw_subject_titles.should == []
+      end
+      it "should have one value for each titleInfo element" do
+        m = "<mods #{@ns_decl}>
+              <subject>
+                <titleInfo><title>first</title></titleInfo>
+                <titleInfo><title>second</title></titleInfo>
+              </subject>
+              <subject>
+                <titleInfo><title>third</title></titleInfo>
+              </subject>
+              </mods>"
+        @smods_rec.from_str m
+        @smods_rec.sw_subject_titles.should == ['first', 'second', 'third']
+      end
+      it "should be an empty Array if there are no values in the mods" do
+        m = "<mods #{@ns_decl}><note>notit</note></mods>"
+        @smods_rec.from_str m
+        @smods_rec.sw_subject_titles.should == []
+      end
+      it "should be an empty Array if there are empty values in the mods" do
+        m = "<mods #{@ns_decl}><subject><titleInfo><title/></titleInfo></subject><note>notit</note></mods>"
+        @smods_rec.from_str m
+        @smods_rec.sw_subject_titles.should == []
+      end
+      context "combining subelements" do
+        before(:all) do
+          m = "<mods #{@ns_decl}>
+                <subject>
+                  <titleInfo>
+                    <title>first</title>
+                    <subTitle>second</subTitle>
+                  </titleInfo>
+                </subject>
+              </mods>"
+          @smods_rec.from_str m
+        end
+        it "uses a ' ' as the separator by default" do
+          @smods_rec.sw_subject_titles.should == ['first second']
+        end          
+        it "honors any string value passed in for the separator" do
+          @smods_rec.sw_subject_titles(' --').should == ['first --second']
+        end
+        it "includes all subelements in the order of occurrence" do
+          m = "<mods #{@ns_decl}>
+                <subject>
+                  <titleInfo>
+                    <partName>1</partName>
+                    <nonSort>2</nonSort>
+                    <partNumber>3</partNumber>
+                    <title>4</title>
+                    <subTitle>5</subTitle>
+                  </titleInfo>
+                </subject>
+              </mods>"
+          @smods_rec.from_str m
+          @smods_rec.sw_subject_titles.should == ['1 2 3 4 5']
+        end
+      end
+    end # sw_subject_titles
+    
+    
+    context "sw_geographic_search" do
+      it "should contain subject <geographic> subelement data" do
+        @sw_geographic_search.should include(@geo)
+      end
+      it "should contain subject <hierarchicalGeographic> subelement data" do
+        @sw_geographic_search.should include(@hier_geo_country)
+      end
+      it "should contain translation of <geographicCode> subelement data with translated authorities" do
+        m = "<mods #{@ns_decl}><subject><geographicCode authority='marcgac'>e-er</geographicCode></subject></mods>"
+        @smods_rec.from_str m
+        @smods_rec.sw_geographic_search.should include('Estonia')
+      end
+      it "should not contain other subject element data" do
+        @sw_geographic_search.should_not include(@genre)
+        @sw_geographic_search.should_not include(@cart_coord)
+        @sw_geographic_search.should_not include(@s_genre)
+        @sw_geographic_search.should_not include(@s_name)
+        @sw_geographic_search.should_not include(@occupation)
+        @sw_geographic_search.should_not include(@temporal)
+        @sw_geographic_search.should_not include(@topic)
+        @sw_geographic_search.should_not include(@s_title)
+      end
+      it "should be [] if there are no values in the MODS" do
+        m = "<mods #{@ns_decl}><note>notit</note></mods>"
+        @smods_rec.from_str m
+        @smods_rec.sw_geographic_search.should == []
+      end
+      it "should not be empty Array if there are only subject/geographic elements" do
+        m = "<mods #{@ns_decl}><subject><geographic>#{@geo}</geographic></subject></mods>"
+        @smods_rec.from_str m
+        @smods_rec.sw_geographic_search.should == [@geo]
+      end
+      it "should not be empty Array if there are only subject/hierarchicalGeographic" do
+        m = "<mods #{@ns_decl}><subject><hierarchicalGeographic><country>#{@hier_geo_country}</country></hierarchicalGeographic></subject></mods>"
+        @smods_rec.from_str m
+        @smods_rec.sw_geographic_search.should == [@hier_geo_country]
+      end
+      it "should not be empty Array if there are only subject/geographicCode elements" do
+        m = "<mods #{@ns_decl}><subject><geographicCode authority='marcgac'>e-er</geographicCode></subject></mods>"
+        @smods_rec.from_str m
+        @smods_rec.sw_geographic_search.should == ['Estonia']
+      end
+      context "geographic subelement" do
+        it "should have a separate value for each geographic element" do
+          m = "<mods #{@ns_decl}>
+                <subject>
+                <geographic>Mississippi</geographic>
+                <geographic>Tippah County</geographic>
+                </subject>
+                <subject><geographic>Washington (D.C.)</geographic></subject>
+              </mods>"
+          @smods_rec.from_str m
+          @smods_rec.sw_geographic_search.should == ['Mississippi', 'Tippah County', 'Washington (D.C.)']
+        end
+        it "should be empty Array if there are only empty values in the MODS" do
+          m = "<mods #{@ns_decl}><subject><geographic/></subject><note>notit</note></mods>"
+          @smods_rec.from_str m
+          @smods_rec.sw_geographic_search.should == []
+        end
+      end
+      context "hierarchicalGeographic subelement" do
+        it "should have a separate value for each hierarchicalGeographic element" do
+          m = "<mods #{@ns_decl}>
+                <subject>
+                  <hierarchicalGeographic><area>first</area></hierarchicalGeographic>
+                  <hierarchicalGeographic><area>second</area></hierarchicalGeographic>
+                </subject>
+                <subject><hierarchicalGeographic><area>third</area></hierarchicalGeographic></subject>
+              </mods>"
+          @smods_rec.from_str m
+          @smods_rec.sw_geographic_search.should == ['first', 'second', 'third']
+        end
+        it "should be empty Array if there are only empty values in the MODS" do
+          m = "<mods #{@ns_decl}><subject><hierarchicalGeographic/></subject><note>notit</note></mods>"
+          @smods_rec.from_str m
+          @smods_rec.sw_geographic_search.should == []
+        end
+        context "combining subelements" do
+          before(:all) do
+            m = "<mods #{@ns_decl}>
+            <subject>
+              <hierarchicalGeographic>
+              	<country>Canada</country>
+              	<province>British Columbia</province>
+              	<city>Vancouver</city>
+              </hierarchicalGeographic>
+            </subject></mods>"
+            @smods_rec.from_str m
+          end
+          it "uses a space as the separator by default" do
+            @smods_rec.sw_geographic_search.should == ['Canada British Columbia Vancouver']
+          end          
+          it "honors any string value passed in for the separator" do
+            @smods_rec.sw_geographic_search(' --').should == ['Canada --British Columbia --Vancouver']
+          end
+        end
+      end # hierarchicalGeographic
+      context "geographicCode subelement" do
+        before(:all) do
+          m = "<mods #{@ns_decl}>
+            <subject><geographicCode authority='marcgac'>n-us-md</geographicCode></subject>
+            <subject><geographicCode authority='marcgac'>e-er</geographicCode></subject>
+            <subject><geographicCode authority='marccountry'>mg</geographicCode></subject>
+            <subject><geographicCode authority='iso3166'>us</geographicCode></subject>
+          </mods>"
+          @smods_rec.from_str m
+          @geo_search_from_codes = @smods_rec.sw_geographic_search   
+        end
+        it "should not add untranslated values" do
+          @geo_search_from_codes.should_not include('n-us-md')
+          @geo_search_from_codes.should_not include('e-er')
+          @geo_search_from_codes.should_not include('mg')
+          @geo_search_from_codes.should_not include('us')
+        end
+        it "should translate marcgac codes" do
+          @geo_search_from_codes.should include('Estonia')
+        end
+        it "should translate marccountry codes" do
+          @geo_search_from_codes.should include('Madagascar')
+        end
+        it "should not translate other codes" do
+          @geo_search_from_codes.should_not include('United States')
+        end
+        it "should have a separate value for each geographicCode element" do
+          m = "<mods #{@ns_decl}>
+                <subject>
+                  <geographicCode authority='marcgac'>e-er</geographicCode>
+                	<geographicCode authority='marccountry'>mg</geographicCode>
+                </subject>
+                <subject><geographicCode authority='marcgac'>n-us-md</geographicCode></subject>
+              </mods>"
+          @smods_rec.from_str m
+          @smods_rec.sw_geographic_search.should == ['Estonia', 'Madagascar', 'Maryland']
+        end
+        it "should be empty Array if there are only empty values in the MODS" do
+          m = "<mods #{@ns_decl}><subject><geographicCode/></subject><note>notit</note></mods>"
+          @smods_rec.from_str m
+          @smods_rec.sw_geographic_search.should == []
+        end
+        it "should add the translated value if it wasn't present already" do
+          m = "<mods #{@ns_decl}>
+            <subject><geographic>Somewhere</geographic></subject>
+            <subject><geographicCode authority='marcgac'>e-er</geographicCode></subject>
+          </mods>"
+          @smods_rec.from_str m
+          @smods_rec.sw_geographic_search.size.should == 2
+          @smods_rec.sw_geographic_search.should include('Estonia')
+        end
+        it "should not add the translated value if it was already present" do
+          m = "<mods #{@ns_decl}>
+            <subject><geographic>Estonia</geographic></subject>
+            <subject><geographicCode authority='marcgac'>e-er</geographicCode></subject>
+          </mods>"
+          @smods_rec.from_str m
+          @smods_rec.sw_geographic_search.size.should == 1
+          @smods_rec.sw_geographic_search.should == ['Estonia']
+        end
+      end
+    end # sw_geographic_search
+  end # context sw subject methods
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stanford-mods
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-04 00:00:00.000000000 Z
+date: 2013-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mods
@@ -154,6 +154,7 @@ files:
 - spec/kolb_spec.rb
 - spec/name_spec.rb
 - spec/searchworks_spec.rb
+- spec/searchworks_subject_spec.rb
 - spec/spec_helper.rb
 - stanford-mods.gemspec
 homepage: https://github.com/sul-dlss/stanford-mods
@@ -170,7 +171,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4369645381715877941
+      hash: 611342479831019770
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -179,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4369645381715877941
+      hash: 611342479831019770
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -191,5 +192,6 @@ test_files:
 - spec/kolb_spec.rb
 - spec/name_spec.rb
 - spec/searchworks_spec.rb
+- spec/searchworks_subject_spec.rb
 - spec/spec_helper.rb
 has_rdoc: