dspace_rest_client 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a5caf190284294ce02a942a3d72941bfdd452e0
-  data.tar.gz: a2f03710acec47e549750ec8883fa3506ddf8e3c
+  metadata.gz: 5beb7c52c728e6467bdbc68f0d8a7ca7fc6fa08c
+  data.tar.gz: 423f753535f47ec8f64fd9196ce47d32325ec856
 SHA512:
-  metadata.gz: 0dcaae58f9183bc3b8c68d6775443da62f5b423902bf7eaaf95e7ba108769fa1d7b0d45e44e8fda227e31522d2fccabbc82accae889936101fbd130916f20d30
-  data.tar.gz: bfd559a9ed06a3c6fa02ec20bad5210b2b3469f58d5eefc4e6a4f65b1bc94ed4d2808f2bc720c43f9db57d9e072bdbbd3caaa5b22f43bbe918092b704bd9e251
+  metadata.gz: e132ad2bbdf9786150de16e123b38c5dac637e7373ae2b74d9017d3e4b403e0881443b715f00e003e1e0ee634d4ab41ccabeef7265d8c73a34adaa0b96d2c9b6
+  data.tar.gz: bcb42dcfb45d18da3370680147726536c4d48aed446905e5b5303c7498b49b253f92dc156ad1581635322f499fb2c5837ce81086626c12c9dedc612d74677eb5

data/lib/dspace_rest_client.rb

@@ -12,4 +12,6 @@ require File.dirname(__FILE__) + '/dspacerest/repositories/community_repository'
 require File.dirname(__FILE__) + '/dspacerest/repositories/dspace_repository'
 require File.dirname(__FILE__) + '/dspacerest/repositories/item_repository'
 require File.dirname(__FILE__) + '/dspacerest/strategies/uploads/curl_strategy'
-require File.dirname(__FILE__) + '/dspacerest/strategies/uploads/rest_strategy'
+require File.dirname(__FILE__) + '/dspacerest/strategies/uploads/rest_strategy'
+require File.dirname(__FILE__) + '/dspacerest/builders/hash_builder'
+require File.dirname(__FILE__) + '/dspacerest/builders/model_builder'

data/lib/dspacerest/bitstream.rb

@@ -9,42 +9,43 @@ module DSpaceRest
                 :sequence_id, :policies
 
     def initialize args
-      @id = args['id'] || ""
-      @name = args['name'] || ""
-      @type = args['type'] || ""
-      @link = args['link'] || ""
-      @bundle_name = args['bundleName'] || ""
-      @description = args['description'] || ""
-      @format = args['format'] || ""
-      @mime_type = args['mimeType'] || ""
-      @size_bytes = args['sizeBytes'] || ""
-      @parent_object = args['parentObject'] || ""
-      @retrieve_link = args['retrieveLink'] || ""
-      @check_sum = args['checkSum'] || ""
-      @sequence_id = args['sequenceId'] || ""
-      @policies = args['policies'] || ""
-      @expand = args['expand'] || ""
+      @id = args['id']
+      @name = args['name']
+      @type = args['type']
+      @link = args['link']
+      @bundle_name = args['bundleName']
+      @description = args['description']
+      @format = args['format']
+      @mime_type = args['mimeType']
+      @size_bytes = args['sizeBytes']
+      @parent_object = args['parentObject']
+      @retrieve_link = args['retrieveLink']
+      @check_sum = args['checkSum']
+      @sequence_id = args['sequenceId']
+      @policies = DSpaceRest::Builders::ModelBuilder.build_policies(args['policies'])
+      @expand = args['expand']
     end
 
     def to_h
-      h = Hash.new
-      h['id'] = @id
-      h['name'] = @name
-      h['type'] = @type
-      h['link'] = @link
-      h['bundleName'] = @bundle_name
-      h['description'] = @description
-      h['format'] = @format
-      h['mimeType'] = @mime_type
-      h['sizeBytes'] = @size_bytes
-      h['parentObject'] = @parent_object
-      h['retrieveLink'] = @retrieve_link
-      h['checkSum'] = @check_sum
-      h['sequenceId'] = @sequence_id
-      h['policies'] = @policies
-      h['expand'] = @expand
+      h = {
+          id: @id,
+          name: @name,
+          type: @type,
+          link: @link,
+          bundleName: @bundle_name,
+          description: @description,
+          format: @format,
+          mimeType: @mime_type,
+          sizeBytes: @size_bytes,
+          parentObject: @parent_object,
+          retrieveLink: @retrieve_link,
+          checkSum: @check_sum,
+          sequenceId: @sequence_id,
+          policies: @policies,
+          expand: @expand
+      }
+
       h
     end
-
   end
 end

data/lib/dspacerest/builders/hash_builder.rb

@@ -0,0 +1,16 @@
+module DSpaceRest
+  module Builders
+    module HashBuilder
+
+      def self.models2hash(list)
+        hash = []
+        list.each do |m|
+          hash << m.to_h
+        end
+
+        hash
+      end
+
+    end
+  end
+end

data/lib/dspacerest/builders/model_builder.rb

@@ -0,0 +1,61 @@
+module DSpaceRest
+  module Builders
+    module ModelBuilder
+
+      def self.build_communities(communities=[])
+        return communities if communities.nil?
+        colls = []
+        communities.each do |c|
+          colls << DSpaceRest::Community.new(c)
+        end
+        colls
+      end
+
+      def self.build_collections(collections=[])
+        return collections if collections.nil?
+        colls = []
+        collections.each do |c|
+          colls << DSpaceRest::Collection.new(c)
+        end
+        colls
+      end
+
+      def self.build_items(items=[])
+        return items if items.nil?
+        colls = []
+        items.each do |c|
+          colls << DSpaceRest::Item.new(c)
+        end
+        colls
+      end
+
+      def self.build_bitstreams(bitstreams=[])
+        return bitstreams if bitstreams.nil?
+        colls = []
+        bitstreams.each do |c|
+          colls << DSpaceRest::Bitstream.new(c)
+        end
+        colls
+      end
+
+      def self.build_metadatas(metadatas=[])
+        return metadatas if metadatas.nil?
+        colls = []
+        metadatas.each do |c|
+          colls << DSpaceRest::Metadata.new(c)
+        end
+        colls
+      end
+
+      def self.build_policies(policies=[])
+        return policies if policies.nil?
+        colls = []
+        policies.each do |c|
+          colls << DSpaceRest::Policy.new(c)
+        end
+        colls
+      end
+
+    end
+  end
+end

data/lib/dspacerest/collection.rb

@@ -6,7 +6,7 @@ module DSpaceRest
 
     attr_reader :id, :handle, :type, :link, :parent_community,
                 :parent_community_list, :items,
-                :number_iems, :sub_communities, :collections, :expand
+                :number_items, :expand
 
     def initialize args
       @id = args['id']
@@ -15,38 +15,47 @@ module DSpaceRest
       @type = args['type']
       @link = args['link']
       @logo = args['logo']
-      @parent_community = args['parentCommunity']
-      @parent_community_list = args['parentCommunityList']
-      @items = args['items']
       @license = args['license']
       @copyright_text = args['copyrightText']
       @introductory_text = args['introductoryText']
       @short_description = args['shortDescription']
       @sidebar_text = args['sidebarText']
-      @number_items = args['countItems']
+      @number_items = args['numberItems']
       @expand = args['expand']
+
+      @parent_community = DSpaceRest::Community.new(args['parentCommunity']) unless args['parentCommunity'].nil?
+      @parent_community_list = DSpaceRest::Builders::ModelBuilder.build_communities(args['parentCommunityList'])
+      @items = DSpaceRest::Builders::ModelBuilder.build_items(args['items'])
     end
 
     def to_h
-      h = Hash.new
-      h["id"] = @id
-      h["name"] = @name
-      h["handle"] = @handle
-      h["type"] = @type
-      h["link"] = @link
-      h["logo"] = @logo
-      h["parentCommunity"] = @parent_community
-      h["parentCommunityList"] = @parent_community_list
-      h["items"] = @items
-      h["license"] = @license
-      h["copyrightText"] = @copyright_text
-      h["introductoryText"] = @introductory_text
-      h["shortDescription"] = @short_description
-      h["sidebarText"] = @sidebar_text
-      h["numberItems"] = @number_items
-      h["expand"] = @expand
+      h = {
+          id: @id,
+          name: @name,
+          handle: @handle,
+          type: @type,
+          link: @link,
+          logo: @logo,
+          parentCommunity: @parent_community,
+          parentCommunitList: @parent_community_list,
+          items: obj2hash(@items),
+          license: @license,
+          copyrightText: @copyright_text,
+          introductoryText: @introductory_text,
+          shortDescription: @short_description,
+          sidebarText: @sidebar_text,
+          numberItems: @number_items,
+          expand: @expand
+      }
+
       h
     end
 
+    private
+
+    def obj2hash(list)
+      DSpaceRest::Builders::HashBuilder.models2hash list
+    end
+
   end
-end
+end

data/lib/dspacerest/community.rb

@@ -14,36 +14,44 @@ module DSpaceRest
       @type = args['type']
       @link = args['link']
       @logo = args['logo']
-      @parent_community = args['parentCommunity']
+      @parent_community = DSpaceRest::Community.new(args['parentCommunity']) unless args['parentCommunity'].nil?
       @copyright_text = args['copyrightText']
       @introductory_text = args['introductoryText']
       @short_description = args['shortDescription']
       @sidebar_text = args['sidebarText']
       @count_items = args['countItems']
-      @sub_communities = args['subcommunities']
-      @collections = args['collections']
+      @sub_communities = DSpaceRest::Builders::ModelBuilder.build_communities(args['subcommunities'])
+      @collections = DSpaceRest::Builders::ModelBuilder.build_collections(args['collections'])
       @expand = args['expand']
     end
 
     def to_h
-      h = Hash.new
-      h["handle"] = @handle
-      h["name"] = @name
-      h["id"] = @id
-      h["type"] = @type
-      h["link"] = @link
-      h["logo"] = @logo
-      h["parentCommunity"] = @parent_community
-      h["copyrightText"] = @copyright_text
-      h["introductoryText"] = @introductory_text
-      h["shortDescription"] = @short_description
-      h["sidebarText"] = @sidebar_text
-      h["countItems"] = @count_items
-      h["subcommunities"] = @sub_communities
-      h["collections"] = @collections
-      h["expand"] = @expand
+      h = {
+          id: @id,
+          name: @name,
+          handle: @handle,
+          type: @type,
+          link: @link,
+          logo: @logo,
+          parentCommunity: @parent_community,
+          subcommunities: obj2hash(@sub_communities),
+          collections: obj2hash(@collections),
+          copyrightText: @copyright_text,
+          introductoryText: @introductory_text,
+          shortDescription: @short_description,
+          sidebarText: @sidebar_text,
+          countItems: @count_items,
+          expand: @expand
+      }
+
       h
     end
 
+    private
+
+    def obj2hash(list)
+      DSpaceRest::Builders::HashBuilder.models2hash list
+    end
+
   end
 end

data/lib/dspacerest/item.rb

@@ -5,46 +5,44 @@ module DSpaceRest
 
     attr_accessor :name, :archived, :withdrawn
 
-    attr_reader :id, :handle, :type, :link, :last_modified,
-                :parent_collection, :parent_collection_list, :bit_streams,
+    attr_reader :id, :handle, :type, :link, :last_modified, :parent_collection,
+                :parent_collection_list, :parent_community_list, :bit_streams,
                 :expand, :metadata
 
     def initialize args
-      @id = args['id'] || ""
-      @name = args['name'] || ""
-      @handle = args['handle'] || ""
-      @type = args['type'] || ""
-      @link = args['link'] || ""
-      @last_modified = args['lastModified'] || ""
-      @parent_collection = args['parentCollection'] || ""
-      @parent_collection_list = args['parentCollectionList'] || ""
-      @parent_community_list = args['parentCommunityList'] || ""
-      @bit_streams = args['bitstreams'] || ""
-      @archived = args['archived'] || ""
-      @withdrawn = args['withdrawn'] || ""
-      @expand = args['expand'] || ""
-      @metadata = []
+      @id = args['id']
+      @name = args['name']
+      @handle = args['handle']
+      @type = args['type']
+      @link = args['link']
+      @last_modified = args['lastModified']
+      @parent_collection = DSpaceRest::Collection.new(args['parentCollection']) unless args['parentCollection'].nil?
+      @parent_collection_list = DSpaceRest::Builders::ModelBuilder.build_collections(args['parentCollectionList'])
+      @parent_community_list = DSpaceRest::Builders::ModelBuilder.build_communities(args['parentCommunityList'])
+      @bit_streams = DSpaceRest::Builders::ModelBuilder.build_bitstreams(args['bitstreams'])
+      @archived = args['archived']
+      @withdrawn = args['withdrawn']
+      @expand = args['expand']
+      @metadata = DSpaceRest::Builders::ModelBuilder.build_metadatas(args['metadata'])
     end
 
     def to_h
-      h = Hash.new
-      h["id"] = @id
-      h["name"] = @name
-      h["handle"] = @handle
-      h["type"] = @type
-      h["link"] = @link
-      h["lastModified"] = @last_modified
-      h["parentCollection"] = @parent_collection
-      h["parentCollectionList"] = @parent_collection_list
-      h["parentCommunityList"] = @parent_community_list
-      h["bitstreams"] = @bit_streams
-      h["archived"] = @archived
-      h["withdrawn"] = @withdrawn
-      h["expand"] = @expand
-
-      if !@metadata.empty?
-        h["metadata"] = metadata2hash @metadata
-      end
+      h = {
+          id: @id,
+          name: @name,
+          handle: @handle,
+          type: @type,
+          link: @link,
+          lastModified: @last_modified,
+          parentCollection: @parent_collection.to_h,
+          parentCollectionList: obj2hash(@parent_collection_list),
+          parentCommunityList: obj2hash(@parent_community_list),
+          bitstreams: obj2hash(@bit_streams),
+          archived: @archived,
+          withdrawn: @withdrawn,
+          expand: @expand,
+          metadata: obj2hash(@metadata)
+      }
 
       h
     end
@@ -65,14 +63,9 @@ module DSpaceRest
 
     private
 
-    def metadata2hash(metadata)
-      hash = []
-      @metadata.each do |m|
-        hash << m.to_h
-      end
-
-      hash
+    def obj2hash(list)
+      DSpaceRest::Builders::HashBuilder.models2hash list
     end
 
   end
-end
+end

data/lib/dspacerest/metadata.rb

@@ -6,11 +6,11 @@ module DSpaceRest
     def initialize args
       @key = args['key']
       @value = args['value']
-      @language = args['language']
+      @language = args['language'] || nil
     end
 
     def to_h
-      return {"key" => @key, "value" => @value, "language" => @language}
+      {key: @key, value: @value, language: @language}
     end
 
   end

data/lib/dspacerest/policy.rb

@@ -0,0 +1,41 @@
+module DSpaceRest
+  class Policy
+
+    attr_reader :id, :action, :eperson_id, :group_id,
+                :resource_id, :resource_type, :rp_description,
+                :rp_name, :rp_type, :start_date, :end_date
+
+    def initialize args
+      @id = args['id']
+      @action = args['action']
+      @eperson_id = args['epersonId']
+      @group_id = args['groupId']
+      @resource_id = args['resourceId']
+      @resource_type = args['resourceType']
+      @rp_description = args['rpDescription']
+      @rp_name = args['rpName']
+      @rp_type = args['rpType']
+      @start_date = args['startDate']
+      @end_date = args['endDate']
+    end
+
+    def to_h
+      h = {
+          id: @id,
+          action: @action,
+          epersonId: @eperson_id,
+          groupId: @group_id,
+          resourceId: @resource_id,
+          resourceType: @resource_type,
+          rpDescription: @rp_description,
+          rpName: @rp_name,
+          rpType: @rp_type,
+          startDate: @start_date,
+          endDate: @end_date
+      }
+      
+      h
+    end
+
+  end
+end

data/lib/dspacerest/repositories/abstract_repository.rb

@@ -1,12 +1,20 @@
-module DSpaceRest
-  module Repositories
-    class AbstractRepository
-      attr_reader :rest_client
-
-      def initialize(rest_client)
-        @rest_client = rest_client
-      end
-
-    end
-  end
+module DSpaceRest
+  module Repositories
+    class AbstractRepository
+      attr_reader :rest_client
+
+      def initialize(rest_client)
+        @rest_client = rest_client
+      end
+
+      protected
+
+      def build_expand_uri(expand = nil)
+        if expandable_properties.include? expand
+          "expand=#{expand}"
+        end
+      end
+
+    end
+  end
 end

data/lib/dspacerest/repositories/bitstream_repository.rb

@@ -1,49 +1,58 @@
-module DSpaceRest
-  module Repositories
-    class BitstreamRepository < AbstractRepository
-
-      # Bitstreams are files. They have a filename, size (in bytes), and a file format.
-      # Typically in DSpace, the Bitstream will the "full text" article, or some other media.
-      # Some files are the actual file that was uploaded (tagged with bundleName:ORIGINAL),
-      # others are DSpace-generated files that are derivatives or renditions, such as text-extraction, or thumbnails.
-      # You can download files/bitstreams.
-      # DSpace doesn't really limit the type of files that it takes in, so this could be PDF, JPG, audio, video, zip,
-      # or other.
-      # Also, the logo for a Collection or a Community, is also a Bitstream.
-
-      # √ GET /bitstreams - Return all bitstreams in DSpace.
-      # √ GET /bitstreams/{bitstream id} - Return bitstream.
-      # GET /bitstreams/{bitstream id}/policy - Return bitstream policies.
-      # √ GET /bitstreams/{bitstream id}/retrieve - Return data of bitstream.
-      # POST /bitstreams/{bitstream id}/policy - Add policy to item. You must post a ResourcePolicy
-      # PUT /bitstreams/{bitstream id}/data - Update data/file of bitstream. You must put the data
-      # √ PUT /bitstreams/{bitstream id} - Update metadata of bitstream. You must put a Bitstream, does not alter the file/data
-      # DELETE /bitstreams/{bitstream id} - Delete bitstream from DSpace.
-      # DELETE /bitstreams/{bitstream id}/policy/{policy_id} - Delete bitstream policy.
-
-      def get_bitstream_by_id(id)
-        response = rest_client["/bitstreams/#{id}"].get
-        DSpaceRest::Bitstream.new(JSON.parse(response))
-      end
-
-      def get_all_bitstreams
-        response = rest_client["/bitstreams"].get
-        bit_streams = []
-        JSON.parse(response).each do |bits|
-          bit_streams << DSpaceRest::Bitstream.new(bits)
-        end
-        bit_streams
-      end
-
-      def retrieve_data(bitstream)
-        response = rest_client["/bitstreams/#{bitstream.id}/retrieve"].get
-      end
-
-      def update(bitstream)
-        valid_keys=['name', 'description', 'sequenceId']
-        form = JSON.generate(bitstream.to_h.select { |k, v| valid_keys.include? k })
-        response = rest_client["/bitstreams/#{bitstream.id}"].put form
-      end
-    end
-  end
+module DSpaceRest
+  module Repositories
+    class BitstreamRepository < AbstractRepository
+
+      # Bitstreams are files. They have a filename, size (in bytes), and a file format.
+      # Typically in DSpace, the Bitstream will the "full text" article, or some other media.
+      # Some files are the actual file that was uploaded (tagged with bundleName:ORIGINAL),
+      # others are DSpace-generated files that are derivatives or renditions, such as text-extraction, or thumbnails.
+      # You can download files/bitstreams.
+      # DSpace doesn't really limit the type of files that it takes in, so this could be PDF, JPG, audio, video, zip,
+      # or other.
+      # Also, the logo for a Collection or a Community, is also a Bitstream.
+
+      # √ GET /bitstreams - Return all bitstreams in DSpace.
+      # √ GET /bitstreams/{bitstream id} - Return bitstream.
+      # GET /bitstreams/{bitstream id}/policy - Return bitstream policies.
+      # √ GET /bitstreams/{bitstream id}/retrieve - Return data of bitstream.
+      # POST /bitstreams/{bitstream id}/policy - Add policy to item. You must post a ResourcePolicy
+      # PUT /bitstreams/{bitstream id}/data - Update data/file of bitstream. You must put the data
+      # √ PUT /bitstreams/{bitstream id} - Update metadata of bitstream. You must put a Bitstream, does not alter the file/data
+      # DELETE /bitstreams/{bitstream id} - Delete bitstream from DSpace.
+      # DELETE /bitstreams/{bitstream id}/policy/{policy_id} - Delete bitstream policy.
+
+      def get_bitstream_by_id(id, expand = nil)
+        expand_uri = build_expand_uri(expand)
+        response = rest_client["/bitstreams/#{id}?#{expand_uri}"].get
+        DSpaceRest::Bitstream.new(JSON.parse(response))
+      end
+
+      def get_all_bitstreams(expand = nil)
+        expand_uri = build_expand_uri(expand)
+        response = rest_client["/bitstreams?#{expand_uri}"].get
+        bit_streams = []
+        JSON.parse(response).each do |bits|
+          bit_streams << DSpaceRest::Bitstream.new(bits)
+        end
+        bit_streams
+      end
+
+      def retrieve_data(bitstream)
+        response = rest_client["/bitstreams/#{bitstream.id}/retrieve"].get
+      end
+
+      def update(bitstream)
+        valid_keys=['name', 'description', 'sequenceId']
+        form = JSON.generate(bitstream.to_h.select { |k, v| valid_keys.include? k })
+        response = rest_client["/bitstreams/#{bitstream.id}"].put form
+      end
+
+      private
+
+      def expandable_properties
+        ["parent","policies","all"]
+      end
+
+    end
+  end
 end

data/lib/dspacerest/repositories/collection_repository.rb

@@ -1,64 +1,73 @@
-module DSpaceRest
-  module Repositories
-    class CollectionRepository < AbstractRepository
-      # Collections in DSpace are containers of Items
-
-      # √ GET /communities/{communityId}/collections - Returns array of collections of community.
-      # √ GET /collections - Return all collections of DSpace in array.
-      # √ GET /collections/{collectionId} - Return collection with id.
-      # √ GET /collections/{collectionId}/items - Return all items of collection.
-      # √ POST /communities/{communityId}/collections - Create new collections in community. You must post Collection.
-      # √ POST /collections/{collectionId}/items - Create posted item in collection. You must post an Item
-      # POST /collections/find-collection - Find collection by passed name.
-      # PUT /collections/{collectionId} - Update collection. You must put Collection.
-      # DELETE /collections/{collectionId} - Delete collection from DSpace.
-      # DELETE /collections/{collectionId}/items/{itemId} - Delete item in collection.
-      # DELETE /communities/{communityId}/collections/{collectionId} - Delete collection in community.
-
-      def get_collection_items(collection)
-        response = rest_client["/collections/#{collection.id}/items"].get
-        items = []
-        JSON.parse(response).each do |item|
-          items << DSpaceRest::Item.new(item)
-        end
-        items
-      end
-
-      def get_collection_by_id(id)
-        response = rest_client["/collections/#{id}"].get
-        DSpaceRest::Collection.new(JSON.parse(response))
-      end
-
-      def get_all_collections
-        response = rest_client["/collections"].get
-        collections = []
-        JSON.parse(response).each do |coll|
-          collections << DSpaceRest::Collection.new(coll)
-        end
-        collections
-      end
-
-      def get_collections_of(community)
-        response = rest_client["/communities/#{community.id}/collections"].get
-        collections = []
-        JSON.parse(response).each do |coll|
-          collections << DSpaceRest::Collection.new(coll)
-        end
-        collections
-      end
-
-      def create_collection_for(community, collection)
-        form = JSON.generate(collection.to_h)
-        response = rest_client["/communities/#{community.id}/collections"].post form
-        DSpaceRest::Collection.new(JSON.parse(response))
-      end
-
-      def create_item_for(collection, item)
-        form = JSON.generate({"metadata" => item.to_h["metadata"]})
-        response = rest_client["/collections/#{collection.id}/items"].post form
-        DSpaceRest::Item.new(JSON.parse(response))
-      end
-
-    end
-  end
+module DSpaceRest
+  module Repositories
+    class CollectionRepository < AbstractRepository
+      # Collections in DSpace are containers of Items
+
+      # √ GET /communities/{communityId}/collections - Returns array of collections of community.
+      # √ GET /collections - Return all collections of DSpace in array.
+      # √ GET /collections/{collectionId} - Return collection with id.
+      # √ GET /collections/{collectionId}/items - Return all items of collection.
+      # √ POST /communities/{communityId}/collections - Create new collections in community. You must post Collection.
+      # √ POST /collections/{collectionId}/items - Create posted item in collection. You must post an Item
+      # POST /collections/find-collection - Find collection by passed name.
+      # PUT /collections/{collectionId} - Update collection. You must put Collection.
+      # DELETE /collections/{collectionId} - Delete collection from DSpace.
+      # DELETE /collections/{collectionId}/items/{itemId} - Delete item in collection.
+      # DELETE /communities/{communityId}/collections/{collectionId} - Delete collection in community.
+
+      def get_collection_items(collection)
+        response = rest_client["/collections/#{collection.id}/items"].get
+        items = []
+        JSON.parse(response).each do |item|
+          items << DSpaceRest::Item.new(item)
+        end
+        items
+      end
+
+      def get_collection_by_id(id, expand = nil)
+        expand_uri = build_expand_uri(expand)
+        response = rest_client["/collections/#{id}?#{expand_uri}"].get
+        DSpaceRest::Collection.new(JSON.parse(response))
+      end
+
+      def get_all_collections(expand = nil)
+        expand_uri = build_expand_uri(expand)
+        response = rest_client["/collections?#{expand_uri}"].get
+        collections = []
+        JSON.parse(response).each do |coll|
+          collections << DSpaceRest::Collection.new(coll)
+        end
+        collections
+      end
+
+      def get_collections_of(community, expand = nil)
+        expand_uri = build_expand_uri(expand)
+        response = rest_client["/communities/#{community.id}/collections?#{expand_uri}"].get
+        collections = []
+        JSON.parse(response).each do |coll|
+          collections << DSpaceRest::Collection.new(coll)
+        end
+        collections
+      end
+
+      def create_collection_for(community, collection)
+        form = JSON.generate(collection.to_h)
+        response = rest_client["/communities/#{community.id}/collections"].post form
+        DSpaceRest::Collection.new(JSON.parse(response))
+      end
+
+      def create_item_for(collection, item)
+        form = JSON.generate({"metadata" => item.to_h["metadata"]})
+        response = rest_client["/collections/#{collection.id}/items"].post form
+        DSpaceRest::Item.new(JSON.parse(response))
+      end
+
+      private
+
+      def expandable_properties
+        ["parentCommunityList","parentCommunity","items","license","logo","all"]
+      end
+
+    end
+  end
 end

data/lib/dspacerest/repositories/community_repository.rb

@@ -1,62 +1,72 @@
-module DSpaceRest
-  module Repositories
-    class CommunityRepository < AbstractRepository
-      # Communities in DSpace are used for organization and hierarchy, and are containers that hold sub-Communities and Collections.
-
-      # √ GET /communities - Returns array of all communities in DSpace.
-      # √ GET /communities/top-communities - Returns array of all top communities in DSpace
-      # √ GET /communities/{communityId} - Returns community
-      # √ GET /communities/{communityId}/communities - Returns array of subcommunities of community.
-      # √ POST /communities - Create new community at top level. You must post community.
-      # √ POST /communities/{communityId}/communities - Create new subcommunity in community. You must post Community.
-      # PUT /communities/{communityId} - Update community. You must put Community
-      # DELETE /communities/{communityId} - Delete community.
-      # DELETE /communities/{communityId}/communities/{communityId2} - Delete subcommunity in community.
-
-      def get_community_by_id(id)
-        response = rest_client["/communities/#{id}"].get
-        DSpaceRest::Community.new(JSON.parse(response))
-      end
-
-      def get_all_communities
-        response = rest_client["/communities"].get
-        communities = []
-        JSON.parse(response).each do |comm|
-          communities << DSpaceRest::Community.new(comm)
-        end
-        communities
-      end
-
-      def get_top_communities
-        response = rest_client["/communities/top-communities"].get
-        communities = []
-        JSON.parse(response).each do |comm|
-          communities << DSpaceRest::Community.new(comm)
-        end
-        communities
-      end
-
-      def get_subcommunities_of(community)
-        response = rest_client["/communities/#{community.id}/communities"].get
-        communities = []
-        JSON.parse(response).each do |comm|
-          communities << DSpaceRest::Community.new(comm)
-        end
-        communities
-      end
-
-      def create_community(community)
-        form = JSON.generate(community.to_h)
-        response = rest_client["/communities"].post form
-      end
-
-      def create_subcommunity_of(community, subcommunity)
-        form = JSON.generate(subcommunity.to_h)
-        response = rest_client["/communities/#{community.id}/communities"].post form
-
-        DSpaceRest::Community.new(JSON.parse(response))
-      end
-
-    end
-  end
+module DSpaceRest
+  module Repositories
+    class CommunityRepository < AbstractRepository
+      # Communities in DSpace are used for organization and hierarchy, and are containers that hold sub-Communities and Collections.
+
+      # √ GET /communities - Returns array of all communities in DSpace.
+      # √ GET /communities/top-communities - Returns array of all top communities in DSpace
+      # √ GET /communities/{communityId} - Returns community
+      # √ GET /communities/{communityId}/communities - Returns array of subcommunities of community.
+      # √ POST /communities - Create new community at top level. You must post community.
+      # √ POST /communities/{communityId}/communities - Create new subcommunity in community. You must post Community.
+      # PUT /communities/{communityId} - Update community. You must put Community
+      # DELETE /communities/{communityId} - Delete community.
+      # DELETE /communities/{communityId}/communities/{communityId2} - Delete subcommunity in community.
+
+      def get_community_by_id(id, expand = nil)
+        expand_uri = build_expand_uri(expand)
+        response = rest_client["/communities/#{id}?#{expand_uri}"].get
+        DSpaceRest::Community.new(JSON.parse(response))
+      end
+
+      def get_all_communities(expand = nil)
+        expand_uri = build_expand_uri(expand)
+        response = rest_client["/communities?#{expand_uri}"].get
+        communities = []
+        JSON.parse(response).each do |comm|
+          communities << DSpaceRest::Community.new(comm)
+        end
+        communities
+      end
+
+      def get_top_communities(expand = nil)
+        expand_uri = build_expand_uri(expand)
+        response = rest_client["/communities/top-communities?#{expand_uri}"].get
+        communities = []
+        JSON.parse(response).each do |comm|
+          communities << DSpaceRest::Community.new(comm)
+        end
+        communities
+      end
+
+      def get_subcommunities_of(community, expand = nil)
+        expand_uri = build_expand_uri(expand)
+        response = rest_client["/communities/#{community.id}/communities?#{expand_uri}"].get
+        communities = []
+        JSON.parse(response).each do |comm|
+          communities << DSpaceRest::Community.new(comm)
+        end
+        communities
+      end
+
+      def create_community(community)
+        form = JSON.generate(community.to_h)
+        response = rest_client["/communities"].post form
+      end
+
+      def create_subcommunity_of(community, subcommunity)
+        form = JSON.generate(subcommunity.to_h)
+        response = rest_client["/communities/#{community.id}/communities"].post form
+
+        DSpaceRest::Community.new(JSON.parse(response))
+      end
+
+      private
+
+      def expandable_properties
+        ["parentCommunity","collections","subCommunities","logo","all"]
+      end
+
+    end
+  end
 end

data/lib/dspacerest/repositories/dspace_repository.rb

@@ -1,27 +1,27 @@
-module DSpaceRest
-  module Repositories
-    class DspaceRepository < AbstractRepository
-
-      def bitstream_repository
-        BitstreamRepository.new rest_client
-      end
-
-      def collection_repository
-        CollectionRepository.new rest_client
-      end
-
-      def community_repository
-        CommunityRepository.new rest_client
-      end
-
-      def item_repository
-        ItemRepository.new rest_client
-      end
-
-      def metadata_repository
-        MetadataRepository.new rest_client
-      end
-
-    end
-  end
+module DSpaceRest
+  module Repositories
+    class DspaceRepository < AbstractRepository
+
+      def bitstream_repository
+        BitstreamRepository.new rest_client
+      end
+
+      def collection_repository
+        CollectionRepository.new rest_client
+      end
+
+      def community_repository
+        CommunityRepository.new rest_client
+      end
+
+      def item_repository
+        ItemRepository.new rest_client
+      end
+
+      def metadata_repository
+        MetadataRepository.new rest_client
+      end
+
+    end
+  end
 end

data/lib/dspacerest/repositories/item_repository.rb

@@ -1,68 +1,76 @@
-module DSpaceRest
-  module Repositories
-    class ItemRepository < AbstractRepository
-      # Items in DSpace represent a "work" and combine metadata and files, known as Bitstreams
-
-      # √ GET /items - Return list of items.
-      # √ GET /items/{item id} - Return item.
-      # √ GET /items/{item id}/metadata - Return item metadata.
-      # √ GET /items/{item id}/bitstreams - Return item bitstreams.
-      # POST /items/find-by-metadata-field - Find items by metadata entry. You must post a MetadataEntry.  DS-2501 - wrong SQL in REST /items/find-by-metadata-field CLOSED
-      # √ POST /items/{item id}/metadata - Add metadata to item. You must post an array of MetadataEntry
-      # √ POST /items/{item id}/bitstreams - Add bitstream to item. You must post a Bitstream
-      # √ PUT /items/{item id}/metadata - Update metadata in item. You must put a MetadataEntry
-      # √ DELETE /items/{item id} - Delete item.
-      # DELETE /items/{item id}/metadata - Clear item metadata.
-      # DELETE /items/{item id}/bitstreams/{bitstream id} - Delete item bitstream.
-
-
-      def get_all_items
-        response = rest_client["/items"].get
-        items = []
-        JSON.parse(response).each do |item|
-          items << DSpaceRest::Item.new(item)
-        end
-        items
-      end
-
-      def get_item_by_id(id)
-        response = rest_client["/items/#{id}"].get
-        DSpaceRest::Item.new(JSON.parse(response))
-      end
-
-      def get_metadata_of(item)
-        response = rest_client["/items/#{item.id}/metadata"].get
-        metadata = []
-        JSON.parse(response).each do |m|
-          metadata << DSpaceRest::Metadata.new(m)
-        end
-        metadata
-      end
-
-      def get_bitstreams_of(item)
-        response = rest_client["/items/#{item.id}/bitstreams"].get
-        bitstreams = []
-        JSON.parse(response).each do |bits|
-          bitstreams << DSpaceRest::Bitstream.new(bits)
-        end
-        bitstreams
-      end
-
-
-      def create_metadata_for(item)
-        form = JSON.generate(self.to_h["metadata"])
-        response = rest_client["/items/#{item.id}/metadata"].put form
-      end
-
-      def create_bitstream_for(item, file, upload_strategy)
-        response = upload_strategy.upload("/items/#{item.id}/bitstreams", file)
-        DSpaceRest::Bitstream.new(JSON.parse(response))
-      end
-
-      def delete(item)
-        response = rest_client["/items/#{item.id}"].delete
-      end
-
-    end
-  end
+module DSpaceRest
+  module Repositories
+    class ItemRepository < AbstractRepository
+      # Items in DSpace represent a "work" and combine metadata and files, known as Bitstreams
+
+      # √ GET /items - Return list of items.
+      # √ GET /items/{item id} - Return item.
+      # √ GET /items/{item id}/metadata - Return item metadata.
+      # √ GET /items/{item id}/bitstreams - Return item bitstreams.
+      # POST /items/find-by-metadata-field - Find items by metadata entry. You must post a MetadataEntry.  DS-2501 - wrong SQL in REST /items/find-by-metadata-field CLOSED
+      # √ POST /items/{item id}/metadata - Add metadata to item. You must post an array of MetadataEntry
+      # √ POST /items/{item id}/bitstreams - Add bitstream to item. You must post a Bitstream
+      # √ PUT /items/{item id}/metadata - Update metadata in item. You must put a MetadataEntry
+      # √ DELETE /items/{item id} - Delete item.
+      # DELETE /items/{item id}/metadata - Clear item metadata.
+      # DELETE /items/{item id}/bitstreams/{bitstream id} - Delete item bitstream.
+
+
+      def get_all_items(expand = nil)
+        expand_uri = build_expand_uri(expand)
+        response = rest_client["/items?#{expand_uri}"].get
+        items = []
+        JSON.parse(response).each do |item|
+          items << DSpaceRest::Item.new(item)
+        end
+        items
+      end
+
+      def get_item_by_id(id, expand = nil)
+        expand_uri = build_expand_uri(expand)
+        response = rest_client["/items/#{id}?#{expand_uri}"].get
+        DSpaceRest::Item.new(JSON.parse(response))
+      end
+
+      def get_metadata_of(item)
+        response = rest_client["/items/#{item.id}/metadata"].get
+        metadata = []
+        JSON.parse(response).each do |m|
+          metadata << DSpaceRest::Metadata.new(m)
+        end
+        metadata
+      end
+
+      def get_bitstreams_of(item)
+        response = rest_client["/items/#{item.id}/bitstreams"].get
+        bitstreams = []
+        JSON.parse(response).each do |bits|
+          bitstreams << DSpaceRest::Bitstream.new(bits)
+        end
+        bitstreams
+      end
+
+
+      def create_metadata_for(item)
+        form = JSON.generate(self.to_h["metadata"])
+        response = rest_client["/items/#{item.id}/metadata"].put form
+      end
+
+      def create_bitstream_for(item, file, upload_strategy)
+        response = upload_strategy.upload("/items/#{item.id}/bitstreams", file)
+        DSpaceRest::Bitstream.new(JSON.parse(response))
+      end
+
+      def delete(item)
+        response = rest_client["/items/#{item.id}"].delete
+      end
+
+      private
+
+      def expandable_properties
+        ["metadata","parentCollection","parentCollectionList","parentCommunityList","bitstreams","all"]
+      end
+
+    end
+  end
 end

data/lib/dspacerest/strategies/uploads/curl_strategy.rb

@@ -1,27 +1,27 @@
-#require 'curl'
-
-module DSpaceRest
-  module Strategies
-    module Uploads
-      class CurlStrategy
-
-        def initialize(host_url, token)
-          @host_url = host_url
-          @token = token
-        end
-
-        def upload(endpoint, file)
-          c = Curl::Easy.new(@host_url.concat(endpoint))
-          c.headers['Accept'] = 'application/json'
-          c.headers['rest-dspace-token'] = @token
-
-          c.multipart_form_post = true
-          c.ssl_verify_peer = false
-          c.http_post(Curl::PostField.file('file', file))
-
-          c.body_str
-        end
-      end
-    end
-  end
+#require 'curl'
+
+module DSpaceRest
+  module Strategies
+    module Uploads
+      class CurlStrategy
+
+        def initialize(host_url, token)
+          @host_url = host_url
+          @token = token
+        end
+
+        def upload(endpoint, file)
+          c = Curl::Easy.new(@host_url.concat(endpoint))
+          c.headers['Accept'] = 'application/json'
+          c.headers['rest-dspace-token'] = @token
+
+          c.multipart_form_post = true
+          c.ssl_verify_peer = false
+          c.http_post(Curl::PostField.file('file', file))
+
+          c.body_str
+        end
+      end
+    end
+  end
 end

data/lib/dspacerest/strategies/uploads/rest_strategy.rb

@@ -1,17 +1,17 @@
-module DSpaceRest
-  module Strategies
-    module Uploads
-      class RestStrategy
-
-        def initialize(rest_client)
-          @rest_client = rest_client
-        end
-
-        def upload(endpoint, file)
-          @rest_client[endpoint].post File.read(file)
-        end
-
-      end
-    end
-  end
+module DSpaceRest
+  module Strategies
+    module Uploads
+      class RestStrategy
+
+        def initialize(rest_client)
+          @rest_client = rest_client
+        end
+
+        def upload(endpoint, file)
+          @rest_client[endpoint].post File.read(file)
+        end
+
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dspace_rest_client
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Mauricio Giacomini Girardello
@@ -55,10 +55,13 @@ files:
 - lib/dspace_client.rb
 - lib/dspace_rest_client.rb
 - lib/dspacerest/bitstream.rb
+- lib/dspacerest/builders/hash_builder.rb
+- lib/dspacerest/builders/model_builder.rb
 - lib/dspacerest/collection.rb
 - lib/dspacerest/community.rb
 - lib/dspacerest/item.rb
 - lib/dspacerest/metadata.rb
+- lib/dspacerest/policy.rb
 - lib/dspacerest/repositories/abstract_repository.rb
 - lib/dspacerest/repositories/bitstream_repository.rb
 - lib/dspacerest/repositories/collection_repository.rb