marcspec 0.7.3 → 0.8.1

data/CHANGES

@@ -1,3 +1,9 @@
+0.8.1
+  * Added some specs, squashed some bugs. In particular, make sure the Range passed to a ControlField
+    makes sense (x..y, where x<=y and x > 0)
+0.8.0
+  * Changed the syntax for a variable field from ['245', '*', '*', 'ab'] to just ['245', 'ab']. We'll worry
+    about indicators when that bridge gets crossed.
 0.7.3
   * Squashed a bug where I forgot to deal with escaping in java .properties files. Now I'm just using 
     a real Java Properties object so I don't have to worry about it.

data/VERSION

@@ -1 +1 @@
-0.7.3
+0.8.1

data/lib/marcspec/controlfieldspec.rb

@@ -21,7 +21,7 @@ module MARCSpec
     
     def initialize (tag, range=nil)
       unless MARC4J4R::ControlField.control_tag? tag
-        raise ArgumentError "Tag must be a control tag"
+        raise ArgumentError, "Tag must be a control tag"
       end
       @tag = tag
       self.range = range
@@ -53,7 +53,11 @@ module MARCSpec
         @range = range..range
       
       elsif range.is_a? Range
-        @range = range
+        if range.begin < 1 or range.begin > range.end
+          raise ArgumentError "Range must be one-based, with the start before the end, not #{range}"
+        else
+          @range = range
+        end
       else
         raise ArgumentError, "Range must be nil, an integer offset (1-based), or a Range, not #{range.inspect}"
       end

data/lib/marcspec/customspec.rb

@@ -54,7 +54,7 @@ module MARCSpec
       @functionSymbol = opts[:functionSymbol]
 
       unless @solrField and @module and @functionSymbol
-        raise ArgumentError, "Custom solr spec must have a field name in :solrField, module in :module, and the method name as a symbol in :functionSymbol"
+        raise ArgumentError, "Custom solr spec must have a field name in :solrField, module in :module, and the function name as a symbol in :functionSymbol"
       end
       
       

data/lib/marcspec/leaderspec.rb

@@ -15,7 +15,7 @@ module MARCSpec
     
     def initialize (tag, range=nil)
       unless tag == 'LDR'
-        raise ArgumentError "Tag must be 'LDR' for a LeaderSpec"
+        raise ArgumentError, "Tag must be 'LDR' for a LeaderSpec"
       end
       @tag = 'LDR'
       self.range = range

data/lib/marcspec/solrfieldspec.rb

@@ -1,4 +1,6 @@
 require 'stringio'
+require 'marc4j4r/controlfield'
+
 module MARCSpec
   class SolrFieldSpec
     attr_accessor :solrField, :first, :map, :noMapKeyDefault, :marcfieldspecs, :default, :arity
@@ -77,10 +79,10 @@ module MARCSpec
     def self.fromHash h
       sfs = self.new(h)
       h[:specs].each do |s|
-        if s.size < 3 
+        if MARC4J4R::ControlField.control_tag? s[0]
           sfs << MARCSpec::ControlFieldSpec.new(*s)
         else
-          sfs << MARCSpec::VariableFieldSpec.new(s[0], s[3], s[4])
+          sfs << MARCSpec::VariableFieldSpec.new(s[0], s[1], s[2])
         end
       end
       return sfs

data/lib/marcspec/specset.rb

@@ -1,5 +1,5 @@
 require 'jruby_streaming_update_solr_server'
-
+require 'marc4j4r'
 
     
 

data/lib/marcspec/variablefieldspec.rb

@@ -15,7 +15,7 @@ module MARCSpec
   
   class VariableFieldSpec
 
-    attr_accessor :tag, :codes, :joiner
+    attr_accessor :tag, :codes, :joiner, :ind1, :ind2
 
     def initialize tag, codes=nil, joiner=' '
       @tag = tag
@@ -63,16 +63,16 @@ module MARCSpec
     def asPPString
       s = StringIO.new
       if @joiner and @joiner != ' '
-        PP.pp([@tag, '*', '*', @codes.join(''), @joiner], s)
+        PP.pp([@tag, @codes.join(''), @joiner], s)
       else
-        PP.pp([@tag, '*', '*', @codes.join('')], s)
+        PP.pp([@tag, @codes.join('')], s)
       end
       return s.string
     end
 
    def self.fromPPString str
      a = eval(str)
-     return self.new(a[0], a[3], a[4])
+     return self.new(a[0], a[1], a[2])
    end
 
   end

data/spec/{variablefieldspec_spec.rb → marcfieldspecs_spec.rb}

@@ -18,6 +18,94 @@ require 'spec_helper'
 # 852    $a American Folklife Center, Library of Congress
 # 852    $a DLC
 
+describe "ControlFieldSpec" do
+
+  before do
+    @one = MARC4J4R::Reader.new("#{DIR}/data/one.dat").first
+    # @batch = MARC4J4R::Reader.new("#{DIR}/batch.dat").collect
+  end
+
+  # afc99990058366 # data
+  # 01234567890123 # index
+  it "gets a single full value" do
+    cfs = MARCSpec::ControlFieldSpec.new('001')
+    cfs.marc_values(@one).should.equal ["afc99990058366"]    
+  end
+  
+  it "gets a single character" do
+    cfs = MARCSpec::ControlFieldSpec.new('001', 10 )
+    cfs.marc_values(@one).should.equal ['8']
+  end
+  
+  it "gets a range of characters" do
+    cfs = MARCSpec::ControlFieldSpec.new('001', 6..10 )
+    cfs.marc_values(@one).should.equal ['90058']
+  end
+  
+  it "should round trip" do
+    cfs = MARCSpec::ControlFieldSpec.new('001', 6..10 )
+    cfs2 = MARCSpec::ControlFieldSpec.fromPPString(cfs.asPPString)
+    cfs.should.equal cfs2
+  end    
+  
+  it "throws an error if you try to use a datafield tag" do
+    lambda{
+      cfs = MARCSpec::ControlFieldSpec.new('010', 6..10 )
+    }.should.raise ArgumentError
+  end
+  
+  it "accepts various forms for the range" do
+    cfs1 = MARCSpec::ControlFieldSpec.new('001')
+    cfs2 = MARCSpec::ControlFieldSpec.new('001')
+    cfs3 = MARCSpec::ControlFieldSpec.new('001')
+    
+    # Range 4-7 is 9999
+    cfs1.range = 4
+    cfs2.range = 4..4
+    cfs1.marc_values(@one).should.equal ['9']
+    cfs2.marc_values(@one).should.equal ['9']
+  end
+  
+  it "rejects bad ranges" do
+    lambda{
+      cfs = MARCSpec::ControlFieldSpec.new('010', -1)
+    }.should.raise ArgumentError
+
+    lambda{
+      cfs = MARCSpec::ControlFieldSpec.new('010', -1..3)
+    }.should.raise ArgumentError
+    
+    lambda{
+      cfs = MARCSpec::ControlFieldSpec.new('010', [1,2,3])
+    }.should.raise ArgumentError
+  end
+end
+
+
+describe "LeaderSpec" do
+  before do
+    @one = MARC4J4R::Reader.new("#{DIR}/data/one.dat").first
+  end
+  
+  it "must use LDR as the tag" do
+    lambda{
+      cfs = MARCSpec::LeaderSpec.new('008')
+    }.should.raise ArgumentError
+  end
+  
+  it "Works with full leader" do
+    cfs = MARCSpec::LeaderSpec.new('LDR')
+    cfs.marc_values(@one).should.equal @one.leader
+  end
+  
+  it "Works with substring of leader" do
+    cfs = MARCSpec::LeaderSpec.new('LDR', 3..5)
+    cfs.marc_values(@one).should.equal @one.leader[3..5]
+  end
+end
+    
+  
+
 describe "VariableFieldSpec" do
   before do
     @one = MARC4J4R::Reader.new("#{DIR}/data/one.dat").first

data/spec/solrfieldspec_spec.rb

@@ -164,6 +164,18 @@ describe "CustomSolrSpec" do
     @map = MARCSpec::KVMap.new('nameOfTheMap', {@titleACValue.upcase => @mapValue, @default=>@mapValueForDefault})
   end
   
+  it "requires solrfield, module, and function" do
+    lambda{
+      css = MARCSpec::CustomSolrSpec.new(:solrField=>'solrField')
+    }.should.raise ArgumentError
+    lambda{
+      css = MARCSpec::CustomSolrSpec.new(:solrField=>'solrField', :module=>A::B)
+    }.should.raise ArgumentError
+    lambda{
+      css = MARCSpec::CustomSolrSpec.new(:module=>A::B, :functionSymbol=>:titleUp)
+    }.should.raise ArgumentError
+  end
+  
   it "works with no args or map" do
     css = MARCSpec::CustomSolrSpec.new(:solrField=>'solrField', :module=>A::B, :functionSymbol=>:titleUp)
     css.marc_values(@one).should.equal [@one['245'].value.upcase]
@@ -191,6 +203,14 @@ describe "CustomSolrSpec" do
     css.marc_values(@one).should.equal ['two', 'one']
   end
   
+  it "disallows multispecs with maps or default values" do
+    lambda{
+      css = MARCSpec::CustomSolrSpec.new(:solrField=>['s1', 's2'], :module=>A::B, :functionSymbol=>:titleUp, :map=>@map)
+    }.should.raise ArgumentError
+    lambda{
+      css = MARCSpec::CustomSolrSpec.new(:solrField=>['s1', 's2'], :module=>A::B, :functionSymbol=>:titleUp, :default=>"bill")
+    }.should.raise ArgumentError
+  end
   
 end
   

data/spec/specset_spec.rb

@@ -41,15 +41,15 @@ describe "SpecSet Basics" do
       {
        :solrField=> "places",
        :specs => [
-        ["260", "*", "*", "a"],
-        ["651", "*", "*", "a"],
-        ["651", "*", "*", "z"],
+        ["260",  "a"],
+        ["651",  "a"],
+        ["651",  "z"],
        ]
       },
-     {:solrField=>'title', :specs=>[['245', '*', '*']]},
+     {:solrField=>'title', :specs=>[['245']]},
       {
         :solrField => 'titleA',
-        :specs => [['245', '*', '*', 'a']]
+        :specs => [['245',  'a']]
       }
     ]
   end
@@ -74,7 +74,7 @@ describe "SpecSet Basics" do
   end
   
   it "should allow repeated solrFields" do
-    @speclist << {:solrField=>'titleA', :specs=>[['260', '*', '*', 'c']]} # '1939.'
+    @speclist << {:solrField=>'titleA', :specs=>[['260',  'c']]} # '1939.'
     expected = @titleA
     expected << '1939.'
     ss = MARCSpec::SpecSet.new
@@ -95,8 +95,6 @@ describe "SpecSet Basics" do
     h['two'].should.equal [2]
     h['letters'].should.equal ['a', 'b']
   end
-    
-    
 end
    
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: marcspec
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 61
   prerelease: false
   segments: 
   - 0
-  - 7
-  - 3
-  version: 0.7.3
+  - 8
+  - 1
+  version: 0.8.1
 platform: ruby
 authors: 
 - BillDueber
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-25 00:00:00 -04:00
+date: 2010-09-04 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -123,12 +123,10 @@ files:
 - spec/data/umich/translation_maps/location_map.properties
 - spec/data/umich/umich_index.properties
 - spec/maps_spec.rb
+- spec/marcfieldspecs_spec.rb
 - spec/solrfieldspec_spec.rb
 - spec/spec_helper.rb
 - spec/specset_spec.rb
-- spec/controlfieldspec_spec.rb
-- spec/leaderspec_spec.rb
-- spec/variablefieldspec_spec.rb
 has_rdoc: true
 homepage: http://github.com/billdueber/marcspec
 licenses: []
@@ -164,10 +162,8 @@ signing_key:
 specification_version: 3
 summary: Extract data from MARC records and send to Solr
 test_files: 
-- spec/controlfieldspec_spec.rb
-- spec/leaderspec_spec.rb
 - spec/maps_spec.rb
+- spec/marcfieldspecs_spec.rb
 - spec/solrfieldspec_spec.rb
 - spec/spec_helper.rb
 - spec/specset_spec.rb
-- spec/variablefieldspec_spec.rb

data/spec/controlfieldspec_spec.rb

@@ -1,52 +0,0 @@
-require 'spec_helper'
-
-# LEADER 00734njm a2200217uu 4500
-# 001    afc99990058366
-# 003    DLC
-# 005    20071104155141.9
-# 007    sd ummunniauub
-# 008    071103s1939    xxufmnne||||||||| u eng||
-# 010    $a afc99990058366
-# 040    $a DLC $c DLC
-# 245 04 $a The Texas ranger $h [sound recording] / $c Sung by Beale D. Taylor.
-# 260    $a Medina, Texas, $c 1939.
-# 300    $a 1 sound disc : $b analog, 33 1/3 rpm, mono. ; $c 12 in.
-# 651  0 $a Medina $z Texas $z United States of America.
-# 700 1  $a Lomax, John Avery, 1867-1948 $e Recording engineer.
-# 700 1  $a Lomax, Ruby T. (Ruby Terrill) $e Recording engineer.
-# 700 1  $a Taylor, Beale D. $e Singer.
-# 852    $a American Folklife Center, Library of Congress
-# 852    $a DLC
-
-describe "ControlFieldSpec" do
-
-  before do
-    @one = MARC4J4R::Reader.new("#{DIR}/data/one.dat").first
-    # @batch = MARC4J4R::Reader.new("#{DIR}/batch.dat").collect
-  end
-
-  # afc99990058366 # data
-  # 01234567890123 # index
-  it "gets a single full value" do
-    cfs = MARCSpec::ControlFieldSpec.new('001')
-    cfs.marc_values(@one).should.equal ["afc99990058366"]    
-  end
-  
-  it "gets a single character" do
-    cfs = MARCSpec::ControlFieldSpec.new('001', 10 )
-    cfs.marc_values(@one).should.equal ['8']
-  end
-  
-  it "gets a range of characters" do
-    cfs = MARCSpec::ControlFieldSpec.new('001', 6..10 )
-    cfs.marc_values(@one).should.equal ['90058']
-  end
-  
-  it "should round trip" do
-    cfs = MARCSpec::ControlFieldSpec.new('001', 6..10 )
-    cfs2 = MARCSpec::ControlFieldSpec.fromPPString(cfs.asPPString)
-    cfs.should.equal cfs2
-  end    
-end
-
-

data/spec/leaderspec_spec.rb

@@ -1,35 +0,0 @@
-require 'spec_helper'
-
-# LEADER 00734njm a2200217uu 4500
-# 001    afc99990058366
-# 003    DLC
-# 005    20071104155141.9
-# 007    sd ummunniauub
-# 008    071103s1939    xxufmnne||||||||| u eng||
-# 010    $a afc99990058366
-# 040    $a DLC $c DLC
-# 245 04 $a The Texas ranger $h [sound recording] / $c Sung by Beale D. Taylor.
-# 260    $a Medina, Texas, $c 1939.
-# 300    $a 1 sound disc : $b analog, 33 1/3 rpm, mono. ; $c 12 in.
-# 651  0 $a Medina $z Texas $z United States of America.
-# 700 1  $a Lomax, John Avery, 1867-1948 $e Recording engineer.
-# 700 1  $a Lomax, Ruby T. (Ruby Terrill) $e Recording engineer.
-# 700 1  $a Taylor, Beale D. $e Singer.
-# 852    $a American Folklife Center, Library of Congress
-# 852    $a DLC
-
-describe "LeaderSpec" do
-  before do
-    @one = MARC4J4R::Reader.new("#{DIR}/data/one.dat").first
-  end
-  
-  it "Works with full leader" do
-    cfs = MARCSpec::LeaderSpec.new('LDR')
-    cfs.marc_values(@one).should.equal @one.leader
-  end
-  
-  it "Works with substring of leader" do
-    cfs = MARCSpec::LeaderSpec.new('LDR', 3..5)
-    cfs.marc_values(@one).should.equal @one.leader[3..5]
-  end
-end