sub_pub 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c05979fc3b7a089c8cd4097cfc64afe78e45c47
-  data.tar.gz: 1d9685e3e04bee5f4814ff9b6744cb1708e612f4
+  metadata.gz: 18b8637ba49480ffcad6eac58e51e952ca22c1b7
+  data.tar.gz: 7e218133a50995d898178c29d24d898a77587d9e
 SHA512:
-  metadata.gz: d504b666e641901d31eacb9c73deee45096ffbb086ee45d89d7a332275332a71902d38e9b85cfee185ea5b5e3100d5097fe5d4728683d56f9a8098ea8b44db6f
-  data.tar.gz: 8a93dbda5a734f57703a958f2640ce075b4593495ac340e3a33926d32ab493a32aa372ea3d1fd2196157fc4df6058ba55c72e23a15143482ed22c37d94576878
+  metadata.gz: 56a43c5cc8315d5cb60fcfea982d07af70059e0559af775ae1d1a2ed2dae056ce7f564bbaeef2b70a630d1b6582a3342cccb029c0d75750c983ec2f5dfbc014b
+  data.tar.gz: af265913220b1cd1483290c151223a9b07b1cf3c1cd409c70b67e1965dc85c66f68f8a60069440e90fb20e89b3984fad7f81a745dd1887069024a3cc1f383de9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sub_pub (0.0.14)
+    sub_pub (0.0.15)
 
 GEM
   remote: https://rubygems.org/
@@ -36,7 +36,7 @@ GEM
     arel (3.0.2)
     builder (3.0.4)
     coderay (1.0.8)
-    diff-lcs (1.1.3)
+    diff-lcs (1.2.5)
     erubis (2.7.0)
     hike (1.2.1)
     i18n (0.6.1)
@@ -80,14 +80,14 @@ GEM
     rake (10.0.3)
     rdoc (3.12)
       json (~> 1.4)
-    rspec (2.12.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    rspec-core (2.12.1)
-    rspec-expectations (2.12.0)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.0)
+    rspec (2.99.0)
+      rspec-core (~> 2.99.0)
+      rspec-expectations (~> 2.99.0)
+      rspec-mocks (~> 2.99.0)
+    rspec-core (2.99.2)
+    rspec-expectations (2.99.2)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.99.2)
     slop (3.3.3)
     sprockets (2.2.2)
       hike (~> 1.2)

data/lib/sub_pub/active_record/extensions.rb

@@ -0,0 +1,34 @@
+module SubPub
+  module ActiveRecord
+    module Extensions
+      extend ActiveSupport::Concern
+
+      included do
+        ['before_create', 'after_create', 'after_commit'].each do |callback|
+          class_eval "
+          #{callback} do
+            notify_pub_sub_of_active_record_callback('#{callback}')
+          end
+          "
+        end
+
+        [:create, :update, :destroy].each do |callback|
+          class_eval "
+          after_commit(on: callback) do
+            notify_pub_sub_of_active_record_callback('after_commit_on_#{callback.to_s}')
+          end
+          "
+        end
+      end
+
+      private
+
+      def notify_pub_sub_of_active_record_callback(callback)
+        publisher = SubPub::ActiveRecord::Publisher.new(self, callback)
+        publisher.publish_callback_notification
+        publisher.publish_changed_attribute_notifications
+      end
+
+    end
+  end
+end

data/lib/sub_pub/active_record/publisher.rb

@@ -0,0 +1,44 @@
+module SubPub
+  module ActiveRecord
+    class Publisher
+
+      def initialize(record, callback)
+        @record = record
+        @callback = callback
+      end
+
+      def publish_callback_notification
+        publish_notification(callback_notification)
+      end
+
+      def publish_changed_attribute_notifications
+        notification = changes_notification
+        publish_notification(notification) if notification
+      end
+
+      private
+
+      attr_reader :record, :callback
+
+      def publish_notification(message)
+        SubPub.publish(message, record: record)
+      end
+
+      def callback_notification
+        "active_record::#{record.class.to_s.underscore}::#{callback}"
+      end
+
+      def changes_notification
+        return unless record_changes.keys.size > 0
+        callback_notification.tap do |name|
+          record_changes.keys.sort.each { |attribute| name << "::#{attribute}" }
+        end
+      end
+
+      def record_changes
+        /(before|after)_create/.match(callback) ? record.changes : record.previous_changes
+      end
+
+    end
+  end
+end

data/lib/sub_pub/active_record/subscriber.rb

@@ -0,0 +1,65 @@
+module SubPub
+  module ActiveRecord
+    class Subscriber < ::SubPub::Subscriber
+      def self.subscribe_to(class_instance, callback_name, *table_attributes)
+        @class_instance = class_instance
+        @callback_name = callback_name
+        @table_attributes = table_attributes
+
+        super(subscription_name)
+      end
+
+      def self.model_name
+        @class_instance.to_s
+      end
+
+      def self.callback_name
+        @callback_name
+      end
+
+      def self.table_attributes
+        @table_attributes
+      end
+
+      def callback_name
+        self.class.callback_name
+      end
+
+      def model_name
+        self.class.model_name
+      end
+
+      def table_attributes
+        self.class.table_attributes
+      end
+
+      def record
+        options[:record]
+      end
+
+      private
+
+      def self.subscription_name
+        table_attributes.empty? ? string_subscription : regex_subscription
+      end
+
+      def self.string_subscription
+        subscription_basename
+      end
+
+      def self.regex_subscription
+        matcher = subscription_basename << "::"
+        matcher.tap do |m|
+          table_attributes.sort.each { |attribute| m << ".*(?:(#{attribute})(?:::|$))" }
+        end
+
+        Regexp.new(matcher)
+      end
+
+      def self.subscription_basename
+        "active_record::#{@class_instance.to_s.underscore}::#{@callback_name}"
+      end
+
+    end
+  end
+end

data/lib/sub_pub/railtie.rb

@@ -2,7 +2,7 @@ module SubPub
   class Railtie < Rails::Railtie
     initializer "pub sub configuration of active record extensions" do
       class ::ActiveRecord::Base
-        include SubPub::ActiveRecordExtensions
+        include SubPub::ActiveRecord::Extensions
       end
 
       config.after_initialize do

data/lib/sub_pub/scoped_topic.rb

@@ -1,16 +1,26 @@
 module SubPub
   class ScopedTopic
+    attr_reader :topic
+
     def initialize(topic, scope)
       @topic = topic
       @scope = scope
     end
 
     def full_topic
-      "#{@scope}::#{@topic}"
+      scoped_topic
     end
 
-    def topic
-      @topic
+    private
+
+    attr_reader :scope
+
+    def scoped_topic
+      if topic.is_a? Regexp
+        /#{scope}::#{topic.source}/
+      else
+        "#{scope}::#{topic}"
+      end
     end
   end
 end

data/lib/sub_pub/subscription.rb

@@ -16,7 +16,7 @@ module SubPub
     end
 
     def unsubscribe
-      ActiveSupport::Notifications.unsubscribe(@scoped_topic.full_topic)
+      ActiveSupport::Notifications.unsubscribe(@subscription)
     end
 
     def topic

data/lib/sub_pub/version.rb

@@ -1,3 +1,3 @@
 module SubPub
-  VERSION = "0.0.14"
+  VERSION = "0.0.15"
 end

data/lib/sub_pub.rb

@@ -43,13 +43,14 @@ end
 
 require "sub_pub/version"
 require "sub_pub/subscriber"
-require "sub_pub/register"
 require "sub_pub/subscription"
+require "sub_pub/register"
 require "sub_pub/scoped_topic"
 
 require "rails"
 require "active_record"
 
-require "sub_pub/active_record_subscriber"
-require "sub_pub/active_record_extensions"
+require "sub_pub/active_record/publisher"
+require "sub_pub/active_record/subscriber"
+require "sub_pub/active_record/extensions"
 require "sub_pub/railtie"

data/lib/sub_pub_matchers.rb

@@ -4,8 +4,8 @@ module SubPub
       SubscribeToModel.new(expected)
     end
 
-    def subscribe_to_callback(expected)
-      SubscribeToModelCallback.new(expected)
+    def subscribe_to_callback(*expected)
+      SubscribeToModelCallback.new(*expected)
     end
 
     def subscribe_to_topic(expected)
@@ -33,12 +33,13 @@ module SubPub
     end
 
     class SubscribeToModelCallback
-      def initialize(expected)
-        @expected = expected
+      def initialize(*expected)
+        @callback_name, *@table_attributes = *expected
       end
 
       def matches?(subject)
-        subject.callback_name.should == @expected
+        subject.callback_name.should == @callback_name
+        subject.table_attributes.should == @table_attributes
       end
     end
   end

data/spec/integration/active_record_subscription/subscribing_to_callbacks_and_attributes_spec.rb

@@ -0,0 +1,144 @@
+require 'spec_helper'
+
+describe SubPub do
+  include_context "a fake active record result"
+  include_context "a fake active record user"
+
+  describe "after create" do
+    before do
+      class FakeActiveRecordUserSubscriber < SubPub::ActiveRecord::Subscriber
+        subscribe_to(FakeActiveRecordUser, 'after_create', :title, :body)
+
+        def on_publish
+          FakeActiveRecordResult.create
+        end
+      end
+    end
+
+    it "successfully calls through to the subscriber" do
+      FakeActiveRecordResult.count.should == 0
+
+      FakeActiveRecordUser.create
+      FakeActiveRecordResult.count.should == 0
+
+      FakeActiveRecordUser.create(title: "hey guys")
+      FakeActiveRecordResult.count.should == 0
+
+      FakeActiveRecordUser.create(title: "hey guys", body: "nice talking to you")
+
+
+      FakeActiveRecordResult.count.should == 1
+    end
+  end
+
+  describe "after commit" do
+    before do
+      class FakeActiveRecordUserSubscriber < SubPub::ActiveRecord::Subscriber
+        subscribe_to(FakeActiveRecordUser, 'after_commit', :title, :body)
+
+        def on_publish
+          FakeActiveRecordResult.create
+        end
+      end
+    end
+
+    it "successfully calls through to the subscriber" do
+      FakeActiveRecordResult.count.should == 0
+      fake_user = FakeActiveRecordUser.create
+
+      fake_user.update_attributes(title: "ABC")
+      fake_user.update_attributes(body: "XYZ")
+      FakeActiveRecordResult.count.should == 0
+
+      fake_user.update_attributes(body: "words", title: "blah")
+      FakeActiveRecordResult.count.should == 1
+
+      fake_user.update_attributes(body: "things", title: "stuff", pizza: "cheese")
+
+
+      FakeActiveRecordResult.count.should == 2
+    end
+  end
+
+  describe "after commit on create" do
+    before do
+      class FakeActiveRecordUserSubscriber < SubPub::ActiveRecord::Subscriber
+        subscribe_to(FakeActiveRecordUser, 'after_commit_on_create', :title, :body)
+
+        def on_publish
+          FakeActiveRecordResult.create
+        end
+      end
+    end
+
+    it "successfully calls through to the subscriber" do
+      FakeActiveRecordResult.count.should == 0
+
+      FakeActiveRecordUser.create
+      FakeActiveRecordResult.count.should == 0
+
+      FakeActiveRecordUser.create(title: "hey guys")
+      FakeActiveRecordResult.count.should == 0
+
+      FakeActiveRecordUser.create(title: "hey guys", body: "nice talking to you")
+
+
+      FakeActiveRecordResult.count.should == 1
+    end
+  end
+
+  describe "after commit on update" do
+    before do
+      class FakeActiveRecordUserSubscriber < SubPub::ActiveRecord::Subscriber
+        subscribe_to(FakeActiveRecordUser, 'after_commit_on_update', :title, :body)
+
+        def on_publish
+          FakeActiveRecordResult.create
+        end
+      end
+    end
+
+    it "successfully calls through to the subscriber" do
+      FakeActiveRecordResult.count.should == 0
+      fake_user = FakeActiveRecordUser.create
+
+      fake_user.update_attributes(title: "ABC")
+      fake_user.update_attributes(body: "XYZ")
+      FakeActiveRecordResult.count.should == 0
+
+      fake_user.update_attributes(body: "words", title: "blah")
+      FakeActiveRecordResult.count.should == 1
+
+      fake_user.update_attributes(body: "things", title: "stuff", pizza: "cheese")
+
+
+      FakeActiveRecordResult.count.should == 2
+    end
+  end
+
+  describe "before create" do
+    before do
+      class FakeActiveRecordUserSubscriber < SubPub::ActiveRecord::Subscriber
+        subscribe_to(FakeActiveRecordUser, 'before_create', :title, :body)
+
+        def on_publish
+          record.fake_active_record_results.build(title: 'fooz')
+        end
+      end
+    end
+
+    it "successfully calls through to the subscriber" do
+      FakeActiveRecordResult.count.should == 0
+
+      FakeActiveRecordUser.create
+      FakeActiveRecordResult.count.should == 0
+
+      FakeActiveRecordUser.create(title: "hey guys")
+      FakeActiveRecordResult.count.should == 0
+
+      FakeActiveRecordUser.create(title: "hey guys", body: "nice talking to you")
+      FakeActiveRecordResult.count.should == 1
+    end
+  end
+end
+

data/spec/integration/active_record_subscription/subscribing_to_callbacks_spec.rb

@@ -0,0 +1,117 @@
+require 'spec_helper'
+
+describe SubPub do
+  include_context "a fake active record result"
+  include_context "a fake active record user"
+
+  describe "subscribing to an active record callback" do
+    describe "after create" do
+      before do
+        class FakeActiveRecordUserSubscriber < SubPub::ActiveRecord::Subscriber
+          subscribe_to(FakeActiveRecordUser, 'after_create')
+
+          def on_publish
+            FakeActiveRecordResult.create
+          end
+        end
+      end
+
+      it "successfully calls through to the subscriber" do
+        FakeActiveRecordResult.all.size.should == 0
+        FakeActiveRecordUser.create
+        FakeActiveRecordResult.all.size.should == 1
+      end
+    end
+
+    describe "after commit" do
+      before do
+        class FakeActiveRecordUserSubscriber < SubPub::ActiveRecord::Subscriber
+          subscribe_to(FakeActiveRecordUser, 'after_commit')
+
+          def on_publish
+            FakeActiveRecordResult.create
+          end
+        end
+      end
+
+      it "successfully calls through to the subscriber" do
+        FakeActiveRecordResult.all.size.should == 0
+        FakeActiveRecordUser.create
+        FakeActiveRecordResult.all.size.should == 1
+      end
+    end
+
+    describe "after commit on create" do
+      before do
+        class FakeActiveRecordUserSubscriber < SubPub::ActiveRecord::Subscriber
+          subscribe_to(FakeActiveRecordUser, 'after_commit_on_create')
+
+          def on_publish
+            FakeActiveRecordResult.create
+          end
+        end
+      end
+
+      it "successfully calls through to the subscriber" do
+        FakeActiveRecordResult.all.size.should == 0
+        FakeActiveRecordUser.create
+        FakeActiveRecordResult.all.size.should == 1
+      end
+    end
+
+    describe "after commit on destroy" do
+      before do
+        class FakeActiveRecordUserSubscriber < SubPub::ActiveRecord::Subscriber
+          subscribe_to(FakeActiveRecordUser, 'after_commit_on_destroy')
+
+          def on_publish
+            FakeActiveRecordResult.create
+          end
+        end
+      end
+
+      it "successfully calls through to the subscriber" do
+        FakeActiveRecordResult.all.size.should == 0
+        FakeActiveRecordUser.create.destroy
+        FakeActiveRecordResult.all.size.should == 1
+      end
+    end
+
+    describe "after commit on update" do
+      before do
+        class FakeActiveRecordUserSubscriber < SubPub::ActiveRecord::Subscriber
+          subscribe_to(FakeActiveRecordUser, 'after_commit_on_update')
+
+          def on_publish
+            FakeActiveRecordResult.create
+          end
+        end
+      end
+
+      it "successfully calls through to the subscriber" do
+        FakeActiveRecordResult.all.size.should == 0
+        fake_user = FakeActiveRecordUser.create
+        fake_user.update_attributes(title: "ABC")
+        FakeActiveRecordResult.all.size.should == 1
+      end
+    end
+
+    describe "before create" do
+      before do
+        class FakeActiveRecordUserSubscriber < SubPub::ActiveRecord::Subscriber
+          subscribe_to(FakeActiveRecordUser, 'before_create')
+
+          def on_publish
+            record.fake_active_record_results.build(title: 'fooz')
+          end
+        end
+      end
+
+      it "successfully calls through to the subscriber" do
+        FakeActiveRecordResult.all.size.should == 0
+        FakeActiveRecordUser.create
+        FakeActiveRecordResult.all.size.should == 1
+      end
+    end
+  end
+end

data/spec/integration/shared_contexts/changing_records_includes.rb

@@ -0,0 +1,31 @@
+
+shared_context "a record with changes" do
+  let(:changes) do
+    {
+      zzzattribute: ["words", "blerbs"],
+      aaaattribute: ["spaghetti", "metallica"],
+    }
+  end
+
+  let(:expected_message) { "active_record::#{record.class.to_s.underscore}::#{callback}::aaaattribute::zzzattribute" }
+
+  before do
+    allow(record).to receive(:changes) { changes }
+  end
+end
+
+shared_context "a record with previous changes" do
+  let(:previous_changes) do
+    {
+      zzzattribute: ["words", "blerbs"],
+      aaaattribute: ["spaghetti", "metallica"],
+    }
+  end
+
+  let(:expected_message) { "active_record::#{record.class.to_s.underscore}::#{callback}::aaaattribute::zzzattribute" }
+
+  before do
+    allow(record).to receive(:previous_changes) { previous_changes }
+  end
+end
+

data/spec/integration/shared_contexts/fake_active_record_includes.rb

@@ -0,0 +1,26 @@
+shared_context "a fake active record user" do
+  with_model :FakeActiveRecordUser do
+    table do |t|
+      t.string :title
+      t.string :body
+      t.string :pizza
+    end
+
+    model do
+      has_many :fake_active_record_results
+    end
+  end
+end
+
+shared_context "a fake active record result" do
+  with_model :FakeActiveRecordResult do
+    table do |t|
+      t.string :title
+      t.string :body
+      t.string :pizza
+      t.integer :fake_active_record_user_id
+    end
+  end
+end
+
+

data/spec/integration/sub_pub_spec.rb

@@ -1,27 +1,13 @@
 require 'spec_helper'
 
 describe SubPub do
-  with_model :FakeActiveRecordUser do
-    table do |t|
-      t.string :title
-    end
-
-    model do
-      has_many :fake_active_record_results
-    end
-  end
-
-  with_model :FakeActiveRecordResult do
-    table do |t|
-      t.string :title
-      t.integer :fake_active_record_user_id
-    end
-  end
+  include_context "a fake active record result"
+  include_context "a fake active record user"
 
   describe "initial state" do
     it "defaults enabled to true" do
       SubPub::Register.instance.enabled = nil
-      SubPub.enabled?.should be_true
+      SubPub.enabled?.should be true
     end
   end
 
@@ -29,14 +15,14 @@ describe SubPub do
     it "enables SubPub" do
       SubPub.disable
       SubPub.enable
-      SubPub.enabled?.should be_true
+      SubPub.enabled?.should be true
     end
   end
 
   describe "#disable" do
     it "disables SubPub" do
       SubPub.disable
-      SubPub.enabled?.should be_false
+      SubPub.enabled?.should be false
     end
   end
 
@@ -137,115 +123,4 @@ describe SubPub do
       SubPub::Register.instance.subscriptions.count.should == 1
     end
   end
-
-  describe "active record configuration" do
-    describe "after create" do
-      before do
-        class FakeActiveRecordUserSubscriber < SubPub::ActiveRecord::Subscriber
-          subscribe_to(FakeActiveRecordUser, 'after_create')
-
-          def on_publish
-            FakeActiveRecordResult.create
-          end
-        end
-      end
-
-      it "successfully calls through to the subscriber" do
-        FakeActiveRecordResult.all.size.should == 0
-        FakeActiveRecordUser.create
-        FakeActiveRecordResult.all.size.should == 1
-      end
-    end
-
-    describe "after commit" do
-      before do
-        class FakeActiveRecordUserSubscriber < SubPub::ActiveRecord::Subscriber
-          subscribe_to(FakeActiveRecordUser, 'after_commit')
-
-          def on_publish
-            FakeActiveRecordResult.create
-          end
-        end
-      end
-
-      it "successfully calls through to the subscriber" do
-        FakeActiveRecordResult.all.size.should == 0
-        FakeActiveRecordUser.create
-        FakeActiveRecordResult.all.size.should == 1
-      end
-    end
-
-    describe "after commit on create" do
-      before do
-        class FakeActiveRecordUserSubscriber < SubPub::ActiveRecord::Subscriber
-          subscribe_to(FakeActiveRecordUser, 'after_commit_on_create')
-
-          def on_publish
-            FakeActiveRecordResult.create
-          end
-        end
-      end
-
-      it "successfully calls through to the subscriber" do
-        FakeActiveRecordResult.all.size.should == 0
-        FakeActiveRecordUser.create
-        FakeActiveRecordResult.all.size.should == 1
-      end
-    end
-
-    describe "after commit on destroy" do
-      before do
-        class FakeActiveRecordUserSubscriber < SubPub::ActiveRecord::Subscriber
-          subscribe_to(FakeActiveRecordUser, 'after_commit_on_destroy')
-
-          def on_publish
-            FakeActiveRecordResult.create
-          end
-        end
-      end
-
-      it "successfully calls through to the subscriber" do
-        FakeActiveRecordResult.all.size.should == 0
-        FakeActiveRecordUser.create.destroy
-        FakeActiveRecordResult.all.size.should == 1
-      end
-    end
-
-    describe "after commit on update" do
-      before do
-        class FakeActiveRecordUserSubscriber < SubPub::ActiveRecord::Subscriber
-          subscribe_to(FakeActiveRecordUser, 'after_commit_on_update')
-
-          def on_publish
-            FakeActiveRecordResult.create
-          end
-        end
-      end
-
-      it "successfully calls through to the subscriber" do
-        FakeActiveRecordResult.all.size.should == 0
-        fake_user = FakeActiveRecordUser.create
-        fake_user.update_attributes(title: "ABC")
-        FakeActiveRecordResult.all.size.should == 1
-      end
-    end
-
-    describe "before create" do
-      before do
-        class FakeActiveRecordUserSubscriber < SubPub::ActiveRecord::Subscriber
-          subscribe_to(FakeActiveRecordUser, 'before_create')
-
-          def on_publish
-            record.fake_active_record_results.build(title: 'fooz')
-          end
-        end
-      end
-
-      it "successfully calls through to the subscriber" do
-        FakeActiveRecordResult.all.size.should == 0
-        FakeActiveRecordUser.create
-        FakeActiveRecordResult.all.size.should == 1
-      end
-    end
-  end
 end

data/spec/spec_helper.rb

@@ -4,6 +4,9 @@
 # loaded once.
 #
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+
+Dir[File.dirname(__FILE__) + "/integration/shared_contexts/**/**.rb"].each {|f| require f}
+
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true

data/spec/unit/active_record/publisher_spec.rb

@@ -0,0 +1,95 @@
+require 'spec_helper'
+
+describe SubPub::ActiveRecord::Publisher do
+  let(:record) { double(:record) }
+  let(:callback) { "some_callback" }
+
+  subject(:publisher) { SubPub::ActiveRecord::Publisher.new(record, callback) }
+
+  before do
+    stub_const("SomeClassName", Class.new)
+    allow(record).to receive(:class) { SomeClassName }
+    allow(SubPub).to receive(:publish)
+  end
+
+  describe "publish_callback_notification" do
+    let(:expected_message) { "active_record::some_class_name::some_callback" }
+
+    it "publishes a message" do
+      publisher.publish_callback_notification
+      expect(SubPub).to have_received(:publish).with(expected_message, record: record)
+    end
+  end
+
+  describe "publish_changed_attribute_notifications" do
+    context "a before_create callback" do
+      let(:callback) { 'before_create' }
+
+      context "with attribute changes" do
+        include_context "a record with changes"
+
+        it "publishes a message" do
+          publisher.publish_changed_attribute_notifications
+          expect(SubPub).to have_received(:publish).with(expected_message, record: record)
+        end
+      end
+
+      context "without attribute changes" do
+        include_context "a record with changes"
+        let(:changes) { {} }
+
+        it "does not publish a message" do
+          publisher.publish_changed_attribute_notifications
+          expect(SubPub).to_not have_received(:publish)
+        end
+      end
+    end
+
+    context "an after_create callback" do
+      let(:callback) { 'after_create' }
+
+      context "with attribute changes" do
+        include_context "a record with changes"
+
+        it "publishes a message" do
+          publisher.publish_changed_attribute_notifications
+          expect(SubPub).to have_received(:publish).with(expected_message, record: record)
+        end
+      end
+
+      context "without attribute changes" do
+        include_context "a record with changes"
+        let(:changes) { {} }
+
+        it "does not publish a message" do
+          publisher.publish_changed_attribute_notifications
+          expect(SubPub).to_not have_received(:publish)
+        end
+      end
+    end
+
+    context "any other type of callback" do
+      let(:callback) { 'after_commit' }
+
+      context "with attribute changes" do
+        include_context "a record with previous changes"
+
+        it "publishes a message" do
+          publisher.publish_changed_attribute_notifications
+          expect(SubPub).to have_received(:publish).with(expected_message, record: record)
+        end
+      end
+
+      context "without attribute changes" do
+        include_context "a record with previous changes"
+        let(:previous_changes) { {} }
+
+        it "does not publish a message" do
+          publisher.publish_changed_attribute_notifications
+          expect(SubPub).to_not have_received(:publish)
+        end
+      end
+    end
+  end
+
+end

data/spec/unit/active_record/subscriber_spec.rb

@@ -0,0 +1,46 @@
+require 'spec_helper'
+
+describe SubPub::ActiveRecord::Subscriber do
+  with_model :FooBar do
+    table do |t|
+      t.string :title
+    end
+  end
+
+  before do
+    class Fooz < SubPub::ActiveRecord::Subscriber
+      subscribe_to(FooBar, 'after_create')
+    end
+
+    class Blooz < SubPub::ActiveRecord::Subscriber
+      subscribe_to(FooBar, 'after_create', :title)
+    end
+  end
+
+  describe ".model_name" do
+    specify { expect(Fooz.model_name).to eq('FooBar') }
+  end
+
+  describe ".callback_name" do
+    specify { expect(Fooz.callback_name).to eq('after_create') }
+  end
+
+  describe ".table_attributes" do
+    context "with table attributes" do
+      specify { expect(Blooz.table_attributes).to eq([:title]) }
+    end
+
+    context "without table attributes" do
+      specify { expect(Fooz.table_attributes).to eq([]) }
+    end
+  end
+
+  describe 'matchers' do
+    specify { expect(Fooz).to subscribe_to_model(FooBar) }
+    specify { expect(Fooz).to subscribe_to_callback("after_create") }
+
+    specify { expect(Blooz).to subscribe_to_model(FooBar) }
+    specify { expect(Blooz).to subscribe_to_callback("after_create", :title) }
+  end
+end
+

data/spec/unit/scoped_topic_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe SubPub::ScopedTopic do
+  let(:scope) { "cool_domain" }
+
+  subject(:scoped_topic) { SubPub::ScopedTopic.new(topic, scope) }
+
+  describe "#full_topic" do
+    context "the topic is a Regexp" do
+      let(:topic) { /cool_topic/ }
+      specify { expect(scoped_topic.full_topic).to eq(/cool_domain::cool_topic/) }
+    end
+
+    context "the topic is not a Regexp" do
+      let(:topic) { "cool_topic" }
+      specify { expect(scoped_topic.full_topic).to eq("cool_domain::cool_topic") }
+    end
+  end
+
+  describe "topic" do
+    let(:topic) { "cool_topic" }
+    specify { expect(scoped_topic.topic).to eq(topic) }
+  end
+
+end

data/spec/unit/subscription_spec.rb

@@ -0,0 +1,73 @@
+require 'spec_helper'
+
+describe SubPub::Subscription do
+  let(:scoped_topic) { double(:scoped_topic) }
+  let(:topic) { double(:topic) }
+  let(:action) { double(:action) }
+  let(:active_support_subscription) { double(:active_support_subscription) }
+  let(:options) do
+    {
+      scoped_topic: scoped_topic,
+      action: action
+    }
+  end
+
+  let(:subscription) { SubPub::Subscription.new(options) }
+
+  before do
+    allow(scoped_topic).to receive(:topic) { topic }
+  end
+
+  shared_context "a subscribable subscription" do
+    let(:full_topic) { double(:full_topic) }
+
+    before do
+      allow(scoped_topic).to receive(:full_topic) { full_topic }
+      allow(ActiveSupport::Notifications).to receive(:subscribe) { active_support_subscription }
+    end
+  end
+
+  shared_examples "a method which adds a subscription" do
+    specify do
+      SubPub::Subscription.subscribe(options)
+      expect(ActiveSupport::Notifications).to have_received(:subscribe).
+        with(full_topic, action) { active_support_subscription }
+    end
+  end
+
+  describe ".subscribe" do
+    include_context "a subscribable subscription"
+    it_behaves_like "a method which adds a subscription"
+    specify do
+      returned_object = SubPub::Subscription.subscribe(options)
+      expect(returned_object.is_a? SubPub::Subscription).to be true
+    end
+  end
+
+  describe "#subscribe" do
+    include_context "a subscribable subscription"
+    it_behaves_like "a method which adds a subscription"
+    specify { expect(subscription.subscribe).to eq(active_support_subscription) }
+  end
+
+  describe "#unsubscribe" do
+    include_context "a subscribable subscription"
+
+    before do
+      allow(ActiveSupport::Notifications).to receive(:unsubscribe)
+    end
+
+    specify do
+      subscription.subscribe
+      subscription.unsubscribe
+
+      expect(ActiveSupport::Notifications).to have_received(:unsubscribe).
+        with(active_support_subscription)
+    end
+  end
+
+  describe "#topic" do
+    specify { expect(subscription.topic).to eq(topic) }
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sub_pub
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - zephyr-dev@googlegroups.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-08 00:00:00.000000000 Z
+date: 2014-10-27 00:00:00.000000000 Z
 dependencies: []
 description: In process publish/subscribe for Ruby
 email:
@@ -27,8 +27,9 @@ files:
 - Rakefile
 - db/.gitkeep
 - lib/sub_pub.rb
-- lib/sub_pub/active_record_extensions.rb
-- lib/sub_pub/active_record_subscriber.rb
+- lib/sub_pub/active_record/extensions.rb
+- lib/sub_pub/active_record/publisher.rb
+- lib/sub_pub/active_record/subscriber.rb
 - lib/sub_pub/railtie.rb
 - lib/sub_pub/register.rb
 - lib/sub_pub/scoped_topic.rb
@@ -36,13 +37,20 @@ files:
 - lib/sub_pub/subscription.rb
 - lib/sub_pub/version.rb
 - lib/sub_pub_matchers.rb
+- spec/integration/active_record_subscription/subscribing_to_callbacks_and_attributes_spec.rb
+- spec/integration/active_record_subscription/subscribing_to_callbacks_spec.rb
+- spec/integration/shared_contexts/changing_records_includes.rb
+- spec/integration/shared_contexts/fake_active_record_includes.rb
 - spec/integration/sub_pub_spec.rb
 - spec/spec_helper.rb
-- spec/unit/active_record_matchers_spec.rb
-- spec/unit/active_record_subscriber_spec.rb
+- spec/unit/active_record/matchers_spec.rb
+- spec/unit/active_record/publisher_spec.rb
+- spec/unit/active_record/subscriber_spec.rb
 - spec/unit/matchers_spec.rb
 - spec/unit/register_spec.rb
+- spec/unit/scoped_topic_spec.rb
 - spec/unit/subscriber_spec.rb
+- spec/unit/subscription_spec.rb
 - sub_pub.gemspec
 homepage: ''
 licenses: []
@@ -63,16 +71,23 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: SubPub is a thin wrapper around ActiveSupport::Notifications, which provides
   an implementation of the Publish/Subscribe pattern.
 test_files:
+- spec/integration/active_record_subscription/subscribing_to_callbacks_and_attributes_spec.rb
+- spec/integration/active_record_subscription/subscribing_to_callbacks_spec.rb
+- spec/integration/shared_contexts/changing_records_includes.rb
+- spec/integration/shared_contexts/fake_active_record_includes.rb
 - spec/integration/sub_pub_spec.rb
 - spec/spec_helper.rb
-- spec/unit/active_record_matchers_spec.rb
-- spec/unit/active_record_subscriber_spec.rb
+- spec/unit/active_record/matchers_spec.rb
+- spec/unit/active_record/publisher_spec.rb
+- spec/unit/active_record/subscriber_spec.rb
 - spec/unit/matchers_spec.rb
 - spec/unit/register_spec.rb
+- spec/unit/scoped_topic_spec.rb
 - spec/unit/subscriber_spec.rb
+- spec/unit/subscription_spec.rb

data/lib/sub_pub/active_record_extensions.rb

@@ -1,30 +0,0 @@
-module SubPub
-  module ActiveRecordExtensions
-    extend ActiveSupport::Concern
-
-    included do
-      ['before_create', 'after_create', 'after_commit'].each do |callback|
-        class_eval "
-          #{callback} do
-            notify_pub_sub_of_active_record_callback('#{callback}')
-          end
-        "
-      end
-
-      [:create, :update, :destroy].each do |callback|
-        class_eval "
-          after_commit(on: callback) do
-            notify_pub_sub_of_active_record_callback('after_commit_on_#{callback.to_s}')
-          end
-        "
-      end
-    end
-
-    private
-
-    def notify_pub_sub_of_active_record_callback(callback)
-      message = "active_record::#{self.class.to_s.underscore}::#{callback}"
-      SubPub.publish(message, record: self)
-    end
-  end
-end

data/lib/sub_pub/active_record_subscriber.rb

@@ -1,31 +0,0 @@
-module SubPub
-  module ActiveRecord
-    class Subscriber < SubPub::Subscriber
-      def self.subscribe_to(class_instance, callback_name)
-        @class_instance = class_instance
-        @callback_name = callback_name
-        super("active_record::#{@class_instance.to_s.underscore}::#{@callback_name}")
-      end
-
-      def self.model_name
-        @class_instance.to_s
-      end
-
-      def self.callback_name
-        @callback_name
-      end
-
-      def callback_name
-        self.class.callback_name
-      end
-
-      def model_name
-        self.class.model_name
-      end
-
-      def record
-        options[:record]
-      end
-    end
-  end
-end

data/spec/unit/active_record_subscriber_spec.rb

@@ -1,37 +0,0 @@
-require 'spec_helper'
-
-describe SubPub::ActiveRecord::Subscriber do
-  with_model :FooBar do
-    table do |t|
-      t.string :title
-    end
-  end
-
-  before do
-    class Fooz < SubPub::ActiveRecord::Subscriber
-      subscribe_to(FooBar, 'after_create')
-    end
-
-    class Bazz < SubPub::ActiveRecord::Subscriber
-      subscribe_to(FooBar, 'after_create')
-    end
-  end
-
-  it "returns the model name observed" do
-    Fooz.model_name.should == 'FooBar'
-  end
-
-  it "returns the callback observed" do
-    Bazz.callback_name.should == 'after_create'
-  end
-
-  context 'matchers' do
-    subject do
-      Fooz
-    end
-
-    it { should subscribe_to_model(FooBar) }
-    it { should subscribe_to_callback("after_create") }
-  end
-end
-