active-fedora 11.5.2 → 11.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14275b6ec2b5836760ce47c632554e20160063d6
-  data.tar.gz: 9d3d7a2259a002ec20c0759d71d4b472bd01ef3e
+  metadata.gz: 82489148096d04557ef8d858f4cb07d7e4893f26
+  data.tar.gz: d7eb6b00994bc3c60359530a62a226d8a22e22b2
 SHA512:
-  metadata.gz: 68fc369d036b028c650996cdcd4f9d603f1fc52f3c86f91883b15804514e9b31cb11733d5d9dc8d81a1dbbbd3043abb973a3a45427cc20a236eefe6042b8dca2
-  data.tar.gz: 738d06eb6a8230daeeb2db7bca772107846ba0cf1684bd25b47e8404f44d6cd689cbd4dfbb16d14d50e705c38a2282db5f1f3c3ec70806d95396b94d7db518e4
+  metadata.gz: 4e721577c65e61ce86bc4e91e4e226d06f377e3525aa484ae35de7fef4f949c9ee838a5df04d8799bf259a84d26264ab85e167d4b90a97f19951c5fa9f8dbfe5
+  data.tar.gz: 8947ac75e8ec68786c8bb0a9707b8806a41e8eeaddb79a840d3485e0ba8bfe099dde638d68052da0dcef3d2a196f193757c1cfa0a19e78e7feadf055994a742c

data/active-fedora.gemspec

@@ -16,8 +16,8 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'rsolr', '>= 1.1.2', '< 3'
   s.add_dependency 'solrizer', '>= 3.4', '< 5'
-  s.add_dependency "activesupport", '>= 4.2.4', '< 6'
-  s.add_dependency "activemodel", '>= 4.2', '< 6'
+  s.add_dependency "activesupport", '>= 4.2.4', '< 5.2'
+  s.add_dependency "activemodel", '>= 4.2', '< 5.2'
   s.add_dependency "active-triples", '>= 0.11.0', '< 2.0.0'
   s.add_dependency "deprecation"
   s.add_dependency "ldp", '~> 0.7.0'
@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rdoc"
   s.add_development_dependency "yard"
   s.add_development_dependency "rake"
-  s.add_development_dependency "solr_wrapper", "~> 1.0"
+  s.add_development_dependency "solr_wrapper", "~> 2.0"
   s.add_development_dependency 'fcrepo_wrapper', '~> 0.2'
   s.add_development_dependency "rspec", "~> 3.0"
   s.add_development_dependency "rspec-its"

data/lib/active_fedora/associations/collection_proxy.rb

@@ -41,6 +41,8 @@ module ActiveFedora
         merge! association.scope(nullify: false)
       end
 
+      delegate :each, to: :to_a
+
       def target
         @association.target
       end

data/lib/active_fedora/relation.rb

@@ -144,6 +144,16 @@ module ActiveFedora
       @scope_for_create ||= where_values_hash.merge(create_with_value)
     end
 
+    def each
+      if loaded?
+        @records.each { |item| yield item } if block_given?
+        @records.to_enum
+      else
+        find_each(where_values) { |item| yield item } if block_given?
+        enum_for(:find_each, where_values)
+      end
+    end
+
     private
 
       VALID_FIND_OPTIONS = [:order, :limit, :start, :conditions, :cast].freeze

data/lib/active_fedora/relation/delegation.rb

@@ -13,7 +13,8 @@ module ActiveFedora
       :keep_if, :pop, :shift, :delete_at, :select!
     ].to_set
 
-    delegate :length, :collect, :map, :each, :all?, :include?, :to_ary, to: :to_a
+    delegate :length, :map, :to_ary, to: :to_a
+    delegate :all?, :blank?, :collect, :include?, :present?, to: :each
 
     protected
 

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "11.5.2".freeze
+  VERSION = "11.5.3".freeze
 end

data/spec/integration/relation_spec.rb

@@ -39,7 +39,36 @@ describe ActiveFedora::Base do
 
       it "does not reload" do
         expect_any_instance_of(ActiveFedora::Relation).to_not receive :find_each
-        libraries[0]
+        libraries.each(&:id)
+      end
+    end
+
+    describe '#each' do
+      before { Book.create }
+
+      it 'returns an enumerator' do
+        expect(libraries.each).to be_a Enumerator
+      end
+
+      it 'yields the items' do
+        expect { |b| libraries.each(&b) }
+          .to yield_successive_args(*Library.all.to_a)
+      end
+
+      it 'when called from Base yields all items' do
+        expect { |b| described_class.all.each(&b) }
+          .to yield_successive_args(*(Library.all.to_a + Book.all.to_a))
+      end
+
+      context 'when cached' do
+        it 'returns an enumerator' do
+          expect(libraries.each).to be_a Enumerator
+        end
+
+        it 'yields the items' do
+          expect { |b| libraries.each(&b) }
+            .to yield_successive_args(*Library.all.to_a)
+        end
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 11.5.2
+  version: 11.5.3
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-08 00:00:00.000000000 Z
+date: 2018-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -61,7 +61,7 @@ dependencies:
         version: 4.2.4
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -71,7 +71,7 @@ dependencies:
         version: 4.2.4
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
@@ -81,7 +81,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -91,7 +91,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: active-triples
   requirement: !ruby/object:Gem::Requirement
@@ -244,14 +244,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: fcrepo_wrapper
   requirement: !ruby/object:Gem::Requirement