active-fedora 3.2.0.pre2 → 3.2.0.pre3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active-fedora (3.2.0.pre2)
+    active-fedora (3.2.0.pre3)
       activeresource (>= 3.0.0)
       activesupport (>= 3.0.0)
       equivalent-xml

data/History.txt

@@ -1,5 +1,6 @@
 3.2.0
 
+HYDRA-730 ActiveFedora isn't being initialized unless it is specified in the project Gemfile
 Don't create pids until save
 inspect and equality methods
 Deprecate datastream_collections

data/lib/active_fedora.rb

@@ -53,6 +53,7 @@ module ActiveFedora #:nodoc:
   # The configuration hash that gets used by RSolr.connect
   @solr_config ||= {}
   @fedora_config ||= {}
+  @config_options ||= {}
 
   # Initializes ActiveFedora's connection to Fedora and Solr based on the info in fedora.yml and solr.yml
   # NOTE: this deprecates the use of a solr url in the fedora.yml
@@ -89,28 +90,36 @@ module ActiveFedora #:nodoc:
     else
       @config_options = options
     end
+    config_reload!
+  end
 
-    @config_env = environment
-    @fedora_config_path = get_config_path(:fedora)
-    load_config(:fedora)
-
-    @solr_config_path = get_config_path(:solr)
-    load_config(:solr)
-
-    register_fedora_and_solr
+  def self.config_reload!
+    reset!
+    load_configs
+  end
 
-    # Retrieve the valid path for the predicate mappings config file
-    @predicate_config_path = build_predicate_config_path(File.dirname(fedora_config_path))
+  def self.reset!
+    @config_loaded = false  #Force reload of configs
+    @predicate_config_path = nil
+  end
 
+  def self.config_loaded?
+    @config_loaded || false
   end
 
   def self.load_configs
+    return if config_loaded?
+    @config_env = environment
     load_config(:fedora)
     load_config(:solr)
+    @config_loaded = true
+
   end
 
   def self.load_config(config_type)
+    config_path = get_config_path(config_type)
     config_type = config_type.to_s
+    self.instance_variable_set "@#{config_type}_config_path".to_sym, config_path
     config_path = self.send("#{config_type}_config_path".to_sym)
 
     logger.info("#{config_type.upcase}: loading ActiveFedora.#{config_type}_config from #{File.expand_path(config_path)}")
@@ -156,18 +165,6 @@ module ActiveFedora #:nodoc:
     end
   end
 
-  def self.register_fedora_and_solr
-    # Register Solr
-    logger.info("FEDORA: initializing ActiveFedora::SolrService with solr_config: #{ActiveFedora.solr_config.inspect}")
-    ActiveFedora::SolrService.register(ActiveFedora.solr_config[:url])
-    logger.info("FEDORA: initialized Solr with ActiveFedora.solr_config: #{ActiveFedora::SolrService.instance.inspect}")
-        
-    logger.info("FEDORA: initializing Fedora with fedora_config: #{ActiveFedora.fedora_config.inspect}")
-    ActiveFedora::RubydoraConnection.connect(ActiveFedora.fedora_config[:url])
-    logger.info("FEDORA: initialized Fedora as: #{ActiveFedora::RubydoraConnection.instance.inspect}")    
-    
-  end
-
   # Determine what environment we're running in. Order of preference is:
   # 1. config_options[:environment]
   # 2. Rails.env
@@ -204,7 +201,7 @@ module ActiveFedora #:nodoc:
   def self.get_config_path(config_type)
     config_type = config_type.to_s
     if (config_path = config_options.fetch("#{config_type}_config_path".to_sym,nil) )
-      raise ActiveFedoraConfigurationException unless File.file? config_path
+      raise ActiveFedoraConfigurationException, "file does not exist #{config_path}" unless File.file? config_path
       return config_path
     end
     
@@ -212,7 +209,7 @@ module ActiveFedora #:nodoc:
     if config_type == "solr" && (config_path = check_fedora_path_for_solr)
       return config_path
     elsif config_type == "solr" && fedora_config[environment].fetch("solr",nil)
-      logger.warn("DEPRECATION WARNING: You appear to be using a deprecated format for your fedora.yml file.  The solr url should be stored in a separate solr.yml file in the same directory as the fedora.yml")
+      ActiveSupport::Deprecation.warn("You appear to be using a deprecated format for your fedora.yml file.  The solr url should be stored in a separate solr.yml file in the same directory as the fedora.yml")
       raise ActiveFedoraConfigurationException
     end
 
@@ -251,7 +248,7 @@ module ActiveFedora #:nodoc:
   end
 
   def self.predicate_config
-    @predicate_config_path ||= build_predicate_config_path
+    @predicate_config_path ||= build_predicate_config_path(File.dirname(@fedora_config_path))
   end
 
   def self.version
@@ -264,7 +261,7 @@ module ActiveFedora #:nodoc:
     pred_config_paths = [File.expand_path(File.join(File.dirname(__FILE__),"..","config"))]
     pred_config_paths.unshift config_path if config_path
     pred_config_paths.each do |path|
-      testfile = File.join(path,"predicate_mappings.yml")
+      testfile = File.expand_path(File.join(path,"predicate_mappings.yml"))
       if File.exist?(testfile) && valid_predicate_mapping?(testfile)
         return testfile
       end

data/lib/active_fedora/base.rb

@@ -75,7 +75,7 @@ module ActiveFedora
       super
     end
     
-    self.ds_specs = {'RELS-EXT'=> {:type=> ActiveFedora::RelsExtDatastream, :label=>"", :block=>nil}}
+    self.ds_specs = {'RELS-EXT'=> {:type=> ActiveFedora::RelsExtDatastream, :label=>"", :label=>"Fedora Object-to-Object Relationship Metadata", :control_group=>'X', :block=>nil}}
 
     # Has this object been saved?
     def new_object?

data/lib/active_fedora/railtie.rb

@@ -2,9 +2,9 @@ require 'active-fedora'
 require 'rails'
 
 module ActiveFedora
-  class Railtie < Rails::Railtie
-    initializer "active-fedora.configure_rails_initialization" do
-      ActiveFedora.init
-    end
-  end
+  # class Railtie < Rails::Railtie
+  #   initializer "active-fedora.configure_rails_initialization" do
+  #     ActiveFedora.init
+  #   end
+  # end
 end

data/lib/active_fedora/rubydora_connection.rb

@@ -5,7 +5,6 @@ module ActiveFedora
   class RubydoraConnection
     include Singleton
     
-    attr_reader :connection
     attr_accessor :options
 
     def self.connect(params={})
@@ -24,6 +23,14 @@ module ActiveFedora
       instance
     end
 
+    def connection
+      return @connection if @connection
+      ActiveFedora.load_configs
+      ActiveFedora::RubydoraConnection.connect(ActiveFedora.fedora_config[:url])
+      @connection
+    end
+    
+
     def connect(force=false)
       return unless @connection.nil? or force
       allowable_options = [:url, :user, :password, :timeout, :open_timeout, :ssl_client_cert, :ssl_client_key]

data/lib/active_fedora/solr_service.rb

@@ -10,7 +10,7 @@ module ActiveFedora
     load_mappings
       
     attr_reader :conn
-        
+
     def self.register(host=nil, args={})
       Thread.current[:solr_service]=self.new(host, args)
 
@@ -22,6 +22,12 @@ module ActiveFedora
     end
     
     def self.instance
+    # Register Solr
+        
+      unless Thread.current[:solr_service]
+        ActiveFedora.load_configs
+        register(ActiveFedora.solr_config[:url])
+      end
       raise SolrNotInitialized unless Thread.current[:solr_service]
       Thread.current[:solr_service]
     end

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-    VERSION = "3.2.0.pre2"
+    VERSION = "3.2.0.pre3"
 end

data/spec/spec_helper.rb

@@ -16,6 +16,7 @@ ActiveFedora.init(:fedora_config_path=>File.join(File.dirname(__FILE__), "..", "
 
 RSpec.configure do |config|
   config.mock_with :mocha
+  config.color_enabled = true
 end
 
 def fixture(file)

data/spec/support/mock_fedora.rb

@@ -3,6 +3,7 @@ def mock_client
   @mock_client = mock("client")
   @getter = mock("getter")
   @getter.stubs(:get).returns('')
+  @mock_client.stubs(:[]).with("describe?xml=true").returns('')
   @mock_client 
 end
   

data/spec/unit/active_fedora_spec.rb

@@ -11,12 +11,6 @@ describe ActiveFedora do
     ActiveFedora.init(:environment=>"test", :fedora_config_path=>fedora_config_path)
   end
   
-  before(:each) do
-    # Stubbing register_fedora_and_solr in order to speed up tests.  
-    # If you have tests that need fedora & solr registered, 
-    # put them in the separate ActiveFedora describe block towards the end of this file.
-    ActiveFedora.stubs(:register_fedora_and_solr)
-  end
   
   describe "initialization methods" do
     
@@ -85,6 +79,7 @@ describe ActiveFedora do
         Dir.expects(:getwd).at_least_once.returns("/current/working/directory")
         File.expects(:file?).with("/current/working/directory/config/fedora.yml").returns(false)
         File.expects(:file?).with(File.expand_path(File.join(File.dirname("__FILE__"),'config','fedora.yml'))).returns(true)
+        logger.expects(:warn).with("Using the default fedora.yml that comes with active-fedora.  If you want to override this, pass the path to fedora.yml to ActiveFedora - ie. ActiveFedora.init(:fedora_config_path => '/path/to/fedora.yml) - or set Rails.root and put fedora.yml into \#{Rails.root}/config.")
         ActiveFedora.get_config_path(:fedora).should eql(File.expand_path(File.join(File.dirname("__FILE__"),'config','fedora.yml')))
       end
     end
@@ -108,6 +103,7 @@ describe ActiveFedora do
         ActiveFedora.expects(:fedora_config_path).returns("/path/to/fedora/config/fedora.yml")
         File.expects(:file?).with("/path/to/fedora/config/solr.yml").returns(false)
         ActiveFedora.expects(:fedora_config).returns({"test"=>{"solr"=>{"url"=>"http://some_url"}}})
+        ActiveSupport::Deprecation.expects(:warn)
         lambda { ActiveFedora.get_config_path(:solr) }.should raise_exception
       end
 
@@ -139,6 +135,7 @@ describe ActiveFedora do
           Dir.expects(:getwd).at_least_once.returns("/current/working/directory")
           File.expects(:file?).with("/current/working/directory/config/solr.yml").returns(false)
           File.expects(:file?).with(File.expand_path(File.join(File.dirname("__FILE__"),'config','solr.yml'))).returns(true)
+          logger.expects(:warn).with("Using the default solr.yml that comes with active-fedora.  If you want to override this, pass the path to solr.yml to ActiveFedora - ie. ActiveFedora.init(:solr_config_path => '/path/to/solr.yml) - or set Rails.root and put solr.yml into \#{Rails.root}/config.")
           ActiveFedora.get_config_path(:solr).should eql(File.expand_path(File.join(File.dirname("__FILE__"),'config','solr.yml')))
         end
       end
@@ -180,10 +177,28 @@ describe ActiveFedora do
     end
 
     describe "load_configs" do
-      it "should load the fedora and solr configs" do
-        ActiveFedora.expects(:load_config).with(:fedora)
-        ActiveFedora.expects(:load_config).with(:solr)
-        ActiveFedora.load_configs
+      describe "when config is not loaded" do
+        before do
+          ActiveFedora.instance_variable_set :@config_loaded, nil
+        end
+        it "should load the fedora and solr configs" do
+          ActiveFedora.expects(:load_config).with(:fedora)
+          ActiveFedora.expects(:load_config).with(:solr)
+          ActiveFedora.config_loaded?.should be_false
+          ActiveFedora.load_configs
+          ActiveFedora.config_loaded?.should be_true
+        end
+      end
+      describe "when config is loaded" do
+        before do
+          ActiveFedora.instance_variable_set :@config_loaded, true
+        end
+        it "should load the fedora and solr configs" do
+          ActiveFedora.expects(:load_config).never
+          ActiveFedora.config_loaded?.should be_true
+          ActiveFedora.load_configs
+          ActiveFedora.config_loaded?.should be_true
+        end
       end
     end
 
@@ -210,6 +225,7 @@ describe ActiveFedora do
     before(:all) do
       @fake_rails_root = File.expand_path(File.dirname(__FILE__) + '/../fixtures/rails_root')
     end
+
     
     after(:all) do
       config_file = File.join(File.dirname(__FILE__), "..", "..", "config", "fedora.yml")
@@ -230,6 +246,7 @@ describe ActiveFedora do
     end
     it "loads the config that ships with this gem as a last choice" do
       Dir.stubs(:getwd).returns("/fake/path")
+      logger.expects(:warn).with("Using the default fedora.yml that comes with active-fedora.  If you want to override this, pass the path to fedora.yml to ActiveFedora - ie. ActiveFedora.init(:fedora_config_path => '/path/to/fedora.yml) - or set Rails.root and put fedora.yml into \#{Rails.root}/config.")
       ActiveFedora.init
       expected_config = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "config"))
       ActiveFedora.fedora_config_path.should eql(expected_config+'/fedora.yml')
@@ -268,15 +285,6 @@ describe ActiveFedora do
   
   ##########################
   
-  describe ".push_models_to_fedora" do
-    it "should push the model definition for each of the ActiveFedora models into Fedora CModel objects" do
-      pending
-      # find all of the models 
-      # create a cmodel for each model with the appropriate pid
-      # push the model definition into the cmodel's datastream (ie. dsname: oral_history.rb vs dsname: ruby)
-    end
-  end
-
   describe ".build_predicate_config_path" do
     it "should return the path to the default config/predicate_mappings.yml if no valid path is given" do
       ActiveFedora.send(:build_predicate_config_path, nil).should == default_predicate_mapping_file
@@ -296,18 +304,25 @@ describe ActiveFedora do
   end
 
   describe ".predicate_config" do
+    before do
+      ActiveFedora.instance_variable_set :@config_loaded, nil
+    end
     it "should return the default mapping if it has not been initialized" do
-      ActiveFedora.instance_variable_set("@predicate_config_path",nil)
       ActiveFedora.predicate_config().should == default_predicate_mapping_file
     end
-    it "should return the path that was set at initialization" do
-      pending()
-      File.expects(:exist?).with("/path/to/my/files/predicate_mappings.yml").returns(true)
-      mock_file = mock("fedora.yml")
-      File.expects(:open).returns(mock_file)
-      YAML.expects(:load).returns({"test"=>{"solr"=>{"url"=>"http://127.0.0.1:8983/solr/development"}, "fedora"=>{"url"=>"http://fedoraAdmin:fedoraAdmin@127.0.0.1:8983/fedora"}}})
-      ActiveFedora.init(:fedora_config_path => "/path/to/my/files/fedora.yml")
-      ActiveFedora.predicate_config.should == "/path/to/my/files/predicate_mappings.yml"
+    describe "when the path has been set" do
+      before do
+        
+        ActiveFedora.instance_variable_set :@predicate_config_path, nil
+        ActiveFedora.instance_variable_set(:@fedora_config_path, "/path/to/my/files/fedora.yml")
+        # ActiveFedora.expects(:load_config).with(:fedora)
+        # ActiveFedora.expects(:load_config).with(:solr)
+      end
+      it "should return the path that was set at initialization" do
+        File.expects(:exist?).with("/path/to/my/files/predicate_mappings.yml").returns(true)
+        ActiveFedora.expects(:valid_predicate_mapping?).with("/path/to/my/files/predicate_mappings.yml").returns(true)
+        ActiveFedora.predicate_config.should == "/path/to/my/files/predicate_mappings.yml"
+      end
     end
   end
 
@@ -344,7 +359,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-test"
+        ActiveFedora.fedora_config[:url].to_s.should == "http://fedoraAdmin:fedoraAdmin@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')
@@ -371,7 +386,6 @@ describe ActiveFedora do
             File.stubs(:open).with(fedora_config_path).returns(fedora_config)
             File.stubs(:open).with(solr_config_path).returns(solr_config)
 
-            ActiveFedora.expects(:build_predicate_config_path)
 
             ActiveFedora.init(:fedora_config_path=>fedora_config_path,:solr_config_path=>solr_config_path)
             ActiveFedora.solr.class.should == ActiveFedora::SolrService
@@ -397,24 +411,6 @@ describe ActiveFedora do
 end
 
 
-describe ActiveFedora do
-    after(:all) do
-      # Restore to default fedora configs
-      ActiveFedora.init(:environment => "test", :fedora_config_path => File.join(File.dirname(__FILE__), "..", "..", "config", "fedora.yml"))
-    end
-
-  # Put methods whose tests require registering Fedora & Solr here.
-  # to allow tests to run fast, keep these to a minimum.
-  describe "register_solr_and_fedora" do
-    it "should regiser instances with the appropriate urls" do
-      ActiveFedora.expects(:solr_config).at_least_once.returns({:url=>"http://megasolr:8983"})
-      ActiveFedora.expects(:fedora_config).at_least_once.returns({:url=>"http://megafedora:8983"})
-      ActiveFedora.register_fedora_and_solr
-      ActiveFedora.solr.conn.url.to_s.should eql("http://megasolr:8983")
-      ActiveFedora.fedora.options[:url].to_s.should eql("http://megafedora:8983")
-    end
-  end
-end
 
 def mock_yaml(hash, path)
   mock_file = mock(path.split("/")[-1])

data/spec/unit/base_file_management_spec.rb

@@ -19,9 +19,6 @@ describe ActiveFedora::Base do
       @base.expects(:parts).returns(["Foo"])
       @base.file_objects
     end
-    describe "_remove" do
-      it "should wrap collection_members_remove"
-    end
   end
   
   describe ".file_objects_append" do
@@ -52,7 +49,6 @@ describe ActiveFedora::Base do
     it "should return an array" do
       @base.collection_members.should be_kind_of(Array)
     end
-    it "should search for all of the :collection_members" 
     describe "_append" do
       it "should be a supported method" do
         @base.should respond_to(:collection_members_append)
@@ -62,13 +58,6 @@ describe ActiveFedora::Base do
         @base.expects(:add_relationship).with(:has_collection_member, mocko)
         @base.collection_members_append(mocko)
       end
-      it "should support << operator" do
-        pending
-        # I can't remember how to do this, and it's not a deal breaker... (MZ)
-        mocko = mock("object")
-        @base.expects(:add_relationship).with(:has_collection_member, mocko)
-        @base.collection_members << mocko
-      end
     end
     describe "_remove" do
       it "should be a supported method" do

data/spec/unit/rubydora_connection_spec.rb

@@ -16,6 +16,20 @@ describe ActiveFedora::RubydoraConnection do
     end
   end
 
+  # Put methods whose tests require registering Fedora & Solr here.
+  # to allow tests to run fast, keep these to a minimum.
+  describe "connection" do
+    describe "That is new" do
+      before do
+        ActiveFedora::RubydoraConnection.instance.instance_variable_set(:@connection, nil)
+      end
+      it "should regiser instances with the appropriate urls" do
+        ActiveFedora.expects(:load_configs)  
+        ActiveFedora::RubydoraConnection.instance.connection.should be_a Rubydora::Repository
+      end
+    end
+  end
+
   describe 'connect' do
     before do
       @instance = ActiveFedora::RubydoraConnection.instance

data/spec/unit/solr_service_spec.rb

@@ -2,6 +2,10 @@ require 'spec_helper'
 
 
 describe ActiveFedora::SolrService do
+  before do
+    Thread.current[:solr_service]=nil
+  end
+  
   after(:all) do
     ActiveFedora::SolrService.register(ActiveFedora.solr_config[:url])
   end
@@ -34,14 +38,13 @@ describe ActiveFedora::SolrService do
     Thread.current[:solr_service].should == ss
     ActiveFedora::SolrService.instance.should == ss
   end
-  it "should fail fast if solr service not initialized" do
+  it "should try to initialize if the service not initialized, and fail if it does not succeed" do
     Thread.current[:solr_service].should be_nil
+    ActiveFedora.expects(:load_configs)
+    ActiveFedora::SolrService.expects(:register)
     proc{ActiveFedora::SolrService.instance}.should raise_error(ActiveFedora::SolrNotInitialized)
   end
-  before do
-    Thread.current[:solr_service]=nil
-  end
-  
+
   describe "#reify_solr_results" do
     before(:each) do
       class AudioRecord

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: active-fedora
 version: !ruby/object:Gem::Version 
-  hash: 1923832045
+  hash: 1923832047
   prerelease: 6
   segments: 
   - 3
   - 2
   - 0
   - pre
-  - 2
-  version: 3.2.0.pre2
+  - 3
+  version: 3.2.0.pre3
 platform: ruby
 authors: 
 - Matt Zumwalt
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-29 00:00:00 -06:00
+date: 2011-12-30 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency