haystack_ruby 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1bbe8505587fa1e720665305767e15d16a78a11b
-  data.tar.gz: 8ddbb550be5df6a595b1dd3740f6405c3acf9685
+  metadata.gz: b6c6b9cdc1447c63ec9e4389027df52d9895c659
+  data.tar.gz: 5f49ee6b99c204c65b3b8553c1e71b802e61fc32
 SHA512:
-  metadata.gz: 93f07240acd1a2a50c41b2a9e27789c1b8d1cff16e4a2825d9f4577e7b345cedbe7581fe8b5370dffacb4e5885b6a9f30f7e8d371ade56017788a117a6f3b6c2
-  data.tar.gz: bc73973de118ee8a52e9dab9efc59ba9486b048d6bba07d9656c277e19a9610dbaaad5527362f14008b1e9e49c7fcffd471604fc0e4d9923d693821d360c3236
+  metadata.gz: 8b476a3f16801e3b26f1db1f88694edafe3c53d5e4674523500031f621e3235f6b73033db3d6f79888cec58696cc0809d54c4b7701d2c29bf826c97a19784907
+  data.tar.gz: 43faa8a880a29efc9ef66f526668c58cc9bbff9351a73abbee82e5adfcd2ff0218da6a75853997963faf4eb5ad85af8f4c0d61294d3c293c150a790e99c5d93f

data/lib/haystack_ruby/object.rb

@@ -35,27 +35,27 @@ module HaystackRuby
           # Map to Haystack type per http://project-haystack.org/doc/Json
           case val
             when /\Am:.*/
-              include HaystackRuby::Types::Marker
+              extend HaystackRuby::Types::Marker
             when /\Az:.*/
-              include HaystackRuby::Types::NA
+              extend HaystackRuby::Types::NA
             when /\An:.*/
               extend HaystackRuby::Types::Number
             when /\Ar:.*/
-              include HaystackRuby::Types::Ref
+              extend HaystackRuby::Types::Ref
             when /\As:.*/
-              include HaystackRuby::Types::Str
+              extend HaystackRuby::Types::Str
             when /\Ad:.*/
-              include HaystackRuby::Types::Date
+              extend HaystackRuby::Types::Date
             when /\Ah:.*/
-              include HaystackRuby::Types::Time
+              extend HaystackRuby::Types::Time
             when /\At:.*/
-              include HaystackRuby::Types::DateTime
+              extend HaystackRuby::Types::DateTime
             when /\Au:.*/
-              include HaystackRuby::Types::Uri
+              extend HaystackRuby::Types::Uri
             when /\Ab:.*/
-              include HaystackRuby::Types::Bin
+              extend HaystackRuby::Types::Bin
             when /\Ac:.*/
-              include HaystackRuby::Types::Coord
+              extend HaystackRuby::Types::Coord
             when /\Ax:.*/
               raise HaystackRuby::Error, "parsing of XStr type is not supported for string val #{val}"
             else
@@ -67,4 +67,4 @@ module HaystackRuby
       set_fields val
     end
   end
-end
+end

data/lib/haystack_ruby/point.rb

@@ -2,8 +2,8 @@ require 'date'
 # require 'active_support'
 module HaystackRuby
   module Point
-    
-    # is this Point valid for purposees of Project Haystack Integration?  
+
+    # is this Point valid for purposees of Project Haystack Integration?
     def haystack_valid?
       return self.haystack_project_name.present? && self.haystack_point_id.present? && self.haystack_time_zone.present?
     end
@@ -33,7 +33,7 @@ module HaystackRuby
 
     # data is ascending array of hashes with format: {time: epochtime, value: myvalue}
     def his_write(data)
-      query = 
+      query =
         ["ver:\"#{haystack_project.haystack_version}\" id:@#{self.haystack_point_id}",'ts,val'] + data.map{ |d| "#{d[:time]},#{d[:value]}"}
 
       res = connection.post('hisWrite') do |req|
@@ -44,7 +44,7 @@ module HaystackRuby
       JSON.parse(res.body)['meta']['ok'].present?
     end
 
-    def data(start, finish = nil, as_datetime = false) # as_datetime currently ignored
+    def data(start, finish = nil, as_datetime = false, include_unit = false) # as_datetime currently ignored
       return unless haystack_valid? #may choose to throw exception instead
 
       range = [start]
@@ -52,15 +52,16 @@ module HaystackRuby
       # clean up the range argument before passing through to hisRead
       # ----------------
       r = HaystackRuby::Range.new(range, self.haystack_time_zone)
-  
+
       res = his_read r.to_s
-      reformat_timeseries(res['rows'], as_datetime)
+      # puts "res in data : #{res}"
+      reformat_timeseries(res['rows'], as_datetime, include_unit)
     end
 
     def write_data(data)
       # format data for his_write
-      data = data.map do |d| 
-        { 
+      data = data.map do |d|
+        {
           time: HaystackRuby::Timestamp.convert_to_string(d[:time], self.haystack_time_zone),
           value: d[:value]
         }
@@ -68,13 +69,15 @@ module HaystackRuby
       his_write data
     end
 
-    # map from 
-    def reformat_timeseries data, as_datetime
+    # map from
+    def reformat_timeseries data, as_datetime = false, include_unit = false
       data.map do |d|
         time = (as_datetime) ? DateTime.parse(d['ts']) : DateTime.parse(d['ts']).to_i
         val = HaystackRuby::Object.new(d['val'])
-        {:time => time, :value => val.value}
+        r = {:time => time, :value => val.value}
+        r[:unit] = val.unit if include_unit
+        r
       end
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haystack_ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Anya Petersen