megam_api 1.6.4 → 1.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3cc01289852d329bfa721816e4f2971e746e916
-  data.tar.gz: 13b4040a892d1f0945f6022d146b12f476520e46
+  metadata.gz: 1e2116834f32ccc85a0f032e1aa194ddcec1ddf1
+  data.tar.gz: bf6d94110b3cd5381975b00474fa8b527c482dd0
 SHA512:
-  metadata.gz: f52ef71a08e69fcd332133892763a4ea13df16bffb9b4fc4465052bd3df967ed7c8607abe0c2b5d2bceb2935e5cddee48957f30b5e5e95e3240a025d93302ca1
-  data.tar.gz: 3d9847db8437db518d5b2e81cae73ddadd2e1c767a270669769816402036fffe7dedd0b7ff7d3787465ac7ac515e2b319433d224be5abca3762236707e8cf744
+  metadata.gz: 83a21792cf1e6f210706181ec91657d7273b406bc6621ba448e45a98180fd02690f798315e18906660cb03142dc9cb7525b0b487d4d155c7b3b66fd04f91245e
+  data.tar.gz: 99257e6adb30fd253b70fc56f44e0a2eec86f89dd87bf2653522d57d854d7f972afbc00328e233619340c68551619eb036fcbe51ccaf5480df812e55251e2c43

data/.gitignore

@@ -13,6 +13,7 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.c9/*
 
 # YARD artifacts
 .yardoc

data/README.md

@@ -3,9 +3,7 @@ Ruby API for Vertice
 
 [![Gem Version](https://badge.fury.io/rb/megam_api.svg)](http://badge.fury.io/rb/megam_api)
 
-This is a Ruby SDK API for Vertice that talks REST to our Vertice gateway.
-
-[![Build Status](https://travis-ci.org/megamsys/megam_api.png)](https://travis-ci.org/megamsys/megam_api)
+This is a Ruby SDK API for Vertice.
 
 
 Usage
@@ -22,7 +20,7 @@ For more implementation details [see nilavu](http://github.com/megamsys/nilavu.g
 
 # License
 
-MIT
+Apache V2
 
 # Author
 

data/lib/megam/api.rb

@@ -134,10 +134,10 @@ module Megam
             @options = OPTIONS.merge(options)
             @api_key = @options.delete(:api_key) || ENV['MEGAM_API_KEY']
             @email = @options.delete(:email)
-            @password = @options.delete(:password)
+            @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.nil?)
+                fail Megam::API::Errors::AuthKeysMissing if (@email.nil? && @api_key.nil?) || (@email.nil? && @password_hash.nil?)
             end
         end
 
@@ -223,7 +223,8 @@ module Megam
             @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?)
-                @options[:headers] = @options[:headers].merge(X_Megam_PUTTUSAVI => "true") unless (@password == "" || @password.nil?)
+                Megam::Log.debug("> PWH #{@password_hash}")
+                @options[:headers] = @options[:headers].merge(X_Megam_PUTTUSAVI => "true") unless (@password_hash == "" || @password_hash.nil?)
             end
 
             Megam::Log.debug('HTTP Request Data:')
@@ -258,8 +259,8 @@ module Megam
 
             digest  = OpenSSL::Digest.new('sha1')
             movingFactor = data.rstrip!
-            if !(@password.nil?) && @api_key.nil?
-                hash = OpenSSL::HMAC.hexdigest(digest, Base64.strict_decode64(@password), movingFactor)
+            if !(@password_hash.nil?) && @api_key.nil?
+                hash = OpenSSL::HMAC.hexdigest(digest, Base64.strict_decode64(@password_hash), movingFactor)
             elsif !(@api_key.nil?)
                 hash = OpenSSL::HMAC.hexdigest(digest, @api_key, movingFactor)
             else

data/lib/megam/api/accounts.rb

@@ -3,7 +3,6 @@ module Megam
     # GET /accounts
     #Yet to be tested
     def get_accounts(email)
-
       @options = {:path => "/accounts/#{email}",
         :body => ''}.merge(@options)
 
@@ -14,6 +13,18 @@ module Megam
       )
     end
 
+    # The body content needs to be a json.
+    def login(new_account)
+      @options = {:path => '/accounts/login',
+      :body => Megam::JSONCompat.to_json(new_account)}.merge(@options)
+
+      request(
+        :expects  => 302,
+        :method   => :post,
+        :body     => @options[:body]
+        )
+    end
+    
     # The body content needs to be a json.
     def post_accounts(new_account)
       @options = {:path => '/accounts/content',
@@ -37,8 +48,8 @@ module Megam
       )
     end
 
-    def reset_accounts(account)
-      @options = {:path => "/accounts/reset/#{account["email"]}",
+    def forgot(account)
+      @options = {:path => "/accounts/forgot/#{account["email"]}",
      :body => ''}.merge(@options)
 
       request(
@@ -48,8 +59,8 @@ module Megam
       )
     end
 
-    def repassword_accounts(account)
-      @options = {:path => "/accounts/repassword",
+    def password_reset(account)
+      @options = {:path => "/accounts/password_reset",
      :body => Megam::JSONCompat.to_json(account)}.merge(@options)
 
       request(

data/lib/megam/api/version.rb

@@ -1,5 +1,5 @@
 module Megam
   class API
-    VERSION = "1.6.4"
+    VERSION = "1.6.6"
   end
 end

data/lib/megam/core/account.rb

@@ -28,8 +28,9 @@ module Megam
             @suspend = {}
             @dates = {}
             @some_msg = {}
+            
             super({ email: o[:email], api_key: o[:api_key],
-            host: o[:host], password: o[:password], org_id: o[:org_id] })
+                    host: o[:host], password_hash: o[:password_hash], org_id: o[:org_id] })
         end
 
         def account
@@ -103,7 +104,7 @@ module Megam
 
 
         def self.from_hash(o)
-            acct = new(email: o[:email], api_key: o[:api_key], host: o[:host], password: o[:password], org_id: o[:org_id])
+            acct = new(email: o[:email], api_key: o[:api_key], host: o[:host], password_hash: o[:password_hash], org_id: o[:org_id])
             acct.from_hash(o)
             acct
         end
@@ -119,7 +120,7 @@ module Megam
             @phone[:phone] = o[:phone] if o.key?(:phone)
             @phone[:phone_verified] = o[:phone_verified] if o.key?(:phone_verified)
 
-            @password[:password] = o[:password] if o.key?(:password)
+            @password[:password_hash] = o[:password_hash] if o.key?(:password_hash)
             @password[:password_reset_key] = o[:password_reset_key] if o.key?(:password_reset_key)
             @password[:password_reset_sent_at] = o[:password_reset_sent_at] if o.key?(:password_reset_sent_at)
 
@@ -145,6 +146,15 @@ module Megam
             self
         end
 
+        def self.login(o)
+            acct = from_hash(o)
+            acct.login
+        end
+
+        def login
+            megam_rest.login(to_hash)
+        end
+        
         def self.create(o)
             acct = from_hash(o)
             acct.create
@@ -155,7 +165,7 @@ module Megam
         end
 
         def self.show(o)
-            acct = new(email: o[:email], api_key: o[:api_key], host: o[:host], password: o[:password], org_id: o[:org_id])
+            acct = from_hash(o)
             acct.megam_rest.get_accounts(o[:email])
         end
 
@@ -164,26 +174,26 @@ module Megam
             acct.update
         end
 
-        def self.reset(o)
+        def self.forgot(o)
             acct = from_hash(o)
-            acct.reset
+            acct.forgot
         end
 
-        def self.repassword(o)
+        def self.password_reset(o)
             acct = from_hash(o)
-            acct.repassword
+            acct.password_reset
         end
 
         def update
             megam_rest.update_accounts(to_hash)
         end
 
-        def reset
-            megam_rest.reset_accounts(to_hash)
+        def forgot
+            megam_rest.forgot(to_hash)
         end
 
-        def repassword
-            megam_rest.repassword_accounts(to_hash)
+        def password_reset
+            megam_rest.password_reset(to_hash)
         end
 
         def to_s

data/lib/megam/core/rest_adapter.rb

@@ -5,7 +5,7 @@ module Megam
         attr_reader :host
         # the name :password is used as attr_accessor in accounts,
         # hence we use gpassword
-        attr_reader :gpassword
+        attr_reader :password_hash
         attr_reader :org_id
         attr_reader :headers
 
@@ -15,7 +15,7 @@ module Megam
             @email = o[:email]
             @api_key = o[:api_key] || nil
             @host = o[:host]
-            @gpassword = o[:password] || nil
+            @password_hash = o[:password_hash] || nil
             @org_id = o[:org_id]
             @headers = o[:headers]
         end
@@ -29,7 +29,7 @@ module Megam
               :email => email,
               :api_key => api_key,
               :org_id => org_id,
-              :password => gpassword,
+              :password_hash => password_hash,
               :host => host
             }
             if headers

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: megam_api
 version: !ruby/object:Gem::Version
-  version: 1.6.4
+  version: 1.6.6
 platform: ruby
 authors:
 - Rajthilak, Kishorekumar Neelamegam, Ranjitha R, Rajesh Rajagopalan, Thomas Alrin,
@@ -265,4 +265,29 @@ rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Ruby Client for the Megam
-test_files: []
+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_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