atsd 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6966f668083fa1ddfc4447cfd12ab2c187d9c149
-  data.tar.gz: 2a2195ada45085173516415e97b427453e36da42
+  metadata.gz: 1fe21d9c34f97de668d8afc76732e7e2c4afa8f3
+  data.tar.gz: 5ef52d69475fe575de5367e3a4bcf45932f5ea30
 SHA512:
-  metadata.gz: db845e86a01054d31b0d49e7a1a85e775ecc678ff937de85b73452b83824469805dda3b00662436718a08b1bb73aacfa7332563500ae51b334ef50f84079fc4e
-  data.tar.gz: c5560702a4400b30c6f2eec42373757160a93e0d46fc5bb1b9506c5447b63b764497006cc3b0dc0b74b309fd0e3459af9e479cba41e7faf41ccd376fdd8392d5
+  metadata.gz: 5a72102988e12f9f580c679f556f433c05ae31809751d236ef7a70448999029a89224327732722ece0751ebed6ac7db3e0766e383697ae37a6b19b028102d45a
+  data.tar.gz: 37b3a82b25af1aa587020e4be9b506262b10f129b40a8a7889fc2b5e1fa3b813fe992077b616b7c0496e1057c137b4a73782bccd3464426d04b2aa8d2ed6f9bc

data/README.md

@@ -206,7 +206,7 @@ s = Series.new
 s.entity = 'sensor-1'
 s.metric = 'temperature'
 s.data = [ {t: Time.now.to_i*1000, v: 22} ]
-series_service.insert(s)
+atsd.series_service.insert(s)
 ```
 
 Inserting series using Sample class:
@@ -215,7 +215,7 @@ Inserting series using Sample class:
 s = Series.new
 s.entity = 'sensor-1'
 s.metric = 'pressure'
-sample = Sample.new :t => Time.parse("2015-11-17T17:00:00Z"), :v => 7, :version => {:status => "normal", :source => "gateway-1"}
+sample = Sample.new :time => Time.parse("2015-11-17T17:00:00Z"), :value => 7, :version => {:status => "normal", :source => "gateway-1"}
 s.data = [ sample ]
 series_service.insert(s)
 ```
@@ -223,8 +223,8 @@ series_service.insert(s)
 Inserting Series with Versions:
 
 ```ruby
-sample_1 = Sample.new :t => Time.parse("2015-11-17T17:00:00Z"), :v => 7, :version => {:status => "normal", :source => "gateway-1"}
-sample_2 = Sample.new :t => Time.parse("2015-11-17T18:00:00Z"), :v => 17, :version => {:status => "error", :source => "gateway-1"}
+sample_1 = Sample.new :time => Time.parse("2015-11-17T17:00:00Z"), :value => 7, :version => {:status => "normal", :source => "gateway-1"}
+sample_2 = Sample.new :time => Time.parse("2015-11-17T18:00:00Z"), :value => 17, :version => {:status => "error", :source => "gateway-1"}
 series = Series.new :entity => "sensor-1", :metric => "pressure", :data => [sample_1, sample_2]
 atsd.series_service.insert(series)
 ```

data/lib/atsd/models/base_model.rb

@@ -20,6 +20,23 @@ module ATSD
       end
       hash
     end
+
+    # Converts time and value keys as t and v respectively
+    # for the rest operates as a superclass method
+    def []=(key,value)
+      if key.to_s == 'time'
+        key = :t
+        case value
+          when Time
+            value = value.to_i * 1_000
+          else
+            value = value.to_i
+        end
+      end
+      key = :v if key.to_s == 'value'
+      super(key, value)
+    end
+
   end
 end
 

data/lib/atsd/models/series.rb

@@ -7,17 +7,6 @@ module ATSD
 
   class Sample < BaseModel
 
-    TO_MILLISECONDS_LAMBDA = ->(v) do
-      case v
-        when Time
-          v.to_i * 1_000
-        else
-          v.to_i
-      end
-    end
-
-    coerce_key :t, TO_MILLISECONDS_LAMBDA
-
     def set_time(time)
       self["t"] = time
     end

data/lib/atsd/queries/series_query.rb

@@ -4,20 +4,6 @@ module ATSD
   # Class for building and executing Series Query
   # @see https://axibase.com/atsd/api/#series:-query
   class SeriesQuery < BaseQuery
-    #
-    # # @!method type(type)
-    # #   specifies source for underlying data
-    # #   @param [String] type see {Type} for possible values
-    # #   @return [self]
-    #
-    # TO_MILLISECONDS_LAMBDA = ->(v) do
-    #   case v
-    #     when Time
-    #       v.to_i * 1_000
-    #     else
-    #       v.to_i
-    #   end
-    # end
 
     coerce_key :end_time, TO_MILLISECONDS_LAMBDA
     coerce_key :start_time, TO_MILLISECONDS_LAMBDA

data/lib/atsd/services/series_service.rb

@@ -57,7 +57,7 @@ module ATSD
     # Post json
     # @param [Hash] config - Hash containing url, login and password keys, e.g. {:url => "http://www.example.com:8088/api/v1", :login => "login", :password => "password"}
     # @param [String] payload Body - ready to be parsed by ATSD server
-    # @return server response body
+    # @return [Faraday::Response]
     # @raise [APIError]
     def self.post_payload(config,payload)
       url = config[:url]

data/lib/atsd/version.rb

@@ -1,3 +1,3 @@
 module ATSD
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: atsd
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Axibase Corporation
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-24 00:00:00.000000000 Z
+date: 2015-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler