dpn-client 1.3.1 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55ea45ebadcb8d3e8af3c0a8597ec31f8bb49f23
-  data.tar.gz: ad3e2f35e5572ece674d8cb48c3e1adae5a3903c
+  metadata.gz: 29bc947b3dc7eae26d526bf33466eff74b1faace
+  data.tar.gz: 717644a7872c356e8b578d7d79fd7d8897554806
 SHA512:
-  metadata.gz: df13b7da524edb3e8bf7fd7e1d4b34ac4eef89b7d012b24d59c7b33e889afae7dbcc5e79809a13e94497670545ae3344cf613cef3ee103c5394f51db86d1aee0
-  data.tar.gz: d70510caeb2651423862d6a895b097a7cbc8fcbb312e733cf0b4505030f0d0a8afd5952cc59e3f7f0bc4ea26bf9e6c29b619d52ff7351166cdcc8ff28a0f1f51
+  metadata.gz: 12a3cfcb42b6114c6725d0516609fe635d9ce63f4319265a383a516f21e14f5784e5fbc09d0c226c353abb9916dc45a388775108142f4f782a2d48a360d22166
+  data.tar.gz: 32783328da098a1acc306abb002e5c71ea8405b380b342e0953383a682a0dee6d54b75b566a1bdd3f33893c484e32c5f5489ed2461be89c942e1e267cb6f725d

data/.gitignore

@@ -1,6 +1,9 @@
 # Ignore bundler config.
 /.bundle
 
+# Ignore gem packages
+/pkg
+
 # Ignore the default SQLite database.
 /db/*.sqlite3
 /db/*.sqlite3-journal

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    dpn-client (1.3.1)
-      httpclient (~> 2.6.0.1)
+    dpn-client (2.0.1)
+      httpclient (~> 2.8.0)
 
 GEM
   remote: https://rubygems.org/
@@ -10,12 +10,21 @@ GEM
     addressable (2.3.8)
     codeclimate-test-reporter (0.4.8)
       simplecov (>= 0.7.1, < 1.0.0)
+    coderay (1.1.0)
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
     diff-lcs (1.2.5)
     docile (1.1.5)
-    httpclient (2.6.0.1)
+    httpclient (2.8.2.4)
     json (1.8.3)
+    method_source (0.8.2)
+    pry (0.10.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    pry-doc (0.8.0)
+      pry (~> 0.9)
+      yard (~> 0.8)
     rake (10.4.2)
     rspec (3.3.0)
       rspec-core (~> 3.3.0)
@@ -36,6 +45,7 @@ GEM
       json (~> 1.8)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
+    slop (3.6.0)
     webmock (1.21.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
@@ -48,10 +58,12 @@ DEPENDENCIES
   bundler (~> 1.10)
   codeclimate-test-reporter
   dpn-client!
+  pry
+  pry-doc
   rake (~> 10.0)
   rspec
   webmock
   yard
 
 BUNDLED WITH
-   1.11.2
+   1.12.5

data/README.md

@@ -9,8 +9,7 @@
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'dpn-client', :git => 'https://github.com/dpn-admin/dpn-client.git'
-
+gem 'dpn-client'
 ```
 
 And then execute:

data/dpn-client.gemspec

@@ -24,9 +24,11 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "httpclient", "~> 2.6.0.1"
+  spec.add_runtime_dependency "httpclient", "~> 2.8.0"
 
   spec.add_development_dependency "bundler", "~> 1.10"
+  spec.add_development_dependency "pry"
+  spec.add_development_dependency "pry-doc"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "yard"

data/lib/dpn/client/agent.rb

@@ -5,10 +5,14 @@
 
 require "dpn/client/agent/configuration"
 require "dpn/client/agent/connection"
-require "dpn/client/agent/node"
 require "dpn/client/agent/bag"
-require "dpn/client/agent/replicate"
+require "dpn/client/agent/digest"
+require "dpn/client/agent/fixity_check"
+require "dpn/client/agent/ingest"
 require "dpn/client/agent/member"
+require "dpn/client/agent/node"
+require "dpn/client/agent/replicate"
+require "dpn/client/agent/restore"
 
 module DPN
   module Client
@@ -16,10 +20,14 @@ module DPN
       include DPN::Client::Agent::Configuration
       include DPN::Client::Agent::Connection
 
-      include DPN::Client::Agent::Node
       include DPN::Client::Agent::Bag
-      include DPN::Client::Agent::Replicate
+      include DPN::Client::Agent::Digest
+      include DPN::Client::Agent::FixityCheck
+      include DPN::Client::Agent::Ingest
       include DPN::Client::Agent::Member
+      include DPN::Client::Agent::Node
+      include DPN::Client::Agent::Replicate
+      include DPN::Client::Agent::Restore
 
       def initialize(options = {})
         self.configure(options)

data/lib/dpn/client/agent/bag.rb

@@ -15,40 +15,28 @@ module DPN
         #   before this date.
         # @option options [DateTime String] :after (nil) Include only entries last modified
         #   after this date.
+        # @option options [String] :bag_type (nil) One of 'D', 'R', 'I', for data, rights, and
+        #   interpretive, respectively.
         # @option options [String] :admin_node (nil) Namespace of the admin_node of the bag.
+        # @option options [String] :ingest_node (nil) Namespace of the ingest_node of the bag.
         # @option options [String] :member (nil) The UUID of the member that owns or is vested
         #   in this bag.
-        # @option options [String] :bag_type (nil) One of 'D', 'R', 'I', for data, rights, and
-        #   interpretive, respectively.
-        # @yield [Response] Optional block to process individual bag.
-        # @return [Array<Hash>] Array of all bag data. Generated and returned
-        #   only if no block is passed.
+        # @option options [String] :first_version_uuid (nil) UUIDv4 of the bag's first version.
+        # @option options [Array<String>] :replicated_by ([]) Namespaces of replicating nodes; the
+        #  result is the UNION of these filters.
+        # @yield [Response] Block to process each individual bag.
+        #   @see Connection#paginate
         def bags(options = {page_size: 25}, &block)
-          [:after, :before].each do |date_field|
-            if options[date_field].is_a?(DateTime)
-              options[date_field] = options[:date_field].new_offset(0).strftime(DPN::Client.time_format)
-            end
-          end
-
-          return paginate_each "/bag/", options, options[:page_size], &block
+          paginate_each "/bag/", options, options[:page_size], &block
         end
 
 
-        # @overload bag(uuid, &block)
-        #   Get a specific bag
-        #   @param [String] uuid UUID of the bag.
-        #   @yield [Response]
-        #   @return [Response]
-        # @overload bag(options)
-        #   Alias for #bags
-        #   @return [Array<Hash>]
-        #   @see #bags
-        def bag(uuid = nil, options = {page_size: 25}, &block)
-          if uuid
-            get "/bag/#{uuid}/", nil, &block
-          else
-            bags(options, &block)
-          end
+        # Get a specific bag
+        # @param [String] uuid UUID of the bag.
+        # @yield [Response]
+        # @return [Response]
+        def bag(uuid, &block)
+          get "/bag/#{uuid}/", nil, &block
         end
 
 
@@ -57,7 +45,7 @@ module DPN
         # @yield [Response]
         # @return [Response]
         def create_bag(bag, &block)
-          post "/bag", bag, &block
+          post "/bag/", bag, &block
         end
 
 

data/lib/dpn/client/agent/configuration.rb

@@ -26,6 +26,13 @@ module DPN
                       :per_page, :user_agent
         attr_writer :logger
 
+        def api_ver
+          @api_ver ||= "api-v#{DPN::Client.api_version}"
+        end
+
+        def base_url
+          @api_root
+        end
 
         # Apply the options hash to the configuration
         def configure(options_hash = {})
@@ -50,9 +57,6 @@ module DPN
         end
         alias_method  :setup, :reset
 
-        def base_url
-          File.join(@api_root, "api-v#{DPN::Client.api_version}")
-        end
 
         def logger
           @logger ||= NullLogger.new
@@ -77,4 +81,4 @@ module DPN
       end
     end
   end
-end
+end

data/lib/dpn/client/agent/connection.rb

@@ -57,7 +57,7 @@ module DPN
         end
 
 
-        # Make a one or more GET requests, fetching the next
+        # Make one or more GET requests, fetching the next
         # page of results one page at a time, so long as the
         # response indicates there is another page.
         # @param url [String] The path, relative to base_url
@@ -73,6 +73,12 @@ module DPN
           query ||= {}
           query = query.merge({ :page_size => page_size, :page => 1})
 
+          [:after, :before].each do |date_field|
+            if query[date_field].is_a?(DateTime)
+              query[date_field] = query[:date_field].new_offset(0).strftime(DPN::Client.time_format)
+            end
+          end
+
           response = get(url, query) # pass an empty block so we can call the block manually on :results
           yield response
           while response.success? && response[:next] && response[:results].empty? == false
@@ -93,15 +99,16 @@ module DPN
         # @param page_size [Fixnum] The number of results to request
         #   from each page.
         # @yield [Response] Mandatory block that takes each individual
-        #   result wrapped in a response object as a parameter.  If a
-        #   request is unsuccessful, the failed response is yielded.
+        #   result wrapped in a response object as a parameter.  Should
+        #   a request receive an error, the error will be wrapped in
+        #   a response object and yielded.
         def paginate_each(url, query, page_size, &block)
-          raise ArgumentError, "Must pass a block" unless block_given?
+          raise ArgumentError, "Block required" unless block_given?
           paginate(url, query, (page_size || 25)) do |response|
             if response.success?
               logger.info("Response has #{response[:results].size} results.")
               response[:results].each do |result|
-                  yield Response.from_data(response.status, result)
+                yield Response.from_data(response.status, result)
               end
             else
               yield response
@@ -112,6 +119,18 @@ module DPN
 
         protected
 
+        def connection
+          @connection ||= ::HTTPClient.new({
+              agent_name: user_agent,
+              base_url: base_url,
+              default_header: {
+                  "Content-Type" => "application/json",
+                  "Authorization" => "Token #{auth_token}"
+              },
+              force_basic_auth: true
+          })
+        end
+
         def request(method, url, query, body, &block)
           url, extra_query = parse_url(url)
           query ||= {}
@@ -120,50 +139,32 @@ module DPN
               body: body.to_json,
               follow_redirect: true
           }
-
-          logger.info("Sending #{method.upcase}: #{File.join(base_url, fix_url(url))} #{options} ")
-          raw_response = connection.request method, fix_url(url), options
+          logger.info("Sending #{method.upcase}: #{File.join(base_url, url)} #{options} ")
+          raw_response = connection.request method, url, options
           logger.debug("Received #{raw_response.inspect}")
           response = DPN::Client::Response.new(raw_response)
           logger.info("Received #{response.status}")
           if block_given?
             yield response
           end
-
-          return response
+          response
         end
 
-
         def parse_url(raw_url)
           url, query = raw_url.split("?", 2)
-          url = File.join url, ""
-          if query
-            query = URI::decode_www_form(query).to_h
-          else
-            query = {}
-          end
-          return url, query
-        end
-
-
-        def connection
-          @connection ||= ::HTTPClient.new({
-              agent_name: user_agent,
-              base_url: base_url,
-              default_header: {
-                  "Content-Type" => "application/json",
-                  "Authorization" => "Token #{auth_token}"
-              },
-              force_basic_auth: true
-          })
+          query = if query
+                    URI.decode_www_form(query).to_h
+                  else
+                    {}
+                  end
+          return fix_url(url), query
         end
 
-
         def fix_url(url)
-          File.join url, "/"
+          url = File.join(api_ver, url) unless url.include?(api_ver)
+          File.join "/", url, "/"
         end
 
-
         # Convert array values to csv
         # Only goes one level deep.
         # @param [Hash] hash
@@ -180,4 +181,4 @@ module DPN
       end
     end
   end
-end
+end

data/lib/dpn/client/agent/digest.rb

@@ -0,0 +1,60 @@
+# Copyright (c) 2015 The Regents of the University of Michigan.
+# All Rights Reserved.
+# Licensed according to the terms of the Revised BSD License
+# See LICENSE.md for details.
+
+module DPN
+  module Client
+    class Agent
+
+      # Operations on the digest resource.
+      module Digest
+
+        # Get the digests index
+        # @param [Hash] options
+        # @option options [Fixnum] :page_size (25) Number of results per page
+        # @option options [DateTime String] :before (nil) Include only entries last modified
+        #   before this date.
+        # @option options [DateTime String] :after (nil) Include only entries last modified
+        #   after this date.
+        # @yield [Response] Block to process each individual result.
+        def digests(options = {page_size: 25}, &block)
+          paginate_each "/digest/", options, options[:page_size], &block
+        end
+
+
+        # Get the digests for a specific bag
+        # @option options [Fixnum] :page_size (25) Number of results per page
+        # @option options [DateTime String] :before (nil) Include only entries last modified
+        #   before this date.
+        # @option options [DateTime String] :after (nil) Include only entries last modified
+        #   after this date.
+        # @yield [Response] Block to process each individual result.
+        def bag_digests(bag, options = {page_size: 25}, &block)
+          paginate_each "/bag/#{bag}/digest/", options, options[:page_size], &block
+        end
+
+
+        # Get a specific digest
+        # @param [String] bag UUIDv4 of the bag.
+        # @param [String] algorithm Name of the algorithm.
+        # @yield [Response] Optional block to process the response.
+        # @return [Response]
+        def digest(bag, algorithm, &block)
+          get "/bag/#{bag}/digest/#{algorithm}/", nil, &block
+        end
+
+
+        # Create a digest
+        # @param [Hash] digest Body of the digest
+        # @yield [Response]
+        # @return [Response]
+        def create_digest(digest, &block)
+          post "/bag/#{digest[:bag]}/digest/", digest, &block
+        end
+
+      end
+
+    end
+  end
+end

data/lib/dpn/client/agent/fixity_check.rb

@@ -0,0 +1,41 @@
+# Copyright (c) 2015 The Regents of the University of Michigan.
+# All Rights Reserved.
+# Licensed according to the terms of the Revised BSD License
+# See LICENSE.md for details.
+
+module DPN
+  module Client
+    class Agent
+
+      # Operations on the fixity_check resource.
+      module FixityCheck
+
+        # Get the fixity_check index
+        # @param [Hash] options
+        # @option options [Fixnum] :page_size (25) Number of results per page
+        # @option options [DateTime String] :before (nil) Include only entries last modified
+        #   before this date.
+        # @option options [DateTime String] :after (nil) Include only entries last modified
+        #   after this date.
+        # @option options [String] bag (nil) Filter by a specific bag's UUID.
+        # @option options [Boolean] latest (false) Request latest results only.
+        # @option options [String] :node (nil) Namespace of the node.
+        # @yield [Response] Block to process each individual result.
+        def fixity_checks(options = {page_size: 25}, &block)
+          paginate_each "/fixity_check/", options, options[:page_size], &block
+        end
+
+
+        # Create a fixity_check
+        # @param [Hash] fixity_check Body of the fixity_check
+        # @yield [Response]
+        # @return [Response]
+        def create_fixity_check(fixity_check, &block)
+          post "/fixity_check/", fixity_check, &block
+        end
+
+      end
+
+    end
+  end
+end

data/lib/dpn/client/agent/ingest.rb

@@ -0,0 +1,42 @@
+# Copyright (c) 2015 The Regents of the University of Michigan.
+# All Rights Reserved.
+# Licensed according to the terms of the Revised BSD License
+# See LICENSE.md for details.
+
+module DPN
+  module Client
+    class Agent
+
+      # Operations on the ingest resource.
+      module Ingest
+
+        # Get the ingest index
+        # @param [Hash] options
+        # @option options [Fixnum] :page_size (25) Number of results per page
+        # @option options [DateTime String] :before (nil) Include only entries last modified
+        #   before this date.
+        # @option options [DateTime String] :after (nil) Include only entries last modified
+        #   after this date.
+        # @option options [String] bag (nil) Filter by a specific bag's UUID.
+        # @option options [Boolean] latest (false) Request latest results only.
+        # @option options [Boolean] ingested (nil) Filter by value of the ingested field.
+        # @option options [String] :node (nil) Namespace of the node.
+        # @yield [Response] Block to process each individual result.
+        def ingests(options = {page_size: 25}, &block)
+          paginate_each "/ingest/", options, options[:page_size], &block
+        end
+
+
+        # Create a ingest
+        # @param [Hash] ingest Body of the ingest
+        # @yield [Response]
+        # @return [Response]
+        def create_ingest(ingest, &block)
+          post "/ingest/", ingest, &block
+        end
+
+      end
+
+    end
+  end
+end

data/lib/dpn/client/agent/member.rb

@@ -13,29 +13,41 @@ module DPN
         # Get the members index
         # @param [Hash] options
         # @option options [Fixnum] :page_size (25) Number of members per page
-        # @yield [Response] Optional block to process each individual member.
-        # @return [Array<Hash>] Array of all member data. Generated and returned
-        #   only if no block is passed.
+        # @option options [DateTime String] :before (nil) Include only entries last modified
+        #   before this date.
+        # @option options [DateTime String] :after (nil) Include only entries last modified
+        #   after this date.
+        # @yield [Response] Block to process each individual member.
         def members(options = {page_size: 25}, &block)
-          return paginate_each "/member/", options, options[:page_size], &block
+          paginate_each "/member/", options, options[:page_size], &block
         end
 
 
-        # @overload member(uuid, &block)
-        #   Get a specific member
-        #   @param [String] uuid UUIDv4 of the member.
-        #   @yield [Response] Optional block to process the response.
-        #   @return [Response]
-        # @overload member(options, &block)
-        #   Alias for #members
-        #   @return [Array<Hash>]
-        #   @see #members
-        def member(uuid = nil, options = {page_size: 25}, &block)
-          if uuid
-            get "/member/#{fix_uuid(uuid)}/", nil, &block
-          else
-            members(options, &block)
-          end
+        # Get a specific member
+        # @param [String] member_id UUIDv4 of the member.
+        # @yield [Response] Optional block to process the response.
+        # @return [Response]
+        def member(member_id, &block)
+          get "/member/#{member_id}/", nil, &block
+        end
+
+
+        # Get a member's bags
+        # @param [String] member_id The specific member's member_id
+        # @param [Hash] options
+        # @option options [Fixnum] :page_size (25) Number of entries per page
+        # @option options [DateTime String] :before (nil) Include only entries last modified
+        #   before this date.
+        # @option options [DateTime String] :after (nil) Include only entries last modified
+        #   after this date.
+        # @option options [String] :admin_node (nil) Namespace of the admin_node of the bag.
+        # @option options [String] :bag_type (nil) One of 'D', 'R', 'I', for data, rights, and
+        #   interpretive, respectively.
+        # @yield [Response] Optional block to process individual bag.
+        # @return [Array<Hash>] Array of all bag data. Generated and returned
+        #   only if no block is passed.
+        def member_bags(member_id, options = {page_size: 25}, &block)
+          paginate_each "/member/#{member_id}/bags/", options, options[:page_size], &block
         end
 
 
@@ -53,34 +65,19 @@ module DPN
         # @yield [Response]
         # @return [Response]
         def update_member(member, &block)
-          put "/member/#{fix_uuid(member[:uuid])}/", member, &block
+          put "/member/#{member[:member_id]}/", member, &block
         end
 
 
         # Delete a member
-        # @param [String] uuid UUIDv4 of the member.
+        # @param [String] member_id UUIDv4 of the member.
         # @yield [Response]
         # @return [Response]
-        def delete_member(uuid, &block)
-          delete "/member/#{fix_uuid(uuid)}/", &block
+        def delete_member(member_id, &block)
+          delete "/member/#{member_id}/", &block
         end
 
 
-        private
-        # Add dashes to a uuid if they are missing
-        def fix_uuid(uuid)
-          if uuid && uuid.size == 32
-            unless uuid.include?("-")
-              uuid.insert(8, "-")   # 9th, 14th, 19th and 24th
-              uuid.insert(13, "-")
-              uuid.insert(18, "-")
-              uuid.insert(23, "-")
-            end
-          end
-          uuid.downcase
-        end
-        
-
       end
 
     end

data/lib/dpn/client/agent/node.rb

@@ -10,41 +10,12 @@ module DPN
       # Operations on the node resource.
       module Node
 
-        # Get the nodes index
-        # @param [Hash] options
-        # @option options [Fixnum] :page_size (25) Number of nodes per page
-        # @yield [Response] Optional block to process each individual node.
-        # @return [Array<Hash>] Array of all node data. Generated and returned
-        #   only if no block is passed.
-        def nodes(options = {page_size: 25}, &block)
-          return paginate_each "/node/", options, options[:page_size], &block
-        end
-
-
-        # @overload node(namespace, &block)
-        #   Get a specific node
-        #   @param [String] namespace Namespace of the node.
-        #   @yield [Response] Optional block to process the response.
-        #   @return [Response]
-        # @overload node(options, &block)
-        #   Alias for #nodes
-        #   @return [Array<Hash>]
-        #   @see #nodes
-        def node(namespace = nil, options = {page_size: 25}, &block)
-          if namespace
-            get "/node/#{namespace}/", nil, &block
-          else
-            nodes(options, &block)
-          end
-        end
-
-
-        # Create a node
-        # @param [Hash] node Body of the node
-        # @yield [Response]
+        # Get a specific node
+        # @param [String] namespace Namespace of the node.
+        # @yield [Response] Optional block to process the response.
         # @return [Response]
-        def create_node(node, &block)
-          post "/node/", node, &block
+        def node(namespace, &block)
+          get "/node/#{namespace}/", nil, &block
         end
 
 
@@ -57,14 +28,6 @@ module DPN
         end
 
 
-        # Delete a node
-        # @param [String] namespace Namespace of the node.
-        # @yield [Response]
-        # @return [Response]
-        def delete_node(namespace, &block)
-          delete "/node/#{namespace}/", &block
-        end
-
       end
     end
   end

data/lib/dpn/client/agent/replicate.rb

@@ -11,25 +11,20 @@ module DPN
         # Get the replication request index
         # @param [Hash] options
         # @option options [Fixnum] :page_size (25) Number of entries per page
-        # @option options [DateTime,String] :after (nil) Include only entries last modified
-        #   after this date.  Takes a properly formatted string, or a datetime.
-        # @option options [String] uuid (nil) Filter by a specific bag's UUID.
-        # @option options [String] status (nil) Filter by status.
-        # @option options [Boolean] fixity_accept (nil) Filter by the value of fixity_accept.
-        # @option options [Boolean] bag_valid (nil) Filter by the value of bag_valid.
-        # @option options [String] :from_node (nil) Namespace of the from_node of the bag.
+        # @option options [DateTime String] :before (nil) Include only entries last modified
+        #   before this date.
+        # @option options [DateTime String] :after (nil) Include only entries last modified
+        #   after this date.
+        # @option options [String] bag (nil) Filter by a specific bag's UUID.
         # @option options [String] :to_node (nil) Namespace of the to_node of the bag.
-        # @option options [String] :order_by (nil) Comma-separated list of strings to order the
-        #   result by.  Accepted values are 'created_at' and 'updated_at'
-        # @yield [Response] Optional block to process each individual replication.
-        # @return [Array<Hash>] Array of all replication data. Generated and returned
-        #   only if no block is passed.
+        # @option options [String] :from_node (nil) Namespace of the from_node of the bag.
+        # @option options [Boolean] store_requested (nil) Filter by the value of store_requested.
+        # @option options [Boolean] stored (nil) Filter by the value of stored.
+        # @option options [Boolean] cancelled (nil) Filter by the value of cancelled.
+        # @option options [String] cancel_reason (nil) Filter by cancel_reason.
+        # @yield [Response] Block to process each individual replication.
         def replications(options = {page_size: 25}, &block)
-          if options[:after].is_a?(DateTime)
-            options[:after] = options[:after].new_offset(0).strftime(DPN::Client.time_format)
-          end
-
-          return paginate_each "/replicate/", options, options[:page_size], &block
+          paginate_each "/replicate/", options, options[:page_size], &block
         end
 
 
@@ -42,12 +37,14 @@ module DPN
         #   Alias for #replications
         #   @return [Array<Hash>]
         #   @see #replications
-        def replicate(replication_id = nil, options = {page_size: 25}, &block)
-          if replication_id
-            get "/replicate/#{replication_id}/", nil, &block
-          else
-            replications(options, &block)
-          end
+        def replicate(replication_id, &block)
+          get "/replicate/#{replication_id}/", nil, &block
+        end
+
+
+        # Alias of #replicate
+        def replication(replication_id, &block)
+          replicate replication_id, &block
         end
 
 
@@ -56,7 +53,7 @@ module DPN
         # @yield [Response]
         # @return [Response]
         def create_replication(request, &block)
-          post "/replicate", request, &block
+          post "/replicate/", request, &block
         end
 
 
@@ -68,15 +65,6 @@ module DPN
           put "/replicate/#{request[:replication_id]}/", request, &block
         end
 
-
-        # Delete a replication request
-        # @param [String] replication_id The replication_id of the replication request
-        # @yield [Response]
-        # @return [Response]
-        def delete_replication(replication_id, &block)
-          delete "/replicate/#{replication_id}/", &block
-        end
-
       end
     end
   end

data/lib/dpn/client/agent/restore.rb

@@ -0,0 +1,60 @@
+# Copyright (c) 2015 The Regents of the University of Michigan.
+# All Rights Reserved.
+# Licensed according to the terms of the Revised BSD License
+# See LICENSE.md for details.
+
+module DPN
+  module Client
+    class Agent
+      module Restore
+
+        # Get the restore request index
+        # @param [Hash] options
+        # @option options [Fixnum] :page_size (25) Number of entries per page
+        # @option options [DateTime String] :before (nil) Include only entries last modified
+        #   before this date.
+        # @option options [DateTime String] :after (nil) Include only entries last modified
+        #   after this date.
+        # @option options [String] bag (nil) Filter by a specific bag's UUID.
+        # @option options [String] :to_node (nil) Namespace of the to_node of the bag.
+        # @option options [String] :from_node (nil) Namespace of the from_node of the bag.
+        # @option options [Boolean] accepted (nil) Filter by the value of accepted.
+        # @option options [Boolean] finished (nil) Filter by the value of finished.
+        # @option options [Boolean] cancelled (nil) Filter by the value of cancelled.
+        # @option options [String] cancel_reason (nil) Filter by cancel_reason.
+        # @yield [Response] Block to process each individual result.
+        def restores(options = {page_size: 25}, &block)
+          paginate_each "/restore/", options, options[:page_size], &block
+        end
+
+
+        # Get a specific restore request.
+        # @param [String] restore_id
+        # @yield [Response]
+        # @return [Response]
+        def restore(restore_id, &block)
+          get "/restore/#{restore_id}/", nil, &block
+        end
+
+
+        # Create a restore request
+        # @param [Hash] request Body of the restore request
+        # @yield [Response]
+        # @return [Response]
+        def create_restore(request, &block)
+          post "/restore/", request, &block
+        end
+
+
+        # Update a restore request
+        # @param [Hash] request Body of the restore request
+        # @yield [Response]
+        # @return [Response]
+        def update_restore(request, &block)
+          put "/restore/#{request[:restore_id]}/", request, &block
+        end
+
+      end
+    end
+  end
+end

data/lib/dpn/client/response.rb

@@ -24,8 +24,6 @@ module DPN
         self.new.load_from_data!(status, body)
       end
 
-      attr_reader :status, :body
-
 
       def json
         @cached_json ||= @body.to_json
@@ -83,4 +81,4 @@ module DPN
 
     end
   end
-end
+end

data/lib/dpn/client/version.rb

@@ -5,6 +5,6 @@
 
 module DPN
   module Client
-    VERSION = "1.3.1"
+    VERSION = "2.0.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dpn-client
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 2.0.1
 platform: ruby
 authors:
 - Bryan Hockey
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-12 00:00:00.000000000 Z
+date: 2016-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.0.1
+        version: 2.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.0.1
+        version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +38,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-doc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -129,9 +157,13 @@ files:
 - lib/dpn/client/agent/bag.rb
 - lib/dpn/client/agent/configuration.rb
 - lib/dpn/client/agent/connection.rb
+- lib/dpn/client/agent/digest.rb
+- lib/dpn/client/agent/fixity_check.rb
+- lib/dpn/client/agent/ingest.rb
 - lib/dpn/client/agent/member.rb
 - lib/dpn/client/agent/node.rb
 - lib/dpn/client/agent/replicate.rb
+- lib/dpn/client/agent/restore.rb
 - lib/dpn/client/response.rb
 - lib/dpn/client/version.rb
 homepage: https://github.com/dpn-admin/dpn-client