nightfury 0.1.1 → 0.2.0

data/lib/nightfury/identity.rb

@@ -10,7 +10,8 @@ module Nightfury
 
       class << self
         
-        attr_reader :metrics
+        attr_reader :metrics, :tags
+        attr_accessor :store_as
 
         def name
           self.to_s.demodulize.underscore
@@ -26,17 +27,50 @@ module Nightfury
             end
           ENDOFMETHOD
         end
-
+        
+        def tag(name, options={})
+          @tags ||= {}
+          @tags[name] = options[:store_as] ? options[:store_as] : name
+        end
       end
       
-      attr_accessor :id
+      attr_accessor :id, :tags
 
-      def initialize(id)
+      def initialize(id, options={})
         @id = id
+        @tags = options[:tags]
       end
 
       def key_prefix
-        "#{self.class.name}:#{id}"
+        store_name = self.class.store_as ? self.class.store_as : self.class.name
+        tag_ids = generate_tag_ids
+        tag_ids = tag_ids.nil? ? '' : ":#{tag_ids}"
+        "#{store_name}.#{id}#{tag_ids}"
+      end
+
+      private 
+
+      def generate_tag_ids
+        return nil unless tags
+        tag_values = {}
+        tags.each do |key, value|
+          store_name = self.class.tags[key]
+          next if store_name.nil?
+          tag_values[store_name] = value
+        end
+
+        tag_ids = nil
+        tag_values_sorted = tag_values.keys.sort
+        tag_values_sorted.each do |store_name|
+          tag = "#{store_name}.#{tag_values[store_name]}"
+          if tag_ids.nil?
+            tag_ids = tag
+          else
+            tag_ids = "#{tag_ids}:#{tag}"
+          end
+        end
+
+        tag_ids
       end
     end
   end

data/lib/nightfury/metric.rb

@@ -1,17 +1,19 @@
 module Nightfury
   module Metric
     class Base      
-      attr_reader :name, :redis, :redis_key_prefix
+      attr_reader :name, :redis, :redis_key_prefix, :store_as
       
       def initialize(name, options={})
         @name = name
         @redis = Nightfury.redis
         @redis_key_prefix = options[:redis_key_prefix]
+        @store_as = options[:store_as]
       end
 
       def redis_key
         prefix = redis_key_prefix.blank? ? '' : "#{redis_key_prefix}:"
-        "#{prefix}metric:#{name}" 
+        store_name = store_as ? store_as : name
+        "#{prefix}#{store_name}" 
       end
 
       def delete

data/lib/nightfury/version.rb

@@ -1,3 +1,3 @@
 module Nightfury
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/spec/nightfury/identity_spec.rb

@@ -21,6 +21,18 @@ describe Nightfury::Identity::Base do
         Dummy.instance_methods.should include(:another_count)
       end
     end
+
+    describe "tags" do
+      it "should add to tags" do
+        Dummy.tag(:label_id)
+        Dummy.tags[:label_id].should == :label_id
+      end
+
+      it "should add name and store_as to tags" do
+        Dummy.tag(:label_id, store_as: :l)
+        Dummy.tags[:label_id].should == :l
+      end
+    end
   end
 
   describe "InstanceMethods" do
@@ -31,7 +43,22 @@ describe Nightfury::Identity::Base do
 
     it "should generates a key prefix" do
       d = Dummy.new(1)
-      d.key_prefix.should == 'dummy:1'
+      d.key_prefix.should == 'dummy.1'
+    end
+
+    it "should use store_as to generate key prefix if provided" do
+      d = Dummy.new(1)
+      flexmock(Dummy).should_receive(:store_as => :d)
+      d.key_prefix.should == 'd.1'
+    end
+
+    it "should include tags in the key prefix" do
+      DummyTwo = Class.new(Dummy)
+      DummyTwo.store_as = :d
+      DummyTwo.tag(:label_id, store_as: :l)
+      DummyTwo.tag(:agent_id, store_as: :a)
+      d = DummyTwo.new(1, tags: {label_id: 2, agent_id: 3})
+      d.key_prefix.should == 'd.1:a.3:l.2'
     end
 
     describe "Dynamically generated metric" do
@@ -41,7 +68,7 @@ describe Nightfury::Identity::Base do
         metric_object = d.third_count
         metric_object.should be_kind_of(Nightfury::Metric::Value)
         metric_object.name.should == :third_count
-        metric_object.redis_key_prefix.should == 'dummy:1'
+        metric_object.redis_key_prefix.should == 'dummy.1'
       end
     end
   end

data/spec/nightfury/metric/value_spec.rb

@@ -1,25 +1,25 @@
 describe Nightfury::Metric::Value do
   it "should get a value by delegating to redis" do
     value_metric = Nightfury::Metric::Value.new(:tickets_count)
-    flexmock(value_metric.redis).should_receive(:get).with('metric:tickets_count').once
+    flexmock(value_metric.redis).should_receive(:get).with('tickets_count').once
     value_metric.get
   end
 
   it "should set a value by delegating to redis" do
     value_metric = Nightfury::Metric::Value.new(:tickets_count)
-    flexmock(value_metric.redis).should_receive(:set).with('metric:tickets_count', 1).once
+    flexmock(value_metric.redis).should_receive(:set).with('tickets_count', 1).once
     value_metric.set(1)
   end
 
   it "should increment a value by delegating to redis" do
     value_metric = Nightfury::Metric::Value.new(:tickets_count)
-    flexmock(value_metric.redis).should_receive(:incrby).with('metric:tickets_count', 1).once
+    flexmock(value_metric.redis).should_receive(:incrby).with('tickets_count', 1).once
     value_metric.incr
   end
 
   it "should decrement a value by delegating to redis" do
     value_metric = Nightfury::Metric::Value.new(:tickets_count)
-    flexmock(value_metric.redis).should_receive(:decrby).with('metric:tickets_count', 2).once
+    flexmock(value_metric.redis).should_receive(:decrby).with('tickets_count', 2).once
     value_metric.decr(2)
   end
 end

data/spec/nightfury/metric_spec.rb

@@ -8,12 +8,17 @@ describe Nightfury::Metric::Base do
 
   it "should have a redis key" do
     metric = Nightfury::Metric::Base.new(:tickets_count)
-    metric.redis_key.should == "metric:tickets_count"
+    metric.redis_key.should == "tickets_count"
+  end
+
+  it "should use store_as in the redis key instead of name if provided" do
+    metric = Nightfury::Metric::Base.new(:tickets_count, store_as: :tc)
+    metric.redis_key.should == "tc"
   end
 
   it "should accept a redis key prefix" do
     metric = Nightfury::Metric::Base.new(:tickets_count, redis_key_prefix: 'prefix')
-    metric.redis_key.should == "prefix:metric:tickets_count"
+    metric.redis_key.should == "prefix:tickets_count"
   end
 
   it "should have nightfury's redis connection" do
@@ -23,7 +28,7 @@ describe Nightfury::Metric::Base do
 
   it "should be able to remove itself" do
     metric = Nightfury::Metric::Base.new(:tickets_count)
-    flexmock(metric.redis).should_receive(:del).with('metric:tickets_count').once
+    flexmock(metric.redis).should_receive(:del).with('tickets_count').once
     metric.delete
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nightfury
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors: