megam_api 1.6.8 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: acf9806f47fab932ce69e0db128474d8c9f0f182
-  data.tar.gz: dbfc46c378ac00c0170b56e11e7aef94e079a422
+  metadata.gz: 18bbd9e96c718b62b88f6db3596e5271ac932332
+  data.tar.gz: 2a98f3d72705ce5617b4a25bab75ba6284f1af91
 SHA512:
-  metadata.gz: 955ae148705c0df26622687a41681c7874eed2cb4a10b0c4e8e471c136f513513e9a04a635dee6ee1d7a21a75769f44f06bd05bf7ba125759a476f936161ab70
-  data.tar.gz: 03965dbfff7f7d7dd4fdb3e3f680f92b5a14b1fe4a0eb983fbda81bc014ff2908072740073d73badadde7150c7374d52fcdd5c0e882c35527289a734053248b3
+  metadata.gz: 323ea0ed3d5e70e205687c71da0eb67957071e3722f3ecb9b557831572a0bcb30ea3c9dd9ba36fab1cb14486a24de52be213b6cf1ea48bd19219bad948eee6d8
+  data.tar.gz: 25c694febd7b2c4470dfbd6f81e299d16c5caec5edc3d7a5cc0d2471969d0987d4d1ee8b3deb923b0b73ec625d8ba693881a1558c7339600c1220ac8abc6e3ae

data/README.md

@@ -20,7 +20,7 @@ For more implementation details [see nilavu](http://github.com/megamsys/nilavu.g
 
 # License
 
-Apache V2
+MIT
 
 # Author
 

data/lib/megam/api.rb

@@ -93,66 +93,54 @@ require 'megam/core/promos'
 
 module Megam
     class API
-
-        # text is used to print stuff in the terminal (message, log, info, warn etc.)
         attr_accessor :text
+        attr_accessor :email, :api_key, :password_hash, :org_id
+        attr_accessor :api_url, :api_version
+        attr_reader   :last_response
+ 
+        API_VERSION2      = '/v2'.freeze
 
-        API_VERSION2 = '/v2'.freeze
-
-        X_Megam_DATE = 'X-Megam-DATE'.freeze
-        X_Megam_HMAC = 'X-Megam-HMAC'.freeze
-        X_Megam_OTTAI = 'X-Megam-OTTAI'.freeze
-        X_Megam_ORG  = 'X-Megam-ORG'.freeze
+        X_Megam_DATE      = 'X-Megam-DATE'.freeze
+        X_Megam_HMAC      = 'X-Megam-HMAC'.freeze
+        X_Megam_OTTAI     = 'X-Megam-OTTAI'.freeze
+        X_Megam_ORG       = 'X-Megam-ORG'.freeze
         X_Megam_PUTTUSAVI = 'X-Megam-PUTTUSAVI'.freeze
 
         HEADERS = {
-            'Accept' => 'application/json',
+            'Accept'          => 'application/json',
             'Accept-Encoding' => 'gzip',
-            'User-Agent' => "megam-api/#{Megam::API::VERSION}",
-            'X-Ruby-Version' => RUBY_VERSION,
+            'User-Agent'      => "megam-api/#{Megam::API::VERSION}",
+            'X-Ruby-Version'  => RUBY_VERSION,
             'X-Ruby-Platform' => RUBY_PLATFORM
         }
 
         OPTIONS = {
             headers: {},
-            host: '127.0.0.1',
-            nonblock: false,
-            scheme: 'http'
+            nonblock: false
         }
 
-        def text
-            @text ||= Megam::Text.new(STDOUT, STDERR, STDIN, {})
-        end
-
-        attr_reader :last_response
-
-        # It is assumed that every API call will use an API_KEY/email. This ensures validity of the person
-        # really the same guy on who he claims.
-        # 3 levels of options exits
-        # 1. The global OPTIONS as available inside the API (OPTIONS)
-        # 2. The options as passed via the instantiation of API will override global options. The ones that are passed are :email and :api_key and will
-        # be  merged into a class variable @options
-        # 3. Upon merge of the options, the api_key, email as available in the @options is deleted.
         def initialize(options = {})
             @options = OPTIONS.merge(options)
-            @api_key = @options.delete(:api_key) || ENV['MEGAM_API_KEY']
-            @email = @options.delete(:email)
-            @password_hash = @options.delete(:password_hash)
-            @org_id = @options.delete(:org_id)
-            unless !@options.delete(:reset_flag)
-                fail Megam::API::Errors::AuthKeysMissing if (@email.nil? && @api_key.nil?) || (@email.nil? && @password_hash.nil?)
-            end
+            
+            assign_credentials
+            
+            ensure_host_is_flattened
+
+            ensure_authkeys unless is_passthru?
+            
+            turn_off_ssl_verify
+        end
+        
+        
+        def text
+            @text ||= Megam::Text.new(STDOUT, STDERR, STDIN, {})
         end
 
         def request(params, &block)
-
             just_color_debug("#{@options[:path]}")
             start = Time.now
             Megam::Log.debug('START')
-            params.each do |pkey, pvalue|
-                Megam::Log.debug("> #{pkey}: #{pvalue}")
-            end
-
+        
             begin
                 response = connection.request(params, &block)
             rescue Excon::Errors::HTTPStatusError => error
@@ -169,110 +157,131 @@ module Megam
                 end
                 reerror = klass.new(error.message, error.response)
                 reerror.set_backtrace(error.backtrace)
-                Megam::Log.debug("#{reerror.response.body}")
                 reerror.response.body = Megam::JSONCompat.from_json(reerror.response.body.chomp)
-                Megam::Log.debug('RESPONSE ERR: Ruby Object')
-                Megam::Log.debug("#{reerror.response.body}")
                 raise(reerror)
             end
 
             @last_response = response
-            Megam::Log.debug('RESPONSE: HTTP Status and Header Data')
-            Megam::Log.debug("> HTTP #{response.remote_ip} #{response.status}")
-
-            response.headers.each do |header, value|
-                Megam::Log.debug("> #{header}: #{value}")
-            end
-            Megam::Log.debug('End HTTP Status/Header Data.')
-
+            
             if response.body && !response.body.empty?
                 if response.headers['Content-Encoding'] == 'gzip'
-                    Megam::Log.debug('RESPONSE: Content-Encoding is gzip')
                     response.body = Zlib::GzipReader.new(StringIO.new(response.body)).read
                 end
-                Megam::Log.debug('RESPONSE: HTTP Body(JSON)')
-                Megam::Log.debug("#{response.body}")
 
                 begin
                     unless response.headers[X_Megam_OTTAI]
                         response.body = Megam::JSONCompat.from_json(response.body.chomp)
-                        Megam::Log.debug('RESPONSE: Ruby Object')
                     else
                         response.body = Megam::KoniPai.new.koni(response.body.chomp)
-                        Megam::Log.debug('RESPONSE: KoniPai Object ')
                     end
-                    Megam::Log.debug("#{response.body}")
                 rescue Exception => jsonerr
-                    Megam::Log.error(jsonerr)
                     raise(jsonerr)
                 end
             end
+            
             Megam::Log.debug("END(#{(Time.now - start)}s)")
-            # reset (non-persistent) connection
+            
             @connection.reset
             response
         end
 
         private
+        
+        def assign_credentials
+            @api_key       = @options.delete(:api_key) || ENV['MEGAM_API_KEY']
+            @email         = @options.delete(:email)
+            @password_hash = @options.delete(:password_hash)
+            @org_id        = @options.delete(:org_id)
+        end
+        
+        def ensure_host_is_flattened
+            uri          = URI(@options.delete(:host)) if @options.has_key?(:host)
+            
+            scheme       = (uri && uri.scheme) ? uri.scheme : 'http'
+    
+            host         = (uri && uri.host)   ? uri.host : '127.0.0.1'
+            
+            port         = (uri && uri.port)   ? uri.port.to_s : '9000'
+            
+            @api_version = (uri && uri.path)   ? uri.path :  API_VERSION2
+            
+            @api_url     =  scheme +  "://" + host  + ":" + port + @api_version
+        end
+        
+        def is_passthru?
+            @options[:passthru]
+        end    
+        
+        def ensure_authkeys
+            if api_combo_missing? && pw_combo_missing?
+                fail Megam::API::Errors::AuthKeysMissing 
+            end
+        end
+        
+        def api_combo_missing?
+            (!@email.nil? && !@api_key.nil?)
+        end
+        
+        
+        
+        def pw_combo_missing?
+            (!@email.nil? && !@password_hash.nil?)
+        end
+        
+        def turn_off_ssl_verify
+           Excon.defaults[:ssl_verify_peer] = false   unless @api_url.include?("https")
+
+        end
 
         def just_color_debug(path)
-            text.msg "--> #{text.color("(#{path})", :cyan, :bold)}"                  # Why " inside "
+            text.msg "--> #{text.color("(#{path})", :cyan, :bold)}"                  
         end
 
-        # Make a lazy connection.
         def connection
-            @options[:path] = API_VERSION2 + @options[:path]
-            encoded_api_header = encode_header(@options)
-            @options[:headers] = HEADERS.merge(X_Megam_HMAC => encoded_api_header[:hmac],
-            X_Megam_DATE => encoded_api_header[:date], X_Megam_ORG => "#{@org_id}").merge(@options[:headers])
-            if (@api_key == "" || @api_key.nil?)
-                Megam::Log.debug("> PWH #{@password_hash}")
-                @options[:headers] = @options[:headers].merge(X_Megam_PUTTUSAVI => "true") unless (@password_hash == "" || @password_hash.nil?)
-            end
+            @options[:path] = @api_version + @options[:path]
+            
+            build_headers
 
-            Megam::Log.debug('HTTP Request Data:')
-            Megam::Log.debug("> HTTP #{@options[:scheme]}://#{@options[:host]}")
-            @options.each do |key, value|
-                Megam::Log.debug("> #{key}: #{value}")
-            end
-            Megam::Log.debug('End HTTP Request Data.')
-            if @options[:scheme] == 'https'
-                @connection = Excon.new("#{@options[:scheme]}://#{@options[:host]}", @options)
-            else
-                Excon.defaults[:ssl_verify_peer] = false
-                @connection = Excon.new("#{@options[:scheme]}://#{@options[:host]}:9000", @options)
-            end
-            @connection
+            @connection = Excon.new(@api_url, @options)
         end
+        
+        
+        def build_headers
+            encoded = encode_header
+            
+            @options[:headers] = HEADERS.merge(X_Megam_HMAC => encoded[:hmac],
+                                        X_Megam_DATE => encoded[:date], 
+                                        X_Megam_ORG => @org_id).merge(@options[:headers])
+            
+            
+            build_header_puttusavi
+        end   
 
-        ## encode header as per rules.
-        # The input hash will have
-        # :api_key, :email, :body, :path
-        # The output will have
-        # :hmac
-        # :date
-        def encode_header(cmd_parms)
-            header_params = {}
-            body_digest = OpenSSL::Digest::MD5.digest(cmd_parms[:body])
-            body_base64 = Base64.urlsafe_encode64(body_digest)
+        def encode_header
+            body_base64 = Base64.urlsafe_encode64(OpenSSL::Digest::MD5.digest(@options[:body]))
 
             current_date = Time.now.strftime('%Y-%m-%d %H:%M')
 
-            data = "#{current_date}" + "\n" + "#{cmd_parms[:path]}" + "\n" + "#{body_base64}"
+            movingFactor = "#{current_date}" + "\n" + "#{@options[:path]}" + "\n" + "#{body_base64}"
 
-            digest  = OpenSSL::Digest.new('sha1')
+            digest  = OpenSSL::Digest.new('sha256')
 
-            movingFactor = data
-
-            if !(@password_hash.nil?) && @api_key.nil?
+            if pw_combo_missing?
                 hash = OpenSSL::HMAC.hexdigest(digest, Base64.strict_decode64(@password_hash), movingFactor)
-            elsif !(@api_key.nil?)
+            elsif api_combo_missing?
                 hash = OpenSSL::HMAC.hexdigest(digest, @api_key, movingFactor)
             else
                 hash = OpenSSL::HMAC.hexdigest(digest, "", movingFactor)
             end
-            final_hmac = @email + ':' + hash
-            header_params = { hmac: final_hmac, date: current_date }
+            
+            { hmac: (@email + ':' + hash), date: current_date }
+        end
+        
+        def build_header_puttusavi
+          if pw_combo_missing?
+               @options[:headers] = @options[:headers].merge(X_Megam_PUTTUSAVI => "true") 
+          end
         end
+        
     end
 end

data/lib/megam/api/version.rb

@@ -1,5 +1,5 @@
 module Megam
   class API
-    VERSION = "1.6.8"
+    VERSION = "1.7.1"
   end
 end

data/lib/megam/core/json_compat.rb

@@ -1,15 +1,14 @@
 
 # Wrapper class for interacting with JSON.
-
 require "ffi_yajl"
 # We're requiring this to prevent breaking consumers using Hash.to_json
 require "json"
 
 module Megam
     class JSONCompat
+        
         JSON_MAX_NESTING = 1000
 
-
         JSON_CLAZ = 'json_claz'.freeze
 
         MEGAM_ACCOUNT                         = 'Megam::Account'.freeze
@@ -50,13 +49,13 @@ module Megam
         MEGAM_EVENTSBILLINGCOLLECTION         = 'Megam::EventsBillingCollection'.freeze
         MEGAM_EVENTSSTORAGE                   = 'Megam::EventsStorage'.freeze
         MEGAM_EVENTSSTORAGECOLLECTION         = 'Megam::EventsStorageCollection'.freeze
-        MEGAM_SUBSCRIPTIONS                 = 'Megam::Subscriptions'.freeze
-        MEGAM_SUBSCRIPTIONSCOLLECTION       = 'Megam::SubscriptionsCollection'.freeze
-        MEGAM_ADDONS                       = 'Megam::Addons'.freeze
-        MEGAM_ADDONSCOLLECTION            = 'Megam::AddonsCollection'.freeze
+        MEGAM_SUBSCRIPTIONS                   = 'Megam::Subscriptions'.freeze
+        MEGAM_SUBSCRIPTIONSCOLLECTION         = 'Megam::SubscriptionsCollection'.freeze
+        MEGAM_ADDONS                          = 'Megam::Addons'.freeze
+        MEGAM_ADDONSCOLLECTION                = 'Megam::AddonsCollection'.freeze
         MEGAM_PROMOS                          = 'Megam::Promos'.freeze
 
-        class <<self
+        class << self
             # API to use to avoid create_addtions
             def parse(source, opts = {})
                 begin

data/megam_api.gemspec

@@ -5,20 +5,20 @@ require "megam/api/version"
 Gem::Specification.new do |s|
   s.name        = "megam_api"
   s.version     = Megam::API::VERSION
-  s.authors     = ["Rajthilak, Kishorekumar Neelamegam, Ranjitha R, Rajesh Rajagopalan, Thomas Alrin, Yeshwanth Kumar, Subash Sethurajan, Arunkumar sekar"]
-  s.email       = ["rajthilak@megam.io","nkishore@megam.io","ranjithar@megam.io","rajeshr@megam.io","thomasalrin@megam.io","getyesh@megam.io","subash.avc@gmail.com","arunkumar.sekar@megam.io"]
+  s.authors     = ["Rajthilak, Kishorekumar Neelamegam, Ranjitha R, Vinodhini V, Rathish VBR, Rajesh Rajagopalan, Thomas Alrin, Yeshwanth Kumar, Subash Sethurajan, Arunkumar sekar"]
+  s.email       = ["rajthilak@megam.io","nkishore@megam.io","ranjithar@megam.io","vino.v@megam.io","rathishvbr@megam.io","rajeshr@megam.io","thomasalrin@gmail.com","morpheyesh@gmail.com","subash.avc@gmail.com","arunkumar.sekar@megam.io"]
   s.homepage    = "http://github.com/megamsys/megam_api"
-  s.license = "Apache-2.0"
+  s.license = "MIT"
   s.extra_rdoc_files = ["README.md", "LICENSE" ]
-  s.summary = %q{Ruby Client for the Megam}
-  s.description = %q{Ruby Client for the Megam vertice platform. Performs REST calls to Vertice Gateway -  http://github.com/megamsys/vertice_gateway.git}
+  s.summary = %q{Ruby Client for the Megam Vertice}
+  s.description = %q{Ruby Client for the Megam vertice. Performs REST calls to Vertice Gateway -  http://github.com/megamsys/vertice_gateway.git}
   s.files = `git ls-files`.split("\n")
   s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-  s.add_runtime_dependency 'excon', '~> 0.51.0'
+  s.add_runtime_dependency 'excon', '~> 0.52.0'
   s.add_runtime_dependency 'highline', '~> 1.7'
-  s.add_runtime_dependency 'ffi-yajl', '~> 2.2'
+  s.add_runtime_dependency 'ffi-yajl', '~> 2.3'
   s.add_runtime_dependency 'mixlib-config', '~> 2.2'
   s.add_runtime_dependency 'mixlib-log', '~> 1.6'
   s.add_development_dependency 'minitest', '~> 5.9'

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: megam_api
 version: !ruby/object:Gem::Version
-  version: 1.6.8
+  version: 1.7.1
 platform: ruby
 authors:
-- Rajthilak, Kishorekumar Neelamegam, Ranjitha R, Rajesh Rajagopalan, Thomas Alrin,
-  Yeshwanth Kumar, Subash Sethurajan, Arunkumar sekar
+- Rajthilak, Kishorekumar Neelamegam, Ranjitha R, Vinodhini V, Rathish VBR, Rajesh
+  Rajagopalan, Thomas Alrin, Yeshwanth Kumar, Subash Sethurajan, Arunkumar sekar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-16 00:00:00.000000000 Z
+date: 2016-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.51.0
+        version: 0.52.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.51.0
+        version: 0.52.0
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -45,14 +45,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: mixlib-config
   requirement: !ruby/object:Gem::Requirement
@@ -109,15 +109,17 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '11.2'
-description: Ruby Client for the Megam vertice platform. Performs REST calls to Vertice
-  Gateway -  http://github.com/megamsys/vertice_gateway.git
+description: Ruby Client for the Megam vertice. Performs REST calls to Vertice Gateway
+  -  http://github.com/megamsys/vertice_gateway.git
 email:
 - rajthilak@megam.io
 - nkishore@megam.io
 - ranjithar@megam.io
+- vino.v@megam.io
+- rathishvbr@megam.io
 - rajeshr@megam.io
-- thomasalrin@megam.io
-- getyesh@megam.io
+- thomasalrin@gmail.com
+- morpheyesh@gmail.com
 - subash.avc@gmail.com
 - arunkumar.sekar@megam.io
 executables: []
@@ -247,7 +249,7 @@ files:
 - test/test_subscriptions.rb
 homepage: http://github.com/megamsys/megam_api
 licenses:
-- Apache-2.0
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -268,5 +270,31 @@ rubyforge_project:
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: Ruby Client for the Megam
-test_files: []
+summary: Ruby Client for the Megam Vertice
+test_files:
+- test/mixins/test_assemblies.rb
+- test/mixins/test_assembly.rb
+- test/mixins/test_component.rb
+- test/test_accounts.rb
+- test/test_addons.rb
+- test/test_assemblies.rb
+- test/test_assembly.rb
+- test/test_balances.rb
+- test/test_billedhistories.rb
+- test/test_billingtranscations.rb
+- test/test_components.rb
+- test/test_disks.rb
+- test/test_domains.rb
+- test/test_eventsbilling.rb
+- test/test_eventscontainer.rb
+- test/test_eventsstorage.rb
+- test/test_eventsvm.rb
+- test/test_helper.rb
+- test/test_marketplaces.rb
+- test/test_organizations.rb
+- test/test_promos.rb
+- test/test_requests.rb
+- test/test_sensors.rb
+- test/test_snapshots.rb
+- test/test_sshkeys.rb
+- test/test_subscriptions.rb