active-fedora 6.1.1 → 6.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f23c1daf82df2212fb662ee85456d47c3ea2b5b
-  data.tar.gz: cd559e5b3c7c8bf406fd45e9560eb1a4d1e4efaf
+  metadata.gz: 9c01087204a8c5f60744938710ac3eb0c461b6e7
+  data.tar.gz: 49f69184528ee7b71ae305da79ea785fa6b682a4
 SHA512:
-  metadata.gz: c99057e8b3f00720afd1d26d3738e163ee08417c68669850786db17714fda3b131833e7fe4a93af040a66bf1003724969e7f000baf8ebf5829b678e4ca4ee72b
-  data.tar.gz: cdd4b0794c76415f8c52f4ea66d6e74a07b5d835c1c44324d6adb97efe2706598822b4bdcec374798233563e850ddf3a8a66996e270d22ce37493bf63877d1e6
+  metadata.gz: 5b90ee428f9e28fa66d2425dc5a021262a44ee85163a7595c68acb7bac96db4924b409e8b70af51d6a9e6f08efbb74ed4d74349a8af891d4badf910fd986ca41
+  data.tar.gz: 2d0b2da228cb0e2c27a328975ab89e15f0be882a05c18cd2acfd270515b83c6a05dfb50165f8588f15ca56da15080b2c34b061900db88c72da53d2c81f48ac28

data/.travis.yml

@@ -1,7 +1,11 @@
 language: ruby
 rvm:
-  - "1.9.3"
-  - "2.0.0"
+  - 1.9.3
+  - 2.0.0
+
+gemfile:
+  - gemfiles/gemfile.rails3
+  - gemfiles/gemfile.rails4
 
 notifications:
   irc: "irc.freenode.org#projecthydra"

data/History.txt

@@ -1,3 +1,25 @@
+6.2.0 (2013-06-05)
+
+Support for rails 4
+
+Extracted the behavior of resolving a class from a string (ActiveFedora.class_from_string).
+
+You can now pass parameters to accessor delegates.
+
+You can set the object state attribute (objState)
+
+Object state is indexed in solr
+
+Label is now implemented as a delegate
+
+Added Base.unique? to test whether a field is specified as being unique or not.
+
+Removed dependency on builder
+
+When searching for an rdf term in a complex graph, it should match on predicate and type. Previously
+  it was just matching on type.
+
+
 6.1.1
 Rdf nodes should check for an RDF.type when resolving classes
 Objects loaded via Solr should have datastream properties of same class

data/README.textile

@@ -1,7 +1,8 @@
-!https://travis-ci.org/projecthydra/active_fedora.png?branch=master!:https://travis-ci.org/projecthydra/active_fedora
-
 h2. Description
 
+!https://travis-ci.org/projecthydra/active_fedora.png?branch=master!:https://travis-ci.org/projecthydra/active_fedora !https://badge.fury.io/rb/active-fedora.png!:http://badge.fury.io/rb/active-fedora !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.
 
 h2. Getting Help

data/active-fedora.gemspec

@@ -17,9 +17,7 @@ Gem::Specification.new do |s|
   s.add_dependency('rsolr')
   s.add_dependency('om', '~> 2.1.0')
   s.add_dependency('nom-xml', '>=0.5.1')
-  s.add_dependency("activeresource", '>= 3.0.0')
   s.add_dependency("activesupport", '>= 3.0.0')
-  s.add_dependency("builder", '~> 3.0.0')
   s.add_dependency("mediashelf-loggable")
   s.add_dependency("rubydora", '~>1.6')
   s.add_dependency("rdf")

data/gemfiles/gemfile.rails3

@@ -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/gemfile.rails4

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

data/lib/active_fedora.rb

@@ -144,6 +144,32 @@ module ActiveFedora #:nodoc:
   def self.version
     ActiveFedora::VERSION
   end
+  
+  # Convenience method for getting class constant based on a string
+  # @example
+  #   ActiveFedora.class_from_string("Om")
+  #   => Om
+  #   ActiveFedora.class_from_string("ActiveFedora::RdfNode::TermProxy")
+  #   => ActiveFedora::RdfNode::TermProxy
+  # @example Search within ActiveFedora::RdfNode for a class called "TermProxy"
+  #   ActiveFedora.class_from_string("TermProxy", ActiveFedora::RdfNode)
+  #   => ActiveFedora::RdfNode::TermProxy  
+  def self.class_from_string(class_name, container_class=nil)
+    if class_name.include?("::")
+      # result = eval(class_name)
+      class_name.split('::').inject(Object) do |mod, class_name|
+        mod.const_get(class_name)
+      end
+    elsif !container_class.nil?
+      begin
+        container_class.const_get(class_name.to_sym)
+      rescue NameError
+        Kernel.const_get(class_name)
+      end
+    else
+      Kernel.const_get(class_name)
+    end
+  end
 
 end
 

data/lib/active_fedora/base.rb

@@ -30,6 +30,8 @@ module ActiveFedora
     self.fedora_connection = {}
     self.profile_solr_name = ActiveFedora::SolrService.solr_name("object_profile", :displayable)
 
+    delegate :label, :label=, to: :inner_object
+    delegate :state=, :state, to: :inner_object
 
     def method_missing(name, *args)
       dsid = corresponding_datastream_name(name)
@@ -216,11 +218,6 @@ module ActiveFedora
       "info:fedora/#{pid}"
     end
 
-    #return the state of the inner object
-    def state 
-      @inner_object.state
-    end
-
     #return the owner id
     def owner_id
       @inner_object.ownerId
@@ -240,15 +237,6 @@ module ActiveFedora
       @inner_object.new? ? Time.now : @inner_object.profile["objLastModDate"]
     end
 
-    #return the label of the inner object (unless it's a new object)
-    def label
-      @inner_object.label
-    end
-    
-    def label=(new_label)
-      @inner_object.label = new_label
-    end
-
     def ==(comparison_object)
          comparison_object.equal?(self) ||
            (comparison_object.instance_of?(self.class) &&

data/lib/active_fedora/delegating.rb

@@ -16,9 +16,14 @@ module ActiveFedora
       array_setter(key, value)
     end
 
+
     private
-    def array_reader(field)
-      instance_exec(&self.class.delegates[field][:reader])
+    def array_reader(field, *args)
+      if args.present?
+        instance_exec(*args, &self.class.delegates[field][:reader])
+      else
+        instance_exec &self.class.delegates[field][:reader]
+      end
     end
 
     def array_setter(field, args)
@@ -53,7 +58,8 @@ module ActiveFedora
       #   foo = Foo.new
       #   foo.field1 = "My Value"
       #   foo.field1                 # => "My Value"
-      #   foo.field2                 # => NoMethodError: undefined method `field2' for #<Foo:0x1af30c>
+      #   foo.field2                 # => [""]
+      #   foo.field3                 # => NoMethodError: undefined method `field3' for #<Foo:0x1af30c>
 
       def delegate(*methods)
         fields = methods.dup
@@ -89,7 +95,8 @@ module ActiveFedora
       #   foo = Foo.new
       #   foo.field1 = "My Value"
       #   foo.field1                 # => "My Value"
-      #   foo.field2                 # => NoMethodError: undefined method `field2' for #<Foo:0x1af30c>
+      #   foo.field2                 # => [""]
+      #   foo.field3                 # => NoMethodError: undefined method `field3' for #<Foo:0x1af30c>
 
       def delegate_to(datastream,fields,args={})
         fields.each do |f|
@@ -99,22 +106,35 @@ module ActiveFedora
         end
       end
 
+      # Reveal if the delegated field is unique or not
+      # @params [Symbol] field the field to query
+      # @returns [Boolean]
+      def unique?(field)
+        delegates[field][:unique]
+      end
+
       private
       def create_delegate_reader(field, args)
         self.delegates[field] ||= {}
-        self.delegates[field][:reader] = lambda do
+        self.delegates[field][:reader] = lambda do |*opts|
           ds = self.send(args[:to])
           if ds.kind_of?(ActiveFedora::RDFDatastream)
             ds.send(field)
           else
             terminology = args[:at] || [field]
-            ds.send(:term_values, *terminology)
+            if terminology.length == 1 && opts.present?
+              ds.send(terminology.first, *opts)
+            else
+              ds.send(:term_values, *terminology)
+            end
           end
         end
 
-        define_method field do
-          val = self[field]
-          args[:unique] ? val.first : val
+        self.delegates[field][:unique] = args[:unique]
+
+        define_method field do |*opts|
+          val = array_reader(field, *opts)
+          self.class.unique?(field) ? val.first : val
         end
       end
 

data/lib/active_fedora/file_configurator.rb

@@ -1,4 +1,5 @@
 require 'erb'
+require 'psych'
 
 module ActiveFedora
   class FileConfigurator
@@ -109,7 +110,7 @@ module ActiveFedora
       end
 
       begin
-        fedora_yml = YAML::load(config_erb)
+        fedora_yml = Psych.load(config_erb)
       rescue StandardError => e
         raise("fedora.yml was found, but could not be parsed.\n")
       end
@@ -132,7 +133,7 @@ module ActiveFedora
       end
 
       begin
-        solr_yml = YAML::load(config_erb)
+        solr_yml = Psych.load(config_erb)
       rescue StandardError => e
         raise("solr.yml was found, but could not be parsed.\n")
       end
@@ -208,7 +209,7 @@ module ActiveFedora
 
     def predicate_config
       @predicate_config_path ||= build_predicate_config_path(File.dirname(self.path))
-      YAML::load(File.open(@predicate_config_path)) if File.exist?(@predicate_config_path)
+      Psych.load(File.open(@predicate_config_path)) if File.exist?(@predicate_config_path)
     end
 
     protected
@@ -226,7 +227,7 @@ module ActiveFedora
     end
 
     def valid_predicate_mapping?(testfile)
-      mapping = YAML::load(File.open(testfile))
+      mapping = Psych.load(File.open(testfile))
       return false unless mapping.has_key?(:default_namespace) && mapping[:default_namespace].is_a?(String)
       return false unless mapping.has_key?(:predicate_mapping) && mapping[:predicate_mapping].is_a?(Hash)
       true

data/lib/active_fedora/indexing.rb

@@ -14,6 +14,7 @@ module ActiveFedora
         m_time = Time.parse(m_time) unless m_time.is_a?(Time)
         Solrizer.set_field(solr_doc, 'system_create', c_time, :stored_sortable)
         Solrizer.set_field(solr_doc, 'system_modified', m_time, :stored_sortable)
+        Solrizer.set_field(solr_doc, 'object_state', state, :stored_sortable)
         Solrizer.set_field(solr_doc, 'active_fedora_model', self.class.inspect, :stored_sortable)
         solr_doc.merge!(SOLR_DOCUMENT_ID.to_sym => pid)
         solrize_profile(solr_doc)

data/lib/active_fedora/model.rb

@@ -24,11 +24,7 @@ module ActiveFedora
         logger.warn "#{model_value} is not a real class"
         return false
       end
-      if model_value.include?("::")
-        result = eval(model_value)
-      else
-        result = Kernel.const_get(model_value)
-      end
+      result = ActiveFedora.class_from_string(model_value)
       unless result.nil?
         model_ns = (result.respond_to? :pid_namespace) ? result.pid_namespace : ContentModel::CMODEL_NAMESPACE
         if model_ns != pid_ns

data/lib/active_fedora/rdf_node.rb

@@ -25,9 +25,11 @@ module ActiveFedora
       @subject = nil
     end
 
-    # @param [Symbol, RDF::URI] predicate  the predicate to insert into the graph
-    def get_values(subject, predicate)
-      options = config_for_term_or_uri(predicate)
+    # @param [RDF::URI] subject the base node to start the search from
+    # @param [Symbol] term the term to get the values for
+    def get_values(subject, term)
+      options = config_for_term_or_uri(term)
+      predicate = options[:predicate]
       TermProxy.new(self, subject, predicate, options)
     end
 
@@ -35,7 +37,7 @@ module ActiveFedora
       _, conf = self.class.config_for_predicate(predicate)
       class_name = conf[:class_name]
       return nil unless class_name
-      self.class.const_get(class_name.to_sym)
+      ActiveFedora.class_from_string(class_name, self.class)
     end
 
     # if there are any existing statements with this predicate, replace them
@@ -43,24 +45,23 @@ module ActiveFedora
     # @param [Symbol, RDF::URI] predicate  the predicate to insert into the graph
     # @param [Array,#to_s] values  the value/values to insert into the graph
     def set_value(subject, predicate, values)
-
       options = config_for_term_or_uri(predicate)
       predicate = options[:predicate]
+      values = Array(values)
+
+      remove_existing_values(subject, predicate, values)
 
-      delete_predicate(subject, predicate)
-      Array(values).each do |arg|
+      values.each do |arg|
         if arg.respond_to?(:rdf_subject) # an RdfObject
           graph.insert([subject, predicate, arg.rdf_subject ])
         else
           arg = arg.to_s if arg.kind_of? RDF::Literal
-
           graph.insert([subject, predicate, arg])
         end
       end
 
       TermProxy.new(self, subject, predicate, options)
     end
-
  
     def delete_predicate(subject, predicate, values = nil)
       predicate = find_predicate(predicate) unless predicate.kind_of? RDF::URI
@@ -78,7 +79,6 @@ module ActiveFedora
           graph.delete [subject, predicate, v]
         end
       end
-
     end
 
     # append a value 
@@ -117,8 +117,8 @@ module ActiveFedora
     def method_missing(name, *args)
       if (md = /^([^=]+)=$/.match(name.to_s)) && pred = find_predicate(md[1])
           set_value(rdf_subject, pred, *args)  
-      elsif pred = find_predicate(name)
-          get_values(rdf_subject, pred)
+      elsif find_predicate(name)
+          get_values(rdf_subject, name)
       else 
         super
       end
@@ -127,6 +127,43 @@ module ActiveFedora
     end
 
     private
+
+    def remove_existing_values(subject, predicate, values)
+      if values.any? { |x| x.respond_to?(:rdf_subject)}
+        values.each do |arg|
+          if arg.respond_to?(:rdf_subject) # an RdfObject
+            # can't just delete_predicate, have to delete the predicate with the class
+            values_to_delete = find_values_with_class(subject, predicate, arg.class.rdf_type)
+            delete_predicate(subject, predicate, values_to_delete)
+          else
+            delete_predicate(subject, predicate)
+          end
+        end
+      else
+        delete_predicate(subject, predicate)
+      end
+    end
+
+
+    def find_values_with_class(subject, predicate, rdf_type)
+      matching = []
+      query = RDF::Query.new do
+        pattern [subject, predicate, :value]
+      end
+      query.execute(graph).each do |solution|
+        if rdf_type
+          query2 = RDF::Query.new do
+            pattern [solution.value, RDF.type, rdf_type]
+          end
+          query2.execute(graph).each do |sol2|
+            matching << solution.value
+          end
+        else
+          matching << solution.value
+        end
+      end
+      matching 
+    end
     class Builder
       def initialize(parent)
         @parent = parent

data/lib/active_fedora/rdf_node/term_proxy.rb

@@ -46,7 +46,14 @@ module ActiveFedora
           if options[:type] == :date
             v = Date.parse(v)
           end
-          values << v
+          # If the user provided options[:class_name], we should query to make sure this 
+          # potential solution is of the right RDF.type
+          if options[:class_name]
+            klass =  class_from_rdf_type(v, predicate)
+            values << v if klass == ActiveFedora.class_from_string(options[:class_name], graph.class)
+          else
+            values << v
+          end
         end
 
         if options[:class_name]

data/lib/active_fedora/unsaved_digital_object.rb

@@ -2,7 +2,7 @@ module ActiveFedora
   # Helps Rubydora create datastreams of the type defined by the ActiveFedora::Base#datastream_class_for_name
   class UnsavedDigitalObject 
     include DigitalObject::DatastreamBootstrap
-    attr_accessor :original_class, :ownerId, :datastreams, :label, :namespace
+    attr_accessor :original_class, :ownerId, :state, :datastreams, :label, :namespace
 
     PLACEHOLDER = '__DO_NOT_USE__'
     
@@ -36,6 +36,7 @@ module ActiveFedora
       end
       obj.ownerId = ownerId if ownerId
       obj.label = label if label
+      obj.state = state if state
       obj
     end
 

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "6.1.1"
+  VERSION = "6.2.0"
 end

data/spec/integration/base_spec.rb

@@ -25,6 +25,17 @@ describe "A base object with metadata" do
     end
   end
 
+  describe "setting object state" do
+    it "should store it" do
+      obj = MockAFBaseRelationship.create
+      obj.state.should == 'A'
+      obj.state='D'
+      obj.save!
+      obj.reload
+      obj.state.should == 'D'
+    end
+  end
+
   describe "that already exists in the repo" do
     before do
       @release = MockAFBaseRelationship.create()
@@ -245,10 +256,7 @@ describe ActiveFedora::Base do
       @test_object2.save
       inner_object = @test_object2.inner_object
       inner_object.pid.should == @test_object2.pid
-      inner_object.should respond_to(:state)
       inner_object.should respond_to(:lastModifiedDate)
-      inner_object.should respond_to(:ownerId)
-      inner_object.state.should == "A"
       inner_object.ownerId.should == "fedoraAdmin"
     end
   end

data/spec/integration/complex_rdf_datastream_spec.rb

@@ -183,14 +183,15 @@ END
         series = SpecDatastream::Series.new ds.graph
         series.title = ["renovating bathrooms"]
         ds.series = series
-        ds.series.first.type.size.should == 1
-        ds.series.first.type.first.to_s.should == 'http://www.ebu.ch/metadata/ontologies/ebucore#Series' 
 
         program = SpecDatastream::Program.new ds.graph
         program.title = ["This old House"]
         ds.program = program
+
         ds.program.first.type.size.should == 1
         ds.program.first.type.first.to_s.should == 'http://www.ebu.ch/metadata/ontologies/ebucore#Programme' 
+        ds.series.first.type.size.should == 1
+        ds.series.first.type.first.to_s.should == 'http://www.ebu.ch/metadata/ontologies/ebucore#Series' 
       end
 
     end

data/spec/integration/model_spec.rb

@@ -52,7 +52,7 @@ describe ActiveFedora::Model do
       subject { ActiveFedora::Base.load_instance_from_solr('hydrangea:fixture_mods_article1') }
       it { should be_instance_of HydrangeaArticle}
     end
-    describe "with metadata datastrem spec" do
+    describe "with metadata datastream spec" do
       subject { ActiveFedora::Base.load_instance_from_solr('hydrangea:fixture_mods_article1') }
       it "should create an xml datastream" do
         subject.datastreams['properties'].should be_kind_of ActiveFedora::SimpleDatastream

data/spec/unit/active_fedora_spec.rb

@@ -102,4 +102,13 @@ describe ActiveFedora do
       end
     end
   end
+  
+  describe "#class_from_string" do
+    it "should return class constants based on strings" do
+      ActiveFedora.class_from_string("Om").should == Om
+      ActiveFedora.class_from_string("ActiveFedora::RdfNode::TermProxy").should == ActiveFedora::RdfNode::TermProxy
+      ActiveFedora.class_from_string("TermProxy", ActiveFedora::RdfNode).should == ActiveFedora::RdfNode::TermProxy
+      
+    end
+  end
 end

data/spec/unit/base_delegate_spec.rb

@@ -62,6 +62,10 @@ describe ActiveFedora::Base do
       @n = BarHistory2.new()
     end
 
+    it "should reveal the unique properties" do
+      BarHistory2.unique?(:fubar).should be_true
+      BarHistory2.unique?(:cow).should be_false
+    end
 
     it "should save a delegated property uniquely" do
       @n.fubar="Quack"
@@ -71,6 +75,13 @@ describe ActiveFedora::Base do
       @n.donkey.should == "Bray"
       @n.xmlish.term_values(:donkey).first.should == 'Bray'
     end
+
+    it "should allow passing parameters to the delegate accessor" do
+      @n.cow=["one", "two"]
+      @n.cow(1).should == ['two']
+    end
+
+
     it "should return an array if not marked as unique" do
       ### Metadata datastream does not appear to support multiple value setting
       @n.cow=["one", "two"]

data/spec/unit/base_spec.rb

@@ -7,6 +7,7 @@ describe ActiveFedora::Base do
       ActiveFedora::Base.descendants.should include(HydrangeaArticle, SpecialThing)
     end
   end
+
   describe "sharding" do
     it "should have a shard_index" do
       ActiveFedora::Base.shard_index(@this_pid).should == 0
@@ -406,12 +407,14 @@ describe ActiveFedora::Base do
         @test_object.should respond_to(:to_solr)
       end
 
-      it "should add pid, system_create_date and system_modified_date from object attributes" do
+      it "should add pid, system_create_date, system_modified_date and object_state from object attributes" do
         @test_object.should_receive(:create_date).and_return("2012-03-04T03:12:02Z")
         @test_object.should_receive(:modified_date).and_return("2012-03-07T03:12:02Z")
+        @test_object.state = "D"
         solr_doc = @test_object.to_solr
         solr_doc[ActiveFedora::SolrService.solr_name("system_create", :stored_sortable, type: :date)].should eql("2012-03-04T03:12:02Z")
         solr_doc[ActiveFedora::SolrService.solr_name("system_modified", :stored_sortable, type: :date)].should eql("2012-03-07T03:12:02Z")
+        solr_doc[ActiveFedora::SolrService.solr_name("object_state", :stored_sortable)].should eql("D")
         solr_doc[:id].should eql("#{@test_object.pid}")
       end
 

data/spec/unit/config_spec.rb

@@ -2,13 +2,13 @@ require 'spec_helper'
 
 describe ActiveFedora::Config do
   describe "with a single fedora instance" do
-    conf = YAML.load(File.read('spec/fixtures/rails_root/config/fedora.yml'))['test']
+    conf = Psych.load(File.read('spec/fixtures/rails_root/config/fedora.yml'))['test']
     subject { ActiveFedora::Config.new(conf) }
     its(:credentials) { should == {:url => 'http://testhost.com:8983/fedora', :user=> 'fedoraAdmin', :password=> 'fedoraAdmin'}}
     it { should_not be_sharded }
   end
   describe "with several fedora shards" do
-    conf = YAML.load(File.read('spec/fixtures/sharded_fedora.yml'))['test']
+    conf = Psych.load(File.read('spec/fixtures/sharded_fedora.yml'))['test']
     subject { ActiveFedora::Config.new(conf) }
     its(:credentials) { should == [{:url => 'http://127.0.0.1:8983/fedora1', :user=> 'fedoraAdmin', :password=> 'fedoraAdmin'},
                               {:url => 'http://127.0.0.1:8983/fedora2', :user=> 'fedoraAdmin', :password=> 'fedoraAdmin'},

data/spec/unit/unsaved_digital_object_spec.rb

@@ -11,6 +11,11 @@ describe ActiveFedora::UnsavedDigitalObject do
       @obj.ownerId.should == 'fooo'
     end
 
+    it "should have state" do
+      @obj.ownerId = 'D'
+      @obj.ownerId.should == 'D'
+    end
+
     it "should have a default pid" do
       @obj.pid.should == "__DO_NOT_USE__"
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 6.1.1
+  version: 6.2.0
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-08 00:00:00.000000000 Z
+date: 2013-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -54,20 +54,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 0.5.1
-- !ruby/object:Gem::Dependency
-  name: activeresource
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -82,20 +68,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
-- !ruby/object:Gem::Dependency
-  name: builder
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: mediashelf-loggable
   requirement: !ruby/object:Gem::Requirement
@@ -320,6 +292,8 @@ files:
 - config/solr.yml
 - config/solr_mappings_af_0.1.yml
 - config/solr_mappings_bl_2.4.yml
+- gemfiles/gemfile.rails3
+- gemfiles/gemfile.rails4
 - lib/active-fedora.rb
 - lib/active_fedora.rb
 - lib/active_fedora/associations.rb