jrdspace 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 068382596fdb06ed88b6628ebaaf0a8948d07b4b
-  data.tar.gz: c77b894f115059873b84251cc857b8c3b25a1419
+  metadata.gz: 7b98388fea631f9ca928d3be6aea51fc3d3663b8
+  data.tar.gz: f4c4478a4f920bf3c414271ef51e19cdf285cfe9
 SHA512:
-  metadata.gz: d398ad2f1f4dcf31a17734247279af2d38e7dc9239f354412882b881ec9bb977a1cb475236940a157a2d5022ad909e1a0aa6bfb5db081556f885a0b25cb22650
-  data.tar.gz: 6eed5a0a82ea28511dda2ca04f73b0d92a8e2fa5bd29abef06a95b53121aa24df96aaddeaada3cea9a2456049a32836a313222bc334ddda000388eef1f5ba453
+  metadata.gz: 9a996c7423b56fe2a17bc8f81a5dd6fa07724f5d861c45f0a5d79e12c41b7ecf6a7df0296962cb474c2930dfaef4bd5eee3c10aff54a5b8eca230bca5b2912f6
+  data.tar.gz: 24b192ddef65b05a36ba976e65d4c612279efb84b64bde039b0f4126973d89fd7f4a6836b0161c855c709c54841457ea2a14ad1c0595960fe3ebb286a1fc7221

data/.gitignore

@@ -0,0 +1 @@
+jrdspace-*.gem

data/README.md

@@ -10,6 +10,8 @@ The companion project [cli-dspace](https://github.com/akinom/dspace-cli)  contai
 
 Documentation is also available at [rubydoc.info](http://www.rubydoc.info/github/akinom/dspace-jruby)
 
+I would like to hear from you if you download and use jrdsapce. Please do send me your feedback and PRs. 
+
 ## Installation
 
 ### Prerequisite

data/lib/dspace.rb

@@ -1,5 +1,6 @@
-require 'dspace/dspace'
+require 'dspace/dconfig'
 require 'dspace/dconstants'
+require 'dspace/dspace'
 require 'dspace/dso'
 require 'dspace/ddspaceobject'
 require 'dspace/deperson'

data/lib/dspace/dcommunity.rb

@@ -29,4 +29,19 @@ class DCommunity
     return comm
   end
 
+  def getCollections
+     return DCommunity.getCollections(self.dso)
+  end
+
+  def self.getCollections(com)
+      colls = []
+      if (not com.is_a? Array) then
+        com = [com]
+      end
+      com.each do |c|
+        colls = colls +  c.getCollections.collect { |c| c }
+        colls = colls + getCollections(c.getSubcommunities.collect{ |sc| sc})
+      end
+      return colls
+    end
 end

data/lib/dspace/dconfig.rb

@@ -0,0 +1,11 @@
+##
+# This class wraps an org.dspace.content.Community object
+class DConfig
+
+  ##
+  # return configuration value for name
+  def self.get(name)
+    java_import org.dspace.core.ConfigurationManager;
+    ConfigurationManager.getProperty name
+  end
+end

data/lib/dspace/dgroup.rb

@@ -50,11 +50,9 @@ class DGroup
   end
 
   ##
-  # return EPerson and Groups that are (direct) require 'faker;members of this DGroup
-  #
-  # name must be a string
+  # return EPerson and Groups that are (direct) members of this Group
   def members
-    return @obj.getMembers + @obj.getMemberGroups
+    return  @obj.getMemberGroups.collect { |p| p }  + @obj.getMembers.collect { |p| p }
   end
 
   ##

data/lib/dspace/ditem.rb

@@ -12,7 +12,7 @@ class DItem
   end
 
   ##
-  # return array of all org.dspace.content.Item objects
+  # return array of all archived org.dspace.content.Item objects
   def self.all()
     java_import org.dspace.content.Item;
     list, stp = [], iter

data/lib/dspace/dmetadata.rb

@@ -1,3 +1,22 @@
+class DMetadataSchema
+  include DSO
+
+  def self.all
+    java_import org.dspace.content.MetadataSchema
+    MetadataSchema.findAll DSpace.context
+  end
+
+  def fields
+    java_import org.dspace.content.MetadataField
+    MetadataField.findAllInSchema(DSpace.context, @obj.getSchemaID)
+  end
+
+  def inspect
+    return "nil" if @obj.nil?
+    return "#<#{self.class.name}:#{@obj.getName}>"
+  end
+end
+
 class DMetadataField
   include DSO
 
@@ -17,13 +36,20 @@ class DMetadataField
     return MetadataField.find_by_element(DSpace.context, schm.getSchemaID, element, qualifier)
   end
 
-  def inspect
+  ##
+  # return "nil"  or <schema>.<element>[.<qualifier>]
+  def fullName
     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 "#<#{self.class.name}:#{str}>"
+    return str
+  end
+
+  def inspect
+    return "nil" if @obj.nil?
+    return "#<#{self.class.name}:#{fullName}>"
   end
 
 end

data/lib/dspace/dspace.rb

@@ -84,6 +84,12 @@ module DSpace
     klass.send :new, dso
   end
 
+  ##
+  #  return DSPace.create(dso).inspect or "nil"
+  def self.inspect(dso)
+    dso = DSpace.create(dso) if dso
+    dso.inspect
+  end
   ##
   # return the DSpace object that is identified by the given type and identifier
   #
@@ -107,21 +113,36 @@ module DSpace
     return klass.send :find, id
   end
 
-  def self.fromString(type_id_or_handle)
+  def self.fromString(type_id_or_handle_or_title)
     #TODO handle MetadataField string
-    splits = type_id_or_handle.split('.', 2)
-    if (2 == splits.length) then
-      self.find(splits[0].upcase, splits[1])
+    if type_id_or_handle_or_title.start_with? 'TITLE' then
+      str = type_id_or_handle_or_title[6..-1]
+      dsos = DSpace.findByMetadataValue('dc.title', str, DConstants::ITEM)
+      if (dsos.length > 1) then
+        raise "multiple matches for #{type_id_or_handle_or_title}"
+      end
+      return dsos[0]
     else
-      java_import org.dspace.handle.HandleManager
-      return HandleManager.resolve_to_object(DSpace.context, type_id_or_handle);
+      splits = type_id_or_handle_or_title.split('.', 2)
+      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_or_title);
+      end
     end
   end
 
+  ##
+  # get dpace service manager
+  def self.getServiceManager
+    org.dspace.utils.DSpace.new().getServiceManager()
+  end
+
   ##
   # get a dspace service by name
   def self.getService(service_name, java_klass)
-    org.dspace.utils.DSpace.new().getServiceManager().getServiceByName(service_name,java_klass)
+    getServiceManager().getServiceByName(service_name,java_klass)
   end
 
   ##
@@ -164,6 +185,25 @@ module DSpace
     return dsos
   end
 
+  def self.findByGroupPolicy(group_ref_or_name, action_or_nil, resource_type_or_nil)
+    java_import org.dspace.eperson.Group
+    java_import org.dspace.storage.rdbms.DatabaseManager
+
+    group = DGroup.find(group_ref_or_name) if group_ref_or_name.is_a? String
+    raise "must give valied group" if group == nil or not group.is_a? Java::OrgDspaceEperson::Group
+
+    sql = "SELECT RESOURCE_ID, RESOURCE_TYPE_ID FROM RESOURCEPOLICY WHERE EPERSONGROUP_ID = #{group.getID} ";
+    sql += "AND ACTION_ID = #{action_or_nil} " if action_or_nil
+    sql += "AND RESOURCE_TYPE_ID = #{resource_type_or_nil} " if resource_type_or_nil
+
+    tri = DatabaseManager.queryTable(DSpace.context, "MetadataValue", sql)
+    dsos = [];
+    while (iter = tri.next())
+      dsos << self.find(iter.getIntColumn("resource_type_id"), iter.getIntColumn("resource_id"))
+    end
+    tri.close
+    return dsos
+  end
   ##
   # print available static methods for the give classes
   def self.help(klasses = [DCommunity, DCollection, DItem, DBundle, DBitstream, DEPerson,

data/lib/dspace/dwork.rb

@@ -17,7 +17,7 @@ module DWork
     elsif (obj.getType == DConstants::COMMUNITY) then
       wsis = []
       obj.getAllCollections.each do |col|
-        wsis += findAll(col)
+        wsis += findAll(col, klass)
       end
       return wsis
     elsif (obj.getType == DConstants::ITEM) then

data/lib/dspace/version.rb

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

metadata

@@ -1,72 +1,73 @@
 --- !ruby/object:Gem::Specification
 name: jrdspace
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - Monika Mevenkamp
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-11 00:00:00.000000000 Z
+date: 2017-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jar
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  requirement: !ruby/object:Gem::Requirement
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: json
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  requirement: !ruby/object:Gem::Requirement
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: bundler
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.10'
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.10'
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
   name: rake
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
-  prerelease: false
-  type: :development
-description: jrdspace enables scripting of the dspace-api Java objects in a DSpace installation; it includes an interactive console
+description: jrdspace enables scripting of the dspace-api Java objects in a DSpace
+  installation; it includes an interactive console
 email:
 - monikam@princeton.edu
 executables:
@@ -74,6 +75,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- .gitignore
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -84,6 +86,7 @@ files:
 - lib/dspace/dbundle.rb
 - lib/dspace/dcollection.rb
 - lib/dspace/dcommunity.rb
+- lib/dspace/dconfig.rb
 - lib/dspace/dconstants.rb
 - lib/dspace/ddspaceobject.rb
 - lib/dspace/deperson.rb
@@ -99,7 +102,7 @@ homepage: https://github.com/akinom/dspace-jruby
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -114,9 +117,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.4.5
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.0.14.1
+signing_key: 
 specification_version: 4
 summary: Jruby classes that interact with the dspace-api Java classes - v5
 test_files: []