megam_api 0.16 → 0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 09998b376d64a74fe84a95ed4cbb426827e7d853
-  data.tar.gz: 6e69181f6b9a5e77358f957d37b7c011c2efddda
+  metadata.gz: 049495e50148060c8b58f16100dff5a6232aa63e
+  data.tar.gz: 6c3a829fd7baa2121e70eaeae72e8dce1fbbc4e9
 SHA512:
-  metadata.gz: f1bd5cc89a3851223ddbb64e8a60fbda88cc68c60854f569715cd0eeb3ab10e67393697854dc9b7273e12c852385fa8e54a85794a2d356deccafcc019d6772cf
-  data.tar.gz: 69f3175a199fc9614099969ac8150ab78f56244f0b5ca27c2bbea545a524a6183de60e5e5c4276fc5653a1823264acff36b40ebd79bc1eb4d2d13f74067d519e
+  metadata.gz: f87e02f88e6d63c5ad4fe63f40c3a67ec1842e45946ce6dedf68cf888143cbbabef538a2fbee4047c1e460eea7a9f24eda6eb8faff534d2768823b2dc17ff77d
+  data.tar.gz: 82742a4c9a346161c626e082791d15861f7b55c45a5fb1f63bdcbe3f322c59daa85bcd6d0d8cc3e092cb6f7ae29b7dcad07bf4ad8a0bfdf26a2bb937b4ac1134

data/lib/megam/api.rb

@@ -219,21 +219,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"
-          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
 
+      if @options[:scheme] == "https"
       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
+        @options[:scheme] == "http"
       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
+        @options[:scheme] == "http"
       else
         Megam::Log.debug("Certificate found")
         Excon.defaults[:ssl_verify_peer] = true
+                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"))                  
+      end
       end
-        end
 
       Megam::Log.debug("HTTP Request Data:")
       Megam::Log.debug("> HTTP #{@options[:scheme]}://#{@options[:host]}")
@@ -241,13 +242,13 @@ module Megam
         Megam::Log.debug("> #{key}: #{value}")
       end
       Megam::Log.debug("End HTTP Request Data.")
-        if @options[:scheme] == "https"
+      if @options[:scheme] == "https"
       @connection = Excon.new("#{@options[:scheme]}://#{@options[:host]}",@options)
-        else
+      else
            Excon.defaults[:ssl_verify_peer] = false
            @connection = Excon.new("#{@options[:scheme]}://#{@options[:host]}:9000",@options)
-        end
-        @connection
+      end
+      @connection
     end
 
     ## encode header as per rules.
@@ -272,6 +273,7 @@ module Megam
       final_hmac = @email+':' + hash
       header_params = { :hmac => final_hmac, :date => current_date}
     end
-  end
+    
+ end
 
 end

data/lib/megam/api/version.rb

@@ -1,5 +1,5 @@
 module Megam
   class API
-    VERSION = "0.16"
+    VERSION = "0.17"
   end
 end

data/test/test_accounts.rb

@@ -12,7 +12,7 @@ class TestAccounts < MiniTest::Unit::TestCase
     response.body.to_s
     assert_equal(200, response.status)
   end
-  
+=begin
   def test_get_accounts_bad
     assert_raises(Megam::API::Errors::NotFound) do
     response =megams.get_accounts(sandbox_email+"_bad")
@@ -42,4 +42,5 @@ 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.16'
+  version: '0.17'
 platform: ruby
 authors:
 - Kishorekumar Neelamegam, Thomas Alrin, Subash Sethurajan, Rajthilak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-27 00:00:00.000000000 Z
+date: 2014-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon