pulse-meter 0.1.8 → 0.1.9

data/examples/basic_sensor_data.rb

@@ -1,12 +1,12 @@
 $: << File.join(File.absolute_path(__FILE__), '..', 'lib')
 
 require "pulse-meter"
-
+            
 PulseMeter.redis = Redis.new
 
 cfg = PulseMeter::Sensor::Configuration.new(
   lama_count: {
-    type: 'timelined/counter',
+    sensor_type:'timelined/counter',
     args: {
       annotation: 'Lama Count',
       interval: 10,
@@ -15,7 +15,7 @@ cfg = PulseMeter::Sensor::Configuration.new(
   },
 
   lama_average_age: {
-    type: 'timelined/average',
+    sensor_type:'timelined/average',
     args: {
       annotation: 'Lama Average Age',
       interval: 20,
@@ -24,7 +24,7 @@ cfg = PulseMeter::Sensor::Configuration.new(
   },
 
   rhino_count: {
-    type: 'timelined/counter',
+    sensor_type:'timelined/counter',
     args: {
       annotation: 'Rhino Count',
       interval: 10,
@@ -33,7 +33,7 @@ cfg = PulseMeter::Sensor::Configuration.new(
   },
 
   goose_count: {
-    type: 'timelined/hashed_counter',
+    sensor_type:'timelined/hashed_counter',
     args: {
       annotation: 'Goose Count',
       interval: 10,
@@ -42,7 +42,7 @@ cfg = PulseMeter::Sensor::Configuration.new(
   },
 
   rhino_average_age: {
-    type: 'timelined/average',
+    sensor_type:'timelined/average',
     args: {
       annotation: 'Rhino average age',
       interval: 20,

data/lib/pulse-meter/sensor/configuration.rb

@@ -11,8 +11,8 @@ module PulseMeter
       end
 
       def add_sensor(name, opts)
-        type = opts.respond_to?(:type) ? opts.type : opts[:type]
-        klass_s = sensor_class(type)
+        sensor_type = opts.respond_to?(:sensor_type) ? opts.sensor_type : opts[:sensor_type]
+        klass_s = sensor_class(sensor_type)
         klass = constantize(klass_s)
         raise ArgumentError, "#{klass_s} is not a valid class for a sensor" unless klass
         args = (opts.respond_to?(:args) ? opts.args : opts[:args]) || {}
@@ -34,8 +34,8 @@ module PulseMeter
 
       protected
 
-      def sensor_class(type)
-        entries = type.to_s.split('/').map do |entry|
+      def sensor_class(sensor_type)
+        entries = sensor_type.to_s.split('/').map do |entry|
           entry.split('_').map(&:capitalize).join
         end
         entries.unshift('PulseMeter::Sensor').join('::')

data/lib/pulse-meter/version.rb

@@ -1,3 +1,3 @@
 module PulseMeter
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

data/spec/pulse_meter/sensor/configuration_spec.rb

@@ -6,34 +6,34 @@ describe PulseMeter::Sensor::Configuration do
 
     it "should create sensor available under passed name" do
       cfg.sensor(:foo).should be_nil
-      cfg.add_sensor(:foo, type: 'counter')
+      cfg.add_sensor(:foo, sensor_type: 'counter')
       cfg.sensor(:foo).should_not be_nil
     end
 
     it "should event shortcut for the sensor" do
-      cfg.add_sensor(:foo, type: 'counter')
+      cfg.add_sensor(:foo, sensor_type: 'counter')
       sensor = cfg.sensor(:foo)
       sensor.should_receive(:event).with(321)
       cfg.foo(321)
     end
 
     it "should create sensor with correct type" do
-      cfg.add_sensor(:foo, type: 'counter')
+      cfg.add_sensor(:foo, sensor_type: 'counter')
       cfg.sensor(:foo).should be_kind_of(PulseMeter::Sensor::Counter)
     end
 
     it "should raise exception if sensor type is bad" do
-      expect{ cfg.add_sensor(:foo, type: 'baaaar') }.to raise_exception(ArgumentError)
+      expect{ cfg.add_sensor(:foo, sensor_type: 'baaaar') }.to raise_exception(ArgumentError)
     end
 
     it "should pass args to created sensor" do
-      cfg.add_sensor(:foo, type: 'counter', args: {annotation: "My Foo Counter"} )
+      cfg.add_sensor(:foo, sensor_type: 'counter', args: {annotation: "My Foo Counter"} )
       cfg.sensor(:foo).annotation.should == "My Foo Counter"
     end
 
     it "should accept hashie-objects" do
       class Dummy
-        def type
+        def sensor_type
           'counter'
         end
         def args
@@ -52,10 +52,10 @@ describe PulseMeter::Sensor::Configuration do
     it "should add passed sensor setting hash using keys as names" do
       opts = {
         cnt: {
-          type: 'counter'
+          sensor_type: 'counter'
         },
         ind: {
-          type: 'indicator'
+          sensor_type: 'indicator'
         }
       }
       cfg1 = described_class.new(opts)
@@ -69,7 +69,7 @@ describe PulseMeter::Sensor::Configuration do
     it "should give access to added sensors" do
       opts = {
         cnt: {
-          type: 'counter',
+          sensor_type: 'counter',
           args: {
             annotation: "MySensor"
           }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pulse-meter
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-05 00:00:00.000000000 Z
+date: 2012-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gon-sinatra