cs 0.1.1beta → 0.1.3

data/lib/cs/version.rb

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

data/spec/features/user_management_spec.rb

@@ -7,7 +7,6 @@ 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
@@ -25,7 +24,7 @@ describe "User management" do
 
     let!(:logged_in_client) do
       client = CS::Client.new(base_uri: base_uri)
-      client.session_id = '1234'
+      client.session_id = '123488'
       client
     end
 
@@ -90,7 +89,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'=>'1234'}).
+        with(:headers => {'Content-Type'=>'application/json', 'X-Session-Id'=>'123488'}).
         to_return(:status => 200, :body => body.to_json, :headers => {'Content-Type'=>'application/json'})
 
       client = logged_in_client

data/spec/lib/cs/collection/sensor_data_collection_spec.rb

@@ -0,0 +1,27 @@
+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

data/spec/lib/cs/end_point/sensor_spec.rb

@@ -93,6 +93,34 @@ module CS
           sensor.delete!.should be_true
         end
       end
+
+      describe "copy_data" do
+        it "should copy data from other sensor" do
+          # create sensor_a
+          session_a = CS::Session.new
+          session_a.session_id = 1
+          sensor_a = Sensor.new(id: 1)
+          sensor_a.session = session_a
+
+          # create sensor_b
+          session_b = CS::Session.new
+          session_b.session_id = 2
+          sensor_b = Sensor.new(id: 2)
+          sensor_b.session = session_b
+
+          # session_a should recice get with parameter corrent start_date and end_date
+          data = {"data" => [{"id"=>"1_1401381426.400", "sensor_id"=>1, "value"=> "1", "date"=>1402032192.4}]}
+          session_a.should_receive(:get)
+            .with("/sensors/1/data.json", {:page=>0, :per_page=>1000, :start_date=>1402032192.0, :end_date=>1402032200.0, sensor_id: 1})
+            .and_return(data)
+
+          # session_b should receive post with data
+          session_b.should_receive(:post)
+            .with("/sensors/data.json", {:sensors=>[{:sensor_id=>2, :data=>[{:date=>1402032192.4, :value=>"1"}]}]})
+          sensor_b.copy_data(sensor_a, start_date: 1402032192, end_date: 1402032200)
+
+        end
+      end
     end
   end
 end

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

@@ -57,15 +57,6 @@ 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,17 +78,6 @@ 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,15 +32,6 @@ 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')
@@ -196,6 +187,24 @@ module CS
           end
         end
       end
+
+      describe "clone_from" do
+        it "should copy properties from other sensor and assign the session_id" do
+            attributes = {name: 'sensor1', display_name: 'Sensor1',
+              device_type: 'Android', pager_type: 'pager1',
+              data_type: 'json', data_structure: {"foo" => 'integer'}}
+
+            source = EndPoint::Sensor.new(attributes)
+            cloned = relation.clone_from(source)
+
+            cloned.name.should eq(attributes[:name])
+            cloned.display_name.should eq(attributes[:display_name])
+            cloned.device_type.should eq(attributes[:device_type])
+            cloned.pager_type.should eq(attributes[:pager_type])
+            cloned.data_type.should eq(attributes[:data_type])
+            cloned.data_structure.should eq(attributes[:data_structure])
+        end
+      end
     end
   end
 end

data/spec/lib/cs/session_spec.rb

@@ -6,7 +6,6 @@ describe "session" do
 
   let!(:user) do
     username = "user1@tester.com"
-    password = "password"
 
     client = CS::Client.new(base_uri: base_uri)
     user = client.new_user
@@ -69,9 +68,24 @@ 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)
-         session = client.oauth('CS_CONSUMER_KEY', 'CS_CONSUMER_SECRET',
+         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 = '1234'
+        client.session_id = '123499'
         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.1beta
+  version: 0.1.3
 platform: ruby
 authors:
 - Ahmy Yulrizka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-17 00:00:00.000000000 Z
+date: 2014-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: launchy
@@ -24,20 +24,34 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.3'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.12.6
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.12.6
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '0.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '0.12'
 - !ruby/object:Gem::Dependency
   name: oauth
   requirement: !ruby/object:Gem::Requirement
@@ -55,7 +69,10 @@ dependencies:
 description: CommonSense API client library
 email:
 - ahmy@sense-os.nl
-executables: []
+executables:
+- cs
+- cs-console
+- cs-password
 extensions: []
 extra_rdoc_files: []
 files:
@@ -65,21 +82,31 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- bin/cs
+- bin/cs-console
+- bin/cs-password
 - cs.gemspec
 - lib/cs.rb
 - lib/cs/auth/http.rb
 - lib/cs/auth/oauth.rb
+- lib/cs/cli/cli.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
@@ -88,6 +115,7 @@ 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
@@ -115,12 +143,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.1.9
@@ -131,6 +159,7 @@ 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