dor-workflow-service 1.7.2 → 1.7.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 95ac5b55e85b0888494137002b9ddc6bec371154
+  data.tar.gz: d1d9a154300e1ea5fa93465dc750eab338540cae
+SHA512:
+  metadata.gz: dc5c11825381c2121d155ec476904f3ad09a57eba04d00bc5b89812b12ab0b1b7ab027766f02a2d46bb8e901ff44b194c0137362cc3fc31e1a919ff463628824
+  data.tar.gz: 64cf49461fbeb5fb24f8c950000644762aedb9bfb1779980b9b8440529606ee66092dbbc5322af49fbfbc9e54d925c2f9b3dc3f3519b634d09cc34f3d519e5db

data/.rspec

@@ -0,0 +1 @@
+--color

data/.travis.yml

@@ -2,6 +2,5 @@ notifications:
   email: false
 
 rvm:
-  - 1.8.7
   - 1.9.3
-  - 2.0.0
+  - 2.0.0

data/Gemfile

@@ -3,11 +3,6 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in dor-workflow-service.gemspec
 gemspec
 
-if RUBY_VERSION < '1.9'
-  gem 'activesupport', "< 4.0"
-  gem 'nokogiri', "< 1.6"
-end
-
 group :development do
   gem "debugger", :platform => :ruby_19
 end

data/dor-workflow-service.gemspec

@@ -14,10 +14,10 @@ Gem::Specification.new do |gem|
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.test_files    = gem.files.grep(%r{^(spec)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency "activesupport", '~> 3.2'
+  gem.add_dependency "activesupport", '>= 3.2.1', '< 4.2.2'
   gem.add_dependency "nokogiri", '~> 1.6.0'
   gem.add_dependency "rest-client", '~> 1.6.7'
   gem.add_dependency "confstruct", '~> 0.2.7'
@@ -26,5 +26,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "rspec"
   gem.add_development_dependency "yard"
   gem.add_development_dependency "redcarpet"
-  gem.add_development_dependency "equivalent-xml", '~> 0.3.0'
+  gem.add_development_dependency "equivalent-xml", '~> 0.5.1'
 end

data/lib/dor/services/workflow_service.rb

@@ -1,4 +1,5 @@
 require 'rest-client'
+require 'active_support'
 require 'active_support/core_ext'
 require 'nokogiri'
 

data/lib/dor/workflow_version.rb

@@ -1,7 +1,7 @@
 module Dor
   module Workflow
     module Service
-      VERSION = "1.7.2"
+      VERSION = "1.7.4"
     end
   end
 end

data/spec/workflow_service_spec.rb

@@ -1,6 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 require 'dor-workflow-service'
 require 'equivalent-xml'
+require 'equivalent-xml/rspec_matchers'
 
 describe Dor::WorkflowService do
 
@@ -32,29 +33,29 @@ describe Dor::WorkflowService do
     @druid = 'druid:123'
 
     @mock_logger = double('logger').as_null_object
-    Rails.stub(:logger).and_return(@mock_logger)
+    allow(Rails).to receive(:logger).and_return(@mock_logger)
 
     @mock_resource = double('mock_rest_client_resource')
-    @mock_resource.stub(:[]).and_return(@mock_resource)
-    @mock_resource.stub(:options).and_return( {} )
-    RestClient::Resource.stub(:new).and_return(@mock_resource)
+    allow(@mock_resource).to receive(:[]).and_return(@mock_resource)
+    allow(@mock_resource).to receive(:options).and_return( {} )
+    allow(RestClient::Resource).to receive(:new).and_return(@mock_resource)
     Dor::WorkflowService.configure 'https://dortest.stanford.edu/workflow'
   end
 
   describe "#create_workflow" do
     it "should pass workflow xml to the DOR workflow service and return the URL to the workflow" do
-      @mock_resource.should_receive(:put).with(wf_xml_label, anything()).and_return('')
+      expect(@mock_resource).to receive(:put).with(wf_xml_label, anything()).and_return('')
       Dor::WorkflowService.create_workflow(@repo, @druid, 'etdSubmitWF', wf_xml)
     end
 
     it "should log an error and return false if the PUT to the DOR workflow service throws an exception" do
       ex = Exception.new("exception thrown")
-      @mock_resource.should_receive(:put).and_raise(ex)
-      lambda{ Dor::WorkflowService.create_workflow(@repo, @druid, 'etdSubmitWF', wf_xml) }.should raise_error(Exception, "exception thrown")
+      expect(@mock_resource).to receive(:put).and_raise(ex)
+      expect{ Dor::WorkflowService.create_workflow(@repo, @druid, 'etdSubmitWF', wf_xml) }.to raise_error(Exception, "exception thrown")
     end
 
     it "sets the create-ds param to the value of the passed in options hash" do
-      @mock_resource.should_receive(:put).with(wf_xml_label, :content_type => 'application/xml',
+      expect(@mock_resource).to receive(:put).with(wf_xml_label, :content_type => 'application/xml',
                                                 :params => {'create-ds' => false}).and_return('')
       Dor::WorkflowService.create_workflow(@repo, @druid, 'etdSubmitWF', wf_xml, :create_ds => false)
     end
@@ -78,7 +79,7 @@ describe Dor::WorkflowService do
         </workflow>
       XML
 
-      Dor::WorkflowService.send(:add_lane_id_to_workflow_xml, 'lane1', wf_xml).should be_equivalent_to(expected)
+      expect(Dor::WorkflowService.send(:add_lane_id_to_workflow_xml, 'lane1', wf_xml)).to be_equivalent_to(expected)
     end
   end
 
@@ -89,56 +90,56 @@ describe Dor::WorkflowService do
 
     it "should update workflow status and return true if successful" do
       built_xml = "<?xml version=\"1.0\"?>\n<process name=\"reader-approval\" status=\"completed\" elapsed=\"0\" note=\"annotation\" version=\"2\" laneId=\"lane2\"/>\n"
-      @mock_resource.should_receive(:put).with(built_xml, { :content_type => 'application/xml' }).and_return('')
-      Dor::WorkflowService.update_workflow_status(@repo, @druid, "etdSubmitWF", "reader-approval", "completed", :version => 2, :note => 'annotation', :lane_id => 'lane2').should be_true
+      expect(@mock_resource).to receive(:put).with(built_xml, { :content_type => 'application/xml' }).and_return('')
+      expect(Dor::WorkflowService.update_workflow_status(@repo, @druid, "etdSubmitWF", "reader-approval", "completed", :version => 2, :note => 'annotation', :lane_id => 'lane2')).to be_truthy
     end
 
     it "should return false if the PUT to the DOR workflow service throws an exception" do
       ex = Exception.new("exception thrown")
-      @mock_resource.should_receive(:put).with(@xml_re, { :content_type => 'application/xml' }).and_raise(ex)
-      lambda{ Dor::WorkflowService.update_workflow_status(@repo, @druid, "etdSubmitWF", "reader-approval", "completed") }.should raise_error(Exception, "exception thrown")
+      expect(@mock_resource).to receive(:put).with(@xml_re, { :content_type => 'application/xml' }).and_raise(ex)
+      expect{ Dor::WorkflowService.update_workflow_status(@repo, @druid, "etdSubmitWF", "reader-approval", "completed") }.to raise_error(Exception, "exception thrown")
     end
 
     it "performs a conditional update when current-status is passed as a parameter" do
-      @mock_resource.should_receive(:[]).with("dor/objects/druid:123/workflows/etdSubmitWF/reader-approval?current-status=queued")
-      @mock_resource.should_receive(:put).with(@xml_re, { :content_type => 'application/xml' }).and_return('')
-      Dor::WorkflowService.update_workflow_status(@repo, @druid, "etdSubmitWF", "reader-approval", "completed", :version => 2, :note => 'annotation', :lane_id => 'lane1', :current_status => 'queued').should be_true
+      expect(@mock_resource).to receive(:[]).with("dor/objects/druid:123/workflows/etdSubmitWF/reader-approval?current-status=queued")
+      expect(@mock_resource).to receive(:put).with(@xml_re, { :content_type => 'application/xml' }).and_return('')
+      expect(Dor::WorkflowService.update_workflow_status(@repo, @druid, "etdSubmitWF", "reader-approval", "completed", :version => 2, :note => 'annotation', :lane_id => 'lane1', :current_status => 'queued')).to be_truthy
     end
   end
 
   describe "#update_workflow_error_status" do
     it "should update workflow status to error and return true if successful" do
-      @mock_resource.should_receive(:put).with(/status="error" errorMessage="Some exception" errorText="The optional stacktrace"/, { :content_type => 'application/xml' }).and_return('')
+      expect(@mock_resource).to receive(:put).with(/status="error" errorMessage="Some exception" errorText="The optional stacktrace"/, { :content_type => 'application/xml' }).and_return('')
       Dor::WorkflowService.update_workflow_error_status(@repo, @druid, "etdSubmitWF", "reader-approval", "Some exception", :error_text =>"The optional stacktrace")
     end
 
     it "should return false if the PUT to the DOR workflow service throws an exception" do
       ex = Exception.new("exception thrown")
-      @mock_resource.should_receive(:put).with(/status="completed"/, { :content_type => 'application/xml' }).and_raise(ex)
-      lambda{ Dor::WorkflowService.update_workflow_status(@repo, @druid, "etdSubmitWF", "reader-approval", "completed") }.should raise_error(Exception, "exception thrown")
+      expect(@mock_resource).to receive(:put).with(/status="completed"/, { :content_type => 'application/xml' }).and_raise(ex)
+      expect{ Dor::WorkflowService.update_workflow_status(@repo, @druid, "etdSubmitWF", "reader-approval", "completed") }.to raise_error(Exception, "exception thrown")
     end
   end
 
   describe "#get_workflow_status" do
     it "parses workflow xml and returns status as a string" do
-      @mock_resource.should_receive(:get).and_return('<process name="registrar-approval" status="completed" />')
-      Dor::WorkflowService.get_workflow_status('dor', 'druid:123', 'etdSubmitWF', 'registrar-approval').should == 'completed'
+      expect(@mock_resource).to receive(:get).and_return('<process name="registrar-approval" status="completed" />')
+      expect(Dor::WorkflowService.get_workflow_status('dor', 'druid:123', 'etdSubmitWF', 'registrar-approval')).to eq('completed')
     end
 
     it "should throw an exception if it fails for any reason" do
       ex = Exception.new("exception thrown")
-      @mock_resource.should_receive(:get).and_raise(ex)
+      expect(@mock_resource).to receive(:get).and_raise(ex)
 
-      lambda{ Dor::WorkflowService.get_workflow_status('dor', 'druid:123', 'etdSubmitWF', 'registrar-approval') }.should raise_error(Exception, "exception thrown")
+      expect{ Dor::WorkflowService.get_workflow_status('dor', 'druid:123', 'etdSubmitWF', 'registrar-approval') }.to raise_error(Exception, "exception thrown")
     end
 
     it "should throw an exception if it cannot parse the response" do
-      @mock_resource.should_receive(:get).and_return('something not xml')
-      lambda{ Dor::WorkflowService.get_workflow_status('dor', 'druid:123', 'etdSubmitWF', 'registrar-approval') }.should raise_error(Exception, "Unable to parse response:\nsomething not xml")
+      expect(@mock_resource).to receive(:get).and_return('something not xml')
+      expect{ Dor::WorkflowService.get_workflow_status('dor', 'druid:123', 'etdSubmitWF', 'registrar-approval') }.to raise_error(Exception, "Unable to parse response:\nsomething not xml")
     end
     it "should return nil if the workflow/process combination doesnt exist" do
-      @mock_resource.should_receive(:get).and_return('<process name="registrar-approval" status="completed" />')
-      Dor::WorkflowService.get_workflow_status('dor', 'druid:123', 'accessionWF', 'publish').should == nil
+      expect(@mock_resource).to receive(:get).and_return('<process name="registrar-approval" status="completed" />')
+      expect(Dor::WorkflowService.get_workflow_status('dor', 'druid:123', 'accessionWF', 'publish')).to eq(nil)
     end
 
   end
@@ -146,8 +147,8 @@ describe Dor::WorkflowService do
   describe "#get_workflow_xml" do
     it "returns the xml for a given repository, druid, and workflow" do
       xml = '<workflow id="etdSubmitWF"><process name="registrar-approval" status="completed" /></workflow>'
-      @mock_resource.should_receive(:get).and_return(xml)
-      Dor::WorkflowService.get_workflow_xml('dor', 'druid:123', 'etdSubmitWF').should == xml
+      expect(@mock_resource).to receive(:get).and_return(xml)
+      expect(Dor::WorkflowService.get_workflow_xml('dor', 'druid:123', 'etdSubmitWF')).to eq(xml)
     end
   end
 
@@ -160,13 +161,13 @@ describe Dor::WorkflowService do
             <milestone date="2010-06-15T16:08:58-0700">released</milestone>
         </lifecycle>
       EOXML
-      @mock_resource.should_receive(:get).and_return(xml)
-      Dor::WorkflowService.get_lifecycle('dor', 'druid:123', 'released').beginning_of_day.should == Time.parse('2010-06-15T16:08:58-0700').beginning_of_day
+      expect(@mock_resource).to receive(:get).and_return(xml)
+      expect(Dor::WorkflowService.get_lifecycle('dor', 'druid:123', 'released').beginning_of_day).to eq(Time.parse('2010-06-15T16:08:58-0700').beginning_of_day)
     end
 
     it "returns nil if the milestone hasn't been reached yet" do
-      @mock_resource.should_receive(:get).and_return('<lifecycle/>')
-      Dor::WorkflowService.get_lifecycle('dor', 'druid:abc', 'inprocess').should be_nil
+      expect(@mock_resource).to receive(:get).and_return('<lifecycle/>')
+      expect(Dor::WorkflowService.get_lifecycle('dor', 'druid:abc', 'inprocess')).to be_nil
     end
 
   end
@@ -181,18 +182,18 @@ describe Dor::WorkflowService do
 
     context "a query with one step completed and one waiting" do
       it "creates the URI string with only the one completed step" do
-        @mock_resource.should_receive(:[]).with("workflow_queue?waiting=#{@repository}:#{@workflow}:#{@waiting}&completed=#{@repository}:#{@workflow}:#{@completed}&lane-id=default")
-        @mock_resource.should_receive(:get).and_return(%{<objects count="1"><object id="druid:ab123de4567"/><object id="druid:ab123de9012"/></objects>})
-        Dor::WorkflowService.get_objects_for_workstep(@completed, @waiting, 'default', :default_repository => @repository, :default_workflow => @workflow).should == ['druid:ab123de4567','druid:ab123de9012']
+        expect(@mock_resource).to receive(:[]).with("workflow_queue?waiting=#{@repository}:#{@workflow}:#{@waiting}&completed=#{@repository}:#{@workflow}:#{@completed}&lane-id=default")
+        expect(@mock_resource).to receive(:get).and_return(%{<objects count="1"><object id="druid:ab123de4567"/><object id="druid:ab123de9012"/></objects>})
+        expect(Dor::WorkflowService.get_objects_for_workstep(@completed, @waiting, 'default', :default_repository => @repository, :default_workflow => @workflow)).to eq(['druid:ab123de4567','druid:ab123de9012'])
       end
     end
 
     context "a query with TWO steps completed and one waiting" do
       it "creates the URI string with the two completed steps correctly" do
         second_completed="google-convert"
-        @mock_resource.should_receive(:[]).with("workflow_queue?waiting=#{@repository}:#{@workflow}:#{@waiting}&completed=#{@repository}:#{@workflow}:#{@completed}&completed=#{@repository}:#{@workflow}:#{second_completed}&lane-id=default")
-        @mock_resource.should_receive(:get).and_return(%{<objects count="1"><object id="druid:ab123de4567"/><object id="druid:ab123de9012"/></objects>})
-        Dor::WorkflowService.get_objects_for_workstep([@completed,second_completed], @waiting, 'default', :default_repository => @repository, :default_workflow => @workflow).should == ['druid:ab123de4567','druid:ab123de9012']
+        expect(@mock_resource).to receive(:[]).with("workflow_queue?waiting=#{@repository}:#{@workflow}:#{@waiting}&completed=#{@repository}:#{@workflow}:#{@completed}&completed=#{@repository}:#{@workflow}:#{second_completed}&lane-id=default")
+        expect(@mock_resource).to receive(:get).and_return(%{<objects count="1"><object id="druid:ab123de4567"/><object id="druid:ab123de9012"/></objects>})
+        expect(Dor::WorkflowService.get_objects_for_workstep([@completed,second_completed], @waiting, 'default', :default_repository => @repository, :default_workflow => @workflow)).to eq(['druid:ab123de4567','druid:ab123de9012'])
       end
     end
 
@@ -206,9 +207,9 @@ describe Dor::WorkflowService do
         completed3="ingest-transfer"
         qualified_completed2 = "#{repo2}:#{workflow2}:#{completed2}"
         qualified_completed3 = "#{repo2}:#{workflow2}:#{completed3}"
-        @mock_resource.should_receive(:[]).with("workflow_queue?waiting=#{qualified_waiting}&completed=#{qualified_completed}&completed=#{qualified_completed2}&completed=#{qualified_completed3}&lane-id=default")
-        @mock_resource.should_receive(:get).and_return(%{<objects count="2"><object id="druid:ab123de4567"/><object id="druid:ab123de9012"/></objects>})
-        Dor::WorkflowService.get_objects_for_workstep([qualified_completed, qualified_completed2, qualified_completed3], qualified_waiting).should == ['druid:ab123de4567', 'druid:ab123de9012']
+        expect(@mock_resource).to receive(:[]).with("workflow_queue?waiting=#{qualified_waiting}&completed=#{qualified_completed}&completed=#{qualified_completed2}&completed=#{qualified_completed3}&lane-id=default")
+        expect(@mock_resource).to receive(:get).and_return(%{<objects count="2"><object id="druid:ab123de4567"/><object id="druid:ab123de9012"/></objects>})
+        expect(Dor::WorkflowService.get_objects_for_workstep([qualified_completed, qualified_completed2, qualified_completed3], qualified_waiting)).to eq(['druid:ab123de4567', 'druid:ab123de9012'])
       end
 
       it "same but with lane_id" do
@@ -220,9 +221,9 @@ describe Dor::WorkflowService do
         completed3="ingest-transfer"
         qualified_completed2 = "#{repo2}:#{workflow2}:#{completed2}"
         qualified_completed3 = "#{repo2}:#{workflow2}:#{completed3}"
-        @mock_resource.should_receive(:[]).with("workflow_queue?waiting=#{qualified_waiting}&completed=#{qualified_completed}&completed=#{qualified_completed2}&completed=#{qualified_completed3}&lane-id=lane1")
-        @mock_resource.should_receive(:get).and_return(%{<objects count="2"><object id="druid:ab123de4567"/><object id="druid:ab123de9012"/></objects>})
-        Dor::WorkflowService.get_objects_for_workstep([qualified_completed, qualified_completed2, qualified_completed3], qualified_waiting, "lane1").should == [ 'druid:ab123de4567', 'druid:ab123de9012']
+        expect(@mock_resource).to receive(:[]).with("workflow_queue?waiting=#{qualified_waiting}&completed=#{qualified_completed}&completed=#{qualified_completed2}&completed=#{qualified_completed3}&lane-id=lane1")
+        expect(@mock_resource).to receive(:get).and_return(%{<objects count="2"><object id="druid:ab123de4567"/><object id="druid:ab123de9012"/></objects>})
+        expect(Dor::WorkflowService.get_objects_for_workstep([qualified_completed, qualified_completed2, qualified_completed3], qualified_waiting, "lane1")).to eq([ 'druid:ab123de4567', 'druid:ab123de9012'])
       end
 
       it "creates the URI string with only one completed step passed in as a String" do
@@ -230,25 +231,25 @@ describe Dor::WorkflowService do
         qualified_completed = "#{@repository}:#{@workflow}:#{@completed}"
         repo2 = "sdr"
 
-        @mock_resource.should_receive(:[]).with("workflow_queue?waiting=#{qualified_waiting}&completed=#{qualified_completed}&lane-id=default")
-        @mock_resource.should_receive(:get).and_return(%{<objects count="1"><object id="druid:ab123de4567"/></objects>})
-        Dor::WorkflowService.get_objects_for_workstep(qualified_completed, qualified_waiting).should == ['druid:ab123de4567']
+        expect(@mock_resource).to receive(:[]).with("workflow_queue?waiting=#{qualified_waiting}&completed=#{qualified_completed}&lane-id=default")
+        expect(@mock_resource).to receive(:get).and_return(%{<objects count="1"><object id="druid:ab123de4567"/></objects>})
+        expect(Dor::WorkflowService.get_objects_for_workstep(qualified_completed, qualified_waiting)).to eq(['druid:ab123de4567'])
       end
 
       it "creates the URI string without any completed steps, only waiting" do
         qualified_waiting = "#{@repository}:#{@workflow}:#{@waiting}"
 
-        @mock_resource.should_receive(:[]).with("workflow_queue?waiting=#{qualified_waiting}&lane-id=default")
-        @mock_resource.should_receive(:get).and_return(%{<objects count="1"><object id="druid:ab123de4567"/></objects>})
-        Dor::WorkflowService.get_objects_for_workstep(nil, qualified_waiting).should == ['druid:ab123de4567']
+        expect(@mock_resource).to receive(:[]).with("workflow_queue?waiting=#{qualified_waiting}&lane-id=default")
+        expect(@mock_resource).to receive(:get).and_return(%{<objects count="1"><object id="druid:ab123de4567"/></objects>})
+        expect(Dor::WorkflowService.get_objects_for_workstep(nil, qualified_waiting)).to eq(['druid:ab123de4567'])
       end
 
       it "same but with lane_id" do
         qualified_waiting = "#{@repository}:#{@workflow}:#{@waiting}"
 
-        @mock_resource.should_receive(:[]).with("workflow_queue?waiting=#{qualified_waiting}&lane-id=lane1")
-        @mock_resource.should_receive(:get).and_return(%{<objects count="1"><object id="druid:ab123de4567"/></objects>})
-        Dor::WorkflowService.get_objects_for_workstep(nil, qualified_waiting, "lane1").should == [ 'druid:ab123de4567' ]
+        expect(@mock_resource).to receive(:[]).with("workflow_queue?waiting=#{qualified_waiting}&lane-id=lane1")
+        expect(@mock_resource).to receive(:get).and_return(%{<objects count="1"><object id="druid:ab123de4567"/></objects>})
+        expect(Dor::WorkflowService.get_objects_for_workstep(nil, qualified_waiting, "lane1")).to eq([ 'druid:ab123de4567' ])
       end
     end
   end
@@ -259,16 +260,16 @@ describe Dor::WorkflowService do
       workflow = "googleScannedBookWF"
       completed = "google-download"
       waiting = "process-content"
-      @mock_resource.should_receive(:[]).with("workflow_queue?waiting=#{repository}:#{workflow}:#{waiting}&completed=#{repository}:#{workflow}:#{completed}&lane-id=default")
-      @mock_resource.should_receive(:get).and_return(%{<objects count="0"/>})
-      Dor::WorkflowService.get_objects_for_workstep(completed, waiting, 'default', :default_repository => repository, :default_workflow => workflow).should == []
+      expect(@mock_resource).to receive(:[]).with("workflow_queue?waiting=#{repository}:#{workflow}:#{waiting}&completed=#{repository}:#{workflow}:#{completed}&lane-id=default")
+      expect(@mock_resource).to receive(:get).and_return(%{<objects count="0"/>})
+      expect(Dor::WorkflowService.get_objects_for_workstep(completed, waiting, 'default', :default_repository => repository, :default_workflow => workflow)).to eq([])
     end
   end
 
   describe "#delete_workflow" do
     it "sends a delete request to the workflow service" do
-      @mock_resource.should_receive(:[]).with("#{@repo}/objects/#{@druid}/workflows/accessionWF")
-      @mock_resource.should_receive(:delete)
+      expect(@mock_resource).to receive(:[]).with("#{@repo}/objects/#{@druid}/workflows/accessionWF")
+      expect(@mock_resource).to receive(:delete)
       Dor::WorkflowService.delete_workflow(@repo, @druid, 'accessionWF')
     end
   end
@@ -276,10 +277,10 @@ describe Dor::WorkflowService do
     it 'should include the version in with the milestones' do
       xml='<?xml version="1.0" encoding="UTF-8"?><lifecycle objectId="druid:gv054hp4128"><milestone date="2012-01-26T21:06:54-0800" version="2">published</milestone></lifecycle>'
       xml=Nokogiri::XML(xml)
-      Dor::WorkflowService.stub(:query_lifecycle).and_return(xml)
+      allow(Dor::WorkflowService).to receive(:query_lifecycle).and_return(xml)
       milestones=Dor::WorkflowService.get_milestones(@repo, @druid)
-      milestones.first[:milestone].should == "published"
-      milestones.first[:version].should == "2"
+      expect(milestones.first[:milestone]).to eq("published")
+      expect(milestones.first[:version]).to eq("2")
     end
   end
 
@@ -297,21 +298,21 @@ describe Dor::WorkflowService do
       </workflows>
       XML
 
-      Dor::WorkflowService.stub(:get_workflow_xml) { xml }
+      allow(Dor::WorkflowService).to receive(:get_workflow_xml) { xml }
       expect(Dor::WorkflowService.get_active_workflows('dor', 'druid:mw971zk1113')).to eq(['accessionWF'])
     end
   end
 
   describe "#close_version" do
     it "calls the versionClose endpoint with druid" do
-      @mock_resource.should_receive(:[]).with("dor/objects/druid:123/versionClose").and_return(@mock_resource)
-      @mock_resource.should_receive(:post).with('').and_return('')
+      expect(@mock_resource).to receive(:[]).with("dor/objects/druid:123/versionClose").and_return(@mock_resource)
+      expect(@mock_resource).to receive(:post).with('').and_return('')
       Dor::WorkflowService.close_version(@repo, @druid)
     end
 
     it "optionally prevents creation of accessionWF" do
-      @mock_resource.should_receive(:[]).with("dor/objects/druid:123/versionClose?create-accession=false").and_return(@mock_resource)
-      @mock_resource.should_receive(:post).with('').and_return('')
+      expect(@mock_resource).to receive(:[]).with("dor/objects/druid:123/versionClose?create-accession=false").and_return(@mock_resource)
+      expect(@mock_resource).to receive(:post).with('').and_return('')
       Dor::WorkflowService.close_version(@repo, @druid, false)
     end
   end
@@ -324,22 +325,22 @@ describe Dor::WorkflowService do
             <workflow laneId="lane2" note="annotation" lifecycle="in-process" errorText="stacktrace" errorMessage="NullPointerException" elapsed="1.173" repository="dor" attempts="0" datetime="2008-11-15T13:30:00-0800" status="waiting" process="jp2-create" name="assemblyWF" druid="dr:456"/>
         </workflows>
       XML
-      @mock_resource.should_receive(:[]).with("workflow_queue/all_queued?repository=dor&hours-ago=24&limit=100")
-      @mock_resource.should_receive(:get).and_return(xml)
+      expect(@mock_resource).to receive(:[]).with("workflow_queue/all_queued?repository=dor&hours-ago=24&limit=100")
+      expect(@mock_resource).to receive(:get).and_return(xml)
 
       ah = Dor::WorkflowService.get_stale_queued_workflows 'dor', :hours_ago => 24, :limit => 100
       expected = [ { :workflow => 'accessionWF', :step => 'content-metadata', :druid => 'dr:123', :lane_id => 'lane1'},
                    { :workflow => 'assemblyWF', :step => 'jp2-create', :druid => 'dr:456', :lane_id => 'lane2'} ]
-      ah.should eql(expected)
+      expect(ah).to eql(expected)
     end
   end
 
   describe ".count_stale_queued_workflows" do
     it "returns the number of queued workflow steps" do
-      @mock_resource.should_receive(:[]).with("workflow_queue/all_queued?repository=dor&hours-ago=48&count-only=true")
-      @mock_resource.should_receive(:get).and_return(%{<objects count="10"/>})
+      expect(@mock_resource).to receive(:[]).with("workflow_queue/all_queued?repository=dor&hours-ago=48&count-only=true")
+      expect(@mock_resource).to receive(:get).and_return(%{<objects count="10"/>})
 
-      Dor::WorkflowService.count_stale_queued_workflows('dor', :hours_ago => 48).should == 10
+      expect(Dor::WorkflowService.count_stale_queued_workflows('dor', :hours_ago => 48)).to eq(10)
     end
   end
 
@@ -352,11 +353,11 @@ describe Dor::WorkflowService do
       </lanes>
       XML
 
-      @mock_resource.should_receive(:[]).with("workflow_queue/lane_ids?step=dor:accessionWF:shelve")
-      @mock_resource.should_receive(:get).and_return(xml)
+      expect(@mock_resource).to receive(:[]).with("workflow_queue/lane_ids?step=dor:accessionWF:shelve")
+      expect(@mock_resource).to receive(:get).and_return(xml)
 
-      Dor::WorkflowService.get_lane_ids('dor', 'accessionWF', 'shelve').should == ["lane1", "lane2"]
+      expect(Dor::WorkflowService.get_lane_ids('dor', 'accessionWF', 'shelve')).to eq(["lane1", "lane2"])
     end
   end
 
-end
+end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-workflow-service
 version: !ruby/object:Gem::Version
-  version: 1.7.2
-  prerelease: 
+  version: 1.7.4
 platform: ruby
 authors:
 - Willy Mene
@@ -10,152 +9,140 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-13 00:00:00.000000000 Z
+date: 2015-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 3.2.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 4.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.1
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 4.2.2
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.7
 - !ruby/object:Gem::Dependency
   name: confstruct
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.7
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.5.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.5.1
 description: Enables Ruby manipulation of the DOR Workflow Service via its REST API
 email:
 - wmene@stanford.edu
@@ -164,9 +151,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
-- .yardopts
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
+- ".yardopts"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -180,29 +168,27 @@ files:
 - spec/workflow_service_spec.rb
 homepage: https://consul.stanford.edu/display/DOR/DOR+services#DORservices-initializeworkflow
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Provides convenience methods to work with the DOR Workflow Service
 test_files:
 - spec/spec_helper.rb
 - spec/workflow_service_spec.rb
-has_rdoc: