megam_api 0.63 → 0.65

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 271894fb639567159273c4022e475b5110fcdd10
-  data.tar.gz: 3eff3dd70b91086d365ffa90276cf45ccd601e51
+  metadata.gz: 396ae54e417f9d73a4acc609ea187aa1d409bec8
+  data.tar.gz: 4d4d75ef881b83312490e25a3a88cc0d90a9878f
 SHA512:
-  metadata.gz: 2edbeff9fa4f6a9ecab4ee4427a90d1b55fcf9a017463bffe0a1c9a156339e8c163701f57957378981f0832ea57dc6335e08305bc8fa1520a424acbc010d3b31
-  data.tar.gz: 964bdd26ac9373791597a889289e3f10ba368460103d95c0754b91b45d8a87cd366481817f49ced6cb39d42d6ec76fa123ef0c85ead240378a6ffc47e8910b31
+  metadata.gz: 6b1f5241bf38114873a406284dc149c2d919af4db95374fc32954021ae7d4adac36e6a0bd5aacc4746c174aec696c07b29e1e5aeb0f8941215e33c7af59f5715
+  data.tar.gz: 6d05626aa9e462f5c0e6ecc2807ebbd5316d8e4f39c0cbe334a1fe103566ff791cf977262cec5cf3b838ca437ea799eec551018482dd9706ac164daabd62b02a

data/README.md

@@ -86,7 +86,7 @@ For more implementation details [see meggy](https://github.com/megamsys/meggy.gi
 
 We are glad to help if you have questions, or request for new features..
 
-[twitter @megamsys](http://twitter.com/megamsys) [email support@megam.co.in](<support@megam.co.in>)
+[twitter @megamsys](http://twitter.com/megamsys) [email support@megam.io](<support@megam.io>)
 
 
 
@@ -100,7 +100,7 @@ We are glad to help if you have questions, or request for new features..
 |                      | Yeshwanth Kumar (<getyesh@megam.io>)
 |                      | Subash Sethurajan (<subash.avc@gmail.com>)
 |                      | Thomas Alrin (<thomasalrin@megam.io>)
-| **Copyright:**       | Copyright (c) 2012-2014 Megam Systems.
+| **Copyright:**       | Copyright (c) 2013-2015 Megam Systems.
 | **License:**         | Apache License, Version 2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");

data/lib/megam/api.rb

@@ -129,8 +129,9 @@ module Megam
     # 2. The options as passed via the instantiation of API will override global options. The ones that are passed are :email and :api_key and will
     # be  merged into a class variable @options
     # 3. Upon merge of the options, the api_key, email as available in the @options is deleted.
-    def initialize(options = {})
+    def initialize(options = {})  
       @options = OPTIONS.merge(options)
+      puts @options
       @api_key = @options.delete(:api_key) || ENV['MEGAM_API_KEY']
       @email = @options.delete(:email)
       fail ArgumentError, 'You must specify [:email, :api_key]' if @email.nil? || @api_key.nil?

data/lib/megam/api/version.rb

@@ -1,5 +1,5 @@
 module Megam
   class API
-    VERSION = "0.63"
+    VERSION = "0.65"
   end
 end

data/lib/megam/core/account.rb

@@ -15,7 +15,7 @@
 #
 module Megam
   class Account < Megam::ServerAPI
-    def initialize(email=nil, api_key=nil)
+    def initialize(email=nil, api_key=nil, host=nil)
       @id = nil
       @email = nil
       @api_key = nil
@@ -28,7 +28,7 @@ module Megam
       @password_reset_sent_at = nil
       @created_at = nil
       @some_msg = {}
-      super(email, api_key)
+      super(email, api_key, host)
     end
 
     #used by resque workers and any other background job
@@ -201,7 +201,7 @@ module Megam
     end
 
     def self.from_hash(o)
-      acct = self.new(o[:email], o[:api_key])
+      acct = self.new(o[:email], o[:api_key], o[:host])
       acct.from_hash(o)
       acct
     end
@@ -233,8 +233,8 @@ module Megam
 
 
     # Load a account by email_p
-    def self.show(email,api_key=nil)
-      acct = self.new(email, api_key)
+    def self.show(email,api_key,host=nil)
+      acct = self.new(email, api_key, host)
       acct.megam_rest.get_accounts(email)
     end
 

data/lib/megam/core/assemblies.rb

@@ -16,14 +16,14 @@
 
 module Megam
   class Assemblies < Megam::ServerAPI
-    def initialize(email=nil, api_key=nil)
+    def initialize(email=nil, api_key=nil, host=nil)
       @id = nil
       @accounts_id = nil
       @name = nil
       @assemblies = []
       @inputs = []
       @created_at = nil
-      super(email, api_key)
+      super(email, api_key, host)
     end
 
     def assemblies
@@ -126,8 +126,8 @@ module Megam
       asm
     end
 
-    def self.from_hash(o,tmp_email=nil, tmp_api_key=nil)
-      asm = self.new(tmp_email, tmp_api_key)
+    def self.from_hash(o,tmp_email=nil, tmp_api_key=nil, tmp_host=nil)
+      asm = self.new(tmp_email, tmp_api_key, tmp_host)
       asm.from_hash(o)
       asm
     end
@@ -143,7 +143,7 @@ module Megam
     end
 
     def self.create(params)
-      asm = from_hash(params, params["email"] || params[:email], params["api_key"] || params[:api_key])
+      asm = from_hash(params, params["email"] || params[:email], params["api_key"] || params[:api_key], params["host"] || params[:host])
       asm.create
     end
 
@@ -153,13 +153,13 @@ module Megam
     end
 
     # Load a account by email_p
-    def self.show(one_assemblies_id, tmp_email=nil, tmp_api_key=nil)
-      asm = self.new(tmp_email, tmp_api_key)
+    def self.show(one_assemblies_id, tmp_email=nil, tmp_api_key=nil, tmp_host=nil)
+      asm = self.new(tmp_email, tmp_api_key, tmp_host)
       asm.megam_rest.get_one_assemblies(one_assemblies_id)
     end
 
     def self.list(params)
-      asm = self.new(params["email"], params["api_key"])
+      asm = self.new(params["email"], params["api_key"], params["host"])
       asm.megam_rest.get_assemblies
     end
 

data/lib/megam/core/assembly.rb

@@ -16,7 +16,7 @@
 
 module Megam
   class Assembly < Megam::ServerAPI
-    def initialize(email=nil, api_key=nil)
+    def initialize(email=nil, api_key=nil, host=nil)
       @id = nil
       @name = nil
       @tosca_type = nil
@@ -28,7 +28,7 @@ module Megam
       @outputs = []
       @status = nil
       @created_at = nil
-      super(email, api_key)
+      super(email, api_key, host)
     end
 
     def assembly
@@ -185,8 +185,8 @@ module Megam
       asm
     end
 
-    def self.from_hash(o,tmp_email=nil, tmp_api_key=nil)
-      asm = self.new(tmp_email, tmp_api_key)
+    def self.from_hash(o,tmp_email=nil, tmp_api_key=nil, tmp_host=nil)
+      asm = self.new(tmp_email, tmp_api_key, tmp_host)
       asm.from_hash(o)
       asm
     end
@@ -208,12 +208,12 @@ module Megam
 
 
     def self.show(params)
-      asm = self.new(params["email"], params["api_key"])
+      asm = self.new(params["email"], params["api_key"], params["host"])
       asm.megam_rest.get_one_assembly(params["id"])
     end
 
      def self.update(params)
-      asm = from_hash(params, params["email"] || params[:email], params["api_key"] || params[:api_key])
+      asm = from_hash(params, params["email"] || params[:email], params["api_key"] || params[:api_key], params["host"] || params[:host])
       asm.update
     end
 

data/lib/megam/core/auth.rb

@@ -26,7 +26,7 @@ module Megam
     end
 
     def megam_rest
-      Megam::API.new(Megam::Config[:email], Megam::Config[:api_key])
+      Megam::API.new(Megam::Config[:email], Megam::Config[:api_key], Megam::Config[:host])
     end
 
     def some_msg(arg=nil)

data/lib/megam/core/availableunits.rb

@@ -15,14 +15,14 @@
 ##
 module Megam
   class Availableunits < Megam::ServerAPI
-    def initialize(email=nil, api_key=nil)
+    def initialize(email=nil, api_key=nil, host=nil)
       @id = nil
       @name = nil
       @duration = nil
       @charges_per_duration = nil     
       @created_at = nil
       @some_msg = {}
-      super(email, api_key)
+      super(email, api_key, host)
     end
 
     def availableunits
@@ -127,8 +127,8 @@ module Megam
       aunit
     end
 
-    def self.from_hash(o,tmp_email=nil, tmp_api_key=nil)
-      aunit = self.new(tmp_email, tmp_api_key)
+    def self.from_hash(o,tmp_email=nil, tmp_api_key=nil, tmp_host=nil)
+      aunit = self.new(tmp_email, tmp_api_key, tmp_host)
       aunit.from_hash(o)
       aunit
     end
@@ -142,8 +142,8 @@ module Megam
       self
     end
 
-    def self.create(o,tmp_email=nil, tmp_api_key=nil)
-      acct = from_hash(o,tmp_email, tmp_api_key)
+    def self.create(o,tmp_email=nil, tmp_api_key=nil, tmp_host)
+      acct = from_hash(o,tmp_email, tmp_api_key, tmp_host)
       acct.create
     end
 
@@ -155,20 +155,20 @@ module Megam
     # Load all available units -
     # returns a AvailableUnitsCollection
     # don't return self. check if the Megam::AvailableUnitsCollection is returned.
-    def self.list(tmp_email=nil, tmp_api_key=nil)
-    aunit = self.new(tmp_email,tmp_api_key)
+    def self.list(tmp_email=nil, tmp_api_key=nil, tmp_host=nil)
+    aunit = self.new(tmp_email,tmp_api_key,tmp_host)
       aunit.megam_rest.get_availableunits
     end
 
     # Show a particular available units by name,
     # Megam::Availables
-    def self.show(p_name,tmp_email=nil, tmp_api_key=nil)
-    pre = self.new(tmp_email,tmp_api_key)
+    def self.show(p_name,tmp_email=nil, tmp_api_key=nil, tmp_host=nil)
+    pre = self.new(tmp_email,tmp_api_key, tmp_host)
     pre.megam_rest.get_availableunit(p_name)
     end
 
-    def self.delete(p_name,tmp_email=nil, tmp_api_key=nil)
-    pre = self.new(tmp_email,tmp_api_key)
+    def self.delete(p_name,tmp_email=nil, tmp_api_key=nil, tmp_host=nil)
+    pre = self.new(tmp_email,tmp_api_key,tmp_host)
     pre.megam_rest.delete_availableunit(p_name)
     end
 

data/lib/megam/core/balances.rb

@@ -15,7 +15,7 @@
 ##
 module Megam
   class Balances < Megam::ServerAPI
-    def initialize(email=nil, api_key=nil)
+    def initialize(email=nil, api_key=nil, host=nil)
       @id = nil
       @accounts_id = nil
       @name = nil
@@ -23,7 +23,7 @@ module Megam
       @created_at = nil
       @updated_at = nil
       @some_msg = {}
-      super(email, api_key)
+      super(email, api_key, host)
     end
 
     def balances
@@ -137,8 +137,8 @@ module Megam
       balances
     end
 
-    def self.from_hash(o,tmp_email=nil, tmp_api_key=nil)
-      balances = self.new(tmp_email, tmp_api_key)
+    def self.from_hash(o,tmp_email=nil, tmp_api_key=nil, tmp_host=nil)
+      balances = self.new(tmp_email, tmp_api_key, tmp_host)
       balances.from_hash(o)
       balances
     end
@@ -154,7 +154,7 @@ module Megam
     end
 
     def self.create(params)
-      acct = from_hash(params,params["email"], params["api_key"])
+      acct = from_hash(params,params["email"], params["api_key"], params["host"])
       acct.create
     end
 
@@ -167,24 +167,24 @@ module Megam
     # returns a BalanceCollection
     # don't return self. check if the Megam::BalanceCollection is returned.
     def self.list(params)
-      balance = self.new(params["email"], params["api_key"])
+      balance = self.new(params["email"], params["api_key"], params["host"])
       balance.megam_rest.get_balances
     end
 
     # Show a particular balance by name,
     # Megam::Balance
      def self.show(params)
-      pre = self.new(params["email"], params["api_key"])
+      pre = self.new(params["email"], params["api_key"], params["host"])
       pre.megam_rest.get_balance(params["email"])
     end
 
-    def self.delete(p_name,tmp_email=nil, tmp_api_key=nil)
-      pre = self.new(tmp_email,tmp_api_key)
+    def self.delete(p_name,tmp_email=nil, tmp_api_key=nil, tmp_host=nil)
+      pre = self.new(tmp_email,tmp_api_key,tmp_host)
       pre.megam_rest.delete_balance(p_name)
     end
 
     def self.update(params)
-      asm = from_hash(params, params["email"], params["api_key"])
+      asm = from_hash(params, params["email"], params["api_key"], params["host"])
       asm.update
     end
 

data/lib/megam/core/billinghistories.rb

@@ -15,7 +15,7 @@
 ##
 module Megam
   class Billinghistories < Megam::ServerAPI
-    def initialize(email=nil, api_key=nil)
+    def initialize(email=nil, api_key=nil, host=nil)
       @id = nil
       @accounts_id = nil
       @assembly_id = nil
@@ -24,7 +24,7 @@ module Megam
       @currency_type = nil
       @created_at = nil
       @some_msg = {}
-      super(email, api_key)
+      super(email, api_key, host)
     end
 
     def billinghistories
@@ -150,8 +150,8 @@ module Megam
       bal
     end
 
-    def self.from_hash(o,tmp_email=nil, tmp_api_key=nil)
-      bal = self.new(tmp_email, tmp_api_key)
+    def self.from_hash(o,tmp_email=nil, tmp_api_key=nil, tmp_host=nil)
+      bal = self.new(tmp_email, tmp_api_key, tmp_host)
       bal.from_hash(o)
       bal
     end
@@ -167,8 +167,8 @@ module Megam
       self
     end
 
-    def self.create(o,tmp_email=nil, tmp_api_key=nil)
-      acct = from_hash(o,tmp_email, tmp_api_key)
+    def self.create(o,tmp_email=nil, tmp_api_key=nil, tmp_host=nil)
+      acct = from_hash(o,tmp_email, tmp_api_key, tmp_host)
       acct.create
     end
 
@@ -181,19 +181,19 @@ module Megam
     # returns a BillingHistoriesCollection
     # don't return self. check if the Megam::BillingHistoriesCollection is returned.
     def self.list(params)
-      billhistory = self.new(params["email"], params["api_key"])
+      billhistory = self.new(params["email"], params["api_key"], params["host"])
       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)
+    def self.show(p_name,tmp_email=nil, tmp_api_key=nil, tmp_host=nil)
+      pre = self.new(tmp_email,tmp_api_key, tmp_host)
       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)
+    def self.delete(p_name,tmp_email=nil, tmp_api_key=nil, tmp_host=nil)
+      pre = self.new(tmp_email,tmp_api_key, tmp_host)
       pre.megam_rest.delete_billinghistory(p_name)
     end
 

data/lib/megam/core/billings.rb

@@ -16,7 +16,7 @@
 module Megam
   class Billings < Megam::ServerAPI
     
-    def initialize(email=nil, api_key=nil)
+    def initialize(email=nil, api_key=nil, host=nil)
       @id = nil
       @accounts_id = nil
       @line1 = nil
@@ -28,7 +28,7 @@ module Megam
       @bill_type = nil
       @created_at = nil
       @some_msg = {}
-      super(email, api_key)
+      super(email, api_key, host)
     end
 
     def billings
@@ -190,8 +190,8 @@ module Megam
       cts
     end
 
-    def self.from_hash(o,tmp_email=nil, tmp_api_key=nil)
-      cts = self.new(tmp_email,tmp_api_key)
+    def self.from_hash(o,tmp_email=nil, tmp_api_key=nil, tmp_host=nil)
+      cts = self.new(tmp_email,tmp_api_key,tmp_host)
       cts.from_hash(o)
       cts
     end
@@ -209,8 +209,8 @@ module Megam
       self
     end
 
-    def self.create(o,tmp_email=nil, tmp_api_key=nil)
-      acct = from_hash(o,tmp_email, tmp_api_key)
+    def self.create(o,tmp_email=nil, tmp_api_key=nil,tmp_host=nil)
+      acct = from_hash(o,tmp_email, tmp_api_key, tmp_host)
       acct.create
     end
 
@@ -222,15 +222,15 @@ module Megam
     # Load all billings -
     # returns a billingsCollection
     # don't return self. check if the Megam::billingsCollection is returned.
-    def self.list(tmp_email=nil, tmp_api_key=nil)
-      cts = self.new(tmp_email, tmp_api_key)
+    def self.list(tmp_email=nil, tmp_api_key=nil, tmp_host=nil)
+      cts = self.new(tmp_email, tmp_api_key, tmp_host)
       cts.megam_rest.get_billings
     end
 
     # Show a particular billings by name,
     # Megam::billings
-    def self.show(p_name,tmp_email=nil, tmp_api_key=nil)
-      pre = self.new(tmp_email, tmp_api_key)
+    def self.show(p_name,tmp_email=nil, tmp_api_key=nil, tmp_host=nil)
+      pre = self.new(tmp_email, tmp_api_key, tmp_host)
       pre.megam_rest.get_billing(p_name)
     end
 

data/lib/megam/core/cat_requests.rb

@@ -16,7 +16,7 @@
 module Megam
   class CatRequests < Megam::ServerAPI
 
-    def initialize(email=nil, api_key=nil)
+    def initialize(email=nil, api_key=nil, host=nil)
       @id = nil
       @cat_id = nil
       @cattype = nil
@@ -24,7 +24,7 @@ module Megam
       @action = nil
       @some_msg = {}
       @created_at = nil
-      super(email, api_key)
+      super(email, api_key, host)
     end
 
     def cat_request
@@ -143,8 +143,8 @@ module Megam
       node
     end
 
-    def self.from_hash(o,tmp_email=nil, tmp_api_key=nil)
-      node = self.new(tmp_email, tmp_api_key)
+    def self.from_hash(o,tmp_email=nil, tmp_api_key=nil, tmp_host=nil)
+      node = self.new(tmp_email, tmp_api_key, tmp_host)
       node.from_hash(o)
       node
     end
@@ -161,7 +161,7 @@ module Megam
 
 
     def self.create(o)
-      acct = from_hash(o, o["email"], o["api_key"])
+      acct = from_hash(o, o["email"], o["api_key"], o["host"])
       acct.create
     end