cs 0.1.0 → 0.1.1beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9c07ce0761efba489c25ac1286348c278d43024
-  data.tar.gz: a200d01e595e45f19d4188a68b3089ab864222f0
+  metadata.gz: da893437e3bafdedfc45e0ee607d2bf923faa73c
+  data.tar.gz: 4c63a68ad28063ce2a61968ec71da47c7e41fb94
 SHA512:
-  metadata.gz: ee82e700560960c985a55829cba9987952b619b20395435d111948695f36550e9c3f4d5ea6d2bc1a4ae784c78dacdba6c3fb710c4268affcc80782e364b2fcce
-  data.tar.gz: 32cbaac901131587917bc9a9ada98678399cab0d34bec5ba83cd50daee54f13c08377c7879b82ffb7a39bd659dea8b2861b19424bb4fcfdc8d0dd63a25d9e7a5
+  metadata.gz: 2ab95c33150cc511f53a057280e83fe35eafcdd61b48acab6ef6bce312511af17c295945e06412b36c98446fc012c60df6aebd7e03017a8cc275e866461bdd36
+  data.tar.gz: 3973ad261722529b962970e5c956eb921045820cde9ccff0d268824024ffa3cddd487a9bca7faa56f1430320bbd93c8ac45453af135371aa70e1cead6debbd0a

data/.travis.yml

@@ -2,7 +2,8 @@ language: ruby
 rvm:
   - 2.0.0
   - 1.9.3
+  - 1.9.2
   - jruby-19mode
-  - rbx-2.2.1
+  - rbx-19mode
   - jruby-head
 script: bundle exec rspec spec

data/Gemfile

@@ -3,15 +3,7 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in cs.gemspec
 gemspec
 gem "time-lord"
-gem 'json'
-
-#
-# Rubinius does not load ruby stdlib by default
-#
-
-platforms :rbx do
-  gem 'rubysl'
-end
+gem 'json', '~> 1.7.7'
 
 group :test do
   gem "rake", "~> 10.1.0"

data/cs.gemspec

@@ -8,8 +8,6 @@ Gem::Specification.new do |gem|
   gem.summary       = %q{Client library to communicate with CommonSense written in ruby}
   gem.homepage      = "https://github.com/senseobservationsystems/commonsense-ruby-lib"
 
-  gem.required_ruby_version = '>= 1.9.3'
-
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
@@ -17,6 +15,6 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = CS::VERSION
   gem.add_development_dependency("launchy", "~> 2.3")
-  gem.add_dependency('httparty', '~> 0.12')
+  gem.add_dependency('httparty', '~> 0.11')
   gem.add_dependency('oauth', '~> 0.4')
 end

data/lib/cs.rb

@@ -9,17 +9,12 @@ require "cs/end_point/user"
 require "cs/end_point/group"
 require "cs/end_point/sensor"
 require "cs/end_point/sensor_data"
-require "cs/end_point/trigger"
-require "cs/end_point/notification"
 require "cs/parameter_processor"
 require "cs/relation"
 require "cs/relation/sensor_relation"
 require "cs/relation/sensor_data_relation"
 require "cs/relation/user_relation"
 require "cs/relation/group_relation"
-require "cs/relation/trigger_relation"
-require "cs/relation/notification_relation"
-require "cs/collection/sensor_data_collection"
 
 module CS
 
@@ -70,10 +65,10 @@ module CS
     #
     #    client = CS::Client.new
     #    client.login!('username', 'password')
-    def login!(user, password, digest=true)
+    def login!(user, password)
       @session = Session.new(base_uri: @base_uri)
       @session.logger = logger
-      @session.login(user, password, digest)
+      @session.login(user, password)
     end
 
     # Create a new session to CommonSense using username and plain text password
@@ -81,8 +76,8 @@ module CS
     #
     #    client = CS::Client.new
     #    client.login('username', 'password')
-    def login(user, password, digest=true)
-      login!(user, password, digest) rescue false
+    def login(user, password)
+      login!(user, password) rescue false
     end
 
     # Create a new session to CommonSense using OAuth credentials
@@ -105,16 +100,6 @@ module CS
       @session.session_id = session_id
     end
 
-    # Create new session by specifying api_key
-    #
-    #     client = CS::Client.new
-    #     client.session_id = '12345'
-    def api_key=(api_key)
-      @session = Session.new(base_uri: @base_uri)
-      @session.logger = logger
-      @session.api_key = api_key
-    end
-
     # Retrun logged in user
     def current_user
       user = EndPoint::User.new
@@ -148,14 +133,6 @@ module CS
       Relation::GroupRelation.new(@session)
     end
 
-    def triggers
-      Relation::TriggerRelation.new(@session)
-    end
-
-    def notifications
-      Relation::NotificationRelation.new(@session)
-    end
-
     def current_groups
       group = EndPoint::Group.new
       group.session = @session
@@ -168,9 +145,5 @@ module CS
       return @session.errors if @session
     end
   end
-
-  def self.load_CLI
-    require "cs/cli/cli"
-  end
 end
 

data/lib/cs/auth/http.rb

@@ -7,11 +7,10 @@ module CS
       include HTTParty
 
       attr_accessor :response_body, :response_code, :response_headers, :errors
-      attr_reader :session_id, :api_key
+      attr_reader :session_id
 
-      def initialize(base_uri = nil, api_key = nil)
+      def initialize(base_uri = nil)
         self.base_uri = base_uri
-        @api_key = api_key
         @session_id = nil
         reset
       end
@@ -23,23 +22,10 @@ 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
@@ -80,7 +66,7 @@ module CS
         header = self.class.default_options[:headers] || {}
         header.merge!({"Content-Type" => "application/json"})
         if @session_id
-          header = header.merge('X-SESSION_ID' => self.session_id)
+          header.merge!('X-SESSION_ID' => self.session_id)
         end
         header
       end
@@ -93,19 +79,18 @@ module CS
         @session_id = session_id
       end
 
+
       # login to commonsense
       # @return [String] session_id
-      def login(username, password, digest=true)
-        if digest
-          password = Digest::MD5.hexdigest password
-        end
+      def login(username, password)
+        password = Digest::MD5.hexdigest password
         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
@@ -119,7 +104,6 @@ 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/end_point/sensor.rb

@@ -26,8 +26,8 @@ module CS
         end
       end
 
-
-      def to_cs_sensor
+      # overide Endpoint#to_parameters
+      def to_parameters
         param = self.to_h(false)
         if param[:data_type] == "json"
           if param[:data_structure] && !param[:data_structure].kind_of?(String)
@@ -35,13 +35,7 @@ module CS
           end
         end
 
-        param
-      end
-
-      # overide Endpoint#to_parameters
-      def to_parameters
-
-        {sensor: to_cs_sensor}
+        {sensor: param}
       end
 
       def data

data/lib/cs/end_point/sensor_data.rb

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

data/lib/cs/relation.rb

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

data/lib/cs/relation/sensor_relation.rb

@@ -100,18 +100,6 @@ module CS
         self.select { |sensor| sensor.name =~ regex }
       end
 
-      def triggers()
-        Relation::SensorTriggersRelation.new(@session)
-      end
-
-      def clone_from(other_sensor)
-        sensor = Sensor.new(other_sensor.to_parameters[:sensor])
-        sensor.id = nil
-        sensor.session = self.session
-
-        sensor
-      end
-
       private
       def resource_class
         EndPoint::Sensor
@@ -121,15 +109,5 @@ 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/session.rb

@@ -13,9 +13,9 @@ module CS
 
     # login to commonsense
     # @return [String] session_id
-    def login(username, password, digest=true)
+    def login(username, password)
       @auth_proxy = CS::Auth::HTTP.new(@base_uri)
-      @auth_proxy.login(username, password, digest)
+      @auth_proxy.login(username, password)
     end
 
     def oauth(consumer_key, consumer_secret, access_token, access_token_secret)
@@ -28,20 +28,11 @@ 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
@@ -155,12 +146,7 @@ module CS
     end
 
     def to_s
-      if session_id
-        return "SESSION_ID \"#{session_id}\""
-      elsif api_key
-        return "API_KEY \"#{api_key}\""
-      end
-      return ""
+      "\"#{self.session_id}\""
     end
 
     def inspect

data/lib/cs/version.rb

@@ -1,3 +1,3 @@
 module CS
-  VERSION = "0.1.0"
+  VERSION = "0.1.1beta"
 end

data/spec/features/user_management_spec.rb

@@ -7,6 +7,7 @@ describe "User management" do
 
     let!(:user) do
       username = "user1@tester.com"
+      password = "password"
 
       client = CS::Client.new(base_uri: base_uri)
       user = client.new_user
@@ -24,7 +25,7 @@ describe "User management" do
 
     let!(:logged_in_client) do
       client = CS::Client.new(base_uri: base_uri)
-      client.session_id = '123488'
+      client.session_id = '1234'
       client
     end
 
@@ -89,7 +90,7 @@ describe "User management" do
       }
 
       stub_request(:get, "http://api.dev.sense-os.local/users/current.json?").
-        with(:headers => {'Content-Type'=>'application/json', 'X-Session-Id'=>'123488'}).
+        with(:headers => {'Content-Type'=>'application/json', 'X-Session-Id'=>'1234'}).
         to_return(:status => 200, :body => body.to_json, :headers => {'Content-Type'=>'application/json'})
 
       client = logged_in_client

data/spec/lib/cs/relation/group_relation_spec.rb

@@ -57,6 +57,15 @@ module CS
         end
       end
 
+      describe "get_data" do
+        it "should not throw an exception" do
+          relation = GroupRelation.new
+          relation.stub(:get_data!).and_return { raise Error }
+
+          expect { relation.get_data }.to_not raise_error
+        end
+      end
+
       describe "each" do
         it "should get all users group  and yield each" do
           session = double('Session')

data/spec/lib/cs/relation/sensor_data_relation_spec.rb

@@ -78,6 +78,17 @@ module CS
         end
       end
 
+      describe "get_data" do
+        it "call get_data! and not throw exception" do
+          sensor_id = 1
+          relation = SensorDataRelation.new(sensor_id)
+          relation.stub(:get_data!).and_return { raise Error }
+
+          expect { relation.get_data }.to_not raise_error
+          relation.get_data.should be_nil
+        end
+      end
+
       describe "each_batch" do
         it "should yield data to with multiple pages" do
           sensor_id = 1

data/spec/lib/cs/relation/sensor_relation_spec.rb

@@ -32,6 +32,15 @@ module CS
         end
       end
 
+      describe "get_data" do
+        it "should not throw an exception" do
+          relation = SensorRelation.new
+          relation.stub(:get_data!).and_return { raise Error }
+
+          expect { relation.get_data }.to_not raise_error
+        end
+      end
+
       describe "each" do
         it "should get all sensor and yield each" do
           session = double('Session')

data/spec/lib/cs/session_spec.rb

@@ -6,6 +6,7 @@ describe "session" do
 
   let!(:user) do
     username = "user1@tester.com"
+    password = "password"
 
     client = CS::Client.new(base_uri: base_uri)
     user = client.new_user
@@ -68,24 +69,9 @@ describe "session" do
          client = create_client
          CS::Auth::OAuth.should_receive(:new).with('CS_CONSUMER_KEY', 'CS_CONSUMER_SECRET',
                                 'CS_ACCESS_TOKEN', 'CS_ACCESS_TOKEN_SECRET', base_uri)
-         client.oauth('CS_CONSUMER_KEY', 'CS_CONSUMER_SECRET',
+         session = client.oauth('CS_CONSUMER_KEY', 'CS_CONSUMER_SECRET',
                                 'CS_ACCESS_TOKEN', 'CS_ACCESS_TOKEN_SECRET')
        end
     end
   end
-
-  describe "API_KEY" do
-    it "should append API key in the url" do
-      client = create_client
-      client.api_key = '123456'
-      CS::Auth::HTTP.should_receive(:get).
-        with("/sensors.json?API_KEY=123456",
-             {:query=>{:page=>0, :per_page=>1000},
-              :headers=>{"Content-Type"=>"application/json"}}
-            )
-
-      result = client.sensors
-      result.to_a
-    end
-  end
 end

data/spec/lib/cs_spec.rb

@@ -10,7 +10,7 @@ module CS
 
       let!(:logged_in_client) do
         client = CS::Client.new(base_uri: base_uri)
-        client.session_id = '123499'
+        client.session_id = '1234'
         client
       end
 

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
 require 'bundler/setup'
 require 'rspec'
 require 'cs'
-require 'pry'
+#require 'pry'
 
 Dir[File.join(File.dirname(__FILE__),("support/**/*.rb"))].each {|f| require f}
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cs
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1beta
 platform: ruby
 authors:
 - Ahmy Yulrizka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-06 00:00:00.000000000 Z
+date: 2014-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: launchy
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: oauth
   requirement: !ruby/object:Gem::Requirement
@@ -69,23 +69,17 @@ files:
 - lib/cs.rb
 - lib/cs/auth/http.rb
 - lib/cs/auth/oauth.rb
-- lib/cs/collection.rb
-- lib/cs/collection/sensor_data_collection.rb
 - lib/cs/end_point.rb
 - lib/cs/end_point/group.rb
-- lib/cs/end_point/notification.rb
 - lib/cs/end_point/sensor.rb
 - lib/cs/end_point/sensor_data.rb
-- lib/cs/end_point/trigger.rb
 - lib/cs/end_point/user.rb
 - lib/cs/error.rb
 - lib/cs/parameter_processor.rb
 - lib/cs/relation.rb
 - lib/cs/relation/group_relation.rb
-- lib/cs/relation/notification_relation.rb
 - lib/cs/relation/sensor_data_relation.rb
 - lib/cs/relation/sensor_relation.rb
-- lib/cs/relation/trigger_relation.rb
 - lib/cs/relation/user_relation.rb
 - lib/cs/serializer.rb
 - lib/cs/session.rb
@@ -94,7 +88,6 @@ files:
 - spec/features/sensor_data_management_spec.rb
 - spec/features/sensor_management_spec.rb
 - spec/features/user_management_spec.rb
-- spec/lib/cs/collection/sensor_data_collection_spec.rb
 - spec/lib/cs/end_point/group_spec.rb
 - spec/lib/cs/end_point/sensor_data_spec.rb
 - spec/lib/cs/end_point/sensor_spec.rb
@@ -122,12 +115,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.1.9
@@ -138,7 +131,6 @@ test_files:
 - spec/features/sensor_data_management_spec.rb
 - spec/features/sensor_management_spec.rb
 - spec/features/user_management_spec.rb
-- spec/lib/cs/collection/sensor_data_collection_spec.rb
 - spec/lib/cs/end_point/group_spec.rb
 - spec/lib/cs/end_point/sensor_data_spec.rb
 - spec/lib/cs/end_point/sensor_spec.rb

data/lib/cs/collection.rb

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

data/lib/cs/collection/sensor_data_collection.rb

@@ -1,61 +0,0 @@
-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/cs/end_point/notification.rb

@@ -1,16 +0,0 @@
-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/trigger.rb

@@ -1,16 +0,0 @@
-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/notification_relation.rb

@@ -1,20 +0,0 @@
-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/trigger_relation.rb

@@ -1,21 +0,0 @@
-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/spec/lib/cs/collection/sensor_data_collection_spec.rb

@@ -1,27 +0,0 @@
-require 'spec_helper'
-
-module CS
-  module Collection
-    describe SensorDataCollection do
-      describe "process_batch" do
-        it "should convert into multi data payload" do
-          sdc = SensorDataCollection.new
-          sdc.batch_size = 2
-
-          current_batch = [
-            EndPoint::SensorData.new(sensor_id: 1, value: 1),
-            EndPoint::SensorData.new(sensor_id: 1, value: 2),
-            EndPoint::SensorData.new(sensor_id: 2, value: 1),
-            EndPoint::SensorData.new(sensor_id: 2, value: 2),
-            EndPoint::SensorData.new(sensor_id: 1, value: 3),
-            EndPoint::SensorData.new(sensor_id: 1, value: 4),
-            EndPoint::SensorData.new(sensor_id: 2, value: 3),
-            EndPoint::SensorData.new(sensor_id: 2, value: 4)
-          ]
-
-          sdc.process_batch(current_batch)
-        end
-      end
-    end
-  end
-end