umlaut-primo 0.1.0 → 0.1.2

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZDZiNzE1ZTk1MDQ4MDlkNGUyZDA5NjBmMTFmNWFjYzQ4NzQzODg3Yw==
+  data.tar.gz: !binary |-
+    NTQxYjAyZmUxNDNmYjM0ZWVlOTljZDU4MzY2Zjk3NDVjYjQ0MjJhYg==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    MzhmZmE1ZmEyZjZmYzViN2RhODQ1YzNiNDBmYTBhOWZiYWFjYTZlOTc4YmYx
+    MjQzZDcyZmJkZmI0ZmU0NDM1NTYzYjA1YTRkNWVjYWUxYzkzMzgwMTMyZTNj
+    NjU4ZjFkZTg0NDJiY2U0Njg2NWE1MmZkNmE1YmQxNmJhMzFlZjE=
+  data.tar.gz: !binary |-
+    NjM2YThlYzEyN2RhZmE5NDM3ZDYzNDcyMTI4N2VlZDUzOTIzNzBiMWEwZmIz
+    NGFlZWNjNjA1YTE5OTlkZjBlYzNmNzg0ZThiYjhmZDIwODBkMmUyMzMwMTlj
+    ZWUxMzVhMTNjMjRkNDA0NDg5YTNkNWIyMjgwNzRmOTlmMjc1YTY=

data/Rakefile

@@ -4,26 +4,9 @@ begin
 rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
-begin
-  require 'rdoc/task'
-rescue LoadError
-  require 'rdoc/rdoc'
-  require 'rake/rdoctask'
-  RDoc::Task = Rake::RDocTask
-end
-
-RDoc::Task.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'Umlaut Primo Service Adaptor'
-  rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.rdoc')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
 Bundler::GemHelper.install_tasks
 
 require 'rake/testtask'
-
 Rake::TestTask.new(:test) do |t|
   t.libs << 'lib'
   t.libs << 'test'
@@ -31,5 +14,4 @@ Rake::TestTask.new(:test) do |t|
     'test/**/*_test.rb', 'test/**/**/*_test.rb']
   t.verbose = false
 end
-
-task :default => :test
+task :default => :test

data/lib/umlaut_primo/primo_service.rb

@@ -79,7 +79,7 @@
 #             used in the case where an ezproxy prefix (on any other regexp) is hardcoded in the URL,
 #             and needs to be removed in order to match against SFXUrls.
 #             Example:
-#                 !ruby/regexp '/https\:\/\/ezproxy\.library\.nyu\.edu\/login\?url=/'
+#                 !ruby/regexp '/https\:\/\/ezproxy\.library\.edu\/login\?url=/'
 # primo_config::  _optional_ string representing the primo yaml config file in config/
 #             default file name: primo.yml
 #             hash mappings from yaml config
@@ -181,23 +181,23 @@ class PrimoService < Service
     #   ISBN OR
     #   ISSN OR
     #   Title and author and genre
-    if @record_id
+    if((not @record_id.blank?))
       search.record_id! @record_id
-    elsif @isbn
+    elsif((not @isbn.blank?))
       search.isbn_is @isbn
-    elsif @issn
+    elsif((not @issn.blank?))
       search.isbn_is @issn
-    elsif @title and @author and @genre
-      search.title_is(@title).creator_is(@author).genre_is(@genre)
+    elsif((not @title.blank?) and (not @author.blank?) and (not @genre.blank?))
+      search.title_is(@title).creator_is(@author).any_is(@genre)
     else # Don't do a search.
       return request.dispatched(self, true)
     end
 
     begin
       records = search.records
-      # Enhance the referent with metadata from Primo Searcher if Primo record id is present
-      # i.e. if we did our search with the Primo system number
-      if @record_id and @service_types.include?("referent_enhance")
+      # Enhance the referent with metadata from Primo Searcher if Primo record id, ISSN
+      # or ISBN is present i.e. if we did our search with a Primo ID number
+      if (not (@record_id.blank? and @issn.blank? and @isbn.blank?)) and @service_types.include?("referent_enhance")
         # We'll take the first record, since there should only be one.
         enhance_referent(request, records.first)
       end

data/lib/umlaut_primo/version.rb

@@ -1,3 +1,3 @@
 module UmlautPrimo
-  VERSION = "0.1.0"
+  VERSION = "0.1.2"
 end