philotic 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75e1404b96bfb860814c48b3acf1380492c4f46b
-  data.tar.gz: 86dd9ec5d5fe47f5d2a1831b62dde08f8cb2ec9a
+  metadata.gz: 8aa3dc7a09929105b73c5fb51b7d0fe9bf73c111
+  data.tar.gz: c89f7608c819acb0cbca645ee3ace3b6936723a7
 SHA512:
-  metadata.gz: a64938a62e9dcc6ded5000577cd0dc97bd0b02722a81a60099375da3fd3a817b2c69521672df291f8243c1f8db442d909aaf8f15d4ffeae08cdd4a9ad4a9fc45
-  data.tar.gz: fe5c070416b330cfce1dada9e9dc78d50c1cd2f9d68a9637c13338db50c8d5e05be970637d6fafd71f8c10e6e4366dbb343e016d455d89f3847c2cb6f058d850
+  metadata.gz: ee090366e13f093fcf493d5763e1c720fa6ca3fe524281380574010d6c347bc7326bd4462bc97d57c32aed9422e835506bad94290912bc9f8f7f4e92ae1fda94
+  data.tar.gz: 3f6de8f45b0af5cc06a9f304c4728e18be8c5f09a4f680d747b1add5575d78e77b718b23d7ed75ac34d56bb4d0ca78048289b82da55e18580340573d5d0fe963

data/.travis.yml

@@ -1,15 +1,19 @@
 language: ruby
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.0
-  - rbx-2.2.10
-  - jruby-19mode
-  - ruby-head
-  - jruby-head
+- 1.9.3
+- 2.0.0
+- 2.1.0
+- rbx-2.2.10
+- jruby-19mode
+- ruby-head
+- jruby-head
 script:
-  - bundle exec rspec
+- bundle exec rspec
 addons:
   code_climate:
     repo_token:
-      secure: "D1HT1RpA+t8nZbXXD26rAyU8YJmaVFQXv+2yXmBmIca7d38zWz+SnJS8shtUXL48MRF31LC6ywTHjHi0JmCLKnwPQhddD8u8pecLGSOhc/wmdauDBTSlfYHo/2uErkVBix9oAgRvn/9b5sx7/yzq1PUWuhYgJhcnibECtQQQQkw="
+      secure: D1HT1RpA+t8nZbXXD26rAyU8YJmaVFQXv+2yXmBmIca7d38zWz+SnJS8shtUXL48MRF31LC6ywTHjHi0JmCLKnwPQhddD8u8pecLGSOhc/wmdauDBTSlfYHo/2uErkVBix9oAgRvn/9b5sx7/yzq1PUWuhYgJhcnibECtQQQQkw=
+notifications:
+  hipchat:
+    rooms:
+      secure: akLY832/pt0+9Y2TFKpzW08bagPMY//AcQJ5JGzc0yd3hZbXTlkW4S8bMEclBeHBqLGCV6vaWeN90PiYwIBs4IWlxopPAop4BEWeqRvD8+B4fxarXYwejt54vH3v4iCnHhSNBpFJDbykyfL0f0g9fhvM48eHzhBXTxPZfpQ9nXs=

data/examples/creating_named_queues/manually.rb

@@ -5,8 +5,8 @@ $stdout.sync = true
 require 'philotic'
 
 # explicitly create named queues for this example
-# ENV['INITIALIZE_NAMED_QUEUE'] must equal 'true' to run Philotic.initialize_named_queue!
-ENV['INITIALIZE_NAMED_QUEUE'] = 'true'
+# ENV['PHILOTIC_INITIALIZE_NAMED_QUEUE'] must equal 'true' to run Philotic.initialize_named_queue!
+ENV['PHILOTIC_INITIALIZE_NAMED_QUEUE'] = 'true'
 Philotic.initialize_named_queue!('male_queue', bindings: [{:'x-match' => 'all', gender: :M, available: true}])
 Philotic.initialize_named_queue!('female_queue', bindings: [{:'x-match' => 'all', gender: :F, available: true}])
 Philotic.initialize_named_queue!('test_queue', bindings: [{ :'x-match' => 'any', gender: :M, available: true }])

data/lib/philotic.rb

@@ -21,20 +21,26 @@ module Philotic
   end
 
   def self.initialize_named_queue!(queue_name, config)
+    raise "ENV['PHILOTIC_INITIALIZE_NAMED_QUEUE'] must equal 'true' to run Philotic.initialize_named_queue!" unless ENV['PHILOTIC_INITIALIZE_NAMED_QUEUE'] == 'true'
+
     Philotic.connect!
-    config = config.deep_symbolize_keys
+    queue_exists = Philotic::Connection.connection.queue_exists? queue_name
 
-    raise "ENV['INITIALIZE_NAMED_QUEUE'] must equal 'true' to run Philotic.initialize_named_queue!" unless ENV['INITIALIZE_NAMED_QUEUE'] == 'true'
+    should_delete_queue = queue_exists && ENV['PHILOTIC_DELETE_EXISTING_QUEUE'] == 'true'
+    should_create_queue = !queue_exists || ENV['PHILOTIC_DELETE_EXISTING_QUEUE'] == 'true'
 
-    if Philotic::Connection.connection.queue_exists? queue_name
+    if should_delete_queue
       Philotic::Connection.channel.queue(queue_name, passive: true).delete
       Philotic.logger.info "deleted old queue. queue: #{queue_name}"
     end
 
-    queue = queue_from_config(queue_name, config)
-
-    bind_queue(queue, config)
-    yield queue if block_given?
+    if should_create_queue
+      config = config.deep_symbolize_keys
+      queue = queue_from_config(queue_name, config)
+      bind_queue(queue, config)
+    else
+      Philotic.logger.warn "Queue #{queue_name} not created; it already exists. ENV['PHILOTIC_DELETE_EXISTING_QUEUE'] must equal 'true' to override."
+    end
   end
 
   def self.bind_queue(queue, config)
@@ -85,8 +91,8 @@ module Philotic
     Philotic::Connection.connected?
   end
 
-  def self.connect! &block
-    Philotic::Connection.connect! &block
+  def self.connect!
+    Philotic::Connection.connect!
   end
 end
 

data/lib/philotic/config.rb

@@ -77,7 +77,7 @@ module Philotic
 
     def message_return_handler
       @message_return_handler ||= lambda do |basic_return, metadata, payload|
-        puts "Philotic message #{JSON.parse payload} was returned! reply_code = #{basic_return.reply_code}, reply_text = #{basic_return.reply_text} headers = #{metadata[:headers]}"
+        Philotic.logger.warn "Philotic message #{JSON.parse payload} was returned! reply_code = #{basic_return.reply_code}, reply_text = #{basic_return.reply_text} headers = #{metadata[:headers]}"
       end
     end
 

data/lib/philotic/logging/logger.rb

@@ -11,7 +11,7 @@ module Philotic
         @event_class ||= Philotic::Logging::Event
       end
 
-      def add(severity, message = nil, progname = nil, &block)
+      def add(severity, message = nil, progname = nil)
         severity ||= UNKNOWN
         if @logdev.nil? or severity < @level
           return true

data/lib/philotic/routable.rb

@@ -62,8 +62,8 @@ module Philotic
         attr_accessor(*names)
       end
 
-      def publish(*args, &block)
-        self.new(*args).publish(&block)
+      def publish(*args)
+        self.new(*args).publish
       end
     end
 
@@ -88,8 +88,8 @@ module Philotic
       @message_metadata.merge! options
     end
 
-    def publish &block
-      Philotic::Publisher.publish(self, &block)
+    def publish
+      Philotic::Publisher.publish self
     end
 
     private

data/lib/philotic/tasks/init_queues.rb

@@ -3,8 +3,8 @@ namespace :philotic do
   task :init_queues, :filename do |t, args|
     raise "You must specify a file name for #{t.name}: rake #{t.name}[FILENAME] #yes, you need the brackets, no space." if !args[:filename]
 
-    # ENV['INITIALIZE_NAMED_QUEUE'] must equal 'true' to run Philotic.initialize_named_queue!
-    ENV['INITIALIZE_NAMED_QUEUE'] = 'true'
+    # ENV['PHILOTIC_INITIALIZE_NAMED_QUEUE'] must equal 'true' to run Philotic.initialize_named_queue!
+    ENV['PHILOTIC_INITIALIZE_NAMED_QUEUE'] = 'true'
 
     require 'philotic'
 

data/lib/philotic/version.rb

@@ -1,3 +1,3 @@
 module Philotic
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

data/spec/philotic_spec.rb

@@ -24,17 +24,34 @@ describe Philotic do
           }
       }
     end
-    it "should throw an error when ENV['INITIALIZE_NAMED_QUEUE'] is not set to 'true'" do
-      ENV['INITIALIZE_NAMED_QUEUE'] = nil
-      queue_name                    = test_queues.keys.first
-      config                        = test_queues[queue_name]
-      expect(Philotic).to receive(:connect!)
-      expect { Philotic.initialize_named_queue! queue_name, config }.to raise_error("ENV['INITIALIZE_NAMED_QUEUE'] must equal 'true' to run Philotic.initialize_named_queue!")
+    it "should throw an error when ENV['PHILOTIC_INITIALIZE_NAMED_QUEUE'] is not set to 'true'" do
+      ENV['PHILOTIC_INITIALIZE_NAMED_QUEUE'] = nil
+      queue_name                             = test_queues.keys.first
+      config                                 = test_queues[queue_name]
+      expect(Philotic).not_to receive(:connect!)
+      expect { Philotic.initialize_named_queue! queue_name, config }.to raise_error("ENV['PHILOTIC_INITIALIZE_NAMED_QUEUE'] must equal 'true' to run Philotic.initialize_named_queue!")
 
     end
 
-    it 'should set up the queue with the right parameters' do
-      ENV['INITIALIZE_NAMED_QUEUE'] = 'true'
+    it "should log a warning when ENV['PHILOTIC_DELETE_EXISTING_QUEUE'] is not set to 'true' and the queue already exists" do
+      ENV['PHILOTIC_INITIALIZE_NAMED_QUEUE'] = 'true'
+      test_queues.each_pair do |queue_name, config|
+
+        connection = double
+
+        expect(Philotic).to receive(:connect!)
+        expect(Philotic::Connection).to receive(:connection).and_return(connection)
+        expect(connection).to receive(:queue_exists?).and_return(true)
+
+        expect(Philotic.logger).to receive(:warn)
+
+        Philotic.initialize_named_queue! queue_name, config
+      end
+    end
+
+    it "should delete the queue first when ENV['PHILOTIC_DELETE_EXISTING_QUEUE'] is set to 'true' and the queue already exists" do
+      ENV['PHILOTIC_INITIALIZE_NAMED_QUEUE'] = 'true'
+      ENV['PHILOTIC_DELETE_EXISTING_QUEUE'] = 'true'
 
       test_queues.each_pair do |queue_name, config|
 
@@ -48,18 +65,18 @@ describe Philotic do
 
         expect(Philotic).to receive(:connect!)
         expect(Philotic::Connection).to receive(:connection).and_return(connection)
-        expect(connection).to receive(:queue_exists?)
-        expect(Philotic::Connection).to receive(:channel).and_return(channel).exactly(2).times
+        expect(connection).to receive(:queue_exists?).and_return(true)
+        expect(Philotic::Connection).to receive(:channel).and_return(channel).exactly(3).times
+        expect(channel).to receive(:queue).with(queue_name, {passive: true}).and_return(queue)
+        expect(queue).to receive(:delete)
         expect(channel).to receive(:queue).with(queue_name, queue_options).and_return(queue)
         expect(channel).to receive(:headers).with(config[:exchange], durable: true) { exchange }
         expect(queue).to receive(:name).and_return(queue_name).exactly(2).times
 
         config[:bindings].each do |arguments|
           expect(queue).to receive(:bind).with(exchange, {arguments: arguments})
-          Philotic.initialize_named_queue! queue_name, config
         end
-
-
+        Philotic.initialize_named_queue! queue_name, config
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: philotic
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Nathan Keyes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-08 00:00:00.000000000 Z
+date: 2014-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter