active-fedora 6.8.0 → 7.0.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38f3e48a7233ed42a4657aabad91c8b386995d5c
-  data.tar.gz: be721bf82b5bf9f0e7929c4c7845bdaa335b013b
+  metadata.gz: c74522099ed634b608f204bad305da5f8d75cab4
+  data.tar.gz: 2e8c34f85de2b43228be92b308bae48dc09743be
 SHA512:
-  metadata.gz: 58a454c65dda6893b240992458c025266a4f25a837e0f61eb845bb136ff18baceed7ae2c34dfb60027871908c12de0e825ecc1eaa42c1fd86c051ce9779c4af9
-  data.tar.gz: 49ae4783ee9f477296b966ad76673d5763efb8492d8472a9fb55b9d63e95e4ad9f3bdf622a66b54ea993425954382d67e3017f5d1f67d734961c52345c42c4d2
+  metadata.gz: e860a7bcd89e37df76919459ed159f618de89d3e86a34b8ec47fd05f3471a3be2a252b1639e41f4e8d8e1f799f833e8cb4b4d65351ef866bc461691e362bb619
+  data.tar.gz: bf290c42f829451d2858e06c25a283bcbbf5d30b4ea942322ea3d0d984740eb38318d6e5262d5c36da38211386b04bc57bd9b41264c54c0dbd718d81780ff3eb

data/.gitignore

@@ -12,3 +12,4 @@ bin
 .idea
 .ruby-version
 .ruby-gemset
+gemfiles/*.gemfile.lock

data/.travis.yml

@@ -1,13 +1,23 @@
-sudo: false
 language: ruby
 rvm:
-  - 2.2.5
-  - 2.3.1
+  - 2.1.0
+  - 2.0.0
+  - 1.9.3
+
+matrix:
+  allow_failures:
+    - rvm: 2.1.0
+
+
+gemfile:
+  - gemfiles/rails3.gemfile
+  - gemfiles/rails4.gemfile
 
 notifications:
   irc: "irc.freenode.org#projecthydra"
 
 before_install:
   - gem install bundler
-
-jdk: oraclejdk8
+env:
+  global:
+    - NOKOGIRI_USE_SYSTEM_LIBRARIES=true

data/CONTRIBUTING.md

@@ -78,6 +78,8 @@ You should also add yourself to the `CONTRIBUTORS.md` file in the root of the pr
 
 ### Submitting Changes
 
+[Detailed Walkthrough of One Pull Request per Commit](http://ndlib.github.io/practices/one-commit-per-pull-request/)
+
 * Read the article ["Using Pull Requests"](https://help.github.com/articles/using-pull-requests) on GitHub.
 * Make sure your branch is up to date with its parent branch (i.e. master)
   * `git checkout master`

data/Gemfile

@@ -10,5 +10,3 @@ group :development, :test do
 end
 
 gem 'jruby-openssl', :platform=> :jruby
-
-gem 'activemodel', '~> 4.2'

data/History.txt

@@ -1,36 +1,6 @@
-v6.7.8
-Backported changes from master for proper deserialization of ActiveFedora::DatastreamHash (Fixed #439) [Michael B. Klein]
+v7.0.0 Unreleased
 
-v6.7.7
-Backported changes from master for rubydora 1.7.1+ compatibility (Fixes #354). Upgraded rubydora to ~> 1.7.4. [David Chandek-Stark]
-
-v6.7.6
-Patch ActiveFedora::SolrDigitalObject for Rubydora 1.7.0 compatibility. [David Chandek-Stark]
-
-v6.7.5
-Support for rubydora 1.7.0 [Justin Coyne]
-
-v6.7.4
-Restrict rdf to ~> 1.1.1.1 because rdf 1.1.2 breaks ActiveFedora [Justin Coyne]
-
-v6.7.3
-Force overwrite the blacklight configuration [Justin Coyne]
-
-v6.7.2
-ConfigGenerator should use a unique method name, not `generate` so that it doesn't cause an infinite loop [Justin Coyne]
-
-v6.7.1
-Force RDF data to be UTF-8 The RDF reader chokes on certain character combinations if the raw data is not encoded UTF-8.  See https://github.com/ruby-rdf/rdf/issues/142 Fedora does not store character encoding, so by default they come back as ASCII-8BIT. [Justin Coyne]
-Renaming invoke -> generate [Jeremy Friesen]
-
-v6.7.0
-Remove loading of rake tasks because they are already loaded in the railtie [Chris Colvard]
-Added has_attributes to replace delegate_to [Justin Coyne]
-
-v6.6.1
-Don't try to track changes on delegates that are not attributes [Justin Coyne]
-Alter test so that it's compatible with the solr document produced by om 3.0.4 [Justin Coyne]
-Fix test for Fedora 3.7 [Justin Coyne]
+Removed update_indexed_attributes, update_datastream_attributes, get_values_from_datastream
 
 v6.6.0
 Add _destroy method for building nested forms [Justin Coyne]

data/README.md

@@ -0,0 +1,143 @@
+Description
+-----------
+
+[![Build Status](https://travis-ci.org/projecthydra/active_fedora.png?branch=master)](https://travis-ci.org/projecthydra/active\_fedora)
+[![Version](https://badge.fury.io/rb/active-fedora.png)](http://badge.fury.io/rb/active-fedora)
+[![Dependencies](https://gemnasium.com/projecthydra/active_fedora.png)](https://gemnasium.com/projecthydra/active\_fedora)
+
+RubyFedora and ActiveFedora provide a set of Ruby gems for creating and
+managing objects in the Fedora Repository Architecture
+([http://fedora-commons.org](http://fedora-commons.org)). ActiveFedora
+is loosely based on “ActiveRecord” in Rails. The 3.x series of
+ActiveFedora depends on Rails 3, specifically activemodel and
+activesupport.
+
+Getting Help
+------------
+
+-   Community Discussions & Mailing List are located at
+    [http://groups.google.com/group/hydra-tech](http://groups.google.com/group/hydra-tech)
+-   Developers hang out on IRC in \#projecthydra on freenet.
+
+Installation
+------------
+
+The gem is hosted on gemcutter.
+
+    gem install active-fedora
+
+Getting Started
+---------------
+
+The [ActiveFedora Console
+Tour](https://github.com/projecthydra/active_fedora/wiki/Getting-Started:-Console-Tour)
+gives you a brief tour through ActiveFedora’s features on the command
+line.
+
+Generators
+----------
+
+You can generate a model inheriting from ActiveFedora::Base.
+
+    rails generate active_fedora:model Book
+
+Testing (this Gem)
+------------------
+
+In order to run the RSpec tests, you need to have a copy of the
+ActiveFedora source code, and then run bundle install in the source
+directory. Testing requires hydra-jetty, which contains version for
+Fedora and Solr. Setting up and maintaining hydra-jetty for the purposes
+of testing this gem is all accomplished via
+
+    git clone https://github.com/projecthydra/active_fedora.git
+    cd /wherever/active_fedora/is
+    bundle install
+
+### Using the continuous integration server
+
+You can test ActiveFedora using the same process as our continuous
+integration server. To do that, unzip a copy\
+of hydra-jetty first. This includes copies of Fedora and Solr which are
+used during the testing process.
+
+      rake jetty:unzip 
+
+Once hydra-jetty is unzipped, the ci rake task will spin up jetty,
+import the fixtures, and run the tests for you.
+
+      rake active_fedora:ci
+
+### Testing Manually
+
+If you want to run the tests manually, follow these instructions.
+
+You need to have a copy of hydra-jetty running. To do this, download a
+working copy of
+[hydra-jetty](https://github.com/projecthydra/hydra-jetty), cd into its
+root and run
+
+    java -jar start.jar
+
+Now you’re ready to run the tests. In the directory where active\_fedora
+is installed, run
+
+      rake spec
+
+Predicate Mappings
+------------------
+
+ActiveFedora versions 2.2.1 and higher provides specialized control over
+the predicate mappings used by SemanticNode. In order to provide your
+own mappings, \
+you must supply a predicate\_mappings.yml in the same format as the
+config/predicate\_mappings.yml file shipped with the ActiveFedora gem.
+Place the file in the same directory\
+as your fedora.yml file and use the current method of initializing
+ActiveFedora:
+
+    ActiveFedora.init("/path/to/my/config/fedora.yml")
+
+If no predicate\_mappings.yml file is found, ActiveFedora will use the
+default mappings.
+
+Acknowledgements
+----------------
+
+Creator: Matt Zumwalt ([MediaShelf](http://yourmediashelf.com))
+
+Developers: \
+Justin Coyne, McClain Looney & Eddie Shin
+([MediaShelf](http://yourmediashelf.com)), Rick Johnson (Notre Dame)
+
+LICENSE:
+--------
+
+Copyright © 2009-2012 Matt Zumwalt & MediaShelf, LLC
+
+This program is free software: you can redistribute it and/or modify\
+it under the terms of the GNU Lesser General Public License (LGPL) as \
+published by the Free Software Foundation, either version 3 of the
+License, \
+or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,\
+but WITHOUT ANY WARRANTY; without even the implied warranty of\
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\
+GNU General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License\
+along with this program. If not, see <http://www.gnu.org/licenses/> or \
+see <http://www.gnu.org/licenses/lgpl.html>.
+
+The above copyright notice and this permission notice shall be\
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED ‘AS IS’, WITHOUT WARRANTY OF ANY KIND,\
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.\
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY\
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,\
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE\
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -1,21 +1,19 @@
 require 'rake/clean'
 require 'rubygems'
 require 'bundler'
-require 'bundler/setup'
-require 'active-fedora'
+require "bundler/setup"
+require "active-fedora"
 
 Bundler::GemHelper.install_tasks
 
-# peg to an expected-to-match version of jetty, if not specified
-ZIP_URL ||= ENV['ZIP_URL'] || 'https://github.com/projecthydra/hydra-jetty/archive/v7.2.0.zip'
-
 # load rake tasks defined in lib/tasks that are not loaded in lib/active_fedora.rb
-load 'lib/tasks/active_fedora_dev.rake' if defined?(Rake)
+load "lib/tasks/active_fedora_dev.rake"
 
 CLEAN.include %w[**/.DS_Store tmp *.log *.orig *.tmp **/*~]
 
-task :ci   => ['jetty:clean', 'active_fedora:ci']
+task :ci => ['jetty:clean', 'active_fedora:ci']
 task :spec => ['active_fedora:rspec']
 task :rcov => ['active_fedora:rcov']
 
+
 task :default => [:ci]

data/active-fedora.gemspec

@@ -15,31 +15,31 @@ Gem::Specification.new do |s|
   s.required_ruby_version     = '>= 1.9.3'
 
   s.add_dependency('rsolr')
-  s.add_dependency('om', '~> 3.0')
+  s.add_dependency('om', '~> 3.0.0')
   s.add_dependency('nom-xml', '>=0.5.1')
-  s.add_dependency("activesupport", '>= 3')
+  s.add_dependency("activesupport", '>= 3.0.0')
   s.add_dependency("mediashelf-loggable")
-  s.add_dependency("rubydora", '~>1.6', '>= 1.6.5')
-  s.add_dependency("rdf", '~> 1.1', '>= 1.1.1.1')
-  s.add_dependency("rdf-rdfxml", '~>1.1')
+  s.add_dependency("rubydora", '~>1.7.0.pre1')
+  s.add_dependency("rdf")
+  s.add_dependency("rdf-rdfxml", '~>1.1.0')
   s.add_dependency("deprecation")
   s.add_development_dependency("rdoc")
   s.add_development_dependency("yard")
-  s.add_development_dependency("RedCloth") # for RDoc formatting
   s.add_development_dependency("rake")
   s.add_development_dependency("jettywrapper", ">=1.4.0")
-  s.add_development_dependency("rspec", "~> 2.99")
+  s.add_development_dependency("rspec", ">= 2.9.0")
   s.add_development_dependency("equivalent-xml")
   s.add_development_dependency("rest-client")
   s.add_development_dependency("webmock")
-
+  
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.extra_rdoc_files = [
     "LICENSE",
-    "README.textile"
+    "README.md"
   ]
   s.require_paths = ["lib"]
 
 end
+

data/gemfiles/rails3.gemfile

@@ -0,0 +1,11 @@
+source "http://rubygems.org"
+
+gemspec :path=>"../"
+
+gem 'activemodel', '~> 3.2.13'
+
+group :development, :test do
+  gem 'rcov', :platform => :mri_18
+  gem 'simplecov', :platform => :mri_19
+  gem 'simplecov-rcov', :platform => :mri_19
+end

data/gemfiles/rails4.gemfile

@@ -0,0 +1,10 @@
+source "http://rubygems.org"
+
+gemspec :path=>"../"
+
+gem 'activemodel', '~> 4.0.0'
+
+group :development, :test do
+  gem 'simplecov', :platform => :mri_19
+  gem 'simplecov-rcov', :platform => :mri_19
+end

data/lib/active_fedora.rb

@@ -22,28 +22,33 @@ module ActiveFedora #:nodoc:
   class AssociationTypeMismatch < RuntimeError; end # :nodoc:
   class UnregisteredPredicateError < RuntimeError; end # :nodoc:
   class RecordNotSaved < RuntimeError; end # :nodoc:
+  class IllegalOperation < RuntimeError; end # :nodoc:
 
 
   eager_autoload do
+    autoload :AssociationRelation
     autoload :Associations
     autoload :Attributes
     autoload :Auditable
+    autoload :AutosaveAssociation
     autoload :Base
     autoload :ContentModel
     autoload :Callbacks
     autoload :Config
+    autoload :Core
     autoload :Datastream
+    autoload :DatastreamAttribute
     autoload :DatastreamHash
     autoload :Datastreams
-    autoload :Delegating
     autoload :DigitalObject
+    autoload :FedoraAttributes
     autoload :FileConfigurator
     autoload :Indexing
     autoload :Model
     autoload :NestedAttributes
-    autoload :NokogiriDatastream
     autoload :NomDatastream
     autoload :NtriplesRDFDatastream
+    autoload :NullRelation
     autoload :OmDatastream
     autoload :Property
     autoload :Persistence
@@ -57,10 +62,22 @@ module ActiveFedora #:nodoc:
     autoload :RdfxmlRDFDatastream
     autoload :Reflection
     autoload :Relation
+
+    autoload_under 'relation' do
+      autoload :Calculations
+      autoload :Delegation
+      autoload :SpawnMethods
+      autoload :QueryMethods
+      autoload :FinderMethods
+    end
+
     autoload :RelationshipGraph
     autoload :RelsExtDatastream
-    autoload :ServiceDefinitions
+    autoload :Scoping
     autoload :SemanticNode
+    autoload :ServiceDefinitions
+    autoload :Serialization
+    autoload :Sharding
     autoload :SimpleDatastream
     autoload :SolrDigitalObject
     autoload :SolrService
@@ -72,7 +89,17 @@ module ActiveFedora #:nodoc:
     autoload :Validations
     autoload :SolrInstanceLoader
   end
-  
+
+  module Scoping
+    extend ActiveSupport::Autoload
+
+    eager_autoload do
+      autoload :Default
+      autoload :Named
+    end
+  end
+
+
   
   include Loggable
   

data/lib/active_fedora/association_relation.rb

@@ -0,0 +1,18 @@
+module ActiveFedora
+  class AssociationRelation < Relation
+    def initialize(klass, association)
+      super(klass)
+      @association = association
+    end
+
+    def proxy_association
+      @association
+    end
+
+    private
+
+    def exec_queries
+      super.each { |r| @association.set_inverse_instance r }
+    end
+  end
+end

data/lib/active_fedora/associations.rb

@@ -5,13 +5,26 @@ module ActiveFedora
   module Associations
     extend ActiveSupport::Concern
 
-    autoload :HasManyAssociation, 'active_fedora/associations/has_many_association'
-    autoload :BelongsToAssociation, 'active_fedora/associations/belongs_to_association'
+    autoload :Association,           'active_fedora/associations/association'
+    autoload :AssociationScope,      'active_fedora/associations/association_scope'
+    autoload :SingularAssociation,   'active_fedora/associations/singular_association'
+    autoload :CollectionAssociation, 'active_fedora/associations/collection_association'
+    autoload :CollectionProxy,       'active_fedora/associations/collection_proxy'
+
+    autoload :HasManyAssociation,             'active_fedora/associations/has_many_association'
+    autoload :BelongsToAssociation,           'active_fedora/associations/belongs_to_association'
     autoload :HasAndBelongsToManyAssociation, 'active_fedora/associations/has_and_belongs_to_many_association'
 
+    module Builder
+      autoload :Association,             'active_fedora/associations/builder/association'
+      autoload :SingularAssociation,     'active_fedora/associations/builder/singular_association'
+      autoload :CollectionAssociation,   'active_fedora/associations/builder/collection_association'
+
+      autoload :BelongsTo,           'active_fedora/associations/builder/belongs_to'
+      autoload :HasMany,             'active_fedora/associations/builder/has_many'
+      autoload :HasAndBelongsToMany, 'active_fedora/associations/builder/has_and_belongs_to_many'
+    end
 
-    autoload :AssociationCollection, 'active_fedora/associations/association_collection'
-    autoload :AssociationProxy, 'active_fedora/associations/association_proxy'
 
     # Clears out the association cache.
     def clear_association_cache #:nodoc:
@@ -20,6 +33,21 @@ module ActiveFedora
 
     # :nodoc:
     attr_reader :association_cache
+
+
+    # Returns the association instance for the given name, instantiating it if it doesn't already exist
+    def association(name) #:nodoc:
+      association = association_instance_get(name)
+
+      if association.nil?
+        reflection  = self.class.reflect_on_association(name)
+        association = reflection.association_class.new(self, reflection)
+        association_instance_set(name, association)
+      end
+
+      association
+    end
+    
     
     private 
 
@@ -35,10 +63,8 @@ module ActiveFedora
 
     module ClassMethods
 
-      def has_many(association_id, options={})
-        reflection = create_has_many_reflection(association_id, options)
-        add_association_callbacks(reflection.name, reflection.options)
-        collection_accessor_methods(reflection, HasManyAssociation)
+      def has_many(name, options={})
+        Builder::HasMany.build(self, name, options)
       end
 
   
@@ -75,14 +101,9 @@ module ActiveFedora
       # Option examples:
       #   belongs_to :firm, :property => :client_of
       #   belongs_to :author, :class_name => "Person", :property => :author_of
-      def belongs_to(association_id, options = {})
+      def belongs_to(name, options = {})
         raise "You must specify a property name for #{name}" if !options[:property]
-        reflection = create_belongs_to_reflection(association_id, options)
-
-        association_accessor_methods(reflection, BelongsToAssociation)
-        association_constructor_method(:build,  reflection, BelongsToAssociation)
-        association_constructor_method(:create, reflection, BelongsToAssociation)
-        #configure_dependency_for_belongs_to(reflection)
+        Builder::BelongsTo.build(self, name, options)
       end
 
 
@@ -148,163 +169,9 @@ module ActiveFedora
       #   has_and_belongs_to_many :projects, :property=>:works_on
       #   has_and_belongs_to_many :nations, :class_name => "Country", :property=>:is_citizen_of
       #   has_and_belongs_to_many :topics, :property=>:has_topic, :inverse_of=>:is_topic_of
-      def has_and_belongs_to_many(association_id, options = {}, &extension)
-        reflection = create_has_and_belongs_to_many_reflection(association_id, options, &extension)
-        collection_accessor_methods(reflection, HasAndBelongsToManyAssociation)
-        #configure_after_destroy_method_for_has_and_belongs_to_many(reflection)
-        add_association_callbacks(reflection.name, options)
+      def has_and_belongs_to_many(name, options = {})
+        Builder::HasAndBelongsToMany.build(self, name, options)
       end
-
-
-      private 
-
-        def create_has_many_reflection(association_id, options)
-          create_reflection(:has_many, association_id, options, self)
-          #collection_accessor_methods(reflection, HasManyAssociation)
-        end
-
-        def create_belongs_to_reflection(association_id, options)
-          create_reflection(:belongs_to, association_id, options, self)
-        end
-
-        def create_has_and_belongs_to_many_reflection(association_id, options)
-          create_reflection(:has_and_belongs_to_many, association_id, options, self)
-        end
-
-        def add_association_callbacks(association_name, options)
-          callbacks = %w(before_add after_add before_remove after_remove)
-          callbacks.each do |callback_name|
-            full_callback_name = "#{callback_name}_for_#{association_name}"
-            defined_callbacks = options[callback_name.to_sym]
-            class_attribute full_callback_name.to_sym
-            if options.has_key?(callback_name.to_sym)
-              self.send((full_callback_name +'=').to_sym, [defined_callbacks].flatten)
-            else
-              self.send((full_callback_name +'=').to_sym, [])
-            end
-          end
-        end
-
-        def association_accessor_methods(reflection, association_proxy_class)
-          redefine_method(reflection.name) do |*params|
-            force_reload = params.first unless params.empty?
-            association = association_instance_get(reflection.name)
-
-            if association.nil? || force_reload
-              association = association_proxy_class.new(self, reflection)
-              retval = force_reload ? reflection.klass.uncached { association.reload } : association.reload
-              if retval.nil? and association_proxy_class == BelongsToAssociation
-                association_instance_set(reflection.name, nil)
-                return nil
-              end
-              association_instance_set(reflection.name, association)
-            end
-
-            association.target.nil? ? nil : association
-          end
-
-          redefine_method("loaded_#{reflection.name}?") do
-            association = association_instance_get(reflection.name)
-            association && association.loaded?
-          end
-
-          redefine_method("#{reflection.name}=") do |new_value|
-            association = association_instance_get(reflection.name)
-
-            if association.nil? || association.target != new_value
-              association = association_proxy_class.new(self, reflection)
-            end
-
-            association.replace(new_value)
-            association_instance_set(reflection.name, new_value.nil? ? nil : association)
-          end
-
-          redefine_method("set_#{reflection.name}_target") do |target|
-            return if target.nil? and association_proxy_class == BelongsToAssociation
-            association = association_proxy_class.new(self, reflection)
-            association.target = target
-            association_instance_set(reflection.name, association)
-          end
-
-          redefine_method("#{reflection.name}_id=") do |new_value|
-            options = reflection.klass == ActiveFedora::Base ? {cast: true} : {}
-            obj =  new_value.blank? ? nil : reflection.klass.find(new_value, options)
-            send("#{reflection.name}=", obj)
-          end
-          redefine_method("#{reflection.name}_id") do 
-            obj = send("#{reflection.name}")
-            obj.pid if obj
-          end
-        end
-
-
-        def collection_reader_method(reflection, association_proxy_class)
-          redefine_method(reflection.name) do |*params|
-            
-            if (params.first.is_a?(Hash) && params.first[:response_format] == :solr)
-              load_from_solr = true
-              force_reload = false 
-            else 
-              force_reload = params.first unless params.empty?
-            end
-            association = association_instance_get(reflection.name)
-            unless association
-              association = association_proxy_class.new(self, reflection)
-              association_instance_set(reflection.name, association)
-            end
-
-            association.reload if force_reload
-            return association.load_from_solr if load_from_solr
-
-            association
-          end
-
-          redefine_method("#{reflection.name.to_s.singularize}_ids") do
-              send(reflection.name).map { |r| r.pid }
-          end
-
-        end
-
-
-        def collection_accessor_methods(reflection, association_proxy_class, writer = true)
-          collection_reader_method(reflection, association_proxy_class)
-
-          if writer
-            redefine_method("#{reflection.name}=") do |new_value|
-              # Loads proxy class instance (defined in collection_reader_method) if not already loaded
-              association = send(reflection.name)
-              association.replace(new_value)
-              association
-            end
-
-            redefine_method("#{reflection.name.to_s.singularize}_ids=") do |new_value|
-              ids = (new_value || []).reject { |nid| nid.blank? }
-              #TODO, like this when find() can return multiple records
-              #send("#{reflection.name}=", reflection.klass.find(ids))
-              opts = reflection.klass == ActiveFedora::Base ? {cast: true} : nil
-              send("#{reflection.name}=", ids.collect { |id| reflection.klass.find(id, opts)})
-            end
-          end
-        end
-
-        def association_constructor_method(constructor, reflection, association_proxy_class)
-          redefine_method("#{constructor}_#{reflection.name}") do |*params|
-            attributees      = params.first unless params.empty?
-            replace_existing = params[1].nil? ? true : params[1]
-            association      = association_instance_get(reflection.name)
-
-            unless association
-              association = association_proxy_class.new(self, reflection)
-              association_instance_set(reflection.name, association)
-            end
-
-            # if association_proxy_class == HasOneAssociation
-            #   association.send(constructor, attributees, replace_existing)
-            # else
-            association.send(constructor, attributees)
-            #end
-          end
-        end
     end
   end
 end