mms-api 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f46973360a5bc90648f5db16ed68f2a715df24f
-  data.tar.gz: 87a3cdbe52ea77dd5b1778d8df9318a2b34734e6
+  metadata.gz: 50ef9789119c25dc3d0061bd092475344eb30d4a
+  data.tar.gz: f85fb48393f03e4485984a27c0d04ca814397214
 SHA512:
-  metadata.gz: 34e98f586c2a03de4ea3260a11f22fba361e93407de77f740f0f12b5c2a79144befb8ed1343ccff7143f3fed09238fd048c4415d7915a69115bb14ca4be823b1
-  data.tar.gz: 2cbf2343574237b3814aae43a47815591d0b5cf773da2555ceb08271b4836cb50442c437b1a38b9a5af6f76b1589b6be88e73d7c92bc4abfb61eea1a7f26b2e5
+  metadata.gz: ba8ca38b105d5de0948607a673d4f6bb293982013f9b569dee5fc692c79c58d6831cc6b16557b6404c34ead8088aa830c21e096a8e426b18820706ef4d88e165
+  data.tar.gz: 1a8b3bb28a32f6c74a63d76a1cc4c413ed37cf56de64237f9e2207d3ed527cbd6b2ed51a374ef3c62489d5ced642f26be08b33617a3e7d106c7bf6fbc4a8ed32

data/lib/mms/cli.rb

@@ -68,12 +68,11 @@ module MMS
             raise MMS::ConfigError.new("Config option `#{key}` from file `#{config_file}` is not allowed!")
           end
         end
-
       end
 
       # @return [MMS::Agent]
       def agent
-        @client = MMS::Client.new(@config.username, @config.apikey)
+        @client = MMS::Client.new(@config.username, @config.apikey, @config.apiurl)
         @agent = MMS::Agent.new(client)
       end
 

data/lib/mms/client.rb

@@ -18,59 +18,26 @@ module MMS
     # @param [String] path
     # @return [Hash]
     def get(path)
-      _get(@url + path, @username, @apikey)
+      _request(Net::HTTP::Get, @url + path, @username, @apikey, nil)
     end
 
     # @param [String] path
     # @param [Hash] data
     # @return [Hash]
     def post(path, data)
-      _post(@url + path, data, @username, @apikey)
+      _request(Net::HTTP::Post, @url + path, @username, @apikey, data)
     end
 
     private
 
+    # @param [Net::HTTPRequest] http_method
     # @param [String] path
     # @param [String] username
     # @param [String] password
-    def _get(path, username, password)
-
-      digest_auth = Net::HTTP::DigestAuth.new
-      digest_auth.next_nonce
-
-      uri = URI.parse path
-      uri.user= CGI.escape(username)
-      uri.password= CGI.escape(password)
-
-      http = Net::HTTP.new(uri.host, uri.port)
-      http.use_ssl = true
-
-      req = Net::HTTP::Get.new uri.request_uri
-      res = http.request req
-
-      auth = digest_auth.auth_header uri, res['WWW-Authenticate'], 'GET'
-      req = Net::HTTP::Get.new uri.request_uri
-      req.add_field 'Authorization', auth
-
-      response = http.request(req)
-      response_json = JSON.parse(response.body)
-
-      unless response.code == 200 or response_json['error'].nil?
-        msg = "http 'get' error for url `#{url}`"
-        msg = response_json['detail'] unless response_json['detail'].nil?
-
-        raise MMS::AuthError.new(msg, req, response) if response.code == '401'
-        raise MMS::ApiError.new(msg, req, response)
-      end
-
-      (response_json.nil? or response_json['results'].nil?) ? response_json : response_json['results']
-    end
-
-    # @param [String] path
     # @param [Hash] data
-    # @param [String] username
-    # @param [String] password
-    def _post(path, data, username, password)
+    # @return [Hash]
+    def _request(http_method, path, username, password, data = nil)
+
       digest_auth = Net::HTTP::DigestAuth.new
       digest_auth.next_nonce
 
@@ -79,13 +46,15 @@ module MMS
       uri.password= CGI.escape(password)
 
       http = Net::HTTP.new uri.host, uri.port
-      http.use_ssl = true
+      http.use_ssl = (uri.scheme == 'https')
 
-      req = Net::HTTP::Post.new uri.request_uri, {'Content-Type' => 'application/json'}
+      req = http_method.new(uri.request_uri, {'Content-Type' => 'application/json'})
       res = http.request req
 
-      auth = digest_auth.auth_header uri, res['WWW-Authenticate'], 'POST'
-      req = Net::HTTP::Post.new uri.request_uri, {'Content-Type' => 'application/json'}
+      raise 'Invalid method' unless http_method.kind_of? Class and http_method < Net::HTTPRequest
+      req = http_method.new(uri.request_uri, {'Content-Type' => 'application/json'})
+      method_name = http_method.name.split('::').last.upcase
+      auth = digest_auth.auth_header(uri, res['WWW-Authenticate'], method_name)
       req.add_field 'Authorization', auth
       req.body = data.to_json
 

data/lib/mms/version.rb

@@ -1,3 +1,3 @@
 module MMS
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mms-api
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Cargo Media
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-17 00:00:00.000000000 Z
+date: 2015-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-http-digest_auth