megam_api 0.83 → 0.85

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f814ba34699702613f4170de436101ee77fd7f73
-  data.tar.gz: 3679a992351bdc4526ed4587a451f1be3e9e9d3e
+  metadata.gz: e7b28d854d2bc822f5e8948f61a254d8de1c4873
+  data.tar.gz: d03f30284539a0b2cdef981edd4eef32cbc0e24d
 SHA512:
-  metadata.gz: 9711406ffa238bf689b06deee32c0ab572730fc7bd05545a29e08f392cb6019a56a8ef7b518dfd88eebc7bb14fefa532c3ecaca281ee632d4a1e4e63fd3c645d
-  data.tar.gz: 11a0ac3339a11c22814a9a26a581f61458d11c325496a37aab20719196e2fcfd4a09391676d358a89f072a2ac2235d63567658e94ac6491a465292313b2181e1
+  metadata.gz: b974cd6149d3efdd35b100a4520b7cc2bda5430673c86eadd46c88f747f5c8d17c54016736015d4ae94fd2c3a3c8c0c688bedd39251361ca8d96af65c6298d5f
+  data.tar.gz: c46041ec809c04fdffd5ebcb149361c9c69ebfd02a0b3c2bc23fcd27eac3ccbf6e7027a13f4bae190a76f1999c7da022f00d0eef2f9b521725139f2b94e9ecea

data/lib/megam/api.rb

@@ -14,10 +14,8 @@ require 'megam/api/errors'
 require 'megam/api/version'
 require 'megam/api/accounts'
 require 'megam/api/requests'
-# require 'megam/api/cloud_tool_settings'
 require 'megam/api/sshkeys'
 require 'megam/api/marketplaces'
-require 'megam/api/marketplace_addons'
 require 'megam/api/organizations'
 require 'megam/api/domains'
 require 'megam/api/csars'
@@ -54,14 +52,10 @@ require 'megam/core/error'
 require 'megam/core/account'
 require 'megam/core/request'
 require 'megam/core/request_collection'
-# require 'megam/core/cloudtoolsetting'
-# require 'megam/core/cloudtoolsetting_collection'
 require 'megam/core/sshkey'
 require 'megam/core/sshkey_collection'
 require 'megam/core/marketplace'
 require 'megam/core/marketplace_collection'
-require 'megam/core/marketplace_addon'
-require 'megam/core/marketplace_addon_collection'
 require 'megam/core/organizations'
 require 'megam/core/organizations_collection'
 require 'megam/core/domains'
@@ -141,7 +135,7 @@ module Megam
     end
 
     def request(params, &block)
-    
+
       just_color_debug("#{@options[:path]}")
       start = Time.now
       Megam::Log.debug('START')

data/lib/megam/api/version.rb

@@ -1,5 +1,5 @@
 module Megam
   class API
-    VERSION = "0.83"
+    VERSION = "0.85"
   end
 end

data/lib/megam/core/config.rb

@@ -25,10 +25,6 @@ module Megam
       configuration.inspect
     end
 
-    megam_api_server_url   "http://localhost:9000"
-
-    megam_api_version      "v2"
-
     email nil
     api_key nil
 

data/lib/megam/core/json_compat.rb

@@ -35,12 +35,8 @@ module Megam
     MEGAM_BALANCESCOLLECTION          = 'Megam::BalancesCollection'.freeze
     MEGAM_BILLEDHISTORIES             = 'Megam::Billedhistories'.freeze
     MEGAM_BILLEDHISTORIESCOLLECTION   = 'Megam::BilledhistoriesCollection'.freeze
-    MEGAM_INVOICESCOLLECTION          = 'Megam::InvoicesCollection'.freeze
-    MEGAM_INVOICES                    = 'Megam::Invoices'.freeze
-    MEGAM_BILLINGS                    = 'Megam::Billings'.freeze  
+    MEGAM_BILLINGS                    = 'Megam::Billings'.freeze
     MEGAM_BILLINGSCOLLECTION          = 'Megam::BillingsCollection'.freeze
-    MEGAM_CLOUDTOOLSETTING            = 'Megam::CloudToolSetting'.freeze
-    MEGAM_CLOUDTOOLSETTINGCOLLECTION  = 'Megam::CloudToolSettingCollection'.freeze
     MEGAM_COMPONENTS                  = 'Megam::Components'.freeze
     MEGAM_COMPONENTSCOLLECTION        = 'Megam::ComponentsCollection'.freeze
     MEGAM_CREDITHISTORIES             = 'Megam::Credithistories'.freeze
@@ -51,16 +47,16 @@ module Megam
     MEGAM_DISCOUNTS                   = 'Megam::Discounts'.freeze
     MEGAM_DISCOUNTSCOLLECTION         = 'Megam::DiscountsCollection'.freeze
     MEGAM_ERROR                       = 'Megam::Error'.freeze
-    MEGAM_SENSORS                       = 'Megam::Sensors'.freeze
-    MEGAM_SENSORSCOLLECTION = 'Megam::SensorsCollection'.freeze
+    MEGAM_INVOICESCOLLECTION          = 'Megam::InvoicesCollection'.freeze
+    MEGAM_INVOICES                    = 'Megam::Invoices'.freeze
     MEGAM_MARKETPLACE                 = 'Megam::MarketPlace'.freeze
     MEGAM_MARKETPLACECOLLECTION       = 'Megam::MarketPlaceCollection'.freeze
-    MEGAM_MARKETPLACEADDON            = 'Megam::MarketPlaceAddons'.freeze
-    MEGAM_MARKETPLACEADDONCOLLECTION  = 'Megam::MarketPlaceAddonsCollection'.freeze
     MEGAM_ORGANIZATION                = 'Megam::Organizations'.freeze
     MEGAM_ORGANIZATIONSCOLLECTION     = 'Megam::OrganizationsCollection'.freeze
     MEGAM_REQUEST                     = 'Megam::Request'.freeze
     MEGAM_REQUESTCOLLECTION           = 'Megam::RequestCollection'.freeze
+    MEGAM_SENSORS                     = 'Megam::Sensors'.freeze
+    MEGAM_SENSORSCOLLECTION           = 'Megam::SensorsCollection'.freeze
     MEGAM_SSHKEY                      = 'Megam::SshKey'.freeze
     MEGAM_SSHKEYCOLLECTION            = 'Megam::SshKeyCollection'.freeze
     MEGAM_SUBSCRIPTIONS               = 'Megam::Subscriptions'.freeze
@@ -172,10 +168,6 @@ module Megam
           Megam::MarketPlace
         when MEGAM_MARKETPLACECOLLECTION
           Megam::MarketPlaceCollection
-        when MEGAM_MARKETPLACEADDON
-          Megam::MarketPlaceAddons
-        when MEGAM_MARKETPLACEADDONCOLLECTION
-          Megam::MarketPlaceAddonsCollection
         when MEGAM_ORGANIZATION
           Megam::Organizations
         when MEGAM_ORGANIZATIONSCOLLECTION

data/lib/megam/core/request.rb

@@ -20,7 +20,6 @@ module Megam
       @cat_id = nil
       @name = nil
       @cattype = nil
-      @command =nil
       @action = nil
       @category = nil
       @some_msg = {}
@@ -90,14 +89,6 @@ module Megam
       end
     end
 
-    def command(arg=nil)
-      if arg != nil
-        @command = arg
-      else
-      @command
-      end
-    end
-
     def some_msg(arg=nil)
       if arg != nil
         @some_msg = arg
@@ -120,7 +111,6 @@ module Megam
       index_hash["cattype"] = cattype
       index_hash["action"] = action
       index_hash["category"] = category
-      index_hash["command"] = command
       index_hash["created_at"] = created_at
       index_hash
     end
@@ -139,7 +129,6 @@ module Megam
         "cattype" => cattype,
         "action" => action,
         "category" => category,
-        "command" => command,
         "created_at" => created_at
       }
       result
@@ -154,7 +143,6 @@ module Megam
       node.cattype(o["cattype"]) if o.has_key?("cattype")
       node.action(o["action"]) if o.has_key?("action")
       node.category(o["category"]) if o.has_key?("category")
-      node.command(o["command"]) if o.has_key?("command")
       node.created_at(o["created_at"]) if o.has_key?("created_at")
       #success or error
       node.some_msg[:code] = o["code"] if o.has_key?("code")
@@ -177,7 +165,6 @@ module Megam
       @cattype = o[:cattype] if o.has_key?(:cattype)
       @action = o[:action] if o.has_key?(:action)
       @category = o[:category] if o.has_key?(:category)
-      @command  = o[:command] if o.has_key?(:command)
       @created_at = o[:created_at] if o.has_key?(:created_at)
       self
     end
@@ -206,7 +193,6 @@ module Megam
 
     def to_s
       Megam::Stuff.styled_hash(to_hash)
-    #"---> Megam::Account:[error=#{error?}]\n"+
     end
 
   end

data/lib/megam/mixins/assembly.rb

@@ -3,11 +3,11 @@ require File.expand_path("#{File.dirname(__FILE__)}/components")
 require File.expand_path("#{File.dirname(__FILE__)}/outputs")
 
 module Megam
-  class  Mixins
+  class Mixins
     class Assembly
       attr_reader :name, :components, :policies, :outputs, :mixins
       def initialize(params)
-        params = Hash[params.map{ |k, v| [k.to_sym, v] }]
+        params = Hash[params.map { |k, v| [k.to_sym, v] }]
         @name = params[:assemblyname]
         @mixins = CommonDeployable.new(params)
         @outputs = Outputs.new(params)
@@ -17,9 +17,9 @@ module Megam
 
       def to_hash
         result = @mixins.to_hash
-        result[:name]  = @name if @name
-        result[:components]  = @components if @components
-        result[:outputs] = @outputs.to_array  if @outputs
+        result[:name] = @name if @name
+        result[:components] = @components if @components
+        result[:outputs] = @outputs.to_array if @outputs
         result[:policies] = @policies if @policies
         result
       end
@@ -38,7 +38,6 @@ module Megam
           @components = []
         end
       end
-
     end
   end
 end

data/lib/megam/mixins/common_deployable.rb

@@ -20,8 +20,8 @@ module Megam
       end
 
       def initialize(params)
-        @tosca_type = ""
-        @status = "launching"
+        @tosca_type = ''
+        @status = 'launching'
         bld_toscatype(params)
         @inputs = InputGroupData.new(params)
         set_attributes(params)
@@ -29,9 +29,9 @@ module Megam
 
       def to_hash
         h = {
-          :status => status,
-          :tosca_type => tosca_type,
-          :inputs => inputs.to_hash
+          status: status,
+          tosca_type: tosca_type,
+          inputs: inputs.to_hash
         }
       end
 

data/lib/megam/mixins/components.rb

@@ -18,18 +18,18 @@ module Megam
 
       def to_hash
         result = @mixins.to_hash
-        result[:name]  = @name if @name
-        result[:artifacts]  = @artifacts if @artifacts
-        result[:repo]  = @repo if @repo
-        result[:operations]  = @operations if @operations
-        result[:outputs] = @outputs.to_array  if @outputs
+        result[:name] = @name if @name
+        result[:artifacts] = @artifacts if @artifacts
+        result[:repo] = @repo if @repo
+        result[:operations] = @operations if @operations
+        result[:outputs] = @outputs.to_array if @outputs
         result[:related_components] = @related_components if @related_components
         result
       end
 
-	def to_a
-		[to_hash]
-	end
+      def to_a
+        [to_hash]
+      end
 
       private
 
@@ -38,13 +38,13 @@ module Megam
       end
 
       def add_related_components(params)
-	related_components = []
+        related_components = []
         related_components << "#{params[:assemblyname]}.#{params[:domain]}/#{params[:componentname]}" if params.key?(:bind_type)
       end
 
       def add_operations(params)
         operations = []
-        operations.push(create_operation(Operations::CI, Operations::CI_DESCRIPTON,  params)) unless (params[:scm_name] && params[:scm_name].strip.empty?)
+        operations.push(create_operation(Operations::CI, Operations::CI_DESCRIPTON, params)) unless params[:scm_name] && params[:scm_name].strip.empty?
         operations.push(create_operation(Operations::BIND, Operations::BIND_DESCRIPTON, params)) if params.key?(:bind_type)
       end
 
@@ -74,18 +74,17 @@ module Megam
         set_attributes(params)
         @type = params[:type]
         @source = params[:scm_name]
-	@url = params[:source]
-	@oneclick = params[:oneclick]
+        @url = params[:source]
+        @oneclick = params[:oneclick]
       end
 
       def tohash
-        {  :rtype => @type,
-          :source => @source,
-          :oneclick => @oneclick,
-          :url => @url
+        {  rtype: @type,
+           source: @source,
+           oneclick: @oneclick,
+           url: @url
         }
       end
-
     end
 
     class Operations
@@ -94,16 +93,16 @@ module Megam
 
       ATTRIBUTES = []
 
-      CI = "CI".freeze
-      CI_DESCRIPTON = "always up to date code. sweet."
+      CI = 'CI'.freeze
+      CI_DESCRIPTON = 'always up to date code. sweet.'
 
-      BIND = "bind".freeze
-      BIND_DESCRIPTON = "bind. sweet."
-      def initialize(params,type, desc)
+      BIND = 'bind'.freeze
+      BIND_DESCRIPTON = 'bind. sweet.'
+      def initialize(params, type, desc)
         @type = type
         @desc = desc
-        #set_attributes(params)
-	@prop = prop(params)
+        # set_attributes(params)
+        @prop = prop(params)
       end
 
       def attributes
@@ -111,19 +110,20 @@ module Megam
       end
 
       def tohash
-        {   :operation_type => @type,
-          :description => @desc,
-          :properties => @prop
+        {   operation_type: @type,
+            description: @desc,
+            properties: @prop
         }
       end
-#Key_name mismatch. Key_name is to be changed.
-	def prop(params)
-    op = []
-    op << { 'key' => 'type', 'value' => params[:scm_name] }
-    op << { 'key' => 'token', 'value' => params[:scmtoken] || '' }
-    op << { 'key' => 'username', 'value' => params[:scmowner] || '' }
-      op
-	end
+
+      # Key_name mismatch. Key_name is to be changed.
+      def prop(params)
+        op = []
+        op << { 'key' => 'type', 'value' => params[:scm_name] }
+        op << { 'key' => 'token', 'value' => params[:scmtoken] || '' }
+        op << { 'key' => 'username', 'value' => params[:scmowner] || '' }
+        op
+      end
     end
 
     class Artifacts
@@ -142,9 +142,9 @@ module Megam
       end
 
       def tohash
-        {   :artifact_type => "",
-          :content => "",
-          :requirements => []
+        {   artifact_type: '',
+            content: '',
+            requirements: []
         }
       end
     end

data/lib/megam/mixins/megam_attributes.rb

@@ -1,14 +1,14 @@
 module Nilavu
   module MegamAttributes
     ATTRIBUTES = []
-    KEY = "key".freeze
-    VALUE = "value".freeze
+    KEY = 'key'.freeze
+    VALUE = 'value'.freeze
     attr_accessor *ATTRIBUTES
     def attributes
       NotImplementedError
     end
 
-    def initialize(control_data={})
+    def initialize(control_data = {})
       set_attributes(control_data)
     end
 

data/lib/megam/mixins/outputs.rb

@@ -19,6 +19,5 @@ module Megam
     def to_array
       array = []
     end
-
   end
 end

data/lib/megam/mixins/policies.rb

@@ -4,26 +4,24 @@ module Megam
       attr_reader :bind_type, :policymembers
 
       def initialize(params)
-	@bind_type = params[:bind_type] if params.key?(:bind_type)
-	@policymembers = params[:policymembers] if params.key?(:policymembers)
+        @bind_type = params[:bind_type] if params.key?(:bind_type)
+        @policymembers = params[:policymembers] if params.key?(:policymembers)
       end
 
       def to_array
-    com = []
-    if @bind_type && @bind_type != 'Unbound service'
-      value = {
-        name: 'bind policy',
-        ptype: 'colocated',
-        members: [
-          @policymembers
-        ]
-      }
-      com << value
-    end
-    com
+        com = []
+        if @bind_type && @bind_type != 'Unbound service'
+          value = {
+            name: 'bind policy',
+            ptype: 'colocated',
+            members: [
+              @policymembers
+            ]
+          }
+          com << value
+        end
+        com
       end
-
-
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: megam_api
 version: !ruby/object:Gem::Version
-  version: '0.83'
+  version: '0.85'
 platform: ruby
 authors:
 - Rajthilak, Kishorekumar Neelamegam, Thomas Alrin, Yeshwanth Kumar, Subash Sethurajan,
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-06 00:00:00.000000000 Z
+date: 2015-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -148,7 +148,6 @@ files:
 - lib/megam/api/errors.rb
 - lib/megam/api/invoices.rb
 - lib/megam/api/login.rb
-- lib/megam/api/marketplace_addons.rb
 - lib/megam/api/marketplaces.rb
 - lib/megam/api/organizations.rb
 - lib/megam/api/promos.rb
@@ -188,8 +187,6 @@ files:
 - lib/megam/core/konipai.rb
 - lib/megam/core/log.rb
 - lib/megam/core/marketplace.rb
-- lib/megam/core/marketplace_addon.rb
-- lib/megam/core/marketplace_addon_collection.rb
 - lib/megam/core/marketplace_collection.rb
 - lib/megam/core/monologger.rb
 - lib/megam/core/organizations.rb
@@ -264,8 +261,36 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Ruby Client for the Megam
-test_files: []
+test_files:
+- test/mixins/test_assemblies.rb
+- test/mixins/test_assembly.rb
+- test/mixins/test_component.rb
+- test/test_accounts.rb
+- test/test_assemblies.rb
+- test/test_assembly.rb
+- test/test_availableunits.rb
+- test/test_balances.rb
+- test/test_billedhistories.rb
+- test/test_billings.rb
+- test/test_cat_requests.rb
+- test/test_components.rb
+- test/test_credithistories.rb
+- test/test_csars.rb
+- test/test_discounts.rb
+- test/test_domains.rb
+- test/test_helper.rb
+- test/test_invoices.rb
+- test/test_login.rb
+- test/test_marketplaceaddons.rb
+- test/test_marketplaces.rb
+- test/test_organizations.rb
+- test/test_predefclouds.rb
+- test/test_promos.rb
+- test/test_requests.rb
+- test/test_sensors.rb
+- test/test_sshkeys.rb
+- test/test_subscriptions.rb

data/lib/megam/api/marketplace_addons.rb

@@ -1,27 +0,0 @@
-module Megam
-  class API
-
-#=begin
-    def get_addons(node_name)
-      @options = {:path => "/marketplaceaddons/#{node_name}",:body => ""}.merge(@options)
-
-      request(
-        :expects  => 200,
-        :method   => :get,
-        :body     => @options[:body]
-      )
-    end
-#=end
-    def post_addon(new_addon)
-      @options = {:path => '/marketplaceaddons/content',
-        :body => Megam::JSONCompat.to_json(new_addon)}.merge(@options)
-
-      request(
-        :expects  => 201,
-        :method   => :post,
-        :body     => @options[:body]
-      )
-    end
-
-  end
-end

data/lib/megam/core/marketplace_addon.rb

@@ -1,195 +0,0 @@
-# Copyright:: Copyright (c) 2012, 2014 Megam Systems
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-module Megam
-  class MarketPlaceAddons< Megam::ServerAPI
-
-    def initialize(email=nil, api_key=nil, host=nil)
-      @id = nil
-      @node_id = nil
-      @node_name = nil
-      @marketplace_id = nil
-      @config = nil
-      @config_id = nil
-      @created_at = nil
-      @some_msg = {}
-      super(email,api_key,host)
-    end
-
-    def market_place_addons
-      self
-    end
-
-
-    def id(arg=nil)
-      if arg != nil
-        @id = arg
-      else
-      @id
-      end
-    end
-
-    def node_id(arg=nil)
-      if arg != nil
-        @node_id = arg
-      else
-      @node_id
-      end
-    end
-
-    def node_name(arg=nil)
-      if arg != nil
-        @node_name = arg
-      else
-      @node_name
-      end
-    end
-
-    def marketplace_id(arg=nil)
-      if arg != nil
-        @marketplace_id = arg
-      else
-      @marketplace_id
-      end
-    end
-
-    def config_id(arg=nil)
-      if arg != nil
-        @config_id = arg
-      else
-      @config_id
-      end
-    end
-
-    def config(arg=nil)
-      if arg != nil
-        @config = arg
-      else
-      @config
-      end
-    end
-
-    def created_at(arg=nil)
-      if arg != nil
-        @created_at = arg
-      else
-      @created_at
-      end
-    end
-    def some_msg(arg=nil)
-      if arg != nil
-        @some_msg = arg
-      else
-      @some_msg
-      end
-    end
-
-    def error?
-      crocked  = true if (some_msg.has_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["node_id"] = node_id
-      index_hash["node_name"] = node_name
-      index_hash["marketplace_id"] = marketplace_id
-      index_hash["config"] = config
-      index_hash["config_id"] = config_id
-      index_hash["created_at"] = created_at
-      index_hash["some_msg"] = some_msg
-      index_hash
-    end
-
-    # Serialize this object as a hash: called from JsonCompat.
-    # Verify if this called from JsonCompat during testing.
-    def to_json(*a)
-      for_json.to_json(*a)
-    end
-
-    def for_json
-      result = {
-        "id" => id,
-        "node_id" => node_id,
-        "node_name" => node_name,
-        "marketplace_id" => marketplace_id,
-        "config" => {},
-        "config_id" => config_id,
-        "created_at" => created_at
-      }
-      result
-    end
-
-
-    def self.json_create(o)
-      addon = new
-      addon.id(o["id"]) if o.has_key?("id")
-      addon.node_id(o["node_id"]) if o.has_key?("node_id")
-      addon.node_name(o["node_name"]) if o.has_key?("node_name")
-      addon.marketplace_id(o["marketplace_id"]) if o.has_key?("marketplace_id")
-      addon.config(o["config"]) if o.has_key?("config")
-      addon.config_id(o["config_id"]) if o.has_key?("config_id")
-      addon.created_at(o["created_at"]) if o.has_key?("created_at")
-
-      addon.some_msg[:code] = o["code"] if o.has_key?("code")
-      addon.some_msg[:msg_type] = o["msg_type"] if o.has_key?("msg_type")
-      addon.some_msg[:msg]= o["msg"] if o.has_key?("msg")
-      addon.some_msg[:links] = o["links"] if o.has_key?("links")
-
-      addon
-    end
-
-    def self.from_hash(o,tmp_email=nil, tmp_api_key=nil, tmp_host=nil)
-      addon = self.new(tmp_email, tmp_api_key, tmp_host)
-      addon.from_hash(o)
-      addon
-    end
-
-    def from_hash(o)
-      @id        = o["id"] if o.has_key?("id")
-      @node_id        = o["node_id"] if o.has_key?("node_id")
-      @node_name = o["node_name"] if o.has_key?("node_name")
-      @marketplace_id   = o["marketplace_id"] if o.has_key?("marketplace_id")
-      @config   = o["config"] if o.has_key?("config")
-      @config_id  = o["config_id"] if o.has_key?("config_id")
-      @created_at        = o["created_at"] if o.has_key?("created_at")
-      self
-    end
-
-    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
-
-    # Create the addon via the REST API
-    def create
-      megam_rest.post_addon(to_hash)
-    end
-
-    # Load a account by email_p
-    def self.list(node_name,tmp_email=nil, tmp_api_key=nil, tmp_host=nil)
-      addon = self.new(tmp_email, tmp_api_key, tmp_host)
-      addon.megam_rest.get_addons(node_name)
-      #self
-    end
-
-    def to_s
-      Megam::Stuff.styled_hash(to_hash)
-    end
-
-  end
-end

data/lib/megam/core/marketplace_addon_collection.rb

@@ -1,148 +0,0 @@
-# Copyright:: Copyright (c) 2012, 2014 Megam Systems
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-module Megam
-  class MarketPlaceAddonsCollection
-    include Enumerable
-
-    
-    attr_reader :iterator
-    def initialize
-      @addons = Array.new
-      @addons_by_name = Hash.new
-      @insert_after_idx = nil
-    end
-
-    def all_addons
-      @addons
-    end
-
-    def [](index)
-      @addons[index]
-    end
-
-    def []=(index, arg)
-      is_megam_addon(arg)
-      @addons[index] = arg
-      @addons_by_name[arg.id] = index
-    end
-
-    def <<(*args)
-      args.flatten.each do |a|
-        is_megam_addon(a)
-        @addons << a
-        @addons_by_name[a.id] = @addons.length - 1
-      end
-      self
-    end
-
-    # 'push' is an alias method to <<
-    alias_method :push, :<<
-
-    def insert(addon)
-      is_megam_addon(addon)
-      if @insert_after_idx
-        # in the middle of executing a run, so any addons inserted now should
-        # be placed after the most recent addition done by the currently executing
-        # addons
-        @addons.insert(@insert_after_idx + 1, addon)
-        # update name -> location mappings and register new addons
-        @addons_by_name.each_key do |key|
-        @addons_by_name[key] += 1 if @addons_by_name[key] > @insert_after_idx
-        end
-        @addons_by_name[addon.id] = @insert_after_idx + 1
-        @insert_after_idx += 1
-      else
-      @addons << addon
-      @addons_by_name[addon.id] = @addons.length - 1 
-      end
-    end
-
-    def each
-      @addons.each do |addon|
-        yield addon
-      end
-    end
-
-    def each_index
-      @addons.each_index do |i|
-        yield i
-      end
-    end
-
-    def empty?
-      @addons.empty?
-    end
-
-    def lookup(addon)
-      lookup_by = nil
-      if addon.kind_of?(Megam::MarketPlaceAddons)
-      lookup_by = addon.id
-      elsif addon.kind_of?(String)
-      lookup_by = addon
-      else
-        raise ArgumentError, "Must pass a Megam::MarketPlaceAddons or String to lookup"
-      end
-      res = @addons_by_name[lookup_by]
-      unless res
-        raise ArgumentError, "Cannot find a appreq matching #{lookup_by} (did you define it first?)"
-      end
-      @addons[res]
-    end
-    
-     # Transform the ruby obj ->  to a Hash
-    def to_hash
-      index_hash = Hash.new
-      self.each do |addon|
-        index_hash[addon.id] = addon.to_s
-      end
-      index_hash
-    end
-
-    # Serialize this object as a hash: called from JsonCompat.
-    # Verify if this called from JsonCompat during testing.
-    def to_json(*a)
-      for_json.to_json(*a)
-    end
-
-
-    def self.json_create(o)
-      collection = self.new()
-      o["results"].each do |addons_list|
-       addons_array = addons_list.kind_of?(Array) ? addons_list : [ addons_list ]
-        addons_array.each do |addon|
-          collection.insert(addon)
-        end
-      end
-      collection
-    end
-
-    private
-
-    
-    
-    def is_megam_addon(arg)
-      unless arg.kind_of?(Megam::MarketPlaceAddons)
-        raise ArgumentError, "Members must be Megam::MarketPlaceAddons"
-      end
-      true
-    end
-
-    def to_s
-      Megam::Stuff.styled_hash(to_hash)
-    end
-
-  end
-end