rubydora 0.0.4 → 0.0.5

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/lib/rubydora/digital_object.rb

@@ -59,7 +59,7 @@ module Rubydora
     # @param [Rubydora::Repository] repository context
     # @param [Hash] options default attribute values (used esp. for creating new datastreams
     def initialize pid, repository = nil, options = {}
-      @pid = pid
+      @pid = pid.gsub('info:fedora/', '')
       @repository = repository
 
       options.each do |key, value|

data/lib/rubydora/ext/solr.rb

@@ -82,7 +82,7 @@ module Rubydora::Ext
       def datastreams_to_solr doc
         datastreams.each do |dsid, ds|
           doc['disseminates_s'] ||= []
-          doc['disseminates_s'] << [dsid]
+          doc['disseminates_s'] << dsid
           ds.to_solr(doc)
         end
       end

data/lib/rubydora/rest_api_client/v33.rb

@@ -1,18 +1,9 @@
 module Rubydora::RestApiClient
   # Fall-back implementations for fcrepo < 3.4
   module V33
-    # SOAP API endpoint
-    # @return [SOAP::WSDLDriverFactory]
-    def soap
-     return @soap if @soap
-     gem "soap4r"
-     require 'soap/wsdlDriver'
-
-     @soap = SOAP::WSDLDriverFactory.new("#{ config[:url] }/wsdl?api=API-M").create_rpc_driver
-     @soap.options['protocol.http.basic_auth'] << [config[:url], config[:user], config[:password]]
-
-     @soap
-       
+    # @param [Rubydora::Repository] repository
+    def self.extended repository
+      repository.send(:extend, Rubydora::Soap)
     end
 
     # {include:RestApiClient#relationships}

data/lib/rubydora/soap.rb

@@ -0,0 +1,21 @@
+module Rubydora
+  # Fedora SOAP API extension
+  module Soap
+    # @param [Rubydora::Repository] repository
+    def self.extended repository
+      gem "soap4r"
+      require 'soap/wsdlDriver'
+    end
+
+    # SOAP API endpoint
+    # @return [SOAP::RPC::Driver]
+    def soap
+     return @soap if @soap
+
+     @soap = SOAP::WSDLDriverFactory.new("#{ config[:url] }/wsdl?api=API-M").create_rpc_driver
+     @soap.options['protocol.http.basic_auth'] << [config[:url], config[:user], config[:password]]
+
+     @soap
+    end
+  end
+end

data/lib/rubydora.rb

@@ -4,6 +4,7 @@ module Rubydora
   autoload :Repository, "rubydora/repository"
   autoload :ResourceIndex, "rubydora/resource_index"
   autoload :RestApiClient, "rubydora/rest_api_client"
+  autoload :Soap, "rubydora/soap"
   autoload :ModelsMixin, "rubydora/models_mixin"
   autoload :Ext, "rubydora/ext"
   autoload :RelationshipsMixin, "rubydora/relationships_mixin"

data/rubydora.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rubydora}
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chris Beer"]
-  s.date = %q{2011-04-19}
+  s.date = %q{2011-04-21}
   s.description = %q{Fedora Commons REST API ruby library : REQUIRES FCREPO 3.4+}
   s.email = %q{chris@cbeer.info}
   s.extra_rdoc_files = [
@@ -37,6 +37,7 @@ Gem::Specification.new do |s|
     "lib/rubydora/resource_index.rb",
     "lib/rubydora/rest_api_client.rb",
     "lib/rubydora/rest_api_client/v33.rb",
+    "lib/rubydora/soap.rb",
     "rubydora.gemspec",
     "spec/datastream_spec.rb",
     "spec/digital_object_spec.rb",
@@ -47,6 +48,7 @@ Gem::Specification.new do |s|
     "spec/repository_spec.rb",
     "spec/resource_index_spec.rb",
     "spec/rest_api_client_spec.rb",
+    "spec/soap_spec.rb",
     "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/cbeer/rubydora}
@@ -64,6 +66,7 @@ Gem::Specification.new do |s|
     "spec/repository_spec.rb",
     "spec/resource_index_spec.rb",
     "spec/rest_api_client_spec.rb",
+    "spec/soap_spec.rb",
     "spec/spec_helper.rb"
   ]
 

data/spec/ext_solr_spec.rb

@@ -2,9 +2,11 @@ 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
-      Rubydora::Ext::Solr.load
       @mock_repository = mock(Rubydora::Repository)
       obj = Rubydora::DigitalObject.new('pid', @mock_repository)
       obj.should be_a_kind_of(Rubydora::Ext::Solr::DigitalObjectMixin)
@@ -45,7 +47,6 @@ describe Rubydora::Ext::Solr do
       @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)
@@ -66,5 +67,78 @@ describe Rubydora::Ext::Solr do
       @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/repository_spec.rb

@@ -69,6 +69,11 @@ end
       @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)
+    end
   end
 
 describe "find_by_sparql" do

data/spec/soap_spec.rb

@@ -0,0 +1,12 @@
+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(SOAP::RPC::Driver)
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubydora
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Chris Beer
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-19 00:00:00 -04:00
+date: 2011-04-21 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -192,6 +192,7 @@ files:
 - lib/rubydora/resource_index.rb
 - lib/rubydora/rest_api_client.rb
 - lib/rubydora/rest_api_client/v33.rb
+- lib/rubydora/soap.rb
 - rubydora.gemspec
 - spec/datastream_spec.rb
 - spec/digital_object_spec.rb
@@ -202,6 +203,7 @@ files:
 - spec/repository_spec.rb
 - spec/resource_index_spec.rb
 - spec/rest_api_client_spec.rb
+- spec/soap_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/cbeer/rubydora
@@ -247,4 +249,5 @@ test_files:
 - spec/repository_spec.rb
 - spec/resource_index_spec.rb
 - spec/rest_api_client_spec.rb
+- spec/soap_spec.rb
 - spec/spec_helper.rb