partisan 0.2.3 → 0.3

data/.travis.yml

@@ -5,7 +5,7 @@ rvm:
   - 1.9.3
 
 gemfile:
-  - gemfiles/Gemfile.rails-4.0
-  - gemfiles/Gemfile.rails-3.2.x
+  - gemfiles/Gemfile.activerecord-4.0
+  - gemfiles/Gemfile.activerecord-3.2.x
 
 script: "echo 'DO IT' && bundle exec rake spec"

data/README.md

@@ -1,9 +1,16 @@
-# Partisan
-
-[![Gem Version](https://badge.fury.io/rb/partisan.png)](https://rubygems.org/gems/partisan)
-[![Build Status](https://travis-ci.org/mirego/partisan.png?branch=master)](https://travis-ci.org/mirego/partisan)
-
-Partisan is a Ruby library that allows ActiveRecord records to follow other records.
+<p align="center">
+  <a href="https://github.com/mirego/partisan">
+    <img src="http://i.imgur.com/npOjnF2.png" alt="Partisan" />
+  </a>
+  <br />
+  Partisan is a Ruby library that allows ActiveRecord records to follow other records.
+  <br /><br />
+  <a href="https://rubygems.org/gems/partisan"><img src="https://badge.fury.io/rb/partisan.png" /></a>
+  <a href="https://codeclimate.com/github/mirego/partisan"><img src="https://codeclimate.com/github/mirego/partisan.png" /></a>
+  <a href="https://travis-ci.org/mirego/partisan"><img src="https://travis-ci.org/mirego/partisan.png?branch=master" /></a>
+</p>
+
+---
 
 It’s heavily inspired by `acts_as_follower`. However, it’s not 100% compatible with `acts_as_follower` as I removed some “features”:
 

data/gemfiles/{Gemfile.rails-3.2.x → Gemfile.activerecord-3.2.x}

@@ -2,4 +2,4 @@ source 'https://rubygems.org'
 
 gemspec path: '../'
 
-gem 'rails', '~> 3.2.0'
+gem 'activerecord', '~> 3.2.0'

data/gemfiles/{Gemfile.rails-4.0 → Gemfile.activerecord-4.0}

@@ -2,4 +2,4 @@ source 'https://rubygems.org'
 
 gemspec path: '../'
 
-gem 'rails', '~> 4.0.0'
+gem 'activerecord', '~> 4.0.0'

data/lib/partisan.rb

@@ -23,4 +23,4 @@ module Partisan
   end
 end
 
-require 'partisan/railtie' if defined?(Rails) && Rails::VERSION::MAJOR >= 3
+ActiveRecord::Base.class_eval(&Partisan.inject_into_active_record)

data/lib/partisan/follow.rb

@@ -14,39 +14,62 @@ module Partisan
     after_create :update_follow_counter
     after_destroy :update_follow_counter
 
-    # Follower's :follow callbacks
-    around_create do |follow, blk|
-      self.follower.about_to_follow = self.follower.just_followed = self.followable
-      self.follower.run_callbacks :follow, &blk
-      self.follower.about_to_follow = self.follower.just_followed = nil
+    around_create :around_create_follower
+    around_create :around_create_followable
+    around_destroy :around_destroy_follower
+    around_destroy :around_destroy_followable
+
+    # Constants
+    FOLLOWER_FOLLOW_ACCESSORS = [:about_to_follow, :just_followed]
+    FOLLOWER_UNFOLLOW_ACCESSORS = [:about_to_unfollow, :just_unfollowed]
+    FOLLOWABLE_BEING_FOLLOWED_ACCESSORS = [:about_to_be_followed_by, :just_followed_by]
+    FOLLOWABLE_BEING_UNFOLLOWED_ACCESSORS = [:about_to_be_unfollowed_by, :just_unfollowed_by]
+
+  protected
+
+    def update_follow_counter
+      follower.update_follower_counter
+      followable.update_followable_counter
     end
 
-    # Followable's :follow callbacks
-    around_create do |follow, blk|
-      self.followable.about_to_be_followed_by = self.followable.just_followed_by = self.follower
-      self.followable.run_callbacks :being_followed, &blk
-      self.followable.about_to_be_followed_by = self.followable.just_followed_by = nil
+    def around_create_follower(&blk)
+      execute_callback :follower, :follow, &blk
     end
 
-    # Follower's :unfollow callbacks
-    around_destroy do |follow, blk|
-      self.follower.about_to_unfollow = self.follower.just_unfollowed = self.followable
-      self.follower.run_callbacks :unfollow, &blk
-      self.follower.about_to_unfollow = self.follower.just_unfollowed = nil
+    def around_create_followable(&blk)
+      execute_callback :followable, :being_followed, &blk
     end
 
-    # Followable's :unfollow callbacks
-    around_destroy do |follow, blk|
-      self.followable.about_to_be_unfollowed_by = self.followable.just_unfollowed_by = self.follower
-      self.followable.run_callbacks :being_unfollowed, &blk
-      self.followable.about_to_be_unfollowed_by = self.followable.just_unfollowed_by = nil
+    def around_destroy_follower(&blk)
+      execute_callback :follower, :unfollow, &blk
     end
 
-  protected
+    def around_destroy_followable(&blk)
+      execute_callback :followable, :being_unfollowed, &blk
+    end
 
-    def update_follow_counter
-      self.follower.update_follower_counter
-      self.followable.update_followable_counter
+    def self.accessors_for_follow_callback(association, callback)
+      const_get "#{association}_#{callback}_accessors".upcase
+    end
+
+  private
+
+    def execute_callback(association, callback, &blk)
+      # Fetch our associated objects
+      object = send(association)
+      reverse_object = association == :follower ? send(:followable) : send(:follower)
+
+      # Associate each given accessor to the reverse object
+      accessors = self.class.accessors_for_follow_callback(association, callback)
+      accessors.map { |accessor| object.send "#{accessor}=", reverse_object }
+
+      # Run the callbacks
+      object.run_callbacks(callback, &blk)
+
+      # Reset each accessor value
+      accessors.map { |accessor| object.send "#{accessor}=", nil }
+
+      true
     end
   end
 end

data/lib/partisan/version.rb

@@ -1,3 +1,3 @@
 module Partisan
-  VERSION = "0.2.3"
+  VERSION = "0.3"
 end

data/partisan.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(spec)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'rails', '>= 3.0.0'
+  spec.add_dependency 'activerecord', '>= 3.0.0'
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'

data/spec/spec_helper.rb

@@ -8,9 +8,6 @@ require 'partisan'
 # Require our macros and extensions
 Dir[File.expand_path('../../spec/support/macros/*.rb', __FILE__)].map(&method(:require))
 
-# Inject our methods into ActiveRecord (like our railtie does)
-ActiveRecord::Base.class_eval(&Partisan.inject_into_active_record)
-
 RSpec.configure do |config|
   # Include our macros
   config.include DatabaseMacros

data/spec/support/macros/model_macros.rb

@@ -1,5 +1,5 @@
 module ModelMacros
-  # Create a new emotional model
+  # Create a new followable model
   def followable(klass_name, &block)
     spawn_model klass_name, ActiveRecord::Base do
       acts_as_followable
@@ -7,20 +7,20 @@ module ModelMacros
     end
   end
 
-  # Create a new emotive model
+  # Create a new follower model
   def follower(klass_name, &block)
     spawn_model klass_name, ActiveRecord::Base do
       acts_as_follower
-      class_eval(&block) if block
+      instance_exec(&block) if block
     end
   end
 
-  # Create a new emotive and emotionnal model
+  # Create a new followable and follower model
   def followable_and_follower(klass_name, &block)
     spawn_model klass_name, ActiveRecord::Base do
       acts_as_followable
       acts_as_follower
-      class_eval(&block) if block
+      instance_exec(&block) if block
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: partisan
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: '0.3'
   prerelease: 
 platform: ruby
 authors:
@@ -10,10 +10,10 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-09 00:00:00.000000000 Z
+date: 2013-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -109,8 +109,8 @@ files:
 - LICENSE.md
 - README.md
 - Rakefile
-- gemfiles/Gemfile.rails-3.2.x
-- gemfiles/Gemfile.rails-4.0
+- gemfiles/Gemfile.activerecord-3.2.x
+- gemfiles/Gemfile.activerecord-4.0
 - lib/generators/partisan/USAGE
 - lib/generators/partisan/install_generator.rb
 - lib/generators/partisan/templates/migration.rb
@@ -119,7 +119,6 @@ files:
 - lib/partisan/follow_helper.rb
 - lib/partisan/followable.rb
 - lib/partisan/follower.rb
-- lib/partisan/railtie.rb
 - lib/partisan/version.rb
 - partisan.gemspec
 - spec/partisan/followable_spec.rb
@@ -143,7 +142,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 598192539115200308
+      hash: 83070319270688629
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -152,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 598192539115200308
+      hash: 83070319270688629
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23

data/lib/partisan/railtie.rb

@@ -1,10 +0,0 @@
-require 'partisan'
-require 'rails'
-
-module Partisan
-  class Railtie < Rails::Railtie
-    initializer "follows.active_record" do |app|
-      ActiveSupport.on_load :active_record, {}, &Partisan.inject_into_active_record
-    end
-  end
-end