rubydora 0.5.13 → 0.7.0

data/VERSION

@@ -1 +1 @@
-0.5.13
+0.7.0

data/lib/rubydora/datastream.rb

@@ -12,8 +12,6 @@ module Rubydora
     class_attribute :eager_load_datastream_content
     self.eager_load_datastream_content = false
 
-    include Rubydora::ExtensionParameters
-
     attr_reader :digital_object, :dsid
 
     # mapping datastream attributes (and api parameters) to datastream profile names
@@ -37,6 +35,7 @@ module Rubydora
 
       class_eval %Q{
       def #{attribute.to_s}= val
+        validate_#{attribute.to_s}!(val) if respond_to?(:validate_#{attribute.to_s}!, true)
         #{attribute.to_s}_will_change! unless val == #{attribute.to_s}
         @#{attribute.to_s} = val
       end
@@ -125,6 +124,8 @@ module Rubydora
     # Retrieve the content of the datastream (and cache it)
     # @return [String]
     def content
+      return @content if new?
+
       begin
         options = { :pid => pid, :dsid => dsid }
         options[:asOfDateTime] = asOfDateTime if asOfDateTime
@@ -161,6 +162,14 @@ module Rubydora
       changed_attributes['content'] = nil
     end
 
+    def has_content?
+      return true unless new?
+
+      return !dsLocation.blank? if ['E','R'].include? controlGroup
+
+      !@content.blank?
+    end
+
     # Retrieve the datastream profile as a hash (and cache it)
     # @param opts [Hash] :validateChecksum if you want fedora to validate the checksum
     # @return [Hash] see Fedora #getDatastream documentation for keys
@@ -224,7 +233,7 @@ module Rubydora
       run_callbacks :create do
         repository.add_datastream to_api_params.merge({ :pid => pid, :dsid => dsid })
         reset_profile_attributes
-        Datastream.new(digital_object, dsid)
+        self.class.new(digital_object, dsid, @options)
       end
     end
 
@@ -236,7 +245,7 @@ module Rubydora
         return create if new?
         repository.modify_datastream to_api_params.merge({ :pid => pid, :dsid => dsid })
         reset_profile_attributes
-        Datastream.new(digital_object, dsid)
+        self.class.new(digital_object, dsid, @options)
       end
     end
 
@@ -298,6 +307,10 @@ module Rubydora
       raise "Can't change values on older versions" if @asOfDateTime
     end
 
+    def validate_dsLocation! val
+      URI.parse(val) unless val.nil?
+    end
+
     private
     def attribute_will_change! *args
       check_if_read_only

data/lib/rubydora/digital_object.rb

@@ -12,7 +12,6 @@ module Rubydora
     define_model_callbacks :save, :create, :destroy
     define_model_callbacks :initialize, :only => :after
     include ActiveModel::Dirty
-    include Rubydora::ExtensionParameters
     include Rubydora::ModelsMixin
     include Rubydora::RelationshipsMixin
 

data/lib/rubydora/repository.rb

@@ -16,7 +16,7 @@ module Rubydora
     # @option options [Boolean] :validateChecksum
     def initialize options = {}
       @config = options.symbolize_keys
-      load_api_abstraction
+      check_repository_version!
     end
 
     # {include:DigitalObject.find}
@@ -97,15 +97,11 @@ module Rubydora
     protected
 
     # Load fallback API implementations for older versions of Fedora
-    def load_api_abstraction
+    def check_repository_version!
       return unless version
 
-      if version <= 3.0
-      end
-
       if version < 3.4
-        require 'rubydora/rest_api_client/v33'
-        self.extend Rubydora::RestApiClient::V33
+        raise "You're connecting to a Fedora #{version} repository. Rubydora requires Fedora >= 3.4"
       end
 
       true

data/lib/rubydora/transactions.rb

@@ -15,15 +15,15 @@ module Rubydora
       end
 
       before_purge_object do |options|
-        append_to_transactions_log :purge_object, :pid => options[:pid], :foxml => export(:pid => options[:pid], :context => :archive) if Rubydora::Transactions.use_transactions
+        append_to_transactions_log :purge_object, :pid => options[:pid], :foxml => true if Rubydora::Transactions.use_transactions
       end
 
       before_modify_datastream do |options|
-        append_to_transactions_log :modify_datastream, :pid => options[:pid], :foxml => export(:pid => options[:pid], :context => :archive) if Rubydora::Transactions.use_transactions
+        append_to_transactions_log :modify_datastream, :pid => options[:pid], :foxml => true if Rubydora::Transactions.use_transactions
       end
 
       before_purge_datastream do |options|
-        append_to_transactions_log :purge_datastream, :pid => options[:pid], :foxml => export(:pid => options[:pid], :context => :archive) if Rubydora::Transactions.use_transactions
+        append_to_transactions_log :purge_datastream, :pid => options[:pid], :foxml => true if Rubydora::Transactions.use_transactions
       end
 
       before_add_datastream do |options|
@@ -72,15 +72,28 @@ module Rubydora
     # Unshift a transaction entry onto the transaction logs.
     # We want these entries in reverse-chronological order
     # for ease of undoing..
-    def append_to_transactions_log *args
+    def append_to_transactions_log method, options = {}
       return unless Rubydora::Transactions.use_transactions
-      transactions_log.unshift(args)
+
+      unless transaction_is_redundant?(method, options)
+        options[:foxml] = export(:pid => options[:pid], :context => :archive) if options[:foxml] == true
+        transactions_log.unshift([method, options])
+      end
     end
 
     # The repository transaction log.
     def transactions_log
       @log ||= []
     end
+
+    def transaction_is_redundant? method, options
+      return true if transactions_log.any? { |(t_method, t_options)| 
+        # these methods will rollback ANY object change that happens after it, so there's no need to track future changes to this object
+        t_options[:pid] == options[:pid] and [:ingest, :purge_object, :modify_datastream, :purge_datastream].include? t_method
+      }
+
+      false
+    end
   end
 
   class Transaction

data/lib/rubydora.rb

@@ -8,12 +8,9 @@ module Rubydora
   autoload :ResourceIndex, "rubydora/resource_index"
   autoload :FedoraUrlHelpers, "rubydora/fedora_url_helpers"
   autoload :RestApiClient, "rubydora/rest_api_client"
-  autoload :Soap, "rubydora/soap"
   autoload :ModelsMixin, "rubydora/models_mixin"
-  autoload :Ext, "rubydora/ext"
   autoload :RelationshipsMixin, "rubydora/relationships_mixin"
   autoload :DigitalObject, "rubydora/digital_object"
-  autoload :ExtensionParameters, "rubydora/extension_parameters"
   autoload :Callbacks, "rubydora/callbacks"
   autoload :ArrayWithCallback, "rubydora/array_with_callback"
   autoload :Transactions, "rubydora/transactions"

data/rubydora.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.authors = ["Chris Beer"]
   s.email = ["chris@cbeer.info"]
   s.summary = %q{Fedora Commons REST API ruby library }
-  s.description = %q{Fedora Commons REST API ruby library : REQUIRES FCREPO 3.4+}
+  s.description = %q{Fedora Commons REST API ruby library}
   s.homepage = "http://github.com/cbeer/rubydora"
 
   s.files         = `git ls-files`.split("\n")
@@ -22,7 +22,6 @@ Gem::Specification.new do |s|
   s.add_dependency "mime-types"
   s.add_dependency "activesupport"
   s.add_dependency "activemodel"
-  s.add_dependency "savon"
   s.add_dependency "hooks"
   s.add_dependency "deprecation"
 

data/spec/lib/datastream_spec.rb

@@ -210,6 +210,30 @@ describe Rubydora::Datastream do
     end
   end
 
+  describe "has_content?" do
+    subject { Rubydora::Datastream.new mock(:pid => 'asdf'), 'asdf' }
+    it "should have content if it is persisted" do
+      subject.stub(:new? => false)
+      subject.should have_content     
+    end
+
+    it "should have content if it has content" do
+      subject.content = "123"
+      subject.should have_content     
+    end
+
+    it "should have content if it has a dsLocation" do
+      subject.dsLocation = "urn:abc"
+      subject.controlGroup = 'E'
+      subject.should have_content     
+    end
+
+    it "should not have content otherwise" do
+      subject.stub(:content => nil)
+      subject.should_not have_content     
+    end
+  end
+
   describe "update" do
 
     before(:each) do
@@ -390,7 +414,7 @@ describe Rubydora::Datastream do
         end
 
         it "should look in the object profile" do
-          subject.should_receive(:profile) { { method => 'qwerty' } }
+          subject.stub(:profile) { { method => 'qwerty' } }
           subject.send(method).should == 'qwerty'
         end
 
@@ -409,8 +433,20 @@ describe Rubydora::Datastream do
     end
 
     describe "#dsLocation" do
-      it_behaves_like "a datastream attribute"
+      it_behaves_like "a read-only datastream attribute"
       let(:method) { 'dsLocation' }
+
+      subject { Rubydora::Datastream.new @mock_object, 'dsid' }
+
+      it "should reject invalid URIs" do
+        expect { subject.dsLocation = "this is a bad uri" }.to raise_error URI::InvalidURIError
+      end
+
+      it "should appear in the save request" do
+          @mock_repository.should_receive(:modify_datastream).with(hash_including(method.to_sym => 'http://example.com'))
+          subject.dsLocation = 'http://example.com'
+          subject.save
+      end
     end
 
     describe "#altIDs" do

data/spec/lib/repository_spec.rb

@@ -65,17 +65,9 @@ describe Rubydora::Repository do
   end
 
   describe "load_api_abstraction" do
-    class ApiAbstractionTestClass < Rubydora::Repository 
-      def version; 3.3; end
-    end
     it "should load an abstraction layer for relationships for older versions of the fedora rest api" do
-      @mock_repository = ApiAbstractionTestClass.new
-      @mock_repository.should be_a_kind_of(Rubydora::RestApiClient::V33)
-    end
-
-    it "should automatically load the SOAP endpoint when needed" do
-      @mock_repository = ApiAbstractionTestClass.new
-      @mock_repository.should be_a_kind_of(Rubydora::Soap)
+      Rubydora::Repository.any_instance.stub(:version).and_return(3.3)
+      expect { Rubydora::Repository.new }.to raise_error
     end
   end
 

data/spec/lib/transactions_spec.rb

@@ -8,6 +8,31 @@ describe Rubydora::Transactions do
     repository = Rubydora::Repository.new :url => 'http://example.org'
   }
 
+  describe "#transaction_is_redundant?" do
+    it "should throw away transactions messages if the object was ingested or purged previously" do
+      subject.client.stub_chain(:[], :post).and_return 'asdf'
+      subject.client.stub_chain(:[], :put).and_return 'asdf'
+      subject.client.stub_chain(:[], :delete)
+
+        # this should be squelched
+      subject.should_not_receive(:export).with(hash_including(:pid => 'asdf', :context => :archive)).and_return '<xml />'
+      
+      subject.transaction do |t|
+        subject.ingest :pid => 'asdf', :file => '<a />'
+        subject.purge_object :pid => 'asdf'
+        subject.modify_datastream :pid => 'asdf', :dsid => 'mydsid'
+
+
+        subject.should_receive(:purge_object).with(hash_including(:pid => 'asdf'))
+
+        # this should be squelched
+        subject.should_not_receive(:ingest).with(hash_including(:pid => 'asdf', :file => '<a />'))
+
+        t.rollback
+      end
+    end
+  end
+
   describe "#rollback" do
 
     it "should fire a after_rollback hook" do
@@ -84,6 +109,7 @@ describe Rubydora::Transactions do
       subject.client.stub_chain(:[], :put)
 
       subject.should_receive(:export).with(hash_including(:pid => 'asdf', :context => :archive)).and_return '<xml />'
+      subject.should_receive(:purge_object).with(hash_including(:pid => 'asdf'))
       subject.should_receive(:ingest).with(hash_including(:pid => 'asdf', :file => '<xml />'))
 
       subject.transaction do |t|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubydora
 version: !ruby/object:Gem::Version
-  version: 0.5.13
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-25 00:00:00.000000000 Z
+date: 2012-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastercsv
@@ -107,22 +107,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: savon
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: hooks
   requirement: !ruby/object:Gem::Requirement
@@ -251,7 +235,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: ! 'Fedora Commons REST API ruby library : REQUIRES FCREPO 3.4+'
+description: Fedora Commons REST API ruby library
 email:
 - chris@cbeer.info
 executables: []
@@ -271,31 +255,21 @@ files:
 - lib/rubydora/callbacks.rb
 - lib/rubydora/datastream.rb
 - lib/rubydora/digital_object.rb
-- lib/rubydora/ext.rb
-- lib/rubydora/ext/model_loader.rb
-- lib/rubydora/ext/solr.rb
-- lib/rubydora/extension_parameters.rb
 - lib/rubydora/fedora_url_helpers.rb
 - lib/rubydora/models_mixin.rb
 - lib/rubydora/relationships_mixin.rb
 - lib/rubydora/repository.rb
 - lib/rubydora/resource_index.rb
 - lib/rubydora/rest_api_client.rb
-- lib/rubydora/rest_api_client/v33.rb
-- lib/rubydora/soap.rb
 - lib/rubydora/transactions.rb
 - lib/rubydora/version.rb
 - rubydora.gemspec
 - spec/lib/datastream_spec.rb
 - spec/lib/digital_object_spec.rb
-- spec/lib/ext_model_loader_spec.rb
-- spec/lib/ext_solr_spec.rb
-- spec/lib/extension_parameters_spec.rb
 - spec/lib/integration_test_spec.rb
 - spec/lib/repository_spec.rb
 - spec/lib/resource_index_spec.rb
 - spec/lib/rest_api_client_spec.rb
-- spec/lib/soap_spec.rb
 - spec/lib/transactions_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/cbeer/rubydora
@@ -310,35 +284,25 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2331369473702813867
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2331369473702813867
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Fedora Commons REST API ruby library
 test_files:
 - spec/lib/datastream_spec.rb
 - spec/lib/digital_object_spec.rb
-- spec/lib/ext_model_loader_spec.rb
-- spec/lib/ext_solr_spec.rb
-- spec/lib/extension_parameters_spec.rb
 - spec/lib/integration_test_spec.rb
 - spec/lib/repository_spec.rb
 - spec/lib/resource_index_spec.rb
 - spec/lib/rest_api_client_spec.rb
-- spec/lib/soap_spec.rb
 - spec/lib/transactions_spec.rb
 - spec/spec_helper.rb
 has_rdoc: 

data/lib/rubydora/ext/model_loader.rb

@@ -1,62 +0,0 @@
-module Rubydora::Ext
-  # Rubydora extension to load dynamically load modules into an object based on defined models
-  module ModelLoader
-    # @param [Hash] args
-    # @option args [Class] :base_namespace
-    # @option args [Class] :method
-    # @option args [Class] :class
-    #
-    def self.load args = {}
-      args[:class] ||=  Rubydora::DigitalObject
-      args[:method] ||= :models
-
-      args[:class].extension_parameters[:ModelLoaderMixin] ||= {}
-      args[:class].extension_parameters[:ModelLoaderMixin][:namespaces] ||= []
-      args[:class].extension_parameters[:ModelLoaderMixin][:namespaces] << args[:base_namespace]
-      args[:class].extension_parameters[:ModelLoaderMixin][:method] ||= args[:method]
-      args[:class].use_extension(ModelLoaderMixin)
-    end
-
-    module ModelLoaderMixin
-      # @param [Class] base
-      def self.extended(document)
-        self.module_names(document).each do |model|
-          document.class.extension_parameters[:ModelLoaderMixin][:namespaces].each do |ns|
-            begin
-              mod = self.string_to_constant [ns, model].compact.map { |x| x.to_s }.join("/")
-              document.send(:extend, mod)
-            rescue NameError, LoadError
-            end
-          end
-        end
-      end
-
-      # convert a model string to a Ruby class (see ActiveSupport::Inflector#constantize)
-      # @param [String] lower_case_and_underscored_word
-      # @return [Module]
-      def self.string_to_constant lower_case_and_underscored_word
-        camel_cased_word = lower_case_and_underscored_word.to_s.gsub(/\/(.?)/) { "::#{$1.upcase}" }.gsub(/(?:^|_)(.)/) { $1.upcase }
-
-        names = camel_cased_word.split('::')
-        names.shift if names.empty? || names.first.empty?
-
-        constant = Object
-        names.each do |name|
-          if Module.method(:const_get).arity == 1
-          constant = constant.const_defined?(name) ? constant.const_get(name) : constant.const_missing(name)
-          else
-          constant = constant.const_defined?(name,false) ? constant.const_get(name) : constant.const_missing(name)
-          end
-        end
-        constant
-      end
-
-      private
-      def self.module_names(document)
-        arr = document.send(document.class.extension_parameters[:ModelLoaderMixin][:method])
-        arr &&= [arr] unless arr.is_a? Array
-        arr.map { |x| x.gsub('info:fedora/', '').downcase.gsub(/[^a-z0-9_:]+/, '_').gsub(':', '/').gsub(/_{2,}/, '_').gsub(/^_|_$/, '')  }
-      end
-    end
-  end
-end

data/lib/rubydora/ext/solr.rb

@@ -1,103 +0,0 @@
-module Rubydora::Ext
-  # Mapping Fedora objects to Solr documents
-  module Solr
-    # load this module by mixing into appropriate modules
-    # @param [Hash] args
-    # @option args [Class] :digital_object
-    # @option args [Class] :datastream
-    def self.load args = { :digital_object => Rubydora::DigitalObject, :datastream => Rubydora::Datastream}
-      args[:digital_object].send(:include, Rubydora::Ext::Solr::DigitalObjectMixin) if args[:digital_object]
-      args[:datastream].send(:include, Rubydora::Ext::Solr::DatastreamMixin) if args[:datastream]
-    end
-
-    # Datastreams mixin
-    module DatastreamMixin
-      # Initialize solr mapping logic
-      # @param [Class] base
-      def self.included(base)
-        base.instance_eval %Q{
-          class << self; attr_accessor :solr_mapping_logic end
-        }  
-
-        base.class_eval %Q{
-          attr_writer :solr_mapping_logic
-          def solr_mapping_logic
-            @solr_mapping_logic ||= self.class.solr_mapping_logic.dup
-          end
-        }
-
-        base.solr_mapping_logic ||= []
-      end
-
-      # sets appropriate solr document parameters for this datastream
-      # @param [Hash] doc Solr document object (pass-by-reference)
-      def to_solr(doc = {})
-      end
-
-    end
-
-    # DigitalObject mixin
-    module DigitalObjectMixin
-      # Initialize solr mapping logic
-      # @param [Class] base 
-      def self.included(base)
-        base.instance_eval %Q{
-          class << self; attr_accessor :solr_mapping_logic end
-        }  
-
-        base.class_eval %Q{
-          attr_writer :solr_mapping_logic
-          def solr_mapping_logic
-            @solr_mapping_logic ||= self.class.solr_mapping_logic.dup
-          end
-        }
-
-        base.solr_mapping_logic ||= [:object_profile_to_solr,:datastreams_to_solr, :relations_to_solr]
-      end
-
-      ##
-      # Set appropriate solr document attributes for this object
-      # @param [Hash] doc Solr document object (pass-by-reference)
-      def to_solr(doc = {})
-        self.solr_mapping_logic.each do |method_name|
-          send(method_name, doc)
-        end
-
-        doc.reject { |k,v| v.nil? or (v.respond_to?(:empty?) and v.empty?) }
-      end
-
-      # add solr document attributes from the object profile
-      # @param [Hash] doc Solr document object (pass-by-reference)
-      def object_profile_to_solr doc
-        doc['id'] = pid
-        doc['pid_s'] = pid
-
-        self.profile.each do |key, value|
-          doc["#{key}_s"] = value
-        end
-      end
-
-      # add solr document attributes from the object datastreams
-      # @param [Hash] doc Solr document object (pass-by-reference)
-      def datastreams_to_solr doc
-        datastreams.each do |dsid, ds|
-          doc['disseminates_s'] ||= []
-          doc['disseminates_s'] << dsid
-          ds.to_solr(doc)
-        end
-      end
-
-      # add solr document attributes by querying the resource index
-      # @param [Hash] doc Solr document object (pass-by-reference)
-      def relations_to_solr doc
-        self.repository.sparql("SELECT ?relation ?object FROM <#ri> WHERE {
-   <#{uri}> ?relation ?object
-}").each do |row|
-          solr_field = "ri_#{row['relation'].split('#').last}_s"
-          doc[solr_field] ||= []
-          doc[solr_field] << row['object']
-        end
-      end
-    end
-  end
-end

data/lib/rubydora/ext.rb

@@ -1,5 +0,0 @@
-module Rubydora
-  # Extensions namespace
-  module Ext
-  end
-end

data/lib/rubydora/extension_parameters.rb

@@ -1,51 +0,0 @@
-module Rubydora
-# Copied in part from projectblacklight.org
-  module ExtensionParameters
-    # setup extension support
-    def self.included(base)
-      base.extend ExtendableClassMethods
-
-      base.class_eval do
-        # Provide a class-level hash for extension parameters
-        # @return [Hash]
-        def self.extension_parameters
-          ## This variable should NOT be @@, since we're in a class method,
-          # it's just @ to be a class variable. Confusing, but it
-          # passes the tests this way.       
-          @extension_parameters ||= {}
-        end      
-      end
-
-      base.after_initialize do
-        apply_extensions
-      end
-    end
-
-    # try to apply registered extensions
-    def apply_extensions
-      self.class.registered_extensions.each do |registration|
-        self.extend( registration[:module_obj] ) if registration[:condition_proc].nil? || registration[:condition_proc].call( self )
-      end
-    end
-
-  # Certain class-level modules needed for the document-specific
-  # extendability architecture
-  module ExtendableClassMethods
-    attr_writer :registered_extensions
-
-    # registered_extensions accessor
-    # @return [Array]
-    def registered_extensions
-      @registered_extensions ||= []
-    end
-
-    # register extensions
-    # @param [Module] module_obj
-    # @yield &condition
-    def use_extension( module_obj, &condition )
-      registered_extensions << {:module_obj => module_obj, :condition_proc => condition}    
-    end
-
-  end
-  end
-end

data/lib/rubydora/rest_api_client/v33.rb

@@ -1,27 +0,0 @@
-module Rubydora::RestApiClient
-  # Fall-back implementations for fcrepo < 3.4
-  module V33
-    # @param [Rubydora::Repository] repository
-    def self.extended repository
-      repository.send(:extend, Rubydora::Soap)
-    end
-
-    # {include:RestApiClient#relationships}
-    def relationships options = {}
-      nil
-    end
-
-    # {include:RestApiClient#add_relationship}
-    def add_relationship options = {}
-      pid = options.delete(:pid) || options[:subject]
-      self.soap.request :add_relationship, :pid => pid, :relationship => options[:predicate], :object => options[:object], :isLiteral => false, :datatype => nil
-    end
-
-    # {include:RestApiClient#purge_relationship}
-    def purge_relationship options = {}
-      pid = options.delete(:pid) || options[:subject]
-      self.soap.request :purge_relationship, :pid => pid, :relationship => options[:predicate], :object => options[:object], :isLiteral => false, :datatype => nil
-    end
-
-  end
-end

data/lib/rubydora/soap.rb

@@ -1,20 +0,0 @@
-module Rubydora
-  # Fedora SOAP API extension
-  module Soap
-    # @param [Rubydora::Repository] repository
-    def self.extended repository
-      require 'savon'
-    end
-
-    # SOAP API endpoint
-    # @return [SOAP::RPC::Driver]
-    def soap
-     @soap ||= begin
-                 client = Savon::Client.new do |wsdl, http|
-                   wsdl.document = "#{ config[:url] }/wsdl?api=API-M"
-                   http.auth.basic config[:user], config[:password]
-                 end
-               end
-    end
-  end
-end

data/spec/lib/ext_model_loader_spec.rb

@@ -1,6 +0,0 @@
-require 'spec_helper'
-require 'rubydora/ext/model_loader'
-
-describe Rubydora::Ext::ModelLoader do
-
-end

data/spec/lib/ext_solr_spec.rb

@@ -1,144 +0,0 @@
-require 'spec_helper'
-require 'rubydora/ext/solr'
-
-describe Rubydora::Ext::Solr do
-  before(:all) do
-    Rubydora::Ext::Solr.load
-  end
-  describe "load" do
-    it "should load mixins" do
-      @mock_repository = mock(Rubydora::Repository)
-      obj = Rubydora::DigitalObject.new('pid', @mock_repository)
-      obj.should be_a_kind_of(Rubydora::Ext::Solr::DigitalObjectMixin)
-    end
-  end
-
-  describe "solr_mapping_logic" do
-    class MockSolrMappingClass
-
-    end 
-    before(:each) do
-       Rubydora::Ext::Solr.load :digital_object => MockSolrMappingClass
-    end
-
-    it "should provide a class-level step list" do
-      MockSolrMappingClass.solr_mapping_logic.should_not be_empty
-    end
-
-    it "should be overridable on the class level" do
-      expect { MockSolrMappingClass.solr_mapping_logic << :a }.to change{MockSolrMappingClass.solr_mapping_logic.length}.by(1)
-    end
-
-    it "should be overridable on the instance level" do
-      MockSolrMappingClass.solr_mapping_logic = []
-      mock = MockSolrMappingClass.new
-
-      mock.solr_mapping_logic.should be_empty
-      mock.solr_mapping_logic << :a
-      mock.solr_mapping_logic.should == [:a]
-      MockSolrMappingClass.solr_mapping_logic.should == []
-    end
-
-  end
-
-  describe "to_solr" do
-    before(:each) do
-      @mock_repository = mock(Rubydora::Repository)
-      @object = Rubydora::DigitalObject.new('pid', @mock_repository)
-    end
-    it "should call the members of solr_mapping_logic" do
-      @object.should_receive(:solr_mapping_logic).and_return([:mock_solr_step, :another_mock_solr_step])
-      @object.should_receive(:mock_solr_step)
-      @object.should_receive(:another_mock_solr_step)
-      @object.to_solr
-    end
-
-    it "should allow steps to modify the resulting solr document" do
-      @object.should_receive(:solr_mapping_logic).and_return([:mock_solr_step, :another_mock_solr_step])
-      @object.stub(:mock_solr_step) do |doc|
-        doc[:a] = 'a'
-        doc[:b] = 0
-      end
-
-      @object.stub(:another_mock_solr_step) do |doc|
-        doc[:b] = 'b'
-      end
-    
-      @object.to_solr.should == { :a => 'a', :b => 'b'}
-    end
-  end
-
-  describe "object_profile_to_solr" do
-    before(:each) do
-      @mock_repository = mock(Rubydora::Repository)
-      @object = Rubydora::DigitalObject.new('pid', @mock_repository)
-    end
-
-    it "should map the pid and id" do
-      @object.should_receive(:profile).and_return({})
-      doc = {}
-      @object.object_profile_to_solr(doc)
-
-      doc['id'].should == 'pid'
-      doc['pid_s'].should == 'pid'
-    end
-
-    it "should map the profile hash to generic document fields" do
-      @object.should_receive(:profile).and_return({'a' => 1, 'b' => 2})
-      doc = {}
-      @object.object_profile_to_solr(doc)
-      doc['a_s'].should == 1
-      doc['b_s'].should == 2
-    end
-  end
-
-  describe "datastreams_to_solr" do
-    before(:each) do
-      @mock_repository = mock(Rubydora::Repository)
-      @object = Rubydora::DigitalObject.new('pid', @mock_repository)
-    end
-
-    it "should map the list of datastreams" do
-      @mock_ds = mock(Rubydora::Datastream)
-      @mock_ds2 = mock(Rubydora::Datastream)
-
-      @mock_ds.should_receive(:to_solr).with(instance_of(Hash))
-      @mock_ds2.should_receive(:to_solr).with(instance_of(Hash))
-      @object.should_receive(:datastreams).and_return(:a => @mock_ds, :b => @mock_ds2)
-      doc = {}
-      @object.datastreams_to_solr(doc)
-
-      doc['disseminates_s'].should == [:a, :b]
-    end
-
-    it "should let the datastreams inject any document attributes" do
-      @mock_ds = mock(Rubydora::Datastream)
-
-      @mock_ds.should_receive(:to_solr) do |doc|
-        doc['a'] = 1
-      end
-      @object.should_receive(:datastreams).and_return(:a => @mock_ds)
-      doc = {}
-      @object.datastreams_to_solr(doc)
-
-      doc['a'].should == 1
-    end
-  end
-
-  describe "relations_to_solr" do
-    before(:each) do
-      @mock_repository = mock(Rubydora::Repository)
-      @object = Rubydora::DigitalObject.new('pid', @mock_repository)
-    end
-
-    it "should lazily map relationships from SPARQL" do
-      @object.repository.should_receive(:sparql).and_return([{'relation' => '...#isPartOf', 'object' => 'info:fedora/test:pid'}])
-      doc = {}
-      @object.relations_to_solr(doc)
-      doc['ri_isPartOf_s'].should == ['info:fedora/test:pid']
-    end
-  end
-
-
-end
-

data/spec/lib/extension_parameters_spec.rb

@@ -1,60 +0,0 @@
-require 'spec_helper'
-
-describe Rubydora::ExtensionParameters do
-  describe "extension parameters" do
-    class MockExtensionParametersClass
-      include Rubydora::Callbacks
-      register_callback :after_initialize
-      include Rubydora::ExtensionParameters
-    end
-
-    it "should have extension parameters at the class level" do
-      MockExtensionParametersClass.extension_parameters[:a] = 1 
-
-      MockExtensionParametersClass.extension_parameters.should == { :a => 1 }
-
-    end
-  end
-
-  describe "DigitalObject" do
-    module FakeExtension
-    end
-
-    module OtherFakeExtension
-
-    end
-    before(:each) do
-      @mock_repository = mock()
-    end
-
-    after(:each) do
-      Rubydora::DigitalObject.registered_extensions = []
-    end
-
-    it "should be extendable" do
-      Rubydora::DigitalObject.use_extension FakeExtension
-      @object = Rubydora::DigitalObject.new 'pid', @mock_repository
-      @object.is_a?(FakeExtension).should == true
-    end
-
-    it "should be extendable conditionally" do
-      Rubydora::DigitalObject.use_extension(FakeExtension) { |x| true }
-      Rubydora::DigitalObject.use_extension(OtherFakeExtension) { |x| false }
-      @object = Rubydora::DigitalObject.new 'pid', @mock_repository
-      @object.is_a?(FakeExtension).should == true
-      @object.is_a?(OtherFakeExtension).should == false
-    end
-
-    it "should be able to introspect object profiles" do
-      @mock_repository.should_receive(:object).any_number_of_times.with({:pid => 'pid'}).and_return <<-XML
-      <objectProfile>
-        <a>1</a>
-      </objectProfile>
-      XML
-      Rubydora::DigitalObject.use_extension(FakeExtension) { |x| x.profile['a'] == '1' }
-      @object = Rubydora::DigitalObject.new 'pid', @mock_repository
-      @object.is_a?(FakeExtension).should == true
-    end
-  end
-end
-

data/spec/lib/soap_spec.rb

@@ -1,12 +0,0 @@
-require 'spec_helper'
-
-describe Rubydora::Soap do
-  before(:all) do
-    @repository = Rubydora.connect({ :url => 'http://localhost:8080/fedora', :user => 'fedoraAdmin', :password => 'fedoraAdmin' })
-    @repository.send(:extend, Rubydora::Soap)
-  end
-
-  it "should provide a SOAP endpoint accessor" do
-     @repository.soap.should be_a_kind_of(Savon::Client)
-  end
-end