dspace_rest_client 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b65cfc43168775fd85926964857e02e80a2cec24
-  data.tar.gz: 4d6f01213f641e1a2a6cc16903830430236d6f86
+  metadata.gz: b2f83ca04d0ba0ceac01dbb9427a9a1aa7b777dd
+  data.tar.gz: 404728373c56cacdd8face45b875f50aebe5dfeb
 SHA512:
-  metadata.gz: 0c7c4bd22023e60896e8813f219a9b9f1f75b6548f1ac4c5f60f448818ce10f6eeac029001bcd4b947e834dfdded3bfc814b562cb3f77de66d338eb59f4b9301
-  data.tar.gz: 385b1ea18d80c5ebee0ddcd4397d81d7e031316ad4bf2d7c60e3a152aa2f30350594284550ad6d795f59c84c7b015e9fc9231944c125e3a0ad20401d0f09182b
+  metadata.gz: 8667ed334ae8f31aa0ca970243235a839e2bf184af32aed1b5759c8ced3a5fdb0e62ad983cbf96cf05c8d1f54ff02cce2a2e3ccd20aa028bf061f4772df58820
+  data.tar.gz: 8a5b6e03db7f815060913e6e93533d6a328a96ba72f46ac8b8bb2973cdddf1aea135c25e896a79a6a5798beac808938da1c267f9cc7fcc78d3551f627ef73ffd

data/lib/dspace_client.rb

@@ -1,64 +1,64 @@
-require 'rest-client'
-
-class DspaceClient
-  attr_reader :rest_client, :url
-
-  def initialize(url, authenticated_token = nil)
-    @url = url
-
-    if (authenticated_token.nil?)
-      @rest_client = build_rest_client url
-    else
-      @rest_client = build_rest_client url, rest_dspace_token: authenticated_token
-    end
-  end
-
-  def repository
-    @dspace_repository ||= build_repository @rest_client
-  end
-
-  def login(username, password)
-    user = JSON.generate({
-                             email: username,
-                             password: password
-                         })
-
-    # send login request to server and receive the token
-    authenticated_token = @rest_client['/login'].post user
-
-    # overwrite the rest_client and dspace_repository
-    @rest_client = build_rest_client @url, rest_dspace_token: authenticated_token
-    @dspace_repository = build_repository @rest_client
-
-    authenticated_token
-  end
-
-  def logout
-    response = JSON.parse @rest_client['/logout'].post []
-  end
-
-  def status
-    response = JSON.parse @rest_client['/status'].get
-  end
-
-  def test
-    response = JSON.parse(@rest_client['/test'].get)
-  end
-
-  private
-
-  def build_repository(rest_client)
-    DSpaceRest::Repositories::DspaceRepository.new rest_client
-  end
-
-  def build_rest_client(url, headers={})
-    RestClient::Resource.new(url,
-                             verify_ssl: OpenSSL::SSL::VERIFY_NONE,
-                             headers: headers.merge(
-                                 content_type: :json,
-                                 accept: :json
-                             )
-    )
-  end
-
-end
+require 'rest-client'
+
+class DspaceClient
+  attr_reader :rest_client, :url
+
+  def initialize(url, authenticated_token = nil)
+    @url = url
+
+    if (authenticated_token.nil?)
+      @rest_client = build_rest_client url
+    else
+      @rest_client = build_rest_client url, rest_dspace_token: authenticated_token
+    end
+  end
+
+  def repository
+    @dspace_repository ||= build_repository @rest_client
+  end
+
+  def login(username, password)
+    user = JSON.generate({
+                             email: username,
+                             password: password
+                         })
+
+    # send login request to server and receive the token
+    authenticated_token = @rest_client['/login'].post user
+
+    # overwrite the rest_client and dspace_repository
+    @rest_client = build_rest_client @url, rest_dspace_token: authenticated_token
+    @dspace_repository = build_repository @rest_client
+
+    authenticated_token
+  end
+
+  def logout
+    response = JSON.parse @rest_client['/logout'].post []
+  end
+
+  def status
+    response = JSON.parse @rest_client['/status'].get
+  end
+
+  def test
+    response = JSON.parse(@rest_client['/test'].get)
+  end
+
+  private
+
+  def build_repository(rest_client)
+    DSpaceRest::Repositories::DspaceRepository.new rest_client
+  end
+
+  def build_rest_client(url, headers={})
+    RestClient::Resource.new(url,
+                             verify_ssl: OpenSSL::SSL::VERIFY_NONE,
+                             headers: headers.merge(
+                                 content_type: :json,
+                                 accept: :json
+                             )
+    )
+  end
+
+end

data/lib/dspace_rest_client.rb

@@ -1,17 +1,17 @@
-# More logical way to require 'dspace-rest-client'
-require File.dirname(__FILE__) + '/dspace_client'
-require File.dirname(__FILE__) + '/dspacerest/bitstream'
-require File.dirname(__FILE__) + '/dspacerest/collection'
-require File.dirname(__FILE__) + '/dspacerest/community'
-require File.dirname(__FILE__) + '/dspacerest/item'
-require File.dirname(__FILE__) + '/dspacerest/metadata'
-require File.dirname(__FILE__) + '/dspacerest/repositories/abstract_repository'
-require File.dirname(__FILE__) + '/dspacerest/repositories/bitstream_repository'
-require File.dirname(__FILE__) + '/dspacerest/repositories/collection_repository'
-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/builders/hash_builder'
-require File.dirname(__FILE__) + '/dspacerest/builders/model_builder'
+# More logical way to require 'dspace-rest-client'
+require File.dirname(__FILE__) + '/dspace_client'
+require File.dirname(__FILE__) + '/dspacerest/bitstream'
+require File.dirname(__FILE__) + '/dspacerest/collection'
+require File.dirname(__FILE__) + '/dspacerest/community'
+require File.dirname(__FILE__) + '/dspacerest/item'
+require File.dirname(__FILE__) + '/dspacerest/metadata'
+require File.dirname(__FILE__) + '/dspacerest/repositories/abstract_repository'
+require File.dirname(__FILE__) + '/dspacerest/repositories/bitstream_repository'
+require File.dirname(__FILE__) + '/dspacerest/repositories/collection_repository'
+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/builders/hash_builder'
+require File.dirname(__FILE__) + '/dspacerest/builders/model_builder'

data/lib/dspacerest/bitstream.rb

@@ -1,51 +1,51 @@
-module DSpaceRest
-  class Bitstream
-
-    attr_accessor :name, :bundle_name,
-                  :description, :format, :mime_type
-
-    attr_reader :id, :type, :link, :size_bytes,
-                :parent_object, :retrieve_link, :check_sum,
-                :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 = DSpaceRest::Builders::ModelBuilder.build_policies(args['policies'])
-      @expand = args['expand']
-    end
-
-    def to_h
-      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
+module DSpaceRest
+  class Bitstream
+
+    attr_accessor :name, :bundle_name,
+                  :description, :format, :mime_type
+
+    attr_reader :id, :type, :link, :size_bytes,
+                :parent_object, :retrieve_link, :check_sum,
+                :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 = DSpaceRest::Builders::ModelBuilder.build_policies(args['policies'])
+      @expand = args['expand']
+    end
+
+    def to_h
+      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

@@ -1,16 +1,18 @@
-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
+module DSpaceRest
+  module Builders
+    module HashBuilder
+
+      def self.models2hash(list)
+        hash = []
+        unless list.nil?
+          list.each do |m|
+            hash << m.to_h
+          end
+        end
+
+        hash
+      end
+
+    end
+  end
+end

data/lib/dspacerest/builders/model_builder.rb

@@ -1,61 +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
+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

@@ -1,61 +1,61 @@
-module DSpaceRest
-  class Collection
-
-    attr_accessor :name, :logo, :license, :copyright_text,
-                  :introductory_text, :short_description, :sidebar_text
-
-    attr_reader :id, :handle, :type, :link, :parent_community,
-                :parent_community_list, :items,
-                :number_items, :expand
-
-    def initialize args
-      @id = args['id']
-      @name = args['name']
-      @handle = args['handle']
-      @type = args['type']
-      @link = args['link']
-      @logo = args['logo']
-      @license = args['license']
-      @copyright_text = args['copyrightText']
-      @introductory_text = args['introductoryText']
-      @short_description = args['shortDescription']
-      @sidebar_text = args['sidebarText']
-      @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 = {
-          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
+module DSpaceRest
+  class Collection
+
+    attr_accessor :name, :logo, :license, :copyright_text,
+                  :introductory_text, :short_description, :sidebar_text
+
+    attr_reader :id, :handle, :type, :link, :parent_community,
+                :parent_community_list, :items,
+                :number_items, :expand
+
+    def initialize args
+      @id = args['id']
+      @name = args['name']
+      @handle = args['handle']
+      @type = args['type']
+      @link = args['link']
+      @logo = args['logo']
+      @license = args['license']
+      @copyright_text = args['copyrightText']
+      @introductory_text = args['introductoryText']
+      @short_description = args['shortDescription']
+      @sidebar_text = args['sidebarText']
+      @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 = {
+          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