megam_api 0.58 → 0.59

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e588bc6c0273dc73140d2f93e492c0567441b400
-  data.tar.gz: 526674879efb9ae20c3e3632cedd04cfcf0443c1
+  metadata.gz: 6962d753033b0018f0d9fa3f7bf84490be095630
+  data.tar.gz: 0bc5ed0fcb60fc33613d53e2ab5fa44e2c90c822
 SHA512:
-  metadata.gz: b9371e4be212684da2b5e4960a10597c54851e1c9c671f0f51291ea50542d3a1506524b80638e3e1554bda2bcb1a39af447469e323f6ca4685efe1e5502f1d8f
-  data.tar.gz: d9462be29836ca6e7a21c84f234ffcaf1d007404e11d01c513394b10b2d68171c44bbb7ec321d9c35ff4435e523e4725461fda5fe299948c51946c8cb9067ae5
+  metadata.gz: 74add9831ce71475d431e5cc5939aa9d9e8b66bd762b5d9b1a9fe97d407a73683c3c7aa57f6e0e8c7a8a6b30188c84887fcc6cd9fa56744116d45bbf4bcf12d8
+  data.tar.gz: e9525f69232eee8935272ffb7c2ef8db7c3af613122a173d1c15f7a0e1942911a84a165c9d6762a745e7cc209edfa38a5612c14f9b354a83bfd0bc37bf2c4d29

data/lib/megam/api/components.rb

@@ -15,7 +15,7 @@ module Megam
         :body => Megam::JSONCompat.to_json(new_asm)}.merge(@options)
 
       request(
-        :expects  => 201,
+        :expects  => [200, 201],
         :method   => :post,
         :body     => @options[:body]
       )

data/lib/megam/api/discounts.rb

@@ -1,18 +1,9 @@
 module Megam
   class API
     def get_discounts
+      puts "Entered get discount--weehaa!"
       @options = {:path => '/discounts',:body => ""}.merge(@options)
-
-      request(
-        :expects  => 200,
-        :method   => :get,
-        :body     => @options[:body]
-      )
-    end
-
-    def get_discounts(id)
-      @options = {:path => "/discounts/#{id}",:body => ""}.merge(@options)
-
+  puts @options
       request(
         :expects  => 200,
         :method   => :get,
@@ -20,6 +11,7 @@ module Megam
       )
     end
 
+    
     def post_discounts(new_discount)
       @options = {:path => '/discounts/content',
         :body => Megam::JSONCompat.to_json(new_discount)}.merge(@options)

data/lib/megam/api/version.rb

@@ -1,5 +1,5 @@
 module Megam
   class API
-    VERSION = "0.58"
+    VERSION = "0.59"
   end
 end

data/lib/megam/core/discounts.rb

@@ -159,16 +159,14 @@ module Megam
     end
 
     def self.create(params)
-      puts "creating discounts entry...hold tight"
-      puts params.inspect
-      discount = from_hash(params)
+     
+      discount = from_hash(params, params[:email], params[:api_key])
       discount.create
     end
 
     # Create the discounts via the REST API
     def create
-      puts "YES. CREATING....JUST A SEC"
-      puts to_hash
+      
       megam_rest.post_discounts(to_hash)
     end
     
@@ -185,8 +183,9 @@ module Megam
     # Load all discounts -
     # returns a discountsCollection
     # don't return self. check if the Megam::discountsCollection is returned.
-    def self.list(tmp_email=nil, tmp_api_key=nil)
-      cts = self.new(tmp_email, tmp_api_key)
+    def self.list(params)
+      cts = self.new(params[:email], params[:api_key])
+      
       cts.megam_rest.get_discounts
     end
 

data/lib/megam/core/discounts_collection.rb

@@ -35,14 +35,14 @@ module Megam
     def []=(index, arg)
       is_megam_discounts(arg)
       @discounts[index] = arg
-      @discounts_by_name[arg.repo_name] = index
+      @discounts_by_name[arg.code] = index
     end
 
     def <<(*args)
       args.flatten.each do |a|
         is_megam_discounts(a)
         @discounts << a
-        @discounts_by_name[a.repo_name] =@discounts.length - 1
+        @discounts_by_name[a.code] =@discounts.length - 1
       end
       self
     end
@@ -61,11 +61,11 @@ module Megam
         @discounts_by_name.each_key do |key|
         @discounts_by_name[key] += 1 if@discounts_by_name[key] > @insert_after_idx
         end
-        @discounts_by_name[discounts.repo_name] = @insert_after_idx + 1
+        @discounts_by_name[discounts.code] = @insert_after_idx + 1
         @insert_after_idx += 1
       else
       @discounts << discounts
-      @discounts_by_name[discounts.repo_name] =@discounts.length - 1
+      @discounts_by_name[discounts.code] =@discounts.length - 1
       end
     end
 
@@ -88,7 +88,7 @@ module Megam
     def lookup(discounts)
       lookup_by = nil
       if discounts.kind_of?(Megam::Discounts)
-      lookup_by = discounts.repo_name
+      lookup_by = discounts.code
       elsif discounts.kind_of?(String)
       lookup_by = discounts
       else
@@ -105,7 +105,7 @@ module Megam
     def to_hash
       index_hash = Hash.new
       self.each do |discounts|
-        index_hash[discounts.repo_name] = discounts.to_s
+        index_hash[discounts.code] = discounts.to_s
       end
       index_hash
     end

data/test/test_discounts.rb

@@ -1,7 +1,7 @@
 require File.expand_path("#{File.dirname(__FILE__)}/test_helper")
 
 class TestApps < MiniTest::Unit::TestCase
-#=begin
+=begin
   def test_post_discount
     tmp_hash = { :accounts_id => "ACT93476985797", 
                  :bill_type => "paypal",
@@ -12,14 +12,16 @@ class TestApps < MiniTest::Unit::TestCase
     response = megams.post_discounts(tmp_hash)
     assert_equal(201, response.status)
   end
-#=end
+=end
+
 
-=begin
   def test_get_discounts
     response = megams.get_discounts
+    puts response.inspect
     assert_equal(200, response.status)
+    
   end
-=end
+
 =begin
   def test_get_discounts
     response = megams.get_discounts("iaas_default")

data/test/test_helper.rb

@@ -69,9 +69,9 @@ def sandbox_name
 end
 
 def sandbox_apikey
-   "S2lTFprreumUrQPfjfKANQ=="
+   "DgBRJLv1v5QCfqqneNCh1w=="
 end
 
 def sandbox_email
-  "super@removedtest.com"
+  "morpheyesh@gmail.com"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: megam_api
 version: !ruby/object:Gem::Version
-  version: '0.58'
+  version: '0.59'
 platform: ruby
 authors:
 - Rajthilak, Kishorekumar Neelamegam, Thomas Alrin, Yeshwanth Kumar, Subash Sethurajan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-21 00:00:00.000000000 Z
+date: 2015-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -257,34 +257,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: Ruby Client for the Megam
-test_files:
-- test/test_accounts.rb
-- test/test_assemblies.rb
-- test/test_assembly.rb
-- test/test_availableunits.rb
-- test/test_balances.rb
-- test/test_billinghistories.rb
-- test/test_billings.rb
-- test/test_cat_requests.rb
-- test/test_cloudtoolsettings.rb
-- test/test_components.rb
-- test/test_credithistories.rb
-- test/test_csars.rb
-- test/test_discounts.rb
-- test/test_domains.rb
-- test/test_event.rb
-- test/test_helper.rb
-- test/test_login.rb
-- test/test_logs.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_sshkeys.rb
-- test/test_subscriptions.rb
+test_files: []