cs 0.1.0beta3 → 0.1.0

data/lib/{commonsense-ruby-lib → cs}/auth/oauth.rb

@@ -1,6 +1,6 @@
 require "oauth"
 
-module CommonSense
+module CS
   module Auth
     class OAuth
 
@@ -21,48 +21,48 @@ module CommonSense
         @oauth
       end
 
-      def get(path, query={}, headers = {})
+      def execute(&block)
         reset
-        headers = default_headers.merge(headers)
-        response = oauth.get(path, headers)
+        response = yield
         parse_response(response)
         @response_body
       end
 
-      def post(path, body = '', headers = {})
-        reset
-        headers = default_headers.merge(headers)
-        response = oauth.post(path, body.to_json, headers)
-        parse_response(response)
+      def get(path, query={}, headers = {})
+        execute do
+          path += '?' + URI.encode_www_form(query) unless query.empty?
+          headers = default_headers.merge(headers)
+          oauth.get(path, headers)
+        end
+      end
 
-        @response_body
+      def post(path, body = '', headers = {})
+        execute do
+          headers = default_headers.merge(headers)
+          oauth.post(path, body.to_json, headers)
+        end
       end
 
       def put(path, body = '', headers = {})
-        reset
-        headers = default_headers.merge(headers)
-        response = oauth.put(path, body.to_json, headers)
-        parse_response(response)
-
-        @response_body
+        execute do
+          headers = default_headers.merge(headers)
+          oauth.put(path, body.to_json, headers)
+        end
       end
 
       def delete(path, query={}, headers = {})
-        reset
-        headers = default_headers.merge(headers)
-        response = oauth.delete(path, headers)
-        parse_response(response)
-
-        @response_body
+        execute do
+          path += '?' + URI.encode_www_form(query) unless query.empty?
+          headers = default_headers.merge(headers)
+          oauth.delete(path, headers)
+        end
       end
 
       def head(path, headers = {})
-        reset
-        headers = default_headers.merge(headers)
-        response = oauth.head(path, headers)
-        parse_response(response)
-
-        @response_body
+        execute do
+          headers = default_headers.merge(headers)
+          oauth.head(path, headers)
+        end
       end
 
       def base_uri=(uri = nil)

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,61 @@
+require 'delegate'
+
+module CS
+  module Collection
+    class SensorDataCollection < SimpleDelegator
+      attr_accessor :session
+      attr_accessor :batch_size
+
+      def initialize
+        @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_point)
+        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/{commonsense-ruby-lib → cs}/end_point.rb

@@ -1,7 +1,7 @@
-require 'commonsense-ruby-lib/serializer'
-module CommonSense
+require 'cs/serializer'
+module CS
   module EndPoint
-    include CommonSense::Serializer
+    include CS::Serializer
 
     attr_accessor :session
 
@@ -22,7 +22,7 @@ module CommonSense
 
     # get value of property name
     def parameter(name)
-      self.instance_variable_get(name)
+      self.instance_variable_get("@#{name}")
     end
 
     # Persist end point object to CS. It will create a new record on CS
@@ -44,20 +44,20 @@ module CommonSense
     #
     #     sensor.name = "accelerometer edit"
     #     sensor.save! # this will update the sensor
-    def save!
+    def save!(options={})
       check_session!
 
       if @id
-        self.update!
+        self.update!(options)
       else
-        self.create!
+        self.create!(options)
       end
     end
 
-    # it will persist data to CS just like {#save!} but it will return nil instead of exception
+    # it will persist data to CS just like {#save!} but it will return false instead of exception
     # if it encouter error while persiting data
-    def save
-      save! rescue nil
+    def save(options={})
+      save!(options) rescue false
     end
 
     # Create a new end point object to CS. It will raise an exception if there is an error
@@ -74,8 +74,9 @@ module CommonSense
     #
     #     sensor.create! # this will create new sensor on CS
     #     sensor.id # should give you the id of the sensor
-    def create!
+    def create!(options={})
       parameter = self.to_parameters
+      parameter.merge!(options)
       res = session.post(post_url, parameter)
 
       if session.response_code != 201
@@ -90,11 +91,10 @@ module CommonSense
       true
     end
 
-    # Create a new endpoint object to CS, just like {#create!} but it will return nil
+    # Create a new endpoint object to CS, just like {#create!} but it will return false
     # if there is an error.
-    def create
-      result = create! rescue nil
-      not result.nil?
+    def create(options={})
+      create!(options) rescue false
     end
 
     # Retrieve Data from CS of the current object based on the id of the object.
@@ -125,10 +125,9 @@ module CommonSense
     end
 
     # it will retrieve / reload current object form CS, just like {#retrieve!} but it
-    # will return nil instead of raise an exception if there is an error.
+    # will return false instead of raise an exception if there is an error.
     def retrieve
-      result = retrieve! rescue nil
-      not result.nil?
+      retrieve! rescue false
     end
 
     # alias for {#retrieve}
@@ -143,11 +142,12 @@ module CommonSense
     #     sensor = client.sensors.find(1)
     #     sensor.name = "new name"
     #     sensor.update!
-    def update!
+    def update!(options={})
       check_session!
       raise Error::ResourceIdError unless @id
 
       parameter = self.to_parameters
+      parameter.merge!(options)
       res = session.put(put_url, parameter)
 
       if session.response_code != 200
@@ -160,9 +160,8 @@ module CommonSense
 
     # Update current end point object to CS, just like {#update!} but it will return nil
     # if there is an error
-    def update
-      result = update! rescue nil
-      not result.nil?
+    def update(options={})
+      update!(options) rescue false
     end
 
 
@@ -192,8 +191,7 @@ module CommonSense
     # Delete the current end point object from CS, just like {#delete!} but it will return nil
     # if there is an error
     def delete
-      result = delete! rescue nil
-      not result.nil?
+      delete! rescue false
     end
 
     # return the commonsense URL for method
@@ -205,6 +203,12 @@ module CommonSense
       url
     end
 
+    def duplicate
+      clone = self.dup
+      clone.id = nil
+      clone
+    end
+
     protected
     def scan_header_for_id(location_header)
       location_header.scan(/.*\/#{resources}\/(.*)/)[0] if location_header
@@ -268,9 +272,17 @@ module CommonSense
         class_variable_set(:@@delete_url, "/#{resources}/:id.json")
       end
 
+      def resources_name
+        class_variable_get(:@@resources)
+      end
+
       def resource(resource)
         class_variable_set(:@@resource, resource)
       end
+
+      def resource_name
+        class_variable_get(:@@resource)
+      end
     end
   end
 end

data/lib/cs/end_point/group.rb

@@ -0,0 +1,26 @@
+module CS
+  module EndPoint
+    class Group
+      include EndPoint
+
+      attribute :name, :anonymous, :public, :hidden, :access_password, :description,
+        :required_sensors, :default_list_users, :default_add_users, :default_remove_users,
+        :default_list_sensors, :default_add_sensors, :required_show_id, :required_show_email,
+        :required_show_first_name, :required_show_surname, :required_show_phone_number,
+        :required_show_username
+
+      resources "groups"
+      resource "group"
+
+      def initialize(hash={})
+        from_hash(hash)
+      end
+
+      # get groups that user belongs to
+      def current_groups(options={})
+        relation = Relation::GroupRelation.new(@session)
+        relation.to_a
+      end
+    end
+  end
+end

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/{commonsense-ruby-lib → cs}/end_point/sensor.rb

@@ -1,14 +1,24 @@
-module CommonSense
+module CS
   module EndPoint
     class Sensor
       include EndPoint
 
       attribute :name, :display_name, :device_type, :pager_type, :data_type, :data_structure
-      resources :sensors
-      resource :sensor
+      resources "sensors"
+      resource "sensor"
 
       def initialize(hash={})
         from_hash(hash)
+        parse_data_structure
+      end
+
+      def retrieve!
+        super
+        parse_data_structure
+        true
+      end
+
+      def parse_data_structure
         if self.data_type == "json"
           if self.data_structure && self.data_structure.kind_of?(String)
             self.data_structure = JSON.parse(self.data_structure) rescue nil
@@ -16,8 +26,8 @@ module CommonSense
         end
       end
 
-      # overide Endpoint#to_parameters
-      def to_parameters
+
+      def to_cs_sensor
         param = self.to_h(false)
         if param[:data_type] == "json"
           if param[:data_structure] && !param[:data_structure].kind_of?(String)
@@ -25,7 +35,13 @@ module CommonSense
           end
         end
 
-        {sensor: param}
+        param
+      end
+
+      # overide Endpoint#to_parameters
+      def to_parameters
+
+        {sensor: to_cs_sensor}
       end
 
       def data

data/lib/{commonsense-ruby-lib → cs}/end_point/sensor_data.rb

@@ -1,9 +1,9 @@
-module CommonSense
+module CS
   module EndPoint
     # This object represent a sensor data point
     # usage example:
     #
-    #    client = CommonSense::Client.new
+    #    client = CS::Client.new
     #    client.login('username', 'password')
     #
     #    # Find the first position sensor
@@ -19,13 +19,14 @@ module CommonSense
     #    sensor.data.build(date: Time.now, value: {"lux => 1}).save!
     #
     class SensorData
-      include CommonSense::EndPoint
+      include CS::EndPoint
 
       attr_accessor :month, :week, :year
       attribute :date, :value, :sensor_id
-      resource :data
+      resources "data"
+      resource "data"
 
-      def to_parameters
+      def to_cs_point
         param = self.to_h(false)
         param.delete(:sensor_id)
         value = param[:value]
@@ -33,7 +34,17 @@ module CommonSense
           param[:value] = value.to_json unless value.kind_of?(String) || value.kind_of?(Numeric)
         end
 
-        {data: [param]}
+        param[:date] = CS::Time.new(date).to_f if param[:date]
+
+        param
+      end
+
+      def to_parameters
+        {data: [to_cs_point]}
+      end
+
+      def date_human
+        Time.new(@date)
       end
 
       # there is no currently end point for geting data by id