megam_api 0.92 → 0.93

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 071caa7bd474a339b47140544b4e0a8d91db1c35
-  data.tar.gz: fc7453b06ad55819e3c56effb9d7f87b04f277c6
+  metadata.gz: d8a15e5000dc77156d71acc72cfd7e6938bdd22a
+  data.tar.gz: fb4fcafb4e1bd33e7a0813524d1b6c80fb4fed2f
 SHA512:
-  metadata.gz: 4c8cdd71db440428818116497f3eb0e0fe4a9271a3a25e0f8978f1595d7274d26da043f1677d482efa1a1a9a51bdc38ea28df7193befc18f57143b5f142895fb
-  data.tar.gz: d9cc61b373ee547b96a23dc3d683eff055b25a4d670647bb359c4d219f0952b9092030015f5c610269418727ae25b71f3c0c0cdbb656c53650de8b52b298136a
+  metadata.gz: 58ef61fcfeeef6795df7fbb9f94ba8cf884d24b6e78e03e3b0ec3663d552bb572698a2218bba9441a178109921ea42bd5a6621ead97126a562aa55cdd658204a
+  data.tar.gz: 267663ea7f418aa31a6cad29e0d1155ea941b0f223283c0145dbf7652d624dbd3ab31d03123e1b1d2cf9f75fc9052cd2d30baeffac2ce6b8a1d06e0cc8031da3

data/lib/megam/api.rb

@@ -98,6 +98,7 @@ module Megam
     X_Megam_DATE = 'X-Megam-DATE'.freeze
     X_Megam_HMAC = 'X-Megam-HMAC'.freeze
     X_Megam_OTTAI = 'X-Megam-OTTAI'.freeze
+    X_Megam_ORG  = 'X-Megam-ORG'.freeze
 
     HEADERS = {
       'Accept' => 'application/json',
@@ -131,7 +132,9 @@ module Megam
       @options = OPTIONS.merge(options)
       @api_key = @options.delete(:api_key) || ENV['MEGAM_API_KEY']
       @email = @options.delete(:email)
-      fail Megam::API::Errors::AuthKeysMissing if @email.nil? || @api_key.nil?
+      @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?)
     end
 
     def request(params, &block)
@@ -184,7 +187,7 @@ module Megam
         Megam::Log.debug("#{response.body}")
 
         begin
-          unless response.headers[X_Megam_OTTAI]
+          unless response.headers[X_Megam_OTTAI]           
             response.body = Megam::JSONCompat.from_json(response.body.chomp)
             Megam::Log.debug('RESPONSE: Ruby Object')
           else
@@ -214,8 +217,8 @@ module Megam
       @options[:path] = API_VERSION2 + @options[:path]
       encoded_api_header = encode_header(@options)
       @options[:headers] = HEADERS.merge(X_Megam_HMAC => encoded_api_header[:hmac],
-      X_Megam_DATE => encoded_api_header[:date]).merge(@options[:headers])
-
+      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?)
       Megam::Log.debug('HTTP Request Data:')
       Megam::Log.debug("> HTTP #{@options[:scheme]}://#{@options[:host]}")
       @options.each do |key, value|
@@ -248,8 +251,12 @@ module Megam
       data = "#{current_date}" + "\n" + "#{cmd_parms[:path]}" + "\n" + "#{body_base64}"
 
       digest  = OpenSSL::Digest.new('sha1')
-      movingFactor = data.rstrip!
-      hash = OpenSSL::HMAC.hexdigest(digest, @api_key, movingFactor)
+      movingFactor = data.rstrip!     
+      if !(@password.nil?)
+        hash = OpenSSL::HMAC.hexdigest(digest, Base64.strict_decode64(@password), movingFactor)
+      else
+        hash = OpenSSL::HMAC.hexdigest(digest, @api_key, movingFactor)
+      end
       final_hmac = @email + ':' + hash
       header_params = { hmac: final_hmac, date: current_date }
     end

data/lib/megam/api/marketplaces.rb

@@ -1,7 +1,6 @@
 module Megam
   class API
 
-    # GET /nodes
     def get_marketplaceapps
       @options = {:path => '/marketplaces',:body => ""}.merge(@options)
 

data/lib/megam/api/organizations.rb

@@ -1,57 +1,51 @@
 module Megam
   class API
+    def get_organizations
 
-def get_organizations
+      @options = {:path => '/organizations',:body => ''}.merge(@options)
 
-  @options = {:path => '/organizations',:body => ''}.merge(@options)
-
-  request(
+      request(
         :expects => 200,
         :method => :get,
         :body => @options[:body]
 
   )
- end
+    end
 
-def get_organization(id)
+    def get_organization(id)
 
-  @options = {:path => "/organizations/#{id}",
+      @options = {:path => "/organizations/#{id}",
     :body => ''}.merge(@options)
 
-  request(
+      request(
     :expects  => 200,
     :method   => :get,
     :body     => @options[:body]
   )
-end
+    end
 
-
-def post_organization(new_organization)
+    def post_organization(new_organization)
 
       @options = {:path => '/organizations/content',
         :body =>  Megam::JSONCompat.to_json(new_organization)}.merge(@options)
 
-
-              request(
+      request(
                 :expects  => 201,
                 :method   => :post,
                 :body     => @options[:body]
                 )
-            end
-
-
+    end
 
     def update_organization(new_organization)
 
-        @options = {:path => '/organizations/update',
+      @options = {:path => '/organizations/update',
             :body =>  Megam::JSONCompat.to_json(new_organization)}.merge(@options)
 
-
-          request(
+      request(
               :expects  => 201,
               :method   => :post,
               :body     => @options[:body]
             )
-        end
-      end
+    end
+  end
 end

data/lib/megam/api/version.rb

@@ -1,5 +1,5 @@
 module Megam
   class API
-    VERSION = "0.92"
+    VERSION = "0.93"
   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, host=nil)
+    def initialize(o)
       @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, host)
+      super({:email => o[:email], :api_key => o[:api_key], :host => o[:host], :password => o[:password], :org_id => o[:org_id]})
     end
 
     #used by resque workers and any other background job
@@ -181,7 +181,7 @@ module Megam
 
     # Create a Megam::Account from JSON (used by the backgroud job workers)
     def self.json_create(o)
-      acct = new
+      acct = new({})
       acct.id(o["id"]) if o.has_key?("id")
       acct.email(o["email"]) if o.has_key?("email")
       acct.api_key(o["api_key"]) if o.has_key?("api_key")
@@ -201,7 +201,7 @@ module Megam
     end
 
     def self.from_hash(o)
-      acct = self.new(o[:email], o[:api_key], o[:host])
+      acct = self.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
     end
@@ -231,13 +231,19 @@ module Megam
       megam_rest.post_accounts(to_hash)
     end
 
-
+=begin
     # Load a account by email_p
-    def self.show(email,api_key,host=nil)
-      acct = self.new(email, api_key, host)
+    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]})
+      acct.megam_rest.get_accounts(o[:email])
+    end
 
     def self.update(o)
      acct = from_hash(o)

data/lib/megam/core/assemblies.rb

@@ -16,22 +16,22 @@
 
 module Megam
   class Assemblies < Megam::ServerAPI
-    def initialize(email=nil, api_key=nil, host=nil)
+    def initialize(o)
       @id = nil
       @accounts_id = nil
       @org_id = nil
       @name = nil
+      @password = nil
       @assemblies = []
       @inputs = []
       @created_at = nil
-      super(email, api_key, host)
+      super(o)
     end
 
     def assemblies
       self
     end
 
-
     def id(arg=nil)
       if arg != nil
         @id = arg
@@ -47,7 +47,7 @@ module Megam
       @accounts_id
       end
     end
-
+    
     def org_id(arg=nil)
       if arg != nil
         @org_id = arg
@@ -56,6 +56,14 @@ module Megam
       end
     end
 
+    def password(arg=nil)
+      if arg != nil
+        @password = arg
+      else
+      @password
+      end
+    end
+
     def name(arg=nil)
       if arg != nil
         @name = arg
@@ -72,7 +80,6 @@ module Megam
       end
     end
 
-
     def inputs(arg=[])
       if arg != []
         @inputs = arg
@@ -127,7 +134,7 @@ module Megam
     end
 
     def self.json_create(o)
-      asm = new
+      asm = new({})
       asm.id(o["id"]) if o.has_key?("id")
       asm.name(o["name"]) if o.has_key?("name")
       asm.accounts_id(o["accounts_id"]) if o.has_key?("accounts_id")
@@ -138,8 +145,8 @@ module Megam
       asm
     end
 
-    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)
+    def self.from_hash(o)
+      asm = self.new(o)
       asm.from_hash(o)
       asm
     end
@@ -148,15 +155,15 @@ module Megam
       @id                = o["id"] if o.has_key?("id")
       @name              = o["name"] if o.has_key?("name")
       @accounts_id       = o["accounts_id"] if o.has_key?("accounts_id")
-      @org_id       = o["org_id"] if o.has_key?("org_id")
+      @org_id            = o["org_id"] if o.has_key?("org_id")
       @assemblies        = o["assemblies"] if o.has_key?("assemblies")
-      @inputs             = o["inputs"] if o.has_key?("inputs")
+      @inputs            = o["inputs"] if o.has_key?("inputs")
       @created_at        = o["created_at"] if o.has_key?("created_at")
       self
     end
 
     def self.create(params)
-      asm = from_hash(params, params["email"] || params[:email], params["api_key"] || params[:api_key], params["host"] || params[:host])
+      asm = from_hash(params)
       asm.create
     end
 
@@ -166,13 +173,13 @@ module Megam
     end
 
     # Load a account by email_p
-    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)
+    def self.show(o)
+      asm = self.new(o)
+      asm.megam_rest.get_one_assemblies(o[:assemblies_id])
     end
 
     def self.list(params)
-      asm = self.new(params["email"], params["api_key"], params["host"])
+      asm = self.new(params)
       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, host = nil)
+    def initialize(o)
       @id = nil
       @asms_id = nil
       @name = nil
@@ -28,7 +28,7 @@ module Megam
       @status = nil
       @created_at = nil
 
-      super(email, api_key, host)
+      super(o)
     end
 
     def assembly
@@ -124,7 +124,7 @@ module Megam
       index_hash = {}
       index_hash['json_claz'] = self.class.name
       index_hash['id'] = id
-       index_hash["asms_id"] = asms_id
+      index_hash["asms_id"] = asms_id
       index_hash['name'] = name
       index_hash['components'] = components
       index_hash['tosca_type'] = tosca_type
@@ -159,7 +159,7 @@ module Megam
     end
 
     def self.json_create(o)
-      asm = new
+      asm = new({})
       asm.id(o['id']) if o.key?('id')
       asm.asms_id(o["asms_id"]) if o.has_key?("asms_id")
       asm.name(o['name']) if o.key?('name')
@@ -173,15 +173,15 @@ module Megam
       asm
     end
 
-    def self.from_hash(o, tmp_email = nil, tmp_api_key = nil, tmp_host = nil)
-      asm = new(tmp_email, tmp_api_key, tmp_host)
+    def self.from_hash(o)
+      asm = new(o)
       asm.from_hash(o)
       asm
     end
 
     def from_hash(o)
       @id                = o['id'] if o.key?('id')
-       @asms_id         = o["asms_id"] if o.has_key?("asms_id")
+      @asms_id           = o["asms_id"] if o.has_key?("asms_id")
       @name              = o['name'] if o.key?('name')
       @components        = o['components'] if o.key?('components')
       @tosca_type        = o['tosca_type'] if o.key?('tosca_type')
@@ -194,17 +194,17 @@ module Megam
     end
 
     def self.show(params)
-      asm = new(params['email'], params['api_key'], params['host'])
+      asm = new(params)
       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], params['host'] || params[:host])
+      asm = from_hash(params)
       asm.update
    end
 
    def self.upgrade(params)
-     asm = from_hash(params, params['email'] || params[:email], params['api_key'] || params[:api_key], params['host'] || params[:host])
+     asm = from_hash(params)
      asm.megam_rest.upgrade_assembly(params['id'])
    end
 
@@ -218,3 +218,4 @@ module Megam
     end
   end
 end
+

data/lib/megam/core/availableunits.rb

@@ -113,7 +113,7 @@ module Megam
 
     #
     def self.json_create(o)
-      aunit = new
+      aunit = new({})
       aunit.id(o["id"]) if o.has_key?("id")
       aunit.name(o["name"]) if o.has_key?("name")     
       aunit.duration(o["duration"]) if o.has_key?("duration")
@@ -179,3 +179,4 @@ module Megam
 
   end
 end
+

data/lib/megam/core/balances.rb

@@ -199,3 +199,4 @@ module Megam
 
   end
 end
+

data/lib/megam/core/billedhistories.rb

@@ -203,3 +203,4 @@ module Megam
 
   end
 end
+

data/lib/megam/core/components.rb

@@ -16,7 +16,7 @@
 
 module Megam
   class Components < Megam::ServerAPI
-    def initialize(email = nil, api_key = nil, host = nil)
+    def initialize(o)
       @id = nil
       @name = nil
       @tosca_type = nil
@@ -37,7 +37,7 @@ module Megam
       @url = nil
       @created_at = nil
 
-      super(email, api_key, host)
+      super(o)
     end
 
     def components
@@ -244,7 +244,7 @@ module Megam
     end
 
     def self.json_create(o)
-      asm = new
+      asm = new({})
       asm.id(o['id']) if o.key?('id')
       asm.name(o['name']) if o.key?('name')
       asm.tosca_type(o['tosca_type']) if o.key?('tosca_type')
@@ -269,8 +269,8 @@ module Megam
       asm
     end
 
-    def self.from_hash(o, tmp_email = nil, tmp_api_key = nil, tmp_host = nil)
-      asm = new(tmp_email, tmp_api_key, tmp_host)
+    def self.from_hash(o)
+      asm = new(o)
       asm.from_hash(o)
       asm
     end
@@ -292,18 +292,18 @@ module Megam
     end
 
     def self.create(params)
-      asm = from_hash(params, params['email'], params['api_key'], params['host'])
+      asm = from_hash(params)
       asm.create
     end
 
     # Load a account by email_p
     def self.show(params)
-      asm = new(params['email'], params['api_key'], params['host'])
+      asm = new(params)
       asm.megam_rest.get_components(params['id'])
     end
 
     def self.update(params)
-      asm = from_hash(params, params['email'] || params[:email], params['api_key'] || params[:api_key], params['host'] || params[:host])
+      asm = from_hash(params)
       asm.update
     end