resync-client 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f077335c97ed2009691229c16b7a09a67dcdd26a
-  data.tar.gz: 6e9ead882a801b98dfcae84a79a144829eafc624
+  metadata.gz: 8314c851c5631164009f9a2d88d0c3d403cc70ad
+  data.tar.gz: 533203c8b735acb0c29063efa8112feb80921e45
 SHA512:
-  metadata.gz: 7e624c546a773172d6001790e28bbd1a1a2ed1dfde653ec2e8b22e30dbd463e1e7390ae335fde5a396bb2b10ee53333582cfbc291a0a7a582d88991332148422
-  data.tar.gz: bc379b7fdbe407d309c6da128724a805dcd88c016750b71d17da4cee7f8b847ec13ba63f2533b476bb7fd948a81e9168a45833938d9713092c08a04646a4bbce
+  metadata.gz: 2be76b5aaf5d2141a009ef77336ebb1d78877971d94a1069e369bb25e97251726b548898f3906e9852097e53cde6ec28f68638bebfd14c90f6c124bddbcd14d9
+  data.tar.gz: 0071b77513fc26fee16832f7885e414801e65c4895df3911c4093b5fff0c187c478209605447db5cf9f27eb97a4ae5e457bb093f436eed3bf7cce0c03fe5439c

data/.gitignore

@@ -15,15 +15,9 @@
 *.a
 mkmf.log
 
-# Rails engine
-
-.bundle/
-log/*.log
-spec/dummy/db/*.sqlite3
-spec/dummy/db/*.sqlite3-journal
-spec/dummy/log/*.log
-spec/dummy/tmp/
-spec/dummy/.sass-cache
+# gem build
+
+*.gem
 
 # IntellJ
 

data/CHANGES.md

@@ -1,3 +1,9 @@
+# 0.2.4
+
+- Added `#all_resources` to transparently download and flatten lists in `ChangeListIndex` and `ResourceListIndex`
+- Added `#all_zip_packages` to transparently download and flatten dumps in `ChangeDumpIndex` and `ResourceDumpIndex`
+- Fix issue where documentation on mixin modules was mistakenly applied to the `Resync` module
+
 # 0.2.3
 
 - Update to depend on [resync](https://github.com/dmolesUC3/resync) 0.2.2

data/lib/resync/client/mixins/bitstream_resource.rb

@@ -1,13 +1,13 @@
 require_relative '../zip'
 
-# A resource that refers to a bitsream within a zipped bitstream package.
-#
-# @!attribute [rw] zip_package_delegate
-#   @return [ZipPackage] the provider of the containing package,
-#     e.g. its manifest
 module Resync
   class Client
     module Mixins
+      # A resource that refers to a bitsream within a zipped bitstream package.
+      #
+      # @!attribute [rw] zip_package_delegate
+      #   @return [ZipPackage] the provider of the containing package,
+      #     e.g. its manifest
       module BitstreamResource
         attr_accessor :zip_package_delegate
 

data/lib/resync/client/mixins/client_delegator.rb

@@ -1,13 +1,13 @@
 require_relative '../../client'
 
-# An object that delegates to another to provide a {Client} for downloading
-# resources and links.
-#
-# @!attribute [rw] client_delegate
-#   @return [#client] The client provider.
 module Resync
   class Client
     module Mixins
+      # An object that delegates to another to provide a {Client} for downloading
+      # resources and links.
+      #
+      # @!attribute [rw] client_delegate
+      #   @return [#client] The client provider.
       module ClientDelegator
         attr_accessor :client_delegate
 

data/lib/resync/client/mixins/downloadable.rb

@@ -1,9 +1,10 @@
+require 'resync'
 require_relative 'client_delegator'
 
-# A downloadable resource or link.
 module Resync
   class Client
     module Mixins
+      # A downloadable resource or link.
       module Downloadable
         prepend ClientDelegator
 
@@ -33,4 +34,12 @@ module Resync
       end
     end
   end
+
+  class Link
+    prepend Client::Mixins::Downloadable
+  end
+
+  class Resource
+    prepend Client::Mixins::Downloadable
+  end
 end

data/lib/resync/client/mixins/{zipped_resource_list.rb → dump.rb}

@@ -1,14 +1,16 @@
+require 'resync'
 require_relative '../zip'
 require_relative 'zipped_resource'
 
-# A list of resources each of which refers to a zipped bitstream package.
 module Resync
   class Client
     module Mixins
-      module ZippedResourceList
+      # A list of resources each of which refers to a zipped bitstream package.
+      module Dump
         def resources=(value)
           super
           resources.each do |r|
+            next if r.respond_to?(:zip_package)
             class << r
               prepend ZippedResource
             end
@@ -23,4 +25,12 @@ module Resync
       end
     end
   end
+
+  class ResourceDump
+    prepend Client::Mixins::Dump
+  end
+
+  class ChangeDump
+    prepend Client::Mixins::Dump
+  end
 end

data/lib/resync/client/mixins/dump_index.rb

@@ -0,0 +1,33 @@
+require 'resync'
+require_relative 'resource_client_delegate'
+
+module Resync
+  class Client
+    module Mixins
+      # A resource container whose resources are {ZippedResourceList}s
+      module DumpIndex
+        prepend ResourceClientDelegate
+
+        # Downloads and parses each resource list and returns a flattened enumeration
+        # of all zip packages in each contained list. Each contained list is only downloaded
+        # as needed, and only downloaded once.
+        # @return [Enumerator::Lazy<Resync::Client::Zip::ZipPackages>] the flattened enumeration of resources
+        def all_zip_packages
+          @zipped_resource_lists ||= {}
+          resources.flat_map do |r|
+            @zipped_resource_lists[r] ||= r.get_and_parse
+            @zipped_resource_lists[r].respond_to?(:zip_packages) ? @zipped_resource_lists[r].zip_packages : []
+          end
+        end
+      end
+    end
+  end
+
+  class ChangeDumpIndex
+    prepend Client::Mixins::DumpIndex
+  end
+
+  class ResourceDumpIndex
+    prepend Client::Mixins::DumpIndex
+  end
+end

data/lib/resync/client/mixins/dump_manifest.rb

@@ -0,0 +1,40 @@
+require 'resync'
+require_relative '../zip'
+require_relative 'bitstream_resource'
+
+module Resync
+  class Client
+    module Mixins
+      # A list of resources within a single zipped bitstream package, e.g. as provided
+      # by the package manifest.
+      #
+      # @!attribute [rw] zip_package
+      #   @return [ZipPackage] the package.
+      module DumpManifest
+        attr_accessor :zip_package
+
+        # Makes each provided resource a {BitstreamResource}
+        # @param value [Array<Resource>] the resources for this list
+        def resources=(value)
+          super
+          resources.each do |r|
+            unless r.respond_to?(:bitstream) && r.respond_to?(:containing_package)
+              class << r
+                prepend BitstreamResource
+              end
+            end
+            r.zip_package_delegate = self
+          end
+        end
+      end
+    end
+  end
+
+  class ResourceDumpManifest
+    prepend Client::Mixins::DumpManifest
+  end
+
+  class ChangeDumpManifest
+    prepend Client::Mixins::DumpManifest
+  end
+end

data/lib/resync/client/mixins/link_client_delegate.rb

@@ -1,9 +1,10 @@
+require 'resync'
 require_relative 'client_delegator'
 
-# A link container that is capable of providing those resources with a {Client}
 module Resync
   class Client
     module Mixins
+      # A link container that is capable of providing those resources with a {Client}
       module LinkClientDelegate
         prepend ClientDelegator
 
@@ -16,4 +17,8 @@ module Resync
       end
     end
   end
+
+  class Augmented
+    prepend Client::Mixins::LinkClientDelegate
+  end
 end

data/lib/resync/client/mixins/list_index.rb

@@ -0,0 +1,33 @@
+require 'resync'
+require_relative 'resource_client_delegate'
+
+module Resync
+  class Client
+    module Mixins
+      # A resource container whose resources are, themselves, resource containers
+      module ListIndex
+        prepend ResourceClientDelegate
+
+        # Downloads and parses each resource list and returns a flattened enumeration
+        # of all resources in each contained list. Each contained list is only downloaded
+        # as needed, and only downloaded once.
+        # @return [Enumerator::Lazy<Resync::Resource>] the flattened enumeration of resources
+        def all_resources
+          @resource_lists ||= {}
+          resources.flat_map do |r|
+            @resource_lists[r] ||= r.get_and_parse
+            @resource_lists[r].resources
+          end
+        end
+      end
+    end
+  end
+
+  class ChangeListIndex
+    prepend Client::Mixins::ListIndex
+  end
+
+  class ResourceListIndex
+    prepend Client::Mixins::ListIndex
+  end
+end

data/lib/resync/client/mixins/resource_client_delegate.rb

@@ -1,9 +1,10 @@
+require 'resync'
 require_relative 'client_delegator'
 
-# A resource container that is capable of providing those resources with a {Client}
 module Resync
   class Client
     module Mixins
+      # A resource container that is capable of providing those resources with a {Client}
       module ResourceClientDelegate
         prepend ClientDelegator
 
@@ -16,4 +17,8 @@ module Resync
       end
     end
   end
+
+  class BaseResourceList
+    prepend Client::Mixins::ResourceClientDelegate
+  end
 end

data/lib/resync/client/mixins/zipped_resource.rb

@@ -1,10 +1,10 @@
 require_relative '../zip'
 require_relative 'downloadable'
 
-# A resource that refers to a zipped bitstream package.
 module Resync
   class Client
     module Mixins
+      # A resource that refers to a zipped bitstream package.
       module ZippedResource
         prepend Downloadable
 
@@ -12,6 +12,7 @@ module Resync
         # it to a temporary file if necessary.
         # @return [Resync::Client::Zip::ZipPackage] the zipped contents of this resource
         def zip_package
+          puts self
           @zip_package ||= Resync::Client::Zip::ZipPackage.new(download_to_temp_file)
         end
       end

data/lib/resync/client/version.rb

@@ -1,6 +1,6 @@
 module Resync
   class Client
     # The version of this gem.
-    VERSION = '0.2.3'
+    VERSION = '0.2.4'
   end
 end

data/lib/resync/client/zip/zip_package.rb

@@ -1,6 +1,6 @@
 require 'zip'
 require 'resync'
-require_relative '../../extensions'
+require_relative '../mixins'
 require_relative 'bitstream'
 
 module Resync

data/lib/resync/client/zip/zip_packages.rb

@@ -1,5 +1,5 @@
 require 'resync'
-require_relative '../../extensions'
+require_relative '../mixins'
 require_relative 'zip_package'
 
 module Resync
@@ -53,6 +53,16 @@ module Resync
             yield package_for(resource)
           end
         end
+
+        # Eagerly gets the zip package for each resource, downloading
+        # as necessary. (For compatbility with {::Enumerator::Lazy#flat_map})
+        # @return [Array<ZipPackage>] the zip package for each resource
+        def force
+          @resources.map { |r| package_for(r) }.to_a
+        end
+
+        # Alias for {#force} (for compatbility with {::Enumerable#flat_map})
+        alias_method :to_ary, :force
       end
     end
   end

data/lib/resync/client.rb

@@ -1,5 +1,5 @@
 require 'resync'
-require_relative 'extensions'
+require_relative 'client/mixins'
 
 Dir.glob(File.expand_path('../client/*.rb', __FILE__), &method(:require))
 

data/spec/data/examples/resource-list-1.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"
+        xmlns:rs="http://www.openarchives.org/rs/terms/">
+  <rs:ln rel="up"
+         href="http://example.com/dataset1/capabilitylist.xml"/>
+  <rs:ln rel="index"
+         href="http://example.com/dataset1/resourcelist-index.xml"/>
+  <rs:md capability="resourcelist"
+         at="2013-01-03T09:00:00Z"/>
+  <url>
+    <loc>http://example.com/res1</loc>
+    <lastmod>2013-01-02T13:00:00Z</lastmod>
+    <rs:md hash="md5:1584abdf8ebdc9802ac0c6a7402c8753"
+           length="4385"
+           type="application/pdf"/>
+  </url>
+  <url>
+    <loc>http://example.com/res2</loc>
+    <lastmod>2013-01-02T14:00:00Z</lastmod>
+    <rs:md hash="md5:4556abdf8ebdc9802ac0c6a7402c9881"
+           length="883"
+           type="image/png"/>
+  </url>
+</urlset>

data/spec/data/examples/resource-list-2.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"
+        xmlns:rs="http://www.openarchives.org/rs/terms/">
+  <rs:ln rel="up"
+         href="http://example.com/dataset1/capabilitylist.xml"/>
+  <rs:ln rel="index"
+         href="http://example.com/dataset1/resourcelist-index.xml"/>
+  <rs:md capability="resourcelist"
+         at="2013-01-03T09:00:00Z"/>
+  <url>
+    <loc>http://example.com/res3</loc>
+    <lastmod>2013-01-02T13:00:00Z</lastmod>
+    <rs:md hash="md5:1584abdf8ebdc9802ac0c6a7402c8753"
+           length="4385"
+           type="application/pdf"/>
+  </url>
+  <url>
+    <loc>http://example.com/res4</loc>
+    <lastmod>2013-01-02T14:00:00Z</lastmod>
+    <rs:md hash="md5:4556abdf8ebdc9802ac0c6a7402c9881"
+           length="883"
+           type="image/png"/>
+  </url>
+</urlset>

data/spec/data/examples/resource-list-3.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"
+        xmlns:rs="http://www.openarchives.org/rs/terms/">
+  <rs:ln rel="up"
+         href="http://example.com/dataset1/capabilitylist.xml"/>
+  <rs:ln rel="index"
+         href="http://example.com/dataset1/resourcelist-index.xml"/>
+  <rs:md capability="resourcelist"
+         at="2013-01-03T09:00:00Z"/>
+  <url>
+    <loc>http://example.com/res5</loc>
+    <lastmod>2013-01-02T13:00:00Z</lastmod>
+    <rs:md hash="md5:1584abdf8ebdc9802ac0c6a7402c8753"
+           length="4385"
+           type="application/pdf"/>
+  </url>
+  <url>
+    <loc>http://example.com/res6</loc>
+    <lastmod>2013-01-02T14:00:00Z</lastmod>
+    <rs:md hash="md5:4556abdf8ebdc9802ac0c6a7402c9881"
+           length="883"
+           type="image/png"/>
+  </url>
+</urlset>

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

@@ -0,0 +1,108 @@
+require 'spec_helper'
+
+module Resync
+  class Client
+    module Mixins
+      describe DumpIndex do
+        before(:each) do
+          @helper = instance_double(Client::HTTPHelper)
+          @client = Client.new(helper: @helper)
+        end
+
+        describe '#all_zip_packages' do
+          it 'flattens the child resourcelists' do
+            resources = Array.new(6) { instance_double(ZippedResource) }
+            all_zip_packages = Array.new(6) do |i|
+              zip_package = instance_double(Zip::ZipPackage)
+              expect(resources[i]).to receive(:zip_package).once.and_return(zip_package)
+              allow(resources[i]).to receive(:client_delegate=)
+              zip_package
+            end
+
+            dump1 = ResourceDump.new(resources: resources[0, 3])
+            dump2 = ResourceDump.new(resources: resources[3, 3])
+
+            dump1_resource = instance_double(Resource)
+            allow(dump1_resource).to receive(:client_delegate=)
+            expect(dump1_resource).to receive(:get_and_parse).and_return(dump1)
+
+            dump2_resource = instance_double(Resource)
+            allow(dump2_resource).to receive(:client_delegate=)
+            expect(dump2_resource).to receive(:get_and_parse).and_return(dump2)
+
+            index = ResourceDumpIndex.new(resources: [dump1_resource, dump2_resource])
+            all_packages = index.all_zip_packages
+
+            expect(all_packages.to_a).to eq(all_zip_packages)
+          end
+
+          it 'is lazy enough not to download anything till it\'s iterated' do
+            dump1_resource = instance_double(Resource)
+            allow(dump1_resource).to receive(:client_delegate=)
+            expect(dump1_resource).not_to receive(:get_and_parse)
+
+            dump2_resource = instance_double(Resource)
+            allow(dump2_resource).to receive(:client_delegate=)
+            expect(dump2_resource).not_to receive(:get_and_parse)
+
+            index = ResourceDumpIndex.new(resources: [dump1_resource, dump2_resource])
+            index.all_zip_packages
+          end
+
+          it 'is lazy enough not to download resources it doesn\'t need' do
+            resources = Array.new(3) { instance_double(ZippedResource) }
+            resources.each do |r|
+              allow(r).to receive(:client_delegate=)
+              zip_package = instance_double(Zip::ZipPackage)
+              expect(r).to receive(:zip_package).once.and_return(zip_package)
+            end
+
+            dump1 = ResourceDump.new(resources: resources[0, 3])
+
+            dump1_resource = instance_double(Resource)
+            allow(dump1_resource).to receive(:client_delegate=)
+            expect(dump1_resource).to receive(:get_and_parse).and_return(dump1)
+
+            dump2_resource = instance_double(Resource)
+            allow(dump2_resource).to receive(:client_delegate=)
+            expect(dump2_resource).not_to receive(:get_and_parse)
+
+            index = ResourceDumpIndex.new(resources: [dump1_resource, dump2_resource])
+            index.all_zip_packages.each_with_index do |_, i|
+              break if i >= 2
+            end
+          end
+
+          it 'caches downloaded resources' do
+            resources = Array.new(6) { instance_double(ZippedResource) }
+            resources.each do |r|
+              allow(r).to receive(:client_delegate=)
+              zip_package = instance_double(Zip::ZipPackage)
+              expect(r).to receive(:zip_package).once.and_return(zip_package)
+            end
+
+            dump1 = ResourceDump.new(resources: resources[0, 3])
+            dump2 = ResourceDump.new(resources: resources[3, 3])
+
+            dump1_resource = instance_double(Resource)
+            allow(dump1_resource).to receive(:client_delegate=)
+            expect(dump1_resource).to receive(:get_and_parse).once.and_return(dump1)
+
+            dump2_resource = instance_double(Resource)
+            allow(dump2_resource).to receive(:client_delegate=)
+            expect(dump2_resource).to receive(:get_and_parse).once.and_return(dump2)
+
+            index = ResourceDumpIndex.new(resources: [dump1_resource, dump2_resource])
+            all_packages = index.all_zip_packages
+
+            a1 = all_packages.to_a
+            a2 = all_packages.to_a
+            a1.each_with_index do |pkg, i|
+              expect(pkg).to be(a2[i])
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/spec/unit/resync/client/{zipped_resource_list_spec.rb → dump_spec.rb}

@@ -3,7 +3,7 @@ require 'spec_helper'
 module Resync
   class Client
     module Mixins
-      describe ZippedResourceList do
+      describe Dump do
         it "works for #{ResourceDump}" do
           path = 'spec/data/resourcedump/resourcedump.xml'
           package_uri = URI('http://example.com/resourcedump.zip')

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

@@ -0,0 +1,107 @@
+require 'spec_helper'
+
+module Resync
+  class Client
+    module Mixins
+      describe ListIndex do
+        before(:each) do
+          @helper = instance_double(Client::HTTPHelper)
+          @client = Client.new(helper: @helper)
+        end
+
+        describe '#all_resources' do
+          it 'flattens the child resourcelists' do
+            index_uri = URI('http://example.com/resource-list-index.xml')
+            index_data = File.read('spec/data/examples/resource-list-index.xml')
+            expect(@helper).to receive(:fetch).with(uri: index_uri).and_return(index_data)
+
+            list_1_uri = URI('http://example.com/resourcelist1.xml')
+            list_1_data = File.read('spec/data/examples/resource-list-1.xml')
+            expect(@helper).to receive(:fetch).with(uri: list_1_uri).once.and_return(list_1_data)
+
+            list_1_uri = URI('http://example.com/resourcelist2.xml')
+            list_1_data = File.read('spec/data/examples/resource-list-2.xml')
+            expect(@helper).to receive(:fetch).with(uri: list_1_uri).once.and_return(list_1_data)
+
+            list_1_uri = URI('http://example.com/resourcelist3.xml')
+            list_1_data = File.read('spec/data/examples/resource-list-3.xml')
+            expect(@helper).to receive(:fetch).with(uri: list_1_uri).once.and_return(list_1_data)
+
+            index = @client.get_and_parse(index_uri)
+            all_resources = index.all_resources.to_a
+            expect(all_resources.size).to eq(6)
+            all_resources.each_with_index do |r, i|
+              expected_uri = URI("http://example.com/res#{i + 1}")
+              expect(r.uri).to eq(expected_uri)
+            end
+          end
+
+          it 'is lazy enough not to download anything till it \'s iterated ' do
+            index_uri = URI('http://example.com/resource-list-index.xml')
+            index_data = File.read('spec/data/examples/resource-list-index.xml')
+            expect(@helper).to receive(:fetch).with(uri: index_uri).and_return(index_data)
+
+            list_1_uri = URI('http://example.com/resourcelist1.xml')
+            expect(@helper).not_to receive(:fetch).with(uri: list_1_uri)
+
+            list_1_uri = URI('http://example.com/resourcelist2.xml')
+            expect(@helper).not_to receive(:fetch).with(uri: list_1_uri)
+
+            list_1_uri = URI('http://example.com/resourcelist3.xml')
+            expect(@helper).not_to receive(:fetch).with(uri: list_1_uri)
+
+            index = @client.get_and_parse(index_uri)
+            index.all_resources
+          end
+
+          it 'is lazy enough not to download resources it doesn\'t need' do
+            index_uri = URI('http://example.com/resource-list-index.xml')
+            index_data = File.read('spec/data/examples/resource-list-index.xml')
+            expect(@helper).to receive(:fetch).with(uri: index_uri).and_return(index_data)
+
+            list_1_uri = URI('http://example.com/resourcelist1.xml')
+            list_1_data = File.read('spec/data/examples/resource-list-1.xml')
+            expect(@helper).to receive(:fetch).with(uri: list_1_uri).once.and_return(list_1_data)
+
+            list_1_uri = URI('http://example.com/resourcelist2.xml')
+            list_1_data = File.read('spec/data/examples/resource-list-2.xml')
+            expect(@helper).to receive(:fetch).with(uri: list_1_uri).once.and_return(list_1_data)
+
+            list_1_uri = URI('http://example.com/resourcelist3.xml')
+            expect(@helper).not_to receive(:fetch).with(uri: list_1_uri)
+
+            index = @client.get_and_parse(index_uri)
+            index.all_resources.each_with_index do |_, i|
+              break if i >= 3
+            end
+          end
+
+          it 'caches downloaded resources' do
+            index_uri = URI('http://example.com/resource-list-index.xml')
+            index_data = File.read('spec/data/examples/resource-list-index.xml')
+            expect(@helper).to receive(:fetch).with(uri: index_uri).and_return(index_data)
+
+            list_1_uri = URI('http://example.com/resourcelist1.xml')
+            list_1_data = File.read('spec/data/examples/resource-list-1.xml')
+            expect(@helper).to receive(:fetch).with(uri: list_1_uri).once.and_return(list_1_data)
+
+            list_1_uri = URI('http://example.com/resourcelist2.xml')
+            list_1_data = File.read('spec/data/examples/resource-list-2.xml')
+            expect(@helper).to receive(:fetch).with(uri: list_1_uri).once.and_return(list_1_data)
+
+            list_1_uri = URI('http://example.com/resourcelist3.xml')
+            list_1_data = File.read('spec/data/examples/resource-list-3.xml')
+            expect(@helper).to receive(:fetch).with(uri: list_1_uri).once.and_return(list_1_data)
+
+            index = @client.get_and_parse(index_uri)
+            a1 = index.all_resources.to_a
+            a2 = index.all_resources.to_a
+            a1.each_with_index do |r, i|
+              expect(r).to be(a2[i])
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -29,6 +29,30 @@ module Resync
           expect(zip_packages[1]).to be(zip_package)
         end
 
+        it 'flatmaps' do
+          resources = Array.new(6) { |i| Resource.new(uri: "http://example.org/res#{i}") }
+          all_packages = Array.new(6) do |i|
+            zip_package = instance_double(ZipPackage)
+            expect(resources[i]).to receive(:zip_package).once.and_return(zip_package)
+            zip_package
+          end
+
+          zip_packages_1 = ZipPackages.new(resources[0, 3])
+          zip_packages_2 = ZipPackages.new(resources[3, 3])
+
+          zrl1 = instance_double(Resync::Client::Mixins::Dump)
+          expect(zrl1).to receive(:zip_packages).twice.and_return(zip_packages_1)
+
+          zrl2 = instance_double(Resync::Client::Mixins::Dump)
+          expect(zrl2).to receive(:zip_packages).twice.and_return(zip_packages_2)
+
+          flat_mapped = [zrl1, zrl2].flat_map(&:zip_packages)
+          expect(flat_mapped).to eq(all_packages)
+
+          lazy_flat_mapped = [zrl1, zrl2].lazy.flat_map(&:zip_packages).to_a
+          expect(lazy_flat_mapped).to eq(all_packages)
+        end
+
         it 'supports lazy iteration' do
           manifests = Array.new(3) { instance_double(ChangeDumpManifest) }
           all_packages = Array.new(3) do |index|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resync-client
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - David Moles
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-10 00:00:00.000000000 Z
+date: 2015-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resync
@@ -163,19 +163,20 @@ files:
 - lib/resync/client/http_helper.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/dump.rb
+- lib/resync/client/mixins/dump_index.rb
+- lib/resync/client/mixins/dump_manifest.rb
 - lib/resync/client/mixins/link_client_delegate.rb
+- lib/resync/client/mixins/list_index.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.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
@@ -185,6 +186,9 @@ files:
 - spec/data/examples/change-list.xml
 - spec/data/examples/resource-dump-manifest.xml
 - spec/data/examples/resource-dump.xml
+- spec/data/examples/resource-list-1.xml
+- spec/data/examples/resource-list-2.xml
+- spec/data/examples/resource-list-3.xml
 - spec/data/examples/resource-list-index.xml
 - spec/data/examples/resource-list.xml
 - spec/data/examples/source-description.xml
@@ -203,11 +207,13 @@ files:
 - spec/todo.rb
 - spec/unit/resync/client/bitstream_spec.rb
 - spec/unit/resync/client/client_spec.rb
+- spec/unit/resync/client/dump_index_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/list_index_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
@@ -241,6 +247,9 @@ test_files:
 - spec/data/examples/change-list.xml
 - spec/data/examples/resource-dump-manifest.xml
 - spec/data/examples/resource-dump.xml
+- spec/data/examples/resource-list-1.xml
+- spec/data/examples/resource-list-2.xml
+- spec/data/examples/resource-list-3.xml
 - spec/data/examples/resource-list-index.xml
 - spec/data/examples/resource-list.xml
 - spec/data/examples/source-description.xml
@@ -259,9 +268,11 @@ test_files:
 - spec/todo.rb
 - spec/unit/resync/client/bitstream_spec.rb
 - spec/unit/resync/client/client_spec.rb
+- spec/unit/resync/client/dump_index_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/list_index_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/mixins/bitstream_resource_list.rb

@@ -1,29 +0,0 @@
-require_relative '../zip'
-require_relative 'bitstream_resource'
-
-# A list of resources within a single zipped bitstream package, e.g. as provided
-# by the package manifest.
-#
-# @!attribute [rw] zip_package
-#   @return [ZipPackage] the package.
-module Resync
-  class Client
-    module Mixins
-      module BitstreamResourceList
-        attr_accessor :zip_package
-
-        # Makes each provided resource a {BitstreamResource}
-        # @param value [Array<Resource>] the resources for this list
-        def resources=(value)
-          super
-          resources.each do |r|
-            class << r
-              prepend BitstreamResource
-            end
-            r.zip_package_delegate = self
-          end
-        end
-      end
-    end
-  end
-end

data/lib/resync/extensions.rb

@@ -1,36 +0,0 @@
-require 'resync'
-require_relative 'client/mixins'
-
-module Resync
-  class Link
-    prepend Client::Mixins::Downloadable
-  end
-
-  class Augmented
-    prepend Client::Mixins::LinkClientDelegate
-  end
-
-  class Resource
-    prepend Client::Mixins::Downloadable
-  end
-
-  class BaseResourceList
-    prepend Client::Mixins::ResourceClientDelegate
-  end
-
-  class ResourceDump
-    prepend Client::Mixins::ZippedResourceList
-  end
-
-  class ChangeDump
-    prepend Client::Mixins::ZippedResourceList
-  end
-
-  class ResourceDumpManifest
-    prepend Client::Mixins::BitstreamResourceList
-  end
-
-  class ChangeDumpManifest
-    prepend Client::Mixins::BitstreamResourceList
-  end
-end