popular 0.1.0 → 0.3.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDk1NGEzNDZlYjNkZjEzMmFkZTQ1MjFhYmY3YzYxMTk2ZGY2YjdiOA==
+    NDZkMzQzZDk2OTIzYTc3ZjMzNzA1NWU0NzQ1MTA3ZjcwYzJhNDYzYw==
   data.tar.gz: !binary |-
-    ODM2MjhhODY1NmJjZjZlMzQzYzljMTM3ZTFkZjExOTgzMDZmMmQxZQ==
+    OWM2YjUyZTExMTVjYWUwYjJmMTUyNWFiZWNjNjA4ZGQ3N2U3MjQwYg==
 SHA512:
   metadata.gz: !binary |-
-    ODY5YzY4YzYxNzU5NTc1MzVjNTMwMmE5YzBiOTgzNmQ4MjVjMzE5Y2ExMTIy
-    YmU3YTAxZWY4NmM4YjlmMTIxY2YyN2U2MjNlMjAxNmY3MzRiMDI5ZjVjODA0
-    YTEyM2EwYWI5NjcwMzhkNmZhZjE2MTU2NDlkNWM2ZTg4MTg5ODQ=
+    ZmFkZjJmZWJkOWU0ZTFhNmJjZDBmNjY1OTJhYmM2YjY3YjI0M2VkNmY2YjYx
+    ZGU0MWJjNTFlYzllYTZkNzFiNDQ4MTAzMjgxNWM0ZWY0NTdmOTk5MDQwMzU5
+    OTdjYWRhYmRjYWJmMWU2MTEzODljYTU1ZDBjYzdhM2MwOWFjYTg=
   data.tar.gz: !binary |-
-    MTcwYjYwMTU4Njk3YTY0YTE1M2JjNmIwMzIyN2QxYzFkZjU5NjQ2ODY1OTFl
-    ZmQxZjE3NjI5MjEwNzBlMzBiNTNkZjk2Mzk5NGU2NmRmMDljZmE4ZWYxNDdk
-    YWNlOWMwODg4ZTZjNTRmZWZlNWQ1ZjkwY2ZhYjI4OWI3ZTEyNWY=
+    NDRjZThlZWM2YWQ5MWFmOWFhNWYyMDE5OTFlNTJjOGIwZjkwOTc3YzUyMTZm
+    ZTk5MDk3M2IwYmIzZWEwNThhYTFiYWNhOTViMTI0OThjNWZlZjVlZDIyNDU0
+    MzE3N2ZmZTJkNzc3YTE1ZjgyZGVhZTJhNGVlMmM2NzAyYTgyZGE=

data/lib/popular/popular.rb

@@ -2,15 +2,18 @@ module Popular
 
   module Popular
 
-    def self.included base
+    extend ActiveSupport::Concern
 
-      base.class_eval do
+    included do |base|
+      has_many :friendships, class_name: 'Popular::Friendship', as: :popular_model, dependent: :destroy
+      has_many :friends, through: :friendships, source_type: base
 
-        has_many :friendships, class_name: 'Popular::Friendship', as: :popular_model, dependent: :destroy
-        has_many :friends, through: :friendships, source_type: base
+      include ActiveSupport::Callbacks
+      define_callbacks :befriend
 
+      [:before_befriend, :after_befriend].each do |callback|
+        send callback
       end
-
     end
 
     # Adds a friend to an instance's friend's list
@@ -24,7 +27,9 @@ module Popular
     #
     #   user.friends_with? other_user #=> true
     def befriend new_friend
-      friendships.create friend: new_friend
+      run_callbacks :befriend do
+        friendships.create friend: new_friend
+      end
     end
 
     # Adds a friend to an instance's friend's list
@@ -36,10 +41,12 @@ module Popular
     #   user = User.create name: "Justin"
     #   other_user = User.create name: "Jenny"
     #   user.befriend! other_user
-    #   user.reload
+    #
     #   user.friends_with? other_user # => true
     def befriend! new_friend
-      friendships.create! friend: new_friend
+      run_callbacks :befriend do
+        friendships.create! friend: new_friend
+      end
     end
 
     # Removes a friend from an instance's friend's list
@@ -76,6 +83,52 @@ module Popular
       friendships.where( friend: popular_model ).any?
     end
 
+    module ClassMethods
+
+      # before_befriend callback convenience class method
+      #
+      # @since 0.3.0
+      #
+      # @example
+      #
+      #   class User < ActiveRecord::Base
+      #     before_befriend :do_something_amazing
+      #
+      #     def do_something_amazing
+      #       puts name
+      #     end
+      #   end
+      #
+      #   user = User.create name: "Justin"
+      #   another_user = User.create name: "Jenny"
+      #
+      #   user.befriend another_user #=> "Justin"
+      def before_befriend *args, &blk
+        set_callback :befriend, :before, *args, &blk
+      end
+
+      # after_befriend callback convenience class method
+      #
+      # @since 0.3.0
+      #
+      # @example
+      #
+      #   class User < ActiveRecord::Base
+      #     after_befriend :do_something_amazing
+      #
+      #     def do_something_amazing
+      #       puts name
+      #     end
+      #   end
+      #
+      #   user = User.create name: "Justin"
+      #   another_user = User.create name: "Jenny"
+      #
+      #   user.befriend another_user #=> "Justin"
+      def after_befriend *args, &blk
+        set_callback :befriend, :after, *args, &blk
+      end
+    end
   end
 
 end

data/lib/popular/version.rb

@@ -1,3 +1,3 @@
 module Popular
-  VERSION = "0.1.0"
+  VERSION = "0.3.0"
 end

data/popular.gemspec

@@ -26,5 +26,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "yard", "~> 0.8"
   spec.add_development_dependency "redcarpet", "~> 3.1"
   spec.add_development_dependency "inch", "~> 0.3"
-  spec.add_development_dependency "gem-release", '~> 0.7.1'
+  spec.add_development_dependency "gem-release", '~> 0.7'
 end

data/spec/popular/popular_model_spec.rb

@@ -4,16 +4,49 @@ shared_examples "a popular model" do
     it 'creates a one way friendship' do
       popular_model.befriend! another_popular_model
 
-      expect( popular_model.friends ).to match_array [another_popular_model]
+      expect( popular_model).to be_friends_with another_popular_model
+    end
+
+    it 'triggers before_befriend callback' do
+        popular_model_with_before_befriend_callback
+          .should_receive( :callback_worked )
+          .once
+          .and_return true
+
+        popular_model_with_before_befriend_callback.befriend! another_popular_model
+    end
+
+    context 'successful' do
+      it 'triggers after_befriend callback' do
+        popular_model_with_after_befriend_callback
+          .should_receive( :callback_worked )
+          .once
+          .and_return true
+
+        popular_model_with_after_befriend_callback.befriend! another_popular_model
+      end
     end
   end
 
   describe '.befriend' do
-    it 'creates a one way friendship' do
-      popular_model.befriend another_popular_model
 
-      expect( popular_model.friends ).to match_array [another_popular_model]
+    context 'successful' do
+      it 'triggers after_befriend callback' do
+        popular_model_with_after_befriend_callback
+          .should_receive( :callback_worked )
+          .once
+          .and_return true
+
+        popular_model_with_after_befriend_callback.befriend another_popular_model
+      end
+
+      it 'creates a one way friendship' do
+        popular_model.befriend another_popular_model
+
+        expect( popular_model).to be_friends_with another_popular_model
+      end
     end
+
   end
 
   describe '#friends_with?' do
@@ -33,7 +66,7 @@ shared_examples "a popular model" do
         popular_model.send method, another_popular_model
       end
 
-      expect( popular_model.friends ).to be_empty
+      expect( popular_model).to_not be_friends_with another_popular_model
     end
   end
 

data/spec/popular/popular_spec.rb

@@ -15,8 +15,11 @@ describe Popular::Popular do
   end
 
   it_behaves_like 'a popular model' do
+    let ( :random_object ) { RandomClass.new }
     let ( :popular_model ) { PopularModel.create }
     let ( :another_popular_model ) { PopularModel.create }
+    let ( :popular_model_with_after_befriend_callback ) { PopularModelWithAfterBefriendCallback.create }
+    let ( :popular_model_with_before_befriend_callback ) { PopularModelWithBeforeBefriendCallback.create }
   end
 
 end

data/spec/spec_helper.rb

@@ -6,6 +6,8 @@ end
 require 'sqlite3'
 require 'popular'
 
+Dir["./spec/support/**/*.rb"].sort.each { |f| require f }
+
 ActiveRecord::Base.establish_connection adapter: "sqlite3", database: ":memory:"
 
 ActiveRecord::Schema.define version: 1 do
@@ -19,12 +21,6 @@ ActiveRecord::Schema.define version: 1 do
 
 end
 
-UnpopularModel = Class.new ActiveRecord::Base
-
-class PopularModel < ActiveRecord::Base
-  popular
-end
-
 RSpec.configure do |config|
   config.order = 'random'
 end

data/spec/support/popular_model.rb

@@ -0,0 +1,3 @@
+class PopularModel < ActiveRecord::Base
+  popular
+end

data/spec/support/popular_model_with_after_befriend_callback.rb

@@ -0,0 +1,7 @@
+class PopularModelWithAfterBefriendCallback < PopularModel
+  after_befriend :callback_worked
+
+  def callback_worked
+    true
+  end
+end

data/spec/support/popular_model_with_before_befriend_callback.rb

@@ -0,0 +1,7 @@
+class PopularModelWithBeforeBefriendCallback < PopularModel
+  before_befriend :callback_worked
+
+  def callback_worked
+    true
+  end
+end

data/spec/support/random_class.rb

@@ -0,0 +1 @@
+RandomClass = Class.new

data/spec/support/unpopular_model.rb

@@ -0,0 +1 @@
+UnpopularModel = Class.new ActiveRecord::Base

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: popular
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.0
 platform: ruby
 authors:
 - thejchap
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: '0.7'
 description: Friendship gem for Rails/ActiveRecord. Popular saves time when developing
   social apps
 email:
@@ -161,6 +161,11 @@ files:
 - spec/popular/popular_model_spec.rb
 - spec/popular/popular_spec.rb
 - spec/spec_helper.rb
+- spec/support/popular_model.rb
+- spec/support/popular_model_with_after_befriend_callback.rb
+- spec/support/popular_model_with_before_befriend_callback.rb
+- spec/support/random_class.rb
+- spec/support/unpopular_model.rb
 homepage: http://thejchap.github.io/popular
 licenses:
 - MIT
@@ -189,4 +194,9 @@ test_files:
 - spec/popular/popular_model_spec.rb
 - spec/popular/popular_spec.rb
 - spec/spec_helper.rb
+- spec/support/popular_model.rb
+- spec/support/popular_model_with_after_befriend_callback.rb
+- spec/support/popular_model_with_before_befriend_callback.rb
+- spec/support/random_class.rb
+- spec/support/unpopular_model.rb
 has_rdoc: