jrdspace 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5db7f77a3d11787aba5287f24399b892124e5bb
-  data.tar.gz: bb17539e3e32642d8d8d2826fec7e496d638ba88
+  metadata.gz: 068382596fdb06ed88b6628ebaaf0a8948d07b4b
+  data.tar.gz: c77b894f115059873b84251cc857b8c3b25a1419
 SHA512:
-  metadata.gz: c076098fdff1062aef6d13e7b04817d9f967c5e30390c5e8d151265c24893fffa1634ec1142c6e0d625c448589cb0211ea4670c02f08e375794d1475b2a678e0
-  data.tar.gz: 46f5ce896a3bc98ff427fb78cacc37c796dc2017be8cbe01947c6b174538e8be0bd68bb3d0644bdd8b7f54825b832bf6437ab58cf59f2eb16ad464e23a744d15
+  metadata.gz: d398ad2f1f4dcf31a17734247279af2d38e7dc9239f354412882b881ec9bb977a1cb475236940a157a2d5022ad909e1a0aa6bfb5db081556f885a0b25cb22650
+  data.tar.gz: 6eed5a0a82ea28511dda2ca04f73b0d92a8e2fa5bd29abef06a95b53121aa24df96aaddeaada3cea9a2456049a32836a313222bc334ddda000388eef1f5ba453

data/README.md

@@ -15,7 +15,7 @@ Documentation is also available at [rubydoc.info](http://www.rubydoc.info/github
 ### Prerequisite
  * JRuby  [Get Started](http://jruby.org/getting-started)
  * Package Manager  [Bundler](http://bundler.io/)
- * optional - but useful [RMV](https://rvm.io/)
+ * optional - but useful [RVM](https://rvm.io/)
 
 ### Installation 
 
@@ -84,9 +84,11 @@ provide convenience methods, such as retrieving all Communities  finding individ
 DCommunity.all
 DSpace.fromString ('some/handle')      
 DSpace.fromString ('ITEM.124')      
-DSpace.fromString ('EPERSON.a_netid')   
-DSpace.fromString ('GROUP.Anonymous')      
-DGroup.find('group_name')
+DCollection.find(10)     
+DEPerson.find ('email@there.edu')  
+DGroup.find('Anonymous') 
+DGroup.find(1) 
+DMetadataField.find('dc.contributor')
 ```
 
 If you want to make changes you can 'login' 
@@ -109,12 +111,13 @@ DCommunity.all.each { |c| puts [c.getCollections.length, c.getHandle, c.getName]
 ```
 
 Java objects can be converted to corresponding jrdspace objects, so that the additional functionality implemented by jrdspace classes becomes available. 
-For example all jrdspace objects derived from DSpaceObjects implement the parents and policies method:
+For example all jrdspace objects derived from DSpaceObjects implement the parents, policies, and  getMetaDataValues method:
 
 ```
-dso = DSpace.fromHandle('xxxxx/zzz') 
+dso = DSpace.fromString('xxxxx/zzz') 
 DSpace.create(dso).parents
 DSpace.create(dso).policies
+DSpace.create(dso).getMetaDataValues
 ```
 
 

data/lib/dspace.rb

@@ -1,6 +1,7 @@
 require 'dspace/dspace'
 require 'dspace/dconstants'
 require 'dspace/dso'
+require 'dspace/ddspaceobject'
 require 'dspace/deperson'
 require 'dspace/dgroup'
 require 'dspace/dcollection'

data/lib/dspace/dbitstream.rb

@@ -2,6 +2,7 @@
 # This class wraps an org.dspace.content.Bitstream object
 class DBitstream
   include DSO
+  include DDSpaceObject
 
   ##
   # return array of all org.dspace.content.Bitstream objects

data/lib/dspace/dbundle.rb

@@ -2,6 +2,7 @@
 # This class wraps an org.dspace.content.Bitstream object
 class DBundle
   include DSO
+  include DDSpaceObject
 
   ##
   # returns nil or the org.dspace.content.Bundle object with the given id

data/lib/dspace/dcollection.rb

@@ -2,6 +2,7 @@
 # This class wraps an org.dspace.content.Collection object
 class DCollection
   include DSO
+  include DDSpaceObject
 
   ##
   # return array of all org.dspace.content.Collection objects

data/lib/dspace/dcommunity.rb

@@ -2,6 +2,7 @@
 # This class wraps an org.dspace.content.Community object
 class DCommunity
   include DSO
+  include DDSpaceObject
 
   ##
   # return array of all org.dspace.content.Community objects

data/lib/dspace/ddspaceobject.rb

@@ -0,0 +1,50 @@
+##
+# This module contains methods to be included by classes that wrap objects 
+# that derive from org.dspace.content.DSpaceObject 
+require 'json'
+
+module DDSpaceObject
+
+  def parents
+    moms = [];
+    p = @obj.getParentObject()
+    while p do
+      moms << p;
+      p = p.getParentObject();
+    end
+    return moms;
+  end
+
+  def policies()
+    java_import org.dspace.authorize.AuthorizeManager
+    pols = AuthorizeManager.getPolicies(DSpace.context, @obj)
+    pols.collect do |p|
+      pp = p.getEPerson
+      pg = p.getGroup
+      hsh = { :action => p.getAction()}
+      hsh[:person] = pp.getName if pp
+      hsh[:group] = pg.getName if pg
+      hsh
+    end
+  end
+
+  def getMetaDataValues()
+    java_import org.dspace.content.MetadataSchema
+    java_import org.dspace.content.MetadataField
+    java_import org.dspace.storage.rdbms.DatabaseManager
+    java_import org.dspace.storage.rdbms.TableRow
+
+    sql = "SELECT MV.metadata_field_id,  MV.text_value FROM METADATAVALUE MV " +
+            " WHERE RESOURCE_TYPE_ID = #{@obj.getType} AND RESOURCE_ID = #{@obj.getID}"
+    tri = DatabaseManager.queryTable(DSpace.context, "MetadataValue",   sql)
+    mvs = [];
+    while (iter = tri.next())
+      field =  MetadataField.find(DSpace.context, iter.getIntColumn("metadata_field_id"))
+      mvs <<  [ DMetadataField.new(field), iter.getStringColumn("text_value") ]
+    end
+    tri.close
+    return mvs
+  end
+
+end
+

data/lib/dspace/deperson.rb

@@ -2,6 +2,7 @@
 # This class wraps an org.dspace.eperson.EPerson object
 class DEPerson
   include DSO
+  include DDSpaceObject
 
   ##
   # return array of all org.dspace.eperson.EPerson objects
@@ -54,7 +55,8 @@ class DEPerson
   ##
   # convert to string
   def inspect
+    return "nil" if @obj.nil?
     describe = @obj.getNetid || @obj.getEmail || @obj.getID
-    return "EPERSON.#{describe}"
+    return "#<#{self.class.name}:#{describe}>"
   end
 end

data/lib/dspace/dgroup.rb

@@ -2,6 +2,7 @@
 # This class wraps an org.dspace.eperson.Group object
 class DGroup
   include DSO
+  include DDSpaceObject
 
   ##
   # id of administrator group
@@ -70,6 +71,6 @@ class DGroup
   ##
   # convert to string
   def inspect
-    return "GROUP.#{@obj.getName}"
-  end
+    return "nil" if @obj.nil?
+    return "#<#{self.class.name}:#{@obj.getName}>"  end
 end

data/lib/dspace/ditem.rb

@@ -2,6 +2,7 @@
 # This class wraps an org.dspace.content.Item object
 class DItem
   include DSO;
+  include DDSpaceObject
 
   ##
   # return org.dspace.content.ItemIterator for all Items

data/lib/dspace/dmetadata.rb

@@ -1,12 +1,5 @@
 class DMetadataField
-
-  ##
-  # instantiate a wrapper for the given org.dspace.content.MetadataField
-  def initialize(dobj)
-    raise "must pass non null obj" unless dobj
-    raise "must pass org.dspace.content.MetadataField obj" unless dobj.instance_of? org.dspace.content.MetadataField
-    @obj = dobj
-  end
+  include DSO
 
   ##
   # returns nil or the org.dspace.content.MetadataField object with the given field_name
@@ -25,11 +18,12 @@ class DMetadataField
   end
 
   def inspect
+    return "nil" if @obj.nil?
     java_import org.dspace.content.MetadataSchema
     schema = MetadataSchema.find(DSpace.context, @obj.schemaID)
     str = "#{schema.getName}.#{@obj.element}"
     str += ".#{@obj.qualifier}" if @obj.qualifier
-    return str
+    return "#<#{self.class.name}:#{str}>"
   end
 
 end

data/lib/dspace/dso.rb

@@ -10,60 +10,20 @@ module DSO
   # 
   # the wrapper object's class must be compatible with the type of the given dobj 
   def initialize(dobj)
-    raise "must pass non null obj" unless dobj
-    type = DConstants.const_get self.class.name[1..-1].upcase
     @obj = dobj
-    raise "#{dobj} is not a #{type} object" unless @obj.getType == type
+    if dobj then
+      myname = self.class.name
+      raise "can't create #{myname} object from #{@obj}" if myname[1..-1] != @obj.getClass.getName.split('.')[-1]
+    end
   end
 
   def dso
     return @obj
   end
 
-  def parents
-    moms = [];
-    p = @obj.getParentObject()
-    while p do
-      moms << p;
-      p = p.getParentObject();
-    end
-    return moms;
-  end
-
-  def policies()
-    java_import org.dspace.authorize.AuthorizeManager
-    pols = AuthorizeManager.getPolicies(DSpace.context, @obj)
-    pols.collect do |p|
-      pp = p.getEPerson
-      pg = p.getGroup
-      hsh = { :action => p.getAction()}
-      hsh[:person] = pp.getName if pp
-      hsh[:group] = pg.getName if pg
-      hsh
-    end
-  end
-
-  def getMetaDataValues()
-    java_import org.dspace.content.MetadataSchema
-    java_import org.dspace.content.MetadataField
-    java_import org.dspace.storage.rdbms.DatabaseManager
-    java_import org.dspace.storage.rdbms.TableRow
-
-    sql = "SELECT MV.metadata_field_id,  MV.text_value FROM METADATAVALUE MV " +
-            " WHERE RESOURCE_TYPE_ID = #{@obj.getType} AND RESOURCE_ID = #{@obj.getID}"
-    tri = DatabaseManager.queryTable(DSpace.context, "MetadataValue",   sql)
-    mvs = [];
-    while (iter = tri.next())
-      field =  MetadataField.find(DSpace.context, iter.getIntColumn("metadata_field_id"))
-      mvs <<  [ DMetadataField.new(field), iter.getStringColumn("text_value") ]
-    end
-    tri.close
-    return mvs
-  end
-
   def inspect
     return "nil" if @obj.nil?
-    return "#{@obj.getTypeText}.#{@obj.getID}"
+    return "#<#{self.class.name}:#{@obj.getID}>"
   end
 
 end

data/lib/dspace/dspace.rb

@@ -113,6 +113,7 @@ module DSpace
     if (2 == splits.length) then
       self.find(splits[0].upcase, splits[1])
     else
+      java_import org.dspace.handle.HandleManager
       return HandleManager.resolve_to_object(DSpace.context, type_id_or_handle);
     end
   end

data/lib/dspace/dwork.rb

@@ -34,6 +34,7 @@ module DWork
 end
 
 class DWorkflowItem
+  include DSO
 
   ##
   # find org.dspace.workflow.WorkflowItem
@@ -56,6 +57,7 @@ class DWorkflowItem
 end
 
 class DWorkspaceItem
+  include DSO
 
   ##
   # find org.dspace.workflow.WorkspaceItem

data/lib/dspace/version.rb

@@ -1,3 +1,3 @@
 module DSpace
-    VERSION = "0.0.12"
+    VERSION = "0.0.13"
 end

data/test.rb

@@ -0,0 +1,45 @@
+require 'dspace'
+DSpace.load
+
+def test_dso(ddso)
+  [:policies, :parents, :getMetaDataValues].each do |m|
+    puts "#{ddso.inspect}.#{m} -> #{ddso.send(m)}"
+  end
+end
+
+[DCommunity, DCollection, DItem, DBitstream].each do |klass|
+  puts klass.name + ".all"
+  all = klass.send :all
+  dso = all[0]
+  puts klass.name + ".find"
+  o = klass.send :find, dso.getID
+  ddso = DSpace.create(o)
+  puts "ddso.inspect #{ddso.inspect}"
+
+  o = DSpace.fromString("#{DConstants.typeStr(dso.getType)}.#{dso.getID}")
+  puts "ERROR #{o} != #{DSpace.create(dso).inspect}" if o != dso
+  if dso.getHandle then
+    o = DSpace.fromString(dso.getHandle)
+    puts "ERROR #{o} != #{DSpace.create(dso).inspect}" if o != dso
+  end
+
+  test_dso(ddso)
+end
+
+[DWorkflowItem, DWorkspaceItem].each do |klass|
+  puts klass.name + ".findAll"
+  all = klass.send :findAll, nil
+  id = all.length > 0 ? all[0].getID : nil
+  puts klass.name + ".find #{id}"
+  obj = klass.send(:find, id)
+  puts "#{klass}.new #{obj}"
+  puts klass.send(:new, obj).inspect
+end
+
+ditem = DSpace.create(DBitstream.all[0].getParentObject)
+puts "#{ditem}.bitstreams => #{ditem.bitstreams}"
+bundle = ditem.bitstreams[0].getBundles[0]
+puts bundle
+dbundle = DSpace.create(bundle)
+test_dso(dbundle)
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jrdspace
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Monika Mevenkamp
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-06-06 00:00:00.000000000 Z
+date: 2016-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jar
@@ -85,6 +85,7 @@ files:
 - lib/dspace/dcollection.rb
 - lib/dspace/dcommunity.rb
 - lib/dspace/dconstants.rb
+- lib/dspace/ddspaceobject.rb
 - lib/dspace/deperson.rb
 - lib/dspace/dgroup.rb
 - lib/dspace/ditem.rb
@@ -93,6 +94,7 @@ files:
 - lib/dspace/dspace.rb
 - lib/dspace/dwork.rb
 - lib/dspace/version.rb
+- test.rb
 homepage: https://github.com/akinom/dspace-jruby
 licenses:
 - MIT