megam_api 0.72 → 0.73

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10829b22401a59fc9bc209b0a3a107a37ab35b06
-  data.tar.gz: 79ec7f1a4bc07c1e111bef7ca3c71b2a5843f2f2
+  metadata.gz: 67d28ae2a87930c4b944ae4b778696e72ce0ac7c
+  data.tar.gz: fa247596489d7a31251b48b8335c1fafffd95498
 SHA512:
-  metadata.gz: feba2ff261c2964c2a51caef0c3629ba725cafaa2f5e872f9ee68596c7b5d1d7815d08de1ef9cba089b39d66e7342dbbdc43c01771ec4879cafbddc48f938828
-  data.tar.gz: d130ac562711645cd9b09d73f3d10d539328681bce844493286a4ce9c99b1fd048bd4ab89b391ed80f4a36fde23562de5c9af52ad352a1aa98e5c3a76c20e1e9
+  metadata.gz: 4922f672dcafdb0993c93ef84e96a392dcea443eec3403d5dd4cbc72198ff78c808db5352234c238fb8ce7085d4d2bb773dc362783fb4f0697c9e4f568fe694e
+  data.tar.gz: 3895bfc122d83b32c1ee3ec9dbaa2948786527a8c0ff6f767313bbf9a9a2125848be2d46a7a83daabe78a5eec7562d48f85e51fc4fedf104bbbd7349de378fc7

data/lib/megam/api/{billinghistories.rb → billedhistories.rb}

@@ -1,7 +1,7 @@
 module Megam
   class API
-    def get_billinghistories
-      @options = {:path => '/billinghistories',:body => ""}.merge(@options)
+    def get_billedhistories
+      @options = {:path => '/billedhistories',:body => ""}.merge(@options)
 
       request(
         :expects  => 200,
@@ -10,8 +10,8 @@ module Megam
       )
     end
 
-    def get_billinghistory(id)
-      @options = {:path => "/billinghistories/#{id}",:body => ""}.merge(@options)
+    def get_billedhistory(id)
+      @options = {:path => "/billedhistories/#{id}",:body => ""}.merge(@options)
 
       request(
         :expects  => 200,
@@ -20,9 +20,9 @@ module Megam
       )
     end
 
-    def post_billinghistories(new_billinghistory)
-      @options = {:path => '/billinghistories/content',
-        :body => Megam::JSONCompat.to_json(new_billinghistory)}.merge(@options)
+    def post_billedhistories(new_billedhistory)
+      @options = {:path => '/billedhistories/content',
+        :body => Megam::JSONCompat.to_json(new_billedhistory)}.merge(@options)
 
       request(
         :expects  => 201,

data/lib/megam/api/version.rb

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

data/lib/megam/api.rb

@@ -27,7 +27,7 @@ require 'megam/api/components'
 require 'megam/api/event'
 require 'megam/api/availableunits'
 require 'megam/api/balances'
-require 'megam/api/billinghistories'
+require 'megam/api/billedhistories'
 require 'megam/api/billings'
 require 'megam/api/credithistories'
 require 'megam/api/discounts'
@@ -71,8 +71,8 @@ require 'megam/core/availableunits_collection'
 require 'megam/core/availableunits'
 require 'megam/core/balances_collection'
 require 'megam/core/balances'
-require 'megam/core/billinghistories_collection'
-require 'megam/core/billinghistories'
+require 'megam/core/billedhistories_collection'
+require 'megam/core/billedhistories'
 require 'megam/core/billings_collection'
 require 'megam/core/billings'
 require 'megam/core/credithistories_collection'

data/lib/megam/core/{billinghistories.rb → billedhistories.rb}

@@ -14,7 +14,7 @@
 ## limitations under the License.
 ##
 module Megam
-  class Billinghistories < Megam::ServerAPI
+  class Billedhistories < Megam::ServerAPI
     def initialize(email=nil, api_key=nil, host=nil)
       @id = nil
       @accounts_id = nil
@@ -27,7 +27,7 @@ module Megam
       super(email, api_key, host)
     end
 
-    def billinghistories
+    def billedhistories
       self
     end
 
@@ -174,7 +174,7 @@ module Megam
 
     # Create the billing histories via the REST API
     def create
-      megam_rest.post_billinghistories(to_hash)
+      megam_rest.post_billedhistories(to_hash)
     end
 
     # Load all billing histories -
@@ -182,19 +182,19 @@ module Megam
     # don't return self. check if the Megam::BillingHistoriesCollection is returned.
     def self.list(params)
       billhistory = self.new(params["email"], params["api_key"], params["host"])
-      billhistory.megam_rest.get_billinghistories
+      billhistory.megam_rest.get_billedhistories
     end
 
     # Show a particular billing history by name,
     # Megam::BillingHistory
     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)
+      pre.megam_rest.get_billedhistory(p_name)
     end
 
     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)
+      pre.megam_rest.delete_billedhistory(p_name)
     end
 
     def to_s

data/lib/megam/core/billedhistories_collection.rb

@@ -0,0 +1,144 @@
+##
+## Copyright [2013-2015] [Megam Systems]
+##
+## 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 BilledhistoriesCollection
+    include Enumerable
+
+    attr_reader :iterator
+    def initialize
+      @billedhistories = Array.new
+      @billedhistories_by_name = Hash.new
+      @insert_after_idx = nil
+    end
+
+    def all_billedhistories
+      @billedhistories
+    end
+
+    def [](index)
+      @billedhistories[index]
+    end
+
+    def []=(index, arg)
+      is_megam_billedhistories(arg)
+      @billedhistories[index] = arg
+      @billedhistories_by_name[arg.accounts_id] = index
+    end
+
+    def <<(*args)
+      args.flatten.each do |a|
+        is_megam_billedhistories(a)
+        @billedhistories << a
+        @billedhistories_by_name[a.accounts_id] =@billedhistories.length - 1
+      end
+      self
+    end
+
+    # 'push' is an alias method to <<
+    alias_method :push, :<<
+
+    def insert(billedhistories)
+      is_megam_billedhistories(billedhistories)
+      if @insert_after_idx
+        # in the middle of executing a run, so any predefs inserted now should
+        # be placed after the most recent addition done by the currently executing
+        # billedhistories
+        @billedhistories.insert(@insert_after_idx + 1, billedhistories)
+        # update name -> location mappings and register new billedhistories
+        @billedhistories_by_name.each_key do |key|
+        @billedhistories_by_name[key] += 1 if@billedhistories_by_name[key] > @insert_after_idx
+        end
+        @billedhistories_by_name[billedhistories.accounts_id] = @insert_after_idx + 1
+        @insert_after_idx += 1
+      else
+      @billedhistories << billedhistories
+      @billedhistories_by_name[billedhistories.accounts_id] =@billedhistories.length - 1
+      end
+    end
+
+    def each
+      @billedhistories.each do |billedhistories|
+        yield billedhistories
+      end
+    end
+
+    def each_index
+      @billedhistories.each_index do |i|
+        yield i
+      end
+    end
+
+    def empty?
+      @billedhistories.empty?
+    end
+
+    def lookup(billedhistories)
+      lookup_by = nil
+      if Billedhistories.kind_of?(Megam::Billedhistories)
+      lookup_by = billedhistories.accounts_id
+    elsif billedhistories.kind_of?(String)
+      lookup_by = billedhistories
+      else
+        raise ArgumentError, "Must pass a Megam::billedhistories or String to lookup"
+      end
+      res =@billedhistories_by_name[lookup_by]
+      unless res
+        raise ArgumentError, "Cannot find a billedhistories matching #{lookup_by} (did you define it first?)"
+      end
+      @billedhistories[res]
+    end
+
+    # Transform the ruby obj ->  to a Hash
+    def to_hash
+      index_hash = Hash.new
+      self.each do |billedhistories|
+        index_hash[billedhistories.accounts_id] = billedhistories.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 |billedhistories_list|
+        billedhistories_array = billedhistories_list.kind_of?(Array) ? billedhistories_list : [ billedhistories_list ]
+        billedhistories_array.each do |billedhistories|
+          collection.insert(billedhistories)
+        end
+      end
+      collection
+    end
+
+    private
+
+    def is_megam_billedhistories(arg)
+      unless arg.kind_of?(Megam::Billedhistories)
+        raise ArgumentError, "Members must be Megam::billedhistories's"
+      end
+      true
+    end
+
+    def to_s
+      Megam::Stuff.styled_hash(to_hash)
+    end
+
+  end
+end

data/lib/megam/core/json_compat.rb

@@ -32,8 +32,8 @@ module Megam
     MEGAM_AVAILABLEUNITSCOLLECTION    = "Megam::AvailableunitsCollection".freeze
     MEGAM_BALANCES                    = "Megam::Balances".freeze
     MEGAM_BALANCESCOLLECTION          = "Megam::BalancesCollection".freeze
-    MEGAM_BILLINGHISTORIES            = "Megam::Billinghistories".freeze
-    MEGAM_BILLINGHISTORIESCOLLECTION  = "Megam::BillinghistoriesCollection".freeze
+    MEGAM_BILLEDHISTORIES            = "Megam::Billedhistories".freeze
+    MEGAM_BILLEDHISTORIESCOLLECTION  = "Megam::BilledhistoriesCollection".freeze
     MEGAM_BILLINGS                    = "Megam::Billings".freeze
     MEGAM_BILLINGSCOLLECTION          = "Megam::BillingsCollection".freeze
     MEGAM_CLOUDTOOLSETTING            = "Megam::CloudToolSetting".freeze
@@ -194,10 +194,10 @@ module Megam
           Megam::Balances
         when MEGAM_BALANCESCOLLECTION
           Megam::BalancesCollection
-        when MEGAM_BILLINGHISTORIES
-          Megam::Billinghistories
-        when MEGAM_BILLINGHISTORIESCOLLECTION
-          Megam::BillinghistoriesCollection
+        when MEGAM_BILLEDHISTORIES
+          Megam::Billedhistories
+        when MEGAM_BILLEDHISTORIESCOLLECTION
+          Megam::BilledhistoriesCollection
         when MEGAM_BILLINGS
           Megam::Billings
         when MEGAM_BILLINGSCOLLECTION

data/megam_api.gemspec

@@ -16,11 +16,11 @@ Gem::Specification.new do |s|
   s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-  s.add_runtime_dependency 'excon', '~> 0.45.3'
+  s.add_runtime_dependency 'excon', '~> 0.45.4'
   s.add_runtime_dependency 'highline', '~> 1.7'
   s.add_runtime_dependency 'yajl-ruby', '~> 1.2'
-  s.add_runtime_dependency 'mixlib-config', '~> 2.1'
+  s.add_runtime_dependency 'mixlib-config', '~> 2.2'
   s.add_runtime_dependency 'mixlib-log', '~> 1.6'
-  s.add_development_dependency 'minitest', '~> 5.6'
+  s.add_development_dependency 'minitest', '~> 5.8'
   s.add_development_dependency 'rake', '~> 10.4'
 end

data/test/{test_billinghistories.rb → test_billedhistories.rb}

@@ -2,30 +2,29 @@ require File.expand_path("#{File.dirname(__FILE__)}/test_helper")
 
 class TestApps < MiniTest::Unit::TestCase
 #=begin
-  def test_post_billinghistories
-    tmp_hash = { :accounts_id => "ACT93476985797", 
+  def test_post_billedhistories
+    tmp_hash = { :accounts_id => "ACT1262792663065821184",
                  :assembly_id => "ASM89687",
                  :bill_type => "paypal",
                  :billing_amount => "45",
                  :currency_type => "USD"
     }
 
-    response = megams.post_billinghistories(tmp_hash)
+    response = megams.post_billedhistories(tmp_hash)
     assert_equal(201, response.status)
   end
 #=end
 
 =begin
-  def test_get_billinghistories
-    response = megams.get_billinghistories
+  def test_get_billedhistories
+    response = megams.get_billedhistories
     assert_equal(200, response.status)
   end
 =end
 =begin
-  def test_get_billinghistories
-    response = megams.get_billinghistory("iaas_default")
+  def test_get_billedhistories
+    response = megams.get_billedhistory("iaas_default")
     assert_equal(200, response.status)
   end
 =end
 end
-

data/test/test_helper.rb

@@ -21,8 +21,8 @@ end
 
 def megams_new(options={})
 s_options = SANDBOX_HOST_OPTIONS.merge({
-  :email => "a@b.com",
-  :api_key => "CSefq53pY3Sv6iBERSjyRQ=="
+  :email => "rr@e.com",
+  :api_key => "7DDsX3Nw6tFkOMHAM1Es8w=="
 })
   options = s_options.merge(options)
   mg=Megam::API.new(options)
@@ -61,7 +61,7 @@ def random_email
 end
 
 def domain_name
-   "defaultdomain.co"
+   "megambox.com"
 end
 
 def sandbox_name
@@ -69,11 +69,11 @@ def sandbox_name
 end
 
 def sandbox_apikey
-"7bwpJHv1bvnfF-lAFZwWZQ=="  #{}"IamAtlas{74}NobdyCanSedfefdeME#07"
+"7DDsX3Nw6tFkOMHAM1Es8w=="  #{}"IamAtlas{74}NobdyCanSedfefdeME#07"
 end
 
 def sandbox_email
 #  "darth@vader.com"
 #"coolvader@iamswag.com"
-"cloud2@cloud.com"
+"rr@e.com"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: megam_api
 version: !ruby/object:Gem::Version
-  version: '0.72'
+  version: '0.73'
 platform: ruby
 authors:
 - Rajthilak, Kishorekumar Neelamegam, Thomas Alrin, Yeshwanth Kumar, Subash Sethurajan,
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.45.3
+        version: 0.45.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.45.3
+        version: 0.45.4
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -59,14 +59,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: mixlib-log
   requirement: !ruby/object:Gem::Requirement
@@ -87,14 +87,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.6'
+        version: '5.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.6'
+        version: '5.8'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -137,7 +137,7 @@ files:
 - lib/megam/api/assembly.rb
 - lib/megam/api/availableunits.rb
 - lib/megam/api/balances.rb
-- lib/megam/api/billinghistories.rb
+- lib/megam/api/billedhistories.rb
 - lib/megam/api/billings.rb
 - lib/megam/api/components.rb
 - lib/megam/api/credithistories.rb
@@ -165,8 +165,8 @@ files:
 - lib/megam/core/availableunits_collection.rb
 - lib/megam/core/balances.rb
 - lib/megam/core/balances_collection.rb
-- lib/megam/core/billinghistories.rb
-- lib/megam/core/billinghistories_collection.rb
+- lib/megam/core/billedhistories.rb
+- lib/megam/core/billedhistories_collection.rb
 - lib/megam/core/billings.rb
 - lib/megam/core/billings_collection.rb
 - lib/megam/core/components.rb
@@ -209,7 +209,7 @@ files:
 - test/test_assembly.rb
 - test/test_availableunits.rb
 - test/test_balances.rb
-- test/test_billinghistories.rb
+- test/test_billedhistories.rb
 - test/test_billings.rb
 - test/test_cat_requests.rb
 - test/test_components.rb
@@ -259,7 +259,7 @@ test_files:
 - test/test_assembly.rb
 - test/test_availableunits.rb
 - test/test_balances.rb
-- test/test_billinghistories.rb
+- test/test_billedhistories.rb
 - test/test_billings.rb
 - test/test_cat_requests.rb
 - test/test_components.rb

data/lib/megam/core/billinghistories_collection.rb

@@ -1,144 +0,0 @@
-##
-## Copyright [2013-2015] [Megam Systems]
-##
-## 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 BillinghistoriesCollection
-    include Enumerable
-
-    attr_reader :iterator
-    def initialize
-      @billinghistories = Array.new
-      @billinghistories_by_name = Hash.new
-      @insert_after_idx = nil
-    end
-
-    def all_billinghistories
-      @billinghistories
-    end
-
-    def [](index)
-      @billinghistories[index]
-    end
-
-    def []=(index, arg)
-      is_megam_billinghistories(arg)
-      @billinghistories[index] = arg
-      @billinghistories_by_name[arg.accounts_id] = index
-    end
-
-    def <<(*args)
-      args.flatten.each do |a|
-        is_megam_billinghistories(a)
-        @billinghistories << a
-        @billinghistories_by_name[a.accounts_id] =@billinghistories.length - 1
-      end
-      self
-    end
-
-    # 'push' is an alias method to <<
-    alias_method :push, :<<
-
-    def insert(billinghistories)
-      is_megam_billinghistories(billinghistories)
-      if @insert_after_idx
-        # in the middle of executing a run, so any predefs inserted now should
-        # be placed after the most recent addition done by the currently executing
-        # billinghistories
-        @billinghistories.insert(@insert_after_idx + 1, billinghistories)
-        # update name -> location mappings and register new billinghistories
-        @billinghistories_by_name.each_key do |key|
-        @billinghistories_by_name[key] += 1 if@billinghistories_by_name[key] > @insert_after_idx
-        end
-        @billinghistories_by_name[billinghistories.accounts_id] = @insert_after_idx + 1
-        @insert_after_idx += 1
-      else
-      @billinghistories << billinghistories
-      @billinghistories_by_name[billinghistories.accounts_id] =@billinghistories.length - 1
-      end
-    end
-
-    def each
-      @billinghistories.each do |billinghistories|
-        yield billinghistories
-      end
-    end
-
-    def each_index
-      @billinghistories.each_index do |i|
-        yield i
-      end
-    end
-
-    def empty?
-      @billinghistories.empty?
-    end
-
-    def lookup(billinghistories)
-      lookup_by = nil
-      if billinghistories.kind_of?(Megam::Billinghistories)
-      lookup_by = billinghistories.accounts_id
-      elsif billinghistories.kind_of?(String)
-      lookup_by = billinghistories
-      else
-        raise ArgumentError, "Must pass a Megam::billinghistories or String to lookup"
-      end
-      res =@billinghistories_by_name[lookup_by]
-      unless res
-        raise ArgumentError, "Cannot find a billinghistories matching #{lookup_by} (did you define it first?)"
-      end
-      @billinghistories[res]
-    end
-
-    # Transform the ruby obj ->  to a Hash
-    def to_hash
-      index_hash = Hash.new
-      self.each do |billinghistories|
-        index_hash[billinghistories.accounts_id] = billinghistories.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 |billinghistories_list|
-        billinghistories_array = billinghistories_list.kind_of?(Array) ? billinghistories_list : [ billinghistories_list ]
-        billinghistories_array.each do |billinghistories|
-          collection.insert(billinghistories)
-        end
-      end
-      collection
-    end
-
-    private
-
-    def is_megam_billinghistories(arg)
-      unless arg.kind_of?(Megam::Billinghistories)
-        raise ArgumentError, "Members must be Megam::billinghistories's"
-      end
-      true
-    end
-
-    def to_s
-      Megam::Stuff.styled_hash(to_hash)
-    end
-
-  end
-end