megam_api 0.100 → 1.5.beta2

data/lib/megam/core/domains.rb

@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 module Megam
-  class Domains < Megam::ServerAPI
+  class Domains < Megam::RestAdapter
     def initialize(o)
       @id = nil
       @org_id = nil

data/lib/megam/core/error.rb

@@ -15,19 +15,11 @@
 #
 module Megam
   class Error
-    
+
     def initialize
       @some_msg = {}
     end
 
-    #used by resque workers and any other background job
-    def auth
-      self
-    end
-
-    def megam_rest
-      Megam::Scm.new(Megam::Config[:name], Megam::Config[:displayName], Megam::Config[:mail], Megam::Config[:password])
-    end
 
     def some_msg(arg=nil)
       if arg != nil
@@ -84,12 +76,6 @@ module Megam
       self
     end
 
-    # just an auth
-    def self.auth
-      megam_rest.post_auth
-      self
-    end
-
 
     def to_s
       Megam::Stuff.styled_hash(to_hash)

data/lib/megam/core/json_compat.rb

@@ -13,216 +13,178 @@
 
 # Wrapper class for interacting with JSON.
 
-require 'yajl/json_gem'
-require 'yajl'
+require "ffi_yajl"
+# We're requiring this to prevent breaking consumers using Hash.to_json
+require "json"
 
 module Megam
-  class JSONCompat
-    JSON_MAX_NESTING = 1000
-
-
-    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_AUTH                        = 'Megam::Auth'.freeze
-    MEGAM_AVAILABLEUNITS              = 'Megam::Availableunits'.freeze
-    MEGAM_AVAILABLEUNITSCOLLECTION    = 'Megam::AvailableunitsCollection'.freeze
-    MEGAM_BALANCES                    = 'Megam::Balances'.freeze
-    MEGAM_BALANCESCOLLECTION          = 'Megam::BalancesCollection'.freeze
-    MEGAM_BILLEDHISTORIES             = 'Megam::Billedhistories'.freeze
-    MEGAM_BILLEDHISTORIESCOLLECTION   = 'Megam::BilledhistoriesCollection'.freeze
-    MEGAM_BILLINGS                    = 'Megam::Billings'.freeze
-    MEGAM_BILLINGSCOLLECTION          = 'Megam::BillingsCollection'.freeze
-    MEGAM_COMPONENTS                  = 'Megam::Components'.freeze
-    MEGAM_COMPONENTSCOLLECTION        = 'Megam::ComponentsCollection'.freeze
-    MEGAM_CREDITHISTORIES             = 'Megam::Credithistories'.freeze
-    MEGAM_CREDITHISTORIESCOLLECTION   = 'Megam::CredithistoriesCollection'.freeze
-    MEGAM_CSAR                        = 'Megam::CSAR'.freeze
-    MEGAM_CSARCOLLECTION              = 'Megam::CSARCollection'.freeze
-    MEGAM_DOMAIN                      = 'Megam::Domains'.freeze
-    MEGAM_DOMAINCOLLECTION              = 'Megam::DomainsCollection'.freeze
-    MEGAM_DISCOUNTS                   = 'Megam::Discounts'.freeze
-    MEGAM_DISCOUNTSCOLLECTION         = 'Megam::DiscountsCollection'.freeze
-    MEGAM_ERROR                       = 'Megam::Error'.freeze
-    MEGAM_INVOICESCOLLECTION          = 'Megam::InvoicesCollection'.freeze
-    MEGAM_INVOICES                    = 'Megam::Invoices'.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_SSHKEY                      = 'Megam::SshKey'.freeze
-    MEGAM_SSHKEYCOLLECTION            = 'Megam::SshKeyCollection'.freeze
-    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)
-      # structures.
-      def opts_add_max_nesting(opts)
-        if opts.nil? || !opts.key?(:max_nesting)
-          opts = opts.nil? ? {} : opts.clone
-          opts[:max_nesting] = JSON_MAX_NESTING
+    class JSONCompat
+        JSON_MAX_NESTING = 1000
+
+
+        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_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_SSHKEY                      = 'Megam::SshKey'.freeze
+        MEGAM_SSHKEYCOLLECTION            = 'Megam::SshKeyCollection'.freeze
+        MEGAM_PROMOS                      = 'Megam::Promos'.freeze
+
+        class <<self
+            # API to use to avoid create_addtions
+            def parse(source, opts = {})
+                begin
+                    FFI_Yajl::Parser.parse(source, opts)
+                rescue FFI_Yajl::ParseError => e
+                    raise JSON::ParseError, e.message
+                end
+            end
+
+            # Just call the JSON gem's parse method with a modified :max_nesting field
+            def from_json(source, opts = {})
+                obj = parse(source, opts)
+
+                # JSON gem requires top level object to be a Hash or Array (otherwise
+                # you get the "must contain two octets" error). Yajl doesn't impose the
+                # same limitation. For compatibility, we re-impose this condition.
+                unless obj.kind_of?(Hash) || obj.kind_of?(Array)
+                    raise JSON::ParseError, "Top level JSON object must be a Hash or Array. (actual: #{obj.class})"
+                end
+
+                # The old default in the json gem (which we are mimicing because we
+                # sadly rely on this misfeature) is to "create additions" i.e., convert
+                # JSON objects into ruby objects. Explicit :create_additions => false
+                # is required to turn it off.
+                if opts[:create_additions].nil? || opts[:create_additions]
+                    map_to_rb_obj(obj)
+                else
+                    obj
+                end
+            end
+
+            # Look at an object that's a basic type (from json parse) and convert it
+            # to an instance of Chef classes if desired.
+            def map_to_rb_obj(json_obj)
+                case json_obj
+                when Hash
+                    mapped_hash = map_hash_to_rb_obj(json_obj)
+                    if json_obj.has_key?(JSON_CLAZ) && (class_to_inflate = class_for_json_class(json_obj[JSON_CLAZ]))
+                        class_to_inflate.json_create(mapped_hash)
+                    else
+                        mapped_hash
+                    end
+                when Array
+                    json_obj.map { |e| map_to_rb_obj(e) }
+                else
+                    json_obj
+                end
+            end
+
+            def map_hash_to_rb_obj(json_hash)
+                json_hash.each do |key, value|
+                    json_hash[key] = map_to_rb_obj(value)
+                end
+                json_hash
+            end
+
+            def to_json(obj, opts = nil)
+                begin
+                    FFI_Yajl::Encoder.encode(obj, opts)
+                rescue FFI_Yajl::EncodeError => e
+                    raise JSON::GeneratorError, e.message
+                end
+            end
+
+
+            def to_json_pretty(obj, opts = nil)
+                opts ||= {}
+                options_map = {}
+                options_map[:pretty] = true
+                options_map[:indent] = opts[:indent] if opts.has_key?(:indent)
+                to_json(obj, options_map).chomp
+            end
+
+
+            # Map +JSON_CLAZ+ to a Class object. We use a +case+ instead of a Hash
+            # assigned to a constant because otherwise this file could not be loaded
+            # until all the constants were defined, which means you'd have to load
+            # the world to get json.
+            def class_for_json_class(json_class)
+                case json_class
+                when MEGAM_ERROR
+                    Megam::Error
+                when MEGAM_ACCOUNT
+                    Megam::Account
+                when MEGAM_ASSEMBLIES
+                    Megam::Assemblies
+                when MEGAM_ASSEMBLIESCOLLECTION
+                    Megam::AssembliesCollection
+                when MEGAM_ASSEMBLY
+                    Megam::Assembly
+                when MEGAM_ASSEMBLYCOLLECTION
+                    Megam::AssemblyCollection
+                when MEGAM_COMPONENTS
+                    Megam::Components
+                when MEGAM_COMPONENTSCOLLECTION
+                    Megam::ComponentsCollection
+                when MEGAM_REQUEST
+                    Megam::Request
+                when MEGAM_REQUESTCOLLECTION
+                    Megam::RequestCollection
+                when MEGAM_SSHKEY
+                    Megam::SshKey
+                when MEGAM_SSHKEYCOLLECTION
+                    Megam::SshKeyCollection
+                when MEGAM_MARKETPLACE
+                    Megam::MarketPlace
+                when MEGAM_MARKETPLACECOLLECTION
+                    Megam::MarketPlaceCollection
+                when MEGAM_ORGANIZATION
+                    Megam::Organizations
+                when MEGAM_ORGANIZATIONSCOLLECTION
+                    Megam::OrganizationsCollection
+                when MEGAM_DOMAIN
+                    Megam::Domains
+                when MEGAM_DOMAINCOLLECTION
+                    Megam::DomainsCollection
+                when MEGAM_SENSORS
+                    Megam::Sensors
+                when MEGAM_SENSORSCOLLECTION
+                    Megam::SensorsCollection
+                when MEGAM_BALANCES
+                    Megam::Balances
+                when MEGAM_BALANCESCOLLECTION
+                    Megam::BalancesCollection
+                when MEGAM_BILLEDHISTORIES
+                    Megam::Billedhistories
+                when MEGAM_BILLEDHISTORIESCOLLECTION
+                    Megam::BilledhistoriesCollection
+                when MEGAM_PROMOS
+                    Megam::Promos
+                else
+                    fail JSON::ParserError, "Unsupported `json_class` type '#{json_class}'"
+                end
+            end
         end
-        opts
-      end
-
-      # Just call the JSON gem's parse method with a modified :max_nesting field
-      def from_json(source, opts = {})
-        obj = ::Yajl::Parser.parse(source)
-
-        # JSON gem requires top level object to be a Hash or Array (otherwise
-        # you get the "must contain two octets" error). Yajl doesn't impose the
-        # same limitation. For compatibility, we re-impose this condition.
-        unless obj.is_a?(Hash) || obj.is_a?(Array)
-          fail JSON::ParserError, "Top level JSON object must be a Hash or Array. (actual: #{obj.class})"
-        end
-
-        # The old default in the json gem (which we are mimicing because we
-        # sadly rely on this misfeature) is to "create additions" i.e., convert
-        # JSON objects into ruby objects. Explicit :create_additions => false
-        # is required to turn it off.
-        if opts[:create_additions].nil? || opts[:create_additions]
-          map_to_rb_obj(obj)
-        else
-          obj
-        end
-      end
-
-      # Look at an object that's a basic type (from json parse) and convert it
-      # to an instance of Megam classes if desired.
-      def map_to_rb_obj(json_obj)
-        case json_obj
-        when Hash
-          mapped_hash = map_hash_to_rb_obj(json_obj)
-
-          if json_obj.key?(JSON_CLAZ) && (class_to_inflate = class_for_json_class(json_obj[JSON_CLAZ]))
-            class_to_inflate.json_create(mapped_hash)
-
-          else
-            mapped_hash
-          end
-        when Array
-          json_obj.map { |e| map_to_rb_obj(e) }
-        else
-          json_obj
-        end
-      end
-
-      def map_hash_to_rb_obj(json_hash)
-        json_hash.each do |key, value|
-          json_hash[key] = map_to_rb_obj(value)
-        end
-        json_hash
-      end
-
-      def to_json(obj, opts = nil)
-        obj.to_json(opts_add_max_nesting(opts))
-      end
-
-      def to_json_pretty(obj, opts = nil)
-        ::JSON.pretty_generate(obj, opts_add_max_nesting(opts))
-      end
-
-      # Map +JSON_CLAZ+ to a Class object. We use a +case+ instead of a Hash
-      # assigned to a constant because otherwise this file could not be loaded
-      # until all the constants were defined, which means you'd have to load
-      # the world to get json.
-      def class_for_json_class(json_class)
-        case json_class
-        when MEGAM_ERROR
-          Megam::Error
-        when MEGAM_AUTH
-          Megam::Auth
-        when MEGAM_ACCOUNT
-          Megam::Account
-        when MEGAM_ASSEMBLIES
-          Megam::Assemblies
-        when MEGAM_ASSEMBLIESCOLLECTION
-          Megam::AssembliesCollection
-        when MEGAM_ASSEMBLY
-          Megam::Assembly
-        when MEGAM_ASSEMBLYCOLLECTION
-          Megam::AssemblyCollection
-        when MEGAM_COMPONENTS
-          Megam::Components
-        when MEGAM_COMPONENTSCOLLECTION
-          Megam::ComponentsCollection
-        when MEGAM_REQUEST
-          Megam::Request
-        when MEGAM_REQUESTCOLLECTION
-          Megam::RequestCollection
-        when MEGAM_SSHKEY
-          Megam::SshKey
-        when MEGAM_SSHKEYCOLLECTION
-          Megam::SshKeyCollection
-        when MEGAM_MARKETPLACE
-          Megam::MarketPlace
-        when MEGAM_MARKETPLACECOLLECTION
-          Megam::MarketPlaceCollection
-        when MEGAM_ORGANIZATION
-          Megam::Organizations
-        when MEGAM_ORGANIZATIONSCOLLECTION
-          Megam::OrganizationsCollection
-        when MEGAM_CSAR
-          Megam::CSAR
-        when MEGAM_CSARCOLLECTION
-          Megam::CSARCollection
-        when MEGAM_DOMAIN
-          Megam::Domains
-        when MEGAM_DOMAINCOLLECTION
-          Megam::DomainsCollection
-        when MEGAM_SENSORS
-          Megam::Sensors
-        when MEGAM_SENSORSCOLLECTION
-          Megam::SensorsCollection
-        when MEGAM_AVAILABLEUNITS
-          Megam::Availableunits
-        when MEGAM_AVAILABLEUNITSCOLLECTION
-          Megam::AvailableunitsCollection
-        when MEGAM_BALANCES
-          Megam::Balances
-        when MEGAM_BALANCESCOLLECTION
-          Megam::BalancesCollection
-        when MEGAM_BILLEDHISTORIES
-          Megam::Billedhistories
-        when MEGAM_BILLEDHISTORIESCOLLECTION
-          Megam::BilledhistoriesCollection
-        when MEGAM_INVOICES
-          Megam::Invoices
-        when MEGAM_INVOICESCOLLECTION
-          Megam::InvoicesCollection
-        when MEGAM_BILLINGS
-          Megam::Billings
-        when MEGAM_BILLINGSCOLLECTION
-          Megam::BillingsCollection
-        when MEGAM_CREDITHISTORIES
-          Megam::Credithistories
-        when MEGAM_CREDITHISTORIESCOLLECTION
-          Megam::CredithistoriesCollection
-        when MEGAM_DISCOUNTS
-          Megam::Discounts
-        when MEGAM_DISCOUNTSCOLLECTION
-          Megam::DiscountsCollection
-        when MEGAM_SUBSCRIPTIONS
-          Megam::Subscriptions
-        when MEGAM_SUBSCRIPTIONSCOLLECTION
-          Megam::SubscriptionsCollection
-        when MEGAM_PROMOS
-          Megam::Promos
-        else
-          fail JSON::ParserError, "Unsupported `json_class` type '#{json_class}'"
-        end
-      end
     end
-  end
 end

data/lib/megam/core/marketplace.rb

@@ -16,7 +16,7 @@
 
 
 module Megam
-  class MarketPlace < Megam::ServerAPI
+  class MarketPlace < Megam::RestAdapter
     def initialize(o)
       @id = nil
       @settings_name = nil

data/lib/megam/core/marketplace_collection.rb

@@ -101,21 +101,17 @@ module Megam
       @apps[res]
     end
 
-     # Transform the ruby obj ->  to a Hash
-    def to_hash
-      index_hash = Hash.new
-      self.each do |app|
-        index_hash[app.flavor] = app.to_s
-      end
-      index_hash
+    def to_s
+        @apps.join(", ")
     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)
+    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()
@@ -138,10 +134,5 @@ module Megam
       end
       true
     end
-
-    def to_s
-      Megam::Stuff.styled_hash(to_hash)
-    end
-
   end
 end