active-fedora 4.0.0.rc13 → 4.0.0.rc14

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active-fedora (4.0.0.rc13)
+    active-fedora (4.0.0.rc14)
       activeresource (>= 3.0.0)
       activesupport (>= 3.0.0)
       equivalent-xml

data/History.txt

@@ -1,4 +1,4 @@
-4.0.0.rc13
+4.0.0.rc14
 Removed deprecations
   * allowing :fedora level in fedora.yml
   * automatic includes of Relationships and FileMethods is removed
@@ -8,7 +8,7 @@ Improved loading from solr
 RDF datastreams
 Replaced solr-ruby with rsolr. Note: remove any calls to .hits
 load_instance is now deprecated, replaced with find
-Find always casts to the appropriate object.
+Find and load_instance_from_solr always instantiate the model defined in the object. 
 Run a stub :environment task in the fixture loading rake tasks (which is overridden by rails)
 Find raises ObjectNotFoundError when the object isn't found
 Removed dependency on solrizer-fedora

data/lib/active_fedora/base.rb

@@ -316,7 +316,6 @@ module ActiveFedora
     end
 
     
-    # ** EXPERIMENTAL **
     # This method adapts the inner_object to a new ActiveFedora::Base implementation
     # This is intended to minimize redundant interactions with Fedora
     def adapt_to(klass)
@@ -346,8 +345,6 @@ module ActiveFedora
       self.init_with DigitalObject.find(self.class,self.pid)
     end
     
-    # ** EXPERIMENTAL **
-    #
     # This method can be used instead of ActiveFedora::Model::ClassMethods.find.  
     # It works similarly except it populates an object from Solr instead of Fedora.
     # It is most useful for objects used in read-only displays in order to speed up loading time.  If only
@@ -369,8 +366,13 @@ module ActiveFedora
       else
         raise "Solr document record id and pid do not match" unless pid == solr_doc[SOLR_DOCUMENT_ID]
       end
+      klass = if class_str = solr_doc['active_fedora_model_s']
+        class_str.first.constantize
+      else
+        ActiveFedora::Base
+      end
      
-      obj = self.allocate.init_with(SolrDigitalObject.new(solr_doc, self))
+      obj = klass.allocate.init_with(SolrDigitalObject.new(solr_doc, self))
       #set by default to load any dependent relationship objects from solr as well
       #need to call rels_ext once so it exists when iterating over datastreams
       obj.rels_ext
@@ -475,7 +477,7 @@ module ActiveFedora
     include Associations
     include NestedAttributes
     include Reflection
-    include NamedRelationships
+    include NamedRelationships ##TODO don't include by default
   end
 
 end

data/lib/active_fedora/metadata_datastream.rb

@@ -248,22 +248,23 @@ module ActiveFedora
     def field(name, tupe, opts={})
       #TODO add term to terminology
       @fields[name.to_s.to_sym]={:type=>tupe, :values=>[]}.merge(opts)
-      eval <<-EOS
-        def #{name}_values=(arg)
+      #eval <<-EOS
+      (class << self; self; end).class_eval do
+        define_method "#{name}_values=".to_sym do |arg|
           ensure_xml_loaded  
           @fields["#{name.to_s}".to_sym][:values]=[arg].flatten
           self.dirty=true
         end
-        def #{name}_values
+        define_method "#{name}_values".to_sym do 
           ensure_xml_loaded  
           @fields["#{name}".to_sym][:values]
         end
-        def #{name}_append(arg)
+        define_method "#{name}_append".to_sym do |arg|
           ensure_xml_loaded  
           @fields["#{name}".to_sym][:values] << arg
           self.dirty =true
         end
-      EOS
+      end
     end
 
   end

data/lib/active_fedora/nokogiri_datastream.rb

@@ -176,10 +176,9 @@ module ActiveFedora
       values = []
       solr_doc = @internal_solr_doc
       return values if solr_doc.nil?
-      begin
-       term = self.class.terminology.retrieve_term(*OM.pointers_to_flat_array(term_pointer, false))
-       #check if hierarchical term pointer
-       if is_hierarchical_term_pointer?(*term_pointer)
+      term = self.class.terminology.retrieve_term(*OM.pointers_to_flat_array(term_pointer, false))
+      #check if hierarchical term pointer
+      if is_hierarchical_term_pointer?(*term_pointer)
          # if we are hierarchical need to detect all possible node values that exist
          # we do this by building up the possible solr names parent by parent and/or child by child
          # if an index is supplied for any node in the pointer it will be used
@@ -227,7 +226,7 @@ module ActiveFedora
              value.is_a?(Array) ? values.concat(value) : values << value
            end
          end
-       else
+      else
          #this is not hierarchical and we can simply look for the solr name created using the terms without any indexes
          generic_field_name_base = OM::XML::Terminology.term_generic_name(*term_pointer)
          generic_field_name = generate_solr_symbol(generic_field_name_base, term.data_type)
@@ -235,10 +234,6 @@ module ActiveFedora
          unless value.nil?
            value.is_a?(Array) ? values.concat(value) : values << value
          end
-       end
-      rescue Exception => e
-        #just do nothing since term does not exist and return emtpy values
-        raise e
       end
       values
     end

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-    VERSION = "4.0.0.rc13"
+    VERSION = "4.0.0.rc14"
 end

data/spec/integration/model_spec.rb

@@ -58,4 +58,10 @@ describe ActiveFedora::Model do
     end
   end
   
+  describe "#load_instance_from_solr" do
+    describe "with a valid pid" do
+      subject { ActiveFedora::Base.load_instance_from_solr('hydrangea:fixture_mods_article1') }
+      it { should be_instance_of HydrangeaArticle}
+    end
+  end
 end

data/spec/integration/mods_article_integration_spec.rb

@@ -1,31 +1,9 @@
 require 'spec_helper'
 
 describe ActiveFedora::Base do
-
-  before(:all) do
-    class HydrangeaArticle < ActiveFedora::Base
-      include ActiveFedora::Relationships
-      has_relationship "parts", :is_part_of, :inbound => true
-
-      # Uses the Hydra Rights Metadata Schema for tracking access permissions & copyright
-      # has_metadata :name => "rightsMetadata", :type => Hydra::RightsMetadata 
-
-      # Uses the Hydra MODS Article profile for tracking most of the descriptive metadata
-      has_metadata :name => "descMetadata", :type => Hydra::ModsArticleDatastream 
-
-      # A place to put extra metadata values
-      has_metadata :name => "properties", :type => ActiveFedora::MetadataDatastream do |m|
-        m.field 'collection', :string
-      end
-    end
-  end
-  
-  before(:each) do
-    @test_article = HydrangeaArticle.find("hydrangea:fixture_mods_article1")
-  end
-  
   describe ".update_indexed_attributes" do
     before(:each) do
+      @test_article = HydrangeaArticle.find("hydrangea:fixture_mods_article1")
       @test_article.update_indexed_attributes({[{:person=>0}, :first_name] => "GIVEN NAMES"}, :datastreams=>"descMetadata")
     end
     after(:each) do

data/spec/unit/model_spec.rb

@@ -101,11 +101,6 @@ describe ActiveFedora::Model do
     end
   end
   
-  
-  it 'should provide #find_by_solr' do
-    SpecModel::Basic.should respond_to(:find)
-  end
-  
   describe '#find_by_solr' do
     it "(:all) should query solr for all objects with :active_fedora_model_s of self.class and return a Solr result" do
       mock_response = mock("SolrResponse")

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: active-fedora
 version: !ruby/object:Gem::Version 
-  hash: 15424143
+  hash: 15424137
   prerelease: 6
   segments: 
   - 4
   - 0
   - 0
   - rc
-  - 13
-  version: 4.0.0.rc13
+  - 14
+  version: 4.0.0.rc14
 platform: ruby
 authors: 
 - Matt Zumwalt
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-16 00:00:00 Z
+date: 2012-03-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false