multiple_man 0.5.20 → 0.5.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0591b04188fa134c346891d8797b182f08a42f0d
-  data.tar.gz: 1a077b8c73e84f51203c4c7d2b6da4346278cc07
+  metadata.gz: f395c0bc53fe2aab8ffde4426d0013cf9a0ee0ba
+  data.tar.gz: ce5554a9a4e526be5216796f0b34cecf7d7a1fa0
 SHA512:
-  metadata.gz: 81995d16cc55a54ebffdde454fc01ae64fd02bc353a2acdaf9124e110253ffac287b8b47d7008903e5b28363e4e92622b73239b2d9b44e8eb126b8144cd6b7c0
-  data.tar.gz: 99602120d126845c63a7e8aee2d25c117abdd754e8f0837d0d3f56cffbdc1db779624a9721588cfd1644584bf792ff9ec0d6a54b12ef29188b5b10ad027321db
+  metadata.gz: 163c9dad1a4ee94f7e74a442721b2be649e64af233a0105d4f885695effd21c58eb4933053f5a9abdb01a1570ad1fc33ca1318c6d709753012c363c6b2843cda
+  data.tar.gz: 87c49def2141da2c11297facc6618c93984f31aceacbcbd40ab606ce951fcdc408d6db1e472a62fc09bcb4430dd6e954b54d46ceda053e670e69f49108381d35

data/Guardfile

@@ -0,0 +1,38 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+## Uncomment and set this to only include directories you want to watch
+# directories %w(app lib config test spec features)
+
+## Uncomment to clear the screen before every task
+# clearing :on
+
+## Guard internally checks for changes in the Guardfile and exits.
+## If you want Guard to automatically start up again, run guard in a
+## shell loop, e.g.:
+##
+##  $ while bundle exec guard; do echo "Restarting Guard..."; done
+##
+## Note: if you are using the `directories` clause above and you are not
+## watching the project directory ('.'), then you will want to move
+## the Guardfile to a watched dir and symlink it back, e.g.
+#
+#  $ mkdir config
+#  $ mv Guardfile config/
+#  $ ln -s config/Guardfile .
+#
+# and, you'll have to watch "config/Guardfile" instead of "Guardfile"
+
+# Note: The cmd option is now required due to the increasing number of ways
+#       rspec may be run, below are examples of the most common uses.
+#  * bundler: 'bundle exec rspec'
+#  * bundler binstubs: 'bin/rspec'
+#  * spring: 'bin/rsspec' (This will use spring if running and you have
+#                          installed the spring binstubs per the docs)
+#  * zeus: 'zeus rspec' (requires the server to be started separetly)
+#  * 'just' rspec: 'rspec'
+guard :rspec, cmd: 'bundle exec rspec' do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/multiple_man/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+end

data/README.md

@@ -199,3 +199,7 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
+
+
+[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/influitive/multiple_man/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
+

data/lib/multiple_man/attribute_extractor.rb

@@ -5,7 +5,7 @@ module MultipleMan
 
     def initialize(record, fields, include_previous = false)
       raise "Fields must be specified" unless fields
-      
+
       self.include_previous = include_previous
       self.record = record
       self.fields = fields
@@ -13,7 +13,7 @@ module MultipleMan
 
     def as_json
       if include_previous
-        data.merge(previous_data)
+        data.merge({previous: data("_was")})
       else
         data
       end
@@ -21,22 +21,18 @@ module MultipleMan
 
   private
 
-    def data
+    def data(suffix = nil)
       Hash[fields.map do |field|
-        [field, record.send(field)] 
-      end]
+        get_field(field, suffix)
+      end.reject(&:nil?)]
     end
 
-    def previous_data
-      { previous: Hash[fields.map do |field|
-          previous_data_method = "#{field}_was"
-          [field, record.send(previous_data_method)] if record.respond_to? previous_data_method
-        end.reject(&:nil?)]
-      }
+    def get_field(field, suffix)
+      method = "#{field}#{suffix}"
+      [field, record.send(method)] if record.respond_to? method
     end
 
-
     attr_accessor :record, :fields, :identifier, :include_previous
 
   end
-end
+end

data/lib/multiple_man/connection.rb

@@ -1,19 +1,18 @@
 require 'bunny'
-require 'connection_pool'
 require 'active_support/core_ext/module'
 
 module MultipleMan
   class Connection
+    @mutex = Mutex.new
 
     def self.connect
-      connection = Bunny.new(MultipleMan.configuration.connection)
-      MultipleMan.logger.debug "Connecting to #{MultipleMan.configuration.connection}"
-      connection.start
       channel = connection.create_channel
       yield new(channel) if block_given?
+    rescue Bunny::ConnectionClosedError, Bunny::NetworkErrorWrapper
+      reset!
+      retry
     ensure
       channel.close if channel && channel.open?
-      connection.close if connection && connection.open?
     end
 
     attr_reader :topic
@@ -23,16 +22,49 @@ module MultipleMan
       self.topic = channel.topic(topic_name)
     end
 
+    def self.connection
+      @mutex.synchronize do
+        @connection ||= begin
+          connection = Bunny.new(MultipleMan.configuration.connection, heartbeat: 5)
+          MultipleMan.logger.debug "Connecting to #{MultipleMan.configuration.connection}"
+          connection.start
+
+          connection
+        end
+      end
+    end
+
+    def self.reset!
+      @connection.close if @connection
+
+      @connection = nil
+    end
+
     def topic_name
       MultipleMan.configuration.topic_name
     end
 
     delegate :queue, to: :channel
-    
+
   private
 
     attr_accessor :channel
     attr_writer :topic
-
   end
-end
+end
+
+__END__
+
+# Possible usage
+
+Unicorn.after_fork do
+  MultipleMan::Connection.reset!
+end
+
+Sidekiq.configure_server do |config|
+  MultipleMan::Connection.reset!
+end
+
+PhusionPassenger.on_event(:starting_worker_process) do |forked|
+  MultipleMan::Connection.reset! if forked
+end

data/lib/multiple_man/version.rb

@@ -1,3 +1,3 @@
 module MultipleMan
-  VERSION = "0.5.20"
+  VERSION = "0.5.21"
 end

data/multiple_man.gemspec

@@ -23,6 +23,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", '~> 10.1.0'
   spec.add_development_dependency "rspec", '~> 2.14.1'
   spec.add_development_dependency 'codeclimate-test-reporter'
+  spec.add_development_dependency 'guard'
+  spec.add_development_dependency 'guard-rspec'
   spec.add_runtime_dependency     "bunny", '>= 1.2'
   spec.add_runtime_dependency     "activesupport", '>= 3.0'
   spec.add_runtime_dependency     "connection_pool", ">= 1.2"

data/spec/connection_spec.rb

@@ -7,8 +7,7 @@ describe MultipleMan::Connection do
 
   describe "connect" do
     it "should open a connection and a channel" do
-      mock_bunny.should_receive(:start)
-      Bunny.should_receive(:new).and_return(mock_bunny)
+      MultipleMan::Connection.should_receive(:connection).and_return(mock_bunny)
       mock_bunny.should_receive(:create_channel).once.and_return(mock_channel)
 
       described_class.connect { }

data/spec/integration/ephermal_model_spec.rb

@@ -29,10 +29,13 @@ describe "Publishing of ephermal models" do
       id: { id: 5 },
       data: { foo: 'foo', bar: 'bar', baz: 'baz'}
     }.to_json
+
+    #MultipleMan::Connection.unstub!(:connection)
+
     expect_any_instance_of(Bunny::Exchange).to receive(:publish)
                                            .with(payload, routing_key: 'multiple_man.Ephermal.create')
 
     obj.multiple_man_publish(:create)
   end
 
-end
+end

data/spec/listeners/listener_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper' 
+require 'spec_helper'
 
-describe MultipleMan::Listeners::Listener do 
+describe MultipleMan::Listeners::Listener do
   class MockClass1; end
   class MockClass2; end
 
@@ -72,4 +72,4 @@ describe MultipleMan::Listeners::Listener do
 
     listener.process_message(OpenStruct.new(routing_key: "app.MockClass1.create"), '{"a":1,"b":2}')
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: multiple_man
 version: !ruby/object:Gem::Version
-  version: 0.5.20
+  version: 0.5.21
 platform: ruby
 authors:
 - Ryan Brunner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-23 00:00:00.000000000 Z
+date: 2015-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bunny
   requirement: !ruby/object:Gem::Requirement
@@ -132,6 +160,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - Gemfile
+- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -193,7 +222,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: MultipleMan syncs changes to ActiveRecord models via AMQP