cs 0.2.0 → 0.2.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/cs/end_point/sensor.rb +1 -4
- data/lib/cs/version.rb +1 -1
- data/spec/lib/cs/end_point/sensor_spec.rb +22 -12
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: f784a586f058e66e21473d93c2faa62b78d673b1
|
4
|
+
data.tar.gz: 2fa7f838841dcf1cd91832ee3e9c5a1f556b233d
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 520106dfffa9f923252cb3ed5b9c2171cbe8f5f775f71622fac4fd83716b987d5ba7b9ebd0398e56e484b9167596cfdc8efdebfd3af944eb8baff8161c60727d
|
7
|
+
data.tar.gz: 478ef3af0983bbf7da0eab382bc311bb1ddd346c2d8fd8028275fb99b0e604f9ae71df6960e066f8a83f83633cb094b593efba83ae571d232b1c058726f27c0c
|
data/lib/cs/end_point/sensor.rb
CHANGED
@@ -57,10 +57,7 @@ module CS
|
|
57
57
|
# destination.copy_data(source, start_date: 12345, end_date: 12350)
|
58
58
|
#
|
59
59
|
def copy_data(sensor, parameters={})
|
60
|
-
source = sensor.data
|
61
|
-
parameters.each do |k,v|
|
62
|
-
source.send(k.to_sym, v)
|
63
|
-
end
|
60
|
+
source = sensor.data.where(parameters)
|
64
61
|
|
65
62
|
collection = self.data.collection
|
66
63
|
source.each do |point|
|
data/lib/cs/version.rb
CHANGED
@@ -95,29 +95,39 @@ module CS
|
|
95
95
|
end
|
96
96
|
|
97
97
|
describe "copy_data" do
|
98
|
-
|
98
|
+
before :each do
|
99
99
|
# create sensor_a
|
100
|
-
session_a = CS::Session.new
|
101
|
-
session_a.session_id = 1
|
102
|
-
sensor_a = Sensor.new(id: 1)
|
103
|
-
sensor_a.session = session_a
|
100
|
+
@session_a = CS::Session.new
|
101
|
+
@session_a.session_id = 1
|
102
|
+
@sensor_a = Sensor.new(id: 1)
|
103
|
+
@sensor_a.session = @session_a
|
104
104
|
|
105
105
|
# create sensor_b
|
106
|
-
session_b = CS::Session.new
|
107
|
-
session_b.session_id = 2
|
108
|
-
sensor_b = Sensor.new(id: 2)
|
109
|
-
sensor_b.session = session_b
|
106
|
+
@session_b = CS::Session.new
|
107
|
+
@session_b.session_id = 2
|
108
|
+
@sensor_b = Sensor.new(id: 2)
|
109
|
+
@sensor_b.session = @session_b
|
110
|
+
end
|
110
111
|
|
112
|
+
it "should copy data from other sensor" do
|
111
113
|
# session_a should recice get with parameter corrent start_date and end_date
|
112
114
|
data = {"data" => [{"id"=>"1_1401381426.400", "sensor_id"=>1, "value"=> "1", "date"=>1402032192.4}]}
|
113
|
-
session_a.should_receive(:get)
|
115
|
+
@session_a.should_receive(:get)
|
114
116
|
.with("/sensors/1/data.json", {:page=>0, :per_page=>1000, :start_date=>1402032192.0, :end_date=>1402032200.0, sensor_id: 1})
|
115
117
|
.and_return(data)
|
116
118
|
|
117
119
|
# session_b should receive post with data
|
118
|
-
session_b.should_receive(:post)
|
120
|
+
@session_b.should_receive(:post)
|
119
121
|
.with("/sensors/data.json", {:sensors=>[{:sensor_id=>2, :data=>[{:date=>1402032192.4, :value=>"1"}]}]})
|
120
|
-
sensor_b.copy_data(sensor_a, start_date: 1402032192, end_date: 1402032200)
|
122
|
+
@sensor_b.copy_data(@sensor_a, start_date: 1402032192, end_date: 1402032200)
|
123
|
+
|
124
|
+
end
|
125
|
+
|
126
|
+
it 'should also parse interval parameter' do
|
127
|
+
@session_a.should_receive(:get)
|
128
|
+
.with("/sensors/1/data.json", {:page=>0, :per_page=>1000, :start_date=>1402032192.0, :end_date=>1402032200.0, sensor_id: 1, interval: 60})
|
129
|
+
|
130
|
+
@sensor_b.copy_data(@sensor_a, start_date: 1402032192, end_date: 1402032200, interval: 60)
|
121
131
|
|
122
132
|
end
|
123
133
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: cs
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.2.
|
4
|
+
version: 0.2.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Ahmy Yulrizka
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2015-07-16 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: launchy
|