openaccess-apc 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e052242ed7b781cea0a4d318ecb246c4af62c022
-  data.tar.gz: afa2a441d87730981498dcbd9f589ecd56f2723e
+  metadata.gz: a698e7c44a9866af8f475583905dbb70337678ad
+  data.tar.gz: 02ce906ba42fa03dea06ec3b9f171d6070d5bf68
 SHA512:
-  metadata.gz: ff34a37d56c2c8eb51642c6ef9a09e6e8d50090d95fa91b51a19d1ce75e4e3f8dec3ce75150a4ff8504cf9439d6db2ea00aa0936422b4d9c56753ec7cb674256
-  data.tar.gz: 00bc92546e0af2a73b4c37b711de361a8977bee04052d110547fa9772a9191c9e6d7a65aceec41b98b044ad5c24f08f864812e27ba635d87de06d9807dacf493
+  metadata.gz: 1c21a83d25ad8d8548142c1a6314216170f14e74dec2e26ce4b02beb8103f29303fa5081375a146ebd1118a5cf94c5473c87e2f8bbf4c4d3c014cf295dd528f6
+  data.tar.gz: c225213087854008087fba073508955f313083950d436594bbb63dd3bd141728b5ba70f5c99b7c4518adede734621affe95bf083e8c5ad271eac724cddfcfb97

data/lib/openaccess/apc.rb

@@ -86,7 +86,7 @@ module Puree
         params = {
           'associatedPersonUuids.uuid' => uuid,
           'rendering' => :system,
-          'window.size' => limit.to_s,
+          'window.size' => (limit || 5).to_s,
           'window.offset' => (opts[:offset] || 0).to_s
         }
         self.class.query_params(params, **opts)
@@ -190,13 +190,12 @@ module OpenAccess
     # @option opts [Date, DateTime, String, Time] :created_start include
     #   publications deposited on or after this date
     # @option opts [Integer, String] the Pure employee ID
-    # @option opts [Integer] :results the number of eligible publications
-    #   required
+    # @return [Array<Hash>] the publications
     def self.publications_for_person(username = nil, **opts)
       person_uuid = person(username, employee_id: opts[:employee_id])
       publications_criteria(opts)
       pubs = @person_query.publications_extended(uuid: person_uuid, **opts)
-      publications_summary(pubs[0..opts[:results]])
+      publications_summary(pubs)
     end
 
     # Private helpers
@@ -243,20 +242,19 @@ module OpenAccess
         workflow_state: pub.workflow_state
       }
     end
+    # rubocop:enable Metrics/MethodLength
     private_class_method :publication_summary
 
     # Sets the Puree person query criteria in an options hash
     # @param opts [Hash] the options hash
     # @return [Hash] the options hash
     def self.publications_criteria(opts)
-      opts[:results] ||= 5
-      opts[:limit] ||= opts[:results] * 10
+      opts[:limit] ||= 5
       opts[:order_by] = ['-created']
-      # End date defaults to today; start date defaults to 6 months before end
-      end_date = to_date(opts[:created_date_end], Date.today)
-      start_date = to_date(opts[:created_date_start], end_date - 183)
-      opts[:created_end] = end_date.to_s # YYYY-MM-DD
-      opts[:created_start] = start_date.to_s
+      end_date = to_date(opts[:created_date_end])
+      start_date = to_date(opts[:created_date_start])
+      opts[:created_end] = end_date.to_s if end_date # YYYY-MM-DD
+      opts[:created_start] = start_date.to_s if start_date
       opts
     end
     private_class_method :publications_criteria
@@ -276,6 +274,7 @@ module OpenAccess
     # @param date [Object] the date representation
     # @param default [Date, nil] the default value if no date is supplied or
     #   string parsing fails
+    # @return [Date] the date instance
     def self.to_date(date = nil, default = nil)
       return default if date.nil? || date.empty?
       return date if date.is_a?(Date)

data/lib/openaccess/apc/version.rb

@@ -1,5 +1,5 @@
 module OpenAccess
   module APC
-    VERSION = '0.2.1'.freeze
+    VERSION = '0.2.2'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openaccess-apc
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Digital Innovation, Lancaster University Library
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-23 00:00:00.000000000 Z
+date: 2017-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ldap