hydra-derivatives 3.3.1 → 3.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ba5f325949132a7201726c3c2d43a22e38efb84
-  data.tar.gz: '009267a617253cd3ee3c7cd23a3556b3bbec1e5e'
+  metadata.gz: 3cb485ab21d05631d5c5643d6fe6726d2dc82fb3
+  data.tar.gz: 2f30a6f276a10e750bd4d1f5acde291d775e5668
 SHA512:
-  metadata.gz: 86d072cf269aefc35f7a18925e96a8f3002964ffadbd917e2507e5f4a37b646d39e9f5bdbdd492476a36bbcc659b78c30580394be89d08672585de4bb0eca6ef
-  data.tar.gz: '089461874c714dd28e60129c65b50a61de16cc3b0ad95d30e3fd2f0ac721816bfb7bdfba1d14c16aff41a4d2547ae9fe3f7b3321036378d68c1763e1f6815aa7'
+  metadata.gz: 6b0618b15bb531bbe5d2b476b790b3f26652a8ebab3403a325ff720d2fc16b933de2e8c37e94521eb14e405b1f15ceda036c0ef647808d995e81389fb471a250
+  data.tar.gz: 02225a904af793102c24dbd983116640dea8183ce331f0fb40830095d8012466dfe7c5870ca0a6f398956b2bbdaffeaadfa555d1e7a49c8db936caf65e759c6d

data/VERSION

@@ -1 +1 @@
-3.3.1
+3.3.2

data/lib/hydra/derivatives/processors/full_text.rb

@@ -27,6 +27,9 @@ module Hydra::Derivatives::Processors
         raise "Solr Extract service was unsuccessful. '#{uri}' returned code #{resp.code} for #{source_path}\n#{resp.body}" unless resp.code == '200'
         file_content.rewind if file_content.respond_to?(:rewind)
 
+        if resp.type_params['charset']
+          resp.body.force_encoding(resp.type_params['charset'])
+        end
         resp.body
       end
 

data/spec/processors/full_text_spec.rb

@@ -28,13 +28,23 @@ describe Hydra::Derivatives::Processors::FullText do
     end
 
     context "that is successful" do
-      let(:resp) { double(code: '200', body: response_body) }
+      let(:resp) { double(code: '200', type_params: {}, body: response_body) }
       it "calls the extraction service" do
         expect(request).to receive(:post).with('http://example.com:99/solr/update', String, "Content-Type" => "application/vnd.openxmlformats-officedocument.wordprocessingml.document", "Content-Length" => "24244").and_return(resp)
         expect(subject).to eq response_body
       end
     end
 
+    context "that is successful with UTF-8 content" do
+      let(:response_utf8)  { "returned by “Solr”" }
+      let(:response_ascii) { response_utf8.dup.force_encoding("ASCII-8BIT") }
+      let(:resp)           { double(code: '200', type_params: { "charset" => "UTF-8" }, body: response_ascii) }
+      it "calls the extraction service" do
+        expect(request).to receive(:post).with('http://example.com:99/solr/update', String, "Content-Type" => "application/vnd.openxmlformats-officedocument.wordprocessingml.document", "Content-Length" => "24244").and_return(resp)
+        expect(subject).to eq response_utf8
+      end
+    end
+
     context "that fails" do
       let(:resp) { double(code: '500', body: response_body) }
       it "raises an error" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hydra-derivatives
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 3.3.2
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-22 00:00:00.000000000 Z
+date: 2017-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -336,7 +336,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Derivative generation plugin for hydra