active-fedora 7.0.0.pre3 → 7.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 326d249cd4fae27ff020852f7f76213ebc79f29f
-  data.tar.gz: 4a71080c33394383361845919afe864472eedf27
+  metadata.gz: 155ad613119b5eb0ce0333d32c7bb0fb67009847
+  data.tar.gz: d02a5f3a7617168e35a90ff28dec878ef8ec46cf
 SHA512:
-  metadata.gz: 0191dcb8e84050abc5869f1ec0d5003195774421929e1ddb8e7f31d461eca505458af240f3ca9f4eefee323c62d819bf34b8cf9a12fdbf1c118ce4ab5c9040c2
-  data.tar.gz: 21202208679bb2bd1982377c60a597ab07bc70923d68bedeb31e45476e1b984b530e80e6d44357a2b567ffb83badc7a04bbd3f1a90079aa3be4ea5e340ac6fdb
+  metadata.gz: 0ce6042eaaeca85fc1d000a6fdb593e8ef30cf7fd614e5f9a0a973fa5e33ff3b3a4c9d85ad02e2e9f4d5be3a7742d63f3634181842910aad93efb5d223557bbd
+  data.tar.gz: 798590c4f7b93fe8b3cde0149162806bf7f6da20cbac133bdf11eb17ef18fce5cb3004a149c68243e29e3600b3c6ff1fbca9ddf126af320b1c6da4be1ac25702

data/lib/active_fedora/datastream_attribute.rb

@@ -21,7 +21,7 @@ module ActiveFedora
       if @datastream.respond_to?(:primary_solr_name)
         @datastream.primary_solr_name(field)
       else
-        raise IllegalOperation, "the datastream '#{datastream_class}' doesn't respond to 'primary_solr_name'"
+        raise NoMethodError, "the datastream '#{datastream_class}' doesn't respond to 'primary_solr_name'"
       end
     end
 
@@ -29,7 +29,7 @@ module ActiveFedora
       if datastream_class.respond_to?(:type)
         datastream_class.type(field)
       else
-        raise IllegalOperation, "the datastream '#{datastream_class}' doesn't respond to 'type'"
+        raise NoMethodError, "the datastream '#{datastream_class}' doesn't respond to 'type'"
       end
     end
 
@@ -53,21 +53,24 @@ module ActiveFedora
       this = self
       self.reader = lambda do |*opts|
         if inner_object.is_a? SolrDigitalObject
-          # Look in the cache
-          # TODO catch a non-cached error and try fedora.
-          inner_object.fetch(this.field)
+          begin
+            # Look in the cache
+            return inner_object.fetch(this.field)
+          rescue NoMethodError => e
+            # couldn't get it from solr, so try from fedora.
+            logger.info "Couldn't get #{this.field} out of solr, because #{e.message}. Trying another way."
+          end
+        end
+        # Load from fedora
+        ds = datastream_for_attribute(this.dsid)
+        if ds.kind_of?(ActiveFedora::RDFDatastream)
+          ds.send(this.field)
         else
-          # Load from fedora
-          ds = datastream_for_attribute(this.dsid)
-          if ds.kind_of?(ActiveFedora::RDFDatastream)
-            ds.send(this.field)
+          terminology = this.at || [this.field]
+          if terminology.length == 1 && opts.present?
+            ds.send(terminology.first, *opts)
           else
-            terminology = this.at || [this.field]
-            if terminology.length == 1 && opts.present?
-              ds.send(terminology.first, *opts)
-            else
-              ds.send(:term_values, *terminology)
-            end
+            ds.send(:term_values, *terminology)
           end
         end
       end

data/lib/active_fedora/om_datastream.rb

@@ -413,6 +413,7 @@ module ActiveFedora
 
     #override OM::XML::term_values so can lazy load from solr if this datastream initialized using +from_solr+
     def term_values(*term_pointer)
+      # TODO if we can add primary_solr_name onto OmDatastream, we may be able to do away with get_values_from_solr.
       if @internal_solr_doc
         #lazy load values from solr on demand
         get_values_from_solr(*term_pointer)

data/lib/active_fedora/relation.rb

@@ -16,6 +16,13 @@ module ActiveFedora
       @values = {}
     end
 
+    # This method gets called on clone
+    def initialize_copy(other)
+      # Dup the values
+      @values = Hash[@values]
+      reset
+    end
+
     # Tries to create a new record with the same scoped attributes
     # defined in the relation. Returns the initialized object if validation fails.
     #
@@ -43,19 +50,6 @@ module ActiveFedora
       self
     end
 
-    # Limits the number of returned records to the value specified
-    #
-    # @option [Integer] value the number of records to return
-    #
-    # @example
-    #  Person.where(name_t: 'Jones').limit(10)
-    #    => [#<Person @id="foo:123" @name='Jones'>, #<Person @id="foo:125" @name='Jones'>, ...]
-    def limit(value)
-      relation = clone
-      relation.limit_value = value
-      relation
-    end
-
     # Limits the returned records to those that match the provided search conditions
     #
     # @option [Hash] opts a hash of solr conditions

data/lib/active_fedora/relation/query_methods.rb

@@ -37,6 +37,22 @@ module ActiveFedora
       @values[:limit] = value
     end   
 
+    # Limits the number of returned records to the value specified
+    #
+    # @option [Integer] value the number of records to return
+    #
+    # @example
+    #  Person.where(name_t: 'Jones').limit(10)
+    #    => [#<Person @id="foo:123" @name='Jones'>, #<Person @id="foo:125" @name='Jones'>, ...]
+    def limit(value)
+      spawn.limit!(value)
+    end
+
+    def limit!(value)
+      self.limit_value = value
+      self
+    end
+
     def none! # :nodoc:
       extending!(NullRelation)
     end

data/lib/active_fedora/solr_digital_object.rb

@@ -43,17 +43,16 @@ module ActiveFedora
       self
     end
 
-    def fetch(field)
+    def fetch(field, default=[])
       attribute = original_class.defined_attributes[field]
       field_name = attribute.primary_solr_name
-      if field_name
-       val = solr_doc.fetch field_name
-       case attribute.type
-       when :date
-         val.is_a?(Array) ? val.map{|v| Date.parse v} : Date.parse(val)
-       else
-         val
-       end
+      raise KeyError, "Tried to fetch `#{field}' from solr, but it isn't indexed." unless field_name
+      val = solr_doc.fetch field_name, default
+      case attribute.type
+      when :date
+        val.is_a?(Array) ? val.map{|v| Date.parse v} : Date.parse(val)
+      else
+        val
       end
     end
     

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "7.0.0.pre3"
+  VERSION = "7.0.0.rc1"
 end

data/spec/integration/load_from_solr_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe "Loading from solr" do
   before do
-    class MyDatastream < ActiveFedora::NtriplesRDFDatastream
+    class MyRdfDatastream < ActiveFedora::NtriplesRDFDatastream
       map_predicates do |map|
         map.title(in: RDF::DC) do |index|
           index.as :stored_searchable, :facetable
@@ -20,21 +20,31 @@ describe "Loading from solr" do
         map.related_url(to: "seeAlso", in: RDF::RDFS)
       end
     end
+    class MyOmDatastream < ActiveFedora::OmDatastream
+      set_terminology do |t|
+        t.root(path: "animals")
+        t.duck(index_as: :stored_searchable)
+      end
+    end
     class RdfTest < ActiveFedora::Base 
-      has_metadata :name=>'rdf', :type=>MyDatastream
+      has_metadata 'rdf', type: MyRdfDatastream
+      has_metadata 'om', type: MyOmDatastream
       has_attributes :based_near, :related_url, :part, :date_uploaded, datastream: 'rdf', multiple: true
       has_attributes :title, :identifier, datastream: 'rdf', multiple: false
+      has_attributes :duck, datastream: 'om', multiple: false
     end
   end
 
   let!(:original) { RdfTest.create!(title: "PLAN 9 FROM OUTER SPACE",
                                     date_uploaded: Date.parse('1959-01-01'),
+                                    duck: "quack",
                                    identifier: 12345) }
 
   after do
     original.destroy
     Object.send(:remove_const, :RdfTest)
-    Object.send(:remove_const, :MyDatastream)
+    Object.send(:remove_const, :MyRdfDatastream)
+    Object.send(:remove_const, :MyOmDatastream)
   end
 
   it "should be able to get indexed properties without loading from fedora" do
@@ -43,6 +53,9 @@ describe "Loading from solr" do
     expect(obj.title).to eq "PLAN 9 FROM OUTER SPACE"
     expect(obj.date_uploaded).to eq [Date.parse('1959-01-01')]
     expect(obj.identifier).to eq 12345
-    expect(obj.part).to be_nil # since it wasn't indexed 
+    expect{obj.part}.to raise_error KeyError, "Tried to fetch `part' from solr, but it isn't indexed."
+    expect(ActiveFedora::DatastreamAttribute.logger).to receive(:info).with "Couldn't get duck out of solr, because the datastream 'MyOmDatastream' doesn't respond to 'primary_solr_name'. Trying another way."
+    expect(obj.duck).to eq 'quack'
   end
+
 end

data/spec/integration/scoped_query_spec.rb

@@ -84,6 +84,12 @@ describe "scoped queries" do
       it "should chain count" do
         ModelIntegrationSpec::Basic.where(ActiveFedora::SolrService.solr_name('bar', type: :string) => 'Peanuts').count.should == 2 
       end
+
+      it "calling first should not affect the relation's ability to get all results later" do
+        relation = ModelIntegrationSpec::Basic.where(ActiveFedora::SolrService.solr_name('bar', type: :string) => 'Peanuts')
+        expect {relation.first}.not_to change {relation.to_a.size}
+      end
+
     end
 
     describe "when one of the objects in solr isn't in fedora" do

data/spec/unit/solr_digital_object_spec.rb

@@ -18,6 +18,47 @@ describe ActiveFedora::SolrDigitalObject do
     end
   end
 
+  describe "fetch" do
+    before do
+      class MyDatastream
+        def initialize(_, _)
+        end
+
+        def primary_solr_name(field)
+          return if field == :publisher
+          "#{field}_tesim"
+        end
+        def self.type(field)
+          :string
+        end
+      end
+      class MyModel < ActiveFedora::Base
+        has_metadata 'descMetadata', type: MyDatastream
+        has_attributes :title, :author, :publisher, datastream: 'descMetadata'
+      end
+
+    end
+    after do
+      Object.send(:remove_const, :MyModel)
+      Object.send(:remove_const, :MyDatastream)
+    end
+    subject { ActiveFedora::SolrDigitalObject.new({'title_tesim' => 'foo'},{'datastreams'=>{}}, MyModel) }
+    it "the default should be nil" do
+      expect(subject.fetch('author')).to be_empty
+    end
+    it "should grab values" do
+      expect(subject.fetch('title')).to eq 'foo'
+    end
+    it "should grab values" do
+      expect(subject.fetch('title')).to eq 'foo'
+    end
+
+    it "should raise an error if the field isn't indexed" do
+      expect{subject.fetch('publisher')}.to raise_error KeyError, "Tried to fetch `publisher' from solr, but it isn't indexed."
+    end
+
+  end
+
   describe "initializing" do
     describe "without a datastream in the ds spec and an xml mime type in the solr doc" do
       before do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 7.0.0.pre3
+  version: 7.0.0.rc1
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-17 00:00:00.000000000 Z
+date: 2014-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr