influxer 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9483ba238ca5ac211fc174ae7dd81c49fd5aa08
-  data.tar.gz: 1915d412dc2bd255e4460e7448d8e007ec9dadf2
+  metadata.gz: 2b4166514c7bebd4c2af58c8362902eac3ee2113
+  data.tar.gz: 4d635a59d2969f7be5134018504d1fd93679d73c
 SHA512:
-  metadata.gz: ba9f6fc956de4fbf97e30a4f7dcf2ed248082ef4f1260ae18080b6cfd4d606239a3bc82346cfe815b77d355fe739ca2fecfb61ee8ed0ff5f037f7f900283ebea
-  data.tar.gz: 89bf51a352e1c83bf5a02d793aa7d43c820dbbc3275ef0447f6195d7c15fe5d94242989e2f75f728b575a3de8c58d71702163776887964ddfd2f547c9ec68d24
+  metadata.gz: 46fdff670e7c1f5d82dd4c89724c3b2710946bed1e5b584fb0fdddd2b78f7279d5e2a551599592f3ae7d99b2a1fb0f494cfbc8df981b40fada5ce2512cad04e5
+  data.tar.gz: 7db66507e1616b9dd99dfe55310e73c080c655fd70f2f8506eb6d294e61bfd9fb94401a6caf0ef23de9e66235fafb7afe5e550cdcd68cd8aa1961175fb00d515

data/influxer.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   
   s.add_runtime_dependency "rails", '~> 4.0'
   s.add_dependency "influxdb", "~> 0.1.0", ">= 0.1.8"
-  s.add_dependency "anyway_config", "~> 0.4"
+  s.add_dependency "anyway_config", "~>0", ">= 0.3"
 
   s.add_development_dependency "timecop"
   s.add_development_dependency "simplecov", ">= 0.3.8"

data/lib/influxer/metrics/metrics.rb

@@ -1,11 +1,12 @@
 require 'influxer/metrics/relation'
 require 'influxer/metrics/scoping'
 require 'influxer/metrics/fanout'
+require 'active_model'
 
 module Influxer
   class MetricsError < StandardError; end
   class MetricsInvalid < MetricsError; end
-  
+
   class Metrics
     include ActiveModel::Model
     include ActiveModel::Validations
@@ -20,10 +21,10 @@ module Influxer
       # delegate query functions to all
       delegate *(
         [
-          :write, :select, :where, :group, 
-          :merge, :time, :past, :since, :limit, 
+          :write, :select, :where, :group,
+          :merge, :time, :past, :since, :limit,
           :fill, :delete_all
-        ]+Influxer::Calculations::CALCULATION_METHODS), 
+        ]+Influxer::Calculations::CALCULATION_METHODS),
       to: :all
 
       def attributes(*attrs)
@@ -41,7 +42,7 @@ module Influxer
       def inherited(subclass)
         subclass.set_series
       end
-    
+
       def set_series(*args)
         if args.empty?
           matches = self.to_s.match(/^(.*)Metrics$/)
@@ -66,7 +67,7 @@ module Influxer
           current_scope.clone
         else
           default_scoped
-        end          
+        end
       end
     end
 
@@ -82,7 +83,7 @@ module Influxer
       return false if self.invalid?
 
       run_callbacks :write do
-        self.write_point
+        write_point
       end
       self
     end
@@ -93,9 +94,9 @@ module Influxer
     end
 
     def write_point
-      client.write_point series, @attributes
+      client.write_point unquote(series), @attributes
       @persisted = true
-    end 
+    end
 
     def persisted?
       @persisted
@@ -109,6 +110,10 @@ module Influxer
       Influxer.client
     end
 
+
+    attributes :time
+
+
     def quote_series(val)
       case val
       when Regexp
@@ -122,11 +127,15 @@ module Influxer
           quote_series(val.first)
         end
       else
-        '"'+val.to_s.gsub(/\"/){ %q{\"} }+'"'  
+        '"'+val.to_s.gsub(/\"/){ %q{\"} }+'"'
       end
     end
 
-    attributes :time
-  
+    private
+
+    def unquote(name)
+      name.gsub(/(\A['"]|['"]\z)/,'')
+    end
+
   end
-end 
+end

data/lib/influxer/version.rb

@@ -1,3 +1,3 @@
 module Influxer
-  VERSION = "0.2.0"
+  VERSION = "0.2.2"
 end

data/spec/metrics/metrics_spec.rb

@@ -49,36 +49,37 @@ describe Influxer::Metrics do
 
     let(:dummy_metrics) { DummyMetrics.new dummy_id: 1, user_id: 1}
 
-    describe "write method" do
-
-      it "should not write if required attribute is missing" do
-        m = DummyMetrics.new(dummy_id: 1)
-        expect(m.write).to be false
-        expect(m.errors.size).to eq(1)
-      end 
-
-      it "should raise error if required attribute is missing" do
-        expect{DummyMetrics.new(user_id: 1).write!}.to raise_error(StandardError)    
+    describe "#write" do
+
+      context "Validations" do
+        it "should not write if required attribute is missing" do
+          m = DummyMetrics.new(dummy_id: 1)
+          expect(m.write).to be false
+          expect(m.errors.size).to eq(1)
+        end 
+
+        it "should raise error if required attribute is missing" do
+          expect{DummyMetrics.new(user_id: 1).write!}.to raise_error(StandardError)    
+        end 
+
+        it "should raise error if you want to write twice" do
+          expect(dummy_metrics.write).to be_truthy
+          expect{dummy_metrics.write!}.to raise_error(StandardError)
+        end
       end 
 
       it "should write successfully when all required attributes are set" do
+        expect(Influxer.client).to receive(:write_point).with("dummy", anything)
         expect(dummy_metrics.write).to be_truthy
         expect(dummy_metrics.persisted?).to be_truthy
       end 
-
-      it "should raise error if you want to write twice" do
-        expect(dummy_metrics.write).to be_truthy
-        expect{dummy_metrics.write!}.to raise_error(StandardError)
-      end 
     end
 
-    describe "active_model callbacks on write" do
-      it "should work" do
-
+    context "active_model callbacks" do
+      it "should set current time" do
         Timecop.freeze(Time.local(2014,10,10,10,10,10)) do
           dummy_metrics.write!
         end
-
         expect(dummy_metrics.time).to eq Time.local(2014,10,10,10,10,10)
       end
     end
@@ -89,7 +90,8 @@ describe Influxer::Metrics do
 
     let(:dummy_metrics) do
       Class.new(Influxer::Metrics) do
-        set_series :dummies        
+        set_series :dummies       
+        attributes :user_id, :dummy_id 
       end
     end
 
@@ -159,7 +161,9 @@ describe Influxer::Metrics do
 
     describe "write method" do
       it "should write data and return point" do
-        point = DummyMetrics.write(user_id: 1, dummy_id: 2)
+        expect(Influxer.client).to receive(:write_point).with("dummies", {user_id: 1, dummy_id: 2})
+        
+        point = dummy_metrics.write(user_id: 1, dummy_id: 2)
         expect(point.persisted?).to be_truthy
         expect(point.user_id).to eq 1
         expect(point.dummy_id).to eq 2

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: influxer
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Vlad Dem
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-11 00:00:00.000000000 Z
+date: 2015-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -50,14 +50,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -271,3 +277,4 @@ signing_key:
 specification_version: 4
 summary: InfluxDB for Rails
 test_files: []
+has_rdoc: