purl_fetcher-client 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0fbb1d4ee923c8a04d013b372637f82b18c9a2fa433cf40792aec85152062f1
-  data.tar.gz: 01dad44de5ded0fd3206d7adb7be24d89103ce8cbafb3cf1aaa9abee51f8add8
+  metadata.gz: 97df63e9b1a234a5c89c948ca110180d6d9a620042e5280b036c15259a79d8ea
+  data.tar.gz: 50fd0e88ef00cc1da27d75c71fedffaac1a8beaf5d930280255bc878321e4c7e
 SHA512:
-  metadata.gz: 6c7daf20c0d96b891998a9a622d5ca05b319b2a1ff60da84a6200f536fd778ca91ed41b396aa688a7b5d4b4c40d62a56e5bf49366596539968fa4cf1dcb40e13
-  data.tar.gz: 5352c32604756a40e6d807e3c93b05321aeb4c67d1222fb6fe8b03b60e20ba15dffb16e40631b05ba15c1c1824749be9f0ec10d3f757623ff575e1da214a0417
+  metadata.gz: c72ac95809823377fa72cbb2f5b52fb11a4c3f69de2a17c250491a54b2b74549ddc1563cc0d5aa7170b07824a57c53afb348c4d29c03f771442dab64a7a87443
+  data.tar.gz: 41b9ef57041248734ff4f31e0bdd262e01018a618a4231f9f0b3c6b11dd65e8caa443a54b0ba48458b44fc7d17fba128d726f0d7e85935067021303ee85d4509

data/.github/workflows/ruby.yml

@@ -0,0 +1,27 @@
+name: CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  tests:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: 3.0
+    - uses: actions/cache@v2
+      with:
+        path: vendor/bundle
+        key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
+        restore-keys: |
+          ${{ runner.os }}-gems-
+    - name: Bundle install
+      run: bundle install
+    - name: Run tests
+      run: bundle exec rake

data/lib/purl_fetcher/client/public_xml_record.rb

@@ -1,15 +1,28 @@
 require 'nokogiri'
 require 'stanford-mods'
+require 'mods_display'
+require 'dor/rights_auth'
 
 module PurlFetcher::Client
   class PublicXmlRecord
+    include ModsDisplay::ModelExtension
+    include ModsDisplay::ControllerExtension
+
+    mods_xml_source do |model|
+      model.mods.to_s
+    end
+    configure_mods_display do
+    end
+
     attr_reader :druid, :options
 
     def self.fetch(url)
-      if defined?(Manticore)
-        Manticore.get(url).body
+      if defined?(JRUBY_VERSION)
+        response = Manticore.get(url)
+        response.body if response.code == 200
       else
-        HTTP.get(url).body
+        response = HTTP.get(url)
+        response.body if response.status.ok?
       end
     end
 
@@ -42,10 +55,18 @@ module PurlFetcher::Client
       end
     end
 
+    def mods_display
+      @mods_display ||= render_mods_display(self)
+    end
+
     def public_xml
       @public_xml ||= self.class.fetch(purl_base_url + "/#{druid}.xml")
     end
 
+    def public_xml?
+      !!public_xml
+    end
+
     def public_xml_doc
       @public_xml_doc ||= Nokogiri::XML(public_xml)
     end
@@ -54,7 +75,7 @@ module PurlFetcher::Client
       @mods ||= if public_xml_doc.xpath('/publicObject/mods:mods', mods: 'http://www.loc.gov/mods/v3').any?
         public_xml_doc.xpath('/publicObject/mods:mods', mods: 'http://www.loc.gov/mods/v3').first
       else
-        self.class.fetch(purl_base_url + "#{druid}.mods")
+        self.class.fetch(purl_base_url + "/#{druid}.mods")
       end
     end
 
@@ -111,16 +132,22 @@ module PurlFetcher::Client
 
      def collections
        @collections ||= predicate_druids('isMemberOfCollection').map do |druid|
-         PublicXmlRecord.new(druid, settings)
+         PublicXmlRecord.new(druid, options)
        end
      end
 
      def constituents
        @constituents ||= predicate_druids('isConstituentOf').map do |druid|
-         PublicXmlRecord.new(druid, settings)
+         PublicXmlRecord.new(druid, options)
        end
      end
 
+     def items(&block)
+       return [] unless is_collection
+
+       purl_fetcher_client.collection_members(druid, &block)
+     end
+
      # the thumbnail in publicXML properly URI encoded, including the slash separator
      # @return [String] thumb filename with druid prepended, e.g. oo000oo0001%2Ffilename%20withspace.jp2
     def encoded_thumb
@@ -128,7 +155,7 @@ module PurlFetcher::Client
       return unless thumb
       thumb_druid=thumb.split('/').first # the druid (before the first slash)
       thumb_filename=thumb.split(/[a-zA-Z]{2}[0-9]{3}[a-zA-Z]{2}[0-9]{4}[\/]/).last # everything after the druid
-      "#{thumb_druid}%2F#{URI.escape(thumb_filename)}"
+      "#{thumb_druid}%2F#{ERB::Util.url_encode(thumb_filename)}"
     end
 
     # get the druids from predicate relationships in rels-ext from public_xml
@@ -142,8 +169,39 @@ module PurlFetcher::Client
       end
     end
 
+    def druid_tree
+      druid.match(/(..)(...)(..)(....)/).captures.join('/')
+    end
+
+    def rights_xml
+      @rights_xml ||= public_xml_doc.xpath('//rightsMetadata').to_s
+    end
+
+    def rights
+      @rights ||= ::Dor::RightsAuth.parse(rights_xml)
+    end
+
+    def public?
+      rights.world_unrestricted?
+    end
+
+    def stanford_only?
+      rights.stanford_only_unrestricted?
+    end
+
     def purl_base_url
-      options[:purl_url] || 'https://purl.stanford.edu'
+      options[:purl_url]&.sub(%r{/$}, '') || 'https://purl.stanford.edu'
+    end
+
+    def purl_fetcher_api_endpoint
+      options[:purl_fetcher_url] || 'https://purl-fetcher.stanford.edu'
+    end
+
+    def purl_fetcher_client
+      @purl_fetcher_client ||= PurlFetcher::Client::Reader.new(
+        nil,
+        'purl_fetcher.api_endpoint' => purl_fetcher_api_endpoint
+      )
     end
   end
 end

data/lib/purl_fetcher/client/reader.rb

@@ -20,6 +20,14 @@ class PurlFetcher::Client::Reader
     end
   end
 
+  def collection_members(druid)
+    return to_enum(:collection_members, druid) unless block_given?
+
+    paginated_get("/collections/druid:#{druid.sub(/^druid:/, '')}/purls", 'purls').each do |obj, _meta|
+      yield PurlFetcher::Client::PublicXmlRecord.new(obj['druid'].sub('druid:', ''), settings), obj, self
+    end
+  end
+
   private
 
   def first_modified

data/lib/purl_fetcher/client/version.rb

@@ -1,5 +1,5 @@
 module PurlFetcher
   module Client
-    VERSION = "0.3.0"
+    VERSION = "0.4.0"
   end
 end

data/purl_fetcher-client.gemspec

@@ -23,8 +23,10 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'http'
   spec.add_dependency 'nokogiri'
   spec.add_dependency 'stanford-mods'
+  spec.add_dependency 'dor-rights-auth'
+  spec.add_dependency 'mods_display'
 
   spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", "~> 3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: purl_fetcher-client
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Chris Beer
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-05-30 00:00:00.000000000 Z
+date: 2021-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -52,6 +52,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: dor-rights-auth
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mods_display
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -70,16 +98,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -94,16 +122,16 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-description: 
+description:
 email:
 - cabeer@stanford.edu
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - README.md
@@ -116,10 +144,10 @@ files:
 - lib/purl_fetcher/client/reader.rb
 - lib/purl_fetcher/client/version.rb
 - purl_fetcher-client.gemspec
-homepage: 
+homepage:
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -134,8 +162,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Traject-compatible reader implementation for streaming data from purl-fetcher
 test_files: []

data/.travis.yml

@@ -1,7 +0,0 @@
----
-sudo: false
-language: ruby
-cache: bundler
-rvm:
-  - 2.4.1
-before_install: gem install bundler -v 1.16.3