egauge 1.0.2 → 1.0.3

data/History.txt

@@ -1,4 +1,8 @@
-== 1.0.2 / 2012-11/14
+== 1.0.3 / 2012-11-15
+
+* Remove step from #each_row's yielded params in Data and Register
+
+== 1.0.2 / 2012-11-14
 
 * Fix case where we have multiple data nodes in an XML dump due to a change in timing intervals - Scott Klein
 

data/Version.txt

@@ -1 +1 @@
-1.0.2
+1.0.3

data/lib/egauge/data.rb

@@ -51,7 +51,7 @@ module EGauge
       end.inject(&:+)
     end
     
-    # Run each value in this register
+    # Run each row in the dataset, yielding |timestamp, [register vals...]|
     def each_row
       @xml.group.elements.each do |chunk|
         # Set up for running this data chunk - prep timestamp and increment step from source xml
@@ -61,17 +61,17 @@ module EGauge
         # Run each row in the chunk, and yield our results
         (chunk / './r').each do |row|
           vals = (row / './c').collect {|c| c.text.to_i}
-          yield ts, vals, step
+          yield ts, vals
           ts += step
         end
       end
     end
     
-    # Return results as a 2D array, like so: [ [timestamp1, [val1, val2...], seconds1], [timestamp2, [val1, val2,...], seconds2], ... ]
+    # Return results as a 2D array, like so: [ [timestamp1, [val1, val2...]], [timestamp2, [val1, val2,...]], ... ]
     def to_a
       res = []
-      each_row do |ts, vals, step|
-        res << [ts, vals, step]
+      each_row do |ts, vals|
+        res << [ts, vals]
       end
       res
     end

data/lib/egauge/register.rb

@@ -23,17 +23,17 @@ module EGauge
         # Run each row in the chunk, and yield our results
         (chunk / './r').each do |row|
           val = (row / './c')[@index].text.to_i
-          yield ts, val, step
+          yield ts, val
           ts += step
         end
       end
     end
     
-    # Return results as a 2D array, like so: [ [timestamp1, val1, seconds1], [timestamp2, val2, seconds2], ... ]
+    # Return results as a 2D array, like so: [ [timestamp1, val1], [timestamp2, val2], ... ]
     def to_a
       res = []
-      each_row do |ts, val, step|
-        res << [ts, val, step]
+      each_row do |ts, val|
+        res << [ts, val]
       end
       res
     end

data/spec/egauge/data_spec.rb

@@ -35,11 +35,10 @@ describe EGauge::Data do
   end
   
   it 'should allow access to full row data' do
-    @data1.each_row do |ts, values, step|
+    @data1.each_row do |ts, values|
       ts.should be_a(Time)
       values.should be_a(Array)
       values.count.should == 3
-      step.should == 60
     end
   end
 

data/spec/egauge/register_spec.rb

@@ -24,10 +24,9 @@ describe EGauge::Register do
   
   it 'should allow iterating over values with timestamps' do
     counter = 0
-    @reg.each_row do |ts, val, step|
+    @reg.each_row do |ts, val|
       val.should be_a(Integer)
       ts.should be_a(Time)
-      step.should == 60
       counter += 1
     end
     counter.should == 3

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: egauge
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-14 00:00:00.000000000 Z
+date: 2012-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec