beetle 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8bc8a9a807e4dc4700014a8141bc0655a148f640
-  data.tar.gz: 8edb6370ac5ffce29a3413e92e95b1c77a64f5e0
+  metadata.gz: 3f2aa62352bfa22c0bcf8b02160027aed3429cd6
+  data.tar.gz: 491a52bbb628b89165e09671e505147d540844bf
 SHA512:
-  metadata.gz: 3663209bba33abb84e9f83b202b86887487b913d9d3314f19f872fdebd8366b8da6fbe9906b8638854c7e47f55b95af5c72357f5f9d0d68820c3891a70cc17db
-  data.tar.gz: 0627f275d36fa6b18abe866405ade5dcffd8bbb4f48df360aacf94c0b0743394feef73432c19efdaa8c92b3e0f7bdb6d124b190f2c7e4ebe2c23727c05666b39
+  metadata.gz: 383565b61fe2689ac5767b668710762bda352a8c1c37253e351e7c5d527e97dbd240e5346403881cf3cf428b0b2137eea1fddb4cba15ea6eb3a2afb7f8f04205
+  data.tar.gz: 76fd7ccdb3f16680792695778685fca20102575b1c419ffd6e5fa3d4b48917de7abcbf808f109d2cb3fe70a76cd638d18fffd3165aa93fdefd984daec74722c3

data/RELEASE_NOTES.rdoc

@@ -1,5 +1,9 @@
 = Release Notes
 
+== Version 0.4.2
+* Fail hard on missing master file
+* Set message timestamp header
+
 == Version 0.4.1
 * Require newer bunny version (0.7.10) to fix publishing of messages larger than frame_max
 

data/features/support/env.rb

@@ -1,9 +1,10 @@
 require File.expand_path('../../../lib/beetle', __FILE__)
 
-# Allow using Test::Unit for step assertions
-# See http://wiki.github.com/aslakhellesoy/cucumber/using-testunit
-require 'test/unit/assertions'
-World(Test::Unit::Assertions)
+# See https://github.com/cucumber/cucumber/wiki/Using-MiniTest
+require 'minitest/unit'
+World do
+  extend MiniTest::Assertions
+end
 
 Before do
   `ruby features/support/system_notification_logger start`

data/lib/beetle/deduplication_store.rb

@@ -189,8 +189,6 @@ module Beetle
     def redis_master_from_master_file
       set_current_redis_master_from_master_file if redis_master_file_changed?
       @current_master
-    rescue Errno::ENOENT
-      nil
     end
 
     # redis master file changed outside the running process?

data/lib/beetle/message.rb

@@ -32,6 +32,8 @@ module Beetle
     attr_reader :header
     # the uuid of the message
     attr_reader :uuid
+    # unix timestamp when the message was published
+    attr_reader :timestamp
     # message payload
     attr_reader :data
     # the message format version of the message
@@ -76,6 +78,7 @@ module Beetle
       # p header.attributes
       amqp_headers = header.attributes
       @uuid = amqp_headers[:message_id]
+      @timestamp = amqp_headers[:timestamp]
       headers = amqp_headers[:headers].symbolize_keys
       @format_version = headers[:format_version].to_i
       @flags = headers[:flags].to_i
@@ -92,6 +95,7 @@ module Beetle
       expires_at = now + (opts[:ttl] || DEFAULT_TTL)
       opts = opts.slice(*PUBLISHING_KEYS)
       opts[:message_id] = generate_uuid.to_s
+      opts[:timestamp] = now
       headers = (opts[:headers] ||= {})
       headers.merge!(
         :format_version => FORMAT_VERSION.to_s,

data/lib/beetle/publisher.rb

@@ -60,7 +60,7 @@ module Beetle
 
     def publish_with_redundancy(exchange_name, message_name, data, opts) #:nodoc:
       if @servers.size < 2
-        logger.error "Beetle: at least two active servers are required for redundant publishing"
+        logger.warn "Beetle: at least two active servers are required for redundant publishing"
         return publish_with_failover(exchange_name, message_name, data, opts)
       end
       published = []

data/lib/beetle/version.rb

@@ -1,3 +1,3 @@
 module Beetle
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

data/test/beetle/deduplication_store_test.rb

@@ -66,9 +66,9 @@ module Beetle
       2.times { @store.redis }
     end
 
-    test "should return nil if the master file doesn't exist" do
+    test "should blow up if the master file doesn't exist" do
       Beetle.config.redis_server = "/tmp/__i_don_not_exist__.txt"
-      assert_equal nil, @store.redis_master_from_master_file
+      assert_raises(Errno::ENOENT) { @store.redis_master_from_master_file }
     end
 
     private

data/test/beetle/message_test.rb

@@ -16,6 +16,13 @@ module Beetle
       assert_equal Message::FORMAT_VERSION, m.format_version
     end
 
+    test "a message should decode the timestamp" do
+      Message.stubs(:now).returns(42)
+      header = header_with_params()
+      m = Message.new("queue", header, 'foo')
+      assert_equal 42, m.timestamp
+    end
+
     test "a redundantly encoded message should have the redundant flag set on delivery" do
       header = header_with_params(:redundant => true)
       m = Message.new("queue", header, 'foo')
@@ -24,14 +31,14 @@ module Beetle
     end
 
     test "encoding a message with a specfied time to live should set an expiration time" do
-      Message.expects(:now).returns(25)
+      Message.stubs(:now).returns(25)
       header = header_with_params(:ttl => 17)
       m = Message.new("queue", header, 'foo')
       assert_equal 42, m.expires_at
     end
 
     test "encoding a message should set the default expiration date if none is provided in the call to encode" do
-      Message.expects(:now).returns(1)
+      Message.stubs(:now).returns(1)
       header = header_with_params({})
       m = Message.new("queue", header, 'foo')
       assert_equal 1 + Message::DEFAULT_TTL, m.expires_at
@@ -62,6 +69,12 @@ module Beetle
       assert_equal uuid, options[:message_id]
     end
 
+    test "the publishing options should include the timestamp" do
+      Message.stubs(:now).returns(42)
+      options = Message.publishing_options
+      assert_equal 42, options[:timestamp]
+    end
+
     test "the publishing options must only include string values" do
       options = Message.publishing_options(:redundant => true, :mandatory => true, :bogus => true)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beetle
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Stefan Kaes
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-16 00:00:00.000000000 Z
+date: 2015-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uuid4r
@@ -284,7 +284,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.7
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 3
 summary: High Availability AMQP Messaging with Redundant Queues