camaraderie 0.2 → 0.2.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ce3848b0371955a9e5e5fadbb99b8d6d98925006
+  data.tar.gz: 3198acae258f052ec878c70bc8e258d5521d1759
+SHA512:
+  metadata.gz: 2ee591a2e67b717b9401ecc14e93ef1e29b7a07a283c60045e1e5cf6af21d3f35d1f3df321eb68bde0263b073e895ac9c9a21a4b96ca4049462b48f530862b94
+  data.tar.gz: 1a982f26281718207372272b781c872bdef8f7923911bb513cf1658b17f6552e6993ca5252ca6fd0e5fba829f541366f7532f14a5022114d657bb6792de9e64e

data/.travis.yml

@@ -5,6 +5,7 @@ rvm:
   - 1.9.3
 
 gemfile:
+  - gemfiles/Gemfile.activerecord-4.1
   - gemfiles/Gemfile.activerecord-4.0
   - gemfiles/Gemfile.activerecord-3.2.x
 

data/README.md

@@ -1,6 +1,7 @@
 # Camaraderie
 
 [![Gem Version](https://badge.fury.io/rb/camaraderie.png)](https://rubygems.org/gems/camaraderie)
+[![Code Climate](https://codeclimate.com/github/mirego/camaraderie.png)](https://codeclimate.com/github/mirego/camaraderie)
 [![Build Status](https://travis-ci.org/mirego/camaraderie.png?branch=master)](https://travis-ci.org/mirego/camaraderie)
 
 Camaraderie takes away the pain of managing membership stuff between users and organizations.

data/gemfiles/Gemfile.activerecord-4.1

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

data/lib/camaraderie.rb

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

data/lib/camaraderie/version.rb

@@ -1,3 +1,3 @@
 module Camaraderie
-  VERSION = '0.2'
+  VERSION = '0.2.1'
 end

data/lib/generators/camaraderie/templates/migration.rb

@@ -10,6 +10,7 @@ class AddCamaraderie < ActiveRecord::Migration
 
     add_index "memberships", ["organization_id", "membership_type"], name: "index_memberships_on_organization_id_and_membership_type"
     add_index "memberships", ["organization_id", "user_id", "membership_type"], name: "index_memberships_on_everything", unique: true
+    add_index "memberships", ["organization_id", "user_id"], name: "index_memberships_on_organization_id_and_user_id"
     add_index "memberships", ["organization_id"], name: "index_memberships_on_organization_id"
     add_index "memberships", ["user_id"], name: "index_memberships_on_user_id"
   end

data/spec/camaraderie/membership_spec.rb

@@ -29,14 +29,14 @@ describe Camaraderie::Membership do
     describe :admins do
       subject { Membership.admins }
 
-      it { should be_an_instance_of(relation_class(Membership)) }
+      it { should be_a_kind_of(ActiveRecord::Relation) }
       it { should have(2).items }
     end
 
     describe :members do
       subject { Membership.members }
 
-      it { should be_an_instance_of(relation_class(Membership)) }
+      it { should be_a_kind_of(ActiveRecord::Relation) }
       it { should have(1).item }
     end
   end

data/spec/camaraderie/organization_spec.rb

@@ -27,26 +27,26 @@ describe Camaraderie::Organization do
 
     describe :admins do
       subject { organization.admins }
-      it { should be_an_instance_of(relation_class(Membership)) }
+      it { should be_a_kind_of(ActiveRecord::Relation) }
       it { should have(1).item }
     end
 
     describe :members do
       subject { organization.members }
-      it { should be_an_instance_of(relation_class(Membership)) }
+      it { should be_a_kind_of(ActiveRecord::Relation) }
       it { should have(2).items }
     end
 
     describe :admin_users do
       subject { organization.admin_users }
-      it { should be_an_instance_of(relation_class(User)) }
+      it { should be_a_kind_of(ActiveRecord::Relation) }
       it { should have(1).item }
       it { should include user1 }
     end
 
     describe :member_users do
       subject { organization.member_users }
-      it { should be_an_instance_of(relation_class(User)) }
+      it { should be_a_kind_of(ActiveRecord::Relation) }
       it { should have(2).items }
       it { should include user2, user3 }
     end

data/spec/spec_helper.rb

@@ -8,14 +8,10 @@ require 'camaraderie'
 # 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(&Camaraderie.inject_into_active_record)
-
 RSpec.configure do |config|
   # Include our macros
   config.include DatabaseMacros
   config.include ModelMacros
-  config.include RailsMacros
 
   config.before(:each) do
     # Create the SQLite database

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: camaraderie
 version: !ruby/object:Gem::Version
-  version: '0.2'
-  prerelease: 
+  version: 0.2.1
 platform: ruby
 authors:
 - Rémi Prévost
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-12 00:00:00.000000000 Z
+date: 2013-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,39 +27,34 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,33 +69,29 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
 description: Camaraderie takes away the pain of managing membership stuff between
@@ -125,10 +112,10 @@ files:
 - camaraderie.gemspec
 - gemfiles/Gemfile.activerecord-3.2.x
 - gemfiles/Gemfile.activerecord-4.0
+- gemfiles/Gemfile.activerecord-4.1
 - lib/camaraderie.rb
 - lib/camaraderie/membership.rb
 - lib/camaraderie/organization.rb
-- lib/camaraderie/railtie.rb
 - lib/camaraderie/user.rb
 - lib/camaraderie/version.rb
 - lib/generators/camaraderie/USAGE
@@ -142,37 +129,29 @@ files:
 - spec/spec_helper.rb
 - spec/support/macros/database_macros.rb
 - spec/support/macros/model_macros.rb
-- spec/support/macros/rails_macros.rb
 homepage: https://github.com/mirego/camaraderie
 licenses:
 - BSD 3-Clause
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3093721818560586396
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3093721818560586396
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.1.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Camaraderie takes away the pain of managing membership stuff between users
   and organizations.
 test_files:
@@ -183,4 +162,3 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/macros/database_macros.rb
 - spec/support/macros/model_macros.rb
-- spec/support/macros/rails_macros.rb

data/lib/camaraderie/railtie.rb

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

data/spec/support/macros/rails_macros.rb

@@ -1,9 +0,0 @@
-module RailsMacros
-  def relation_class(klass)
-    if ActiveRecord::VERSION::MAJOR == 3
-      ActiveRecord::Relation
-    else
-      "ActiveRecord::Relation::ActiveRecord_Relation_#{klass.name}".constantize
-    end
-  end
-end