active-fedora 11.3.0 → 11.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28c6a10d30587f9ac67d5608f825e55c1ae8e6ec
-  data.tar.gz: 5332ef7ee96bb3d42e3a979aa4c36adb3c619307
+  metadata.gz: a51429cf9f08cc4aa710a9fc0d380d6111dda29a
+  data.tar.gz: 87d9e18ee4cf39390b51ea9c38b4a1c61cf74e4d
 SHA512:
-  metadata.gz: 5eda47b76299b6a282e53b9a3f7f65bc68e8f0a3b2ca546a8e486d5f75545ce7f900579ade9039e8829b2cf1cf13f8115b811fd9aa2fb1f70795621058d7f864
-  data.tar.gz: f2e444ff21e35d1dc896f14eacb72449e2f71a35f2d2336fffb7de4ef6501800d6e6d156f3f1d95d4733fe7397042e1fedd2fc01a552b8022debd1147d317926
+  metadata.gz: 244c96fe18c9e450eb87037c154f160c851ef4c294b1fcc4f929dffab591e811ffc885dd590b84e2e43d76014b7af02f07c01b42f50a321cf99c4bae69d0aed2
+  data.tar.gz: 351d9b679c249a799a39e36b47dfb94a09d2a321ea0dd3b08e13eeaccfc5c966c89e257acd1bd471bfc13ebbd5faf55c1be93d36cead40cdbbab9de2e48a5ea0

data/active-fedora.gemspec

@@ -22,6 +22,8 @@ Gem::Specification.new do |s|
   s.add_dependency "deprecation"
   s.add_dependency "ldp", '~> 0.7.0'
   s.add_dependency "ruby-progressbar", '~> 1.0'
+  s.add_dependency 'faraday', '~> 0.12.1'
+  s.add_dependency 'faraday-encoding', '0.0.4'
 
   s.add_development_dependency "rails"
   s.add_development_dependency "rdoc"

data/lib/active_fedora/fedora.rb

@@ -1,3 +1,6 @@
+require 'faraday'
+require 'faraday-encoding'
+
 module ActiveFedora
   class Fedora
     class << self
@@ -83,9 +86,11 @@ module ActiveFedora
     def authorized_connection
       options = {}
       options[:ssl] = ssl_options if ssl_options
-      connection = Faraday.new(host, options)
-      connection.basic_auth(user, password)
-      connection
+      Faraday.new(host, options) do |conn|
+        conn.response :encoding # use Faraday::Encoding middleware
+        conn.adapter Faraday.default_adapter # net/http
+        conn.basic_auth(user, password)
+      end
     end
 
     def validate_options

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "11.3.0".freeze
+  VERSION = "11.3.1".freeze
 end

data/spec/integration/file_spec.rb

@@ -88,6 +88,44 @@ describe ActiveFedora::File do
     end
   end
 
+  describe "#content" do
+    let(:file) { described_class.new { |ds| ds.content = content } }
+
+    before do
+      file.save
+    end
+
+    describe "#content" do
+      subject(:resource) { described_class.new(file.uri).content }
+
+      before { content.rewind }
+
+      context "when encoding is not set" do
+        let(:content) { fixture('dino.jpg') }
+
+        it "is read from fedora" do
+          expect(resource).to eq content.read
+          expect(resource.encoding).to eq Encoding::ASCII_8BIT
+        end
+      end
+
+      context "when encoding is set" do
+        let(:file) do
+          described_class.new do |f|
+            f.content = content
+            f.mime_type = 'text/plain;charset=UTF-8'
+          end
+        end
+        let(:content) { StringIO.new "I'm a little teåpot" }
+
+        it "is read from fedora" do
+          expect(resource).to eq content.read
+          expect(resource.encoding).to eq Encoding::UTF_8
+        end
+      end
+    end
+  end
+
   context "with a sub-resource" do
     before do
       class MockAFBase < ActiveFedora::Base
@@ -114,7 +152,7 @@ describe ActiveFedora::File do
     context "a binary file" do
       let(:path) { "ds#{Time.now.to_i}" }
       let(:content) { fixture('dino.jpg') }
-      let(:file) { described_class.new.tap { |ds| ds.content = content } }
+      let(:file) { described_class.new { |ds| ds.content = content } }
 
       before do
         test_object.attach_file(file, path)
@@ -125,11 +163,6 @@ describe ActiveFedora::File do
         expect(test_object.attached_files[path]).to_not be_content_changed
       end
 
-      it "is able to read the content from fedora" do
-        content.rewind
-        expect(test_object.attached_files[path].content).to eq content.read
-      end
-
       describe "streaming the response" do
         let(:stream_reader) { instance_double(IO) }
         it "streams the response" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 11.3.0
+  version: 11.3.1
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-13 00:00:00.000000000 Z
+date: 2017-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -148,6 +148,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.12.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.12.1
+- !ruby/object:Gem::Dependency
+  name: faraday-encoding
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.4
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement