puree 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f4b875fcc3fc9d0c03faf62d20332c2be02b8c7
-  data.tar.gz: eacdf05a1625cda281f653009389b16dc2d10822
+  metadata.gz: 647da98cd2670d75fc42262e0065907dae349f5a
+  data.tar.gz: 4de66341673526e53c8130c0324beb99fa71d342
 SHA512:
-  metadata.gz: d644dbf426c9137f442e14b385b9535d9f65e4fd90c5bc24eb1417416d169b867f6aa828d16d44ffb95e7b39e2a49462a95aaff79b322c5385d30ae493afe25c
-  data.tar.gz: 9f40cdd393fb7606d55431c9de9ff68db7ee2341234997e48db252ec240a6fc50a55282ffb120820485379c69aa5e3d83f7f35d0c9c50dfc48adfe875250e508
+  metadata.gz: 741a1e488e1d1f829d02dee741776e656446eda31a3da6df90fbca3bf27f98ad46ba05d0ee7c59642d1d614705558133cbb0e241379470392ff36f7c4b4ddfbf
+  data.tar.gz: 49420c09bf3040c81ac7b1d3bb436fde06be860cb4b4300beca00510733106b8824fb8a938bc2f76e8b55020e139ac16d06c7be72b3149eb713b090e50260426

data/CHANGELOG.md

@@ -5,6 +5,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ## Unreleased
 - Metadata: activity?, clipping?, externalPerson?
 
+## 1.5.0 - 2017-10-03
+### Added
+- Dataset, Publication - workflow_state.
+
 ## 1.4.0 - 2017-09-01
 - Project - external_organisations, funded.
 - Publication - associated, external_organisations.

data/lib/puree.rb

@@ -13,6 +13,7 @@ require 'puree/xml_extractor/mixins/external_organisations_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/mixins/workflow_state_mixin'
 
 require 'puree/xml_extractor/shared'
 require 'puree/xml_extractor/base'

data/lib/puree/extractor/dataset.rb

@@ -38,6 +38,7 @@ module Puree
         @model.spatial_point = @extractor.spatial_point
         @model.temporal = @extractor.temporal
         @model.title = @extractor.title
+        @model.workflow_state = @extractor.workflow_state
         @model
       end
 

data/lib/puree/extractor/publication.rb

@@ -40,6 +40,7 @@ module Puree
         @model.translated_subtitle = @extractor.translated_subtitle
         @model.translated_title = @extractor.translated_title
         @model.type = @extractor.type
+        @model.workflow_state = @extractor.workflow_state
         @model
       end
 

data/lib/puree/model/dataset.rb

@@ -79,6 +79,9 @@ module Puree
       # @return [String, nil]
       attr_accessor :title
 
+      # @return [String, nil]
+      attr_accessor :workflow_state
+
     end
   end
 end

data/lib/puree/model/publication.rb

@@ -74,6 +74,8 @@ module Puree
       # @return [String, nil]
       attr_accessor :type
 
+      # @return [String, nil]
+      attr_accessor :workflow_state
 
     end
   end

data/lib/puree/version.rb

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

data/lib/puree/xml_extractor/dataset.rb

@@ -6,6 +6,7 @@ module Puree
     #
     class Dataset < Puree::XMLExtractor::Resource
       include Puree::XMLExtractor::AssociatedMixin
+      include Puree::XMLExtractor::WorkflowStateMixin
 
       def initialize(xml:)
         super
@@ -173,11 +174,6 @@ module Puree
         nil
       end
 
-      # def state
-      #   # useful?
-      #   /startedWorkflow/state
-      # end
-
       # Temporal coverage
       # @return [Puree::Model::TemporalRange, nil]
       def temporal

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

@@ -0,0 +1,18 @@
+module Puree
+
+  module XMLExtractor
+
+    # Workflow state extractor mixin.
+    #
+    module WorkflowStateMixin
+
+      # Workflow state
+      # @return [String, nil]
+      def workflow_state
+        xpath_query_for_single_value '/startedWorkflows/startedWorkflow/state'
+      end
+
+    end
+
+  end
+end

data/lib/puree/xml_extractor/publication.rb

@@ -7,6 +7,7 @@ module Puree
     class Publication < Puree::XMLExtractor::Resource
       include Puree::XMLExtractor::AssociatedMixin
       include Puree::XMLExtractor::ExternalOrganisationsMixin
+      include Puree::XMLExtractor::WorkflowStateMixin
 
       def initialize(xml:)
         @resource_type = :publication

data/spec/resource/dataset_http_spec.rb

@@ -103,6 +103,10 @@ describe 'Dataset' do
       expect(@p.title).to be_a String if @p.title
     end
 
+    it '#workflow_state' do
+      expect(@p.workflow_state).to be_a String if @p.workflow_state
+    end
+
   end
 
 end

data/spec/resource/publication_http_spec.rb

@@ -109,6 +109,10 @@ describe 'Publication' do
       expect(@p.type).to be_a String if @p.type
     end
 
+    it '#workflow_state' do
+      expect(@p.workflow_state).to be_a String if @p.workflow_state
+    end
+
   end
 
 end

data/spec/spec_helper.rb

@@ -13,6 +13,7 @@ require 'puree/xml_extractor/mixins/external_organisations_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/mixins/workflow_state_mixin'
 
 require 'puree/xml_extractor/shared'
 require 'puree/xml_extractor/base'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puree
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Adrian Albin-Clark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-01 00:00:00.000000000 Z
+date: 2017-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -148,6 +148,7 @@ files:
 - 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/mixins/workflow_state_mixin.rb
 - lib/puree/xml_extractor/organisation.rb
 - lib/puree/xml_extractor/paper.rb
 - lib/puree/xml_extractor/paper_base.rb