partisan 0.4 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5144131fd00599fe346d266846c160768aa821e2
-  data.tar.gz: ab4d801d4cf2e632474efa1d8a1117d1b66b7a19
+  metadata.gz: 698e3eb571bbe3198a67365ef8be7beb1b37acf2
+  data.tar.gz: 40db91f5461e512580f03d9afcc93391fffcd66d
 SHA512:
-  metadata.gz: e416ac5b694502c5d7f84442079987f5b3561a7b6cfe90c36f78517b6f9d791a16c78f20b9069d35d5e2874b425c4e5c236a9e2257c4e74fbfba8fa30f41791d
-  data.tar.gz: e5fbe276053c550f4ecadb39df3c8933eade895eb435ee0d3558504da5592d1eb71d7fef076446aed41b56aa7a913c4bbe190393c3ab0fba644fffa4f3ca3eee
+  metadata.gz: 9c02a2514eeb7b5b4249370c57aff22f4a587aa30e628868858b08234dd6b4df2c85eadba4cf4c9afebe1645ab3bc3dbe07f89c1a9e596e303f62be79a280ad4
+  data.tar.gz: 8eeb187a25dcdf319342860348b41408abc85e8baeb5b292cf932d699cf9e7a855b895bd48b1732ed4158391b2e507c7ca77763fc1f49e41e2ea60797eb71d9c

data/.travis.yml

@@ -5,7 +5,17 @@ rvm:
   - 1.9.3
 
 gemfile:
+  - gemfiles/Gemfile.activerecord-4.1
   - gemfiles/Gemfile.activerecord-4.0
   - gemfiles/Gemfile.activerecord-3.2.x
 
 script: "echo 'DO IT' && bundle exec rake spec"
+
+notifications:
+  hipchat:
+    rooms:
+      secure: "DUZC6Q2b18pEp7W7qNnGRYDgqtZGeWh44ED+hF27OIxjdM6JRx/nOmpvY46/lR6KjiH7DDM+TGPbxAzXo3rECxUZqkMPjMkqfZyfyN4JhccI/dJf1EL0GDUMogPfFUOuLWTqA49Y9GvvXTghK/irlLBhInWcrPJcTIsDG2t4nN4="
+    template:
+      - '%{repository}#%{build_number} (%{branch} - %{commit} : %{author}): %{message} (<a href="%{build_url}">Build</a>/<a href="%{compare_url}">Changes</a>)'
+    format: 'html'
+

data/README.md

@@ -5,9 +5,10 @@
   <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>
+  <a href="https://rubygems.org/gems/partisan"><img src="http://img.shields.io/gem/v/partisan.svg" /></a>
+  <a href="https://codeclimate.com/github/mirego/partisan"><img src="http://img.shields.io/codeclimate/github/mirego/partisan.svg" /></a>
+  <a href="https://gemnasium.com/mirego/partisan"><img src="http://img.shields.io/gemnasium/mirego/partisan.svg" /></a>
+  <a href="https://travis-ci.org/mirego/partisan"><img src="http://img.shields.io/travis/mirego/partisan.svg" /></a>
 </p>
 
 ---
@@ -145,6 +146,6 @@ The available callbacks are:
 
 ## About Mirego
 
-Mirego is a team of passionate people who believe that work is a place where you can innovate and have fun. We proudly build mobile applications for [iPhone](http://mirego.com/en/iphone-app-development/ "iPhone application development"), [iPad](http://mirego.com/en/ipad-app-development/ "iPad application development"), [Android](http://mirego.com/en/android-app-development/ "Android application development"), [Blackberry](http://mirego.com/en/blackberry-app-development/ "Blackberry application development"), [Windows Phone](http://mirego.com/en/windows-phone-app-development/ "Windows Phone application development") and [Windows 8](http://mirego.com/en/windows-8-app-development/ "Windows 8 application development") in beautiful Quebec City.
+[Mirego](http://mirego.com) is a team of passionate people who believe that work is a place where you can innovate and have fun. We're a team of [talented people](http://life.mirego.com) who imagine and build beautiful Web and mobile applications. We come together to share ideas and [change the world](http://mirego.org).
 
-We also love [open-source software](http://open.mirego.com/) and we try to extract as much code as possible from our projects to give back to the community.
+We also [love open-source software](http://open.mirego.com) and we try to give back to the community as much as we can.

data/gemfiles/Gemfile.activerecord-4.1

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gemspec path: '../'
+
+gem 'activerecord', '~> 4.1.0'

data/lib/partisan.rb

@@ -2,14 +2,12 @@ require "partisan/version"
 
 require "active_record"
 
+require "partisan/helper"
 require "partisan/follow"
-require "partisan/follow_helper"
 require "partisan/follower"
 require "partisan/followable"
 
 module Partisan
-  include Partisan::FollowHelper
-
   def self.inject_into_active_record
     @inject_into_active_record ||= Proc.new do
       def self.acts_as_follower

data/lib/partisan/followable.rb

@@ -3,8 +3,6 @@ module Partisan
     extend ActiveSupport::Concern
     extend ActiveModel::Callbacks
 
-    include Partisan::FollowHelper
-
     included do
       has_many :followings, as: :followable, class_name: 'Follow', dependent: :destroy
       define_model_callbacks :being_followed
@@ -34,7 +32,7 @@ module Partisan
     def followers_by_type(follower_type)
       opts = {
         'follows.followable_id' => self.id,
-        'follows.followable_type' => parent_class_name(self)
+        'follows.followable_type' => Partisan::Helper.parent_class_name(self)
       }
 
       follower_type.constantize.joins(:follows).where(opts)

data/lib/partisan/follower.rb

@@ -2,7 +2,6 @@ module Partisan
   module Follower
     extend ActiveSupport::Concern
     extend ActiveModel::Callbacks
-    include Partisan::FollowHelper
 
     included do
       has_many :follows, as: :follower, class_name: 'Follow', dependent: :destroy
@@ -63,7 +62,7 @@ module Partisan
     #
     # @return [Follow, ...]
     def fetch_follows(resource)
-      follows.where followable_id: resource.id, followable_type: parent_class_name(resource)
+      follows.where followable_id: resource.id, followable_type: Partisan::Helper.parent_class_name(resource)
     end
 
     # Get resource records for a specific type, used by #method_missing
@@ -77,7 +76,7 @@ module Partisan
     def following_by_type(followable_type)
       opts = {
         'follows.follower_id' => self.id,
-        'follows.follower_type' => parent_class_name(self)
+        'follows.follower_type' => Partisan::Helper.parent_class_name(self)
       }
 
       followable_type.constantize.joins(:followings).where(opts)

data/lib/partisan/helper.rb

@@ -0,0 +1,17 @@
+module Partisan
+  class Helper
+    # Retrieves the parent class name
+    def self.parent_class_name(obj)
+      # If the object is an ActiveRecord record
+      klass = obj.class if obj.class < ActiveRecord::Base
+
+      # If the object respond to `object` and the value is an ActiveRecord record
+      klass ||= obj.object.class if obj.respond_to?(:object) && obj.object.class < ActiveRecord::Base
+
+      # In case we’re using STI, loop back until we find the top-level ActiveRecord model
+      klass = klass.superclass while klass.superclass != ActiveRecord::Base
+
+      klass.name
+    end
+  end
+end

data/lib/partisan/version.rb

@@ -1,3 +1,3 @@
 module Partisan
-  VERSION = '0.4'
+  VERSION = '0.4.1'
 end

data/partisan.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.version       = Partisan::VERSION
   spec.authors       = ['Simon Prévost', 'Rémi Prévost']
   spec.email         = ['sprevost@mirego.com', 'Rémi Prévost']
-  spec.description   = 'Partisan is a Ruby library that allows ActiveRecord records to be follower and followable, just like on popular social networks. It’s heavily inspired by acts_as_follower which is no longer maintened.'
+  spec.description   = 'Partisan is a Ruby library that allows ActiveRecord records to be follower and followable, just like on popular social networks. It’s heavily inspired by acts_as_follower which is no longer maintained.'
   spec.summary       = 'Partisan is a Ruby library that allows ActiveRecord records to be follower and followable'
   spec.homepage      = 'https://github.com/mirego/partisan'
   spec.license       = 'BSD 3-Clause'
@@ -22,6 +22,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'rspec', '~> 3.1'
   spec.add_development_dependency 'sqlite3'
 end

data/spec/partisan/followable_spec.rb

@@ -31,8 +31,8 @@ describe Partisan::Followable do
     end
 
     describe :followed_by? do
-      it { expect(band.followed_by? user).to be_true }
-      it { expect(concert.followed_by? user).to be_false }
+      it { expect(band.followed_by? user).to be_truthy }
+      it { expect(concert.followed_by? user).to be_falsey }
     end
 
     describe :followers_by_type do
@@ -62,8 +62,8 @@ describe Partisan::Followable do
     end
 
     describe :respond_to? do
-      it { expect(band.respond_to?(:user_followers)).to be_true }
-      it { expect(band.respond_to?(:users_follower_ids)).to be_true }
+      it { expect(band.respond_to?(:user_followers)).to be_truthy }
+      it { expect(band.respond_to?(:users_follower_ids)).to be_truthy }
     end
 
     describe :update_follow_counter do

data/spec/partisan/follower_spec.rb

@@ -52,8 +52,8 @@ describe Partisan::Follower do
     describe :follows? do
       let(:band2) { Band.create }
 
-      it { expect(user.follows? band).to be_true }
-      it { expect(user.follows? band2).to be_false }
+      it { expect(user.follows? band).to be_truthy }
+      it { expect(user.follows? band2).to be_falsey }
     end
 
     describe :following_by_type do
@@ -89,8 +89,8 @@ describe Partisan::Follower do
     end
 
     describe :respond_to? do
-      it { expect(user.respond_to?(:following_bands)).to be_true }
-      it { expect(user.respond_to?(:following_band_ids)).to be_true }
+      it { expect(user.respond_to?(:following_bands)).to be_truthy }
+      it { expect(user.respond_to?(:following_band_ids)).to be_truthy }
     end
   end
 

data/spec/partisan/helper_spec.rb

@@ -0,0 +1,43 @@
+require 'spec_helper'
+
+describe Partisan::Helper do
+  describe :ClassMethods do
+    describe :parent_class_name do
+      let(:parent_class_name) { Partisan::Helper.send(:parent_class_name, object) }
+
+      before do
+        run_migration { create_table 'articles' }
+      end
+
+      context 'with regular record object' do
+        let(:object) { spawn_model('Article', ActiveRecord::Base).new }
+
+        it { expect(parent_class_name).to eql 'Article' }
+      end
+
+      context 'with STI-model record object' do
+        let(:object) do
+          spawn_model('Article', ActiveRecord::Base)
+          spawn_model('BlogPost', Article).new
+        end
+
+        it { expect(parent_class_name).to eql 'Article' }
+      end
+
+      context 'with a presented record object' do
+        let(:presenter_class) do
+          Class.new(::SimpleDelegator) do
+            alias_method :object, :__getobj__
+          end
+        end
+
+        let(:object) do
+          spawn_model('Article', ActiveRecord::Base)
+          presenter_class.new(Article.new)
+        end
+
+        it { expect(parent_class_name).to eql 'Article' }
+      end
+    end
+  end
+end

data/spec/support/macros/model_macros.rb

@@ -29,7 +29,8 @@ module ModelMacros
   # Create a new model class
   def spawn_model(klass_name, parent_klass, &block)
     Object.instance_eval { remove_const klass_name } if Object.const_defined?(klass_name)
-    Object.const_set(klass_name, Class.new(parent_klass))
+    klass = Object.const_set(klass_name, Class.new(parent_klass))
     Object.const_get(klass_name).class_eval(&block) if block_given?
+    klass
   end
 end

data/spec/support/macros/rails_macros.rb

@@ -1,9 +1,13 @@
 module RailsMacros
+  # NOTE: This method is not fun to maintain but we need it to make sure
+  # Partisan methods return *real* not-loaded ActiveRecord relations
   def relation_class(klass)
     if ActiveRecord::VERSION::MAJOR == 3
       ActiveRecord::Relation
-    else
+    elsif [ActiveRecord::VERSION::MAJOR, ActiveRecord::VERSION::MINOR] == [4, 0]
       "ActiveRecord::Relation::ActiveRecord_Relation_#{klass.name}".constantize
+    else
+      "#{klass.name}::ActiveRecord_Relation".constantize
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: partisan
 version: !ruby/object:Gem::Version
-  version: '0.4'
+  version: 0.4.1
 platform: ruby
 authors:
 - Simon Prévost
@@ -9,81 +9,81 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-16 00:00:00.000000000 Z
+date: 2014-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   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: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   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'
 description: Partisan is a Ruby library that allows ActiveRecord records to be follower
   and followable, just like on popular social networks. It’s heavily inspired by acts_as_follower
-  which is no longer maintened.
+  which is no longer maintained.
 email:
 - sprevost@mirego.com
 - Rémi Prévost
@@ -91,28 +91,30 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE.md
 - README.md
 - Rakefile
 - gemfiles/Gemfile.activerecord-3.2.x
 - gemfiles/Gemfile.activerecord-4.0
+- gemfiles/Gemfile.activerecord-4.1
 - lib/generators/partisan/USAGE
 - lib/generators/partisan/install_generator.rb
 - lib/generators/partisan/templates/migration.rb
 - lib/generators/partisan/templates/model.rb
 - lib/partisan.rb
 - lib/partisan/follow.rb
-- lib/partisan/follow_helper.rb
 - lib/partisan/followable.rb
 - lib/partisan/follower.rb
+- lib/partisan/helper.rb
 - lib/partisan/version.rb
 - partisan.gemspec
 - spec/partisan/followable_spec.rb
 - spec/partisan/follower_spec.rb
+- spec/partisan/helper_spec.rb
 - spec/spec_helper.rb
 - spec/support/macros/database_macros.rb
 - spec/support/macros/model_macros.rb
@@ -127,17 +129,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Partisan is a Ruby library that allows ActiveRecord records to be follower
@@ -145,6 +147,7 @@ summary: Partisan is a Ruby library that allows ActiveRecord records to be follo
 test_files:
 - spec/partisan/followable_spec.rb
 - spec/partisan/follower_spec.rb
+- spec/partisan/helper_spec.rb
 - spec/spec_helper.rb
 - spec/support/macros/database_macros.rb
 - spec/support/macros/model_macros.rb

data/lib/partisan/follow_helper.rb

@@ -1,15 +0,0 @@
-module Partisan
-  module FollowHelper
-
-  private
-
-    # Retrieves the parent class name if using STI.
-    def parent_class_name(obj)
-      klass = obj.class
-      klass = klass.superclass while klass.superclass != ActiveRecord::Base
-
-      klass.name
-    end
-
-  end
-end