megam_api 0.14 → 0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 648894d0115816c314368168eea83b0652a95aec
-  data.tar.gz: 83dd55046ccfc9dcbd92fe5a93c5ec37bb780275
+  metadata.gz: f70bad4104531f59a86d0a85bf96c1f855c0c96e
+  data.tar.gz: 1ec8eb2603e2f632b47352f05be0407786d9f53c
 SHA512:
-  metadata.gz: f4c050bba42496e59abcb765f6fab5f664f2b07d104f47737579f82a806279b08dfb636925ba4a062884c2f09c555992d9f03afe12ae8d2e482cd7be8adb50b9
-  data.tar.gz: aa046a0bd7cbc4b2e1760218739c26e57e9377d8f8c7f63fab83fa6b009c729f1ea3cee620c6c72143912b5b38682e1c430f4ce96c784e43399f592aa59a6aa3
+  metadata.gz: 8c01a6c03db68969107623032db64ee3c37d1ec706ea83478137a041ecb7844cdaf614bc4e28b76984533686b5fc6079667a51ac02489f8190ecacee88b0a978
+  data.tar.gz: 71f7dc9c679c313976733140c50c049fb21577c98c4354fb3711dd549bc24154c447b201adc00ed4565da885b0f2c4889fc02a87560f566ee4a66f5f392d3100

data/lib/megam/api/version.rb

@@ -1,5 +1,5 @@
 module Megam
   class API
-    VERSION = "0.14"
+    VERSION = "0.15"
   end
 end

data/lib/megam/api.rb

@@ -4,6 +4,7 @@ require "excon"
 require "uri"
 require "zlib"
 require 'openssl'
+require 'yaml'                  #COMMON YML
 
 # open it up when needed. This will be needed when a new customer onboarded via pug.
 require "securerandom"
@@ -98,7 +99,6 @@ module Megam
       :nonblock => false,
       :scheme => 'https'
     }
-
     API_VERSION1 = "/v1"
 
     def text
@@ -118,6 +118,11 @@ module Megam
     # 3. Upon merge of the options, the api_key, email as available in the @options is deleted.
     def initialize(options={})
       @options = OPTIONS.merge(options)
+if File.exist?("#{ENV['MEGAM_HOME']}/nilavu.yml")
+        @common = YAML.load_file("#{ENV['MEGAM_HOME']}/nilavu.yml")                  #COMMON YML
+        @options[:host] = "#{@common["api"]["host"]}"
+        @options[:scheme] = "#{@common["api"]["scheme"]}"
+end
       @api_key = @options.delete(:api_key) || ENV['MEGAM_API_KEY']
       @email = @options.delete(:email)
       raise ArgumentError, "You must specify [:email, :api_key]" if @email.nil? || @api_key.nil?
@@ -188,7 +193,7 @@ module Megam
     private
 
     def just_color_debug(path)
-      text.msg "--> #{text.color("(#{path})", :cyan,:bold)}"
+      text.msg "--> #{text.color('(#{path})', :cyan,:bold)}"                  # Why " inside "
     end
 
     #Make a lazy connection.
@@ -199,16 +204,22 @@ module Megam
         'X-Megam-HMAC' => encoded_api_header[:hmac],
         'X-Megam-Date' => encoded_api_header[:date],
       }).merge(@options[:headers])
+                  #COMMON YML
+        if @options[:scheme] == "https"
+puts "=====> if https =======>"
+      Excon.defaults[:ssl_ca_file] = File.expand_path(File.join("#{ENV['MEGAM_HOME']}", "#{@common["api"]["pub_key"]}")) || File.expand_path(File.join(File.dirname(__FILE__), "..", "certs", "cacert.pem"))                  #COMMON YML
 
-      Excon.defaults[:ssl_ca_file] = File.expand_path(File.join(File.dirname(__FILE__), "..", "certs", "cacert.pem"))
-
-      if !File.exist?(File.expand_path(File.join(File.dirname(__FILE__), "..", "certs", "cacert.pem")))
+      if !File.exist?(File.expand_path(File.join("#{ENV['MEGAM_HOME']}", "#{@common["api"]["pub_key"]}")))
+        text.warn("Certificate file does not exist. SSL_VERIFY_PEER set as false")
+        Excon.defaults[:ssl_verify_peer] = false
+      elsif !File.exist?(File.expand_path(File.join(File.dirname(__FILE__), "..", "certs", "cacert.pem")))
         text.warn("Certificate file does not exist. SSL_VERIFY_PEER set as false")
         Excon.defaults[:ssl_verify_peer] = false
       else
         Megam::Log.debug("Certificate found")
         Excon.defaults[:ssl_verify_peer] = true
       end
+        end
 
       Megam::Log.debug("HTTP Request Data:")
       Megam::Log.debug("> HTTP #{@options[:scheme]}://#{@options[:host]}")
@@ -216,7 +227,13 @@ module Megam
         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
     end
 
     ## encode header as per rules.

data/test/test_accounts.rb

@@ -42,4 +42,4 @@ class TestAccounts < MiniTest::Unit::TestCase
     response.body.to_s
     end    
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: megam_api
 version: !ruby/object:Gem::Version
-  version: '0.14'
+  version: '0.15'
 platform: ruby
 authors:
 - Kishorekumar Neelamegam, Thomas Alrin, Subash Sethurajan, Rajthilak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-02 00:00:00.000000000 Z
+date: 2014-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -234,4 +234,3 @@ signing_key:
 specification_version: 4
 summary: Ruby Client for the Megam Cloud
 test_files: []
-has_rdoc: