megam_api 0.73 → 0.75

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67d28ae2a87930c4b944ae4b778696e72ce0ac7c
-  data.tar.gz: fa247596489d7a31251b48b8335c1fafffd95498
+  metadata.gz: 71c2300fe07469f9620a2a8aa85416daca5ec6a7
+  data.tar.gz: 625d47cb3a4f19f7c4c4597e4a9bc5c304f4fdd2
 SHA512:
-  metadata.gz: 4922f672dcafdb0993c93ef84e96a392dcea443eec3403d5dd4cbc72198ff78c808db5352234c238fb8ce7085d4d2bb773dc362783fb4f0697c9e4f568fe694e
-  data.tar.gz: 3895bfc122d83b32c1ee3ec9dbaa2948786527a8c0ff6f767313bbf9a9a2125848be2d46a7a83daabe78a5eec7562d48f85e51fc4fedf104bbbd7349de378fc7
+  metadata.gz: 607188d7cae267b3418ee76b2ade88323a87ab161862bb8677f21eb18142d138f7ef688ffd31c6413868e47f2c996ba548f3a50e857d69973de953471d275b90
+  data.tar.gz: 7eb58498ba9585db3401e347d9ef9bf84b230ad0100485a3406d8ccfb5a0c24d8b11f70ab4086677bd258b909c9c0a2e2540dd13350e8c42e9ad8901db4eded2

data/lib/megam/api.rb

@@ -33,6 +33,7 @@ require 'megam/api/credithistories'
 require 'megam/api/discounts'
 require 'megam/api/subscriptions'
 require 'megam/api/promos'
+require 'megam/api/invoices'
 
 require 'megam/core/server_api'
 require 'megam/core/config'
@@ -82,6 +83,8 @@ require 'megam/core/discounts'
 require 'megam/core/subscriptions_collection'
 require 'megam/core/subscriptions'
 require 'megam/core/promos'
+require 'megam/core/invoices_collection'
+require 'megam/core/invoices'
 
 module Megam
   class API

data/lib/megam/api/assembly.rb

@@ -1,26 +1,25 @@
+
 module Megam
   class API
     def get_one_assembly(asm_id)
-
-      @options = {:path => "/assembly/#{asm_id}",:body => ""}.merge(@options)
+      @options = { path: "/assembly/#{asm_id}", body: '' }.merge(@options)
 
       request(
-        :expects  => 200,
-        :method   => :get,
-        :body     => @options[:body]
+        expects: 200,
+        method: :get,
+        body: @options[:body]
       )
     end
-    
-     def update_assembly(new_asm)
-      @options = {:path => '/assembly/update',
-        :body => Megam::JSONCompat.to_json(new_asm)}.merge(@options)
+
+    def update_assembly(new_asm)
+      @options = { path: '/assembly/update',
+                   body: Megam::JSONCompat.to_json(new_asm) }.merge(@options)
 
       request(
-        :expects  => [200, 201],
-        :method   => :post,
-        :body     => @options[:body]
+        expects: [200, 201],
+        method: :post,
+        body: @options[:body]
       )
-    end
-
+   end
   end
 end

data/lib/megam/api/components.rb

@@ -1,25 +1,24 @@
 module Megam
   class API
     def get_components(comp_id)
-      @options = {:path => "/components/#{comp_id}",:body => ""}.merge(@options)
+      @options = { path: "/components/#{comp_id}", body: '' }.merge(@options)
 
       request(
-        :expects  => 200,
-        :method   => :get,
-        :body     => @options[:body]
+        expects: 200,
+        method: :get,
+        body: @options[:body]
       )
     end
 
-     def update_component(new_asm)
-      @options = {:path => '/components/update',
-        :body => Megam::JSONCompat.to_json(new_asm)}.merge(@options)
+    def update_component(new_asm)
+      @options = { path: '/components/update',
+                   body: Megam::JSONCompat.to_json(new_asm) }.merge(@options)
 
       request(
-        :expects  => [200, 201],
-        :method   => :post,
-        :body     => @options[:body]
+        expects: [200, 201],
+        method: :post,
+        body: @options[:body]
       )
-    end
-
+   end
   end
 end

data/lib/megam/api/invoices.rb

@@ -0,0 +1,35 @@
+module Megam
+  class API
+    def get_invoices
+      @options = {:path => '/invoices',:body => ""}.merge(@options)
+
+      request(
+        :expects  => 200,
+        :method   => :get,
+        :body     => @options[:body]
+      )
+    end
+
+    def get_invoice(id)
+      @options = {:path => "/invoices/#{id}",:body => ""}.merge(@options)
+
+      request(
+        :expects  => 200,
+        :method   => :get,
+        :body     => @options[:body]
+      )
+    end
+
+    def post_invoices(new_invoices)
+      @options = {:path => '/invoices/content',
+        :body => Megam::JSONCompat.to_json(new_invoices)}.merge(@options)
+
+      request(
+        :expects  => 201,
+        :method   => :post,
+        :body     => @options[:body]
+      )
+    end
+
+  end
+end

data/lib/megam/api/version.rb

@@ -1,5 +1,5 @@
 module Megam
   class API
-    VERSION = "0.73"
+    VERSION = "0.75"
   end
 end

data/lib/megam/core/assembly.rb

@@ -16,19 +16,18 @@
 
 module Megam
   class Assembly < Megam::ServerAPI
-    def initialize(email=nil, api_key=nil, host=nil)
+    def initialize(email = nil, api_key = nil, host = nil)
       @id = nil
       @asms_id = nil
       @name = nil
-      @tosca_type = nil
       @components = []
-      @requirements = []
-      @policies=[]
+      @tosca_type = nil
+      @policies = []
       @inputs = []
-      @operations = []
       @outputs = []
       @status = nil
       @created_at = nil
+
       super(email, api_key, host)
     end
 
@@ -36,11 +35,11 @@ module Megam
       self
     end
 
-    def id(arg=nil)
-      if arg != nil
+    def id(arg = nil)
+      if !arg.nil?
         @id = arg
       else
-      @id
+        @id
       end
     end
 
@@ -52,106 +51,88 @@ module Megam
       end
     end
 
-    def name(arg=nil)
-      if arg != nil
+    def name(arg = nil)
+      if !arg.nil?
         @name = arg
       else
-      @name
+        @name
       end
     end
 
-    def tosca_type(arg=nil)
-      if arg != nil
+    def tosca_type(arg = nil)
+      if !arg.nil?
         @tosca_type = arg
       else
-      @tosca_type
+        @tosca_type
       end
     end
 
-    def components(arg=[])
+    def components(arg = [])
       if arg != []
         @components = arg
       else
-      @components
-      end
-    end
-
-    def requirements(arg=[])
-      if arg != []
-        @requirements = arg
-      else
-      @requirements
+        @components
       end
     end
 
-    def policies(arg=[])
+    def policies(arg = [])
       if arg != []
         @policies = arg
       else
-      @policies
+        @policies
       end
     end
 
-    def inputs(arg=[])
+    def inputs(arg = [])
       if arg != []
         @inputs = arg
       else
-      @inputs
+        @inputs
       end
     end
 
-    def operations(arg=nil)
-      if arg != nil
-        @operations = arg
-      else
-      @operations
-      end
-    end
-
-    def outputs(arg=[])
+    def outputs(arg = [])
       if arg != []
         @outputs = arg
       else
-      @outputs
+        @outputs
       end
     end
 
-    def status(arg=nil)
-      if arg != nil
+    def status(arg = nil)
+      if !arg.nil?
         @status = arg
       else
-      @status
+        @status
       end
     end
 
-    def created_at(arg=nil)
-      if arg != nil
+    def created_at(arg = nil)
+      if !arg.nil?
         @created_at = arg
       else
-      @created_at
+        @created_at
+       end
       end
-    end
 
     def error?
-      crocked  = true if (some_msg.has_key?(:msg_type) && some_msg[:msg_type] == "error")
+      crocked = true if some_msg.key?(:msg_type) && some_msg[:msg_type] == 'error'
     end
 
     # Transform the ruby obj ->  to a Hash
     def to_hash
-      index_hash = Hash.new
-      index_hash["json_claz"] = self.class.name
-      index_hash["id"] = id
-      index_hash["asms_id"] = asms_id
-      index_hash["name"] = name
-      index_hash["tosca_type"] = tosca_type
-      index_hash["components"] = components
-      index_hash["requirements"] = requirements
-      index_hash["policies"] = policies
-      index_hash["inputs"] = inputs
-      index_hash["operations"] = operations
-      index_hash["outputs"] = outputs
-      index_hash["status"] = status
-      index_hash["created_at"] = created_at
+      index_hash = {}
+      index_hash['json_claz'] = self.class.name
+      index_hash['id'] = id
+       index_hash["asms_id"] = asms_id
+      index_hash['name'] = name
+      index_hash['components'] = components
+      index_hash['tosca_type'] = tosca_type
+      index_hash['policies'] = policies
+      index_hash['inputs'] = inputs
+      index_hash['outputs'] = outputs
+      index_hash['status'] = status
+      index_hash['created_at'] = created_at
       index_hash
     end
 
@@ -163,17 +144,15 @@ module Megam
 
     def for_json
       result = {
-        "id" => id,
-        "name" => name,
-        "tosca_type" => tosca_type,
-        "components" => components,
-        "requirements" => requirements,
-        "policies" => policies,
-        "inputs" => inputs,
-        "operations" => operations,
-        "outputs" => outputs,
-        "status" => status,
-        "created_at" => created_at
+        'id' => id,
+        'name' => name,
+        'components' => components,
+        'tosca_type' => tosca_type,
+        'policies' => policies,
+        'inputs' => inputs,
+        'outputs' => outputs,
+        'status' => status,
+        'created_at' => created_at
       }
 
       result
@@ -181,53 +160,48 @@ module Megam
 
     def self.json_create(o)
       asm = new
-      asm.id(o["id"]) if o.has_key?("id")
+      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.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.requirements(o["requirements"]) if o.has_key?("requirements")
-      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")
-      asm.operations(o["operations"]) if o.has_key?("operations")
-      asm.outputs(o["outputs"]) if o.has_key?("outputs")
-      asm.status(o["status"]) if o.has_key?("status")
-      asm.created_at(o["created_at"]) if o.has_key?("created_at")
+      asm.name(o['name']) if o.key?('name')
+      asm.components(o['components']) if o.key?('components')
+      asm.tosca_type(o['tosca_type']) if o.key?('tosca_type')
+      asm.policies(o['policies']) if o.key?('policies') # this will be an array? can hash store array?
+      asm.inputs(o['inputs']) if o.key?('inputs')
+      asm.outputs(o['outputs']) if o.key?('outputs')
+      asm.status(o['status']) if o.key?('status')
+      asm.created_at(o['created_at']) if o.key?('created_at')
       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, tmp_email = nil, tmp_api_key = nil, tmp_host = nil)
+      asm = new(tmp_email, tmp_api_key, tmp_host)
       asm.from_hash(o)
       asm
     end
 
     def from_hash(o)
-      @id                = o["id"] if o.has_key?("id")
-      @asms_id           = o["asmd_id"] if o.has_key?("asms_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")
-      @requirements      = o["requirements"] if o.has_key?("requirements")
-      @policies          = o["policies"] if o.has_key?("policies")
-      @inputs            = o["inputs"] if o.has_key?("inputs")
-      @operations        = o["operations"] if o.has_key?("operations")
-      @outputs           = o["outputs"] if o.has_key?("outputs")
-      @status            = o["status"] if o.has_key?("status")
-      @created_at        = o["created_at"] if o.has_key?("created_at")
+      @id                = o['id'] if o.key?('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')
+      @policies          = o['policies'] if o.key?('policies')
+      @inputs            = o['inputs'] if o.key?('inputs')
+      @outputs           = o['outputs'] if o.key?('outputs')
+      @status            = o['status'] if o.key?('status')
+      @created_at        = o['created_at'] if o.key?('created_at')
       self
     end
 
-
     def self.show(params)
-      asm = self.new(params["email"], params["api_key"], params["host"])
-      asm.megam_rest.get_one_assembly(params["id"])
+      asm = 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], params["host"] || params[:host])
+    def self.update(params)
+      asm = from_hash(params, params['email'] || params[:email], params['api_key'] || params[:api_key], params['host'] || params[:host])
       asm.update
-    end
+   end
 
     # Create the node via the REST API
     def update
@@ -237,6 +211,5 @@ module Megam
     def to_s
       Megam::Stuff.styled_hash(to_hash)
     end
-
   end
 end

data/lib/megam/core/components.rb

@@ -16,12 +16,12 @@
 
 module Megam
   class Components < Megam::ServerAPI
-    def initialize(email=nil, api_key=nil, host=nil)
+    def initialize(email = nil, api_key = nil, host = nil)
       @id = nil
-      @name =nil
+      @name = nil
       @tosca_type = nil
       @inputs = []
-      @outputs = []      
+      @outputs = []
       @artifacts = {}
       @artifact_type = nil
       @content = nil
@@ -29,6 +29,11 @@ module Megam
       @related_components = []
       @operations = []
       @status = nil
+      @repo = {}
+      @rtype = nil
+      @source = nil
+      @oneclick = nil
+      @url = nil
       @created_at = nil
 
       super(email, api_key, host)
@@ -38,128 +43,169 @@ module Megam
       self
     end
 
-    def id(arg=nil)
-      if arg != nil
+    def id(arg = nil)
+      if !arg.nil?
         @id = arg
       else
-      @id
+        @id
       end
     end
 
-    def name(arg=nil)
-      if arg != nil
+    def name(arg = nil)
+      if !arg.nil?
         @name = arg
       else
-      @name
+        @name
       end
     end
 
-    def tosca_type(arg=nil)
-      if arg != nil
+    def tosca_type(arg = nil)
+      if !arg.nil?
         @tosca_type = arg
       else
-      @tosca_type
+        @tosca_type
       end
     end
-    
-    def inputs(arg=[])
+
+    def inputs(arg = [])
       if arg != []
         @inputs = arg
       else
-      @inputs
+        @inputs
       end
     end
-    
-    def outputs(arg=[])
+
+    def outputs(arg = [])
       if arg != []
         @outputs = arg
       else
-      @outputs
+        @outputs
       end
     end
 
-    def artifacts(arg=nil)
-      if arg != nil
+    def artifacts(arg = nil)
+      if !arg.nil?
         @artifacts = arg
       else
-      @artifacts
+        @artifacts
       end
     end
 
-    def artifact_type(arg=nil)
-      if arg != nil
+    def artifact_type(arg = nil)
+      if !arg.nil?
         @artifact_type = arg
       else
-      @artifact_type
+        @artifact_type
       end
     end
 
-    def content(arg=nil)
-      if arg != nil
+    def content(arg = nil)
+      if !arg.nil?
         @content = arg
       else
-      @content
+        @content
       end
     end
 
-    def artifact_requirements(arg=[])
+    def artifact_requirements(arg = [])
       if arg != []
         @artifact_requirements = arg
       else
-      @artifact_requirements
+        @artifact_requirements
       end
     end
 
-    def related_components(arg=[])
+    def related_components(arg = [])
       if arg != []
         @related_components = arg
       else
-      @related_components
+        @related_components
       end
     end
 
-    def operations(arg=[])
+    def operations(arg = [])
       if arg != []
         @operations = arg
       else
-      @operations
+        @operations
       end
     end
-    
-     def status(arg=nil)
-      if arg != nil
+
+    def status(arg = nil)
+      if !arg.nil?
         @status = arg
       else
-      @status
+        @status
+      end
+   end
+
+    def repo(arg = nil)
+      if !arg.nil?
+        @repo = arg
+      else
+        @repo
+      end
+   end
+
+    def rtype(arg = nil)
+      if !arg.nil?
+        @rtype = arg
+      else
+        @rtype
+      end
+   end
+
+    def source(arg = nil)
+      if !arg.nil?
+        @source = arg
+      else
+        @source
+      end
+   end
+
+    def oneclick(arg = nil)
+      if !arg.nil?
+        @oneclick = arg
+      else
+        @oneclick
       end
     end
 
-    def created_at(arg=nil)
-      if arg != nil
+    def url(arg = nil)
+      if !arg.nil?
+        @url = arg
+      else
+        @url
+      end
+   end
+
+    def created_at(arg = nil)
+      if !arg.nil?
         @created_at = arg
       else
-      @created_at
+        @created_at
       end
     end
 
     def error?
-      crocked  = true if (some_msg.has_key?(:msg_type) && some_msg[:msg_type] == "error")
+      crocked = true if some_msg.key?(:msg_type) && some_msg[:msg_type] == 'error'
     end
 
     # Transform the ruby obj ->  to a Hash
     def to_hash
-      index_hash = Hash.new
-      index_hash["json_claz"] = self.class.name
-      index_hash["id"] = id
-      index_hash["name"] = name
-      index_hash["tosca_type"] = tosca_type
-      index_hash["inputs"] = inputs
-      index_hash["outputs"] = outputs
-      index_hash["artifacts"] = artifacts
-      index_hash["related_components"] = related_components
-      index_hash["operations"] = operations
-      index_hash["status"] = status
-      index_hash["created_at"] = created_at
+      index_hash = {}
+      index_hash['json_claz'] = self.class.name
+      index_hash['id'] = id
+      index_hash['name'] = name
+      index_hash['tosca_type'] = tosca_type
+      index_hash['inputs'] = inputs
+      index_hash['outputs'] = outputs
+      index_hash['artifacts'] = artifacts
+      index_hash['related_components'] = related_components
+      index_hash['operations'] = operations
+      index_hash['status'] = status
+      index_hash['repo'] = repo
+      index_hash['created_at'] = created_at
       index_hash
     end
 
@@ -171,73 +217,81 @@ module Megam
 
     def for_json
       result = {
-        "id" => id,
-        "name" => name,
-        "tosca_type" => tosca_type,
-        "inputs" => inputs,
-        "outputs" => outputs,
-        "artifacts" => artifacts,
-        "related_components" => related_components,
-        "operations" => operations,
-        "status" => status,
-        "created_at" => created_at
+        'id' => id,
+        'name' => name,
+        'tosca_type' => tosca_type,
+        'inputs' => inputs,
+        'outputs' => outputs,
+        'artifacts' => artifacts,
+        'related_components' => related_components,
+        'operations' => operations,
+        'status' => status,
+        'repo' => repo,
+        'created_at' => created_at
       }
       result
     end
 
     def self.json_create(o)
       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.inputs(o["inputs"]) if o.has_key?("inputs")
-      asm.outputs(o["outputs"]) if o.has_key?("outputs")
-
-      ar = o["artifacts"]
-      asm.artifacts[:artifact_type] = ar["artifact_type"] if ar && ar.has_key?("artifact_type")
-      asm.artifacts[:content] = ar["content"] if ar && ar.has_key?("content")
-      asm.artifacts[:artifact_requirements] = ar["artifact_requirements"] if ar && ar.has_key?("artifact_requirements")
-
-      asm.related_components(o["related_components"]) if o.has_key?("related_components")
-      asm.operations(o["operations"]) if o.has_key?("operations")      
-      asm.status(o["status"]) if o.has_key?("status")
-      asm.created_at(o["created_at"]) if o.has_key?("created_at")
+      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')
+      asm.inputs(o['inputs']) if o.key?('inputs')
+      asm.outputs(o['outputs']) if o.key?('outputs')
+
+      ar = o['artifacts']
+      asm.artifacts[:artifact_type] = ar['artifact_type'] if ar && ar.key?('artifact_type')
+      asm.artifacts[:content] = ar['content'] if ar && ar.key?('content')
+      asm.artifacts[:artifact_requirements] = ar['artifact_requirements'] if ar && ar.key?('artifact_requirements')
+
+      asm.related_components(o['related_components']) if o.key?('related_components')
+      asm.operations(o['operations']) if o.key?('operations')
+      asm.status(o['status']) if o.key?('status')
+
+      ro = o['repo']
+      asm.repo[:rtype] = ro['rtype'] if ro && ro.key?('rtype')
+      asm.repo[:source] = ro['source'] if ro && ro.key?('source')
+      asm.repo[:oneclick] = ro['oneclick'] if ro && ro.key?('oneclick')
+      asm.repo[:url] = ro['url'] if ro && ro.key?('url')
+      asm.created_at(o['created_at']) if o.key?('created_at')
       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, tmp_email = nil, tmp_api_key = nil, tmp_host = nil)
+      asm = new(tmp_email, tmp_api_key, tmp_host)
       asm.from_hash(o)
       asm
     end
 
     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")
-      @inputs                          = o["inputs"] if o.has_key?("inputs")
-      @outputs                         = o["outputs"] if o.has_key?("outputs")
-      @artifacts                       = o["artifacts"] if o.has_key?("artifacts")
-      @related_components              = o["related_components"] if o.has_key?("related_components")
-      @operations                      = o["operations"] if o.has_key?("operations")
-      @status                          = o["status"] if o.has_key?("status")
-      @created_at                      = o["created_at"] if o.has_key?("created_at")
+      @id                              = o['id'] if o.key?('id')
+      @name                            = o['name'] if o.key?('name')
+      @tosca_type                      = o['tosca_type'] if o.key?('tosca_type')
+      @inputs                          = o['inputs'] if o.key?('inputs')
+      @outputs                         = o['outputs'] if o.key?('outputs')
+      @artifacts                       = o['artifacts'] if o.key?('artifacts')
+      @related_components              = o['related_components'] if o.key?('related_components')
+      @operations                      = o['operations'] if o.key?('operations')
+      @status                          = o['status'] if o.key?('status')
+      @repo                            = o['repo'] if o.key?('repo')
+      @created_at                      = o['created_at'] if o.key?('created_at')
       self
     end
 
     def self.create(params)
-      asm = from_hash(params, params["email"], params["api_key"], params["host"])
+      asm = from_hash(params, params['email'], params['api_key'], params['host'])
       asm.create
     end
 
     # Load a account by email_p
     def self.show(params)
-      asm = self.new(params["email"], params["api_key"], params["host"])
-      asm.megam_rest.get_components(params["id"])
+      asm = new(params['email'], params['api_key'], params['host'])
+      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, params['email'] || params[:email], params['api_key'] || params[:api_key], params['host'] || params[:host])
       asm.update
     end
 
@@ -249,6 +303,5 @@ module Megam
     def to_s
       Megam::Stuff.styled_hash(to_hash)
     end
-
   end
-end
+end