megam_api 0.54 → 0.55

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7435f480f5d49dde14ded28222afe0f7f9984751
-  data.tar.gz: d1df8ac5372aa37af59abe346dbbb54aced78364
+  metadata.gz: 980010a7dfd8098fec9910757c57d05e5fa4b43e
+  data.tar.gz: 5f8d54473a44114d7eedcd1bdb802242db64b753
 SHA512:
-  metadata.gz: 9249e35e3bea0541d685fe094f5acdd7aed97204e55855dffc9dad6dd58f7b7692464f9d7e107e5a857f370a91a7eb357f46da20cefd96a52cfbe4fbcffef523
-  data.tar.gz: da0b9a8828730fc6cc6190c0c0496870582ec007014f12a2e7deccc10c5e899fbf873f03240e4930c07639e4d0a26e9c37e45a9bf521be578ce73a27219fc158
+  metadata.gz: 50c286965a8f678e9f1ebb4077a7ae38e8b9cd2936f059a4ae8ccfe711706b470ea927560038522da9e0af6a15cc2be90b446e810d93ac5590d239933eb1dcb3
+  data.tar.gz: ff752564eb85dfa060ee057bf82c9680a38d2e3bfffa7c8a79ad4cbc161dc356b015c17462e4e911ec0a0ebb035dab45c7ec725646da002cd7bcb4495e42d3b9

data/lib/megam/api.rb

@@ -72,8 +72,8 @@ require "megam/core/assembly"
 require "megam/core/assembly_collection"
 require "megam/core/components"
 require "megam/core/components_collection"
-require "megam/core/cat_request"
-require "megam/core/cat_request_collection"
+require "megam/core/cat_requests"
+require "megam/core/cat_requests_collection"
 require "megam/core/event"
 
 

data/lib/megam/api/version.rb

@@ -1,5 +1,5 @@
 module Megam
   class API
-    VERSION = "0.54"
+    VERSION = "0.55"
   end
 end

data/lib/megam/core/{cat_request.rb → cat_requests.rb}

@@ -14,11 +14,12 @@
 # limitations under the License.
 #
 module Megam
-  class CatRequest < Megam::ServerAPI
+  class CatRequests < Megam::ServerAPI
+
     def initialize(email=nil, api_key=nil)
       @id = nil
-      @app_id = nil
-      @app_name = nil
+      @cat_id = nil
+      @name = nil
       @action = nil
       @some_msg = {}
       @created_at = nil
@@ -38,19 +39,19 @@ module Megam
       end
     end
 
-    def app_id(arg=nil)
+    def cat_id(arg=nil)
       if arg != nil
-        @app_id = arg
+        @cat_id = arg
       else
-      @app_id
+      @cat_id
       end
     end
 
-    def app_name(arg=nil)
+    def name(arg=nil)
       if arg != nil
-        @app_name = arg
+        @name = arg
       else
-      @app_name
+      @name
       end
     end
 
@@ -88,8 +89,8 @@ module Megam
       index_hash = Hash.new
       index_hash["json_claz"] = self.class.name
       index_hash["id"] = id
-      index_hash["app_id"] = app_id
-      index_hash["app_name"] = app_name
+      index_hash["cat_id"] = cat_id
+      index_hash["name"] = name
       index_hash["action"] = action
       index_hash["created_at"] = created_at
       index_hash
@@ -104,8 +105,8 @@ module Megam
     def for_json
       result = {
         "id" => id,
-        "app_id" => app_id,
-        "app_name" => app_name,
+        "cat_id" => cat_id,
+        "name" => name,
         "action" => action,
         "created_at" => created_at
       }
@@ -116,8 +117,8 @@ module Megam
     def self.json_create(o)
       node = new
       node.id(o["id"]) if o.has_key?("id")
-      node.app_id(o["app_id"]) if o.has_key?("app_id")
-      node.app_name(o["app_name"]) if o.has_key?("app_name")
+      node.cat_id(o["cat_id"]) if o.has_key?("cat_id")
+      node.name(o["name"]) if o.has_key?("name")
       node.action(o["action"]) if o.has_key?("action")
       node.created_at(o["created_at"]) if o.has_key?("created_at")
       #success or error
@@ -136,8 +137,8 @@ module Megam
 
     def from_hash(o)
       @id = o[:id] if o.has_key?(:id)
-      @app_id  = o[:app_id] if o.has_key?(:app_id)
-      @app_name  = o[:app_name] if o.has_key?(:app_name)
+      @cat_id  = o[:cat_id] if o.has_key?(:cat_id)
+      @name  = o[:name] if o.has_key?(:name)
       @action  = o[:action] if o.has_key?(:action)
       @created_at       = o[:created_at] if o.has_key?(:created_at)
       self

data/lib/megam/core/{cat_request_collection.rb → cat_requests_collection.rb}

@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 module Megam
-  class CatRequestCollection
+  class CatRequestsCollection
     include Enumerable
 
     attr_reader :iterator
@@ -35,14 +35,14 @@ module Megam
     def []=(index, arg)
       is_megam_request(arg)
       @catrequests[index] = arg
-      @catrequests_by_name[arg.app_id] = index
+      @catrequests_by_name[arg.cat_id] = index
     end
 
     def <<(*args)
       args.flatten.each do |a|
         is_megam_request(a)
         @catrequests << a
-        @catrequests_by_name[a.app_id] = @catrequests.length - 1
+        @catrequests_by_name[a.cat_id] = @catrequests.length - 1
       end
       self
     end
@@ -61,11 +61,11 @@ module Megam
         @catrequests_by_name.each_key do |key|
         @catrequests_by_name[key] += 1 if @catrequests_by_name[key] > @insert_after_idx
         end
-        @catrequests_by_name[request.app_id] = @insert_after_idx + 1
+        @catrequests_by_name[request.cat_id] = @insert_after_idx + 1
         @insert_after_idx += 1
       else
       @catrequests << request
-      @catrequests_by_name[request.app_id] = @catrequests.length - 1
+      @catrequests_by_name[request.cat_id] = @catrequests.length - 1
       end
     end
 
@@ -87,12 +87,12 @@ module Megam
 
     def lookup(request)
       lookup_by = nil
-      if request.kind_of?(Megam::CatRequest)
-      lookup_by = request.app_id
+      if request.kind_of?(Megam::CatRequests)
+      lookup_by = request.cat_id
       elsif request.kind_of?(String)
       lookup_by = request
       else
-        raise ArgumentError, "Must pass a Megam::CatRequest or String to lookup"
+        raise ArgumentError, "Must pass a Megam::CatRequests or String to lookup"
       end
       res = @catrequests_by_name[lookup_by]
       unless res
@@ -105,7 +105,7 @@ module Megam
     def to_hash
       index_hash = Hash.new
       self.each do |request|
-        index_hash[request.app_id] = request.to_s
+        index_hash[request.cat_id] = request.to_s
       end
       index_hash
     end
@@ -131,8 +131,8 @@ module Megam
     private
 
     def is_megam_request(arg)
-      unless arg.kind_of?(Megam::CatRequest)
-        raise ArgumentError, "Members must be Megam::CatRequest's"
+      unless arg.kind_of?(Megam::CatRequests)
+        raise ArgumentError, "Members must be Megam::CatRequests's"
       end
       true
     end

data/lib/megam/core/csar.rb

@@ -136,7 +136,7 @@ module Megam
       @id        = o["id"] if o.has_key?("id")
       @desc      = o["desc"] if o.has_key?("desc")
       @link      = o["link"] if o.has_key?("link")
-      @yamldata  = o["yamldata"] if o.has_key?("yamldata") 
+      @yamldata  = o["yamldata"] if o.has_key?("yamldata")
       @created_at = o["created_at"] if o.has_key?("created_at")
       self
     end
@@ -164,7 +164,7 @@ module Megam
       csarslf = self.new(tmp_email, tmp_api_key)
       csarslf.megam_rest.get_csars
     end
-    
+
      #push csar (links)
     def self.push(tmp_email=nil, tmp_api_key=nil, csar_id)
       csarslf = self.new(tmp_email, tmp_api_key)

data/lib/megam/core/json_compat.rb

@@ -36,8 +36,8 @@ module Megam
     MEGAM_BILLINGHISTORIESCOLLECTION  = "Megam::BillinghistoriesCollection".freeze
     MEGAM_BILLINGS                    = "Megam::Billings".freeze
     MEGAM_BILLINGSCOLLECTION          = "Megam::BillingsCollection".freeze
-    MEGAM_CATREQUEST                  = "Megam::CatRequest".freeze
-    MEGAM_CATREQUESTCOLLECTION        = "Megam::CatRequestCollection".freeze
+    MEGAM_CATREQUESTS                 = "Megam::CatRequests".freeze
+    MEGAM_CATREQUESTSCOLLECTION       = "Megam::CatRequestsCollection".freeze
     MEGAM_CLOUDTOOLSETTING            = "Megam::CloudToolSetting".freeze
     MEGAM_CLOUDTOOLSETTINGCOLLECTION  = "Megam::CloudToolSettingCollection".freeze
     MEGAM_COMPONENTS                  = "Megam::Components".freeze
@@ -66,8 +66,8 @@ module Megam
     MEGAM_SUBSCRIPTIONS               = "Megam::Subscriptions".freeze
     MEGAM_SUBSCRIPTIONSCOLLECTION     = "Megam::SubscriptionsCollection".freeze
     MEGAM_PROMOS                      = "Megam::Promos".freeze
-    
-    
+
+
     class <<self
       # Increase the max nesting for JSON, which defaults
       # to 19, and isn't enough for some (for example, a Node within a Node)
@@ -192,10 +192,10 @@ module Megam
           Megam::CSARCollection
         when MEGAM_DOMAIN
           Megam::Domains
-        when MEGAM_CATREQUEST
-          Megam::CatRequest
-        when MEGAM_CATREQUESTCOLLECTION
-          Megam::CatRequestCollection
+        when MEGAM_CATREQUESTS
+          Megam::CatRequests
+        when MEGAM_CATREQUESTSCOLLECTION
+          Megam::CatRequestsCollection
         when MEGAM_EVENT
           Megam::Event
         when MEGAM_AVAILABLEUNITS

data/lib/megam/core/marketplace.rb

@@ -153,18 +153,18 @@ module Megam
       app = new
       app.id(o["id"]) if o.has_key?("id")
       app.name(o["name"]) if o.has_key?("name")
-      
+
       ct = o["catalog"]
-      app.catalog[:logo] = ct["logo"] if ct && ct.has_key?("logo")      
+      app.catalog[:logo] = ct["logo"] if ct && ct.has_key?("logo")
       app.catalog[:category] = ct["category"] if ct && ct.has_key?("category")
       app.catalog[:description] = ct["description"] if ct && ct.has_key?("description")
-            
-      app.plans(o["plans"]) if o.has_key?("plans") 
+
+      app.plans(o["plans"]) if o.has_key?("plans")
       app.cattype(o["cattype"]) if o.has_key?("cattype")
       app.predef(o["predef"]) if o.has_key?("predef")
       app.status(o["status"]) if o.has_key?("status")
       app.created_at(o["created_at"]) if o.has_key?("created_at")
-          
+
       #success or error
       app.some_msg[:code] = o["code"] if o.has_key?("code")
       app.some_msg[:msg_type] = o["msg_type"] if o.has_key?("msg_type")

data/test/test_cat_requests.rb

@@ -3,8 +3,8 @@ require File.expand_path("#{File.dirname(__FILE__)}/test_helper")
 class TestApps < MiniTest::Unit::TestCase
   
   @@tmp_hash = {
-    "app_id" => "ASM1136003656177549312",
-    "app_name" => "HermanWard.megam.co", #APP or Bolt
+    "cat_id" => "ASM1136003656177549312",
+    "name" => "HermanWard.megam.co", #APP or Bolt
     "action" => "start"
   }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: megam_api
 version: !ruby/object:Gem::Version
-  version: '0.54'
+  version: '0.55'
 platform: ruby
 authors:
 - Rajthilak, Kishorekumar Neelamegam, Thomas Alrin, Yeshwanth Kumar, Subash Sethurajan
@@ -170,8 +170,8 @@ files:
 - lib/megam/core/billinghistories_collection.rb
 - lib/megam/core/billings.rb
 - lib/megam/core/billings_collection.rb
-- lib/megam/core/cat_request.rb
-- lib/megam/core/cat_request_collection.rb
+- lib/megam/core/cat_requests.rb
+- lib/megam/core/cat_requests_collection.rb
 - lib/megam/core/cloudtoolsetting.rb
 - lib/megam/core/cloudtoolsetting_collection.rb
 - lib/megam/core/components.rb