megam_api 0.96 → 0.97

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf28e37d2d592a57c4ebefeb2a2bccc316da5089
-  data.tar.gz: 8ddc56a28e21d535fe1140d76755a876e1c11959
+  metadata.gz: ca6cd3eb4822d02d8d0ebaf7f2bc063c271e5053
+  data.tar.gz: 3a824875e7938afaa20b48b6a8fbd9cff05d8b0c
 SHA512:
-  metadata.gz: ffb1be4ce1f8e5463e04f13bf67f5894eb05aa2590585c8a46e65cb1ad4e649febaeeb2a2c78eea66e41b28ed390dfc1eb209d78c63543e9ab23cc00574a8964
-  data.tar.gz: ac923ced56d8882276ab74d70b2c71c96b15502548ee2710a3f7d4f8f2cf1edb93550d4b1f4be159d2ae2f79efd49706bf966f6ba00c9c64860d058507117a3f
+  metadata.gz: 3f6438fa9333d4e5e578e73ab4c9bea324d3ec04fc0ab8f6ded905aa54a8245ce43b79afaf272a09772cac5ae9b07ebe9b0798100440975a0289ba762a52e6d6
+  data.tar.gz: e22ee5fca62c1f2b171313ee733a1a9216736d43d5c0a65323a38e736d6c759c59d1655812360bc90207b98953f5f201db7d985c6ccaa5cf571b32933189f3b3

data/lib/megam/api.rb

@@ -148,7 +148,9 @@ module Megam
       @email = @options.delete(:email)
       @password = @options.delete(:password)
       @org_id = @options.delete(:org_id)
-      fail Megam::API::Errors::AuthKeysMissing if (@email.nil? && @api_key.nil?) || (@email.nil? && @password.nil?)
+      unless !@options.delete(:reset_flag)
+         fail Megam::API::Errors::AuthKeysMissing if (@email.nil? && @api_key.nil?) || (@email.nil? && @password.nil?)
+      end
     end
 
     def request(params, &block)
@@ -232,7 +234,10 @@ module Megam
       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])
-      @options[:headers] = @options[:headers].merge('X-Megam-PUTTUSAVI' => "true") unless (@password == "" || @password.nil?)
+      if (@api_key == "" || @api_key.nil?)
+         @options[:headers] = @options[:headers].merge('X-Megam-PUTTUSAVI' => "true") unless (@password == "" || @password.nil?)
+      end
+
       Megam::Log.debug('HTTP Request Data:')
       Megam::Log.debug("> HTTP #{@options[:scheme]}://#{@options[:host]}")
       @options.each do |key, value|
@@ -266,13 +271,15 @@ module Megam
 
       digest  = OpenSSL::Digest.new('sha1')
       movingFactor = data.rstrip!
-      if !(@password.nil?)
+      if !(@password.nil?) && @api_key.nil?
         hash = OpenSSL::HMAC.hexdigest(digest, Base64.strict_decode64(@password), movingFactor)
-      else
+      elsif !(@api_key.nil?)
         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 }
     end
   end
-end
+end

data/lib/megam/api/accounts.rb

@@ -45,14 +45,34 @@ module Megam
       @options = {:path => '/accounts/update',
      :body => Megam::JSONCompat.to_json(update_account)}.merge(@options)
 
-     request(
+      request(
       :expects => 201,
       :method => :post,
       :body => @options[:body]
       )
     end
 
+    def reset_accounts(account)
+      @options = {:path => "/accounts/reset/#{account["email"]}",
+     :body => ''}.merge(@options)
+
+      request(
+      :expects => 201,
+      :method => :get,
+      :body => @options[:body]
+      )
+    end
+
+    def repassword_accounts(account)
+      @options = {:path => "/accounts/repassword",
+     :body => Megam::JSONCompat.to_json(account)}.merge(@options)
 
+      request(
+      :expects => 201,
+      :method => :post,
+      :body => @options[:body]
+      )
+    end
 
   end
 end

data/lib/megam/api/version.rb

@@ -15,6 +15,6 @@
 #
 module Megam
   class API
-    VERSION = "0.96"
+    VERSION = "0.97"
   end
 end

data/lib/megam/core/account.rb

@@ -231,14 +231,6 @@ module Megam
       megam_rest.post_accounts(to_hash)
     end
 
-=begin
-    # Load a account by email_p
-    def self.show(email,api_key,host=nil,password=nil)
-      acct = self.new(email, api_key, host, password)
-      acct.megam_rest.get_accounts(email)
-    end
-=end
-
     # Load a account by email_p
     def self.show(o)
       acct = self.new({:email => o[:email], :api_key => o[:api_key], :host => o[:host], :password => o[:password], :org_id => o[:org_id]})
@@ -249,11 +241,29 @@ module Megam
      acct = from_hash(o)
      acct.update
    end
+   
+   def self.reset(o)
+     acct = from_hash(o)
+     acct.reset
+   end
+   
+   def self.repassword(o)
+     acct = from_hash(o)
+     acct.repassword
+   end
 
    # Create the node via the REST API
    def update
      megam_rest.update_accounts(to_hash)
    end
+   
+    def reset
+     megam_rest.reset_accounts(to_hash)
+   end
+   
+   def repassword
+     megam_rest.repassword_accounts(to_hash)
+   end
 
     def to_s
       Megam::Stuff.styled_hash(to_hash)

data/lib/megam/core/marketplace.rb

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-require 'hashie'
+
 
 module Megam
   class MarketPlace < Megam::ServerAPI
@@ -74,7 +74,7 @@ module Megam
         @flavor
       end
     end
-    
+
     def catorder(arg = nil)
       if !arg.nil?
         @catorder = arg

data/test/test_accounts.rb

@@ -1,29 +1,49 @@
 require File.expand_path("#{File.dirname(__FILE__)}/test_helper")
 
 class TestAccounts < MiniTest::Unit::TestCase
-  def test_signin_auth
-    response = megams.get_accounts("test@megam.io")
+
+  $admin = "admin-tom"
+  $normal = "normal-tom"
+  $tom_email = "tom@gomegam.com"
+  $bob_email = "bob@gomegam.com"
+#=begin
+
+def test_signin_auth
+    response =megams.get_accounts("test@megam.io")
+    response.body.to_s
+    assert_equal(200, response.status)
+end
+
+  def test_get_accounts_good
+    response =megams.get_accounts(sandbox_email)
     response.body.to_s
     assert_equal(200, response.status)
   end
 
+
+=begin
+
   def test_post_accounts_good
     tmp_hash = {
+      "id" => "000099090909000",
       "first_name" => "Darth",
       "last_name" => "Vader",
-      "email" => "test@megam.io",
+      "email" => "coolvader@iamswag.com",
       "phone" => "19090909090",
       "api_key" => "IamAtlas{74}NobdyCanSedfefdeME#07",
       "authority" => "admin",
-      "password" => Base64.strict_encode64("megam"),
+      "password" => "",
       "password_reset_key" => "",
       "password_reset_sent_at" => "",
-    }
-    response =megams_new.post_accounts(tmp_hash)
+      "created_at" => "2014-10-29 13:24:06 +0000"
+      }
+    response =megams.post_accounts(tmp_hash)
     response.body.to_s
     assert_equal(201, response.status)
   end
+=end
 
+=begin
   def test_update_accounts_good
     tmp_hash = {
       "id" => "w3423",
@@ -32,21 +52,45 @@ class TestAccounts < MiniTest::Unit::TestCase
       "email" => "super@test.com",
       "phone" => "19090909090011111111",
       "api_key" => "IamAtlas{74}NobdyCanSedfefdeME#07",
-      "password" => "tset",
       "authority" => "admin",
+      "password" => "tset",
       "password_reset_key" => "",
+      "password_reset_sent_at" => "",
       "created_at" => "2014-10-29 13:24:06 +0000"
-    }
-    response = megams.update_accounts(tmp_hash)
+      }
+   response = megams.update_accounts(tmp_hash)
+   response.body.to_s
+   assert_equal(201, response.status)
+ end
+=end
+=begin
+  def test_get_accounts_bad
+    assert_raises(Megam::API::Errors::NotFound) do
+    response =megams.get_accounts(sandbox_email+"_bad")
+    response.body.to_s
+    end
+  end
+  def test_post_accounts_admin
+    response =megams.post_accounts(
+    {:id => random_id, :email => $tom_email, :api_key => sandbox_apikey, :authority => $admin})
     response.body.to_s
     assert_equal(201, response.status)
   end
 
-  def test_get_accounts_bad
-    assert_raises(Megam::API::Errors::NotFound) do
-      response =megams.get_accounts(sandbox_email+"_bad")
-      response.body.to_s
-    end
+  def test_post_accounts_normal
+    response =megams.post_accounts(
+    {:id => random_id, :email => $bob_email, :api_key => sandbox_apikey, :authority => $normal})
+    response.body.to_s
+    assert_equal(201, response.status)
   end
 
-end
+  def test_post_accounts_normal_bad
+    assert_raises(ArgumentError) do
+    response =megam.post_accounts(
+    {:id => random_id, :emailo => sandbox_email,
+      :apik_key => sandbox_apikey, :authority => $admin})
+    response.body.to_s
+    end
+  end
+=end
+end

data/test/test_assemblies.rb

@@ -77,8 +77,10 @@ class TestApps < MiniTest::Unit::TestCase
         {"key"=>"status","value"=>"error"}]
     }
 
-    response = megams.post_assemblies(tmp_hash)
-    assert_equal(200, response.status)
-  end
+
+   response = megams.post_assemblies(tmp_hash)
+   assert_equal(201, response.status)
+end
+
 #=end
 end

data/test/test_balances.rb

@@ -11,7 +11,7 @@ class TestApps < MiniTest::Unit::TestCase
     assert_equal(201, response.status)
   end
 #=end
-#=begin
+=begin
 def test_update_balances
   tmp_hash = {:id=>"BAL5611523197067225006",
               :accounts_id=>"ACT119501563472393011",
@@ -22,7 +22,7 @@ def test_update_balances
    response = megams.update_balance(tmp_hash)
     assert_equal(201, response.status)
 end
-#=end
+=end
 =begin
   def test_get_balances
     response = megams.get_balances

data/test/test_billings.rb

@@ -1,7 +1,7 @@
 require File.expand_path("#{File.dirname(__FILE__)}/test_helper")
 
 class TestApps < MiniTest::Unit::TestCase
-#=begin
+=begin
   def test_post_billings
     tmp_hash = { :accounts_id => "ACT93476985797",
                  :line1 => "paypal",
@@ -16,7 +16,7 @@ class TestApps < MiniTest::Unit::TestCase
     response = megams.post_billings(tmp_hash)
     assert_equal(201, response.status)
   end
-#=end
+=end
 
 =begin
   def test_get_billings

data/test/test_cat_requests.rb

@@ -10,11 +10,11 @@ class TestApps < MiniTest::Unit::TestCase
     "category" => "control"
   }
 
-
+=begin
   def test_request_app_start
     response = megams.post_catrequest(@@tmp_hash)
     assert_equal(201, response.status)
   end
-#=end
+=end
 
 end

data/test/test_components.rb

@@ -35,7 +35,7 @@ class TestApps < MiniTest::Unit::TestCase
       "created_at" => "2014-10-29 14:06:39 +0000"
     }
     response = megams.update_component(tmp_hash)
-    assert_equal(201, response.status)
+    assert_equal(200, response.status)
   end
 #=end
 end

data/test/test_login.rb

@@ -1,12 +1,10 @@
 require File.expand_path("#{File.dirname(__FILE__)}/test_helper")
 
 class TestLogin < MiniTest::Unit::TestCase
-
+=begin
   def test_post_login
     response =megams.post_auth()
     assert_equal(200, response.status)
   end
-
+=end
 end
-
-

data/test/test_marketplaceaddons.rb

@@ -1,7 +1,7 @@
 require File.expand_path("#{File.dirname(__FILE__)}/test_helper")
 
 class TestApps < MiniTest::Unit::TestCase
-#=begin
+=begin
 def test_post_addon
 @com = {
 "disaster"=>{
@@ -41,5 +41,6 @@ end
  # def test_get_nodes
  #   response = megams.get_addons("appsample1.megam.co")
   #  assert_equal(200, response.status)
- # end
+  #=end
+=end
 end

data/test/test_predefclouds.rb

@@ -53,13 +53,13 @@ class TestApps < MiniTest::Unit::TestCase
     assert_equal(201, response.status)
   end
 =end
-#=begin
+=begin
 
   def test_get_predefclouds
     response = megams.get_predefclouds
     assert_equal(200, response.status)
   end
-#=end
+=end
 =begin
   def test_get_predefcloud2
     response = megams.get_predefcloud("rkspce_sundown_play")
@@ -78,4 +78,3 @@ end
 end
 =end
 end
-

data/test/test_promos.rb

@@ -1,12 +1,11 @@
 require File.expand_path("#{File.dirname(__FILE__)}/test_helper")
 
 class TestApps < MiniTest::Unit::TestCase
-
+=begin
   def test_get_promos()
     response = megams.get_promos("megamfree5")
     assert_equal(200, response.status)
-   
-  end
 
+  end
+=end
 end
-

data/test/test_sensors.rb

@@ -15,7 +15,7 @@ class TestApps < MiniTest::Unit::TestCase
  end
 =end
 
-#=begin
+=begin
  def test_post_sensors
    tmp_hash =  {
 
@@ -46,5 +46,5 @@ class TestApps < MiniTest::Unit::TestCase
    response = megams.post_sensors(tmp_hash)
    assert_equal(200, response.status)
 end
-#=end
+=end
 end

data/test/test_sshkeys.rb

@@ -5,7 +5,7 @@ class TestApps < MiniTest::Unit::TestCase
 #=begin
   def test_post_sshkey2
     tmp_hash = {
-      :name => "test_sample",
+      :name => "a@b.com_rtr",
       :org_id => "ORG123",
       :privatekey => "-----BEGIN RSA PRIVATE KEY-----
 MIIEpQIBAAKCAQEAz9g/LhHB7fDo85vm2O9F1oDzJhTs6PI3N6WDayZEzG4xmrZd

data/test/test_subscriptions.rb

@@ -1,9 +1,9 @@
 require File.expand_path("#{File.dirname(__FILE__)}/test_helper")
 
 class TestApps < MiniTest::Unit::TestCase
-#=begin
+=begin
   def test_post_subscriptions
-    tmp_hash = { :accounts_id => "ACT93476985797", 
+    tmp_hash = { :accounts_id => "ACT93476985797",
                  :assembly_id => "ASMkh9879847",
                  :start_date => "45",
                  :end_date => ""
@@ -12,7 +12,7 @@ class TestApps < MiniTest::Unit::TestCase
     response = megams.post_subscriptions(tmp_hash)
     assert_equal(201, response.status)
   end
-#=end
+=end
 
 =begin
   def test_get_subscriptions
@@ -27,4 +27,3 @@ class TestApps < MiniTest::Unit::TestCase
   end
 =end
 end
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: megam_api
 version: !ruby/object:Gem::Version
-  version: '0.96'
+  version: '0.97'
 platform: ruby
 authors:
 - Rajthilak, Kishorekumar Neelamegam, Thomas Alrin, Yeshwanth Kumar, Subash Sethurajan,
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-01 00:00:00.000000000 Z
+date: 2016-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon