cs 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65314f9bb5ad1ee8bb734e9a787ec6593b59c5ec
-  data.tar.gz: aa4f03d2c222473803addfe489038be17db58489
+  metadata.gz: f784a586f058e66e21473d93c2faa62b78d673b1
+  data.tar.gz: 2fa7f838841dcf1cd91832ee3e9c5a1f556b233d
 SHA512:
-  metadata.gz: 7eaf6550b00069705edb1c11dde22e3eda0ed839776881e1bb646a37817aa83c046adb163307bff80f7bf8f8699a08d27eb9071a60b0250114d0c2dc5c28e1ee
-  data.tar.gz: 139898e8a861b7ffe9b9659e6ed085105b3b6a9c1f9a9be54adc9c1f33bf10cc58e941037cca90f96edc3239edc56ed84bc6201424f21261e2df17a0b4836dc0
+  metadata.gz: 520106dfffa9f923252cb3ed5b9c2171cbe8f5f775f71622fac4fd83716b987d5ba7b9ebd0398e56e484b9167596cfdc8efdebfd3af944eb8baff8161c60727d
+  data.tar.gz: 478ef3af0983bbf7da0eab382bc311bb1ddd346c2d8fd8028275fb99b0e604f9ae71df6960e066f8a83f83633cb094b593efba83ae571d232b1c058726f27c0c

data/lib/cs/end_point/sensor.rb

@@ -57,10 +57,7 @@ module CS
       #   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
+        source = sensor.data.where(parameters)
 
         collection = self.data.collection
         source.each do |point|

data/lib/cs/version.rb

@@ -1,3 +1,3 @@
 module CS
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

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

@@ -95,29 +95,39 @@ module CS
       end
 
       describe "copy_data" do
-        it "should copy data from other sensor" do
+        before :each 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
+          @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_b = CS::Session.new
+          @session_b.session_id = 2
+          @sensor_b = Sensor.new(id: 2)
+          @sensor_b.session = @session_b
+        end
 
+        it "should copy data from other sensor" do
           # 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)
+          @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)
+          @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)
+          @sensor_b.copy_data(@sensor_a, start_date: 1402032192, end_date: 1402032200)
+
+        end
+
+        it 'should also parse interval parameter' do
+          @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, interval: 60})
+
+          @sensor_b.copy_data(@sensor_a, start_date: 1402032192, end_date: 1402032200, interval: 60)
 
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cs
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Ahmy Yulrizka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-01 00:00:00.000000000 Z
+date: 2015-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: launchy