amistad 0.7.4 → 0.7.5

data/.gitignore

@@ -2,5 +2,5 @@ pkg/*
 *.gem
 .bundle
 spec/db/*.db
-Gemfile.lock
 nbproject
+.rvmrc

data/CHANGELOG

@@ -1,3 +1,10 @@
+Version 0.7.5 (30.09.2011)
+--------------------------
+- Updated Rakefile to add default task that runs the ActiveRecord and Mongoid tests [David Czarnecki]
+- Only load the relevant ORM classes depending on which is in use [David Czarnecki]
+- Checked compatibilty with Rails 3.1
+- Updated the dependencies versions
+
 Version 0.7.4 (23.04.2011)
 --------------------------
 - Checked compatibilty with Mongoid 2.0 final release

data/Gemfile.lock

@@ -0,0 +1,65 @@
+PATH
+  remote: .
+  specs:
+    amistad (0.7.5)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activemodel (3.1.0)
+      activesupport (= 3.1.0)
+      bcrypt-ruby (~> 3.0.0)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.0)
+      activemodel (= 3.1.0)
+      activesupport (= 3.1.0)
+      arel (~> 2.2.1)
+      tzinfo (~> 0.3.29)
+    activesupport (3.1.0)
+      multi_json (~> 1.0)
+    arel (2.2.1)
+    bcrypt-ruby (3.0.1)
+    bson (1.4.0)
+    bson_ext (1.4.0)
+    builder (3.0.0)
+    diff-lcs (1.1.3)
+    fuubar (0.0.6)
+      rspec (~> 2.0)
+      rspec-instafail (~> 0.1.8)
+      ruby-progressbar (~> 0.0.10)
+    i18n (0.6.0)
+    mongo (1.4.0)
+      bson (= 1.4.0)
+    mongoid (2.0.2)
+      activemodel (~> 3.0)
+      mongo (~> 1.3)
+      tzinfo (~> 0.3.22)
+    multi_json (1.0.3)
+    rake (0.9.2)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
+      diff-lcs (~> 1.1.2)
+    rspec-instafail (0.1.8)
+    rspec-mocks (2.6.0)
+    ruby-progressbar (0.0.10)
+    sqlite3 (1.3.4)
+    tzinfo (0.3.30)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord
+  amistad!
+  bson_ext (~> 1.3)
+  bundler
+  fuubar
+  mongoid (~> 2.0.0)
+  rake
+  rspec
+  sqlite3

data/README.markdown

@@ -148,6 +148,8 @@ It is possible to test amistad by running one of the following commands from the
     
 Remember that amistad is only compatible with ActiveRecord 3.0.x and Mongoid 2.0.x.
 
+You can also run `rake` by itself and it will run the ActiveRecord tests followed by the Mongoid tests.
+
 ## Contributors ##
 
 * David Czarnecki : block friendships (and many other improvements)

data/Rakefile

@@ -5,14 +5,18 @@ require 'rspec'
 require 'rspec/core/rake_task'
 
 namespace :spec do
-  Rspec::Core::RakeTask.new(:activerecord) do |t|
+  RSpec::Core::RakeTask.new(:activerecord) do |t|
     t.pattern = "./spec/activerecord/**/*_spec.rb"
     t.rspec_opts = "--format Fuubar"
   end
 
-  Rspec::Core::RakeTask.new(:mongoid) do |t|
+  RSpec::Core::RakeTask.new(:mongoid) do |t|
     t.pattern = "./spec/mongoid/**/*_spec.rb"
     t.rspec_opts = "--format Fuubar"
   end
 end
 
+task :default do
+  Rake::Task['spec:activerecord'].invoke
+  Rake::Task['spec:mongoid'].invoke
+end

data/amistad.gemspec

@@ -14,13 +14,14 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "amistad"
 
-  s.add_development_dependency "bundler", "~>1.0.12"
-  s.add_development_dependency "rspec", "~> 2.5.0"
-  s.add_development_dependency "activerecord", "~> 3.0.7"
-  s.add_development_dependency "sqlite3", ">= 1.3.2"
+  s.add_development_dependency "bundler"
+  s.add_development_dependency "rake"
+  s.add_development_dependency "rspec"
+  s.add_development_dependency "activerecord"
+  s.add_development_dependency "sqlite3"
   s.add_development_dependency "mongoid", "~> 2.0.0"
   s.add_development_dependency "bson_ext", "~> 1.3"
-  s.add_development_dependency "fuubar", "~> 0.0.4"
+  s.add_development_dependency "fuubar"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/amistad.rb

@@ -1,5 +1,11 @@
-require 'amistad/active_record/friend_model'
-require 'amistad/active_record/friendship_model'
-require 'amistad/mongoid/friend_model'
+if defined?(ActiveRecord)
+  require 'amistad/active_record/friend_model'
+  require 'amistad/active_record/friendship_model'
+end
+
+if defined?(Mongoid)
+  require 'amistad/mongoid/friend_model'
+end
+
 require 'amistad/friend_model'
 require 'amistad/friendship_model'

data/lib/amistad/version.rb

@@ -1,3 +1,3 @@
 module Amistad
-  VERSION = "0.7.4"
+  VERSION = "0.7.5"
 end

data/spec/spec_helper.rb

@@ -1,4 +1,6 @@
 require 'rspec'
+require 'active_record'
+require 'mongoid'
 require 'amistad'
 Dir["#{File.dirname(__FILE__)}/support/*.rb"].each {|f| require f}
 

metadata

@@ -1,107 +1,115 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: amistad
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.7.5
   prerelease: 
-  version: 0.7.4
 platform: ruby
-authors: 
+authors:
 - Rawane ZOSSOU
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-23 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-09-30 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: bundler
+  requirement: &70262067526040 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: *70262067526040
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70262067541740 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 1.0.12
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70262067541740
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70262067540020 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 2.5.0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: activerecord
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70262067540020
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: &70262067537380 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 3.0.7
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: sqlite3
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70262067537380
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: &70262067536300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.3.2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: mongoid
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70262067536300
+- !ruby/object:Gem::Dependency
+  name: mongoid
+  requirement: &70262067535440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.0.0
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: bson_ext
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70262067535440
+- !ruby/object:Gem::Dependency
+  name: bson_ext
+  requirement: &70262067534100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1.3"
+      - !ruby/object:Gem::Version
+        version: '1.3'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: fuubar
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *70262067534100
+- !ruby/object:Gem::Dependency
+  name: fuubar
+  requirement: &70262067549700 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.0.4
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
+  prerelease: false
+  version_requirements: *70262067549700
 description: Extends your user model with friendships management methods
-email: 
+email:
 - dev@raw1z.fr
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - CHANGELOG
 - Gemfile
+- Gemfile.lock
 - LICENCE
 - README.markdown
 - Rakefile
@@ -125,32 +133,35 @@ files:
 - spec/support/friend_examples.rb
 homepage: http://github.com/raw1z/amistad
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
+      - 0
+      hash: -4081995342441297245
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
+      - 0
+      hash: -4081995342441297245
 requirements: []
-
 rubyforge_project: amistad
-rubygems_version: 1.7.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Adds friendships management into a rails 3.0 application
-test_files: 
+test_files:
 - spec/activerecord/activerecord_friend_model_spec.rb
 - spec/activerecord/activerecord_friendship_model_spec.rb
 - spec/activerecord/activerecord_spec_helper.rb
@@ -158,4 +169,3 @@ test_files:
 - spec/mongoid/mongoid_spec_helper.rb
 - spec/spec_helper.rb
 - spec/support/friend_examples.rb
-has_rdoc: