megam_api 0.75 → 0.77

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71c2300fe07469f9620a2a8aa85416daca5ec6a7
-  data.tar.gz: 625d47cb3a4f19f7c4c4597e4a9bc5c304f4fdd2
+  metadata.gz: 8425f7c1d458f71a142ce97114a8530e4fed4336
+  data.tar.gz: ff54ea8456f042cf79616c70ef34307135463c78
 SHA512:
-  metadata.gz: 607188d7cae267b3418ee76b2ade88323a87ab161862bb8677f21eb18142d138f7ef688ffd31c6413868e47f2c996ba548f3a50e857d69973de953471d275b90
-  data.tar.gz: 7eb58498ba9585db3401e347d9ef9bf84b230ad0100485a3406d8ccfb5a0c24d8b11f70ab4086677bd258b909c9c0a2e2540dd13350e8c42e9ad8901db4eded2
+  metadata.gz: 755d8b9d59fa9ff9a085c3aaf0b570027d9e858efe69b939f7c7235391d84694ea76b0601f37e84fe65a01eb5bba8a95632d321034b6651d6be83db8fc43ec6d
+  data.tar.gz: 69483f9bf6ac8a348f03e6a5897cc5a0926864f75ab1be1d27c183fd5bab38fe2d11edfa2ad5a083a5736fd2838a29ed98615ce8db431b61d6bd9213b600d4d9

data/lib/megam/api.rb

@@ -24,7 +24,7 @@ require 'megam/api/csars'
 require 'megam/api/assemblies'
 require 'megam/api/assembly'
 require 'megam/api/components'
-require 'megam/api/event'
+require 'megam/api/sensors'
 require 'megam/api/availableunits'
 require 'megam/api/balances'
 require 'megam/api/billedhistories'
@@ -66,8 +66,8 @@ require 'megam/core/assembly'
 require 'megam/core/assembly_collection'
 require 'megam/core/components'
 require 'megam/core/components_collection'
-require 'megam/core/event'
-
+require 'megam/core/sensors'
+require 'megam/core/sensors_collection'
 require 'megam/core/availableunits_collection'
 require 'megam/core/availableunits'
 require 'megam/core/balances_collection'
@@ -91,7 +91,6 @@ module Megam
     # text is used to print stuff in the terminal (message, log, info, warn etc.)
     attr_accessor :text
 
-    API_MEGAM_IO = 'api.megam.io'.freeze
     API_VERSION2 = '/v2'.freeze
 
     X_Megam_DATE = 'X-Megam-DATE'.freeze
@@ -128,13 +127,13 @@ module Megam
     # 3. Upon merge of the options, the api_key, email as available in the @options is deleted.
     def initialize(options = {})
       @options = OPTIONS.merge(options)
-      puts @options
       @api_key = @options.delete(:api_key) || ENV['MEGAM_API_KEY']
       @email = @options.delete(:email)
-      fail ArgumentError, 'You must specify [:email, :api_key]' if @email.nil? || @api_key.nil?
+      fail Megam::API::Errors::AuthKeysMissing if @email.nil? || @api_key.nil?
     end
 
     def request(params, &block)
+    
       just_color_debug("#{@options[:path]}")
       start = Time.now
       Megam::Log.debug('START')
@@ -213,7 +212,7 @@ module Megam
       @options[:path] = API_VERSION2 + @options[:path]
       encoded_api_header = encode_header(@options)
       @options[:headers] = HEADERS.merge(X_Megam_HMAC => encoded_api_header[:hmac],
-                                         X_Megam_DATE => encoded_api_header[:date]).merge(@options[:headers])
+      X_Megam_DATE => encoded_api_header[:date]).merge(@options[:headers])
 
       Megam::Log.debug('HTTP Request Data:')
       Megam::Log.debug("> HTTP #{@options[:scheme]}://#{@options[:host]}")
@@ -252,5 +251,5 @@ module Megam
       final_hmac = @email + ':' + hash
       header_params = { hmac: final_hmac, date: current_date }
     end
- end
+  end
 end

data/lib/megam/api/discounts.rb

@@ -1,9 +1,7 @@
 module Megam
   class API
     def get_discounts
-      puts "Entered get discount--weehaa!"
       @options = {:path => '/discounts',:body => ""}.merge(@options)
-  puts @options
       request(
         :expects  => 200,
         :method   => :get,
@@ -11,10 +9,9 @@ module Megam
       )
     end
 
-    
     def post_discounts(new_discount)
       @options = {:path => '/discounts/content',
-        :body => Megam::JSONCompat.to_json(new_discount)}.merge(@options)
+      :body => Megam::JSONCompat.to_json(new_discount)}.merge(@options)
 
       request(
         :expects  => 201,
@@ -22,13 +19,11 @@ module Megam
         :body     => @options[:body]
       )
     end
-    
-    
     def update_discounts(update_discount)
       @options = {:path => '/discounts/update',
       :body => Megam::JSONCompat.to_json(update_discount)}.merge(@options)
 
-   request(
+      request(
         :expects  => 201,
         :method   => :post,
         :body     => @options[:body]

data/lib/megam/api/errors.rb

@@ -10,8 +10,8 @@ module Megam
           super message
           @response = response
         end
-        
-      
+
+
       end
 
       class Unauthorized < ErrorWithResponse; end
@@ -22,6 +22,8 @@ module Megam
       class Socket < ErrorWithResponse; end
       class RequestFailed < ErrorWithResponse; end
 
+      class AuthKeysMissing < ArgumentError; end
+
     end
   end
 end

data/lib/megam/api/sensors.rb

@@ -0,0 +1,35 @@
+module Megam
+  class API
+    def get_sensors
+      @options = {:path => '/sensors',:body => ""}.merge(@options)
+
+      request(
+        :expects  => 200,
+        :method   => :get,
+        :body     => @options[:body]
+      )
+    end
+
+    def get_sensor(id)
+      @options = {:path => "/sensors/#{id}",:body => ""}.merge(@options)
+
+      request(
+        :expects  => 200,
+        :method   => :get,
+        :body     => @options[:body]
+      )
+    end
+
+    def post_sensors(new_sensors)
+      @options = {:path => '/sensors/content',
+        :body => Megam::JSONCompat.to_json(new_sensors)}.merge(@options)
+
+      request(
+        :expects  => 201,
+        :method   => :post,
+        :body     => @options[:body]
+      )
+    end
+
+  end
+end

data/lib/megam/api/version.rb

@@ -1,5 +1,5 @@
 module Megam
   class API
-    VERSION = "0.75"
+    VERSION = "0.77"
   end
 end

data/lib/megam/core/json_compat.rb

@@ -49,7 +49,8 @@ module Megam
     MEGAM_DISCOUNTS                   = "Megam::Discounts".freeze
     MEGAM_DISCOUNTSCOLLECTION         = "Megam::DiscountsCollection".freeze
     MEGAM_ERROR                       = "Megam::Error".freeze
-    MEGAM_EVENT                       = "Megam::Event".freeze
+    MEGAM_SENSORS                       = "Megam::Sensors".freeze
+    MEGAM_SENSORSCOLLECTION           = "Megam::SensorsCollection".freeze
     MEGAM_MARKETPLACE                 = "Megam::MarketPlace".freeze
     MEGAM_MARKETPLACECOLLECTION       = "Megam::MarketPlaceCollection".freeze
     MEGAM_MARKETPLACEADDON            = "Megam::MarketPlaceAddons".freeze
@@ -65,13 +66,14 @@ module Megam
     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.has_key?(:max_nesting)
-          opts = opts.nil? ? Hash.new : opts.clone
+        if opts.nil? || !opts.key?(:max_nesting)
+          opts = opts.nil? ? {} : opts.clone
           opts[:max_nesting] = JSON_MAX_NESTING
         end
         opts
@@ -84,8 +86,8 @@ module Megam
         # 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) or obj.kind_of?(Array)
-          raise JSON::ParserError, "Top level JSON object must be a Hash or Array. (actual: #{obj.class})"
+        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
@@ -95,28 +97,27 @@ module Megam
         if opts[:create_additions].nil? || opts[:create_additions]
           map_to_rb_obj(obj)
         else
-        obj
+          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.has_key?(JSON_CLAZ) && (class_to_inflate = class_for_json_class(json_obj[JSON_CLAZ]))
-          class_to_inflate.json_create(mapped_hash)
+          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
+            mapped_hash
           end
         when Array
-          json_obj.map {|e| map_to_rb_obj(e)}
+          json_obj.map { |e| map_to_rb_obj(e) }
         else
-        json_obj
+          json_obj
         end
       end
 
@@ -185,8 +186,10 @@ module Megam
           Megam::CSARCollection
         when MEGAM_DOMAIN
           Megam::Domains
-        when MEGAM_EVENT
-          Megam::Event
+        when MEGAM_SENSORS
+          Megam::Sensors
+        when MEGAM_SENSORSCOLLECTION
+          Megam::SensorsCollection
         when MEGAM_AVAILABLEUNITS
           Megam::Availableunits
         when MEGAM_AVAILABLEUNITSCOLLECTION
@@ -200,9 +203,9 @@ module Megam
         when MEGAM_BILLEDHISTORIESCOLLECTION
           Megam::BilledhistoriesCollection
         when MEGAM_INVOICES
-           Megam::Invoices
-      when MEGAM_INVOICESCOLLECTION
-           Megam::InvoicesCollection
+          Megam::Invoices
+        when MEGAM_INVOICESCOLLECTION
+          Megam::InvoicesCollection
         when MEGAM_BILLINGS
           Megam::Billings
         when MEGAM_BILLINGSCOLLECTION
@@ -222,10 +225,9 @@ module Megam
         when MEGAM_PROMOS
           Megam::Promos
         else
-        raise JSON::ParserError, "Unsupported `json_class` type '#{json_class}'"
+          fail JSON::ParserError, "Unsupported `json_class` type '#{json_class}'"
         end
       end
-
     end
   end
 end

data/lib/megam/core/promos.rb

@@ -32,7 +32,7 @@ module Megam
       if arg != nil
         @id = arg
       else
-      @id
+        @id
       end
     end
 
@@ -40,7 +40,7 @@ module Megam
       if arg != nil
         @code = arg
       else
-      @code
+        @code
       end
     end
 
@@ -48,7 +48,7 @@ module Megam
       if arg != nil
         @amount = arg
       else
-      @amount
+        @amount
       end
     end
 
@@ -56,7 +56,7 @@ module Megam
       if arg != nil
         @created_at = arg
       else
-      @created_at
+        @created_at
       end
     end
 
@@ -66,7 +66,7 @@ module Megam
       if arg != nil
         @some_msg = arg
       else
-      @some_msg
+        @some_msg
       end
     end
 
@@ -146,14 +146,12 @@ module Megam
 
     # Show a particular promo by name,
     # Megam::Promos
-     def self.show(params)
-       puts "[x] Called show"
+    def self.show(params)
       pre = self.new(params["email"], params["api_key"], params["host"])
       pre.megam_rest.get_promos(params["code"])
     end
 
 
-
     def to_s
       Megam::Stuff.styled_hash(to_hash)
     end

data/lib/megam/core/request.rb

@@ -190,7 +190,6 @@ module Megam
 
     # Create the node via the REST API
     def create
-    puts "entering megam_api"
       megam_rest.post_request(to_hash)
     end
 

data/lib/megam/core/sensors.rb

@@ -0,0 +1,157 @@
+# Copyright:: Copyright (c) 2012, 2014 Megam Systems
+# License:: Apache License, Version 2.0
+#
+# 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 Sensors < Megam::ServerAPI
+    def initialize(email = nil, api_key = nil, host = nil)
+      @id = nil
+      @sensor_type = nil
+      @payload = {}
+      @created_at = nil
+      super(email, api_key, host)
+    end
+
+    def sensors
+      self
+    end
+
+    def id(arg = nil)
+      if !arg.nil?
+        @id = arg
+      else
+        @id
+      end
+    end
+
+    def sensor_type(arg = nil)
+      if !arg.nil?
+        @sensor_type = arg
+      else
+        @sensor_type
+      end
+    end
+
+    def payload(arg = nil)
+      if !arg.nil?
+        @payload = arg
+      else
+        @payload
+      end
+    end
+
+    def created_at(arg = nil)
+      if !arg.nil?
+        @created_at = arg
+      else
+        @created_at
+      end
+    end
+
+    def error?
+      crocked = true if some_msg.key?(:msg_type) && some_msg[:msg_type] == 'error'
+    end
+
+    # Transform the ruby obj ->  to a Hash
+    def to_hash
+      index_hash = {}
+      index_hash['json_claz'] = self.class.name
+      index_hash['id'] = id
+
+      index_hash['sensor_type'] = sensor_type
+      index_hash['payload'] = payload
+      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,
+        'sensor_type' => sensor_type,
+        'payload' => payload,
+        'created_at' => created_at
+      }
+      result
+    end
+
+    def self.json_create(o)
+      asm = new
+      asm.id(o['id']) if o.key?('id')
+      asm.sensor_type(o['sensor_type']) if o.key?('sensor_type')
+      asm.payload(o['payload']) if o.key?('payload')
+      asm.created_at(o['created_at']) if o.key?('created_at')
+      asm
+    end
+
+    def self.from_hash(o, tmp_email = nil, tmp_api_key = nil, tmp_host = nil)
+      asm = new(tmp_email, tmp_api_key, tmp_host)
+      asm.from_hash(o)
+      asm
+    end
+
+    def from_hash(o)
+      @id = o['id'] if o.key?('id')
+      @sensor_type = o['sensor_type'] if o.key?('sensor_type')
+      @payload = o['payload'] if o.key?('payload')
+      @created_at = o['created_at'] if o.key?('created_at')
+      self
+    end
+
+    def self.create(params)
+      sensors = from_hash(params, params['email'], params['api_key'], params['host'])
+      sensors.create
+    end
+
+    # Load a account by email_p
+    def self.show(params)
+      sensors = new(params['email'], params['api_key'], params['host'])
+      sensors.megam_rest.get_sensor(params['id'])
+    end
+
+    def self.list(params)
+      sensors = self.new(params["email"], params["api_key"], params["host"])
+      sensors.megam_rest.get_sensors
+    end
+
+    def self.update(params)
+      sensors = from_hash(params, params['email'] || params[:email], params['api_key'] || params[:api_key], params['host'] || params[:host])
+      sensors.update
+    end
+
+    def self.list(o)
+        app = self.new(o["email"], o["api_key"], o["host"])
+      app.megam_rest.get_sensors
+    end
+
+    # Create the node via the REST API
+    def update
+      megam_rest.update_(to_hash)
+    end
+
+    def create
+      megam_rest.post_sensors(to_hash)
+    end
+
+    def to_s
+      Megam::Stuff.styled_hash(to_hash)
+    end
+  end
+end