puree 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92900cf287eee283a00fc51d36aacdf62b6c0ef7
-  data.tar.gz: b3a7ea09d42501087a1bb86cd019d1ccbc6e0971
+  metadata.gz: 5aa6af3718ebb33cd7b19ef9142cb73b4a5d0f5c
+  data.tar.gz: b0c01d0104f64d84b9b28a8fca142d9c6fec9165
 SHA512:
-  metadata.gz: e0950129f4825a69f43286e5b6a933e0213e7ac48a99dfcd9cb8305d7c88f464b56472fad809d0b8eee68847d8b5b3decd16bdf4a911f3c23b037e51abff40f0
-  data.tar.gz: b61ec2735dc14cbdc196ad5049e4293f4f4972d5a5d0dac27d257af868ac20178be9e2e8682fd19bdcbbdafd7b60214bfecf9a0726cfe149454463f5d7fc9c4c
+  metadata.gz: a3772603849fb583fcbcc48b9d2343d06c64d17fc2d239d687556e7579804704e1b498cf568285ac49d3bd96669077644a80df3725fae21ed6a39a9fe2b4d85f
+  data.tar.gz: f5906459dedcc2ce1693e6d33d862b300196c4bc551c9bfec2e24b946fae4eacd2ac494e7a7ee8f918a3892708e317ab0ff4ee160496d4f5e30915aa21ed573c

data/CHANGELOG.md

@@ -5,13 +5,17 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ## Unreleased
 - Metadata: activity?, clipping?, externalPerson?
 
+## 1.3.0 - 2017-04-03
+### Added
+- Publication type - JournalArticle, Paper, ConferencePaper.
+
 ## 1.2.0 - 2017-03-31
 ### Added
 - Publication - language, owner, translated_title, translated_subtitle.
 - Publication types - Doctoral Thesis and Master's Thesis.
 
 ### Changed
-- Publication - common attribute set established. doi, event, pages become mixins
+- Publication - common attributes established. doi, event, pages become mixins
 for publication types.
 
 ## 1.1.0 - 2017-03-24

data/lib/puree.rb

@@ -17,13 +17,21 @@ require 'puree/xml_extractor/journal'
 require 'puree/xml_extractor/organisation'
 require 'puree/xml_extractor/person'
 require 'puree/xml_extractor/project'
-require 'puree/xml_extractor/publication'
+
 require 'puree/xml_extractor/mixins/doi_mixin'
 require 'puree/xml_extractor/mixins/event_mixin'
 require 'puree/xml_extractor/mixins/pages_mixin'
+require 'puree/xml_extractor/mixins/page_range_mixin'
+require 'puree/xml_extractor/mixins/peer_reviewed_mixin'
+require 'puree/xml_extractor/publication'
 require 'puree/xml_extractor/thesis'
 require 'puree/xml_extractor/doctoral_thesis'
 require 'puree/xml_extractor/masters_thesis'
+require 'puree/xml_extractor/journal_article'
+require 'puree/xml_extractor/paper_base'
+require 'puree/xml_extractor/conference_paper'
+require 'puree/xml_extractor/paper'
+
 require 'puree/xml_extractor/publisher'
 require 'puree/xml_extractor/server'
 
@@ -41,14 +49,21 @@ require 'puree/model/download_header'
 require 'puree/model/event'
 require 'puree/model/event_header'
 require 'puree/model/journal'
+require 'puree/model/journal_header'
 require 'puree/model/link'
 require 'puree/model/organisation'
 require 'puree/model/person'
 require 'puree/model/project'
+
 require 'puree/model/publication'
 require 'puree/model/thesis'
 require 'puree/model/doctoral_thesis'
 require 'puree/model/masters_thesis'
+require 'puree/model/journal_article'
+require 'puree/model/paper_base'
+require 'puree/model/conference_paper'
+require 'puree/model/paper'
+
 require 'puree/model/publisher'
 require 'puree/model/related_content_header'
 require 'puree/model/spatial_point'
@@ -72,10 +87,16 @@ require 'puree/extractor/journal'
 require 'puree/extractor/organisation'
 require 'puree/extractor/person'
 require 'puree/extractor/project'
+
 require 'puree/extractor/publication'
 require 'puree/extractor/thesis'
 require 'puree/extractor/doctoral_thesis'
 require 'puree/extractor/masters_thesis'
+require 'puree/extractor/journal_article'
+require 'puree/extractor/paper_base'
+require 'puree/extractor/conference_paper'
+require 'puree/extractor/paper'
+
 require 'puree/extractor/publisher'
 require 'puree/extractor/collection'
 require 'puree/extractor/download'

data/lib/puree/extractor/conference_paper.rb

@@ -0,0 +1,26 @@
+module Puree
+  module Extractor
+
+    # Conference paper extractor.
+    #
+    class ConferencePaper < Puree::Extractor::PaperBase
+
+      # @option (see Puree::Extractor::Resource#initialize)
+      def initialize(config)
+        set_model_type 'conference_paper'
+        super
+      end
+
+      private
+
+      def combine_metadata
+        super
+
+        @model.event = @extractor.event
+        @model
+      end
+
+    end
+
+  end
+end

data/lib/puree/extractor/journal_article.rb

@@ -0,0 +1,32 @@
+module Puree
+  module Extractor
+
+    # Journal article extractor.
+    #
+    class JournalArticle < Puree::Extractor::Publication
+
+      # @option (see Puree::Extractor::Resource#initialize)
+      def initialize(config)
+        set_model_type 'journal_article'
+        super
+      end
+
+      private
+
+      def combine_metadata
+        super
+
+        @model.article_number = @extractor.article_number
+        @model.issue = @extractor.issue
+        @model.journal = @extractor.journal
+        @model.pages = @extractor.pages
+        @model.page_range = @extractor.page_range
+        @model.peer_reviewed = @extractor.peer_reviewed
+        @model.volume = @extractor.volume
+        @model
+      end
+
+    end
+
+  end
+end

data/lib/puree/extractor/paper.rb

@@ -0,0 +1,23 @@
+module Puree
+  module Extractor
+
+    # Paper extractor.
+    #
+    class Paper < Puree::Extractor::PaperBase
+
+      # @option (see Puree::Extractor::Resource#initialize)
+      def initialize(config)
+        set_model_type 'paper'
+        super
+      end
+
+      private
+
+      def combine_metadata
+        super
+      end
+
+    end
+
+  end
+end

data/lib/puree/extractor/paper_base.rb

@@ -0,0 +1,28 @@
+module Puree
+  module Extractor
+
+    # Paper base extractor.
+    # Do not use directly.
+    #
+    class PaperBase < Puree::Extractor::Publication
+
+      # @option (see Puree::Extractor::Resource#initialize)
+      def initialize(config)
+        super
+      end
+
+      private
+
+      def combine_metadata
+        super
+
+        @model.pages = @extractor.pages
+        @model.page_range = @extractor.page_range
+        @model.peer_reviewed = @extractor.peer_reviewed
+        @model
+      end
+
+    end
+
+  end
+end

data/lib/puree/extractor/publication.rb

@@ -17,16 +17,20 @@ module Puree
       def combine_metadata
         super
 
+        @model.bibliographical_note = @extractor.bibliographical_note
         @model.category = @extractor.category
         @model.description = @extractor.description
+        @model.dois = @extractor.dois
         @model.files = @extractor.files
         @model.keywords = @extractor.keywords
         @model.language = @extractor.language
+        @model.links = @extractor.links
         @model.organisations = @extractor.organisations
         @model.owner = @extractor.owner
         @model.persons_internal = @extractor.persons_internal
         @model.persons_external = @extractor.persons_external
         @model.persons_other = @extractor.persons_other
+        @model.publication_place = @extractor.publication_place
         @model.publisher = @extractor.publisher
         @model.statuses = @extractor.statuses
         @model.subtitle = @extractor.subtitle

data/lib/puree/model/conference_paper.rb

@@ -0,0 +1,13 @@
+module Puree
+  module Model
+
+    # A conference paper.
+    #
+    class ConferencePaper < Puree::Model::PaperBase
+
+      # @return [Puree::Model::EventHeader, nil]
+      attr_accessor :event
+
+    end
+  end
+end

data/lib/puree/model/journal_article.rb

@@ -0,0 +1,31 @@
+module Puree
+  module Model
+
+    # A journal article.
+    #
+    class JournalArticle < Puree::Model::Publication
+
+      # @return [Fixnum, nil]
+      attr_accessor :article_number
+
+      # @return [Puree::Model::JournalHeader, nil]
+      attr_accessor :journal
+
+      # @return [Fixnum, nil]
+      attr_accessor :issue
+
+      # @return [Fixnum, nil]
+      attr_accessor :pages
+
+      # @return [String, nil]
+      attr_accessor :page_range
+
+      # @return [Boolean, nil]
+      attr_accessor :peer_reviewed
+
+      # @return [Fixnum, nil]
+      attr_accessor :volume
+
+    end
+  end
+end

data/lib/puree/model/journal_header.rb

@@ -0,0 +1,34 @@
+module Puree
+  module Model
+
+    # A minimal representation of a journal.
+    #
+    class JournalHeader < Puree::Model::Structure
+
+      # @return [String, nil]
+      attr_reader :uuid
+
+      # @return [String, nil]
+      attr_reader :title
+
+      # @return [String, nil]
+      attr_reader :type
+
+      # @param v [String]
+      def uuid=(v)
+        @uuid = v if v && !v.empty?
+      end
+
+      # @param v [String]
+      def title=(v)
+        @title = v if v && !v.empty?
+      end
+
+      # @param v [String]
+      def type=(v)
+        @type = v if v && !v.empty?
+      end
+
+    end
+  end
+end

data/lib/puree/model/paper.rb

@@ -0,0 +1,10 @@
+module Puree
+  module Model
+
+    # A paper.
+    #
+    class Paper < Puree::Model::PaperBase
+
+    end
+  end
+end

data/lib/puree/model/paper_base.rb

@@ -0,0 +1,19 @@
+module Puree
+  module Model
+
+    # A base paper.
+    #
+    class PaperBase < Puree::Model::Publication
+
+      # @return [Fixnum, nil]
+      attr_accessor :pages
+
+      # @return [String, nil]
+      attr_accessor :page_range
+
+      # @return [Boolean, nil]
+      attr_accessor :peer_reviewed
+
+    end
+  end
+end

data/lib/puree/model/publication.rb

@@ -5,12 +5,18 @@ module Puree
     #
     class Publication < Resource
 
+      # @return [String, nil]
+      attr_accessor :bibliographical_note
+
       # @return [String, nil]
       attr_accessor :category
 
       # @return [String, nil]
       attr_accessor :description
 
+      # @return [Array<String>]
+      attr_accessor :dois
+
       # @return [Array<Puree::Model::File>]
       attr_accessor :files
 
@@ -20,6 +26,9 @@ module Puree
       # @return [String, nil]
       attr_accessor :language
 
+      # @return [Array<String>]
+      attr_accessor :links
+
       # @return [Array<Puree::Model::OrganisationHeader>]
       attr_accessor :organisations
 
@@ -35,6 +44,9 @@ module Puree
       # @return [Array<Puree::Model::EndeavourPerson>]
       attr_accessor :persons_other
 
+      # @return [String, nil]
+      attr_accessor :publication_place
+
       # @return [String, nil]
       attr_accessor :publisher
 

data/lib/puree/model/thesis.rb

@@ -14,7 +14,7 @@ module Puree
       # @return [String, nil]
       attr_accessor :doi
 
-      # # @return [Fixnum, nil]
+      # @return [Fixnum, nil]
       attr_accessor :pages
 
       # @return [String, nil]

data/lib/puree/version.rb

@@ -1,5 +1,5 @@
 module Puree
   # Semantic version number
   #
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

data/lib/puree/xml_extractor/conference_paper.rb

@@ -0,0 +1,15 @@
+module Puree
+  module XMLExtractor
+
+    # Conference paper XML extractor.
+    #
+    class ConferencePaper < Puree::XMLExtractor::PaperBase
+      include Puree::XMLExtractor::EventMixin
+
+      def initialize(xml:)
+        super
+      end
+
+    end
+  end
+end

data/lib/puree/xml_extractor/journal_article.rb

@@ -0,0 +1,48 @@
+module Puree
+  module XMLExtractor
+
+    # Journal article XML extractor.
+    #
+    class JournalArticle < Puree::XMLExtractor::Publication
+      include Puree::XMLExtractor::PagesMixin
+      include Puree::XMLExtractor::PageRangeMixin
+      include Puree::XMLExtractor::PeerReviewedMixin
+
+      def initialize(xml:)
+        super
+      end
+
+      # @return [Fixnum, nil]
+      def article_number
+        xpath_query_for_single_value('/articleNumber')
+      end
+
+      # @return [Fixnum, nil]
+      def issue
+        xpath_result = xpath_query_for_single_value('/journalNumber')
+        xpath_result ? xpath_result.to_i : nil
+      end
+
+      # @return [Puree::Model::JournalHeader, nil]
+      def journal
+        xpath_result = xpath_query '/journal'
+        if !xpath_result.empty?
+          header = Puree::Model::JournalHeader.new
+          header.title = xpath_result.xpath('title').text.strip
+          journal = xpath_result.xpath('journal')
+          header.type = journal.xpath('typeClassification/term/localizedString').text.strip
+          header.uuid = journal.attr('uuid').text.strip
+          return header
+        end
+        nil
+      end
+
+      # @return [Fixnum, nil]
+      def volume
+        xpath_result = xpath_query_for_single_value('/volume')
+        xpath_result ? xpath_result.to_i : nil
+      end
+
+    end
+  end
+end

data/lib/puree/xml_extractor/mixins/page_range_mixin.rb

@@ -0,0 +1,18 @@
+module Puree
+
+  module XMLExtractor
+
+    # Page range mixin.
+    #
+    module PageRangeMixin
+
+      # @return [String, nil]
+      def page_range
+        xpath_result = xpath_query_for_single_value('/pages')
+        xpath_result ? xpath_result : nil
+      end
+
+    end
+
+  end
+end

data/lib/puree/xml_extractor/mixins/peer_reviewed_mixin.rb

@@ -0,0 +1,20 @@
+module Puree
+
+  module XMLExtractor
+
+    # Peer reviewed extractor mixin.
+    #
+    module PeerReviewedMixin
+
+      # @return [Boolean, nil]
+      def peer_reviewed
+        xpath_result = xpath_query_for_single_value('/peerReview/peerReviewed')
+        return true if xpath_result === 'true'
+        return false if xpath_result === 'false'
+        nil
+      end
+
+    end
+
+  end
+end

data/lib/puree/xml_extractor/paper.rb

@@ -0,0 +1,14 @@
+module Puree
+  module XMLExtractor
+
+    # Paper XML extractor.
+    #
+    class Paper < Puree::XMLExtractor::PaperBase
+
+      def initialize(xml:)
+        super
+      end
+
+    end
+  end
+end

data/lib/puree/xml_extractor/paper_base.rb

@@ -0,0 +1,17 @@
+module Puree
+  module XMLExtractor
+
+    # Paper base XML extractor.
+    #
+    class PaperBase < Puree::XMLExtractor::Publication
+      include Puree::XMLExtractor::PagesMixin
+      include Puree::XMLExtractor::PageRangeMixin
+      include Puree::XMLExtractor::PeerReviewedMixin
+
+      def initialize(xml:)
+        super
+      end
+
+    end
+  end
+end

data/lib/puree/xml_extractor/publication.rb

@@ -11,6 +11,11 @@ module Puree
         super
       end
 
+      # @return [String, nil]
+      def bibliographical_note
+        xpath_query_for_single_value('/bibliographicalNote')
+      end
+
       # @return [String, nil]
       def category
         xpath_query_for_single_value '/publicationCategory/publicationCategory/term/localizedString'
@@ -21,6 +26,11 @@ module Puree
         xpath_query_for_single_value '/abstract/localizedString'
       end
 
+      # @return [Array<String>, nil]
+      def dois
+        xpath_query_for_multi_value '/electronicVersionAssociations/electronicVersionDOIAssociations/electronicVersionDOIAssociation/doi'
+      end
+
       # @return [Array<Puree::Model::File>]
       def files
         xpath_result = xpath_query '/electronicVersionAssociations/electronicVersionFileAssociations/electronicVersionFileAssociation'
@@ -55,6 +65,11 @@ module Puree
         xpath_query_for_single_value '/language/term/localizedString'
       end
 
+      # @return [Array<String>, nil]
+      def links
+        xpath_query_for_multi_value '/electronicVersionAssociations/electronicVersionLinkAssociations/electronicVersionLinkAssociation/link'
+      end
+
       # @return [Array<Puree::Model::OrganisationHeader>]
       def organisations
         xpath_result = xpath_query '/organisations/association/organisation'
@@ -82,9 +97,20 @@ module Puree
         persons 'other'
       end
 
+      # @return [String, nil]
+      def publication_place
+        # handles variations in path
+        xpath_result = xpath_query_for_single_value '/associatedPublisher/placeOfPublication'
+        xpath_result = xpath_query_for_single_value '/associatedPublishers/placeOfPublication' if !xpath_result
+        xpath_result
+      end
+
       # @return [String, nil]
       def publisher
-        xpath_query_for_single_value '/associatedPublisher/publisher/name'
+        # handles variations in path
+        xpath_result = xpath_query_for_single_value '/associatedPublisher/publisher/name'
+        xpath_result = xpath_query_for_single_value '/associatedPublishers/publisher/name' if !xpath_result
+        xpath_result
       end
 
       # @return [Array<Puree::Model::PublicationStatus>]

data/spec/resource/dataset_http_spec.rb

@@ -55,6 +55,10 @@ describe 'Dataset' do
       expect(@p.links).to all( be_a Puree::Model::Link )
     end
 
+    it '#owner' do
+      expect(@p.owner).to be_a Puree::Model::OrganisationHeader if @p.owner
+    end
+
     it '#persons_internal' do
       expect(@p.persons_internal).to all( be_a Puree::Model::EndeavourPerson )
     end

data/spec/resource/publication_http_spec.rb

@@ -25,14 +25,6 @@ describe 'Publication' do
       expect(@p.description).to be_a String if @p.description
     end
 
-    it '#doi' do
-      expect(@p.doi).to be_a String if @p.doi
-    end
-
-    it '#event' do
-      expect(@p.event).to be_a Puree::Model::EventHeader if @p.event
-    end
-
     it '#files' do
       expect(@p.files).to all( be_a Puree::Model::File )
     end
@@ -41,8 +33,8 @@ describe 'Publication' do
       expect(@p.organisations).to all( be_a Puree::Model::OrganisationHeader )
     end
 
-    it '#pages' do
-      expect(@p.pages).to be_a Fixnum if @p.pages
+    it '#owner' do
+      expect(@p.owner).to be_a Puree::Model::OrganisationHeader if @p.owner
     end
 
     it '#persons_internal' do
@@ -69,6 +61,14 @@ describe 'Publication' do
       expect(@p.title).to be_a String if @p.title
     end
 
+    it '#translated_title' do
+      expect(@p.translated_title).to be_a String if @p.translated_title
+    end
+
+    it '#translated_subtitle' do
+      expect(@p.translated_subtitle).to be_a String if @p.translated_subtitle
+    end
+
     it '#type' do
       expect(@p.type).to be_a String if @p.type
     end

data/spec/spec_helper.rb

@@ -17,7 +17,21 @@ require 'puree/xml_extractor/journal'
 require 'puree/xml_extractor/organisation'
 require 'puree/xml_extractor/person'
 require 'puree/xml_extractor/project'
+
+require 'puree/xml_extractor/mixins/doi_mixin'
+require 'puree/xml_extractor/mixins/event_mixin'
+require 'puree/xml_extractor/mixins/pages_mixin'
+require 'puree/xml_extractor/mixins/page_range_mixin'
+require 'puree/xml_extractor/mixins/peer_reviewed_mixin'
 require 'puree/xml_extractor/publication'
+require 'puree/xml_extractor/thesis'
+require 'puree/xml_extractor/doctoral_thesis'
+require 'puree/xml_extractor/masters_thesis'
+require 'puree/xml_extractor/journal_article'
+require 'puree/xml_extractor/paper_base'
+require 'puree/xml_extractor/conference_paper'
+require 'puree/xml_extractor/paper'
+
 require 'puree/xml_extractor/publisher'
 require 'puree/xml_extractor/server'
 
@@ -26,19 +40,30 @@ require 'puree/api/request'
 require 'puree/api/configuration'
 require 'puree/api/authentication'
 
+require 'puree/model/helper/validation'
 require 'puree/model/structure'
 
 require 'puree/model/resource'
 require 'puree/model/dataset'
 require 'puree/model/download_header'
 require 'puree/model/event'
-require 'puree/model/event'
+require 'puree/model/event_header'
 require 'puree/model/journal'
+require 'puree/model/journal_header'
 require 'puree/model/link'
 require 'puree/model/organisation'
 require 'puree/model/person'
 require 'puree/model/project'
+
 require 'puree/model/publication'
+require 'puree/model/thesis'
+require 'puree/model/doctoral_thesis'
+require 'puree/model/masters_thesis'
+require 'puree/model/journal_article'
+require 'puree/model/paper_base'
+require 'puree/model/conference_paper'
+require 'puree/model/paper'
+
 require 'puree/model/publisher'
 require 'puree/model/related_content_header'
 require 'puree/model/spatial_point'
@@ -62,7 +87,16 @@ require 'puree/extractor/journal'
 require 'puree/extractor/organisation'
 require 'puree/extractor/person'
 require 'puree/extractor/project'
+
 require 'puree/extractor/publication'
+require 'puree/extractor/thesis'
+require 'puree/extractor/doctoral_thesis'
+require 'puree/extractor/masters_thesis'
+require 'puree/extractor/journal_article'
+require 'puree/extractor/paper_base'
+require 'puree/extractor/conference_paper'
+require 'puree/extractor/paper'
+
 require 'puree/extractor/publisher'
 require 'puree/extractor/collection'
 require 'puree/extractor/download'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puree
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Adrian Albin-Clark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-31 00:00:00.000000000 Z
+date: 2017-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -72,14 +72,18 @@ files:
 - lib/puree/api/map.rb
 - lib/puree/api/request.rb
 - lib/puree/extractor/collection.rb
+- lib/puree/extractor/conference_paper.rb
 - lib/puree/extractor/dataset.rb
 - lib/puree/extractor/doctoral_thesis.rb
 - lib/puree/extractor/download.rb
 - lib/puree/extractor/event.rb
 - lib/puree/extractor/extractor.rb
 - lib/puree/extractor/journal.rb
+- lib/puree/extractor/journal_article.rb
 - lib/puree/extractor/masters_thesis.rb
 - lib/puree/extractor/organisation.rb
+- lib/puree/extractor/paper.rb
+- lib/puree/extractor/paper_base.rb
 - lib/puree/extractor/person.rb
 - lib/puree/extractor/project.rb
 - lib/puree/extractor/publication.rb
@@ -88,6 +92,7 @@ files:
 - lib/puree/extractor/server.rb
 - lib/puree/extractor/thesis.rb
 - lib/puree/model/address.rb
+- lib/puree/model/conference_paper.rb
 - lib/puree/model/copyright_license.rb
 - lib/puree/model/dataset.rb
 - lib/puree/model/doctoral_thesis.rb
@@ -98,12 +103,16 @@ files:
 - lib/puree/model/file.rb
 - lib/puree/model/helper/validation.rb
 - lib/puree/model/journal.rb
+- lib/puree/model/journal_article.rb
+- lib/puree/model/journal_header.rb
 - lib/puree/model/legal_condition.rb
 - lib/puree/model/link.rb
 - lib/puree/model/masters_thesis.rb
 - lib/puree/model/model.rb
 - lib/puree/model/organisation.rb
 - lib/puree/model/organisation_header.rb
+- lib/puree/model/paper.rb
+- lib/puree/model/paper_base.rb
 - lib/puree/model/person.rb
 - lib/puree/model/person_name.rb
 - lib/puree/model/project.rb
@@ -123,16 +132,22 @@ files:
 - lib/puree/version.rb
 - lib/puree/xml_extractor/base.rb
 - lib/puree/xml_extractor/collection.rb
+- lib/puree/xml_extractor/conference_paper.rb
 - lib/puree/xml_extractor/dataset.rb
 - lib/puree/xml_extractor/doctoral_thesis.rb
 - lib/puree/xml_extractor/download.rb
 - lib/puree/xml_extractor/event.rb
 - lib/puree/xml_extractor/journal.rb
+- lib/puree/xml_extractor/journal_article.rb
 - lib/puree/xml_extractor/masters_thesis.rb
 - lib/puree/xml_extractor/mixins/doi_mixin.rb
 - lib/puree/xml_extractor/mixins/event_mixin.rb
+- lib/puree/xml_extractor/mixins/page_range_mixin.rb
 - lib/puree/xml_extractor/mixins/pages_mixin.rb
+- lib/puree/xml_extractor/mixins/peer_reviewed_mixin.rb
 - lib/puree/xml_extractor/organisation.rb
+- lib/puree/xml_extractor/paper.rb
+- lib/puree/xml_extractor/paper_base.rb
 - lib/puree/xml_extractor/person.rb
 - lib/puree/xml_extractor/project.rb
 - lib/puree/xml_extractor/publication.rb