active-fedora 3.1.0.pre9 → 3.1.0.pre10

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active-fedora (3.1.0.pre9)
+    active-fedora (3.1.0.pre10)
       activeresource (~> 3.0.0)
       activesupport (~> 3.0.0)
       equivalent-xml

data/config/fedora.yml

@@ -1,7 +1,7 @@
 development:
   url: http://fedoraAdmin:fedoraAdmin@127.0.0.1:8983/fedora
 test:
-  url: http://fedoraAdmin:fedoraAdmin@127.0.0.1:8983/fedora
+  url: http://fedoraAdmin:fedoraAdmin@127.0.0.1:8983/fedora-test
 production:
   url: http://fedoraAdmin:fedoraAdmin@127.0.0.1:8080/fedora
     

data/config/jetty.yml

@@ -0,0 +1,3 @@
+jetty_port: 8983
+java_opts:
+  - "-Xmx256m -XX:MaxPermSize=128m"

data/lib/active_fedora/base.rb

@@ -834,6 +834,7 @@ module ActiveFedora
         solr_doc.merge!(SOLR_DOCUMENT_ID.to_sym => pid, ActiveFedora::SolrService.solr_name(:system_create, :date) => self.create_date, ActiveFedora::SolrService.solr_name(:system_modified, :date) => self.modified_date, ActiveFedora::SolrService.solr_name(:active_fedora_model, :symbol) => self.class.inspect)
       end
       datastreams.each_value do |ds|
+        ds.ensure_xml_loaded if ds.respond_to? :ensure_xml_loaded  ### Can't put this in the model because it's often implemented in Solrizer::XML::TerminologyBasedSolrizer 
         solr_doc = ds.to_solr(solr_doc) if ds.kind_of?(ActiveFedora::MetadataDatastream) || ds.kind_of?(ActiveFedora::NokogiriDatastream) || ( ds.kind_of?(ActiveFedora::RelsExtDatastream) && !opts[:model_only] )
       end
       begin
@@ -866,8 +867,8 @@ module ActiveFedora
         #double check pid and id in record match
         raise "Object #{pid} not found in Solr" unless !result.nil? && !solr_doc.nil? && pid == solr_doc[SOLR_DOCUMENT_ID]
       else
-       raise "Solr document record id and pid do not match" unless pid == solr_doc[SOLR_DOCUMENT_ID]
-     end
+        raise "Solr document record id and pid do not match" unless pid == solr_doc[SOLR_DOCUMENT_ID]
+      end
      
       create_date = solr_doc[ActiveFedora::SolrService.solr_name(:system_create, :date)].nil? ? solr_doc[ActiveFedora::SolrService.solr_name(:system_create, :date).to_s] : solr_doc[ActiveFedora::SolrService.solr_name(:system_create, :date)]
       modified_date = solr_doc[ActiveFedora::SolrService.solr_name(:system_create, :date)].nil? ? solr_doc[ActiveFedora::SolrService.solr_name(:system_modified, :date).to_s] : solr_doc[ActiveFedora::SolrService.solr_name(:system_modified, :date)]

data/lib/active_fedora/rels_ext_datastream.rb

@@ -95,6 +95,7 @@ module ActiveFedora
     #  Solr must be synchronized with RELS-EXT data in Fedora.
     def from_solr(solr_doc)
       #cycle through all possible predicates
+      model.relationships_loaded = true
       ActiveFedora::Base.predicate_mappings[ActiveFedora::Base.default_predicate_namespace].keys.each do |predicate|
         predicate_symbol = ActiveFedora::SolrService.solr_name(predicate, :symbol)
         value = (solr_doc[predicate_symbol].nil? ? solr_doc[predicate_symbol.to_s]: solr_doc[predicate_symbol]) 

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-    VERSION = "3.1.0.pre9"
+    VERSION = "3.1.0.pre10"
 end

data/spec/unit/active_fedora_spec.rb

@@ -346,7 +346,7 @@ describe ActiveFedora do
     describe "outside of rails" do
       it "should load the default packaged config/fedora.yml file if no explicit config path is passed" do
         ActiveFedora.init()
-        ActiveFedora.fedora.options[:url].to_s.should == "http://127.0.0.1:8983/fedora"
+        ActiveFedora.fedora.options[:url].to_s.should == "http://127.0.0.1:8983/fedora-test"
       end
       it "should load the passed config if explicit config passed in as a string" do
         ActiveFedora.init(:fedora_config_path=>'./spec/fixtures/rails_root/config/fedora.yml')
@@ -390,7 +390,7 @@ describe ActiveFedora do
           it "should load the default file if no config is found at Rails.root" do
             stub_rails(:root=>File.join(File.dirname(__FILE__),"../fixtures/bad/path/to/rails_root"))
             ActiveFedora.init()
-            ActiveFedora.fedora_config[:url].should == "http://fedoraAdmin:fedoraAdmin@127.0.0.1:8983/fedora"
+            ActiveFedora.fedora_config[:url].should == "http://fedoraAdmin:fedoraAdmin@127.0.0.1:8983/fedora-test"
           end
         end
       end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: active-fedora
 version: !ruby/object:Gem::Version 
-  hash: 1923832011
+  hash: 1923832013
   prerelease: 6
   segments: 
   - 3
   - 1
   - 0
   - pre
-  - 9
-  version: 3.1.0.pre9
+  - 10
+  version: 3.1.0.pre10
 platform: ruby
 authors: 
 - Matt Zumwalt
@@ -560,6 +560,7 @@ files:
 - Rakefile
 - active-fedora.gemspec
 - config/fedora.yml
+- config/jetty.yml
 - config/predicate_mappings.yml
 - config/solr.yml
 - config/solr_mappings.yml