pulse-meter-client-backport 0.1.2 → 0.1.3

data/lib/pulse-meter/mixins/dumper.rb

@@ -10,12 +10,23 @@ module PulseMeter
       module InstanceMethods
         # Serializes object and saves it to Redis
         # @raise [DumpError] if dumping fails for any reason
-        def dump!
+        def dump!(safe = true)
           ensure_storability!
-          serialized_obj = self.to_yaml
-          redis.hset(DUMP_REDIS_KEY, self.name, serialized_obj)
-        rescue
-          raise DumpError, "object cannot be dumped"
+          serialized_obj = to_yaml
+          if safe
+            unless redis.hsetnx(DUMP_REDIS_KEY, name, serialized_obj)
+              stored = self.class.restore(name)
+              unless stored.class == self.class
+                raise DumpConflictError, "Attempt to create sensor #{name} of class #{self.class} but it already has class #{stored.class}"
+              end
+            end
+          else
+            redis.hset(DUMP_REDIS_KEY, name, serialized_obj)
+          end
+        rescue DumpError, RestoreError => exc
+          raise exc
+        rescue StandardError => exc
+          raise DumpError, "object cannot be dumped: #{exc}"
         end
 
         # Ensures that object is dumpable

data/lib/pulse-meter/sensor.rb

@@ -37,6 +37,9 @@ module PulseMeter
   # Exception to be raised when sensor cannot be dumped
   class DumpError < SensorError; end
 
+  # Exception to be raised on attempts of using the same key for different sensors
+  class DumpConflictError < DumpError; end
+
   # Exception to be raised when sensor cannot be restored
   class RestoreError < SensorError; end
 

data/lib/pulse-meter/version.rb

@@ -1,3 +1,3 @@
 module PulseMeter
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/spec/pulse_meter/mixins/dumper_spec.rb

@@ -8,19 +8,23 @@ describe PulseMeter::Mixins::Dumper do
   class Bad < Base; end
 
   class Good < Base
-    attr_accessor :foo
-    def name; foo.to_s; end
+    attr_accessor :some_value
+    attr_accessor :name
 
     def redis; PulseMeter.redis; end
 
-    def initialize(foo)
-      @foo = foo
+    def initialize(name)
+      @name = name.to_s
+      @some_value = name
     end
   end
 
+  class GoodButAnother < Good; end
+
   let(:bad_obj){ Bad.new }
   let(:good_obj){ Good.new(:foo) }
   let(:another_good_obj){ Good.new(:bar) }
+  let(:good_obj_of_another_type){ GoodButAnother.new(:quux) }
   let(:redis){ PulseMeter.redis }
 
   describe '#dump' do
@@ -57,6 +61,23 @@ describe PulseMeter::Mixins::Dumper do
         expect {good_obj.dump!}.to change {redis.hlen(Good::DUMP_REDIS_KEY)}.by(1)
       end
     end
+
+    context "when dump is safe" do
+      it "should not overwrite stored objects of the same type" do
+        good_obj.some_value = 123
+        good_obj.dump!
+        good_obj.some_value = 321
+        good_obj.dump!
+        Base.restore(good_obj.name).some_value.should == 123
+      end
+
+      it "should raise DumpConflictError exception if sensor with the same name but different type already exists" do
+        good_obj.name = "duplicate_name"
+        good_obj_of_another_type.name = "duplicate_name"
+        good_obj.dump!
+        expect{good_obj_of_another_type.dump!}.to raise_exception(PulseMeter::DumpConflictError)
+      end
+    end
   end
 
   describe ".restore" do
@@ -77,14 +98,14 @@ describe PulseMeter::Mixins::Dumper do
 
       it "should restore object data" do
         restored = Base.restore(good_obj.name)
-        restored.foo.should == good_obj.foo
+        restored.some_value.should == good_obj.some_value
       end
 
       it "should restore last dumped object" do
-        good_obj.foo = :bar
-        good_obj.dump!
+        good_obj.some_value = :bar
+        good_obj.dump!(false)
         restored = Base.restore(good_obj.name)
-        restored.foo.should == :bar
+        restored.some_value.should == :bar
       end
     end
   end
@@ -106,8 +127,8 @@ describe PulseMeter::Mixins::Dumper do
       end
 
       it "should return list of registered objects" do
-        good_obj.dump!
-        another_good_obj.dump!
+        good_obj.dump!(false)
+        another_good_obj.dump!(false)
         Base.list_names.should =~ [good_obj.name, another_good_obj.name]
       end
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pulse-meter-client-backport
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Ilya Averyanov
@@ -16,12 +16,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-06 00:00:00 Z
+date: 2012-06-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: json
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -30,12 +28,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
   type: :runtime
-  version_requirements: *id001
+  name: json
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
-  name: redis
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -44,12 +42,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
   type: :runtime
-  version_requirements: *id002
+  name: redis
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
-  name: hashie
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -58,12 +56,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
   type: :development
-  version_requirements: *id003
+  name: hashie
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
-  name: foreman
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -72,12 +70,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
   type: :development
-  version_requirements: *id004
+  name: foreman
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
-  name: mock_redis
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -86,12 +84,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
   type: :development
-  version_requirements: *id005
+  name: mock_redis
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
-  name: rack-test
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -100,12 +98,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
   type: :development
-  version_requirements: *id006
+  name: rack-test
+  requirement: *id006
 - !ruby/object:Gem::Dependency 
-  name: rake
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -114,12 +112,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
   type: :development
-  version_requirements: *id007
+  name: rake
+  requirement: *id007
 - !ruby/object:Gem::Dependency 
-  name: redcarpet
-  prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -128,12 +126,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
   type: :development
-  version_requirements: *id008
+  name: redcarpet
+  requirement: *id008
 - !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -142,12 +140,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
   type: :development
-  version_requirements: *id009
+  name: rspec
+  requirement: *id009
 - !ruby/object:Gem::Dependency 
-  name: timecop
-  prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -156,12 +154,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
   type: :development
-  version_requirements: *id010
+  name: timecop
+  requirement: *id010
 - !ruby/object:Gem::Dependency 
-  name: yard
-  prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -170,8 +168,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
   type: :development
-  version_requirements: *id011
+  name: yard
+  requirement: *id011
 description: Ruby 1.8 compatible PulseMeter client
 email: 
 - av@fun-box.ru