memoir 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 796a35d84795be6d68fd0fb93f6334d9e3580b99
-  data.tar.gz: 480ad5612349c69a5ccb6f62636d6f7f2084a900
+  metadata.gz: 748578685dce1adb5549a7dfbf90aae86bc91d74
+  data.tar.gz: eb15a682be6227a6496e4314ee5b2c7a5996b7e6
 SHA512:
-  metadata.gz: f1a701e9c6d77d733f4a0ee30076ecfce59e10fad41111edc86c588fe88b3045624c42d7e7aed52ac98a0549d3eaeeb0855a844b9c19359f41869e53ad494fc5
-  data.tar.gz: b738cead5216b952f2fb883a6999a7bac6c2c34eb9a314ddde5410ab61ddaeab8e553bd4a870a17c584fd3e773d7897ad9696bc959f22e5db0404c4595460bfc
+  metadata.gz: 1cf7a1bea6c41ea9f133e2e56504762a0372344dcdde1fff1fc49f592022d87b6c3d0426510f9890c839d14368e2a2bdb8abe9662073abc23b7f53e1cd978f04
+  data.tar.gz: 4db3ade3fee3a633ed7a103a1f2637368e1a13dff2b3da303f8c2df74627314f48553735eaaa66abb3600c1f74fe8f94f571e5fde80b051ca58791844253bd9f

data/.travis.yml

@@ -1,12 +1,10 @@
 language: ruby
 
 rvm:
-  - 1.9.3
   - 2.0.0
   - 2.1
   - 2.2.1
   - ruby-head
-  - jruby-19mode
   - jruby-head
 
 jdk:
@@ -19,10 +17,6 @@ matrix:
     - rvm: ruby-head
     - rvm: jruby-head
   exclude:
-    - rvm: 1.9.3
-      jdk: openjdk7
-    - rvm: 1.9.3
-      jdk: oraclejdk7
     - rvm: 2.0.0
       jdk: openjdk7
     - rvm: 2.0.0

data/lib/memoir/client.rb

@@ -1,11 +1,12 @@
 class Memoir::Client
-  attr_accessor :host, :port, :connection, :logger
+  attr_accessor :host, :port, :connection, :timeout, :logger
 
   API_QUERY_URL = '/api/query'.freeze
 
-  def initialize(host, port, logger = nil)
+  def initialize(host, port, logger = nil, options = {})
     @host = host
     @port = port
+    @timeout = options[:timeout] || 10
     @logger = logger
     prepare_connection
   end
@@ -43,6 +44,8 @@ class Memoir::Client
       builder.request :json
       builder.response :json
       builder.adapter Faraday.default_adapter
+      builder.options[:timeout] = @timeout
+      builder.options[:open_timeout] = @timeout
     end
   end
 end

data/lib/memoir/query.rb

@@ -1,7 +1,7 @@
 class Memoir::Query
-  attr_accessor :aggregator, :metric, :rate, :rate_options, :downsample, :filters
+  attr_accessor :aggregator, :metric, :explicit_tags, :rate, :rate_options, :downsample, :filters
 
-  def initialize(aggregator, metric, downsample = nil, rate = false, rate_options = {})
+  def initialize(aggregator, metric, downsample = nil, explicit_tags = false, rate = false, rate_options = {})
     @aggregator = aggregator
     @metric = metric
     @downsample = downsample
@@ -9,6 +9,7 @@ class Memoir::Query
     @rate_options = rate_options
     @tags = {}
     @filters = []
+    @explicit_tags = explicit_tags
   end
 
   def <<(filter)
@@ -31,7 +32,8 @@ class Memoir::Query
     hash = {
       'aggregator' => aggregator,
       'metric' => metric,
-      'rate' => rate
+      'rate' => rate,
+      'explicitTags' => explicit_tags
     }
 
     hash['rateOptions'] = rate_options unless rate_options.empty?

data/lib/memoir/version.rb

@@ -1,3 +1,3 @@
 module Memoir
-  VERSION = '0.1.1'.freeze
+  VERSION = '0.1.2'.freeze
 end

data/memoir.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.10'
+  spec.add_development_dependency 'bundler', '~> 1.7'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'simplecov', '~> 0.11'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: memoir
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Michal Kimle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-20 00:00:00.000000000 Z
+date: 2017-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -189,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Client library for easy communication with OpenTSDB