borrow_direct 1.0.3 → 1.0.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTdkNTczZjRiY2FlYWQ3OWJiYzkyMGNlYzg5YTg1NGMzMjhlMTBhOA==
+    OTY4MWZjYWFkNWZlM2UyNzQxMWQ3M2E0OTcwZGY2MjBlMTlkZDI5ZQ==
   data.tar.gz: !binary |-
-    ZWFjNzMyMjdkODIyNjY5Y2U4NDZmY2Y2MjFiODY4MDJlMGQ0N2ZkOA==
+    YjQ5OTI1N2NjNGQzZjQ3Njc4NGQ0ZmE0MTlmNzY1NjA0ODlmNmIzYw==
 SHA512:
   metadata.gz: !binary |-
-    MTNiZWNlMWVkYTA5OTIzNDA4Mzc3NDlkZDQ4MjhkYzMzZDdhNjVlZDQzM2Yz
-    N2YzNGYzMjFlMmZkZmM1MDI2YjE2NWE5OTllYjAwZjY2NjcwYjg1MzI0NTY0
-    YzcxMTQ1MDZkN2FjMWQ3YjFhODUyY2JjNGRkZGJmY2YxZGVlNjc=
+    YzVhYmY2OTg2ZDg1ZmI5ZjMwOTIwYWNiYmQ1MzUwZDBiZWZhZjhmNjAxOWQ5
+    OWNkYWFjZWY3ZDNlN2ZhMmYyNDI0OWFkMzQwMmE4MWQ0NTZhY2IxNjg2ZTBk
+    OGE4M2RhYmM2MGRjMmNlNzQ2ZjA4ZTEyNjhjNDllN2UxOWRlMjQ=
   data.tar.gz: !binary |-
-    MDM4Yjg1Y2UzNDUwNjIwMWRlOGJkMGRjM2IzNjIxODJkOTdkYTU1MGI1NWIx
-    OTY3NjM5YTFhYWI1NmJjMGUzODU4MDZjYjYzMTdmYjQ3YzZhMTUxM2RjYjcw
-    MWU4NTU1ZDEyYjRmMzMwMmE4MWMyNTQ1ZTU5NjEwMDQwODJhMjg=
+    OGU0YTdiMDY3ZGE5ZDI3MjQxNjJiNTFlZjgxMzcwZjc3OWExN2UyYzAwNTVl
+    NzM0NmM5ZWI0Y2EyZjVjMTliMDg3MjAxZDkxY2FhMDFkMzc0NTNhNjhkMTlh
+    MzcyNzVlMjdiZDU3ZmE4NDRhMjY5ZTZjZjAyZjBkYmNiOTg3OGQ=

data/lib/borrow_direct/generate_query.rb

@@ -4,6 +4,8 @@ module BorrowDirect
   # Generate a "deep link" to query results in BD's native
   # HTML interface. 
   class GenerateQuery
+    PUNCT_STRIP_REGEX = /[[:space:]\)\(\]\[\;\:\.\,\\\/\"\<\>\!]/
+
     attr_accessor :url_base
 
     # Hash from our own API argument to BD field code
@@ -100,18 +102,10 @@ module BorrowDirect
       title.sub!(/[\:\;](.*)$/, '')
 
 
-      # We want to remove anything that isn't a letter, number, or apostrophe.
-      # Other punctuation and weird chars don't help our query.
-      # We want to do it in a way that's unicode-aware.
-      #
-      # This is harder than expected, as ruby regex unicode-aware character
-      # classes don't seem to handle combining diacritics well.
-      #
-      # This crazy way does it, replace anything that matches unicode
-      # space (may include more than just ascii ' ') or punct class, unless 
-      # it's an apostrophe or an ampersand, which are allowed --
-      # and replaces them with plain ascii space.
-      title.gsub!(/[[:space:][:punct:]&&[^\'\&]]/, ' ')
+      # We want to remove some punctuation that is better
+      # turned into a space in the query. Along with
+      # any kind of unicode space, why not. 
+      title.gsub!(PUNCT_STRIP_REGEX, ' ')
 
       # compress any remaining whitespace
       title.strip!
@@ -130,15 +124,32 @@ module BorrowDirect
 
     # Lowercase, and try to get just the last name out of something
     # that looks like a cataloging authorized heading. 
+    #
+    # Try to remove leading 'by' stuff when we're getting a 245c
     def normalized_author(author)
+
       return "" if author.nil? || author.empty?
 
       author = author.downcase
-      # Just take everything before the comma if we have one
-      if author =~ /\A(.*),/
+      # Just take everything before the comma if we have one --
+      # or before an "and", for stripping individuals out of 245c
+      # multiples. 
+      if author =~ /\A(.*)(,|\sand\s)/
         author = $1
       end
 
+
+      author.gsub!(/\A.*by\s*/, '')
+
+      # We want to remove some punctuation that is better
+      # turned into a space in the query. Along with
+      # any kind of unicode space, why not. 
+      author.gsub!(PUNCT_STRIP_REGEX, ' ')
+
+      # compress any remaining whitespace
+      author.strip!
+      author.gsub!(/\s+/, ' ')
+
       return author
     end
 

data/lib/borrow_direct/version.rb

@@ -1,3 +1,3 @@
 module BorrowDirect
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

data/test/generate_query_test.rb

@@ -141,11 +141,29 @@ describe "GenerateQuery" do
       assert_equal "vel#{a_acute_combined}squez's stuff", normalized_title
     end
 
+    it "preserves apostrophes" do
+      assert_equal "c l r james's caribbean", @generator.normalized_title("C L R James's Caribbean")
+    end 
+
     it "allows ampersands" do
       assert_equal "x & y", @generator.normalized_title("x & y")
     end
 
 
+    it "gets author reasonably out of some 245c type things" do
+      assert_equal "edward foster", @generator.normalized_author("edited by Edward Foster")
+      assert_equal "edward foster", @generator.normalized_author("by Edward Foster")
+
+      assert_equal "leonard diepeveen", @generator.normalized_author("edited by Leonard Diepeveen.")
+
+      assert_equal "amalia avramidou", @generator.normalized_author("edited by Amalia Avramidou and Denise Demetriou.")
+      assert_equal "james elkins", @generator.normalized_author("edited by James Elkins and Robert Williams.")
+
+      # Hmm, should we really be stripping those periods? Not sure, but seems
+      # to do okay in searching. 
+      assert_equal "h a shapiro", @generator.normalized_author("edited by H.A. Shapiro.")
+    end
+
 
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: borrow_direct
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Jonathan Rochkind
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-18 00:00:00.000000000 Z
+date: 2015-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient