rubydora 0.0.7 → 0.1.0

data/.gitignore

@@ -0,0 +1,45 @@
+# rcov generated
+coverage
+
+# rdoc generated
+rdoc
+
+# yard generated
+doc
+.yardoc
+
+# bundler
+.bundle
+
+# jeweler generated
+pkg
+
+Gemfile.lock
+.rvmrc
+
+# Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore: 
+#
+# * Create a file at ~/.gitignore
+# * Include files you want ignored
+# * Run: git config --global core.excludesfile ~/.gitignore
+#
+# After doing this, these files will be ignored in all your git projects,
+# saving you from having to 'pollute' every project you touch with them
+#
+# Not sure what to needs to be ignored for particular editors/OSes? Here's some ideas to get you started. (Remember, remove the leading # of the line)
+#
+# For MacOS:
+#
+#.DS_Store
+#
+# For TextMate
+#*.tmproj
+#tmtags
+#
+# For emacs:
+#*~
+#\#*
+#.\#*
+#
+# For vim:
+*.swp

data/Gemfile

@@ -1,27 +1,4 @@
 source "http://rubygems.org"
 
-gem "fastercsv"
-gem "rest-client"
-gem "nokogiri"
-gem "mime-types"
-gem "activesupport", ">= 3.0"
-gem "activemodel", ">= 3.0"
+gemspec
 
-group :soap do
-  gem "soap4r"
-end
-
-# Add dependencies required to use your gem here.
-# Example:
-#   gem "activesupport", ">= 2.3.5"
-
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
-group :development do
-  gem "shoulda", ">= 0"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.5.1"
-  gem "rcov", ">= 0"
-  gem "rspec"
-  gem "yard"
-end

data/Rakefile

@@ -1,5 +1,7 @@
 require 'rubygems'
 require 'bundler'
+require 'bundler/gem_tasks'
+
 begin
   Bundler.setup(:default, :development)
 rescue Bundler::BundlerError => e
@@ -7,20 +9,6 @@ rescue Bundler::BundlerError => e
   $stderr.puts "Run `bundle install` to install missing gems"
   exit e.status_code
 end
-require 'rake'
-
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "rubydora"
-  gem.homepage = "http://github.com/cbeer/rubydora"
-  gem.license = "MIT"
-  gem.summary = %Q{Fedora Commons REST API ruby library}
-  gem.description = %Q{Fedora Commons REST API ruby library : REQUIRES FCREPO 3.4+}
-  gem.email = "chris@cbeer.info"
-  gem.authors = ["Chris Beer"]
-end
-Jeweler::RubygemsDotOrgTasks.new
 
 # Get your spec rake tasks working in RSpec 2.0
 
@@ -35,13 +23,6 @@ RSpec::Core::RakeTask.new do |t|
   # Put spec opts in a file named .rspec in root
 end
 
-desc "Generate code coverage"
-require "rcov/rcovtask"
-RSpec::Core::RakeTask.new(:coverage) do |t|
-  t.pattern = "./spec/**/*_spec.rb" # don't need this, it's default.
-  t.rcov = true
-  t.rcov_opts = ['--exclude', 'spec', '--exclude', 'gems/*']
-end
 
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.1.0

data/lib/rubydora/resource_index.rb

@@ -26,7 +26,11 @@ module Rubydora
     # @param [String] query SPARQL query
     # @return [FasterCSV::Table]
     def sparql query
-      FasterCSV.parse(self.risearch(query), :headers => true)
+      if CSV.const_defined? :Reader
+        FasterCSV.parse(self.risearch(query), :headers => true)
+      else
+        CSV.parse(self.risearch(query), :headers => true)
+      end
     end
 
     protected

data/lib/rubydora/rest_api_client/v33.rb

@@ -14,13 +14,13 @@ module Rubydora::RestApiClient
     # {include:RestApiClient#add_relationship}
     def add_relationship options = {}
       pid = options.delete(:pid) || options[:subject]
-      self.soap.addRelationship(:pid => pid, :relationship => options[:predicate], :object => options[:object], :isLiteral => false, :datatype => nil)
+      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.purgeRelationship(:pid => pid, :relationship => options[:predicate], :object => options[:object], :isLiteral => false, :datatype => nil)
+      self.soap.request :purge_relationship, :pid => pid, :relationship => options[:predicate], :object => options[:object], :isLiteral => false, :datatype => nil
     end
 
   end

data/lib/rubydora/soap.rb

@@ -3,19 +3,18 @@ module Rubydora
   module Soap
     # @param [Rubydora::Repository] repository
     def self.extended repository
-      gem "soap4r"
-      require 'soap/wsdlDriver'
+      require 'savon'
     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
+     @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/lib/rubydora/version.rb

@@ -0,0 +1,10 @@
+# -*- encoding : utf-8 -*-
+module Rubydora
+  unless Rubydora.const_defined? :VERSION
+    def self.version
+      @version ||= File.read(File.join(File.dirname(__FILE__), '..', '..', 'VERSION')).chomp
+    end
+
+    VERSION = self.version
+  end
+end

data/lib/rubydora.rb

@@ -15,17 +15,15 @@ module Rubydora
   autoload :Callbacks, "rubydora/callbacks"
   autoload :ArrayWithCallback, "rubydora/array_with_callback"
 
-  require 'fastercsv'
-  require 'restclient'
-  require 'nokogiri'
 
-  # @return [String] version
-  def self.version
-    @version ||= File.read(File.join(File.dirname(__FILE__), '..', 'VERSION')).chomp
+  require 'csv'
+  if CSV.const_defined? :Reader
+    require 'fastercsv'
   end
+  require 'restclient'
+  require 'nokogiri'
 
-  # version string
-  VERSION = self.version
+  require 'rubydora/version'
 
   # Connect to Fedora Repository
   # @return Rubydora::Repository

data/rubydora.gemspec

@@ -1,119 +1,32 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-
+# Provide a simple gemspec so you can easily use your enginex
+# project in your rails apps through git.
+require File.join(File.dirname(__FILE__), "lib/rubydora/version")
 Gem::Specification.new do |s|
-  s.name = %q{rubydora}
-  s.version = "0.0.7"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.name = "rubydora"
+  s.version = Rubydora::VERSION
+  s.platform = Gem::Platform::RUBY
   s.authors = ["Chris Beer"]
-  s.date = %q{2011-05-12}
+  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.email = %q{chris@cbeer.info}
-  s.extra_rdoc_files = [
-    "LICENSE.txt",
-    "README.rdoc"
-  ]
-  s.files = [
-    "Gemfile",
-    "LICENSE.txt",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "lib/rubydora.rb",
-    "lib/rubydora/array_with_callback.rb",
-    "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/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",
-    "rubydora.gemspec",
-    "spec/datastream_spec.rb",
-    "spec/digital_object_spec.rb",
-    "spec/ext_model_loader_spec.rb",
-    "spec/ext_solr_spec.rb",
-    "spec/extension_parameters_spec.rb",
-    "spec/integration_test_spec.rb",
-    "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}
-  s.licenses = ["MIT"]
+  s.homepage = "http://github.com/cbeer/rubydora"
+
+  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.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Fedora Commons REST API ruby library}
-  s.test_files = [
-    "spec/datastream_spec.rb",
-    "spec/digital_object_spec.rb",
-    "spec/ext_model_loader_spec.rb",
-    "spec/ext_solr_spec.rb",
-    "spec/extension_parameters_spec.rb",
-    "spec/integration_test_spec.rb",
-    "spec/repository_spec.rb",
-    "spec/resource_index_spec.rb",
-    "spec/rest_api_client_spec.rb",
-    "spec/soap_spec.rb",
-    "spec/spec_helper.rb"
-  ]
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.add_dependency "fastercsv"
+  s.add_dependency "rest-client"
+  s.add_dependency "nokogiri"
+  s.add_dependency "mime-types"
+  s.add_dependency "activesupport"
+  s.add_dependency "activemodel"
+  s.add_dependency "savon"
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<fastercsv>, [">= 0"])
-      s.add_runtime_dependency(%q<rest-client>, [">= 0"])
-      s.add_runtime_dependency(%q<nokogiri>, [">= 0"])
-      s.add_runtime_dependency(%q<mime-types>, [">= 0"])
-      s.add_runtime_dependency(%q<activesupport>, [">= 3.0"])
-      s.add_runtime_dependency(%q<activemodel>, [">= 3.0"])
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5.1"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, [">= 0"])
-      s.add_development_dependency(%q<yard>, [">= 0"])
-    else
-      s.add_dependency(%q<fastercsv>, [">= 0"])
-      s.add_dependency(%q<rest-client>, [">= 0"])
-      s.add_dependency(%q<nokogiri>, [">= 0"])
-      s.add_dependency(%q<mime-types>, [">= 0"])
-      s.add_dependency(%q<activesupport>, [">= 3.0"])
-      s.add_dependency(%q<activemodel>, [">= 3.0"])
-      s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
-      s.add_dependency(%q<rcov>, [">= 0"])
-      s.add_dependency(%q<rspec>, [">= 0"])
-      s.add_dependency(%q<yard>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<fastercsv>, [">= 0"])
-    s.add_dependency(%q<rest-client>, [">= 0"])
-    s.add_dependency(%q<nokogiri>, [">= 0"])
-    s.add_dependency(%q<mime-types>, [">= 0"])
-    s.add_dependency(%q<activesupport>, [">= 3.0"])
-    s.add_dependency(%q<activemodel>, [">= 3.0"])
-    s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
-    s.add_dependency(%q<rcov>, [">= 0"])
-    s.add_dependency(%q<rspec>, [">= 0"])
-    s.add_dependency(%q<yard>, [">= 0"])
-  end
+  s.add_development_dependency("rake")
+  s.add_development_dependency("shoulda")
+  s.add_development_dependency("bundler")
+  s.add_development_dependency("rspec")
+  s.add_development_dependency("yard")
 end
-

data/spec/integration_test_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 
 # These tests require a fedora repository with the resource index enabled (and with syncUpdates = true)
 describe "Integration testing against a live Fedora repository" do
-  REPOSITORY_CONFIG = { :url => 'http://localhost:8080/fedora', :user => 'fedoraAdmin', :password => 'fedoraAdmin' }
+  REPOSITORY_CONFIG = { :url => 'http://localhost:8983/fedora', :user => 'fedoraAdmin', :password => 'fedoraAdmin' }
   before(:all) do
     @repository = Rubydora.connect REPOSITORY_CONFIG
   end

data/spec/soap_spec.rb

@@ -7,6 +7,6 @@ describe Rubydora::Soap do
   end
 
   it "should provide a SOAP endpoint accessor" do
-     @repository.soap.should be_a_kind_of(SOAP::RPC::Driver)
+     @repository.soap.should be_a_kind_of(Savon::Client)
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubydora
 version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: false
+  hash: 27
+  prerelease: 
   segments: 
   - 0
+  - 1
   - 0
-  - 7
-  version: 0.0.7
+  version: 0.1.0
 platform: ruby
 authors: 
 - Chris Beer
@@ -15,14 +15,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-12 00:00:00 -04:00
+date: 2011-07-14 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   prerelease: false
-  name: fastercsv
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -31,12 +29,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
   type: :runtime
+  name: fastercsv
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  name: rest-client
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -45,12 +43,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
   type: :runtime
+  name: rest-client
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  name: nokogiri
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -59,12 +57,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
   type: :runtime
+  name: nokogiri
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  name: mime-types
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -73,42 +71,40 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
   type: :runtime
+  name: mime-types
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  name: activesupport
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 3
         segments: 
-        - 3
         - 0
-        version: "3.0"
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
+        version: "0"
   type: :runtime
+  name: activesupport
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  name: activemodel
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 3
         segments: 
-        - 3
         - 0
-        version: "3.0"
-  requirement: *id006
+        version: "0"
+  type: :runtime
+  name: activemodel
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  type: :development
   prerelease: false
-  name: shoulda
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -117,44 +113,40 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id007
+  type: :runtime
+  name: savon
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  type: :development
   prerelease: false
-  name: bundler
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 3
         segments: 
-        - 1
-        - 0
         - 0
-        version: 1.0.0
-  requirement: *id008
-- !ruby/object:Gem::Dependency 
+        version: "0"
   type: :development
+  name: rake
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  name: jeweler
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 3
         segments: 
-        - 1
-        - 5
-        - 1
-        version: 1.5.1
-  requirement: *id009
-- !ruby/object:Gem::Dependency 
+        - 0
+        version: "0"
   type: :development
+  name: shoulda
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  name: rcov
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -163,12 +155,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id010
-- !ruby/object:Gem::Dependency 
   type: :development
+  name: bundler
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  name: rspec
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -177,12 +169,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id011
-- !ruby/object:Gem::Dependency 
   type: :development
+  name: rspec
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  name: yard
-  version_requirements: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -191,17 +183,20 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id012
+  type: :development
+  name: yard
+  version_requirements: *id012
 description: "Fedora Commons REST API ruby library : REQUIRES FCREPO 3.4+"
-email: chris@cbeer.info
+email: 
+- chris@cbeer.info
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE.txt
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
+- .gitignore
 - Gemfile
 - LICENSE.txt
 - README.rdoc
@@ -223,6 +218,7 @@ files:
 - lib/rubydora/rest_api_client.rb
 - lib/rubydora/rest_api_client/v33.rb
 - lib/rubydora/soap.rb
+- lib/rubydora/version.rb
 - rubydora.gemspec
 - spec/datastream_spec.rb
 - spec/digital_object_spec.rb
@@ -237,8 +233,8 @@ files:
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/cbeer/rubydora
-licenses: 
-- MIT
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
@@ -265,7 +261,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Fedora Commons REST API ruby library