active-fedora 2.2.3 → 2.3.0

data/Gemfile.lock

@@ -1,8 +1,7 @@
 PATH
   remote: .
   specs:
-    active-fedora (2.2.0)
-      RedCloth
+    active-fedora (2.2.0.rails3pre1)
       active-fedora
       activeresource
       equivalent-xml
@@ -12,11 +11,9 @@ PATH
       multipart-post
       nokogiri
       om (>= 1.0)
-      rcov
       solr-ruby (>= 0.0.6)
       solrizer (> 1.0.0)
       xml-simple (>= 1.0.12)
-      yard
 
 GEM
   remote: http://rubygems.org/
@@ -64,8 +61,8 @@ GEM
       nokogiri
       nokogiri
       nokogiri
-      om (>= 1.0.0)
       om
+      om (>= 1.0.0)
       stomp
       xml-simple
     solrizer-fedora (1.0.2)
@@ -88,5 +85,6 @@ DEPENDENCIES
   rcov
   rspec (< 2.0.0)
   ruby-debug
+  solrizer
   solrizer-fedora
   yard

data/active-fedora.gemspec

@@ -43,3 +43,4 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
 end
+

data/lib/active_fedora.rb

@@ -23,6 +23,8 @@ require 'active_fedora/rels_ext_datastream.rb'
 require 'active_fedora/semantic_node.rb'
 require 'active_fedora/version.rb'
 
+require 'active_fedora/railtie' if defined?(Rails) && Rails.version >= "3.0"
+
 SOLR_DOCUMENT_ID = ActiveFedora::SolrService.id_field unless defined?(SOLR_DOCUMENT_ID)
 ENABLE_SOLR_UPDATES = true unless defined?(ENABLE_SOLR_UPDATES)
 
@@ -39,23 +41,23 @@ module ActiveFedora #:nodoc:
   # Initializes ActiveFedora's connection to Fedora and Solr based on the info in fedora.yml
   # If RAILS_ENV is set, it will use that environment.  Defaults to "development".
   # @param [String] config_path (optional) the path to fedora.yml
-  #   If config_path is not provided and RAILS_ROOT is set, it will look in RAILS_ENV/config/fedora.yml.  Otherwise, it will look in your config/fedora.yml.  Failing that, it will use localhost urls.
+  #   If config_path is not provided and Rails.root is set, it will look in RAILS_ENV/config/fedora.yml.  Otherwise, it will look in your config/fedora.yml.  Failing that, it will use localhost urls.
   def self.init( config_path=nil )
     
     config_env = defined?(RAILS_ENV) ? RAILS_ENV : "development"
     
     if config_path.nil? 
-      if defined?(RAILS_ROOT)
-        config_path = "#{RAILS_ROOT}/config/fedora.yml"
+      if defined?(Rails.root)
+        config_path = "#{Rails.root}/config/fedora.yml"
       else
         config_path = File.join("config","fedora.yml")
-        unless File.exist?(config_path)
-          config_path = File.join(File.dirname(__FILE__), "..", "config", "fedora.yml")
-          logger.info "Using the default fedora.yml that comes with active-fedora.  If you want to override this, pass the path to fedora.yml as an argument to ActiveFedora.init or set RAILS_ROOT and put fedora.yml into \#{RAILS_ROOT}/config."
-        end
       end
     end
 
+    unless File.exist?(config_path)
+      config_path = File.join(File.dirname(__FILE__), "..", "config", "fedora.yml")
+      logger.info "Using the default fedora.yml that comes with active-fedora.  If you want to override this, pass the path to fedora.yml as an argument to ActiveFedora.init or set Rails.root and put fedora.yml into \#{Rails.root}/config."
+    end
     
     logger.info("FEDORA: loading ActiveFedora config from #{File.expand_path(config_path)}")
     fedora_config = YAML::load(File.open(config_path))

data/lib/active_fedora/railtie.rb

@@ -0,0 +1,10 @@
+require 'active-fedora'
+require 'rails'
+
+module ActiveFedora
+  class Railtie < Rails::Railtie
+    initializer "active-fedora.configure_rails_initialization" do
+      ActiveFedora.init
+    end
+  end
+end

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-    VERSION = "2.2.3"
+    VERSION = "2.3.0"
 end

data/spec/fixtures/rails_root/config/fedora.yml

@@ -0,0 +1,16 @@
+development:
+  fedora:
+    url: http://fedoraAdmin:fedoraAdmin@testhost.com:8983/fedora
+  solr:
+    url: http://testhost.com:8983/solr/development
+test:
+  fedora:
+    url: http://fedoraAdmin:fedoraAdmin@testhost.com:8983/fedora
+  solr:
+    url: http://testhost.com:8983/solr/development
+production:
+  fedora:
+    url: http://fedoraAdmin:fedoraAdmin@testhost.com:8080/fedora
+  solr:
+    url: http://testhost.com:8080/solr
+    

data/spec/fixtures/rails_root/config/predicate_mappings.yml

@@ -0,0 +1,47 @@
+# The default namespace maps to the default namespace for generating rels_ext from solr
+:default_namespace: info:fedora/fedora-system:def/relations-external#
+
+# namespace mappings--- 
+# you can add specific mappings for your institution by providing the following:
+#   namespace_uri:
+#     :relationship_symbol: relationship_identifier
+# 
+# For example, if you have the following element in your rels_ext:
+#  
+#  <oai:itemID>oai:example.edu:changeme:500</oai:itemID>
+# 
+# With the last two lines of this file uncommented, the relationships hash of your object will include:
+#   :oai_item_id => ["info:fedora/oai:example.edu:changeme:500"]
+#
+# With the last two lines of this file commented out, the relationships hash of your object will include:
+#   "oai_itemID" => ["info:fedora/oai:example.edu:changeme:500"]
+#   
+:predicate_mapping:
+  info:fedora/fedora-system:def/relations-external#: 
+    :is_derivation_of: isDerivationOf
+    :is_metadata_for: isMetadataFor
+    :is_member_of_collection: isMemberOfCollection
+    :has_derivation: hasDerivation
+    :is_annotation_of: isAnnotationOf
+    :is_constituent_of: isConstituentOf
+    :is_dependent_of: isDependentOf
+    :has_collection_member: hasCollectionMember
+    :has_annotation: hasAnnotation
+    :has_constituent: hasConstituent
+    :has_dependent: hasDependent
+    :is_part_of: isPartOf
+    :has_equivalent: hasEquivalent
+    :is_subset_of: isSubsetOf
+    :is_description_of: isDescriptionOf
+    :is_member_of: isMemberOf
+    :has_model: hasModel
+    :conforms_to: conformsTo
+    :has_metadata: hasMetadata
+    :has_subset: hasSubset
+    :has_description: hasDescription
+    :has_part: hasPart
+    :has_member: hasMember
+  info:fedora/fedora-system:def/model#:
+    :has_model: hasModel
+#  http://www.openarchives.org/OAI/2.0/: 
+#    :oai_item_id: itemID

data/spec/fixtures/rails_root/config/solr_mappings.yml

@@ -0,0 +1,16 @@
+id: id
+default: searchable
+searchable: 
+  date: _dt
+  string: _t
+  text: _t
+  symbol: _s
+  integer: _i
+  long: _l
+  boolean: _b
+  float: _f
+  double: _d
+displayable: _display
+facetable: _facet
+sortable: _sort
+unstemmed_searchable: _unstem_search

data/spec/fixtures/rails_root/config/solr_mappings_af_0.1.yml

@@ -0,0 +1,9 @@
+id: id
+default: searchable
+searchable:
+  default: _field
+  date: _date
+displayable: _display
+facetable: _facet
+sortable: _sort
+unstemmed_searchable: _unstem_search

data/spec/fixtures/rails_root/config/solr_mappings_bl_2.4.yml

@@ -0,0 +1,17 @@
+id: id
+default: searchable
+searchable:
+  id: id
+  date: _dt
+  string: _t
+  text: _t
+  symbol: _s
+  integer: _i
+  long: _l
+  boolean: _b
+  float: _f
+  double: _d
+displayable: _display
+facetable: _facet
+sortable: _sort
+unstemmed_searchable: _unstem_search

data/spec/rails3_test_app/.gitignore

@@ -0,0 +1,4 @@
+.bundle
+db/*.sqlite3
+log/*.log
+tmp/

data/spec/rails3_test_app/.rspec

@@ -0,0 +1 @@
+--colour

data/spec/rails3_test_app/.rvmrc

@@ -0,0 +1,34 @@
+#!/usr/bin/env bash
+
+# This is an RVM Project .rvmrc file, used to automatically load the ruby
+# development environment upon cd'ing into the directory
+
+ruby_string="ree-1.8.7"
+gemset_name="active_fedora_rails3"
+
+# Install rubies when used instead of only displaying a warning and exiting
+rvm_install_on_use_flag=1
+
+# Specify our desired <ruby>[@<gemset>], the @gemset name is optional.
+environment_id="${ruby_string}@${gemset_name}"
+
+# First, attempt to load the desired environment directly from the environment
+# file. This is very fast and efficient compared to running through the entire
+# CLI and selector. If you want feedback on which environment was used then
+# insert the word 'use' after --create as this triggers verbose mode.
+#
+if [[ -d "${rvm_path:-$HOME/.rvm}/environments" \
+  && -s "${rvm_path:-$HOME/.rvm}/environments/$environment_id" ]] ; then
+  \. "${rvm_path:-$HOME/.rvm}/environments/$environment_id"
+else
+  # If the environment file has not yet been created, use the RVM CLI to select.
+  rvm --create "$environment_id"
+fi
+
+# Ensure that Bundler is installed, install it if it is not.
+if ! (command -v bundle > /dev/null) ; then
+  printf "The rubygem 'bundler' is not installed, installing it now.\n"
+  gem install bundler
+fi
+
+

data/spec/rails3_test_app/Gemfile

@@ -0,0 +1,40 @@
+source 'http://rubygems.org'
+
+gem 'rails', '3.0.7'
+
+# Bundle edge Rails instead:
+# gem 'rails', :git => 'git://github.com/rails/rails.git'
+
+gem 'sqlite3'
+gem 'active-fedora', '2.2.0.rails3pre1'
+gem 'solrizer-fedora', '1.0.3.rails3pre1'
+gem 'solrizer', '1.0.4.rails3pre1'
+gem 'ruby-debug'
+
+
+
+group :development, :test do
+  gem 'rspec-rails'
+end
+# Use unicorn as the web server
+# gem 'unicorn'
+
+# Deploy with Capistrano
+# gem 'capistrano'
+
+# To use debugger (ruby-debug for Ruby 1.8.7+, ruby-debug19 for Ruby 1.9.2+)
+# gem 'ruby-debug'
+# gem 'ruby-debug19', :require => 'ruby-debug'
+
+# Bundle the extra gems:
+# gem 'bj'
+# gem 'nokogiri'
+# gem 'sqlite3-ruby', :require => 'sqlite3'
+# gem 'aws-s3', :require => 'aws/s3'
+
+# Bundle gems for the local environment. Make sure to
+# put test-only gems in this group so their generators
+# and rake tasks are available in development mode:
+# group :development, :test do
+#   gem 'webrat'
+# end

data/spec/rails3_test_app/Gemfile.lock

@@ -0,0 +1,146 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    abstract (1.0.0)
+    actionmailer (3.0.7)
+      actionpack (= 3.0.7)
+      mail (~> 2.2.15)
+    actionpack (3.0.7)
+      activemodel (= 3.0.7)
+      activesupport (= 3.0.7)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.5.0)
+      rack (~> 1.2.1)
+      rack-mount (~> 0.6.14)
+      rack-test (~> 0.5.7)
+      tzinfo (~> 0.3.23)
+    active-fedora (2.2.0.rails3pre1)
+      active-fedora
+      activeresource
+      equivalent-xml
+      facets
+      mediashelf-loggable
+      mime-types (>= 1.16)
+      multipart-post
+      nokogiri
+      om (>= 1.0)
+      solr-ruby (>= 0.0.6)
+      solrizer (> 1.0.0)
+      xml-simple (>= 1.0.12)
+    activemodel (3.0.7)
+      activesupport (= 3.0.7)
+      builder (~> 2.1.2)
+      i18n (~> 0.5.0)
+    activerecord (3.0.7)
+      activemodel (= 3.0.7)
+      activesupport (= 3.0.7)
+      arel (~> 2.0.2)
+      tzinfo (~> 0.3.23)
+    activeresource (3.0.7)
+      activemodel (= 3.0.7)
+      activesupport (= 3.0.7)
+    activesupport (3.0.7)
+    arel (2.0.10)
+    builder (2.1.2)
+    columnize (0.3.2)
+    daemons (1.1.3)
+    diff-lcs (1.1.2)
+    equivalent-xml (0.2.6)
+      nokogiri (>= 1.4.3)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
+    facets (2.9.1)
+    fastercsv (1.5.4)
+    i18n (0.5.0)
+    linecache (0.43)
+    mail (2.2.19)
+      activesupport (>= 2.3.6)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mediashelf-loggable (0.4.2)
+    mime-types (1.16)
+    multipart-post (1.1.1)
+    nokogiri (1.4.4)
+    om (1.2.4)
+      nokogiri (>= 1.4.2)
+      om
+    polyglot (0.3.1)
+    rack (1.2.3)
+    rack-mount (0.6.14)
+      rack (>= 1.0.0)
+    rack-test (0.5.7)
+      rack (>= 1.0)
+    rails (3.0.7)
+      actionmailer (= 3.0.7)
+      actionpack (= 3.0.7)
+      activerecord (= 3.0.7)
+      activeresource (= 3.0.7)
+      activesupport (= 3.0.7)
+      bundler (~> 1.0)
+      railties (= 3.0.7)
+    railties (3.0.7)
+      actionpack (= 3.0.7)
+      activesupport (= 3.0.7)
+      rake (>= 0.8.7)
+      thor (~> 0.14.4)
+    rake (0.9.0)
+    rsolr (1.0.0)
+      builder (>= 2.1.2)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.2)
+    rspec-expectations (2.6.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.6.0)
+    rspec-rails (2.6.0)
+      actionpack (~> 3.0)
+      activesupport (~> 3.0)
+      railties (~> 3.0)
+      rspec (~> 2.6.0)
+    ruby-debug (0.10.4)
+      columnize (>= 0.1)
+      ruby-debug-base (~> 0.10.4.0)
+    ruby-debug-base (0.10.4)
+      linecache (>= 0.3)
+    solr-ruby (0.0.8)
+    solrizer (1.0.4.rails3pre1)
+      daemons
+      mediashelf-loggable
+      mediashelf-loggable
+      nokogiri
+      nokogiri
+      nokogiri
+      om
+      om (>= 1.0.0)
+      stomp
+      xml-simple
+    solrizer-fedora (1.0.3.rails3pre1)
+      active-fedora (= 2.2.0.rails3pre1)
+      fastercsv
+      rsolr
+      solr-ruby (>= 0.0.6)
+      solrizer (>= 1.0.0)
+      solrizer-fedora
+    sqlite3 (1.3.3)
+    stomp (1.1.8)
+    thor (0.14.6)
+    treetop (1.4.9)
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.27)
+    xml-simple (1.0.15)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  active-fedora (= 2.2.0.rails3pre1)
+  rails (= 3.0.7)
+  rspec-rails
+  ruby-debug
+  solrizer (= 1.0.4.rails3pre1)
+  solrizer-fedora (= 1.0.3.rails3pre1)
+  sqlite3

data/spec/rails3_test_app/Rakefile

@@ -0,0 +1,7 @@
+# Add your own tasks in files placed in lib/tasks ending in .rake,
+# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
+
+require File.expand_path('../config/application', __FILE__)
+require 'rake'
+
+TestApp::Application.load_tasks

data/spec/rails3_test_app/app/controllers/application_controller.rb

@@ -0,0 +1,3 @@
+class ApplicationController < ActionController::Base
+  protect_from_forgery
+end

data/spec/rails3_test_app/app/helpers/application_helper.rb

@@ -0,0 +1,2 @@
+module ApplicationHelper
+end

data/spec/rails3_test_app/app/views/layouts/application.html.erb

@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>TestApp</title>
+  <%= stylesheet_link_tag :all %>
+  <%= javascript_include_tag :defaults %>
+  <%= csrf_meta_tag %>
+</head>
+<body>
+
+<%= yield %>
+
+</body>
+</html>

data/spec/rails3_test_app/config.ru

@@ -0,0 +1,4 @@
+# This file is used by Rack-based servers to start the application.
+
+require ::File.expand_path('../config/environment',  __FILE__)
+run TestApp::Application

data/spec/rails3_test_app/config/application.rb

@@ -0,0 +1,42 @@
+require File.expand_path('../boot', __FILE__)
+
+require 'rails/all'
+
+# If you have a Gemfile, require the gems listed there, including any gems
+# you've limited to :test, :development, or :production.
+Bundler.require(:default, Rails.env) if defined?(Bundler)
+
+module TestApp
+  class Application < Rails::Application
+    # Settings in config/environments/* take precedence over those specified here.
+    # Application configuration should go into files in config/initializers
+    # -- all .rb files in that directory are automatically loaded.
+
+    # Custom directories with classes and modules you want to be autoloadable.
+    # config.autoload_paths += %W(#{config.root}/extras)
+
+    # Only load the plugins named here, in the order given (default is alphabetical).
+    # :all can be used as a placeholder for all plugins not explicitly named.
+    # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
+
+    # Activate observers that should always be running.
+    # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
+
+    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
+    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
+    # config.time_zone = 'Central Time (US & Canada)'
+
+    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
+    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
+    # config.i18n.default_locale = :de
+
+    # JavaScript files you want as :defaults (application.js is always included).
+    # config.action_view.javascript_expansions[:defaults] = %w(jquery rails)
+
+    # Configure the default encoding used in templates for Ruby 1.9.
+    config.encoding = "utf-8"
+
+    # Configure sensitive parameters which will be filtered from the log file.
+    config.filter_parameters += [:password]
+  end
+end

data/spec/rails3_test_app/config/boot.rb

@@ -0,0 +1,6 @@
+require 'rubygems'
+
+# Set up gems listed in the Gemfile.
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+
+require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])

data/spec/rails3_test_app/config/database.yml

@@ -0,0 +1,22 @@
+# SQLite version 3.x
+#   gem install sqlite3
+development:
+  adapter: sqlite3
+  database: db/development.sqlite3
+  pool: 5
+  timeout: 5000
+
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
+test:
+  adapter: sqlite3
+  database: db/test.sqlite3
+  pool: 5
+  timeout: 5000
+
+production:
+  adapter: sqlite3
+  database: db/production.sqlite3
+  pool: 5
+  timeout: 5000

data/spec/rails3_test_app/config/environment.rb

@@ -0,0 +1,5 @@
+# Load the rails application
+require File.expand_path('../application', __FILE__)
+
+# Initialize the rails application
+TestApp::Application.initialize!

data/spec/rails3_test_app/config/environments/development.rb

@@ -0,0 +1,26 @@
+TestApp::Application.configure do
+  # Settings specified here will take precedence over those in config/application.rb
+
+  # In the development environment your application's code is reloaded on
+  # every request.  This slows down response time but is perfect for development
+  # since you don't have to restart the webserver when you make code changes.
+  config.cache_classes = false
+
+  # Log error messages when you accidentally call methods on nil.
+  config.whiny_nils = true
+
+  # Show full error reports and disable caching
+  config.consider_all_requests_local       = true
+  config.action_view.debug_rjs             = true
+  config.action_controller.perform_caching = false
+
+  # Don't care if the mailer can't send
+  config.action_mailer.raise_delivery_errors = false
+
+  # Print deprecation notices to the Rails logger
+  config.active_support.deprecation = :log
+
+  # Only use best-standards-support built into browsers
+  config.action_dispatch.best_standards_support = :builtin
+end
+

data/spec/rails3_test_app/config/environments/production.rb

@@ -0,0 +1,49 @@
+TestApp::Application.configure do
+  # Settings specified here will take precedence over those in config/application.rb
+
+  # The production environment is meant for finished, "live" apps.
+  # Code is not reloaded between requests
+  config.cache_classes = true
+
+  # Full error reports are disabled and caching is turned on
+  config.consider_all_requests_local       = false
+  config.action_controller.perform_caching = true
+
+  # Specifies the header that your server uses for sending files
+  config.action_dispatch.x_sendfile_header = "X-Sendfile"
+
+  # For nginx:
+  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect'
+
+  # If you have no front-end server that supports something like X-Sendfile,
+  # just comment this out and Rails will serve the files
+
+  # See everything in the log (default is :info)
+  # config.log_level = :debug
+
+  # Use a different logger for distributed setups
+  # config.logger = SyslogLogger.new
+
+  # Use a different cache store in production
+  # config.cache_store = :mem_cache_store
+
+  # Disable Rails's static asset server
+  # In production, Apache or nginx will already do this
+  config.serve_static_assets = false
+
+  # Enable serving of images, stylesheets, and javascripts from an asset server
+  # config.action_controller.asset_host = "http://assets.example.com"
+
+  # Disable delivery errors, bad email addresses will be ignored
+  # config.action_mailer.raise_delivery_errors = false
+
+  # Enable threaded mode
+  # config.threadsafe!
+
+  # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
+  # the I18n.default_locale when a translation can not be found)
+  config.i18n.fallbacks = true
+
+  # Send deprecation notices to registered listeners
+  config.active_support.deprecation = :notify
+end

data/spec/rails3_test_app/config/environments/test.rb

@@ -0,0 +1,35 @@
+TestApp::Application.configure do
+  # Settings specified here will take precedence over those in config/application.rb
+
+  # The test environment is used exclusively to run your application's
+  # test suite.  You never need to work with it otherwise.  Remember that
+  # your test database is "scratch space" for the test suite and is wiped
+  # and recreated between test runs.  Don't rely on the data there!
+  config.cache_classes = true
+
+  # Log error messages when you accidentally call methods on nil.
+  config.whiny_nils = true
+
+  # Show full error reports and disable caching
+  config.consider_all_requests_local       = true
+  config.action_controller.perform_caching = false
+
+  # Raise exceptions instead of rendering exception templates
+  config.action_dispatch.show_exceptions = false
+
+  # Disable request forgery protection in test environment
+  config.action_controller.allow_forgery_protection    = false
+
+  # Tell Action Mailer not to deliver emails to the real world.
+  # The :test delivery method accumulates sent emails in the
+  # ActionMailer::Base.deliveries array.
+  config.action_mailer.delivery_method = :test
+
+  # Use SQL instead of Active Record's schema dumper when creating the test database.
+  # This is necessary if your schema can't be completely dumped by the schema dumper,
+  # like if you have constraints or database-specific column types
+  # config.active_record.schema_format = :sql
+
+  # Print deprecation notices to the stderr
+  config.active_support.deprecation = :stderr
+end

data/spec/rails3_test_app/config/initializers/backtrace_silencers.rb

@@ -0,0 +1,7 @@
+# Be sure to restart your server when you modify this file.
+
+# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.
+# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ }
+
+# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code.
+# Rails.backtrace_cleaner.remove_silencers!

data/spec/rails3_test_app/config/initializers/inflections.rb

@@ -0,0 +1,10 @@
+# Be sure to restart your server when you modify this file.
+
+# Add new inflection rules using the following format
+# (all these examples are active by default):
+# ActiveSupport::Inflector.inflections do |inflect|
+#   inflect.plural /^(ox)$/i, '\1en'
+#   inflect.singular /^(ox)en/i, '\1'
+#   inflect.irregular 'person', 'people'
+#   inflect.uncountable %w( fish sheep )
+# end

data/spec/rails3_test_app/config/initializers/mime_types.rb

@@ -0,0 +1,5 @@
+# Be sure to restart your server when you modify this file.
+
+# Add new mime types for use in respond_to blocks:
+# Mime::Type.register "text/richtext", :rtf
+# Mime::Type.register_alias "text/html", :iphone

data/spec/rails3_test_app/config/initializers/secret_token.rb

@@ -0,0 +1,7 @@
+# Be sure to restart your server when you modify this file.
+
+# Your secret key for verifying the integrity of signed cookies.
+# If you change this key, all old signed cookies will become invalid!
+# Make sure the secret is at least 30 characters and all random,
+# no regular words or you'll be exposed to dictionary attacks.
+TestApp::Application.config.secret_token = '1c1a9058fbe5cb97c50cfb96a4d4b20ad42a128603eac6d7f6deba4722b9ab2a6c7160b5a35a29de887b7ef41c22b000235eaa08d6c99ec8046c44376e92a80f'

data/spec/rails3_test_app/config/initializers/session_store.rb

@@ -0,0 +1,8 @@
+# Be sure to restart your server when you modify this file.
+
+TestApp::Application.config.session_store :cookie_store, :key => '_test_app_session'
+
+# Use the database for sessions instead of the cookie-based default,
+# which shouldn't be used to store highly confidential information
+# (create the session table with "rails generate session_migration")
+# TestApp::Application.config.session_store :active_record_store

data/spec/rails3_test_app/config/locales/en.yml

@@ -0,0 +1,5 @@
+# Sample localization file for English. Add more files in this directory for other locales.
+# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
+
+en:
+  hello: "Hello world"

data/spec/rails3_test_app/config/routes.rb

@@ -0,0 +1,58 @@
+TestApp::Application.routes.draw do
+  # The priority is based upon order of creation:
+  # first created -> highest priority.
+
+  # Sample of regular route:
+  #   match 'products/:id' => 'catalog#view'
+  # Keep in mind you can assign values other than :controller and :action
+
+  # Sample of named route:
+  #   match 'products/:id/purchase' => 'catalog#purchase', :as => :purchase
+  # This route can be invoked with purchase_url(:id => product.id)
+
+  # Sample resource route (maps HTTP verbs to controller actions automatically):
+  #   resources :products
+
+  # Sample resource route with options:
+  #   resources :products do
+  #     member do
+  #       get 'short'
+  #       post 'toggle'
+  #     end
+  #
+  #     collection do
+  #       get 'sold'
+  #     end
+  #   end
+
+  # Sample resource route with sub-resources:
+  #   resources :products do
+  #     resources :comments, :sales
+  #     resource :seller
+  #   end
+
+  # Sample resource route with more complex sub-resources
+  #   resources :products do
+  #     resources :comments
+  #     resources :sales do
+  #       get 'recent', :on => :collection
+  #     end
+  #   end
+
+  # Sample resource route within a namespace:
+  #   namespace :admin do
+  #     # Directs /admin/products/* to Admin::ProductsController
+  #     # (app/controllers/admin/products_controller.rb)
+  #     resources :products
+  #   end
+
+  # You can have the root of your site routed with "root"
+  # just remember to delete public/index.html.
+  # root :to => "welcome#index"
+
+  # See how all your routes lay out with "rake routes"
+
+  # This is a legacy wild controller route that's not recommended for RESTful applications.
+  # Note: This route will make all actions in every controller accessible via GET requests.
+  # match ':controller(/:action(/:id(.:format)))'
+end

data/spec/rails3_test_app/db/seeds.rb

@@ -0,0 +1,7 @@
+# This file should contain all the record creation needed to seed the database with its default values.
+# The data can then be loaded with the rake db:seed (or created alongside the db with db:setup).
+#
+# Examples:
+#
+#   cities = City.create([{ :name => 'Chicago' }, { :name => 'Copenhagen' }])
+#   Mayor.create(:name => 'Daley', :city => cities.first)

data/spec/rails3_test_app/run_tests

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+

data/spec/rails3_test_app/script/rails

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
+
+APP_PATH = File.expand_path('../../config/application',  __FILE__)
+require File.expand_path('../../config/boot',  __FILE__)
+require 'rails/commands'

data/spec/rails3_test_app/spec/spec_helper.rb

@@ -0,0 +1,27 @@
+# This file is copied to spec/ when you run 'rails generate rspec:install'
+ENV["RAILS_ENV"] ||= 'test'
+require File.expand_path("../../config/environment", __FILE__)
+require 'rspec/rails'
+
+# Requires supporting ruby files with custom matchers and macros, etc,
+# in spec/support/ and its subdirectories.
+Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
+
+RSpec.configure do |config|
+  # == Mock Framework
+  #
+  # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
+  #
+  # config.mock_with :mocha
+  # config.mock_with :flexmock
+  # config.mock_with :rr
+  config.mock_with :rspec
+
+  # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
+  config.fixture_path = "#{::Rails.root}/spec/fixtures"
+
+  # If you're not using ActiveRecord, or you'd prefer not to run each of your
+  # examples within a transaction, remove the following line or assign false
+  # instead of true.
+  config.use_transactional_fixtures = true
+end

data/spec/rails3_test_app/spec/unit/rails_3_init.rb

@@ -0,0 +1,15 @@
+require File.join(File.dirname(__FILE__), '../spec_helper')
+
+describe "initializing active-fedora in a rails 3 app" do
+  it "should include ActiveFedora::Railtie" do
+    begin
+      ActiveFedora::Railtie
+      railtie_loaded = true
+    rescue NameError
+      railtie_loaded = false
+    end
+
+    railtie_loaded.should be_true
+      
+  end
+end

data/spec/spec_helper.rb

@@ -15,7 +15,7 @@ ENV["RAILS_ENV"] ||= 'test'
 RAILS_ENV = ENV["RAILS_ENV"]
 
 $:.unshift(File.dirname(__FILE__) + '/../lib')
-Dir[File.join(File.dirname(__FILE__)+'/../lib/')+'**/*.rb'].each{|x| require x}
+Dir[File.join(File.dirname(__FILE__)+'/../lib/')+'**/*.rb'].each{|x| require x unless x.match(/railtie.rb$/)}
 $VERBOSE=nil
 
 # This loads the Fedora and Solr config info from /config/fedora.yml

data/spec/unit/active_fedora_spec.rb

@@ -52,29 +52,88 @@ describe ActiveFedora do
       ActiveFedora.send(:valid_predicate_mapping?,default_predicate_mapping_file).should be_true
     end
     it "should return false if the mapping is missing the :default_namespace" do
-      mock_yaml({:default_namespace0=>"my_namespace",:predicate_mapping=>{:key0=>"value0", :key1=>"value1"}})
+      mock_yaml({:default_namespace0=>"my_namespace",:predicate_mapping=>{:key0=>"value0", :key1=>"value1"}},"/path/to/predicate_mappings.yml")
       ActiveFedora.send(:valid_predicate_mapping?,"/path/to/predicate_mappings.yml").should be_false
     end
     it "should return false if the :default_namespace is not a string" do
-      mock_yaml({:default_namespace=>{:foo=>"bar"}, :predicate_mapping=>{:key0=>"value0", :key1=>"value1"}})
+      mock_yaml({:default_namespace=>{:foo=>"bar"}, :predicate_mapping=>{:key0=>"value0", :key1=>"value1"}},"/path/to/predicate_mappings.yml")
       ActiveFedora.send(:valid_predicate_mapping?,"/path/to/predicate_mappings.yml").should be_false
     end
     it "should return false if the :predicate_mappings key is missing" do
-      mock_yaml({:default_namespace=>"a string"})
+      mock_yaml({:default_namespace=>"a string"},"/path/to/predicate_mappings.yml")
       ActiveFedora.send(:valid_predicate_mapping?,"/path/to/predicate_mappings.yml").should be_false
     end
     it "should return false if the :predicate_mappings key is not a hash" do
-      mock_yaml({:default_namespace=>"a string",:predicate_mapping=>"another string"})
+      mock_yaml({:default_namespace=>"a string",:predicate_mapping=>"another string"},"/path/to/predicate_mappings.yml")
       ActiveFedora.send(:valid_predicate_mapping?,"/path/to/predicate_mappings.yml").should be_false
     end
 
   end
-end
 
+  describe ".init" 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.fedora_url.to_s.should == "http://fedoraAdmin:fedoraAdmin@127.0.0.1:8983/fedora"
+      end
+      it "should load the passed config if explicit config passed in" do
+        ActiveFedora.init('./spec/fixtures/rails_root/config/fedora.yml')
+        ActiveFedora.fedora.fedora_url.to_s.should == "http://fedoraAdmin:fedoraAdmin@testhost.com:8983/fedora"
+      end
+    end
+
+    describe "within rails" do
+
+      before(:all) do
+        Object.const_set("Rails",String)
+      end
+
+      after(:all) do
+        if Rails == String
+          Object.send(:remove_const,:Rails)
+        end
+      end
+
+      describe "versions prior to 3.0" do
+        describe "with explicit config path passed in" do
+          it "should load the specified config path" do
+            config_hash={"test"=>{"fedora"=>{"url"=>"http://fedoraAdmin:fedoraAdmin@127.0.0.1:8983/fedora"},"solr"=>{"url"=>"http://127.0.0.1:8983/solr/test/"}}}
+            config_path = File.expand_path(File.join(File.dirname(__FILE__),"config"))
+            mock_yaml(config_hash,File.join(config_path,"fedora.yml"))
+            File.expects(:exist?).with(File.join(config_path,"predicate_mappings.yml")).returns(true)
+            ActiveFedora.expects(:valid_predicate_mapping?).returns(true)
+            ActiveFedora.init(File.join(config_path,"fedora.yml"))
+            ActiveFedora.solr.class.should == ActiveFedora::SolrService
+            ActiveFedora.fedora.class.should == Fedora::Repository
+          end
+        end
+
+        describe "with no explicit config path" do
+          it "should look for the file in the path defined at Rails.root" do
+            Rails.expects(:root).returns(File.join(File.dirname(__FILE__),"../fixtures/rails_root"))
+            ActiveFedora.init()
+            ActiveFedora.solr.class.should == ActiveFedora::SolrService
+            ActiveFedora.fedora.class.should == Fedora::Repository
+            ActiveFedora.fedora.fedora_url.to_s.should == "http://fedoraAdmin:fedoraAdmin@testhost.com:8983/fedora"
+          end
+          it "should load the default file if no config is found at Rails.root" do
+            Rails.expects(:root).returns(File.join(File.dirname(__FILE__),"../fixtures/bad/path/to/rails_root"))
+            ActiveFedora.init()
+            ActiveFedora.solr.class.should == ActiveFedora::SolrService
+            ActiveFedora.fedora.class.should == Fedora::Repository
+            ActiveFedora.fedora.fedora_url.to_s.should == "http://fedoraAdmin:fedoraAdmin@127.0.0.1:8983/fedora"
+          end
+        end
+      end
+    end
+  end
+end
 
-def mock_yaml(hash)
-  mock_file = mock("predicate_mappings.yml")
-  File.expects(:open).with("/path/to/predicate_mappings.yml").returns(mock_file)
+def mock_yaml(hash, path)
+  mock_file = mock(path.split("/")[-1])
+  File.stubs(:exist?).with(path).returns(true)
+  File.expects(:open).with(path).returns(mock_file)
   YAML.expects(:load).returns(hash)
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active-fedora
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 3
   prerelease: 
   segments: 
   - 2
-  - 2
   - 3
-  version: 2.2.3
+  - 0
+  version: 2.3.0
 platform: ruby
 authors: 
 - Matt Zumwalt
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-17 00:00:00 Z
+date: 2011-06-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: solr-ruby
@@ -458,6 +458,7 @@ files:
 - lib/active_fedora/nokogiri_datastream.rb
 - lib/active_fedora/property.rb
 - lib/active_fedora/qualified_dublin_core_datastream.rb
+- lib/active_fedora/railtie.rb
 - lib/active_fedora/relationship.rb
 - lib/active_fedora/rels_ext_datastream.rb
 - lib/active_fedora/samples.rb
@@ -494,6 +495,11 @@ files:
 - spec/fixtures/minivan.jpg
 - spec/fixtures/mods_articles/hydrangea_article1.xml
 - spec/fixtures/oh_qdc.xml
+- spec/fixtures/rails_root/config/fedora.yml
+- spec/fixtures/rails_root/config/predicate_mappings.yml
+- spec/fixtures/rails_root/config/solr_mappings.yml
+- spec/fixtures/rails_root/config/solr_mappings_af_0.1.yml
+- spec/fixtures/rails_root/config/solr_mappings_bl_2.4.yml
 - spec/fixtures/test_12.foxml.xml
 - spec/hydrangea_fixture_mods_article1.foxml.xml
 - spec/integration/base_file_management_spec.rb
@@ -514,6 +520,35 @@ files:
 - spec/integration/rf_fedora_object_spec.rb
 - spec/integration/semantic_node_spec.rb
 - spec/integration/solr_service_spec.rb
+- spec/rails3_test_app/.gitignore
+- spec/rails3_test_app/.rspec
+- spec/rails3_test_app/.rvmrc
+- spec/rails3_test_app/Gemfile
+- spec/rails3_test_app/Gemfile.lock
+- spec/rails3_test_app/Rakefile
+- spec/rails3_test_app/app/controllers/application_controller.rb
+- spec/rails3_test_app/app/helpers/application_helper.rb
+- spec/rails3_test_app/app/views/layouts/application.html.erb
+- spec/rails3_test_app/config.ru
+- spec/rails3_test_app/config/application.rb
+- spec/rails3_test_app/config/boot.rb
+- spec/rails3_test_app/config/database.yml
+- spec/rails3_test_app/config/environment.rb
+- spec/rails3_test_app/config/environments/development.rb
+- spec/rails3_test_app/config/environments/production.rb
+- spec/rails3_test_app/config/environments/test.rb
+- spec/rails3_test_app/config/initializers/backtrace_silencers.rb
+- spec/rails3_test_app/config/initializers/inflections.rb
+- spec/rails3_test_app/config/initializers/mime_types.rb
+- spec/rails3_test_app/config/initializers/secret_token.rb
+- spec/rails3_test_app/config/initializers/session_store.rb
+- spec/rails3_test_app/config/locales/en.yml
+- spec/rails3_test_app/config/routes.rb
+- spec/rails3_test_app/db/seeds.rb
+- spec/rails3_test_app/run_tests
+- spec/rails3_test_app/script/rails
+- spec/rails3_test_app/spec/spec_helper.rb
+- spec/rails3_test_app/spec/unit/rails_3_init.rb
 - spec/rcov.opts
 - spec/samples/models/audio_record.rb
 - spec/samples/models/hydrangea_article.rb
@@ -592,6 +627,11 @@ test_files:
 - spec/fixtures/minivan.jpg
 - spec/fixtures/mods_articles/hydrangea_article1.xml
 - spec/fixtures/oh_qdc.xml
+- spec/fixtures/rails_root/config/fedora.yml
+- spec/fixtures/rails_root/config/predicate_mappings.yml
+- spec/fixtures/rails_root/config/solr_mappings.yml
+- spec/fixtures/rails_root/config/solr_mappings_af_0.1.yml
+- spec/fixtures/rails_root/config/solr_mappings_bl_2.4.yml
 - spec/fixtures/test_12.foxml.xml
 - spec/hydrangea_fixture_mods_article1.foxml.xml
 - spec/integration/base_file_management_spec.rb
@@ -612,6 +652,35 @@ test_files:
 - spec/integration/rf_fedora_object_spec.rb
 - spec/integration/semantic_node_spec.rb
 - spec/integration/solr_service_spec.rb
+- spec/rails3_test_app/.gitignore
+- spec/rails3_test_app/.rspec
+- spec/rails3_test_app/.rvmrc
+- spec/rails3_test_app/Gemfile
+- spec/rails3_test_app/Gemfile.lock
+- spec/rails3_test_app/Rakefile
+- spec/rails3_test_app/app/controllers/application_controller.rb
+- spec/rails3_test_app/app/helpers/application_helper.rb
+- spec/rails3_test_app/app/views/layouts/application.html.erb
+- spec/rails3_test_app/config.ru
+- spec/rails3_test_app/config/application.rb
+- spec/rails3_test_app/config/boot.rb
+- spec/rails3_test_app/config/database.yml
+- spec/rails3_test_app/config/environment.rb
+- spec/rails3_test_app/config/environments/development.rb
+- spec/rails3_test_app/config/environments/production.rb
+- spec/rails3_test_app/config/environments/test.rb
+- spec/rails3_test_app/config/initializers/backtrace_silencers.rb
+- spec/rails3_test_app/config/initializers/inflections.rb
+- spec/rails3_test_app/config/initializers/mime_types.rb
+- spec/rails3_test_app/config/initializers/secret_token.rb
+- spec/rails3_test_app/config/initializers/session_store.rb
+- spec/rails3_test_app/config/locales/en.yml
+- spec/rails3_test_app/config/routes.rb
+- spec/rails3_test_app/db/seeds.rb
+- spec/rails3_test_app/run_tests
+- spec/rails3_test_app/script/rails
+- spec/rails3_test_app/spec/spec_helper.rb
+- spec/rails3_test_app/spec/unit/rails_3_init.rb
 - spec/rcov.opts
 - spec/samples/models/audio_record.rb
 - spec/samples/models/hydrangea_article.rb