resync-client 0.1.2 → 0.2.1

data/spec/unit/resync/client/zip_package_spec.rb

@@ -1,43 +1,58 @@
 require 'spec_helper'
-require 'resync/client/zip_package'
 
 module Resync
-  describe ZipPackage do
-    describe '#new' do
-      it 'accepts a path to a ZIP file' do
-        path = 'spec/data/resourcedump/resourcedump.zip'
-        pkg = ZipPackage.new(path)
-        zipfile = pkg.zipfile
-        expect(zipfile).to be_a(Zip::File)
-        expect(zipfile.name).to eq(path)
-      end
+  class Client
+    module Zip
+      describe ZipPackage do
+        describe '#new' do
+          it 'accepts a path to a ZIP file' do
+            path = 'spec/data/resourcedump/resourcedump.zip'
+            pkg = ZipPackage.new(path)
+            zipfile = pkg.zipfile
+            expect(zipfile).to be_a(::Zip::File)
+            expect(zipfile.name).to eq(path)
+          end
 
-      it 'accepts a Zip::File object' do
-        zipfile = Zip::File.open('spec/data/resourcedump/resourcedump.zip')
-        pkg = ZipPackage.new(zipfile)
-        expect(pkg.zipfile).to eq(zipfile)
-      end
+          it 'accepts a Zip::File object' do
+            zipfile = ::Zip::File.open('spec/data/resourcedump/resourcedump.zip')
+            pkg = ZipPackage.new(zipfile)
+            expect(pkg.zipfile).to eq(zipfile)
+          end
 
-      it 'extracts a manifest' do
-        pkg = ZipPackage.new('spec/data/resourcedump/resourcedump.zip')
-        manifest = pkg.manifest
-        expect(manifest).to be_a(Resync::ResourceDumpManifest)
-      end
+          it 'extracts a manifest' do
+            pkg = ZipPackage.new('spec/data/resourcedump/resourcedump.zip')
+            manifest = pkg.manifest
+            expect(manifest).to be_a(Resync::ResourceDumpManifest)
+          end
+
+          it 'extracts entries' do
+            pkg = ZipPackage.new('spec/data/resourcedump/resourcedump.zip')
+            bitstreams = pkg.bitstreams
+            expect(bitstreams.size).to eq(2)
+
+            bs0 = bitstreams[0]
+            expect(bs0.path).to eq('resources/res1')
+            expect(bs0.size).to eq(446)
+            expect(bs0.content).to eq(File.read('spec/data/resourcedump/resources/res1'))
+
+            bs1 = bitstreams[1]
+            expect(bs1.path).to eq('resources/res2')
+            expect(bs1.size).to eq(447)
+            expect(bs1.content).to eq(File.read('spec/data/resourcedump/resources/res2'))
+          end
 
-      it 'extracts entries' do
-        pkg = ZipPackage.new('spec/data/resourcedump/resourcedump.zip')
-        bitstreams = pkg.bitstreams
-        expect(bitstreams.size).to eq(2)
+          it 'provides direct access to bitstreams for each resource in the manifest' do
+            pkg = ZipPackage.new('spec/data/resourcedump/resourcedump.zip')
+            bitstreams = pkg.bitstreams
 
-        bs0 = bitstreams[0]
-        expect(bs0.path).to eq('resources/res1')
-        expect(bs0.size).to eq(446)
-        expect(bs0.content).to eq(File.read('spec/data/resourcedump/resources/res1'))
+            manifest = pkg.manifest
+            resources = manifest.resources
 
-        bs1 = bitstreams[1]
-        expect(bs1.path).to eq('resources/res2')
-        expect(bs1.size).to eq(447)
-        expect(bs1.content).to eq(File.read('spec/data/resourcedump/resources/res2'))
+            resources.each_with_index do |r, i|
+              expect(r.bitstream).to be(bitstreams[i])
+            end
+          end
+        end
       end
     end
   end

data/spec/unit/resync/client/zip_packages_spec.rb

@@ -1,53 +1,57 @@
 require 'spec_helper'
 
 module Resync
-  describe ZipPackages do
-    it 'is lazy' do
-      resources = Array.new(3) { |i| Resource.new(uri: "http://example.org/res#{i}") }
+  class Client
+    module Zip
+      describe ZipPackages do
+        it 'is lazy' do
+          resources = Array.new(3) { |i| Resource.new(uri: "http://example.org/res#{i}") }
 
-      zip_packages = ZipPackages.new(resources)
+          zip_packages = ZipPackages.new(resources)
 
-      zip_package = instance_double(ZipPackage)
-      expect(resources[0]).not_to receive(:zip_package)
-      expect(resources[1]).not_to receive(:zip_package)
-      expect(resources[2]).to receive(:zip_package).and_return(zip_package)
+          zip_package = instance_double(ZipPackage)
+          expect(resources[0]).not_to receive(:zip_package)
+          expect(resources[1]).not_to receive(:zip_package)
+          expect(resources[2]).to receive(:zip_package).and_return(zip_package)
 
-      expect(zip_packages[2]).to be(zip_package)
-    end
-
-    it 'caches zip packages' do
-      resources = Array.new(3) { |i| Resource.new(uri: "http://example.org/res#{i}") }
+          expect(zip_packages[2]).to be(zip_package)
+        end
 
-      zip_packages = ZipPackages.new(resources)
+        it 'caches zip packages' do
+          resources = Array.new(3) { |i| Resource.new(uri: "http://example.org/res#{i}") }
 
-      zip_package = instance_double(ZipPackage)
-      expect(resources[1]).to receive(:zip_package).once.and_return(zip_package)
+          zip_packages = ZipPackages.new(resources)
 
-      expect(zip_packages[1]).to be(zip_package)
-      expect(zip_packages[1]).to be(zip_package)
-    end
+          zip_package = instance_double(ZipPackage)
+          expect(resources[1]).to receive(:zip_package).once.and_return(zip_package)
 
-    it 'supports lazy iteration' do
-      manifests = Array.new(3) { instance_double(ChangeDumpManifest) }
-      all_packages = Array.new(3) do |index|
-        zip_package = instance_double(ZipPackage)
-        allow(zip_package).to receive(:manifest).and_return(manifests[index])
-        zip_package
-      end
-      resources = Array.new(3) do |index|
-        resource = Resource.new(uri: "http://example.org/res#{index}")
-        if index > 1
-          expect(resource).not_to receive(:zip_package)
-        else
-          expect(resource).to receive(:zip_package).and_return(all_packages[index])
+          expect(zip_packages[1]).to be(zip_package)
+          expect(zip_packages[1]).to be(zip_package)
         end
-        resource
-      end
 
-      zip_packages = ZipPackages.new(resources)
-      zip_packages.each_with_index do |zip_package, index|
-        expect(zip_package.manifest).to be(manifests[index])
-        break if index >= 1
+        it 'supports lazy iteration' do
+          manifests = Array.new(3) { instance_double(ChangeDumpManifest) }
+          all_packages = Array.new(3) do |index|
+            zip_package = instance_double(ZipPackage)
+            allow(zip_package).to receive(:manifest).and_return(manifests[index])
+            zip_package
+          end
+          resources = Array.new(3) do |index|
+            resource = Resource.new(uri: "http://example.org/res#{index}")
+            if index > 1
+              expect(resource).not_to receive(:zip_package)
+            else
+              expect(resource).to receive(:zip_package).and_return(all_packages[index])
+            end
+            resource
+          end
+
+          zip_packages = ZipPackages.new(resources)
+          zip_packages.each_with_index do |zip_package, index|
+            expect(zip_package.manifest).to be(manifests[index])
+            break if index >= 1
+          end
+        end
       end
     end
   end

data/spec/unit/resync/client/zipped_resource_list_spec.rb

@@ -0,0 +1,61 @@
+require 'spec_helper'
+
+module Resync
+  class Client
+    module Mixins
+      describe ZippedResourceList do
+        it "works for #{ResourceDump}" do
+          path = 'spec/data/resourcedump/resourcedump.xml'
+          package_uri = URI('http://example.com/resourcedump.zip')
+
+          client = instance_double(Client)
+          expect(client).to receive(:download_to_temp_file).once.with(package_uri).and_return('spec/data/resourcedump/resourcedump.zip')
+
+          dump = XMLParser.parse(File.read(path))
+          dump.client = client
+
+          zip_packages = dump.zip_packages
+          expect(zip_packages.size).to eq(1)
+
+          zip_package = zip_packages[0]
+          expect(zip_package).to be_a(Resync::Client::Zip::ZipPackage)
+
+          bitstreams = zip_package.bitstreams
+          expect(bitstreams.size).to eq(2)
+
+          stream1 = bitstreams[0]
+          expect(stream1.content).to eq(File.read('spec/data/resourcedump/resources/res1'))
+
+          stream2 = bitstreams[1]
+          expect(stream2.content).to eq(File.read('spec/data/resourcedump/resources/res2'))
+        end
+
+        it "works for #{ChangeDump}" do
+          path = 'spec/data/resourcedump/changedump.xml'
+          package_uri = URI('http://example.com/changedump.zip')
+
+          client = instance_double(Client)
+          expect(client).to receive(:download_to_temp_file).once.with(package_uri).and_return('spec/data/resourcedump/resourcedump.zip')
+
+          dump = XMLParser.parse(File.read(path))
+          dump.client = client
+
+          zip_packages = dump.zip_packages
+          expect(zip_packages.size).to eq(1)
+
+          zip_package = zip_packages[0]
+          expect(zip_package).to be_a(Resync::Client::Zip::ZipPackage)
+
+          bitstreams = zip_package.bitstreams
+          expect(bitstreams.size).to eq(2)
+
+          stream1 = bitstreams[0]
+          expect(stream1.content).to eq(File.read('spec/data/resourcedump/resources/res1'))
+
+          stream2 = bitstreams[1]
+          expect(stream2.content).to eq(File.read('spec/data/resourcedump/resources/res2'))
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resync-client
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.1
 platform: ruby
 authors:
 - David Moles
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-04 00:00:00.000000000 Z
+date: 2015-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resync
@@ -19,7 +19,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.1.3
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -160,16 +160,24 @@ files:
 - Rakefile
 - example.rb
 - lib/resync/client.rb
-- lib/resync/client/bitstream.rb
-- lib/resync/client/client.rb
-- lib/resync/client/downloadable.rb
-- lib/resync/client/dump.rb
 - lib/resync/client/http_helper.rb
-- lib/resync/client/resync_extensions.rb
+- lib/resync/client/mixins.rb
+- lib/resync/client/mixins/bitstream_resource.rb
+- lib/resync/client/mixins/bitstream_resource_list.rb
+- lib/resync/client/mixins/client_delegator.rb
+- lib/resync/client/mixins/downloadable.rb
+- lib/resync/client/mixins/link_client_delegate.rb
+- lib/resync/client/mixins/resource_client_delegate.rb
+- lib/resync/client/mixins/zipped_resource.rb
+- lib/resync/client/mixins/zipped_resource_list.rb
 - lib/resync/client/version.rb
-- lib/resync/client/zip_package.rb
-- lib/resync/client/zip_packages.rb
+- lib/resync/client/zip.rb
+- lib/resync/client/zip/bitstream.rb
+- lib/resync/client/zip/zip_package.rb
+- lib/resync/client/zip/zip_packages.rb
+- lib/resync/extensions.rb
 - resync-client.gemspec
+- spec/acceptance/example_spec.rb
 - spec/data/examples/capability-list.xml
 - spec/data/examples/change-dump-manifest.xml
 - spec/data/examples/change-dump.xml
@@ -180,21 +188,26 @@ files:
 - spec/data/examples/resource-list-index.xml
 - spec/data/examples/resource-list.xml
 - spec/data/examples/source-description.xml
+- spec/data/resourcedump/changedump.xml
 - spec/data/resourcedump/manifest.xml
 - spec/data/resourcedump/resourcedump.xml
 - spec/data/resourcedump/resourcedump.zip
 - spec/data/resourcedump/resources/res1
 - spec/data/resourcedump/resources/res2
+- spec/data/simulator/capability-list.xml
+- spec/data/simulator/change-list.xml
+- spec/data/simulator/source-description.xml
+- spec/data/simulator/update.txt
 - spec/rspec_custom_matchers.rb
 - spec/spec_helper.rb
 - spec/todo.rb
 - spec/unit/resync/client/bitstream_spec.rb
 - spec/unit/resync/client/client_spec.rb
-- spec/unit/resync/client/dump_spec.rb
+- spec/unit/resync/client/extensions_spec.rb
 - spec/unit/resync/client/http_helper_spec.rb
-- spec/unit/resync/client/resync_extensions_spec.rb
 - spec/unit/resync/client/zip_package_spec.rb
 - spec/unit/resync/client/zip_packages_spec.rb
+- spec/unit/resync/client/zipped_resource_list_spec.rb
 homepage: http://github.com/dmolesUC3/resync-client
 licenses:
 - MIT
@@ -215,11 +228,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Client library for ResourceSync
 test_files:
+- spec/acceptance/example_spec.rb
 - spec/data/examples/capability-list.xml
 - spec/data/examples/change-dump-manifest.xml
 - spec/data/examples/change-dump.xml
@@ -230,19 +244,24 @@ test_files:
 - spec/data/examples/resource-list-index.xml
 - spec/data/examples/resource-list.xml
 - spec/data/examples/source-description.xml
+- spec/data/resourcedump/changedump.xml
 - spec/data/resourcedump/manifest.xml
 - spec/data/resourcedump/resourcedump.xml
 - spec/data/resourcedump/resourcedump.zip
 - spec/data/resourcedump/resources/res1
 - spec/data/resourcedump/resources/res2
+- spec/data/simulator/capability-list.xml
+- spec/data/simulator/change-list.xml
+- spec/data/simulator/source-description.xml
+- spec/data/simulator/update.txt
 - spec/rspec_custom_matchers.rb
 - spec/spec_helper.rb
 - spec/todo.rb
 - spec/unit/resync/client/bitstream_spec.rb
 - spec/unit/resync/client/client_spec.rb
-- spec/unit/resync/client/dump_spec.rb
+- spec/unit/resync/client/extensions_spec.rb
 - spec/unit/resync/client/http_helper_spec.rb
-- spec/unit/resync/client/resync_extensions_spec.rb
 - spec/unit/resync/client/zip_package_spec.rb
 - spec/unit/resync/client/zip_packages_spec.rb
+- spec/unit/resync/client/zipped_resource_list_spec.rb
 has_rdoc: 

data/lib/resync/client/bitstream.rb

@@ -1,79 +0,0 @@
-module Resync
-
-  # A single entry in a ZIP package.
-  class Bitstream
-
-    # ------------------------------------------------------------
-    # Attributes
-
-    # @return [String] the path to the entry within the ZIP file
-    attr_reader :path
-
-    # @return [Resource] the resource describing this bitstream
-    attr_reader :resource
-
-    # @return [Metadata] the metadata for this bitstream
-    attr_reader :metadata
-
-    # ------------------------------------------------------------
-    # Initializer
-
-    # Creates a new bitstream for the specified resource.
-    #
-    # @param zipfile [Zip::File] The zipfile to read the bitstream from.
-    # @param resource [Resource] The resource describing the bitstream.
-    def initialize(zipfile:, resource:)
-      self.resource = resource
-      @zip_entry = zipfile.find_entry(@path)
-    end
-
-    # ------------------------------------------------------------
-    # Convenience accessors
-
-    # The (uncompressed) size of the bitstream.
-    def size
-      @size ||= @zip_entry.size
-    end
-
-    # The bitstream, as an +IO+-like object. Subsequent
-    # calls will return the same stream.
-    def stream
-      @stream ||= @zip_entry.get_input_stream
-    end
-
-    # The content of the bitstream. The content will be
-    # read only once.
-    def content
-      @content ||= stream.read
-    end
-
-    # The content type of the bitstream, as per {#metadata}.
-    def mime_type
-      @mime_type ||= metadata.mime_type
-    end
-
-    # ------------------------------------------------------------
-    # Private methods
-
-    private
-
-    def resource=(value)
-      fail ArgumentError, 'nil is not a resource' unless value
-      self.metadata = value.metadata
-      @resource = value
-    end
-
-    def metadata=(value)
-      fail 'no metadata found' unless value
-      self.path = value.path
-      @metadata = value
-    end
-
-    def path=(value)
-      fail 'no path found in metadata' unless value
-      @path = value.start_with?('/') ? value.slice(1..-1) : value
-    end
-
-  end
-
-end