megam_api 0.40 → 0.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd60098533007fe3a9b643d55cb878670e207d40
-  data.tar.gz: f0b88a82971c3bcb17c810fc327ba5133d0c26da
+  metadata.gz: d9c8bc9c1bbd2f46a7e18a2a4b4c7854dc8d6e64
+  data.tar.gz: fc575b87198bf131d2efa43ffc55b115c9dcc586
 SHA512:
-  metadata.gz: c6ae07ffae5b01bc48efcb11ed50c737f9c0e2a5317fc3463eb162334c3424f85ff5351e363d8e0739cbd9dcfe8aebb570dc95a75b6c66d6255008d67d09238f
-  data.tar.gz: c31823b892d6ba4d46fd63ab7b1db6383a7cf65eb8ec9c09caa1c505da19675e6d2c491a8968909738d8006dfde628c0ed1fd03b586bad784dd9b82c5743295e
+  metadata.gz: 5376f2ed4aee2d46a16defe9bf2286b0f4fc372240167ffd52f7d9814febffd7e506639f1080a89ba3cee0882fb22b728549b04ed4a275a572d0cf788439825d
+  data.tar.gz: fa25f71b924b0b306328fde1b04310734a8f0091ec64a0b23cee1f10576670407e7cfc01a4227872edd861eb8c15dea9af8572cf16aff6380bf3fd51fa3e0a21

data/lib/megam/api/version.rb

@@ -1,5 +1,6 @@
 module Megam
   class API
-    VERSION = "0.40"
+
+    VERSION = "0.41"
   end
 end

data/lib/megam/core/account.rb

@@ -225,8 +225,9 @@ module Megam
     end
 
 
-    def self.update(o,tmp_email=nil, tmp_api_key=nil)
-     acct = from_hash(o, tmp_email, tmp_api_key)
+    def self.update(o)
+      puts "called uda"
+     acct = from_hash(o)
      acct.update
    end
 

data/lib/megam/core/assemblies.rb

@@ -167,8 +167,8 @@ module Megam
       asm.megam_rest.get_one_assemblies(one_assemblies_id)
     end
 
-    def self.list(tmp_email=nil, tmp_api_key=nil, inflated=false)
-      asm = self.new(tmp_email, tmp_api_key)
+    def self.list(params)
+      asm = self.new(params["email"], params["api_key"])
       asm.megam_rest.get_assemblies
     end
 

data/lib/megam/core/assembly.rb

@@ -19,6 +19,7 @@ module Megam
     def initialize(email=nil, api_key=nil)
       @id = nil
       @name = nil
+      @tosca_type = nil
       @components = []
       @policies=[]
       @inputs = []
@@ -48,6 +49,14 @@ module Megam
       @name
       end
     end
+    
+    def tosca_type(arg=nil)
+      if arg != nil
+        @tosca_type = arg
+      else
+      @tosca_type
+      end
+    end
 
     def components(arg=[])
       if arg != []
@@ -115,6 +124,7 @@ module Megam
       index_hash["json_claz"] = self.class.name
       index_hash["id"] = id
       index_hash["name"] = name
+      index_hash["tosca_type"] = tosca_type
       index_hash["components"] = components
       index_hash["policies"] = policies
       index_hash["inputs"] = inputs
@@ -135,6 +145,7 @@ module Megam
       result = {
         "id" => id,
         "name" => name,
+        "tosca_type" => tosca_type,
         "components" => components,
         "policies" => policies,
         "inputs" => inputs,
@@ -151,6 +162,7 @@ module Megam
       asm = new
       asm.id(o["id"]) if o.has_key?("id")
       asm.name(o["name"]) if o.has_key?("name")
+      asm.tosca_type(o["tosca_type"]) if o.has_key?("tosca_type")
       asm.components(o["components"]) if o.has_key?("components")
       asm.policies(o["policies"]) if o.has_key?("policies") #this will be an array? can hash store array?
       asm.inputs(o["inputs"]) if o.has_key?("inputs")
@@ -170,6 +182,7 @@ module Megam
     def from_hash(o)
       @id                = o["id"] if o.has_key?("id")
       @name              = o["name"] if o.has_key?("name")
+      @tosca_type        = o["tosca_type"] if o.has_key?("tosca_type")
       @components        = o["components"] if o.has_key?("components")
       @policies          = o["policies"] if o.has_key?("policies")
       @inputs            = o["inputs"] if o.has_key?("inputs")

data/lib/megam/core/balances.rb

@@ -166,16 +166,16 @@ module Megam
     # Load all balances -
     # returns a BalanceCollection
     # don't return self. check if the Megam::BalanceCollection is returned.
-    def self.list(tmp_email=nil, tmp_api_key=nil)
-      balance = self.new(tmp_email,tmp_api_key)
+    def self.list(params)
+      balance = self.new(params["email"], params["api_key"])
       balance.megam_rest.get_balances
     end
 
     # Show a particular balance by name,
     # Megam::Balance
-    def self.show(p_name,tmp_email=nil, tmp_api_key=nil)
-      pre = self.new(tmp_email,tmp_api_key)
-      pre.megam_rest.get_balance(p_name)
+     def self.show(params)
+      pre = self.new(params["email"], params["api_key"])
+      pre.megam_rest.get_balance(params["email"])
     end
 
     def self.delete(p_name,tmp_email=nil, tmp_api_key=nil)

data/lib/megam/core/billinghistories.rb

@@ -31,7 +31,6 @@ module Megam
       self
     end
 
-    
     def id(arg=nil)
       if arg != nil
         @id = arg
@@ -136,7 +135,7 @@ module Megam
     #
     def self.json_create(o)
       bal = new
-      bal.id(o["id"]) if o.has_key?("id")     
+      bal.id(o["id"]) if o.has_key?("id")
       bal.accounts_id(o["accounts_id"]) if o.has_key?("accounts_id")
       bal.assembly_id(o["assembly_id"]) if o.has_key?("assembly_id")
       bal.bill_type(o["bill_type"]) if o.has_key?("bill_type")
@@ -181,21 +180,21 @@ module Megam
     # Load all billing histories -
     # returns a BillingHistoriesCollection
     # don't return self. check if the Megam::BillingHistoriesCollection is returned.
-    def self.list(tmp_email=nil, tmp_api_key=nil)
-    billhistory = self.new(tmp_email,tmp_api_key)
+    def self.list(params)
+      billhistory = self.new(params["email"], params["api_key"])
       billhistory.megam_rest.get_billinghistories
     end
 
     # Show a particular billing history by name,
     # Megam::BillingHistory
     def self.show(p_name,tmp_email=nil, tmp_api_key=nil)
-    pre = self.new(tmp_email,tmp_api_key)
-    pre.megam_rest.get_billinghistory(p_name)
+      pre = self.new(tmp_email,tmp_api_key)
+      pre.megam_rest.get_billinghistory(p_name)
     end
 
     def self.delete(p_name,tmp_email=nil, tmp_api_key=nil)
-    pre = self.new(tmp_email,tmp_api_key)
-    pre.megam_rest.delete_billinghistory(p_name)
+      pre = self.new(tmp_email,tmp_api_key)
+      pre.megam_rest.delete_billinghistory(p_name)
     end
 
     def to_s

data/test/test_accounts.rb

@@ -21,7 +21,6 @@ class TestAccounts < MiniTest::Unit::TestCase
       "email" => "coolvader@enterprise.com",
       "phone" => "19090909090",
       "api_key" => "IamAtlas{74}NobdyCanSedfefdeME#07",
-      "password" => "test",
       "authority" => "admin",
       "password_reset_key" => "",
       "created_at" => "2014-10-29 13:24:06 +0000"

data/test/test_assembly.rb

@@ -11,6 +11,7 @@ class TestApps < MiniTest::Unit::TestCase
       "id" => "ASM1139235178976247808",
       "json_claz" => "Megam::Assembly",
       "name" => "calcines",
+      "tosca_type" => "",
       "components" => ["COM1139235178934304768",""],
       "policies" => [{
           "name" => "bind policy",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: megam_api
 version: !ruby/object:Gem::Version
-  version: '0.40'
+  version: '0.41'
 platform: ruby
 authors:
 - Rajthilak, Kishorekumar Neelamegam, Thomas Alrin, Yeshwanth Kumar, Subash Sethurajan