marcspec 0.7.1 → 0.7.2

data/CHANGES

@@ -1,5 +1,7 @@
+0.7.2
+  * Also change methodArgs to functionArgs
 0.7.1
-  * Forgot to update this CHANGES file. 
+  * Forgot to update this CHANGES file.     
 0.7.0
   * Change configuration for custom functions to use :functionSymbol instead of :methodSymbol. Because, you know, they're
     module functions, not class methods. 

data/VERSION

@@ -1 +1 @@
-0.7.1
+0.7.2

data/lib/marcspec/customspec.rb

@@ -32,7 +32,7 @@ module MARCSpec
 
   class CustomSolrSpec < SolrFieldSpec
     
-    attr_accessor :module, :functionSymbol, :methodArgs
+    attr_accessor :module, :functionSymbol, :functionArgs
     
     # Get a new Custom Solr Spec based on the passed in options. 
     # @param [Hash] opts Initialization options
@@ -58,7 +58,7 @@ module MARCSpec
       end
       
       
-      @methodArgs = opts[:methodArgs] || []
+      @functionArgs = opts[:functionArgs] || []
       
       @first = opts[:firstOnly] || false      
       @default = opts[:default] || nil
@@ -86,7 +86,7 @@ module MARCSpec
     # @return [Array<String>] An array of values returned by the custom method
     
     def raw_marc_values r, doc
-      return @module.send(@functionSymbol, doc, r, *@methodArgs)
+      return @module.send(@functionSymbol, doc, r, *@functionArgs)
     end
     
     
@@ -121,9 +121,9 @@ module MARCSpec
       PP.singleline_pp(@module, s)
       s.print(",\n :functionSymbol => ")
       PP.singleline_pp(@functionSymbol, s)
-      if @methodArgs
-        s.print(",\n :methodArgs => ")
-        PP.singleline_pp(@methodArgs, s)
+      if @functionArgs
+        s.print(",\n :functionArgs => ")
+        PP.singleline_pp(@functionArgs, s)
       end
       s.print "\n}"
       return  s.string

data/lib/marcspec.rb

@@ -1,4 +1,5 @@
 require 'logger'
+require 'marc4j4r'
 
 $LOG = Logger.new(STDOUT)
 $LOG.level = Logger::WARN
@@ -8,4 +9,24 @@ require "marcspec/solrfieldspec"
 require "marcspec/kvmap"
 require "marcspec/multivaluemap"
 require "marcspec/specset"
-require "marcspec/marcfieldspec"
+require "marcspec/marcfieldspec"
+
+
+# Build up a little module to include in MARC4J4R::Record that
+# gives us a way to cache computed values within the record itself
+# It's just a hash.
+
+module CacheSpot
+  def cacheadd k, v
+    @_cachespot ||= {}
+    @_cachespot[k] = v
+    return v
+  end
+  
+  def cacheget k
+    @_cachespot ||= {}
+    return @_cachespot[k]
+  end
+end
+
+MARC4J4R::Record.send(:include, CacheSpot)

data/spec/solrfieldspec_spec.rb

@@ -170,24 +170,24 @@ describe "CustomSolrSpec" do
   end
 
   it "accepts nil for no args" do
-    css = MARCSpec::CustomSolrSpec.new(:solrField=>'solrField', :module=>A::B, :functionSymbol=>:titleUp, :methodArgs=>nil)
+    css = MARCSpec::CustomSolrSpec.new(:solrField=>'solrField', :module=>A::B, :functionSymbol=>:titleUp, :functionArgs=>nil)
     css.marc_values(@one).should.equal [@one['245'].value.upcase]
   end
 
   
   it "uses a custom method with args but no map" do
-    css = MARCSpec::CustomSolrSpec.new(:solrField=>'solrField', :module=>A::B, :functionSymbol=>:titleUp, :methodArgs=>[['a', 'c']])
+    css = MARCSpec::CustomSolrSpec.new(:solrField=>'solrField', :module=>A::B, :functionSymbol=>:titleUp, :functionArgs=>[['a', 'c']])
     css.marc_values(@one).should.equal [@titleACValue.upcase]
   end
   
   it "works with a map" do
-    css = MARCSpec::CustomSolrSpec.new(:solrField=>'solrField', :map=>@map, :module=>A::B, :functionSymbol=>:titleUp, :methodArgs=>[['a', 'c']])
+    css = MARCSpec::CustomSolrSpec.new(:solrField=>'solrField', :map=>@map, :module=>A::B, :functionSymbol=>:titleUp, :functionArgs=>[['a', 'c']])
     css.marc_values(@one).should.equal [@mapValue]
   end
   
   it "works with a map that has multiple return values" do 
     @map[@titleACValue.upcase] = ['two', 'one']
-    css = MARCSpec::CustomSolrSpec.new(:solrField=>'solrField', :map=>@map, :module=>A::B, :functionSymbol=>:titleUp, :methodArgs=>[['a', 'c']])
+    css = MARCSpec::CustomSolrSpec.new(:solrField=>'solrField', :map=>@map, :module=>A::B, :functionSymbol=>:titleUp, :functionArgs=>[['a', 'c']])
     css.marc_values(@one).should.equal ['two', 'one']
   end
   

data/spec/specset_spec.rb

@@ -65,7 +65,7 @@ describe "SpecSet Basics" do
   end
   
   it "allows customs that reference previous work" do
-    @speclist << {:solrField=>'titleSort', :module=>A::B, :functionSymbol=>:sortable, :methodArgs=>['title']}
+    @speclist << {:solrField=>'titleSort', :module=>A::B, :functionSymbol=>:sortable, :functionArgs=>['title']}
     ss = MARCSpec::SpecSet.new
     ss.buildSpecsFromList(@speclist)
     h = ss.hash_from_marc @one

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: marcspec
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 7
   prerelease: false
   segments: 
   - 0
   - 7
-  - 1
-  version: 0.7.1
+  - 2
+  version: 0.7.2
 platform: ruby
 authors: 
 - BillDueber