netstorageapi 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc6268c9d0f13d22e3b612b1532270f921f38a25
-  data.tar.gz: a4d51f394e0f7a370a00a51d13c903b69971042e
+  metadata.gz: 98536983f38afcef837d9ecdab5e5728420e700f
+  data.tar.gz: fb7cb2e986b5ef90f9b275932eeb7903438a6341
 SHA512:
-  metadata.gz: 5fa9b21bcfeee2b9deb1ba475c7c5508aec6602d61af2fd0a306dbcd80822247e10931607a4728f3ffa240803cd7b03c58d7114b26aa01673f03524feb64491b
-  data.tar.gz: fa12031d244fb8583870d0b571cd36db0266145f52d9cbb93188f6d160d419f352b846092737c2591d4063fba70f01c7d971f240c4de6fa2d97f978278b99d95
+  metadata.gz: e5d4b6568b60b88f5477cb76d826e3ab2c6dea3b021042bf449883f3ea3bf7732b90bf1a82d9ae7268ee6667de4e1d4f135bd49bfcc436fd36213ac04f9f74db
+  data.tar.gz: b1b19da5b75668dfc3ee39b553c65eb71b136d02cd6966932933b8ba165a1cb609bf67c32ac59e4ac014ce14d21f52bc4b211ec62782f369402e82308e61b75f

data/lib/akamai/netstorage.rb

@@ -25,11 +25,20 @@ require "uri"
 
 
 module Akamai
+    class NetstorageError < Exception
+        """Base-class for all exceptions raised by Netstorage Class"""
+    end
+
+
     class Netstorage
         attr_accessor :hostname, :keyname, :key, :ssl
         attr_reader :request
 
         def initialize(hostname, keyname, key, ssl=false)
+            if hostname == '' || keyname == '' || key == ''
+                raise NetstorageError, '[NetstorageError] You should input netstorage hostname, keyname and key all'
+            end
+
             @hostname = hostname
             @keyname = keyname
             @key = key
@@ -43,21 +52,24 @@ module Akamai
         def _response(uri, kwargs)
             if kwargs[:action] == "download"
                 local_destination = kwargs[:destination]
-                if kwargs[:path]
-                    ns_filename = kwargs[:path][-1] != '/' ? File.basename(kwargs[:path]) : nil
-                    if local_destination == ''
-                        local_destination = ns_filename
-                    elsif File.directory?(local_destination)
-                        local_destination = File.join(local_destination, ns_filename)
-                    end
+                ns_filename = kwargs[:path][-1] != '/' ? File.basename(kwargs[:path]) : nil
+                if local_destination == ''
+                    local_destination = ns_filename
+                elsif File.directory?(local_destination)
+                    local_destination = File.join(local_destination, ns_filename)
                 end
+                
                 response = Net::HTTP.start(uri.hostname, uri.port, 
                   :use_ssl => uri.scheme == 'https') { |http| 
                     http.request @request do |res|
-                        open(local_destination, "wb") do |io|
-                            res.read_body do |chunk|
-                                io.write chunk
+                        begin
+                            open(local_destination, "wb") do |io|
+                                res.read_body do |chunk|
+                                    io.write chunk
+                                end
                             end
+                        rescue Exception => e
+                            raise NetstorageError, e
                         end
                     end
                 }
@@ -65,7 +77,11 @@ module Akamai
             end
 
             if kwargs[:action] == "upload"
-                @request.body = File.read(kwargs[:source]) 
+                begin
+                    @request.body = File.read(kwargs[:source])
+                rescue Exception => e
+                    raise NetstorageError, e
+                end 
             end 
             
             response = Net::HTTP.start(uri.hostname, uri.port, 
@@ -77,6 +93,11 @@ module Akamai
         end
         
         def _request(kwargs={})
+            path = kwargs[:path].to_s 
+            if !path.start_with?('/')
+                raise NetstorageError, '[NetstorageError] Invalid netstorage path'
+            end
+
             path = URI::escape(kwargs[:path])
             acs_action = "version=1&action=#{kwargs[:action]}"
             acs_auth_data = "5, 0.0.0.0, 0.0.0.0, #{Time.now.to_i}, #{Random.rand(100000)}, #{@keyname}"
@@ -91,7 +112,8 @@ module Akamai
                 'X-Akamai-ACS-Action' => acs_action,
                 'X-Akamai-ACS-Auth-Data' => acs_auth_data,
                 'X-Akamai-ACS-Auth-Sign' => acs_auth_sign,
-                'Accept-Encoding' => "identity"
+                'Accept-Encoding' => 'identity',
+                'User-Agent' => 'NetStorageKit-Ruby'
             }
 
             if kwargs[:method] == "GET"
@@ -177,8 +199,12 @@ module Akamai
         end
 
         def upload(local_source, ns_destination)
-            if File.file?(local_source) && ns_destination[-1] == "/" 
-                ns_destination = "#{ns_destination}#{File.basename(local_source)}"
+            if File.file?(local_source) 
+                if ns_destination[-1] == "/" 
+                    ns_destination = "#{ns_destination}#{File.basename(local_source)}"
+                end
+            else
+                raise NetstorageError, "[NetstorageError] #{ns_destination} doesn't exist or is directory"
             end
             return _request(action: "upload",
                             method: "PUT",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: netstorageapi
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Astin Choi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-14 00:00:00.000000000 Z
+date: 2016-09-19 00:00:00.000000000 Z
 dependencies: []
 description: NetstorageAPI is Akamai Netstorage (File/Object Store) API for Ruby 2.0+
 email: achoi@akamai.com