active-fedora 7.0.3 → 7.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3901cc3cf493df96f7126b87a79a397cdf8a6e89
-  data.tar.gz: b9135e235d4748bdf1d0fdaa10674ee35bc5bf41
+  metadata.gz: 9e75a0408125225a3ef0ae91e7de53d0560d10a6
+  data.tar.gz: 56de97df291d2239583e16c500f99ab26df355af
 SHA512:
-  metadata.gz: 23029a9d98b89725f27191a61ca3418e9e94e61553679ced67d660f3e7a8de916e7f68e7ac4f0173cf9e67463329f4abf4cdb9588a71f0b4cc0bf8b87af3a1c9
-  data.tar.gz: a6d0708788d1ef3f6781f077b0aba9dab06adcb2a4144f9b4df09e63ff2c4e501ec1ad1986498e68fe49903033b4d2acf2775c76ab32429d26be9abe8e05051b
+  metadata.gz: 3df7b3a6fd7aab417e3c10d589e0fc06bba37cbee05400ea9d4983314cdaf191239b54ed9202a38f75ce1d1e5dbf1b03ec74b60a0ded41856ac3f68c140fdf31
+  data.tar.gz: d43e9f106e4b6f2c59eb12e36fe62c03d0e1b0040f60af2d373247aa25143499c1ce163ae39b75b3de353301a10abcc6535a01ad9e26c2085c0726dff4bd4c9e

data/lib/active_fedora/associations/collection_association.rb

@@ -130,6 +130,14 @@ module ActiveFedora
         end
       end
 
+      def any?
+        if block_given?
+          load_target.any? { |*block_args| yield(*block_args) }
+        else
+          !empty?
+        end
+      end
+
       def to_ary
         load_target.dup
       end

data/lib/active_fedora/querying.rb

@@ -3,7 +3,7 @@ module ActiveFedora
     extend Deprecation
     self.deprecation_horizon = 'active-fedora version 8.0.0'
 
-    delegate :find, :first, :exists?, :where, :limit, :order, :delete_all, 
+    delegate :find, :first, :exists?, :where, :limit, :offset, :order, :delete_all, 
       :destroy_all, :count, :last, :find_with_conditions, :find_in_batches, :find_each, :to=>:all
 
     def self.extended(base)

data/lib/active_fedora/relation.rb

@@ -54,6 +54,7 @@ module ActiveFedora
       return @records if loaded?
       args = @klass == ActiveFedora::Base ? {:cast=>true} : {}
       args[:rows] = limit_value if limit_value
+      args[:start] = offset_value if offset_value
       args[:sort] = order_values if order_values
       
       @records = to_enum(:find_each, where_values, args).to_a
@@ -121,7 +122,7 @@ module ActiveFedora
 
     private
 
-    VALID_FIND_OPTIONS = [:order, :limit, :conditions, :cast]
+    VALID_FIND_OPTIONS = [:order, :limit, :start, :conditions, :cast]
     
     def apply_finder_options(options)
       relation = clone
@@ -131,7 +132,7 @@ module ActiveFedora
       finders = options.dup
       finders.delete_if { |key, value| value.nil? && key != :limit }
 
-      ([:order,:limit] & finders.keys).each do |finder|
+      ([:order,:limit,:start] & finders.keys).each do |finder|
         relation = relation.send(finder, finders[finder])
       end
 

data/lib/active_fedora/relation/query_methods.rb

@@ -37,6 +37,15 @@ module ActiveFedora
       @values[:limit] = value
     end   
 
+    def offset_value
+      @values[:offset]
+    end
+
+    def offset_value=(value)
+      raise ImmutableRelation if loaded?
+      @values[:offset] = value
+    end   
+
     # Limits the returned records to those that match the provided search conditions
     #
     # @option [Hash] opts a hash of solr conditions
@@ -97,6 +106,23 @@ module ActiveFedora
       self
     end
 
+    # Start the returned records at an offset position.
+    # Useful for paginated results
+    #
+    # @option [Integer] value the number of records offset
+    #
+    # @example
+    #  Person.where(name_t: 'Jones').offset(1000)
+    #    => [#<Person @id="foo:123" @name='Jones'>, #<Person @id="foo:125" @name='Jones'>, ...]
+    def offset(value)
+      spawn.offset!(value)
+    end
+
+    def offset!(value)
+      self.offset_value = value
+      self
+    end
+
     def none! # :nodoc:
       extending!(NullRelation)
     end

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "7.0.3"
+  VERSION = "7.0.4"
 end

data/spec/integration/has_many_associations_spec.rb

@@ -21,6 +21,7 @@ describe "Collection members" do
         expect(library.books).not_to be_loaded
         expect(library.books.size).to eq(0)
         expect(library.books).to be_loaded
+        expect(library.books.any?).to be_false
       end
     end
   end
@@ -50,6 +51,11 @@ describe "Collection members" do
     it "should load from solr with options" do
       expect(library.books.load_from_solr(rows: 0).size).to eq(0)
     end
+    it "should respond to #any?" do
+      expect(library.books.any?).to be_true
+      expect(library.books.any? {|book| book.library == nil}).to be_false
+      expect(library.books.any? {|book| book.library == library}).to be_true
+    end
   end
 end
 

data/spec/integration/scoped_query_spec.rb

@@ -76,6 +76,9 @@ describe "scoped queries" do
       it "should limit" do
         ModelIntegrationSpec::Basic.limit(1).should == [test_instance1]
       end
+      it "should offset" do
+        ModelIntegrationSpec::Basic.offset(1).should == [test_instance2, test_instance3]
+      end
 
       it "should chain queries" do
         ModelIntegrationSpec::Basic.where(ActiveFedora::SolrService.solr_name('bar', type: :string) => 'Peanuts').order(ActiveFedora::SolrService.solr_name('foo', :sortable) + ' asc').limit(1).should == [test_instance2]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 7.0.3
+  version: 7.0.4
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-13 00:00:00.000000000 Z
+date: 2014-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr