influxer 0.2.4 → 0.3.1

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: influxer
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.1
 platform: ruby
 authors:
 - Vlad Dem
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-28 00:00:00.000000000 Z
+date: 2015-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.8
+        version: 0.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.8
+        version: 0.2.2
 - !ruby/object:Gem::Dependency
   name: anyway_config
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.8
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.1'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -95,19 +109,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -137,19 +151,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.1.0
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 1.21.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 1.21.0
 description: InfluxDB the Rails way
 email:
 - dementiev.vm@gmail.com
@@ -166,82 +180,39 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
-- gemfiles/rails40.gemfile
-- gemfiles/rails41.gemfile
 - gemfiles/rails42.gemfile
 - influxer.gemspec
 - lib/influxer.rb
 - lib/influxer/client.rb
 - lib/influxer/config.rb
 - lib/influxer/engine.rb
-- lib/influxer/metrics/fanout.rb
 - lib/influxer/metrics/metrics.rb
 - lib/influxer/metrics/relation.rb
 - lib/influxer/metrics/relation/calculations.rb
-- lib/influxer/metrics/relation/fanout_query.rb
 - lib/influxer/metrics/relation/time_query.rb
+- lib/influxer/metrics/relation/where_clause.rb
 - lib/influxer/metrics/scoping.rb
 - lib/influxer/metrics/scoping/default.rb
 - lib/influxer/metrics/scoping/named.rb
 - lib/influxer/model.rb
+- lib/influxer/rails/client.rb
 - lib/influxer/version.rb
-- lib/tasks/influxer_tasks.rake
+- spec/cases/points_spec.rb
 - spec/client_spec.rb
-- spec/config_spec.rb
-- spec/dummy/README.rdoc
-- spec/dummy/Rakefile
-- spec/dummy/app/assets/images/.keep
-- spec/dummy/app/assets/javascripts/application.js
-- spec/dummy/app/assets/stylesheets/application.css
-- spec/dummy/app/controllers/application_controller.rb
-- spec/dummy/app/controllers/concerns/.keep
-- spec/dummy/app/helpers/application_helper.rb
-- spec/dummy/app/mailers/.keep
-- spec/dummy/app/metrics/testo_metrics.rb
-- spec/dummy/app/models/.keep
-- spec/dummy/app/models/concerns/.keep
-- spec/dummy/app/models/testo.rb
-- spec/dummy/app/views/layouts/application.html.erb
-- spec/dummy/bin/bundle
-- spec/dummy/bin/rails
-- spec/dummy/bin/rake
-- spec/dummy/config.ru
-- spec/dummy/config/application.rb
-- spec/dummy/config/boot.rb
-- spec/dummy/config/database.yml
-- spec/dummy/config/environment.rb
-- spec/dummy/config/environments/development.rb
-- spec/dummy/config/environments/production.rb
-- spec/dummy/config/environments/test.rb
-- spec/dummy/config/influxdb.yml
-- spec/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy/config/initializers/cookies_serializer.rb
-- spec/dummy/config/initializers/filter_parameter_logging.rb
-- spec/dummy/config/initializers/inflections.rb
-- spec/dummy/config/initializers/mime_types.rb
-- spec/dummy/config/initializers/session_store.rb
-- spec/dummy/config/initializers/wrap_parameters.rb
-- spec/dummy/config/locales/en.yml
-- spec/dummy/config/routes.rb
-- spec/dummy/config/secrets.yml
-- spec/dummy/db/migrate/20140730133818_add_testos.rb
-- spec/dummy/db/migrate/20140731162044_add_column_to_testos.rb
-- spec/dummy/db/schema.rb
-- spec/dummy/db/test.sqlite3
-- spec/dummy/lib/assets/.keep
-- spec/dummy/log/.keep
-- spec/dummy/public/404.html
-- spec/dummy/public/422.html
-- spec/dummy/public/500.html
-- spec/dummy/public/favicon.ico
-- spec/fixtures/fanout_series.json
-- spec/metrics/fanout_spec.rb
+- spec/fixtures/empty_result.json
+- spec/fixtures/single_series.json
 - spec/metrics/metrics_spec.rb
 - spec/metrics/relation_spec.rb
 - spec/metrics/scoping_spec.rb
-- spec/model/testo_spec.rb
+- spec/model/user_spec.rb
 - spec/spec_helper.rb
-- spec/support/dummy_metrics.rb
+- spec/support/metrics/action_metrics.rb
+- spec/support/metrics/custom_metrics.rb
+- spec/support/metrics/dummy_metrics.rb
+- spec/support/metrics/user_metrics.rb
+- spec/support/metrics/visits_metrics.rb
+- spec/support/shared_contexts/shared_query.rb
+- spec/support/user.rb
 homepage: http://github.com/palkan/influxer
 licenses:
 - MIT

data/gemfiles/rails40.gemfile

@@ -1,7 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'sqlite3', platform: :mri
-gem 'activerecord-jdbcsqlite3-adapter', platform: :jruby
-gem 'rails', '~> 4.0.1'
-
-gemspec path: '..'

data/gemfiles/rails41.gemfile

@@ -1,7 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'sqlite3', platform: :mri
-gem 'activerecord-jdbcsqlite3-adapter', platform: :jruby
-gem 'rails', '~> 4.1.0'
-
-gemspec path: '..'

data/lib/influxer/metrics/fanout.rb

@@ -1,65 +0,0 @@
-module Influxer
-  module Fanout # :nodoc: all
-    extend ActiveSupport::Concern
-
-    included do
-      class_attribute :fanouts, :fanouts_by_name, :fanout_options
-      self.fanouts = []
-      self.fanouts_by_name = {} # to use within `fanout?`
-      self.fanout_options = { delimeter: "_" }
-    end
-
-    module ClassMethods
-      # Define fanouts for metrics as array of keys.
-      # Order of keys is important.
-      # Fanout delimeter can be set with 'delimiter' option (defaults to '_').
-      #
-      #   class MyMetrics < Influxer::Metrics
-      #     set_series "my_points"
-      #     fanout :account_id, :user_id
-      #   end
-      #
-      #   MyMetrics.where(user_id: 1).where(account_id: 10)
-      #   # select * from my_points_account_id_10_user_id_1
-      #
-      #   class MyMetrics < Influxer::Metrics
-      #     set_series "my_points"
-      #     fanout :account_id, :user_id, delimiter: "."
-      #   end
-      #
-      #   MyMetrics.where(user_id: 1).where(account_id: 10).where("req_time > 1000")
-      #   # select * from my_points.account_id.10.user_id.1 where req_time > 1000
-
-      def fanout(*args, **hargs)
-        self.fanout_options = fanout_options.merge hargs
-
-        names = args.map(&:to_s)
-
-        self.fanouts = (fanouts + names).uniq
-
-        names_hash = {}
-        names.each do |name|
-          names_hash[name] = 1
-        end
-
-        self.fanouts_by_name = fanouts_by_name.merge names_hash
-      end
-
-      def fanout?(key)
-        fanouts_by_name.key?(key.to_s)
-      end
-
-      def fanout_rxp
-        return @fanout_rxp unless @fanout_rxp.nil?
-        series_name = Regexp.escape(quoted_series[1..-2])
-        del = Regexp.escape(fanout_options[:delimeter])
-        rstr = "^#{series_name}"
-        fanouts.each do |f_name|
-          rstr += "(?:#{del}#{Regexp.escape(f_name)}#{del}(?<#{f_name}>[^#{del}]+))?"
-        end
-        rstr += "$"
-        @fanout_rxp = Regexp.new(rstr)
-      end
-    end
-  end
-end

data/lib/influxer/metrics/relation/fanout_query.rb

@@ -1,49 +0,0 @@
-module Influxer
-  module FanoutQuery #:nodoc:
-    # Instance methods are included to Relation
-    def build_fanout(key, val)
-      @values[:has_fanout] = true
-      if val.is_a?(Regexp)
-        @values[:fanout_rxp] = true
-        fanout_values[key.to_s] = val.inspect[1..-2]
-      else
-        fanout_values[key.to_s] = val.to_s
-      end
-    end
-
-    def build_series_name
-      if @values[:has_fanout] == true
-        fan_parts = [@instance.series[1..-2]]
-        @klass.fanouts.each do |name|
-          if fanout_values.key?(name)
-            fan_parts << name
-            fan_parts << fanout_values[name]
-          end
-        end
-        if @values[:fanout_rxp] == true
-          "/^#{ fan_parts.join(@klass.fanout_options[:delimeter]) }$/"
-        else
-          @klass.quoted_series(fan_parts.join(@klass.fanout_options[:delimeter]))
-        end
-      else
-        @instance.series
-      end
-    end
-
-    def prepare_fanout_points(hash)
-      hash.each do |k, v|
-        data = extract_values(k)
-        v.each { |p| p.merge!(data) } unless data.empty?
-      end
-      hash
-    end
-
-    private
-
-    # Extract fanout values from series name
-    def extract_values(name)
-      data = @klass.fanout_rxp.match(name)
-      Hash[data.names.zip(data.captures)].delete_if { |_k, v| v.nil? }
-    end
-  end
-end

data/lib/tasks/influxer_tasks.rake

@@ -1,4 +0,0 @@
-# desc "Explaining what the task does"
-# task :influxer do
-#   # Task goes here
-# end

data/spec/config_spec.rb

@@ -1,17 +0,0 @@
-require 'spec_helper'
-
-describe Influxer::Config do
-  let(:conf) { Influxer.config }
-
-  it "should load config from file" do
-    expect(conf.retry).to eq 5
-    expect(conf.host).to eq "test.host"
-  end
-
-  unless Rails.application.try(:secrets).nil?
-    it "should load config from secrets" do
-      expect(conf.username).to eq "test"
-      expect(conf.password).to eq "test"
-    end
-  end
-end

data/spec/dummy/README.rdoc

@@ -1,28 +0,0 @@
-== README
-
-This README would normally document whatever steps are necessary to get the
-application up and running.
-
-Things you may want to cover:
-
-* Ruby version
-
-* System dependencies
-
-* Configuration
-
-* Database creation
-
-* Database initialization
-
-* How to run the test suite
-
-* Services (job queues, cache servers, search engines, etc.)
-
-* Deployment instructions
-
-* ...
-
-
-Please feel free to use a different markup language if you do not plan to run
-<tt>rake doc:app</tt>.

data/spec/dummy/Rakefile

@@ -1,6 +0,0 @@
-# Add your own tasks in files placed in lib/tasks ending in .rake,
-# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
-
-require File.expand_path('../config/application', __FILE__)
-
-Dummy::Application.load_tasks

data/spec/dummy/app/assets/javascripts/application.js

@@ -1,13 +0,0 @@
-// This is a manifest file that'll be compiled into application.js, which will include all the files
-// listed below.
-//
-// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
-// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
-//
-// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// compiled file.
-//
-// Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
-// about supported directives.
-//
-//= require_tree .

data/spec/dummy/app/assets/stylesheets/application.css

@@ -1,15 +0,0 @@
-/*
- * This is a manifest file that'll be compiled into application.css, which will include all the files
- * listed below.
- *
- * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
- * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
- *
- * You're free to add application-wide styles to this file and they'll appear at the bottom of the
- * compiled file so the styles you add here take precedence over styles defined in any styles
- * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
- * file per style scope.
- *
- *= require_tree .
- *= require_self
- */

data/spec/dummy/app/controllers/application_controller.rb

@@ -1,5 +0,0 @@
-class ApplicationController < ActionController::Base
-  # Prevent CSRF attacks by raising an exception.
-  # For APIs, you may want to use :null_session instead.
-  protect_from_forgery with: :exception
-end

data/spec/dummy/app/helpers/application_helper.rb

@@ -1,2 +0,0 @@
-module ApplicationHelper
-end

data/spec/dummy/app/metrics/testo_metrics.rb

@@ -1,3 +0,0 @@
-class TestoMetrics < Influxer::Metrics
-  attributes :testo_id, :receipt_id, :testo
-end

data/spec/dummy/app/models/testo.rb

@@ -1,6 +0,0 @@
-class Testo < ActiveRecord::Base
-  has_metrics
-  has_metrics :testo_metrics, class_name: "TestoMetrics", inherits: [:receipt_id]
-  has_metrics :testo2_metrics, class_name: "TestoMetrics", foreign_key: :testo
-  has_metrics :custom_metrics, class_name: "TestoMetrics", foreign_key: nil
-end

data/spec/dummy/app/views/layouts/application.html.erb

@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>Dummy</title>
-  <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track' => true %>
-  <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
-  <%= csrf_meta_tags %>
-</head>
-<body>
-
-<%= yield %>
-
-</body>
-</html>

data/spec/dummy/bin/bundle

@@ -1,3 +0,0 @@
-#!/usr/bin/env ruby
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
-load Gem.bin_path('bundler', 'bundle')

data/spec/dummy/bin/rails

@@ -1,4 +0,0 @@
-#!/usr/bin/env ruby
-APP_PATH = File.expand_path('../../config/application',  __FILE__)
-require_relative '../config/boot'
-require 'rails/commands'

data/spec/dummy/bin/rake

@@ -1,4 +0,0 @@
-#!/usr/bin/env ruby
-require_relative '../config/boot'
-require 'rake'
-Rake.application.run

data/spec/dummy/config/application.rb

@@ -1,23 +0,0 @@
-require File.expand_path('../boot', __FILE__)
-
-require 'rails/all'
-
-Bundler.require(*Rails.groups)
-require "influxer"
-
-module Dummy
-  class Application < Rails::Application
-    config.cache_store = :memory_store
-    # Settings in config/environments/* take precedence over those specified here.
-    # Application configuration should go into files in config/initializers
-    # -- all .rb files in that directory are automatically loaded.
-
-    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
-    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
-    # config.time_zone = 'Central Time (US & Canada)'
-
-    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
-    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
-    # config.i18n.default_locale = :de
-  end
-end

data/spec/dummy/config/boot.rb

@@ -1,5 +0,0 @@
-# Set up gems listed in the Gemfile.
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../../Gemfile', __FILE__)
-
-require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
-$LOAD_PATH.unshift File.expand_path('../../../../lib', __FILE__)

data/spec/dummy/config/database.yml

@@ -1,25 +0,0 @@
-# SQLite version 3.x
-#   gem install sqlite3
-#
-#   Ensure the SQLite 3 gem is defined in your Gemfile
-#   gem 'sqlite3'
-#
-default: &default
-  adapter: sqlite3
-  pool: 5
-  timeout: 5000
-
-development:
-  <<: *default
-  database: db/development.sqlite3
-
-# Warning: The database defined as "test" will be erased and
-# re-generated from your development database when you run "rake".
-# Do not set this db to the same as development or production.
-test:
-  <<: *default
-  database: db/test.sqlite3
-
-production:
-  <<: *default
-  database: db/production.sqlite3

data/spec/dummy/config/environment.rb

@@ -1,5 +0,0 @@
-# Load the Rails application.
-require File.expand_path('../application', __FILE__)
-
-# Initialize the Rails application.
-Dummy::Application.initialize!

data/spec/dummy/config/environments/development.rb

@@ -1,37 +0,0 @@
-Dummy::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb.
-
-  # In the development environment your application's code is reloaded on
-  # every request. This slows down response time but is perfect for development
-  # since you don't have to restart the web server when you make code changes.
-  config.cache_classes = false
-
-  # Do not eager load code on boot.
-  config.eager_load = false
-
-  # Show full error reports and disable caching.
-  config.consider_all_requests_local       = true
-  config.action_controller.perform_caching = false
-
-  # Don't care if the mailer can't send.
-  config.action_mailer.raise_delivery_errors = false
-
-  # Print deprecation notices to the Rails logger.
-  config.active_support.deprecation = :log
-
-  # Raise an error on page load if there are pending migrations.
-  config.active_record.migration_error = :page_load
-
-  # Debug mode disables concatenation and preprocessing of assets.
-  # This option may cause significant delays in view rendering with a large
-  # number of complex assets.
-  config.assets.debug = true
-
-  # Adds additional error checking when serving assets at runtime.
-  # Checks for improperly declared sprockets dependencies.
-  # Raises helpful error messages.
-  config.assets.raise_runtime_errors = true
-
-  # Raises error for missing translations
-  # config.action_view.raise_on_missing_translations = true
-end