cs 0.1.1beta → 0.1.3

data/lib/cs/auth/http.rb

@@ -7,10 +7,11 @@ module CS
       include HTTParty
 
       attr_accessor :response_body, :response_code, :response_headers, :errors
-      attr_reader :session_id
+      attr_reader :session_id, :api_key
 
-      def initialize(base_uri = nil)
+      def initialize(base_uri = nil, api_key = nil)
         self.base_uri = base_uri
+        @api_key = api_key
         @session_id = nil
         reset
       end
@@ -22,10 +23,23 @@ module CS
         @response_body
       end
 
+      def process_api_key(path)
+        return path if @api_key.nil?
+
+        if URI(path).query.nil?
+          path += "?API_KEY=#{@api_key}"
+        else
+          path += "&API_KEY=#{@api_key}"
+        end
+
+        path
+      end
+
       def get(path, query={}, headers = {})
         execute do
           headers = default_headers.merge(headers)
           options = {query: query, headers: headers}
+          path = process_api_key(path)
           self.class.get(path, options)
         end
       end
@@ -66,7 +80,7 @@ module CS
         header = self.class.default_options[:headers] || {}
         header.merge!({"Content-Type" => "application/json"})
         if @session_id
-          header.merge!('X-SESSION_ID' => self.session_id)
+          header = header.merge('X-SESSION_ID' => self.session_id)
         end
         header
       end
@@ -79,18 +93,19 @@ module CS
         @session_id = session_id
       end
 
-
       # login to commonsense
       # @return [String] session_id
-      def login(username, password)
-        password = Digest::MD5.hexdigest password
+      def login(username, password, digest=true)
+        if digest
+          password = Digest::MD5.hexdigest password
+        end
         post('/login.json', {:username => username, :password => password})
 
         if @response_code == 200
           self.session_id = response_body['session_id']
         else
           self.session_id = false
-          errors = [response_body['error']]
+          @errors = [response_body['error']]
         end
 
         session_id
@@ -104,6 +119,7 @@ module CS
       end
 
       def parse_response
+        return unless @response_body
         @response_code = @response_body.response.code.to_i
         @response_headers = @response_body.headers
         if @response_code >= 400

data/lib/cs/cli/cli.rb

@@ -0,0 +1,29 @@
+require 'yaml'
+
+module CS
+  module CLI
+    class Config
+      @@config = {}
+      @@loaded = false
+      @@file = ""
+
+      def self.load_config(file="#{ENV['HOME']}/.cs.yml")
+        @@file = file
+        @@config = YAML.load_file(file)
+        @@loaded = true
+      end
+
+      def self.get(key=nil)
+        if !@@loaded
+          STDERR.puts("WARNING could not load '#{@@file}'. Is it exists ?")
+        end
+
+        if key.nil?
+          return @@config
+        else
+          return @@config[key.to_s]
+        end
+      end
+    end
+  end
+end

data/lib/cs/collection.rb

@@ -0,0 +1,7 @@
+module CS
+  ##
+  # Module to handle Collection
+  module Collection
+
+  end
+end

data/lib/cs/collection/sensor_data_collection.rb

@@ -0,0 +1,62 @@
+require 'delegate'
+
+module CS
+  module Collection
+    class SensorDataCollection < SimpleDelegator
+      attr_accessor :session
+      attr_accessor :batch_size
+
+      def initialize(session=nil)
+        self.session = session
+        @batch_size = 1000
+        super([])
+      end
+
+      def save!
+        check_session!
+
+        # group batch
+        self.each_slice(@batch_size) do |batch|
+          body = process_batch(batch)
+          @session.post(get_url, body)
+        end
+      end
+
+      ##
+      # Given array of sensor data it will group the data by sensor_id
+      # and construct payload for multiple sensor upload
+      def process_batch(batch)
+        sensors = {}
+        batch.each do |point|
+          next if point.nil? || point.sensor_id.nil?
+          sensor_id = point.sensor_id
+
+          if !sensors[sensor_id]
+            sensors[sensor_id] = {
+              sensor_id: sensor_id,
+              data: []
+            }
+          end
+
+          sensors[sensor_id][:data].push(point.to_cs_value)
+        end
+
+        retval = []
+        sensors.each do |k, v|
+          retval.push(v)
+        end
+
+        {sensors: retval}
+      end
+
+      def get_url
+        "/sensors/data.json"
+      end
+
+      private
+      def check_session!
+        raise Error::SessionEmptyError unless @session
+      end
+    end
+  end
+end

data/lib/cs/end_point.rb

@@ -1,4 +1,6 @@
 require 'cs/serializer'
+require 'set'
+
 module CS
   module EndPoint
     include CS::Serializer

data/lib/cs/end_point/notification.rb

@@ -0,0 +1,16 @@
+module CS
+  module EndPoint
+    class Notification
+      include EndPoint
+
+      attribute :type, :text, :destination
+
+      resources "notifications"
+      resource "notification"
+
+      def initialize(hash={})
+        from_hash(hash)
+      end
+    end
+  end
+end

data/lib/cs/end_point/sensor.rb

@@ -26,8 +26,8 @@ module CS
         end
       end
 
-      # overide Endpoint#to_parameters
-      def to_parameters
+
+      def to_cs_value
         param = self.to_h(false)
         if param[:data_type] == "json"
           if param[:data_structure] && !param[:data_structure].kind_of?(String)
@@ -35,12 +35,40 @@ module CS
           end
         end
 
-        {sensor: param}
+        param
+      end
+
+      # overide Endpoint#to_parameters
+      def to_parameters
+        {sensor: to_cs_value}
       end
 
       def data
         Relation::SensorDataRelation.new(self.id, self.session)
       end
+
+      # Copy data from other sensor
+      #
+      # example :
+      #
+      #   source = client.sensors.find(1234)
+      #   destination = clint.sensors.find(2345)
+      #
+      #   destination.copy_data(source, start_date: 12345, end_date: 12350)
+      #
+      def copy_data(sensor, parameters={})
+        source = sensor.data
+        parameters.each do |k,v|
+          source.send(k.to_sym, v)
+        end
+
+        collection = self.data.collection
+        source.each do |point|
+          collection.push self.data.build(date: point.date, value: point.value)
+        end
+
+        collection.save!
+      end
     end
   end
 end

data/lib/cs/end_point/sensor_data.rb

@@ -26,7 +26,7 @@ module CS
       resources "data"
       resource "data"
 
-      def to_parameters
+      def to_cs_value
         param = self.to_h(false)
         param.delete(:sensor_id)
         value = param[:value]
@@ -35,7 +35,12 @@ module CS
         end
 
         param[:date] = CS::Time.new(date).to_f if param[:date]
-        {data: [param]}
+
+        param
+      end
+
+      def to_parameters
+        {data: [to_cs_value]}
       end
 
       def date_human

data/lib/cs/end_point/trigger.rb

@@ -0,0 +1,16 @@
+module CS
+  module EndPoint
+    class Trigger
+      include EndPoint
+
+      attribute :name, :expression, :inactivity, :creation_date
+
+      resources "triggers"
+      resource "trigger"
+
+      def initialize(hash={})
+        from_hash(hash)
+      end
+    end
+  end
+end

data/lib/cs/relation.rb

@@ -45,7 +45,7 @@ module CS
     end
 
     def get_data(params={})
-      get_data!(params) rescue nil
+      get_data!(params)
     end
 
     def all
@@ -94,7 +94,6 @@ module CS
     end
 
     def last
-      total = count
       resource = get_single_resource(page: count - 1)
       parse_single_resource(resource)
     end
@@ -146,7 +145,7 @@ module CS
         options[:page] = self.page
         data = get_data(options)
 
-        data = data[resource_class.resources_name]
+        data = data[resource_class.resources_name] unless data.nil?
         if !data.nil? && !data.empty?
           yield data
           self.page += 1

data/lib/cs/relation/notification_relation.rb

@@ -0,0 +1,20 @@
+module CS
+  module Relation
+    class NotificationRelation
+      include Relation
+
+      parameter :page, Integer, default: 0, required: true
+      parameter :per_page, Integer, default: 1000, required: true, maximum: 1000
+      parameter :total, Boolean
+
+      private
+      def resource_class
+        EndPoint::Notification
+      end
+
+      def get_url
+        "/notifications.json"
+      end
+    end
+  end
+end

data/lib/cs/relation/sensor_data_relation.rb

@@ -50,6 +50,14 @@ module CS
         parse_single_resource(data)
       end
 
+      def start_date(date)
+        from(date)
+      end
+
+      def end_date(date)
+        to(date)
+      end
+
       def from(start_date)
         param_option = self.class.parameters[:start_date]
         self.start_date = process_param_time(:start_date, start_date, param_option)
@@ -62,6 +70,10 @@ module CS
         self
       end
 
+      def collection
+        Collection::SensorDataCollection.new(session)
+      end
+
       private
       def resource_class
         EndPoint::SensorData

data/lib/cs/relation/sensor_relation.rb

@@ -100,6 +100,23 @@ module CS
         self.select { |sensor| sensor.name =~ regex }
       end
 
+      def triggers()
+        Relation::SensorTriggersRelation.new(@session)
+      end
+
+      # Create new sensor with properties from other sensor
+      #
+      # example :
+      #
+      #  client.sensors.clone_from(client.sensors.find(123))
+      def clone_from(other_sensor)
+        sensor = EndPoint::Sensor.new(other_sensor.to_cs_value)
+        sensor.id = nil
+        sensor.session = self.session
+
+        sensor
+      end
+
       private
       def resource_class
         EndPoint::Sensor
@@ -109,5 +126,15 @@ module CS
         "/sensors.json"
       end
     end
+
+    class SensorTriggersRelation
+      include Relation
+
+      parameter :page, Integer, default: 0, required: true
+
+      def get_url
+        "/sensors/triggers.json"
+      end
+    end
   end
 end

data/lib/cs/relation/trigger_relation.rb

@@ -0,0 +1,21 @@
+module CS
+  module Relation
+    class TriggerRelation
+      include Relation
+
+      parameter :page, Integer, default: 0, required: true
+      parameter :per_page, Integer, default: 1000, required: true, maximum: 1000
+      parameter :total, Boolean
+
+
+      private
+      def resource_class
+        EndPoint::Trigger
+      end
+
+      def get_url
+        "/triggers.json"
+      end
+    end
+  end
+end

data/lib/cs/session.rb

@@ -13,9 +13,9 @@ module CS
 
     # login to commonsense
     # @return [String] session_id
-    def login(username, password)
+    def login(username, password, digest=true)
       @auth_proxy = CS::Auth::HTTP.new(@base_uri)
-      @auth_proxy.login(username, password)
+      @auth_proxy.login(username, password, digest)
     end
 
     def oauth(consumer_key, consumer_secret, access_token, access_token_secret)
@@ -28,11 +28,20 @@ module CS
       auth_proxy.session_id
     end
 
+    def api_key
+      auth_proxy.api_key
+    end
+
     def session_id=(session_id)
       @auth_proxy = CS::Auth::HTTP.new(@base_uri)
       @auth_proxy.session_id = session_id
     end
 
+    def api_key=(api_key)
+      @api_key = api_key
+      @auth_proxy = CS::Auth::HTTP.new(@base_uri, api_key)
+    end
+
     def auth_proxy
       raise 'The session is not logged in' unless @auth_proxy
       @auth_proxy
@@ -55,18 +64,25 @@ module CS
       logger.info("")
       logger.info("#{type} #{path}")
       logger.debug("headers: #{headers.inspect}")
-      logger.info("parameters: #{body.inspect}")
+      if ["POST", "PUT"].include?(type)
+        logger.debug("request: #{body.inspect}")
+      else
+        logger.info("request: #{body.inspect}")
+      end
     end
 
-    def log_response
-      logger.info("response: #{self.response_code}")
-      logger.debug("body: #{self.response_body}")
+    def log_response(elapsed)
+      logger.info("result: #{self.response_code} in #{elapsed}ms")
+      logger.debug("response: #{self.response_body}")
     end
 
     def execute(type, path, body, headers, &block)
+      start_time = Time.now
       log_request(type, path, body, headers) if logger
       response = retry_on_509 { yield }
-      log_response if logger
+
+      elapsed = (Time.now - start_time) * 1000.0
+      log_response(elapsed) if logger
 
       response
     end
@@ -146,7 +162,12 @@ module CS
     end
 
     def to_s
-      "\"#{self.session_id}\""
+      if session_id
+        return "SESSION_ID \"#{session_id}\""
+      elsif api_key
+        return "API_KEY \"#{api_key}\""
+      end
+      return ""
     end
 
     def inspect