megam_api 1.5.rc2 → 1.5.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4cf248af16e765d6e80dc8309492cb9dec394ecd
-  data.tar.gz: 965f12bf881ad57fdcffd0922a5ab46fff964cb2
+  metadata.gz: 84355616466a199bfaa204d9541505476917eec9
+  data.tar.gz: c76351b0c22edb2082520b5a3cbb5530d8e7a56d
 SHA512:
-  metadata.gz: 66c3fe09164ef45461a9aa86346b6f375a27e7197673f2bae9f1df3df8036cff2ae38d323e6970db7158473a70dc64908687a76072bb850121691054e69fb7df
-  data.tar.gz: c436cc03fd372bf936cda71bdc6ff97027b3ec6d5a70f88fb99dad7327fc803d03b0f0328894905597e7e084a0a688ade4306e8550d48d79d9136a87fdedb51b
+  metadata.gz: 1a748368c58ee56525c34d68e09800227a60f1ca765c8ad387aa4a0557010a94957f276e8be87a2b80ed4a455a5fd3525b1176d9f1354ee56860445bc0432b87
+  data.tar.gz: 933493abb83af5fc57177923a5a3bb86b05fc89a1468ec393c93d52d7bf46867b1bc303c8d5162ef4b8d1a0e0aada861977b517960a92ef4fcfd7786eee16af0

data/lib/megam/api.rb

@@ -28,7 +28,7 @@ require 'megam/api/assemblies'
 require 'megam/api/assembly'
 require 'megam/api/balances'
 require 'megam/api/billedhistories'
-require 'megam/api/billingtranscations'
+require 'megam/api/billingtransactions'
 require 'megam/api/components'
 require 'megam/api/domains'
 require 'megam/api/errors'
@@ -93,8 +93,8 @@ require 'megam/core/balances_collection'
 require 'megam/core/balances'
 require 'megam/core/billedhistories_collection'
 require 'megam/core/billedhistories'
-require 'megam/core/billingtranscations_collection'
-require 'megam/core/billingtranscations'
+require 'megam/core/billingtransactions_collection'
+require 'megam/core/billingtransactions'
 require 'megam/core/promos'
 
 module Megam

data/lib/megam/api/{billingtranscations.rb → billingtransactions.rb}

@@ -15,8 +15,8 @@
 #
 module Megam
   class API
-    def get_billingtranscations
-      @options = {:path => '/billingtranscations',:body => ""}.merge(@options)
+    def get_billingtransactions
+      @options = {:path => '/billingtransactions',:body => ""}.merge(@options)
 
       request(
         :expects  => 200,
@@ -25,9 +25,9 @@ module Megam
       )
     end
 
-    def post_billingtranscations(new_billtranscation)
-      @options = {:path => '/billingtranscations/content',
-        :body => Megam::JSONCompat.to_json(new_billtranscation)}.merge(@options)
+    def post_billingtransactions(new_billtransaction)
+      @options = {:path => '/billingtransactions/content',
+        :body => Megam::JSONCompat.to_json(new_billtransaction)}.merge(@options)
 
       request(
         :expects  => 201,

data/lib/megam/api/version.rb

@@ -15,6 +15,6 @@
 #
 module Megam
   class API
-    VERSION = "1.5.rc2"
+    VERSION = "1.5.rc3"
   end
 end

data/lib/megam/core/billingtransactions.rb

@@ -0,0 +1,229 @@
+##
+## Copyright 2013-2016 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 Billingtransactions < Megam::RestAdapter
+        def initialize(o)
+            @id = nil
+            @accounts_id = nil
+            @gateway = nil
+            @amountin = nil
+            @amountout = nil
+            @fees = nil
+            @tranid = nil
+            @trandate = nil
+            @currency_type = nil
+            @created_at = nil
+            @some_msg = {}
+            super(o)
+        end
+
+        def
+            self
+        end
+
+        def id(arg=nil)
+            if arg != nil
+                @id = arg
+            else
+                @id
+            end
+        end
+
+        def accounts_id(arg=nil)
+            if arg != nil
+                @accounts_id= arg
+            else
+                @accounts_id
+            end
+        end
+
+        def gateway(arg=nil)
+            if arg != nil
+                @gateway= arg
+            else
+                @gateway
+            end
+        end
+
+        def amountin(arg=nil)
+            if arg != nil
+                @amountin= arg
+            else
+                @amountin
+            end
+        end
+
+        def amountout(arg=nil)
+            if arg != nil
+                @amountout= arg
+            else
+                @amountout
+            end
+        end
+
+        def fees(arg=nil)
+            if arg != nil
+                @fees = arg
+            else
+                @fees
+            end
+        end
+
+        def tranid(arg=nil)
+            if arg != nil
+                @tranid = arg
+            else
+                @tranid
+            end
+        end
+
+        def trandate(arg=nil)
+            if arg != nil
+                @trandate = arg
+            else
+                @trandate
+            end
+        end
+
+        def currency_type(arg=nil)
+            if arg != nil
+                @currency_type = arg
+            else
+                @currency_type
+            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["accounts_id"] = accounts_id
+            index_hash["gateway"] = gateway
+            index_hash["amountin"] = amountin
+            index_hash["amountout"] = amountout
+            index_hash["fees"] = fees
+            index_hash["tranid"] = tranid
+            index_hash["trandate"] = trandate
+            index_hash["currency_type"] = currency_type
+            index_hash["created_at"] = created_at
+            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,
+                "accounts_id" => accounts_id,
+                "gateway" => gateway,
+                "amountin" => amountin,
+                "amountout" => amountout,
+                "fees" => fees,
+                "tranid" => tranid,
+                "trandate" => trandate,
+                "currency_type" => currency_type,
+                "created_at" => created_at
+            }
+            result
+        end
+
+        #
+        def self.json_create(o)
+            bal = new({})
+            bal.id(o["id"]) if o.has_key?("id")
+            bal.accounts_id(o["accounts_id"]) if o.has_key?("accounts_id")
+            bal.gateway(o["gateway"]) if o.has_key?("gateway")
+            bal.amountin(o["amountin"]) if o.has_key?("amountin")
+            bal.amountout(o["amountout"]) if o.has_key?("amountout")
+            bal.fees(o["fees"]) if o.has_key?("fees")
+            bal.tranid(o["tranid"]) if o.has_key?("tranid")
+            bal.trandate(o["trandate"]) if o.has_key?("trandate")
+            bal.currency_type(o["currency_type"]) if o.has_key?("currency_type")
+            bal.created_at(o["created_at"]) if o.has_key?("created_at")
+            #success or error
+            bal.some_msg[:code] = o["code"] if o.has_key?("code")
+            bal.some_msg[:msg_type] = o["msg_type"] if o.has_key?("msg_type")
+            bal.some_msg[:msg]= o["msg"] if o.has_key?("msg")
+            bal.some_msg[:links] = o["links"] if o.has_key?("links")
+            bal
+        end
+
+        def self.from_hash(o)
+            bal = self.new(o)
+            bal.from_hash(o)
+            bal
+        end
+
+        def from_hash(o)
+            @id            = o[:id] if o.has_key?(:id)
+            @accounts_id   = o[:accounts_id] if o.has_key?(:accounts_id)
+            @gateway       = o[:gateway] if o.has_key?(:gateway)
+            @amountin      = o[:amountin] if o.has_key?(:amountin)
+            @amountout     = o[:amountout] if o.has_key?(:amountout)
+            @fees          = o[:fees] if o.has_key?(:fees)
+            @tranid        = o[:tranid] if o.has_key?(:tranid)
+            @trandate      = o[:trandate] if o.has_key?(:trandate)
+            @currency_type = o[:currency_type] if o.has_key?(:currency_type)
+            @created_at    = o[:created_at] if o.has_key?(:created_at)
+            self
+        end
+
+        def self.create(params)
+            acct = from_hash(params)
+            acct.create
+        end
+
+        def create
+            megam_rest.post_billedhistories(to_hash)
+        end
+
+        def self.list(params)
+            bill = self.new(params)
+            bill.megam_rest.get_billingtransactions
+        end
+
+
+        def to_s
+            Megam::Stuff.styled_hash(to_hash)
+        end
+
+    end
+end

data/lib/megam/core/billingtransactions_collection.rb

@@ -0,0 +1,137 @@
+##
+## Copyright 2013-2016 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 BillingtransactionsCollection
+        include Enumerable
+
+        attr_reader :iterator
+        def initialize
+            @billingtransactions = Array.new
+            @billingtransactions_by_name = Hash.new
+            @insert_after_idx = nil
+        end
+
+        def all_billingtransactions
+            @billingtransactions
+        end
+
+        def [](index)
+            @billingtransactions[index]
+        end
+
+        def []=(index, arg)
+            is_megam_billingtransactions(arg)
+            @@billingtransactions[index] = arg
+            @billingtransactions_by_name[arg.accounts_id] = index
+        end
+
+        def <<(*args)
+            args.flatten.each do |a|
+                is_megam_billingtransactions(a)
+                @billingtransactions << a
+                @billingtransactions_by_name[a.accounts_id] =@billingtransactions.length - 1
+            end
+            self
+        end
+
+        # 'push' is an alias method to <<
+        alias_method :push, :<<
+
+        def insert(billingtransactions)
+            is_megam_billingtransactions(billingtransactions)
+            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
+                #
+                @billingtransactions.insert(@insert_after_idx + 1,billingtransactions)
+                # update name -> location mappings and register new
+                @billingtransactions_by_name.each_key do |key|
+                    @billingtransactions_by_name[key] += 1 if@billingtransactions_by_name[key] > @insert_after_idx
+                end
+                @billingtransactions_by_name[billingtransactions.accounts_id] = @insert_after_idx + 1
+                @insert_after_idx += 1
+            else
+                @billingtransactions << billingtransactions
+                @billingtransactions_by_name[billingtransactions.accounts_id] =@billingtransactions.length - 1
+            end
+        end
+
+        def each
+            @billingtransactions.each do |billingtransactions|
+                yield billingtransactions
+            end
+        end
+
+        def each_index
+            @billingtransactions.each_index do |i|
+                yield i
+            end
+        end
+
+        def empty?
+            @billingtransactions.empty?
+        end
+
+        def lookup(billingtransactions)
+            lookup_by = nil
+            if billingtransactions.kind_of?(Megam::Billingtransactions)
+                lookup_by = billingtransactions.accounts_id
+            elsif billingtransactions.kind_of?(String)
+                lookup_by = billingtransactions
+            else
+                raise ArgumentError, "Must pass a Megam::Billingtransactions or String to lookup"
+            end
+            res =@billingtransactions_by_name[lookup_by]
+            unless res
+                raise ArgumentError, "Cannot find a  matching #{lookup_by} (did you define it first?)"
+            end
+            @billingtransactions[res]
+        end
+
+        def to_s
+            @billingtransactions.join(", ")
+        end
+
+        def for_json
+            to_a.map { |item| item.to_s }
+        end
+
+        def to_json(*a)
+            Megam::JSONCompat.to_json(for_json, *a)
+        end
+
+        def self.json_create(o)
+            collection = self.new()
+            o["results"].each do |billingtransactions_list|
+                billingtransactions_array = billingtransactions_list.kind_of?(Array) ? billingtransactions_list : [ billingtransactions_list ]
+                billingtransactions_array.each do |billingtransactions|
+                    collection.insert(billingtransactions)
+                end
+            end
+            collection
+        end
+
+        private
+
+        def is_megam_billingtransactions(arg)
+            unless arg.kind_of?(Megam::Billingtransactions)
+                raise ArgumentError, "Members must be Megam::Billingtransactions's"
+            end
+            true
+        end
+
+    end
+end

data/lib/megam/core/json_compat.rb

@@ -24,43 +24,43 @@ module Megam
 
         JSON_CLAZ = 'json_claz'.freeze
 
-        MEGAM_ACCOUNT                     = 'Megam::Account'.freeze
-        MEGAM_ASSEMBLIES                  = 'Megam::Assemblies'.freeze
-        MEGAM_ASSEMBLIESCOLLECTION        = 'Megam::AssembliesCollection'.freeze
-        MEGAM_ASSEMBLY                    = 'Megam::Assembly'.freeze
-        MEGAM_ASSEMBLYCOLLECTION          = 'Megam::AssemblyCollection'.freeze
-        MEGAM_BALANCES                    = 'Megam::Balances'.freeze
-        MEGAM_BALANCESCOLLECTION          = 'Megam::BalancesCollection'.freeze
-        MEGAM_BILLEDHISTORIES             = 'Megam::Billedhistories'.freeze
-        MEGAM_BILLEDHISTORIESCOLLECTION   = 'Megam::BilledhistoriesCollection'.freeze
-        MEGAM_BILLINGTRANSCATIONS             = 'Megam::Billingtranscations'.freeze
-        MEGAM_BILLINGTRANSCATIONSCOLLECTION   = 'Megam::BillingtranscationsCollection'.freeze
-        MEGAM_COMPONENTS                  = 'Megam::Components'.freeze
-        MEGAM_COMPONENTSCOLLECTION        = 'Megam::ComponentsCollection'.freeze
-        MEGAM_DOMAIN                      = 'Megam::Domains'.freeze
-        MEGAM_DOMAINCOLLECTION            = 'Megam::DomainsCollection'.freeze
-        MEGAM_ERROR                       = 'Megam::Error'.freeze
-        MEGAM_MARKETPLACE                 = 'Megam::MarketPlace'.freeze
-        MEGAM_MARKETPLACECOLLECTION       = 'Megam::MarketPlaceCollection'.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_SNAPSHOTS                     = 'Megam::Snapshots'.freeze
-        MEGAM_SNAPSHOTSCOLLECTION           = 'Megam::SnapshotsCollection'.freeze
-        MEGAM_SSHKEY                      = 'Megam::SshKey'.freeze
-        MEGAM_SSHKEYCOLLECTION            = 'Megam::SshKeyCollection'.freeze
-        MEGAM_EVENTSVM                    = 'Megam::EventsVm'.freeze
-        MEGAM_EVENTSVMCOLLECTION            = 'Megam::EventsVmCollection'.freeze
-        MEGAM_EVENTSCONTAINER             = 'Megam::EventsContainer'.freeze
-        MEGAM_EVENTSCONTAINERCOLLECTION   = 'Megam::EventsContainerCollection'.freeze
-        MEGAM_EVENTSBILLING               = 'Megam::EventsBilling'.freeze
-        MEGAM_EVENTSBILLINGCOLLECTION     = 'Megam::EventsBillingCollection'.freeze
-        MEGAM_EVENTSSTORAGE               = 'Megam::EventsStorage'.freeze
-        MEGAM_EVENTSSTORAGECOLLECTION     = 'Megam::EventsStorageCollection'.freeze
-        MEGAM_PROMOS                      = 'Megam::Promos'.freeze
+        MEGAM_ACCOUNT                         = 'Megam::Account'.freeze
+        MEGAM_ASSEMBLIES                      = 'Megam::Assemblies'.freeze
+        MEGAM_ASSEMBLIESCOLLECTION            = 'Megam::AssembliesCollection'.freeze
+        MEGAM_ASSEMBLY                        = 'Megam::Assembly'.freeze
+        MEGAM_ASSEMBLYCOLLECTION              = 'Megam::AssemblyCollection'.freeze
+        MEGAM_BALANCES                        = 'Megam::Balances'.freeze
+        MEGAM_BALANCESCOLLECTION              = 'Megam::BalancesCollection'.freeze
+        MEGAM_BILLEDHISTORIES                 = 'Megam::Billedhistories'.freeze
+        MEGAM_BILLEDHISTORIESCOLLECTION       = 'Megam::BilledhistoriesCollection'.freeze
+        MEGAM_BILLINGTRANSACTIONS             = 'Megam::Billingtransactions'.freeze
+        MEGAM_BILLINGTRANSACTIONSCOLLECTION   = 'Megam::BillingtransactionsCollection'.freeze
+        MEGAM_COMPONENTS                      = 'Megam::Components'.freeze
+        MEGAM_COMPONENTSCOLLECTION            = 'Megam::ComponentsCollection'.freeze
+        MEGAM_DOMAIN                          = 'Megam::Domains'.freeze
+        MEGAM_DOMAINCOLLECTION                = 'Megam::DomainsCollection'.freeze
+        MEGAM_ERROR                           = 'Megam::Error'.freeze
+        MEGAM_MARKETPLACE                     = 'Megam::MarketPlace'.freeze
+        MEGAM_MARKETPLACECOLLECTION           = 'Megam::MarketPlaceCollection'.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_SNAPSHOTS                       = 'Megam::Snapshots'.freeze
+        MEGAM_SNAPSHOTSCOLLECTION             = 'Megam::SnapshotsCollection'.freeze
+        MEGAM_SSHKEY                          = 'Megam::SshKey'.freeze
+        MEGAM_SSHKEYCOLLECTION                = 'Megam::SshKeyCollection'.freeze
+        MEGAM_EVENTSVM                        = 'Megam::EventsVm'.freeze
+        MEGAM_EVENTSVMCOLLECTION              = 'Megam::EventsVmCollection'.freeze
+        MEGAM_EVENTSCONTAINER                 = 'Megam::EventsContainer'.freeze
+        MEGAM_EVENTSCONTAINERCOLLECTION       = 'Megam::EventsContainerCollection'.freeze
+        MEGAM_EVENTSBILLING                   = 'Megam::EventsBilling'.freeze
+        MEGAM_EVENTSBILLINGCOLLECTION         = 'Megam::EventsBillingCollection'.freeze
+        MEGAM_EVENTSSTORAGE                   = 'Megam::EventsStorage'.freeze
+        MEGAM_EVENTSSTORAGECOLLECTION         = 'Megam::EventsStorageCollection'.freeze
+        MEGAM_PROMOS                          = 'Megam::Promos'.freeze
 
         class <<self
             # API to use to avoid create_addtions
@@ -167,22 +167,22 @@ module Megam
                     Megam::SshKey
                 when MEGAM_SSHKEYCOLLECTION
                     Megam::SshKeyCollection
-                  when MEGAM_EVENTSVM
-                      Megam::EventsVm
+                when MEGAM_EVENTSVM
+                    Megam::EventsVm
                 when MEGAM_EVENTSVMCOLLECTION
-                      Megam::EventsVmCollection
-                  when MEGAM_EVENTSCONTAINER
-                      Megam::EventsContainer
+                    Megam::EventsVmCollection
+                when MEGAM_EVENTSCONTAINER
+                    Megam::EventsContainer
                 when MEGAM_EVENTSCONTAINERCOLLECTION
-                      Megam::EventsContainerCollection
-                    when MEGAM_EVENTSBILLING
-                        Megam::EventsBilling
-                  when MEGAM_EVENTSBILLINGCOLLECTION
-                        Megam::EventsBillingCollection
-                      when MEGAM_EVENTSSTORAGE
-                          Megam::EventsStorage
-                    when MEGAM_EVENTSSTORAGECOLLECTION
-                          Megam::EventsStorageCollection
+                    Megam::EventsContainerCollection
+                when MEGAM_EVENTSBILLING
+                    Megam::EventsBilling
+                when MEGAM_EVENTSBILLINGCOLLECTION
+                    Megam::EventsBillingCollection
+                when MEGAM_EVENTSSTORAGE
+                    Megam::EventsStorage
+                when MEGAM_EVENTSSTORAGECOLLECTION
+                    Megam::EventsStorageCollection
                 when MEGAM_MARKETPLACE
                     Megam::MarketPlace
                 when MEGAM_MARKETPLACECOLLECTION
@@ -199,10 +199,10 @@ module Megam
                     Megam::Sensors
                 when MEGAM_SENSORSCOLLECTION
                     Megam::SensorsCollection
-                  when MEGAM_SNAPSHOTS
-                      Megam::Snapshots
-                  when MEGAM_SNAPSHOTSCOLLECTION
-                      Megam::SnapshotsCollection
+                when MEGAM_SNAPSHOTS
+                    Megam::Snapshots
+                when MEGAM_SNAPSHOTSCOLLECTION
+                    Megam::SnapshotsCollection
                 when MEGAM_BALANCES
                     Megam::Balances
                 when MEGAM_BALANCESCOLLECTION
@@ -211,10 +211,10 @@ module Megam
                     Megam::Billedhistories
                 when MEGAM_BILLEDHISTORIESCOLLECTION
                     Megam::BilledhistoriesCollection
-                  when MEGAM_BILLINGTRANSCATIONS
-                      Megam::Billingtranscations
-                  when MEGAM_BILLINGTRANSCATIONSCOLLECTION
-                      Megam::BillingtranscationsCollection
+                when MEGAM_BILLINGTRANSACTIONS
+                    Megam::Billingtransactions
+                when MEGAM_BILLINGTRANSACTIONSCOLLECTION
+                    Megam::BillingtransactionsCollection
                 when MEGAM_PROMOS
                     Megam::Promos
                 else

data/test/test_billingtranscations.rb

@@ -2,7 +2,7 @@ require File.expand_path("#{File.dirname(__FILE__)}/test_helper")
 
 class TestApps < MiniTest::Unit::TestCase
 #=begin
-  def test_post_billingtranscations
+  def test_post_billingtransactions
     tmp_hash = { :accounts_id => "5555555",
                  :gateway => "paypal",
                  :amountin => "5",
@@ -13,21 +13,15 @@ class TestApps < MiniTest::Unit::TestCase
                  :currency_type => "USD"
     }
 
-    response = megams.post_billingtranscations(tmp_hash)
+    response = megams.post_billingtransactions(tmp_hash)
     assert_equal(201, response.status)
   end
 #=end
 
 #=begin
-  def test_get_billingtranscations
-    response = megams.get_billingtranscations
+  def test_get_billingtransactions
+    response = megams.get_billingtransactions
     assert_equal(200, response.status)
   end
 #=end
-=begin
-  def test_get_billingtranscations
-    response = megams.get_billingtranscations("iaas_default")
-    assert_equal(200, response.status)
-  end
-=end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: megam_api
 version: !ruby/object:Gem::Version
-  version: 1.5.rc2
+  version: 1.5.rc3
 platform: ruby
 authors:
 - Rajthilak, Kishorekumar Neelamegam, Thomas Alrin, Yeshwanth Kumar, Subash Sethurajan,
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-27 00:00:00.000000000 Z
+date: 2016-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -138,7 +138,7 @@ files:
 - lib/megam/api/assembly.rb
 - lib/megam/api/balances.rb
 - lib/megam/api/billedhistories.rb
-- lib/megam/api/billingtranscations.rb
+- lib/megam/api/billingtransactions.rb
 - lib/megam/api/components.rb
 - lib/megam/api/domains.rb
 - lib/megam/api/errors.rb
@@ -163,8 +163,8 @@ files:
 - lib/megam/core/balances_collection.rb
 - lib/megam/core/billedhistories.rb
 - lib/megam/core/billedhistories_collection.rb
-- lib/megam/core/billingtranscations.rb
-- lib/megam/core/billingtranscations_collection.rb
+- lib/megam/core/billingtransactions.rb
+- lib/megam/core/billingtransactions_collection.rb
 - lib/megam/core/components.rb
 - lib/megam/core/components_collection.rb
 - lib/megam/core/domain_collection.rb

data/lib/megam/core/billingtranscations.rb

@@ -1,244 +0,0 @@
-##
-## Copyright 2013-2016 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 Billingtranscations < Megam::RestAdapter
-    def initialize(o)
-      @id = nil
-      @accounts_id = nil
-      @gateway = nil
-      @amountin = nil
-      @amountout = nil
-      @fees = nil
-      @tranid = nil
-      @trandate = nil
-      @currency_type = nil
-      @created_at = nil
-      @some_msg = {}
-      super(o)
-    end
-
-    def billingtranscations
-      self
-    end
-
-    def id(arg=nil)
-      if arg != nil
-        @id = arg
-      else
-      @id
-      end
-    end
-
-    def accounts_id(arg=nil)
-      if arg != nil
-        @accounts_id= arg
-      else
-      @accounts_id
-      end
-    end
-
-    def gateway(arg=nil)
-      if arg != nil
-        @gateway= arg
-      else
-      @gateway
-      end
-    end
-
-    def amountin(arg=nil)
-      if arg != nil
-        @amountin= arg
-      else
-      @amountin
-      end
-    end
-
-    def amountout(arg=nil)
-      if arg != nil
-        @amountout= arg
-      else
-      @amountout
-      end
-    end
-
-    def fees(arg=nil)
-      if arg != nil
-        @fees = arg
-      else
-      @fees
-      end
-    end
-
-    def tranid(arg=nil)
-      if arg != nil
-        @tranid = arg
-      else
-      @tranid
-      end
-    end
-
-    def trandate(arg=nil)
-      if arg != nil
-        @trandate = arg
-      else
-      @trandate
-      end
-    end
-
-    def currency_type(arg=nil)
-      if arg != nil
-        @currency_type = arg
-      else
-      @currency_type
-      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["accounts_id"] = accounts_id
-      index_hash["gateway"] = gateway
-      index_hash["amountin"] = amountin
-      index_hash["amountout"] = amountout
-      index_hash["fees"] = fees
-      index_hash["tranid"] = tranid
-      index_hash["trandate"] = trandate
-      index_hash["currency_type"] = currency_type
-      index_hash["created_at"] = created_at
-      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,
-        "accounts_id" => accounts_id,
-        "gateway" => gateway,
-        "amountin" => amountin,
-        "amountout" => amountout,
-        "fees" => fees,
-        "tranid" => tranid,
-        "trandate" => trandate,
-        "currency_type" => currency_type,
-        "created_at" => created_at
-      }
-      result
-    end
-
-    #
-    def self.json_create(o)
-      bal = new({})
-      bal.id(o["id"]) if o.has_key?("id")
-      bal.accounts_id(o["accounts_id"]) if o.has_key?("accounts_id")
-      bal.gateway(o["gateway"]) if o.has_key?("gateway")
-      bal.amountin(o["amountin"]) if o.has_key?("amountin")
-      bal.amountout(o["amountout"]) if o.has_key?("amountout")
-      bal.fees(o["fees"]) if o.has_key?("fees")
-      bal.tranid(o["tranid"]) if o.has_key?("tranid")
-      bal.trandate(o["trandate"]) if o.has_key?("trandate")
-      bal.currency_type(o["currency_type"]) if o.has_key?("currency_type")
-      bal.created_at(o["created_at"]) if o.has_key?("created_at")
-      #success or error
-      bal.some_msg[:code] = o["code"] if o.has_key?("code")
-      bal.some_msg[:msg_type] = o["msg_type"] if o.has_key?("msg_type")
-      bal.some_msg[:msg]= o["msg"] if o.has_key?("msg")
-      bal.some_msg[:links] = o["links"] if o.has_key?("links")
-      bal
-    end
-
-    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
-
-    def from_hash(o)
-      @id        = o[:id] if o.has_key?(:id)
-      @accounts_id = o[:accounts_id] if o.has_key?(:accounts_id)
-      @gateway   = o[:gateway] if o.has_key?(:gateway)
-      @amountin     = o[:amountin] if o.has_key?(:amountin)
-      @amountout   = o[:amountout] if o.has_key?(:amountout)
-      @fees   = o[:fees] if o.has_key?(:fees)
-      @tranid     = o[:tranid] if o.has_key?(:tranid)
-      @trandate   = o[:trandate] if o.has_key?(:trandate)
-      @currency_type   = o[:currency_type] if o.has_key?(:currency_type)
-      @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 billing transcations via the REST API
-    def create
-      megam_rest.post_billedhistories(to_hash)
-    end
-
-    # Load all billing transcations -
-    # returns a BillingTranscationsCollection
-    # don't return self. check if the Megam::BillingTranscationsCollection is returned.
-    def self.list(params)
-      billtranscations = self.new(params["email"], params["api_key"], params["host"])
-      billtranscations.megam_rest.get_billingtranscations
-    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_billtranscation(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_billtranscation(p_name)
-    end
-
-    def to_s
-      Megam::Stuff.styled_hash(to_hash)
-    end
-
-  end
-end

data/lib/megam/core/billingtranscations_collection.rb

@@ -1,136 +0,0 @@
-##
-## Copyright 2013-2016 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 BillingtranscationsCollection
-    include Enumerable
-
-    attr_reader :iterator
-    def initialize
-      @billingtranscations = Array.new
-      @billingtranscations_by_name = Hash.new
-      @insert_after_idx = nil
-    end
-
-    def all_billingtranscations
-      @billingtranscations
-    end
-
-    def [](index)
-      @billingtranscations[index]
-    end
-
-    def []=(index, arg)
-      is_megam_billingtranscations(arg)
-      @billingtranscations[index] = arg
-      @billingtranscations_by_name[arg.accounts_id] = index
-    end
-
-    def <<(*args)
-      args.flatten.each do |a|
-        is_megam_billingtranscations(a)
-        @billingtranscations << a
-        @billingtranscations_by_name[a.accounts_id] =@billingtranscations.length - 1
-      end
-      self
-    end
-
-    # 'push' is an alias method to <<
-    alias_method :push, :<<
-
-    def insert(billingtranscations)
-      is_megam_billingtranscations(billingtranscations)
-      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
-        # billingtranscations
-        @billingtranscations.insert(@insert_after_idx + 1, billingtranscations)
-        # update name -> location mappings and register new billingtranscations
-        @billingtranscations_by_name.each_key do |key|
-        @billingtranscations_by_name[key] += 1 if@billingtranscations_by_name[key] > @insert_after_idx
-        end
-        @billingtranscations_by_name[billingtranscations.accounts_id] = @insert_after_idx + 1
-        @insert_after_idx += 1
-      else
-      @billingtranscations << billingtranscations
-      @billingtranscations_by_name[billingtranscations.accounts_id] =@billingtranscations.length - 1
-      end
-    end
-
-    def each
-      @billingtranscations.each do |billingtranscations|
-        yield billingtranscations
-      end
-    end
-
-    def each_index
-      @billingtranscations.each_index do |i|
-        yield i
-      end
-    end
-
-    def empty?
-      @billingtranscations.empty?
-    end
-
-    def lookup(billingtranscations)
-      lookup_by = nil
-      if billingtranscations.kind_of?(Megam::billingtranscations)
-      lookup_by = billingtranscations.accounts_id
-    elsif billingtranscations.kind_of?(String)
-      lookup_by = billingtranscations
-      else
-        raise ArgumentError, "Must pass a Megam::billingtranscations or String to lookup"
-      end
-      res =@billingtranscations_by_name[lookup_by]
-      unless res
-        raise ArgumentError, "Cannot find a billingtranscations matching #{lookup_by} (did you define it first?)"
-      end
-      @billingtranscations[res]
-    end
-
-    def to_s
-        @billingtranscations.join(", ")
-    end
-
-    def for_json
-        to_a.map { |item| item.to_s }
-    end
-
-    def to_json(*a)
-        Megam::JSONCompat.to_json(for_json, *a)
-    end
-
-    def self.json_create(o)
-      collection = self.new()
-      o["results"].each do |billingtranscations_list|
-        billingtranscations_array = billingtranscations_list.kind_of?(Array) ? billingtranscations_list : [ billingtranscations_list ]
-        billingtranscations_array.each do |billingtranscations|
-          collection.insert(billingtranscations)
-        end
-      end
-      collection
-    end
-
-    private
-
-    def is_megam_billingtranscations(arg)
-      unless arg.kind_of?(Megam::Billingtranscations)
-        raise ArgumentError, "Members must be Megam::billingtranscations's"
-      end
-      true
-    end
-  end
-end